Commit: 68c1ec84294f6a9d67f49baa49865fc3c4f1e097 - saki_eos (git)

Commit MetaInfo

• Revision: 68c1ec84294f6a9d67f49baa49865fc3c4f1e097 (tree)
• Time: 2016-02-20 12:38:56
• Author: 中野沙紀 <nakanosaki@naka...>
• Commiter: 中野沙紀

Log Message

"create Tool"

Change Summary

• modified: include/lmrcFFTCentralSection.h
• modified: src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.c
• modified: src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/mrcMultiFFTCentralSectionsCompare.c

Incremental Difference

--- a/include/lmrcFFTCentralSection.h
+++ b/include/lmrcFFTCentralSection.h
@@ -77,6 +77,7 @@ typedef struct lmrcMultiFFTCentralSectionsCompareInfo{
     int PriorSize;
     double Variat;
     double** Sigma;
+    double SigMin;
     lmrcMultiFFTCentralSectionsCompareInfoOut* Out;
 	lmrcMultiFFTCentralSectionsCompareInfoOut* Prior;
 }lmrcMultiFFTCentralSectionsCompareInfo;
@@ -99,20 +100,28 @@ extern "C" {
 /* prototype begin */
 
 extern void lmrcFFTCentralSectionGet(mrcImage* out, mrcImage* template, mrcImage* volume, lmrcFFTCentralSectionInfo* linfo, int mode);
+
+extern void lmrcImageFFTRhoFilter(mrcImage* volFT, mrcImage* count, lmrcFFTCentralSectionInfo* linfo, int mode);
+extern void lmrcImageFFTCentralSectionPut(mrcImage* volFT, mrcImage* count, mrcImage* template3D, mrcImage* in, double probability, lmrcFFTCentralSectionInfo* linfo, int* c, int mode);
+
+//lmrcFFTCentralSectionCompare.c
 extern void lmrcFFTCentralSectionCompare(mrcImage* in, mrcImage* volume, lmrcFFTCentralSectionCompareInfo* linfo, int mode);
 extern void lmrcFFTCentralSectionCompareInfoWrite(FILE* fpt, float Likelihood, int mode);
+
+//lmrcMultiFFTCentralSectionsComapre
 extern void lmrcFFTCentralSectionsGet(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, mrcImage* template, mrcImage* volume, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode, int nummode);
 extern void lmrcMultiFFTCentralSectionsCompare(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, mrcImage* in, mrcImage* volume, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode, int nummode);
 extern void lmrcMultiFFTCentralSectionsCompareNormalization(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode);
 extern void lmrcMultiFFTCentralSectionsCompareInfoWrite(FILE* fpt, char* filename, lmrcMultiFFTCentralSectionsCompareInfoOut* Out, lmrcMultiFFTCentralSectionsCompareInfo* linfo, float mode1, float mode2);
 extern void lmrcMultiFFTCentralSectionsCompareInfoSort(lmrcMultiFFTCentralSectionsCompareInfoOut Out[], int left, int right);
-//extern void lmrcMultiFFTCentralSectionsCompareInfoSortPre(lmrcMultiFFTCentralSectionsCompareInfo* linfo, int left, int right);
 extern void lmrcMultiFFTCentralSectionsCompareInfoProbSet(lmrcMultiFFTCentralSectionsCompareInfo* linfo ,int mode); 
 extern void lmrcMultiFFTCentralSectionsCompareInfoLimit(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, lmrcMultiFFTCentralSectionsCompareInfo* linfo, float mode1, float mode2);
 extern void lmrcMultiFFTCentralSectionsCompareInfoUpdate(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, lmrcMultiFFTCentralSectionsCompareInfo* linfo);
 extern void lmrcMultiFFTCentralSectionsCompareInfoVariation(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, lmrcMultiFFTCentralSectionsCompareInfo* linfo);
+extern void lmrcMultiFFTCentralSectionsCompareSigma(mrcImage* in, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode);
 /* prototype end */
 
+
 #ifdef __cplusplus
 };
 #endif

--- a/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.c
@@ -50,7 +50,7 @@ lmrcImageFFTCentralSectionPut(mrcImage* volFT, mrcImage* count, mrcImage* templa
 	int i, n, k0;
 	Matrix3D mat;
 	double re3d, im3d;
-	double re3d0=0, im3d0=0;
+	double re3d0=0, im3d0=0,counter=0;
 	double re2d, im2d;
 	double re2d0, im2d0;
 	double phaseShift;
@@ -97,14 +97,13 @@ lmrcImageFFTCentralSectionPut(mrcImage* volFT, mrcImage* count, mrcImage* templa
 
 		mrcPixelDataGet(in, X2d, Y2d, 0, &re2d0, mrcPixelRePart, linfo->InterpMode);
 		mrcPixelDataGet(in, X2d, Y2d, 0, &im2d0, mrcPixelImPart, linfo->InterpMode);
-//if(re2d0 == 0 && im2d0 == 0){
-//}else{
+        if(re2d0 == 0 && im2d0 == 0){
+        }else{
 		re3d = re2d+re2d0*probability;
 		im3d = im2d+im2d0*probability;
 		
         re3d0 = re3d*cos(-phaseShift) - im3d*sin(-phaseShift);
 		im3d0 = re3d*sin(-phaseShift) + im3d*cos(-phaseShift);
-	//	DEBUGPRINT4("new data:  %f %f <- %f %f \n", re2d0, im2d0, re3d0, im3d0); 
 
 		if((-volFT->HeaderN.x/2)+0.5 < X3d && X3d < (volFT->HeaderN.x/2)-0.5 
 		 &&(-volFT->HeaderN.y/2)+0.5 < Y3d && Y3d < (volFT->HeaderN.y/2)-0.5 
@@ -116,26 +115,22 @@ lmrcImageFFTCentralSectionPut(mrcImage* volFT, mrcImage* count, mrcImage* templa
 		if((-volFT->HeaderN.x/2)+0.5 < X3d && X3d < (volFT->HeaderN.x/2)-0.5 
 		 &&(-volFT->HeaderN.y/2)+0.5 < Y3d && Y3d < (volFT->HeaderN.y/2)-0.5 
 		 &&(-volFT->HeaderN.z/2)+0.5 < Z3d && Z3d < (volFT->HeaderN.z/2)-0.5) {
-			mrcPixelDataGet(count, X3d, Y3d, Z3d, &re3d0, mrcPixelRePart, linfo->InterpMode);
- //           if(re3d0==0 && im3d0==0){
- //               printf("not zerozero\n");
-   //         }else{
-            if(re3d0!=0 || im3d0!=0){
-			mrcPixelDataSet(count, X3d, Y3d, Z3d, re3d0+1, mrcPixelRePart);
- //               printf(" zerozero\n");
-            }
-            //	DEBUGPRINT1("count:  %f \n", re3d0); 
+			mrcPixelDataGet(count, X3d, Y3d, Z3d, &counter, mrcPixelRePart, linfo->InterpMode);
+ //         if(re3d0!=0 || im3d0!=0){
+         //   if((re3d - (re2d+re2d0*probability)) != 0){
+			mrcPixelDataSet(count, X3d, Y3d, Z3d, counter+1, mrcPixelRePart);
+ //           }
 		}
         } 
-//	}
+	}
 	}
 
 	lmrcImageFFTCenterChange(volFT, 0);	
-/*
+
 	if(!IsFT(volFT, "lmrcFFTCentralSectionGet", 0)){
 		mrcImageFree(volFT, 0);
 		memoryFree(volFT);
-	}*/
+	}
 }
 
 void 

--- a/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/mrcMultiFFTCentralSectionsCompare.c
+++ b/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/mrcMultiFFTCentralSectionsCompare.c
@@ -18,7 +18,7 @@
 
 #define DEBUG
 #include "genUtil.h"
-#include "/Users/nakanosaki/Eos/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h"
+#include "lmrcFFTCentralSection.h"
 //#include "Class.h"
 
 /*
@@ -44,7 +44,7 @@ main(int argc, char* argv[])
     char filename[256], fname[256], EAMode[5];
     double rot[3];
     char Buf[256];
-    FILE* fp;
+    FILE* fpfp;
 
     start = clock();
 
@@ -81,7 +81,7 @@ main(int argc, char* argv[])
     linfo.llinfo.nRot3 = MAX(1,(int)(fabs((linfo.llinfo.Rot3End - linfo.llinfo.Rot3Start)/linfo.llinfo.Rot3Delta)+0.5));
 
     linfo.llinfo.RotSize = ((linfo.llinfo.nRot1))*((linfo.llinfo.nRot2))*((linfo.llinfo.nRot3));
-    DEBUGPRINT1("RotSize: %d\n",linfo.llinfo.RotSize);
+ //   DEBUGPRINT1("RotSize: %d\n",linfo.llinfo.RotSize);
 
     linfo.OutSize = 0;
     linfo.PriorSize = 0;
@@ -152,16 +152,22 @@ main(int argc, char* argv[])
     lmrcMultiFFTCentralSectionsCompareInfoSort(linfo.Out, 0, linfo.OutSize-1);
     lmrcMultiFFTCentralSectionsCompareInfoLimit(linfo.Out, &linfo, info.Lmode1, info.Lmode2);
     lmrcMultiFFTCentralSectionsCompareNormalization(linfo.Out, &linfo, info.Lcalcmode);
-    lmrcMultiFFTCentralSectionsCompareInfoWrite(info.fptOut1, info.In2D, linfo.Out, &linfo, info.Lmode1, info.Lmode2);
+    if((fpfp=fopen(info.Out1,"a"))==NULL){
+        printf("Out file open error\n");
+        exit(EXIT_FAILURE);
+    }
+    lmrcMultiFFTCentralSectionsCompareInfoWrite(fpfp, info.In2D, linfo.Out, &linfo, info.Lmode1, info.Lmode2);
+    //lmrcMultiFFTCentralSectionsCompareInfoWrite(info.fptOut1, info.In2D, linfo.Out, &linfo, info.Lmode1, info.Lmode2);
     lmrcMultiFFTCentralSectionsCompareInfoVariation(linfo.Out, &linfo); 
  //   lmrcMultiFFTCentralSectionsCompareInfoProbSet(linfo.Out, &linfo ,1);
 
     DEBUGPRINT1("Prior: %f\n",linfo.Out[0].Prob);
-
+/*
     for(i=0; i< linfo.PriorSize; i++){
  if(linfo.Out[i].Prob >0.0){
         DEBUGPRINT1(" %15.6e \n", linfo.Out[i].Prob);
     }}
+    */
     free(linfo.Out);
     free(linfo.Prior);