"modified lmrcMultiFFTCentralSectionsCompare"

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcMultiFFTCentralSectionsCompare.c b/src/Objects/DataManip/mrcImage/src/lmrcMultiFFTCentralSectionsCompare.c
index 11e057e..c05e988 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/lmrcMultiFFTCentralSectionsCompare.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcMultiFFTCentralSectionsCompare.c
@@ -29,7 +29,7 @@ lmrcMultiFFTCentralSectionsCompare(lmrcMultiFFTCentralSectionsCompareInfoOut* Ou
     double likelihoodxim, likelihoodyim, likelihoodxyim;
     double rein, imin;
     double revol, imvol;
-    int i,j;
+    int i;
     clock_t start,end;
     
     DEBUGPRINT("lmrcMultiFFTCentralSectionsCompare start\n");
@@ -46,67 +46,51 @@ lmrcMultiFFTCentralSectionsCompare(lmrcMultiFFTCentralSectionsCompareInfoOut* Ou
             likelihoodxim = 0.0;
             likelihoodyim = 0.0;
             likelihoodxyim = 0.0;
-            j=0;
             for(x=0; x < in->HeaderN.x ; x++){
                 for(y=0; y < in -> HeaderN.y ; y++){
-                    if(j==32){
-                        rein = 0;
-                        imin = 0;
-                        revol = 0;
-                        imvol = 0;
-                    }else{
+                    
+                    if(i>12000){
+                        DEBUGPRINT2("x y:%f %f\n",x, y);
+                    }
                     mrcPixelDataGet(in, x, y, 0, &rein, mrcPixelRePart, linfo->llinfo.llinfo.InterpMode);
                     mrcPixelDataGet(in, x, y, 0, &imin, mrcPixelImPart, linfo->llinfo.llinfo.InterpMode);
-                    
+                    DEBUGPRINT2("rein imin:%f %f\t", rein, imin);
                     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);
-                    }
+                    DEBUGPRINT2("revol imvol:%f %f\n", revol, imvol);
+            
                     likelihoodxre = likelihoodxre + rein*rein;
                     likelihoodxim = likelihoodxim + imin*imin;
                     likelihoodyre = likelihoodyre + revol*revol;
                     likelihoodyim = likelihoodyre + imvol*imvol;
                     likelihoodxyre = likelihoodxyre + rein*revol;
                     likelihoodxyim = likelihoodxyim + imin*imvol;
-                    j++;
-                   if(i>12300){
-                        if(j<40){
-                            DEBUGPRINT1(" %d", j);
-                       }
-                    }
                 }
             }
             Out[i].Likelihood = likelihoodxyre/sqrt(likelihoodxre*likelihoodyre) + likelihoodxyim/sqrt(likelihoodxim*likelihoodyim);
-            if(i>12300){
-                DEBUGPRINT("\n");
+            
+            if(i>12000){
             DEBUGPRINT2("lmrcMultiFFTCentralSectionsComapre Likelihood:%d %f\n", i, Out[i].Likelihood);
             }
         }else{
             likelihood = 0.0;
-            j=0;
             for(x=0; x < in->HeaderN.x ; x++){
                  for(y=0; y < in -> HeaderN.y ; y++){
-                    if(j==32){
-                        rein = 0;
-                        imin = 0;
-                        revol = 0;
-                        imvol = 0;
-                    }else{
+                    if(i>12000){
+                        DEBUGPRINT2("x y:%f %f\n",x ,y);
+                    }
                     mrcPixelDataGet(in, x, y, 0, &rein, mrcPixelRePart, linfo->llinfo.llinfo.InterpMode);
                     mrcPixelDataGet(in, x, y, 0, &imin, mrcPixelImPart, linfo->llinfo.llinfo.InterpMode);
+                    DEBUGPRINT2("rein imin:%f %f\t", rein, imin);
                     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, &imvol, mrcPixelImPart, linfo->llinfo.llinfo.InterpMode);
+                    DEBUGPRINT2("revol imvol:%f %f\n", revol, imvol);
+                    
                     likelihood = likelihood + ((rein - revol)*(rein - revol) + (imin - imvol)*(imin - imvol))/(-2);
-                    j++;
-                    if(i>13000){
-                        if(j<40){
-                            DEBUGPRINT1(" %d", j);
-                        }
-                 }
-                 }
+                 } 
             }
             Out[i].Likelihood = exp(likelihood)/(2*M_PI);
-            if(i>13500){
+            if(i>12000){
                 DEBUGPRINT("\n");
                DEBUGPRINT3("lmrcMultiFFTCentralSectionsComapre Likelihood:%d %f %f\n", i, likelihood, Out[i].Likelihood);
             }