update for osx

Documentation stuff missing

.dockerignore

@@ -0,0 +1 @@
+*.o

.gitignore

@@ -5,3 +5,4 @@ src/qhull/bin/
 src/qhull/lib/libqhullstatic_r.a
 src/qhull/lib/libqhullstatic.a
 *.pyc
+vmd/plugins

Dockerfile-debian-slim

@@ -0,0 +1,22 @@
+FROM debian:bullseye-slim
+RUN groupadd -r fpocket && useradd --no-log-init -r -g fpocket fpocket
+RUN apt update -y && apt install -y gcc g++ make libnetcdf-dev && rm -rf /var/lib/apt/lists/*
+
+# all of this mess is essentially to have a minimalistic build at the end
+COPY makefile /opt/fpocket/
+COPY src /opt/fpocket/src
+COPY man /opt/fpocket/man
+COPY headers /opt/fpocket/headers
+COPY obj /opt/fpocket/obj
+COPY scripts /opt/fpocket/scripts
+COPY bin /opt/fpocket/bin
+COPY plugins/LINUXAMD64 /opt/fpocket/plugins/LINUXAMD64
+COPY plugins/include /opt/fpocket/plugins/include
+COPY plugins/noarch /opt/fpocket/plugins/noarch
+
+WORKDIR /opt/fpocket
+
+RUN make && make install && make clean
+USER fpocket
+WORKDIR /tmp
+CMD ["fpocket"]

Dockerfile-molfile-debug

@@ -0,0 +1,29 @@
+FROM ubuntu:latest
+RUN groupadd -r fpocket && useradd --no-log-init -r -g fpocket fpocket
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PLUGINDIR=compiled
+RUN apt update -y && apt install -y vim gdb gcc g++ make libnetcdf-dev && rm -rf /var/lib/apt/lists/* 
+
+# all of this mess is essentially to have a minimalistic build at the end
+COPY vmd /vmd
+WORKDIR /vmd/plugins
+RUN make LINUXAMD64 && make distrib
+
+COPY makefile /opt/fpocket/
+COPY src /opt/fpocket/src
+COPY data/sample /opt/fpocket/sample
+COPY man /opt/fpocket/man
+COPY headers /opt/fpocket/headers
+COPY obj /opt/fpocket/obj
+COPY scripts /opt/fpocket/scripts
+COPY bin /opt/fpocket/bin
+COPY plugins/LINUXAMD64 /opt/fpocket/plugins/LINUXAMD64
+COPY plugins/include /opt/fpocket/plugins/include
+COPY plugins/noarch /opt/fpocket/plugins/noarch
+
+WORKDIR /opt/fpocket
+RUN cp -r /vmd/plugins/molfile_plugin/compiled/LINUXAMD64/molfile/* plugins/LINUXAMD64/molfile/
+#RUN make && make install && make clean
+USER fpocket
+WORKDIR /tmp
+CMD ["fpocket"]

README.md

@@ -18,6 +18,8 @@ The documentation below here is just a quick & rough overview.
 
 ## What's new compared to fpocket 2.0 (old sourceforge repo)
 __fpocket__: 
+- fpocket now supports mmCIF as input and output format together with the classical PDB format
+- support was added to define / delete and handle protein chains or sets of them to enable characterization of protein protein binding epitopes
 - is now able to consider explicit pockets when you want to calculate properties for a known binding site
 - cli changed a bit
 - pocket flexibility using temperature factors is better considered (less very flexible pockets on very solvent exposed areas)
@@ -152,6 +154,11 @@ You can run fpocket using the following command line as an example:
 fpocket -f 1uyd.pdb
 ```
 
+fpocket now also eats cif as input, so this would work as well. Make sure to use proper file extensions
+```bash
+fpocket -f 1uyd.cif
+```
+
 This will detect all pockets on the input pdb file, named 1uyd.pdb
 If you want to get all command line args for fpocket, simply type `fpocket``
 
@@ -174,7 +181,7 @@ Please read [CONTRIBUTING.md](https://gist.github.com/PurpleBooth/b24679402957c6
 
 * **Peter Schmidtke** - *Initial work* - [pschmidtke](https://github.com/pschmidtke)
 * **Vincent Le Guilloux** - *Initial work* - [leguilv](https://github.com/leguilv)
-* **Mael Shorkar** - *Chain handling* - [leguilv](https://github.com/shorkarmael)
+* **Mael Shorkar** - *Chain handling, MMCIF support* - [shorkarmael](https://github.com/shorkarmael)
 
 
 ## License

doc/GETTINGSTARTED.md

@@ -417,7 +417,7 @@ The simplest way to run fpocket is either by providing a single pdb file, or by
 
 #### Optional:
 
-    -m float: (default 3.4Å) This flag enables the user to modify the minimum radius an alpha sphere might have in a binding pocket. An alpha sphere is a contact sphere, that touches 4 atoms in 3D space without having any internal atoms. Here 3Å allow filtering of too small (protein internal) alpha spheres. I you want to analyze internal interstices, lower this parameter. In the contrary, if you want to analyze more solvent exposed cavities, you can raise this parameter in order to filter out too buried cavities.
+    -m float: (default 3.4Å) This flag enables the user to modify the minimum radius an alpha sphere might have in a binding pocket. An alpha sphere is a contact sphere, that touches 4 atoms in 3D space without having any internal atoms. Here 3Å allow filtering of too small (protein internal) alpha spheres. If you want to analyze internal interstices, lower this parameter. In the contrary, if you want to analyze more solvent exposed cavities, you can raise this parameter in order to filter out too buried cavities.
     
     -M float: (default 6.2Å) Here you can modify the maximum radius of alpha spheres in a pocket. An alpha sphere is a contact sphere, that touches 4 atoms in 3D space without having any internal atoms. Here 7Å allow to filter out too large contact spheres, that are lying on the protein surface. If you want to analyze very flat and solvent exposed surface depressions, raise this parameter. For analysis of buried parts of the protein you can lower this parameter. Higher radii might be more interesting for identification of protein protein binding sites or polysaccharide binding sites. Smaller radii enable detection of buried cavities for small organic molecules (drugs, for instance).
     
@@ -449,13 +449,13 @@ The simplest way to run fpocket is either by providing a single pdb file, or by
     
     -v int: (default 2500) By default, pockets volume are calculated using a monte-carlo algorithm. Basically, the algorithm picks a random point in the space and check if it is included in any alpha sphere, and stores this status. This is repeated N times, and we estimate the volume of the pocket using ratio between the number of hit and the number of iteration, scaled by the size of the box. This parameter defines the number of iteration to perform. Of course, the higher the value is, the greater the accuracy will be, but the performance will be slowed down.
     
-    -b (none): (NOT USED BY DEFAULT) This option allows the user to chose a discrete algorithm  to calculate  the  volume of each pocket instead of the Monte Carlo method. This algorithm puts each pocket into a grid of  dimention (1/N*X  ;  1/N*Y  ;  1/N*Z),  N being the value given using this option, and X, Y and Z being the box dimensions,  determined using coordinates of vertices. Then, a triple iteration on each dimensions is used to estimate the volume, checking if each points  given  by the iteration is in one of the pocket’s vertices. This parameter defines the grid discretization. If this parameter is used, this algorithm will be used instead of the Monte Carlo algorithm. 
+    -b (none): (NOT USED BY DEFAULT) This option allows the user to choose a discrete algorithm  to calculate  the  volume of each pocket instead of the Monte Carlo method. This algorithm puts each pocket into a grid of dimension (1/N*X  ;  1/N*Y  ;  1/N*Z),  N being the value given using this option, and X, Y and Z being the box dimensions,  determined using coordinates of vertices. Then, a triple iteration on each dimensions is used to estimate the volume, checking if each points  given  by the iteration is in one of the pocket’s vertices. This parameter defines the grid discretization. If this parameter is used, this algorithm will be used instead of the Monte Carlo algorithm. 
     Warning: Although this algorithm could be more accurate, a high value might dramatically slow down the program, as this algorithm has a maximum complexity of N*N*N*nb_vertices, and a minimum of N*N*N !!!
 
 
     -d (none): Option allowing you to output pockets and properties in a condensed format. This will put to the stdout pocket properties in a tab separated string and write pocket files in a subfolder
     
-    -r string: (None) This parameter allows you to run fpocket in a restricted mode. Let's suppose you have a very shallow or large pocket with a ligand inside and the automatic pocket prediction always splits up you pocket or you have only a part of the pocket found. Specifying your ligand residue with -r allows you to detect and characterize you ligand binding site explicitely. For instance for `1UYD.pdb` you can specify `-r 1224:PU8:A` (residue number of the ligand: residue name of the ligand: chain of the ligand)
+    -r string: (None) This parameter allows you to run fpocket in a restricted mode. Let's suppose you have a very shallow or large pocket with a ligand inside and the automatic pocket prediction always splits up you pocket or you have only a part of the pocket found. Specifying your ligand residue with -r allows you to detect and characterize you ligand binding site explicitly. For instance for `1UYD.pdb` you can specify `-r 1224:PU8:A` (residue number of the ligand: residue name of the ligand: chain of the ligand)
     
     -y string: (filename) EXPERIMENTAL: here you can specify a topology filename in the Amber prmtop format. This can then be used by fpocket & mdpocket to calculate energy grids for your pockets. NB: you have to specify the -x flag to run energy calculations
     

headers/descriptors.h

@@ -24,6 +24,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include "atom.h"
 #include "aa.h"
 #include "utils.h"
+//#include "asa.h"
 
 
 /* --------------------------------STRUCTURES---------------------------------*/
@@ -88,6 +89,10 @@ typedef struct s_desc
 
 /* ------------------------------PROTOTYPES---------------------------------- */
 
+//explicit definition from asa.h 
+void set_ASA(s_desc *desc,s_pdb *pdb, s_vvertice **tvert,int nvert);
+
+
 s_desc* allocate_s_desc(void) ;
 void reset_desc(s_desc *desc) ;
 

headers/pertable.h

@@ -28,6 +28,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 float pte_get_vdw_ray(const char *symbol) ;
 float pte_get_mass(const char *symbol) ;
 float pte_get_enegativity(const char *symbol) ;
+float pte_get_enegativity_from_number(int atomicnumber) ;
+char *pte_get_element_from_number(int atomicnumber);
 int is_valid_element(const char *str, int ignore_case) ;
 int element_in_std_res(char *res_name);
 int element_in_nucl_acid(char *res_name);

headers/rpdb.h

@@ -89,6 +89,8 @@ typedef struct s_pdb
     char header[M_PDB_BUF_LEN] ; /**< Header container*/
     char fname[M_PDB_FILE_NAME_LEN];    /**< File name container*/
     float avg_bfactor;  /**<overall average B factor*/
+    int model_flag; /**<flag set to 1 if a particular model / conformation was read*/
+    int model_number; /**<number of the model read in*/
 
 } s_pdb ;
 

makefile

@@ -1,6 +1,7 @@
 #------------------------------------------------------------
 # Makefile.
 #------------------------------------------------------------
+#ARCH	    = MACOSXX86_64
 ARCH	    = LINUXAMD64
 export ARCH
 
@@ -12,8 +13,11 @@ PATH_HEADER = headers/
 PATH_BIN    = bin/
 PATH_MAN    = man/
 PATH_QHULL  = src/qhull/src
+PATH_LIB	= $(PLUGINDIR)/$(ARCH)/molfile/
 
 BINDIR  = /usr/local/bin/
+LIBDIR  = /usr/local/lib/
+
 MANDIR  = /usr/local/man/man8/
 
 
@@ -48,7 +52,8 @@ QCFLAGS     = -O -g -pg -ansi
 
 LGSL        = -L$(PATH_GSL)lib -lgsl -lgslcblas 
 LFLAGS	    = -lm -L$(PLUGINDIR)/$(ARCH)/molfile $(PLUGINDIR)/$(ARCH)/molfile/libmolfile_plugin.a -lstdc++
-NETCDFFLAGS	= -lnetcdf
+NETCDFFLAGS	= 
+#-lnetcdf
 
 #
 #------------------------------------------------------------
@@ -180,6 +185,7 @@ install:
 	cp $(PATH_BIN)$(DPOCKET) $(BINDIR)
 	cp $(PATH_BIN)$(MDPOCKET) $(BINDIR)
 	cp $(PATH_MAN)* $(MANDIR)
+	cp $(PATH_LIB)* $(LIBDIR)
 
 check:
 	./$(PATH_BIN)$(CHECK)

plugins/LINUXAMD64/molfile/libmolfile_plugin.h

@@ -207,6 +207,9 @@ extern int molfile_maeffplugin_fini(void);
 extern int molfile_orcaplugin_init(void);
 extern int molfile_orcaplugin_register(void *, vmdplugin_register_cb);
 extern int molfile_orcaplugin_fini(void);
+extern int molfile_qcschemaplugin_init(void);
+extern int molfile_qcschemaplugin_register(void *, vmdplugin_register_cb);
+extern int molfile_qcschemaplugin_fini(void);
 
 #define MOLFILE_INIT_ALL \
     molfile_abinitplugin_init(); \
@@ -276,6 +279,7 @@ extern int molfile_orcaplugin_fini(void);
     molfile_dtrplugin_init(); \
     molfile_maeffplugin_init(); \
     molfile_orcaplugin_init(); \
+    molfile_qcschemaplugin_init(); \
 
 #define MOLFILE_REGISTER_ALL(v, cb) \
     molfile_abinitplugin_register(v, cb); \
@@ -345,6 +349,7 @@ extern int molfile_orcaplugin_fini(void);
     molfile_dtrplugin_register(v, cb); \
     molfile_maeffplugin_register(v, cb); \
     molfile_orcaplugin_register(v, cb); \
+    molfile_qcschemaplugin_register(v, cb); \
 
 #define MOLFILE_FINI_ALL \
     molfile_abinitplugin_fini(); \
@@ -414,6 +419,7 @@ extern int molfile_orcaplugin_fini(void);
     molfile_dtrplugin_fini(); \
     molfile_maeffplugin_fini(); \
     molfile_orcaplugin_fini(); \
+    molfile_qcschemaplugin_fini(); \
 
 #ifdef __cplusplus
 }

plugins/MACOSXX86_64/molfile/libmolfile_plugin.h

@@ -204,6 +204,15 @@ extern int molfile_dtrplugin_fini(void);
 extern int molfile_maeffplugin_init(void);
 extern int molfile_maeffplugin_register(void *, vmdplugin_register_cb);
 extern int molfile_maeffplugin_fini(void);
+extern int molfile_netcdfplugin_init(void);
+extern int molfile_netcdfplugin_register(void *, vmdplugin_register_cb);
+extern int molfile_netcdfplugin_fini(void);
+extern int molfile_vtfplugin_init(void);
+extern int molfile_vtfplugin_register(void *, vmdplugin_register_cb);
+extern int molfile_vtfplugin_fini(void);
+extern int molfile_webpdbplugin_init(void);
+extern int molfile_webpdbplugin_register(void *, vmdplugin_register_cb);
+extern int molfile_webpdbplugin_fini(void);
 
 #define MOLFILE_INIT_ALL \
     molfile_abinitplugin_init(); \
@@ -272,6 +281,9 @@ extern int molfile_maeffplugin_fini(void);
     molfile_xyzplugin_init(); \
     molfile_dtrplugin_init(); \
     molfile_maeffplugin_init(); \
+    molfile_netcdfplugin_init(); \
+    molfile_vtfplugin_init(); \
+    molfile_webpdbplugin_init(); \
 
 #define MOLFILE_REGISTER_ALL(v, cb) \
     molfile_abinitplugin_register(v, cb); \
@@ -340,6 +352,9 @@ extern int molfile_maeffplugin_fini(void);
     molfile_xyzplugin_register(v, cb); \
     molfile_dtrplugin_register(v, cb); \
     molfile_maeffplugin_register(v, cb); \
+    molfile_netcdfplugin_register(v, cb); \
+    molfile_vtfplugin_register(v, cb); \
+    molfile_webpdbplugin_register(v, cb); \
 
 #define MOLFILE_FINI_ALL \
     molfile_abinitplugin_fini(); \
@@ -408,6 +423,9 @@ extern int molfile_maeffplugin_fini(void);
     molfile_xyzplugin_fini(); \
     molfile_dtrplugin_fini(); \
     molfile_maeffplugin_fini(); \
+    molfile_netcdfplugin_fini(); \
+    molfile_vtfplugin_fini(); \
+    molfile_webpdbplugin_fini(); \
 
 #ifdef __cplusplus
 }