modified: mrc2DFTto3DFT.c

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/.DS_Store b/src/Tools/rec3d/mrc2DFTto3DFT/src/.DS_Store
new file mode 100755 (executable)
index 0000000..cd3ca13
Binary files /dev/null and b/src/Tools/rec3d/mrc2DFTto3DFT/src/.DS_Store differ

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/argCheck.c b/src/Tools/rec3d/mrc2DFTto3DFT/src/argCheck.c
index 7a3ee1c..d8bfc42 100755 (executable)
--- a/src/Tools/rec3d/mrc2DFTto3DFT/src/argCheck.c
+++ b/src/Tools/rec3d/mrc2DFTto3DFT/src/argCheck.c
@@ -61,6 +61,17 @@ argCheck(mrc2DFTto3DFTInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("InterpMode") {
+                    if(i+1<argc) {
+                        info->InterpMode = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagInterpMode++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("c") {
                     if(i+1<argc) {
                         info->configFile = stringGetNthWord(argv[i+1], 1, " ,");

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/init.c b/src/Tools/rec3d/mrc2DFTto3DFT/src/init.c
index 1057f3e..edb03ad 100755 (executable)
--- a/src/Tools/rec3d/mrc2DFTto3DFT/src/init.c
+++ b/src/Tools/rec3d/mrc2DFTto3DFT/src/init.c
@@ -15,6 +15,7 @@ init0(mrc2DFTto3DFTInfo* info)
     info->fptIn = NULL;    info->flagIn = 0;
     info->fpttemp3d = NULL;    info->flagtemp3d = 0;
     info->fptOut = NULL;    info->flagOut = 0;
+    info->InterpMode = 1;    info->flagInterpMode = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
 }
@@ -51,6 +52,9 @@ init1(mrc2DFTto3DFTInfo* info)
         info->fptOut = fileOpen(info->Out, "w");
     }
     
+    if(info->flagInterpMode) {
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.c b/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.c
index f9cab72..186dc86 100755 (executable)
--- a/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.c
+++ b/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.c
@@ -64,7 +64,7 @@ main(int argc, char* argv[])
     int c=0;
     linfo.TransX = 0.0;
     linfo.TransY = 0.0;
-    linfo.InterpMode = 1.0;
+    linfo.InterpMode = info.InterpMode;
     
     Out.Header = temp3d.Header;
     count.Header = temp3d.Header;

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.html b/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.html
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.pane b/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.pane
index 7d5fad9..f3d08d8 100755 (executable)
--- a/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.pane
+++ b/src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.pane
@@ -10,8 +10,9 @@
         -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'InputDataFile' i
         -I 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'temp3d' 'Input: mrcFFT(3D)' t3d
         -O 1 0 1 1 0 1 -1x1+1+4.500000 ' ' 'Out' 'Output' o
-        -I 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'mode' 'Mode' m
+        -i 1 0 1 0 0 -1x1+1+6.000000 0 0 1 0 0 'InterpMode' 'Interpolation Mode' InterpMode
+        -I 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+9.000000 0 0 0 0 0 'mode' 'Mode' m
     -E
   -E
 -E

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/test/.DS_Store b/src/Tools/rec3d/mrc2DFTto3DFT/src/test/.DS_Store
new file mode 100755 (executable)
index 0000000..54a78c8
Binary files /dev/null and b/src/Tools/rec3d/mrc2DFTto3DFT/src/test/.DS_Store differ

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/test/Makefile b/src/Tools/rec3d/mrc2DFTto3DFT/src/test/Makefile
old mode 100644 (file)
new mode 100755 (executable)
index f74babd..7dfd6bb
--- a/src/Tools/rec3d/mrc2DFTto3DFT/src/test/Makefile
+++ b/src/Tools/rec3d/mrc2DFTto3DFT/src/test/Makefile
@@ -11,41 +11,10 @@ help:
 
 exec:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME) -i  /Users/nakanosaki/Eos/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Test3dlidt.txt -t3d data/121p.fft3d -o TestOutdata.3d 
+       ../$(OSTYPE)/$(OBJECTNAME) -i  data/DEMOre-15.txt -t3d data/121p.fft3d -o data/NEWDEMO-20.fft3d
        @echo "----- Calc check -----"          
 
 init:
        mrc3Dto2D -i data/121p.mrc3d -o data/121p.10.mrc2d -Rot1 30 30 10 -Rot2 0 0 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.11.mrc2d -Rot1 45 45 10 -Rot2 0 0 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.12.mrc2d -Rot1 60 60 10 -Rot2 0 0 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.14.mrc2d -Rot1 120 120 10 -Rot2 0 0 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.15.mrc2d -Rot1 150 150 10 -Rot2 0 0 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.20.mrc2d -Rot1 0 0 10 -Rot2 30 30 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.21.mrc2d -Rot1 0 0 10 -Rot2 45 45 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.23.mrc2d -Rot1 0 0 10 -Rot2 90 90 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.24.mrc2d -Rot1 0 0 10 -Rot2 120 120 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.25.mrc2d -Rot1 0 0 10 -Rot2 150 150 10 -Rot3 0 0 10 -EulerMode YOYS -InterpolationMode 1
-       
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.30.mrc2d -Rot1 0 0 10 -Rot2 0 0 10 -Rot3 30 30 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.32.mrc2d -Rot1 0 0 10 -Rot2 0 0 10 -Rot3 60 60 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.33.mrc2d -Rot1 0 0 10 -Rot2 0 0 10 -Rot3 90 90 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.34.mrc2d -Rot1 0 0 10 -Rot2 0 0 10 -Rot3 120 120 10 -EulerMode YOYS -InterpolationMode 1
-       mrc3Dto2D -i data/121p.mrc3d -o data/121p.35.mrc2d -Rot1 0 0 10 -Rot2 0 0 10 -Rot3 150 150 10 -EulerMode YOYS -InterpolationMode 1
-       
        mrcImageFFT -i data/121p.10.mrc2d -o data/121p.10.fft2d
-       mrcImageFFT -i data/121p.11.mrc2d -o data/121p.11.fft2d
-       mrcImageFFT -i data/121p.12.mrc2d -o data/121p.12.fft2d
-       mrcImageFFT -i data/121p.14.mrc2d -o data/121p.14.fft2d
-       mrcImageFFT -i data/121p.15.mrc2d -o data/121p.15.fft2d
-       mrcImageFFT -i data/121p.20.mrc2d -o data/121p.20.fft2d
-       mrcImageFFT -i data/121p.21.mrc2d -o data/121p.21.fft2d
-       mrcImageFFT -i data/121p.23.mrc2d -o data/121p.23.fft2d
-       mrcImageFFT -i data/121p.24.mrc2d -o data/121p.24.fft2d
-       mrcImageFFT -i data/121p.25.mrc2d -o data/121p.25.fft2d
-       mrcImageFFT -i data/121p.30.mrc2d -o data/121p.30.fft2d
-       mrcImageFFT -i data/121p.32.mrc2d -o data/121p.32.fft2d
-       mrcImageFFT -i data/121p.33.mrc2d -o data/121p.33.fft2d
-       mrcImageFFT -i data/121p.34.mrc2d -o data/121p.34.fft2d
-       mrcImageFFT -i data/121p.35.mrc2d -o data/121p.45.fft2d
 clean:

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/test/Outdata.3d b/src/Tools/rec3d/mrc2DFTto3DFT/src/test/Outdata.3d
deleted file mode 100644 (file)
index c69e4f9..0000000
Binary files a/src/Tools/rec3d/mrc2DFTto3DFT/src/test/Outdata.3d and /dev/null differ

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/test/TestOutdata.3d b/src/Tools/rec3d/mrc2DFTto3DFT/src/test/TestOutdata.3d
deleted file mode 100644 (file)
index 79b75dd..0000000
Binary files a/src/Tools/rec3d/mrc2DFTto3DFT/src/test/TestOutdata.3d and /dev/null differ

diff --git a/src/Tools/rec3d/mrc2DFTto3DFT/src/usage.c b/src/Tools/rec3d/mrc2DFTto3DFT/src/usage.c
index 2d19a50..244b03d 100755 (executable)
--- a/src/Tools/rec3d/mrc2DFTto3DFT/src/usage.c
+++ b/src/Tools/rec3d/mrc2DFTto3DFT/src/usage.c
@@ -10,6 +10,7 @@ usage(char* thisProgram)
     fprintf(stderr, "    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile\n");
     fprintf(stderr, "    [-t[emplate]3d       temp3d              (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: mrcFFT(3D)\n");
     fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output\n");
+    fprintf(stderr, "    [InterpMode          InterpMode          (1         ).as(Integer             ) ] :Optional  :Interpolation Mode\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();