"commit for modified Object"

diff --git a/.DS_Store b/.DS_Store
index f99e557..7285287 100644 (file)
Binary files a/.DS_Store and b/.DS_Store differ

diff --git a/src/.DS_Store b/src/.DS_Store
index 8d0c431..f6aae27 100644 (file)
Binary files a/src/.DS_Store and b/src/.DS_Store differ

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionsGet.c b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionsGet.c
index 044a94e..0794242 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionsGet.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionsGet.c
@@ -33,12 +33,12 @@ lmrcFFTCentralSectionsGet(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, mrcIma
                 linfo->llinfo.llinfo.Rot1 = x;
                 linfo->llinfo.llinfo.Rot2 = y;
                 linfo->llinfo.llinfo.Rot3 = z;
-
-                lmrcFFTCentralSectionGet(&(Out+i)->out, template, volume, &linfo->llinfo.llinfo, mode);
                 
-                (Out +i)->Rot[0] = x;
-                (Out +i)->Rot[1] = y;
-                (Out +i)->Rot[2] = z;
+                lmrcFFTCentralSectionGet(&Out[i].out, template, volume, &linfo->llinfo.llinfo, mode);
+                
+                Out[i].Rot[0] = x;
+                Out[i].Rot[1] = y;
+                Out[i].Rot[2] = z;
                 i++;
             }
         }

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcMultiFFTCentralSectionsCompare.c b/src/Objects/DataManip/mrcImage/src/lmrcMultiFFTCentralSectionsCompare.c
index 143d491..db7b47b 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/lmrcMultiFFTCentralSectionsCompare.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcMultiFFTCentralSectionsCompare.c
@@ -54,8 +54,8 @@ lmrcMultiFFTCentralSectionsCompare(lmrcMultiFFTCentralSectionsCompareInfoOut* Ou
                     mrcPixelDataGet(in, x, y, 0, &rein, mrcPixelRePart, linfo->llinfo.llinfo.InterpMode);
                     mrcPixelDataGet(in, x, y, 0, &imin, mrcPixelImPart, linfo->llinfo.llinfo.InterpMode);
                     
-                    mrcPixelDataGet(&(Out+i)->out, x, y, 0, &revol, mrcPixelRePart, linfo->llinfo.llinfo.InterpMode);
-                    mrcPixelDataGet(&(Out+i)->out, x, y, 0, &imvol, mrcPixelImPart, linfo->llinfo.llinfo.InterpMode);
+                    mrcPixelDataGet(&Out[i].out, x, y, 0, &revol, mrcPixelRePart, linfo->llinfo.llinfo.InterpMode);
+                    mrcPixelDataGet(&Out[i].out, x, y, 0, &imvol, mrcPixelImPart, linfo->llinfo.llinfo.InterpMode);
                     likelihoodxre = likelihoodxre + rein*rein;
                     likelihoodxim = likelihoodxim + imin*imin;
                     likelihoodyre = likelihoodyre + revol*revol;
@@ -79,9 +79,9 @@ lmrcMultiFFTCentralSectionsCompare(lmrcMultiFFTCentralSectionsCompareInfoOut* Ou
                     //DEBUGPRINT1(" rein:%f\n", rein);
                     mrcPixelDataGet(in, x, y, 0, &imin, mrcPixelImPart, linfo->llinfo.llinfo.InterpMode);
                    // DEBUGPRINT1("imin:%f\n", imin);
-                    mrcPixelDataGet(&(Out+i)->out, x, y, 0, &revol, mrcPixelRePart, linfo->llinfo.llinfo.InterpMode);
+                    mrcPixelDataGet(&Out[i].out, x, y, 0, &revol, mrcPixelRePart, linfo->llinfo.llinfo.InterpMode);
                    // DEBUGPRINT1(" revol:%f\n", revol);
-                    mrcPixelDataGet(&(Out+i)->out, x, y, 0, &imvol, mrcPixelImPart, linfo->llinfo.llinfo.InterpMode);
+                    mrcPixelDataGet(&Out[i].out, x, y, 0, &imvol, mrcPixelImPart, linfo->llinfo.llinfo.InterpMode);
                    // DEBUGPRINT1("imvol:%f\n", imvol);
                     likelihood = likelihood + ((rein - revol)*(rein - revol) + (imin - imvol)*(imin - imvol))/(-2);
                     j++;
@@ -91,8 +91,8 @@ lmrcMultiFFTCentralSectionsCompare(lmrcMultiFFTCentralSectionsCompareInfoOut* Ou
                  }
             }
             DEBUGPRINT("\n");
-            (Out +i) -> Likelihood = exp(likelihood)/(2*M_PI);
-            DEBUGPRINT3("lmrcMultiFFTCentralSectionsComapre Likelihood:%d %f %f\n", i, likelihood, (Out+i)->Likelihood);
+            Out[i].Likelihood = exp(likelihood)/(2*M_PI);
+            DEBUGPRINT3("lmrcMultiFFTCentralSectionsComapre Likelihood:%d %f %f\n", i, likelihood, Out[i].Likelihood);
         }
     }
     DEBUGPRINT("lmrcMultiFFTCentralSectionsCompare end\n");
@@ -108,39 +108,39 @@ lmrcMultiFFTCentralSectionsCompareNormalization(lmrcMultiFFTCentralSectionsCompa
     float delta = 0;
     float weight = 0;
 
-    min = Out->Likelihood;
-    max = Out->Likelihood;
+    min = Out[0].Likelihood;
+    max = Out[0].Likelihood;
 
     if(mode ==1){
         for(i=0; i < linfo->llinfo.RotSize; i++){
-            if(min > (Out+i)->Likelihood){
-                min = (Out+i)->Likelihood;
-            }else if(max < (Out+i)->Likelihood){
-                max = (Out+i)->Likelihood;
+            if(min > Out[i].Likelihood){
+                min = Out[i].Likelihood;
+            }else if(max < Out[i].Likelihood){
+                max = Out[i].Likelihood;
             }
-            sum = sum + (Out+i)-> Likelihood;
+            sum = sum + Out[i].Likelihood;
         }
         DEBUGPRINT1("lmrcMultiFFTCentralSectionsComapreNormalization sum: %f\n",sum);
         delta = max - min;
         for(i=0; i<linfo->llinfo.RotSize; i++){
-            (Out +i) -> Prob = (exp(((Out+i)->Likelihood - min)/delta) - 1)/(exp(1)-1);
-            weight = weight + exp((Out +i)->Prob);
+            Out[i].Prob = (exp((Out[i].Likelihood - min)/delta) - 1)/(exp(1)-1);
+            weight = weight + exp(Out[i].Prob);
         }
     
         for(i=0; i<linfo->llinfo.RotSize; i++){
-            if((Out+i)->Likelihood > 0){
-                (Out +i) -> Weight = exp((Out+i)->Prob)/weight;
+            if(Out[i].Likelihood > 0){
+                Out[i].Weight = exp(Out[i].Prob)/weight;
             }else{
-                (Out +i) -> Weight = 0;
+                Out[i].Weight = 0;
             }
         }
     }else{
         for(i=0; i<linfo->llinfo.RotSize; i++){
-            sum = sum+(Out+i)->Likelihood;
+            sum = sum + Out[i].Likelihood;
         }
         DEBUGPRINT1("lmrcMultiFFTCentralSectionsComapreNormalization sum: %f\n",sum);
         for(i=0; i<linfo->llinfo.RotSize; i++){
-            (Out +i) -> Prob = (Out +i)-> Likelihood / sum;
+            Out[i].Prob = Out[i].Likelihood / sum;
         }
     }
 }
@@ -154,12 +154,12 @@ lmrcMultiFFTCentralSectionsCompareInfoWrite(FILE* fpt, char* filename, lmrcMulti
     if(mode2 == 0){
         for(i=0; i< linfo->llinfo.RotSize; i++){
             if(Mode == 1){
-                if((Out+i)->Weight >= mode1){
-                     fprintf(fpt,"%s %s %15.4f %15.4f %15.4f %15.6e\n", filename, linfo->EulerMode, (Out+i)->Rot[0]*DEGREE, (Out+i)->Rot[1]*DEGREE, (Out+i)->Rot[2]*DEGREE, (Out+i)->Weight);
+                if(Out[i].Weight >= mode1){
+                    fprintf(fpt,"%s %s %15.4f %15.4f %15.4f %15.6e\n", filename, linfo->EulerMode, Out[i].Rot[0]*DEGREE, Out[i].Rot[1]*DEGREE, Out[i].Rot[2]*DEGREE, Out[i].Weight);
                 }
             }else{
-                if((Out+i)->Prob >= mode1){
-                    fprintf(fpt,"%s %s %15.4f %15.4f %15.4f %15.6e\n", filename, linfo->EulerMode, (Out+i)->Rot[0]*DEGREE, (Out+i)->Rot[1]*DEGREE, (Out+i)->Rot[2]*DEGREE, (Out+i)->Prob);
+                if(Out[i].Prob >= mode1){
+                    fprintf(fpt,"%s %s %15.4f %15.4f %15.4f %15.6e\n", filename, linfo->EulerMode, Out[i].Rot[0]*DEGREE, Out[i].Rot[1]*DEGREE, Out[i].Rot[2]*DEGREE, Out[i].Prob);
                 }
             }
         }
@@ -167,9 +167,9 @@ lmrcMultiFFTCentralSectionsCompareInfoWrite(FILE* fpt, char* filename, lmrcMulti
         for(i=0; i< linfo->llinfo.RotSize; i++){
             if(sum < mode2){
                 if(Mode == 1){
-                    sum = sum + (Out+i)->Weight;
+                    sum = sum + Out[i].Weight;
                 }else{
-                    sum = sum + (Out+i)->Prob;
+                    sum = sum + Out[i].Prob;
                 }
                 j++;
             }else{
@@ -179,12 +179,11 @@ lmrcMultiFFTCentralSectionsCompareInfoWrite(FILE* fpt, char* filename, lmrcMulti
            
         for(i=0; i<j; i++){
             if(Mode ==1){
-                if((Out+i)->Weight >= mode1){
-                    fprintf(fpt,"%s %s %15.4f %15.4f %15.4f %15.6e\n", filename, linfo->EulerMode, (Out+i)->Rot[0]*DEGREE, (Out+i)->Rot[1]*DEGREE, (Out+i)->Rot[2]*DEGREE, (Out+i)->Weight);
+                if(Out[i].Weight >= mode1){
+                    fprintf(fpt,"%s %s %15.4f %15.4f %15.4f %15.6e\n", filename, linfo->EulerMode, Out[i].Rot[0]*DEGREE, Out[i].Rot[1]*DEGREE, Out[i].Rot[2]*DEGREE, Out[i].Weight);
                 }
-            }else{
-                if((Out+i)->Prob >= mode1){
-                    fprintf(fpt,"%s %s %15.4f %15.4f %15.4f %15.6e\n", filename, linfo->EulerMode, (Out+i)->Rot[0]*DEGREE, (Out+i)->Rot[1]*DEGREE, (Out+i)->Rot[2]*DEGREE, (Out+i)->Prob);
+                if(Out[i].Prob >= mode1){
+                    fprintf(fpt,"%s %s %15.4f %15.4f %15.4f %15.6e\n", filename, linfo->EulerMode, Out[i].Rot[0]*DEGREE, Out[i].Rot[1]*DEGREE, Out[i].Rot[2]*DEGREE, Out[i].Prob);
                 }                        
             }
         }

diff --git a/src/Tools/.DS_Store b/src/Tools/.DS_Store
index 57af7b6..7ec8da4 100644 (file)
Binary files a/src/Tools/.DS_Store and b/src/Tools/.DS_Store differ

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 5ac6e64..5142eb2 100755 (executable)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -717,3 +717,4 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/Makefile b/src/Tools/Makefile
index 28ff67b..45935c4 120000 (symlink)
--- a/src/Tools/Makefile
+++ b/src/Tools/Makefile
@@ -1 +1 @@
-/Users/taku/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file
+/Users/nakanosaki/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/mrcImage/.DS_Store b/src/Tools/mrcImage/.DS_Store
index db540ae..bc35715 100644 (file)
Binary files a/src/Tools/mrcImage/.DS_Store and b/src/Tools/mrcImage/.DS_Store differ

diff --git a/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/.DS_Store b/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/.DS_Store
index 32f6738..b1c0afd 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/.DS_Store and b/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/.DS_Store differ

diff --git a/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Makefile b/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Makefile
index 52da6cd..b2e2177 100755 (executable)
--- a/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Makefile
@@ -11,8 +11,11 @@ help:
 
 exec:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.0.fft2d -i3d data/121p.fft3d -EulerMode YOYS -Rot1 0.0 360.0 5 -Rot2 0.0 360.0 5 -Rot3 0.0 360.0 5 -trans 0.0 0.0 -InterpMode 0 -o  Out-21-5.txt -Lmode 0 0.0 0.90 -m 0
-       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.0.fft2d -i3d data/121p.fft3d -EulerMode YOYS -Rot1 0.0 360.0 5 -Rot2 0.0 360.0 5 -Rot3 0.0 360.0 5 -trans 0.0 0.0 -InterpMode 0 -o  OutN-21-5.txt -Lmode 1 0.0 0.90 -m 0
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.0.fft2d -i3d data/121p.fft3d -EulerMode YOYS -Rot1 0.0 360.0 15 -Rot2 0.0 360.0 15 -Rot3 0.0 360.0 15 -trans 0.0 0.0 -InterpMode 0 -o   OutN-22-5.txt -Lmode 1 0.0 0.90 -m 0
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.1.fft2d -i3d data/121p.fft3d -EulerMode YOYS -Rot1 0.0 360.0 15 -Rot2 0.0 360.0 15 -Rot3 0.0 360.0 15 -trans 0.0 0.0 -InterpMode 0 -o  OutN1-22-5.txt -Lmode 1 0.0 0.90 -m 0
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.2.fft2d -i3d data/121p.fft3d -EulerMode YOYS -Rot1 0.0 360.0 15 -Rot2 0.0 360.0 15 -Rot3 0.0 360.0 15 -trans 0.0 0.0 -InterpMode 0 -o  OutN2-22-5.txt -Lmode 1 0.0 0.90 -m 0
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.3.fft2d -i3d data/121p.fft3d -EulerMode YOYS -Rot1 0.0 360.0 15 -Rot2 0.0 360.0 15 -Rot3 0.0 360.0 15 -trans 0.0 0.0 -InterpMode 0 -o  OutN3-22-5.txt -Lmode 1 0.0 0.90 -m 0
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.4.fft2d -i3d data/121p.fft3d -EulerMode YOYS -Rot1 0.0 360.0 15 -Rot2 0.0 360.0 15 -Rot3 0.0 360.0 15 -trans 0.0 0.0 -InterpMode 0 -o  OutN4-22-5.txt -Lmode 1 0.0 0.90 -m 0
        
        @echo "----- Calc check -----"          
 

diff --git a/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Out-22-5.txt b/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Out-22-5.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/OutN-22-5.txt b/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/OutN-22-5.txt
new file mode 100644 (file)
index 0000000..e69de29