Bug fixed:

	modified:   Makefile
	bug fixed:   mrcImageClusterAnalysis
	bug fixed:   pdbChargeFit

diff --git a/Makefile b/Makefile
index 4d6ec2a..9ae9653 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ EOS_GIT_REPOSITRY= git.sourceforge.jp:/gitroot/eos/base.git
 EOS_GIT_REPOSITRY_OPTIONAL= git.sourceforge.jp:/gitroot/eos/optional.git 
 EOS_GIT_REPOSITRY_TUTORIAL= git.sourceforge.jp:/gitroot/eos/tutorial.git 
 EOS_GIT_REPOSITRY_DATA= git.sourceforge.jp:/gitroot/eos/data.git 
-EOS_GIT_REPOSITRY_DATA= git.sourceforge.jp:/gitroot/eos/others.git 
+EOS_GIT_REPOSITRY_OTHERS= git.sourceforge.jp:/gitroot/eos/others.git 
 
 
 help::

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageClusterAnalysis b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageClusterAnalysis
index 83bdb37..4d5546f 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageClusterAnalysis and b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageClusterAnalysis differ

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/pdbChargeFit b/hostdepend/X86LINUX64/bin/X86LINUX64/pdbChargeFit
index 85ad983..9cc3eaf 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/pdbChargeFit and b/hostdepend/X86LINUX64/bin/X86LINUX64/pdbChargeFit differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
index ee5727e..76ccac9 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so
index e04dff7..e5e93b4 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so and b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libeosCuda.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libeosCuda.a
index b7b4a76..19552c7 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libeosCuda.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libeosCuda.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libeosCuda.so b/hostdepend/X86LINUX64/lib/X86LINUX64/libeosCuda.so
index aef5612..f3d5aa6 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libeosCuda.so and b/hostdepend/X86LINUX64/lib/X86LINUX64/libeosCuda.so differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a
index 7f7f2a9..32d2e98 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/eosCuda.sharedo b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/eosCuda.sharedo
index bccbf78..b1224d8 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/eosCuda.sharedo and b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/eosCuda.sharedo differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageClusterAnalysis.sharedo b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageClusterAnalysis.sharedo
index 3c1f89c..b43316b 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageClusterAnalysis.sharedo and b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageClusterAnalysis.sharedo differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageFFT.sharedo b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageFFT.sharedo
index 66d9ed1..cfbe0ee 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageFFT.sharedo and b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageFFT.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a
index 7f7f2a9..32d2e98 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a
index 9045513..862e38a 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageClusterAnalysis.sharedo b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageClusterAnalysis.sharedo
index 3c1f89c..b43316b 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageClusterAnalysis.sharedo and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageClusterAnalysis.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageFFT.sharedo b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageFFT.sharedo
index 66d9ed1..cfbe0ee 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageFFT.sharedo and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageFFT.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/st9mESV2 b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/st9mESV2
new file mode 100644 (file)
index 0000000..84ff998
Binary files /dev/null and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/st9mESV2 differ

diff --git a/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/eosCuda.sharedo b/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/eosCuda.sharedo
index bccbf78..b1224d8 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/eosCuda.sharedo and b/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/eosCuda.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.a b/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.a
index b7b4a76..19552c7 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.a and b/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.so b/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.so
index aef5612..f3d5aa6 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.so and b/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.so differ

diff --git a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/mrcImageClusterAnalysis b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/mrcImageClusterAnalysis
index 83bdb37..4d5546f 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/mrcImageClusterAnalysis and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/mrcImageClusterAnalysis differ

diff --git a/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbChargeFit/src/X86LINUX64/pdbChargeFit b/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbChargeFit/src/X86LINUX64/pdbChargeFit
index 85ad983..9cc3eaf 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbChargeFit/src/X86LINUX64/pdbChargeFit and b/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbChargeFit/src/X86LINUX64/pdbChargeFit differ

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageClusterAnalysis.c b/src/Objects/DataManip/mrcImage/src/lmrcImageClusterAnalysis.c
index 98a16ed..1e7ca43 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageClusterAnalysis.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageClusterAnalysis.c
@@ -47,6 +47,9 @@ lmrcImageClusterAnalysisDistanceToLog(FILE* fpt, int n, int m, int prevM, int pr
 double
 lmrcImageDistanceCalc0(mrcImage* out, mrcImage* cor, mrcImage* clusterN, mrcImage* clusterM, int numN, int numM, lmrcImageClusterAnalysisInfo* linfo) {
        double distance = 0;
+       mrcImageParaTypeRealCoord offset;
+
+       offset.x = offset.y = offset.z = 0;
 
        DEBUGPRINT("n lmrcImageDistanceCalc0:");
        switch(linfo->mode) {
@@ -78,7 +81,10 @@ lmrcImageDistanceCalc0(mrcImage* out, mrcImage* cor, mrcImage* clusterN, mrcImag
                                                           clusterN, clusterM, 
                                       numN, numM, 
                                       linfo->mode);
-                       *out = *clusterN;
+                       //*out = *clusterN;
+                       out->Header = clusterN->Header;
+                       mrcInit(out, NULL);
+                       lmrcImageCopy(out, clusterN, offset);
                        cor->Image = NULL;
                  }
                  break;

diff --git a/src/Objects/DataManip/transform/src/lmrc2Dto3D.h b/src/Objects/DataManip/transform/src/lmrc2Dto3D.h
index 3d80a0e..7dab365 100755 (executable)
--- a/src/Objects/DataManip/transform/src/lmrc2Dto3D.h
+++ b/src/Objects/DataManip/transform/src/lmrc2Dto3D.h
@@ -30,7 +30,8 @@
 
 typedef enum lmrc2Dto3DMode {
        mrc2Dto3DModeSimpleBackProjection = 0,
-       mrc2Dto3DModeFilteredBackProjection = 1
+       mrc2Dto3DModeFilteredBackProjection = 1,
+       mrc2Dto3DModeWeightedBackProjection = 2
 } lmrc2Dto3DMode;
 
 typedef struct lmrc2Dto3DInfo {

diff --git a/src/Tools/pdbUtil/pdbChargeFit/Config/Define.inc b/src/Tools/pdbUtil/pdbChargeFit/Config/Define.inc
index 7d0ddbe..f96420f 100755 (executable)
--- a/src/Tools/pdbUtil/pdbChargeFit/Config/Define.inc
+++ b/src/Tools/pdbUtil/pdbChargeFit/Config/Define.inc
@@ -1,4 +1,4 @@
 OBJECTNAME = pdbChargeFit
-EXTRA_LIB  =
+EXTRA_LIB  = $(LIBCUDA)
 EXTRA_CCOPTS =
 EXTRA_INC =

diff --git a/src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.c b/src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.c
index e8eaf63..20151eb 100755 (executable)
--- a/src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.c
+++ b/src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.c
@@ -62,11 +62,11 @@ void lpdbChargeFit(pdbChargeFitInfo *info)
 
 
        tmpPdb.nAtom=0;
-       tmpPdb.PDB=NULL;
+       tmpPdb.top = tmpPdb.PDB=NULL;
        inFixCA.nAtom=0;
-       inFixCA.PDB=NULL;
+       inFixCA.top = inFixCA.PDB=NULL;
        inMoveCA.nAtom=0;
-       inMoveCA.PDB=NULL;
+       inMoveCA.top = inMoveCA.PDB=NULL;
        
        lengthV=floatVectorInit(lengthV,3);
 

diff --git a/src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.c b/src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.c
index 7d5f765..1f1c961 100755 (executable)
--- a/src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.c
+++ b/src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.c
@@ -110,6 +110,7 @@ additionalUsage()
        fprintf(stderr, "-m Option\n");
        fprintf(stderr, "    %d:SimpleBackProjection\n", mrc2Dto3DModeSimpleBackProjection);
        fprintf(stderr, "    %d:FilteredBackProjection\n", mrc2Dto3DModeFilteredBackProjection);
+       fprintf(stderr, "    %d:WeightedBackProjection\n", mrc2Dto3DModeWeightedBackProjection);
        fprintf(stderr, "-single 0|1 \n");
        fprintf(stderr, "    0: tilt axis is parallel to x-axis\n");
        fprintf(stderr, "    1: tilt axis is parallel to y-axis\n");