OSDN Git Service

Bug fixed and rebuild: v2.3.1p0151
authorTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Sun, 7 Jun 2015 20:55:07 +0000 (05:55 +0900)
committerTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Sun, 7 Jun 2015 20:55:07 +0000 (05:55 +0900)
lmrcImageCopy

45 files changed:
.Source [deleted file]
.Source.org [deleted file]
bin/mrcImage3DPeakGet [new symlink]
bin/mrcImageSNEstimate [new symlink]
bin/wish/Display2/tclIndex
include/dmFile.h
include/eosBayes.h [new file with mode: 0644]
include/lmrcImageRadialDistribution.h
src/Objects/DataManip/dmFile/doc/dmFile.html
src/Objects/DataManip/mrcImage/src/mrcImageCopy.c
src/Objects/DataManip/pdbFile/src/pdbUtil.c
src/Objects/General/.Source
src/Objects/General/.Source.org
src/Objects/General/Makefile [changed mode: 0644->0755]
src/Objects/General/eosBayes/.Source [new file with mode: 0644]
src/Objects/General/eosBayes/.Source.org [new file with mode: 0644]
src/Objects/General/eosBayes/src/.CCHeader
src/Objects/General/eosBayes/src/.CHeader
src/Objects/General/eosBayes/src/.Ruby
src/Objects/General/eosBayes/src/.Wish
src/Objects/Makefile [changed mode: 0644->0755]
src/Tools/.Source
src/Tools/.Source.org
src/Tools/Cluster/.Source [deleted file]
src/Tools/Coord/.Source [deleted file]
src/Tools/DCDFile/.Source [deleted file]
src/Tools/DataManip/.Source.org [new file with mode: 0644]
src/Tools/DataManip/Makefile [new file with mode: 0755]
src/Tools/Makefile [changed from symlink to file mode: 0755]
src/Tools/mrcImage/mrcImage3DPeakGet/src/mrcImage3DPeakGet.html [new file with mode: 0644]
src/Tools/mrcImage/mrcImageAutoCorrelationWithWindowing/src/mrcImageAutoCorrelationWithWindowing.html
src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
src/Tools/mrcImage/mrcImageSNEstimate/src/mrcImageSNEstimate.html [new file with mode: 0644]
src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.c
src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html
src/Tools/pdbUtil/pdb2mrc2d/src/test/Makefile
src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.c
src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html
src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/test/Makefile
src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html
src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html
src/Tools/pdbUtil/pdbMove/src/pdbMove.html
src/Tools/pdbUtil/pdbRhoFit/src/pdbRhoFit.html
src/Tools/pdbUtil/pdbRhoFitTm/src/pdbRhoFitTm.html
src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html

diff --git a/.Source b/.Source
deleted file mode 100644 (file)
index f0531e1..0000000
--- a/.Source
+++ /dev/null
@@ -1,22 +0,0 @@
-SOURCE=\
-Integration \
-PrevReleased \
-backup \
-bin \
-data \
-database \
-distribute \
-env \
-hostdepend \
-include \
-lib \
-optional \
-others \
-others2 \
-pione \
-sbin \
-src \
-tutorial \
-util \
-zephyr \
-#LastSource
diff --git a/.Source.org b/.Source.org
deleted file mode 100644 (file)
index f0531e1..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-SOURCE=\
-Integration \
-PrevReleased \
-backup \
-bin \
-data \
-database \
-distribute \
-env \
-hostdepend \
-include \
-lib \
-optional \
-others \
-others2 \
-pione \
-sbin \
-src \
-tutorial \
-util \
-zephyr \
-#LastSource
diff --git a/bin/mrcImage3DPeakGet b/bin/mrcImage3DPeakGet
new file mode 120000 (symlink)
index 0000000..eddb955
--- /dev/null
@@ -0,0 +1 @@
+../sbin/MachineIndependent
\ No newline at end of file
diff --git a/bin/mrcImageSNEstimate b/bin/mrcImageSNEstimate
new file mode 120000 (symlink)
index 0000000..eddb955
--- /dev/null
@@ -0,0 +1 @@
+../sbin/MachineIndependent
\ No newline at end of file
index 8fd9302..75a715a 100644 (file)
@@ -49,7 +49,6 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR
 set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
-set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
 set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
@@ -132,3 +131,4 @@ set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
 set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
+set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
index c68ef96..e17a707 100644 (file)
@@ -135,6 +135,7 @@ typedef struct dmFile3Tag {
        char           seperator[4];
        dmFileInteger4 ninfo; 
        dmFileInteger4* info; 
+       long            pValue; // Offset       
        void*           value;  // Array or value 
        void**          value2; // Struct
        void**          value3; // Array of Struct
@@ -151,6 +152,7 @@ typedef struct dmFile4Tag {
        char           seperator[4];
        dmFileInteger8 ninfo; 
        dmFileInteger8* info; 
+       long            pValue;
        void*           value;  // Array or value 
        void**          value2; // Struct
        void**          value3; // Array of Struct
diff --git a/include/eosBayes.h b/include/eosBayes.h
new file mode 100644 (file)
index 0000000..868174e
--- /dev/null
@@ -0,0 +1,23 @@
+#ifndef EOS_BAYES_H
+#define EOS_BAYES_H
+
+typedef struct eosBayesDistribution {
+       float min;
+       float max;
+       float delta;
+       int   n;
+       float* prob;
+} eosBayesDistribution;
+
+typedef struct eosBayes {
+       int numDistribution;
+       eosBayesDistribution* prior;
+       eosBayesDistribution* posterior;
+
+       int numLikelihood;
+       eosBayesDistribution* likelihood;
+} eosBayes;
+
+
+#endif /* EOS_BAYES_H */
index 488a225..e064b5b 100644 (file)
@@ -20,6 +20,9 @@ typedef struct lmrcImageRadialDistributionInfo {
        float Cx;
        float Cy;
        int flagAverage;
+       int flagAzimuth;
+       int NAzimuth;
+       floatVector* azimuth;
 } lmrcImageRadialDistributionInfo;
 /* struct end */
 
index 95ecc93..55640e7 100644 (file)
@@ -146,6 +146,7 @@ typedef struct dmFile3Tag {
        char           seperator[4];
        dmFileInteger4 ninfo; 
        dmFileInteger4* info; 
+       long            pValue; // Offset       
        void*           value;  // Array or value 
        void**          value2; // Struct
        void**          value3; // Array of Struct
@@ -162,6 +163,7 @@ typedef struct dmFile4Tag {
        char           seperator[4];
        dmFileInteger8 ninfo; 
        dmFileInteger8* info; 
+       long            pValue;
        void*           value;  // Array or value 
        void**          value2; // Struct
        void**          value3; // Array of Struct
index c8a4e15..f708652 100755 (executable)
@@ -12,6 +12,8 @@
 static char __sccs_id[] = "@(#)mrcImageCopy ver1.1; Date:96/05/08 @(#)";
 #include <math.h>
 #include <stdlib.h>
+#define DEBUG
+#include "genUtil.h"
 #include "../inc/mrcImage.h"
 
 void
@@ -22,14 +24,17 @@ lmrcImageCopy(mrcImage* dst, mrcImage* src, mrcImageParaTypeRealCoord to)
        mrcImageParaTypeInteger x, y, z;
        int k;
 
-    for(iz=0; iz<dst->HeaderN.z; iz++) {
-    for(iy=0; iy<dst->HeaderN.y; iy++) {
-    for(ix=0; ix<dst->HeaderN.x; ix++) {
-               x = (int)(ix - to.x + 0.5);
-               y = (int)(iy - to.y + 0.5);
-               z = (int)(iz - to.z + 0.5);
-       mrcPixelDataGet(src, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
-        mrcPixelDataSet(dst, ix, iy, iz, data, mrcPixelRePart);
+       DEBUGPRINT3("to: %g %g %g in lmrcImageCopy\n", to.x, to.y, to.z);
+       DEBUGPRINT3("src: %d %d %d in lmrcImageCopy\n", src->HeaderN.x, src->HeaderN.y, src->HeaderN.z);
+       DEBUGPRINT3("dst: %d %d %d in lmrcImageCopy\n", dst->HeaderN.x, dst->HeaderN.y, dst->HeaderN.z);
+    for(iz=0; iz<src->HeaderN.z; iz++) {
+    for(iy=0; iy<src->HeaderN.y; iy++) {
+    for(ix=0; ix<src->HeaderN.x; ix++) {
+               x = (int)(ix + to.x + 0.5);
+               y = (int)(iy + to.y + 0.5);
+               z = (int)(iz + to.z + 0.5);
+       mrcPixelDataGet(src, ix, iy, iz, &data, mrcPixelRePart, mrcPixelHowNearest);
+        mrcPixelDataSet(dst,  x,  y,  z, data,  mrcPixelRePart);
     }
     }
     }
index ffe9cfd..043583f 100755 (executable)
@@ -610,29 +610,57 @@ pdbRecordIsNearby(pdbRecord record1,pdbRecord record2)
 pdbFileParaTypeInteger
 pdbZValueGet(pdbFile* pdb)
 {
-       if(                                       pdb->PDB->AtomName[1] == 'H') {
-               return 1;
-       } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'C') {
-               return 6;
-       } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'N') {
-               return 7;
-       } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'O') {
-               return 8;
-       } else if(pdb->PDB->AtomName[0] == 'M' && pdb->PDB->AtomName[1] == 'G') {
-               return 12;
-       } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'P') {
-               return 15;
-       } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'S') {
-               return 16;
+    if(       pdb->PDB->Footnote[6] == ' ' && pdb->PDB->Footnote[7] == 'H') {
+        return 1;
+    } else if(pdb->PDB->Footnote[6] == ' ' && pdb->PDB->Footnote[7] == 'C') {
+        return 6;
+    } else if(pdb->PDB->Footnote[6] == ' ' && pdb->PDB->Footnote[7] == 'N') {
+        return 7;
+    } else if(pdb->PDB->Footnote[6] == ' ' && pdb->PDB->Footnote[7] == 'O') {
+        return 8;
+    } else if(pdb->PDB->Footnote[6] == 'N' && pdb->PDB->Footnote[7] == 'A') {
+        return 11;
+    } else if(pdb->PDB->Footnote[6] == 'M' && pdb->PDB->Footnote[7] == 'G') {
+        return 12;
+    } else if(pdb->PDB->Footnote[6] == ' ' && pdb->PDB->Footnote[7] == 'P') {
+        return 15;
+    } else if(pdb->PDB->Footnote[6] == ' ' && pdb->PDB->Footnote[7] == 'S') {
+        return 16;
+    } else if(pdb->PDB->Footnote[6] == 'C' && pdb->PDB->Footnote[7] == 'L') {
+        return 17;
+    } else if(pdb->PDB->Footnote[6] == ' ' && pdb->PDB->Footnote[7] == 'K') {
+        return 19;
+    } else if(pdb->PDB->Footnote[6] == 'C' && pdb->PDB->Footnote[7] == 'A') {
+        return 20;
+    } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'H') {
+        return 1;
+    } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'C') {
+        return 6;
+    } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'N') {
+        return 7;
+    } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'O') {
+        return 8;
+    } else if(pdb->PDB->AtomName[0] == 'N' && pdb->PDB->AtomName[1] == 'A') {
+        return 11;
+    } else if(pdb->PDB->AtomName[0] == 'M' && pdb->PDB->AtomName[1] == 'G') {
+        return 12;
+    } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'P') {
+        return 15;
+    } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'S') {
+        return 16;
        } else if(pdb->PDB->AtomName[0] == 'C' && pdb->PDB->AtomName[1] == 'L') {
                return 17;
-       } else if(pdb->PDB->AtomName[0] == 'C' && pdb->PDB->AtomName[1] == 'A') {
-               return 20;
+    } else if(pdb->PDB->AtomName[0] == ' ' && pdb->PDB->AtomName[1] == 'K') {
+        return 19;
+    } else if(pdb->PDB->AtomName[0] == 'C' && pdb->PDB->AtomName[1] == 'A') {
+        return 20;
        } else if(pdb->PDB->AtomName[0] == 'F' && pdb->PDB->AtomName[1] == 'E') {
                return 26;
-       } else {
-               fprintf(stderr, "Not supported element: %c%c to Carbon\n", pdb->PDB->AtomName[0], pdb->PDB->AtomName[1]);
-               return 6;
-       }
+    } else {
+        fprintf(stderr, "Not supported element: %c%c\n", pdb->PDB->Footnote[6], pdb->PDB->Footnote[7]);
+        fprintf(stderr, "Not supported element: %c%c\n", pdb->PDB->AtomName[0], pdb->PDB->AtomName[1]);
+        return 6;
+    }
+    return 6;
 }
 
index 566c712..a4507ac 100644 (file)
@@ -17,6 +17,7 @@ SpecialNumber \
 String \
 Vector \
 dummy \
+eosBayes \
 eosCuda \
 eosFunc \
 eosList \
index 566c712..a4507ac 100644 (file)
@@ -17,6 +17,7 @@ SpecialNumber \
 String \
 Vector \
 dummy \
+eosBayes \
 eosCuda \
 eosFunc \
 eosList \
old mode 100644 (file)
new mode 100755 (executable)
diff --git a/src/Objects/General/eosBayes/.Source b/src/Objects/General/eosBayes/.Source
new file mode 100644 (file)
index 0000000..4d801af
--- /dev/null
@@ -0,0 +1,5 @@
+SOURCE=\
+doc \
+inc \
+src \
+#LastSource
diff --git a/src/Objects/General/eosBayes/.Source.org b/src/Objects/General/eosBayes/.Source.org
new file mode 100644 (file)
index 0000000..4d801af
--- /dev/null
@@ -0,0 +1,5 @@
+SOURCE=\
+doc \
+inc \
+src \
+#LastSource
old mode 100644 (file)
new mode 100755 (executable)
index aa63bda..d72659a 100644 (file)
@@ -2,6 +2,7 @@ SOURCE=\
 Cluster \
 Coord \
 DCDFile \
+DataManip \
 Integration \
 admin \
 array \
index d72659a..aa63bda 100644 (file)
@@ -2,7 +2,6 @@ SOURCE=\
 Cluster \
 Coord \
 DCDFile \
-DataManip \
 Integration \
 admin \
 array \
diff --git a/src/Tools/Cluster/.Source b/src/Tools/Cluster/.Source
deleted file mode 100644 (file)
index adb2d4f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCE=\
-clusterLog2ToLog \
-clusterLogASCII2Binary \
-clusterShow \
-#LastSource
diff --git a/src/Tools/Coord/.Source b/src/Tools/Coord/.Source
deleted file mode 100644 (file)
index bf35bd2..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCE=\
-coordRotation \
-pointsSetToPDB \
-#LastSource
diff --git a/src/Tools/DCDFile/.Source b/src/Tools/DCDFile/.Source
deleted file mode 100644 (file)
index 292d3b3..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-SOURCE=\
-dcdAtomChangeDistanceFromAtom \
-dcdAtomDistanceDistribution \
-dcdCompareCA \
-dcdDistanceAtomBetweenAtom \
-dcdFilePrint \
-dcdInfo \
-dcdSelectAtoms \
-dcdSerectAtom \
-dcdTimeSeriesBehavior \
-#LastSource
diff --git a/src/Tools/DataManip/.Source.org b/src/Tools/DataManip/.Source.org
new file mode 100644 (file)
index 0000000..f3caea9
--- /dev/null
@@ -0,0 +1,4 @@
+SOURCE=\
+bmp2mrc \
+dm \
+#LastSource
diff --git a/src/Tools/DataManip/Makefile b/src/Tools/DataManip/Makefile
new file mode 100755 (executable)
index 0000000..6c348f0
--- /dev/null
@@ -0,0 +1,119 @@
+include ../../Config/Define.inc
+include ../Config/Define.inc
+include Config/Define.inc
+include .Source
+
+all:
+       for dir in ${SOURCE} ; \
+       do \
+               if [ -d $${dir} ] ; then \
+                       $(CD) $${dir}; make all; $(CD) ..; \
+               fi \
+       done
+
+install:
+       for dir in ${SOURCE} ; \
+       do \
+               if [ -d $${dir} ] ; then \
+                       $(CD) $${dir}; make install; $(CD) ..; \
+               fi \
+       done
+
+put:
+       for dir in ${SOURCE} ; \
+       do \
+               if [ -d $${dir} ] ; then \
+                       $(CD) $${dir}; make put; $(CD) ..; \
+               fi \
+       done
+
+putSF:
+       if [ -f private ] ; then \
+               echo "$(WORLDNAME)/$(CLASSNAME) is private " ; \
+       else \
+               for dir in ${SOURCE} ; \
+               do \
+                       if [ -d $${dir} ] ; then \
+                               $(CD) $${dir}; make putSF; $(CD) ..; \
+                       fi \
+               done \
+       fi
+
+clean:
+       for dir in ${SOURCE} ; \
+       do \
+               $(CD) $${dir}; make clean; $(CD) ..; \
+       done
+
+check:
+       @for dir in ${SOURCE} ; do \
+               if [ -d $${dir} ] ; then \
+                       $(CD) $${dir}; \
+                       echo  $${dir}; \
+                       $(RM) Makefile; \
+                       $(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/Makefile Makefile ; \
+                       make check; \
+                       $(CD) ..; \
+               fi \
+       done
+
+update:
+       @for dir in ${SOURCE} ; do \
+               if [ -d $${dir} ] ; then \
+                       $(CD) $${dir}; \
+                       echo  $${dir}; \
+                       $(RM) Makefile; \
+                       $(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/Makefile Makefile ; \
+                       make update; \
+                       $(CD) ..; \
+               fi \
+       done
+
+depend: check
+       @for dir in ${SOURCE} ; \
+       do \
+               $(CD) $${dir}; make depend; $(CD) ..; \
+       done
+
+backup: 
+       cd ../../..; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
+       tar uvf ${EOS_HOME}/backup/EosBase.tar .[A-z]*
+       @for dir in ${SOURCE} ; \
+       do \
+               $(CD) $${dir}; make backup; $(CD) ..; \
+       done
+
+backup-all: 
+       cd ../../..; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
+       tar rvf ${EOS_HOME}/backup/EosBase.tar .[A-z]*
+       @for dir in ${SOURCE} ; \
+       do \
+               $(CD) $${dir}; make backup; $(CD) ..; \
+       done
+
+distribute: 
+       cd ../../..; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
+       @for dir in ${SOURCE} ; \
+       do \
+               $(CD) $${dir}; make distribute; $(CD) ..; \
+       done
+
+distribute-all: 
+       cd ../../..; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
+       @for dir in ${SOURCE} ; \
+       do \
+               $(CD) $${dir}; make distribute-all; $(CD) ..; \
+       done
+
deleted file mode 120000 (symlink)
index 80a2401a7dc3d8e1cdc121c22208bd28b6887cf3..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-/Users/tacyas/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..ad841104b1b4aa83ce554496adb2d2476544f988
--- /dev/null
@@ -0,0 +1,5 @@
+include ../Config/Define.inc
+include Config/Define.inc
+include .Source
+
+include Config/Target.inc
diff --git a/src/Tools/mrcImage/mrcImage3DPeakGet/src/mrcImage3DPeakGet.html b/src/Tools/mrcImage/mrcImage3DPeakGet/src/mrcImage3DPeakGet.html
new file mode 100644 (file)
index 0000000..ea2d12f
--- /dev/null
@@ -0,0 +1,19 @@
+<HTML>
+<HEAD>
+<TITLE>mrcImage3DPeakGet</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImage3DPeakGet</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImage3DPeakGet
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input:3D
+    [-I[nformation]      Info                (stdin     ).as(inFile::ASCII       ) ] :Optional  :Input:ROI Info
+    [-o[utput]           Out                 (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output:Positon
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index fd15c45..e67c823 100755 (executable)
@@ -8,9 +8,10 @@
 <PRE>
 Usage: mrcImageAutoCorrelationWithWindowing
 Options:
-    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
-    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
-    [-O[utput]           OutWin              (NULL      ).as(outFile             ) ] :Optional  :Output WindowedFile
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input
+    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output
+    [-o[utput]c[entre]   OutCentre           (NULL      ).as(outFile::mrcImage   ) ] :Optional  :OutputDataFile
+    [-O[utput]           OutWin              (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output WindowedFile
     [-W[indowing]y       Wy                  (6         ).as(Real                ) ] :Optional  :Window Height: N.y * 1/Wy
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
index e6c803e..448885e 100755 (executable)
@@ -10,7 +10,7 @@ Usage: mrcImageDensityInfo
 Options:
     [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
     [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Optional  :OutputDataFile
-    [-C[ontour]          Contour             (10        ).as(Real                ) ] :Optional  :ContourLevel: 10 6.950489e-310ach
+    [-C[ontour]          Contour             (10        ).as(Real                ) ] :Optional  :ContourLevel: 10 5.533535e-322ach
     [-log                Log                 (NULL      ).as(appendFile          ) ] :Optional  :OutputDataFile
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
diff --git a/src/Tools/mrcImage/mrcImageSNEstimate/src/mrcImageSNEstimate.html b/src/Tools/mrcImage/mrcImageSNEstimate/src/mrcImageSNEstimate.html
new file mode 100644 (file)
index 0000000..d96efba
--- /dev/null
@@ -0,0 +1 @@
+/bin/bash: mrcImageSNEstimate: No such file or directory
index 80ce6bb..9936a7e 100755 (executable)
@@ -150,6 +150,15 @@ main(int argc, char* argv[])
                                                          (info.mode&HowToCreateImageBit));
                        for(iy=0; iy < info.rotny; iy+= droty) {
                                DEBUGPRINT2("%g %g\n", ix, iy);
+
+#ifdef DEBUG
+                               {
+                                       pdbFileTop(&pdb);
+                                       pdbFileNextAtom(&pdb);
+                                       DEBUGPRINT3("(x, y, z)=(%g, %g %g)\n", pdb.PDB->Coord.x, pdb.PDB->Coord.y, pdb.PDB->Coord.z);
+                               }
+#endif
+
                                if(!info.flagRotMode) {
                                        roty = ((double)iy)/info.rotny*2.0*M_PI; 
                                        pdbRotationZXY(&pdb, rotx, -roty, -rotz); 
@@ -158,8 +167,26 @@ main(int argc, char* argv[])
                                        pdbRotationFollowingEulerAngle(&pdb, info.RotMode, -roty, rotx, -rotz); 
                                }
 
+#ifdef DEBUG
+                               {
+                                       pdbFileTop(&pdb);
+                                       pdbFileNextAtom(&pdb);
+                                       DEBUGPRINT3("(x, y, z)=(%g, %g %g)\n", pdb.PDB->Coord.x, pdb.PDB->Coord.y, pdb.PDB->Coord.z);
+                               }
+#endif
+
                                DEBUGPRINT3("rot: (%g %g %g) \n", rotx*DEGREE, roty*DEGREE, rotz*DEGREE);
+
                        lpdb2mrc2d(&mrc, &pdb,  &linfo, 'z', 0);
+#ifdef DEBUG
+                               {
+                                       char s[1024];
+       
+                                       sprintf(s, "/tmp/test.mrc.%03d", (int)zsection);
+                                       
+                                       mrcFileWrite(&mrc, s, "tmp", 0);
+                               }
+#endif
 
                                if(!info.flagRotMode) {
                                        pdbRotationYXZ(&pdb, -rotx, roty, rotz);
@@ -174,7 +201,15 @@ main(int argc, char* argv[])
                                        to.y = fmod(to.y*info.ny, out.HeaderN.y); 
                                        DEBUGPRINT2("map %f %f\n", to.x, to.y);
                                        to.z = 0.0;
+                                       DEBUGPRINT3("to: %f %f %f\n", to.x, to.y, to.z);
                                        lmrcImageCopy(&out, &mrc, to);
+#ifdef DEBUG
+                               {
+                                       char s[1024];
+                                       sprintf(s, "/tmp/test.2d.%03d", (int)zsection);
+                                       mrcFileWrite(&out, s, "tmp", 0);
+                               }
+#endif
                                } 
                                if(info.flagOut3D) {
                                        to.x = 0.0;
@@ -188,6 +223,7 @@ main(int argc, char* argv[])
                                        out3D.Tailer[(int)zsection].Cont.Rot1 = -roty; 
                                        out3D.Tailer[(int)zsection].Cont.Rot2 =  rotx; 
                                        out3D.Tailer[(int)zsection].Cont.Rot3 = -rotz; 
+                                       DEBUGPRINT3("to: %f %f %f\n", to.x, to.y, to.z);
                                        lmrcImageCopy(&out3D, &mrc, to);        
                                        zsection += 1.0;
                                }
index fe13c09..0a6bc3e 100755 (executable)
@@ -36,6 +36,7 @@ Options:
     [-w[eight]           Weight              (1.0       ).as(Real                ) ] :Optional  :weight
     [-sig[ma]            Sigma               (0.0       ).as(Real                ) ] :Optional  :Sigma[A]:Atom radius
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-cuda               cudaDeviceID        (0         ).as(Integer             ) ] :Optional  :UseCuda
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode: 0 Merc; 1: Earth
 ----- Attention1 -----
 If both of -s and -startEA, first -s and second -startEA will be performed
index 1a1e427..4eceb79 100755 (executable)
@@ -16,7 +16,12 @@ exec:
 
 exec2:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME)  -i data/121p.shift.pdb -o data/121p.mrc2d2 -O data/121p.mrc2dStack2 -s -32 -32 -n 32 32 -d 2 2 -Rot 12 12 -m 1 -sig 3 
+       ../$(OSTYPE)/$(OBJECTNAME)  -i data/121p.shift.pdb -o data/121p.mrc2d2 -O data/121p.mrc2dStack2 -s -32 -32 -n 32 32 -d 2 2 -Rot 12 12 -m 3 -sig 3 
+       @echo "----- Calc check -----"          
+
+exec3:
+       @echo "----- Execution Check -----"
+       ../$(OSTYPE)/$(OBJECTNAME)  -i data/121p.shift.pdb -o data/121p.mrc2d3 -O data/121p.mrc2dStack3 -s -32 -32 -n 32 32 -d 2 2 -Rot 4 4 -m 3 -sig 3 
        @echo "----- Calc check -----"          
 
 clean:
index 9f663eb..1cde100 100755 (executable)
@@ -89,6 +89,7 @@ additionalUsage()
  * * pdbZValueGet
  * *  return value: Atomic Mass of the current atom
 */
+/*
 int
 pdbZValueGet(pdbRecord* current)
 {
@@ -139,7 +140,7 @@ pdbZValueGet(pdbRecord* current)
        }
        return 1;
 }
-
+*/
 void
 lpdb2mrc2dWithCTF(mrcImage* out, pdbFile* pdb, lpdb2mrc2dWithCTFInfo* linfo, ctfInfo* ctf, int mode)
 {
@@ -189,7 +190,7 @@ lpdb2mrc2dWithCTF(mrcImage* out, pdbFile* pdb, lpdb2mrc2dWithCTFInfo* linfo, ctf
                        if(i%100==0) {  
                                fprintf(stderr, "%d\n", i);
                        }
-                       Z  = pdbZValueGet(pdb->PDB);
+                       Z  = pdbZValueGet(pdb);
                        R  = aH *pow(Z, -1.0/3.0);
 
                        mrcInit(&sub, NULL);
@@ -241,4 +242,3 @@ lpdb2mrc2dWithCTF(mrcImage* out, pdbFile* pdb, lpdb2mrc2dWithCTFInfo* linfo, ctf
                }
        }
 }
-
index d900bbd..a5c6d70 100755 (executable)
@@ -1 +1,37 @@
-/bin/bash: pdb2mrc2dWithCTF: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>pdb2mrc2dWithCTF</TITLE>
+</HEAD>
+<BODY>
+<H1>pdb2mrc2dWithCTF</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdb2mrc2dWithCTF
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input: PDB
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output: MRC
+    [-N                  Nx                  (2048      ).as(Integer             ) 
+                         Ny                  (2048      ).as(Integer             ) ] :Optional  :Input: Nx Ny [pixel]
+    [-d                  dx                  (1.72      ).as(Real                ) 
+                         dy                  (1.72      ).as(Real                ) ] :Optional  :Input: dx dy [A]
+    [-Centre             cx                  (0         ).as(Real                ) 
+                         cy                  (0         ).as(Real                ) 
+                         cz                  (0         ).as(Real                ) ] :Optional  :Input: CentreX CentreY [A]
+    [-n                  nx                  (64        ).as(Integer             ) 
+                         ny                  (64        ).as(Integer             ) ] :Optional  :Input: nx ny for subimage [pixel]
+    [-kV                 kV                  (200.      ).as(Real                ) ] :Optional  :kV 
+    [-Cs                 Cs                  (1.7       ).as(Real                ) ] :Optional  :Cs 
+    [-d[e]f[ocus]        Defocus             (10000     ).as(Real                ) ] :Optional  :Defocus [A] at z = 0
+    [-A[overP]           AoverP              (0.07      ).as(Real                ) ] :Optional  :AoverP
+    [-Ain                Ain                 (0.2       ).as(Real                ) ] :Optional  :Beta: IlluminationAngle [mrad]
+    [-ctfMode            ctfMode             (33        ).as(Integer             ) ] :Optional  :ctfMode
+    [-E[uler]A[ngle]     EulerAngle          (XEYS      ).as(String              ) 
+                         Rot1                (0         ).as(Real                ) 
+                         Rot2                (0         ).as(Real                ) 
+                         Rot3                (0         ).as(Real                ) ] :Optional  :EulerAngle: [degree]
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index 323c2db..7127a0e 100755 (executable)
@@ -11,7 +11,7 @@ help:
 
 exec:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME) 
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.pdb -o data/121p.mrc
        @echo "----- Calc check -----"          
 
 clean:
index 076ce13..24999d3 100755 (executable)
@@ -1 +1,36 @@
-/bin/bash: pdbCrystalCreate: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>pdbCrystalCreate</TITLE>
+</HEAD>
+<BODY>
+<H1>pdbCrystalCreate</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdbCrystalCreate
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input:PDB
+    [-I[nfo]             Info                (NULL      ).as(inFile              ) ] :Essential :Input:Crystal Information
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output:PDB
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+----- CrystalInfo -----
+aAxis       %15.6g %15.6g %15.6g
+bAxis       %15.6g %15.6g %15.6g
+cAxis       %15.6g %15.6g %15.6g
+CellLength  %15.6g %15.6g %15.6g
+Origin      %15.6g %15.6g %15.6g
+N           %15d %15d %15d
+StartN      %15d %15d %15d
+SpaceGroup  %15d
+HelixInfo   %10d %10d %10d
+### Attention ###
+Parameter Order is important: Dependent between CellLength and a|b|cAxis.
+                              Because each of aAxis, bAxis, cAxis must be a unit vector.
+HelixInfo   t  u  n
+----- CrystalSpaceGroup -----
+    0 P1
+    1 HelicalSymmmetry
+</PRE>
+</BODY>
+</HTML>
index 0ec5a3f..5da8fe6 100755 (executable)
@@ -1 +1,37 @@
-/bin/bash: pdbHelix: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>pdbHelix</TITLE>
+</HEAD>
+<BODY>
+<H1>pdbHelix</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdbHelix
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-3[D]               Out3D               (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile(3D-mrc)
+    [-2[D]               Out2D               (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile(2D-mrc projection(y-z))
+    [-d[elta]            delta               (5         ).as(Real                ) ] :Optional  :delta[A](mrc-file)
+    [-p[delphi]          delphi              (165       ).as(Real                ) ] :Essential :deltaPhi
+    [-dp[delphi]         deldelphi           (5         ).as(Real                ) ] :Optional  :deltaDeltaPhi
+    [-z[deltaz]          delz                (5         ).as(Real                ) ] :Essential :deltaz
+    [-n[Molecule]        nMolecule           (1         ).as(Integer             ) ] :Essential :NumberOfMolecules
+    [-nx                 nx                  (1         ).as(Integer             ) ] :Optional  :Pixel[Def:]
+    [-ny                 ny                  (1         ).as(Integer             ) ] :Optional  :Pixel[Def:]
+    [-nz                 nz                  (1         ).as(Integer             ) ] :Optional  :Pixel[Def:]
+    [-Sx[tart]           Startx              (0.0       ).as(Real                ) ] :Optional  :Startx[A]
+    [-Sy[tart]           Starty              (0.0       ).as(Real                ) ] :Optional  :Starty[A]
+    [-Sz[tart]           Startz              (0.0       ).as(Real                ) ] :Optional  :Startz[A]
+    [-w[eight]           Weight              (1.0       ).as(Real                ) ] :Optional  :Weight
+    [-dx                 dx                  (2.5       ).as(Real                ) ] :Optional  :dx
+    [-dy                 dy                  (2.5       ).as(Real                ) ] :Optional  :dy
+    [-dz                 dz                  (2.5       ).as(Real                ) ] :Optional  :dz
+    [-startn             startn              (0         ).as(Integer             ) ] :Optional  :start molecule's index
+    [-startC             startID             (A         ).as(Character           ) ] :Optional  :start chain ID
+    [-deltaSeq           deltaSeq            (1000      ).as(Integer             ) ] :Optional  :start chain ID
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+</PRE>
+</BODY>
+</HTML>
index 9a2b54e..4b6f1f1 100755 (executable)
@@ -1 +1,28 @@
-/bin/bash: pdbMove: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>pdbMove</TITLE>
+</HEAD>
+<BODY>
+<H1>pdbMove</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdbMove
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-x                  X                   (0.0       ).as(Real                ) ] :Optional  :Move X[A]
+    [-y                  Y                   (0.0       ).as(Real                ) ] :Optional  :Move Y[A]
+    [-z                  Z                   (0.0       ).as(Real                ) ] :Optional  :Move Z[A]
+    [-originTo           toX                 (0.0       ).as(Real                ) 
+                         toY                 (0.0       ).as(Real                ) 
+                         toZ                 (0.0       ).as(Real                ) ] :Optional  :move (0,0,0) to (X,Y,Z)
+    [-toOrigin           fromX               (0.0       ).as(Real                ) 
+                         fromY               (0.0       ).as(Real                ) 
+                         fromZ               (0.0       ).as(Real                ) ] :Optional  :move (X,Y,Z) to (0,0,0)
+    [-GCtoOrigin                                                                   ] :Optional  :GC(Gravity Centre) to origin
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index 22baa00..9811048 100755 (executable)
@@ -1 +1,72 @@
-/bin/bash: pdbRhoFit: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>pdbRhoFit</TITLE>
+</HEAD>
+<BODY>
+<H1>pdbRhoFit</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdbRhoFit
+Options:
+    [-i[nput]pdb[File]   InPdb               (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-i[nput]mrc[File]   InMrc               (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput of ]mrc    OutMrc              (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-o[utput of ]txt    OutTxt              (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-o[utput of ]par    OutPar              (stdout    ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-o[utput of ]pdb    OutPDB              (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-xmin               xmin                (0         ).as(Real                ) ] :Optional  :xmin for fitting
+    [-xmax               xmax                (0         ).as(Real                ) ] :Optional  :xmax for fitting
+    [-xd[elta]           xDelta              (1         ).as(Real                ) ] :Optional  :delta x for fitting
+    [-ymin               ymin                (0         ).as(Real                ) ] :Optional  :ymin for fitting
+    [-ymax               ymax                (0         ).as(Real                ) ] :Optional  :ymax for fitting
+    [-yd[elta]           yDelta              (1         ).as(Real                ) ] :Optional  :delta y for fitting
+    [-zmin               zmin                (0         ).as(Real                ) ] :Optional  :zmin for fitting
+    [-zmax               zmax                (82        ).as(Real                ) ] :Optional  :zmax for fitting
+    [-zd[elta]           zDelta              (1         ).as(Real                ) ] :Optional  :delta z for fitting
+    [-E[uler]A[ngle]     EulerAngle          (ZOYS      ).as(String              ) ] :Optional  :Euler Angle for three-angle
+    [-phimin             phimin              (0         ).as(Real                ) ] :Optional  :phimin for fitting(degree)
+    [-phimax             phimax              (194       ).as(Real                ) ] :Optional  :phimax for fitting(degree)
+    [-phid[elta]         phiDelta            (2         ).as(Real                ) ] :Optional  :delta phi for fitting(degree)
+    [-psimin             psimin              (0         ).as(Real                ) ] :Optional  :psimin for fitting(degree)
+    [-psimax             psimax              (0         ).as(Real                ) ] :Optional  :psimax for fitting(degree)
+    [-psid[elta]         psiDelta            (2         ).as(Real                ) ] :Optional  :delta psi for fitting(degree)
+    [-thetamin           thetamin            (0         ).as(Real                ) ] :Optional  :thetamin for fitting(degree)
+    [-thetamax           thetamax            (0         ).as(Real                ) ] :Optional  :thetamax for fitting(degree)
+    [-thetad[elta]       thetaDelta          (2         ).as(Real                ) ] :Optional  :delta theta for fitting(degree)
+    [-n[ormalize]w[eight]normalizeWeight     (100000000.0).as(Real                ) ] :Optional  :weight for normalize
+    [-n[ormalize]C[ontour]normalizeContour    (0.0       ).as(Real                ) ] :Optional  :Contour Level for Normalize
+    [-I[nverse]                                                                    ] :Optional  :Black is High Density.
+    [-Zminus                                                                       ] :Optional  :Shift to -z
+    [-Tfactor                                                                      ] :Optional  :Consider T factor
+    [-T[ factor ]lim[it] Tlim                (60        ).as(Real                ) ] :Optional  :The atom will be neglected
+    [-Centre                                                                       ] :Optional  :Filament-axis is x=0, y=0
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-C[ontour]          contourLevel        (0.0       ).as(Real                ) ... ] :Variable  :ContourLevel
+
+
+Usage of pdbRhoFit:
+    -ipdb   : Filename of pdb file of atomic model
+    -imrc   : Filename of mrc file of contour map
+    -omrc   : Filename of mrc file of fitting results
+    -otxt   : Filename of text file of fitting results
+    -opar   : Filename of text file of fitting results
+    -opdb   : Filename of pdb file with a max score after fitting results
+    -zmin   : Initial value of z (should <= zmax)
+    -zmax   : Final value of z
+    -zd     : Delta z for fitting (should >0)
+    -phimin : Initial value of phi (should <= phimax; initial value of phi is 0)
+    -phimax : Final value of phi (should >0)
+    -phid   : Delta phi for fitting (should >0)
+    -C      : Contour level (variable and MUST be last option)
+    -Inverse: Protein has high density on the image
+    -Zminus : Atomic model shift to -z while fitting
+    -Tfactor: Consider temperature factor
+    -Tlim   : The atoms whose T factor is above Tlim will be neglected
+    -Centre : Filament-axis is x=0, y=0
+    -c      : Not used now
+    -m   0 : Count the atom number inside the contour.
+         1 : Add the densities of atoms.
+</PRE>
+</BODY>
+</HTML>
index a1c79f5..a0c20a4 100755 (executable)
@@ -1 +1,76 @@
-/bin/bash: pdbRhoFitTm: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>pdbRhoFitTm</TITLE>
+</HEAD>
+<BODY>
+<H1>pdbRhoFitTm</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdbRhoFitTm
+Options:
+    [-i[nput]pdb[File]   InPdb               (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-i[nput]mrc[File]   InMrc               (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput of ]mrc    OutMrc              (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-Sx                 Sx                  (50        ).as(Real                ) ] :Essential :x of rotation axis
+    [-Sy                 Sy                  (110       ).as(Real                ) ] :Essential :y of rotation axis
+    [-Sz                 Sz                  (110       ).as(Real                ) ] :Essential :z of rotation axis
+    [-o[utput of ]txt    OutTxt              (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-o[utput of ]pdb    OutPDB              (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-xmin               xmin                (0         ).as(Real                ) ] :Optional  :xmin for fitting
+    [-xmax               xmax                (0         ).as(Real                ) ] :Optional  :xmax for fitting
+    [-xd[elta]           xDelta              (1         ).as(Real                ) ] :Optional  :delta x for fitting
+    [-ymin               ymin                (0         ).as(Real                ) ] :Optional  :ymin for fitting
+    [-ymax               ymax                (0         ).as(Real                ) ] :Optional  :ymax for fitting
+    [-yd[elta]           yDelta              (1         ).as(Real                ) ] :Optional  :delta y for fitting
+    [-zmin               zmin                (0         ).as(Real                ) ] :Optional  :zmin for fitting
+    [-zmax               zmax                (82        ).as(Real                ) ] :Optional  :zmax for fitting
+    [-zd[elta]           zDelta              (1         ).as(Real                ) ] :Optional  :delta z for fitting
+    [-E[uler]A[ngle]     EulerAngle          (ZOYS      ).as(String              ) ] :Optional  :Euler Angle for three-angle
+    [-phimin             phimin              (0         ).as(Real                ) ] :Optional  :phimin for fitting(degree)
+    [-phimax             phimax              (194       ).as(Real                ) ] :Optional  :phimax for fitting(degree)
+    [-phid[elta]         phiDelta            (2         ).as(Real                ) ] :Optional  :delta phi for fitting(degree)
+    [-psimin             psimin              (0         ).as(Real                ) ] :Optional  :psimin for fitting(degree)
+    [-psimax             psimax              (0         ).as(Real                ) ] :Optional  :psimax for fitting(degree)
+    [-psid[elta]         psiDelta            (2         ).as(Real                ) ] :Optional  :delta psi for fitting(degree)
+    [-thetamin           thetamin            (0         ).as(Real                ) ] :Optional  :thetamin for fitting(degree)
+    [-thetamax           thetamax            (0         ).as(Real                ) ] :Optional  :thetamax for fitting(degree)
+    [-thetad[elta]       thetaDelta          (2         ).as(Real                ) ] :Optional  :delta theta for fitting(degree)
+    [-n[ormalize]w[eight]normalizeWeight     (100000000.0).as(Real                ) ] :Optional  :weight for normalize
+    [-n[ormalize]C[ontour]normalizeContour    (0.0       ).as(Real                ) ] :Optional  :Contour Level for Normalize
+    [-I[nverse]                                                                    ] :Optional  :Black is High Density.
+    [-Zminus                                                                       ] :Optional  :Shift to -z
+    [-Tfactor                                                                      ] :Optional  :Consider T factor
+    [-T[ factor ]lim[it] Tlim                (60        ).as(Real                ) ] :Optional  :The atom will be neglected
+    [-Centre                                                                       ] :Optional  :Filament-axis is x=0, y=0
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-C[ontour]          contourLevel        (0.0       ).as(Real                ) ... ] :Variable  :ContourLevel
+
+
+Usage of pdbRhoFitTm:
+    -ipdb   : Filename of pdb file of atomic model
+    -imrc   : Filename of mrc file of contour map
+    -omrc   : Filename of mrc file of fitting results
+    -otxt   : Filename of text file of fitting results
+    -opdb   : Filename of pdb file with a max score after fitting results
+    -zmin   : Initial value of z (should <= zmax)
+    -zmax   : Final value of z
+    -zd     : Delta z for fitting (should >0)
+    -phimin : Initial value of phi (should <= phimax; initial value of phi is 0)
+    -phimax : Final value of phi (should >0)
+    -phid   : Delta phi for fitting (should >0)
+    -C      : Contour level (variable and MUST be last option)
+    -Inverse: Protein has high density on the image
+    -Sx            : x of rotation axis
+    -Sy     : y of rotation axis
+    -Sz     : z of rotation axis
+    -Zminus : Atomic model shift to -z while fitting
+    -Tfactor: Consider temperature factor
+    -Tlim   : The atoms whose T factor is above Tlim will be neglected
+    -Centre : Filament-axis is x=0, y=0
+    -c      : Not used now
+    -m   0 : Count the atom number inside the contour.
+         1 : Add the densities of atoms.
+</PRE>
+</BODY>
+</HTML>
index 3b7dbb2..204e3c2 100755 (executable)
@@ -1 +1,30 @@
-/bin/bash: pdbTwoProteinFit: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>pdbTwoProteinFit</TITLE>
+</HEAD>
+<BODY>
+<H1>pdbTwoProteinFit</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdbTwoProteinFit
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-i[nput]res[idue]   InResidue           (NULL      ).as(inFile              ) ] :Optional  :ResidueInformationOfInputData
+    [-i[nput]sel[ectResidue]SelectIn            (NULL      ).as(outFile             ) ] :Optional  :Output: Selected residue of in after fitting
+    [-r[ef]              Ref                 (NULL      ).as(inFile              ) ] :Essential :ReferenceDataFile
+    [-r[ef]res[idue]     RefResidue          (NULL      ).as(inFile              ) ] :Optional  :ResidueInfomationOfReferenceData
+    [-r[ef]sel[ectResidue]SelectRef           (NULL      ).as(outFile             ) ] :Optional  :Output: Selected residue of after fitting
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-o[utput]Matrix     Matrix              (stdout    ).as(outFile             ) ] :Optional  :OutputMatrix
+    [-o[utput]Param      Param               (stdout    ).as(outFile             ) ] :Optional  :OutputParam
+    [-o[utput]Dis[tance] outDis              (stdout    ).as(outFile             ) ] :Optional  :Output: PDB Distance as Temp
+    [-o[utput]Dis[tance]2outDis2             (stdout    ).as(outFile             ) ] :Optional  :Output: Distance List for Ca
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+>>>> Input and Reference File Format<<<<
+ResidueNumberToBeFitted
+...
+If |, all residules are sellected till the residue in the next line
+</PRE>
+</BODY>
+</HTML>