recompile

diff --git a/env/Eos_env b/env/Eos_env
index 25e491e..e1ebe20 100755 (executable)
--- a/env/Eos_env
+++ b/env/Eos_env
@@ -5,12 +5,12 @@
 if [ -z "$EOS_HOME0" ] ;  then
        export EOS_HOME=$HOME/Eos
        export EOS_MIRROR_SITE=$HOME/EosMirror
-       export EOS_GITUSER=$USER
+       export EOS_GITUSER=$saki_eos
 else
        # For Personal(by install-eos.sh)  
        export EOS_HOME=$EOS_HOME0
        export EOS_MIRROR_SITE=$EOS_HOME0/EosMirror
-       export EOS_GITUSER=$USER
+       export EOS_GITUSER=$saki_eos
 fi
 
 #if you want to use the binaries complied by icc, you need set USE_ICC 

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h
index 5ccbf5f..54fef0a 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h
+++ b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h
@@ -34,6 +34,12 @@ typedef struct lmrcFFTCentralSectionInfo {
 
 } lmrcFFTCentralSectionInfo;
 
+typedef struct lmrcFFTCentralSectionCompareInfo{
+       float* likelihood;
+       lmrcFFTCentralSectionInfo llinfo;
+
+}lmrcFFTCentralSectionCompareInfo;
+
 /* struct end */
 
 #ifdef __cplusplus
@@ -43,7 +49,8 @@ extern "C" {
 /* prototype begin */
 
 extern void lmrcFFTCentralSectionGet(mrcImage* out, mrcImage* template, mrcImage* volume, lmrcFFTCentralSectionInfo* linfo, int mode);
-
+extern void lmrcFFTCentralSectionCompare(mrcImage* in, mrcImage* volume, lmrcFFTCentralSectionCompareInfo* linfo, int mode);
+extern void lmrcFFTCentralSectionCompareInfoWrite(FILE* fpt, lmrcFFTCentralSectionCompareInfo* linfo, int mode);
 /* prototype end */
 
 #ifdef __cplusplus

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionCompare.c b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionCompare.c
new file mode 100644 (file)
index 0000000..b4b2cc7
--- /dev/null
+++ b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionCompare.c
@@ -0,0 +1,49 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% lmrcFFTCentralSectionCompare ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : lmrcFFTCentralSectionCompare 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%lmrcFFTCentralSectionCompare ver%I%; Date:%D% %Z%";
+
+#include "genUtil.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "./lmrcFFTCentralSection.h"
+
+void
+lmrcFFTCentralSectionCompare(mrcImage* in, mrcImage* volume, lmrcFFTCentralSectionCompareInfo* linfo, int mode){
+
+       int i, j;
+       mrcImage* vol2d;
+       double rein, imin;
+       double revol, imvol;
+       float likelihood;
+
+       linfo->likelihood = (float*)malloc(sizeof(float));
+
+       lmrcFFTCentralSectionGet(vol2d, in, volume, &linfo->llinfo, mode);
+
+       for(i=0; i < in->HeaderN.x ; i++){
+               for(j=0; j < in->HeaderN.y ; j++){
+               
+                       mrcPicxelDataGet(in, i, j, rein, mrcPixelRePart, linfo->llinfo.InterpMode);
+                       mrcPicxelDataGet(in, i, j, imin, mrcPixelImPart, linfo->llinfo.InterpMode);
+               
+                       mrcPicxelDataGet(vol2d, i, j, revol, mrcPixelRePart, linfo->llinfo.InterpMode);
+                       mrcPicxelDataGet(vol2d, i, j, imvol, mrcPixelImPart, linfo->llinfo.InterpMode);
+
+                       likelihood = likelihood + ((rein - revol)*(rein - revol)+(imin - imvol)*(imin - imvol))/(-2);
+               }
+       }
+
+       linfo->likelihood[0] = exp(likelihood)/2*M_PI;
+
+}
+

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionCompareInfoWrite.c b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionCompareInfoWrite.c
new file mode 100644 (file)
index 0000000..0e1e7b8
--- /dev/null
+++ b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSectionCompareInfoWrite.c
@@ -0,0 +1,25 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% lmrcFFTCentralSectionCompareInfoWrite ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : lmrcFFTCentralSectionCompareInfoWrite 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%lmrcFFTCentralSectionCompareInfoWrite ver%I%; Date:%D% %Z%";
+
+#include "genUtil.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include "./lmrcFFTCentralSection.h"
+
+void lmrcFFTCentralSectionCompareInfoWrite(FILE* fpt, lmrcFFTCentralSectionCompareInfo* linfo, int mode){
+
+       //int i;
+
+       fprintf(fpt, "%f\n",linfo->likelihood[0]);
+
+}

diff --git a/src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.c b/src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.c
index b44ffae..27a5e0c 100755 (executable)
--- a/src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.c
+++ b/src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.c
@@ -17,7 +17,7 @@
 
 #define DEBUG
 #include "genUtil.h"
-#include "lmrcFFTCentralSection.h"
+#include "/Users/nakanosaki/Eos/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h"
 
 /*
 Example:
@@ -36,6 +36,9 @@ int
 main(int argc, char* argv[]) 
 {
        mrcFFTCentralSectionCompareInfo info;
+       lmrcFFTCentralSectionCompareInfo linfo;
+       mrcImage in;
+       mrcImage volume;
 
        init0(&info);
     argCheck(&info, argc, argv);
@@ -43,6 +46,21 @@ main(int argc, char* argv[])
 
        DEBUGPRINT("Program Start\n");
 
+       mrcFileRead(&in, info.In2D, "in main", 0);
+       mrcFileRead(&volume, info.In3D, "in main", 0);
+       
+       strncpy(linfo.llinfo.EulerMode, info.EAMode, 4);
+       linfo.llinfo.Rot1 = info.Rot1*RADIAN;
+       linfo.llinfo.Rot2 = info.Rot2*RADIAN;
+       linfo.llinfo.Rot3 = info.Rot3*RADIAN;
+       linfo.llinfo.TransX = info.TransX;
+       linfo.llinfo.TransY = info.TransY;
+       linfo.llinfo.InterpMode = info.InterpMode;
+       
+       lmrcFFTCentralSectionCompare(&in, &volume, &linfo, info.mode);
+
+       lmrcFFTCentralSectionCompareInfoWtire(info.fptOut, &linfo, info.mode);
+
        exit(EXIT_SUCCESS);
 }
 
@@ -50,4 +68,5 @@ void
 additionalUsage()
 {
        fprintf(stderr, "----- Additional Usage -----\n");
+       
 }