Please enter the commit message for your changes. Lines starting

 with '#' will be ignored, and an empty message aborts the commit.

 On branch master
 Your branch is up to date with 'origin/master'.

 Changes to be committed:
	modified:   src/Tools/Config/Define.inc
	modified:   src/Tools/mrcImage/mrcImageOpticalFlow/Config/OptionControlFile
	modified:   src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.html
	modified:   src/Tools/mrcImage/mrcImageOpticalFlow/src/usage.c

 Changes not staged for commit:
	modified:   include/eosMATH.h

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 976d158..8e67020 100644 (file)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -8,3 +8,4 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/mrcImage/mrcImageOpticalFlow/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageOpticalFlow/Config/OptionControlFile
index dfc4db1..1068fd8 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageOpticalFlow/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageOpticalFlow/Config/OptionControlFile
@@ -2,7 +2,7 @@
 # FileFormat
 "-i1","-i[nput]1","Input","Essential","1","1","In1","inFile::mrcImage","NULL"
 "-i2","-i[nput]2","Input","Essential","1","1","In2","inFile::mrcImage","NULL"
-"-i3","-i[nput]2","Input","Optional","1","1","In3","inFile::mrcImage","NULL"
+"-i3","-i[nput]3","Input","Optional","1","1","In3","inFile::mrcImage","NULL"
 "-o","-o[utput]","OutputDataFile","Essential","3","1","Vx","outFile::mrcImage","NULL","2","Vy","outFile::mrcImage","NULL","3","Vz","outFile::mrcImage","NULL"
 "-oF","-o[utput]F","OutputDataFile","Essential","4","1","OutFx","outFile::mrcImage","NULL","2","OutFy","outFile::mrcImage","NULL","3","OutFz","outFile::mrcImage","NULL","4","OutDi","outFile::mrcImage","NULL" 
 "-oSize","-o[utput]Size","Output:Chimera","Optional","1","1","Size","outFile::mrcImage","NULL"

diff --git a/src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.html b/src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.html
index c8b16e9..a0368a3 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.html
+++ b/src/Tools/mrcImage/mrcImageOpticalFlow/src/mrcImageOpticalFlow.html
@@ -10,7 +10,7 @@ Usage: mrcImageOpticalFlow
 Options:
     [-i[nput]1           In1                 (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input
     [-i[nput]2           In2                 (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input
-    [-i[nput]2           In3                 (NULL      ).as(inFile::mrcImage    ) ] :Optional  :Input
+    [-i[nput]3           In3                 (NULL      ).as(inFile::mrcImage    ) ] :Optional  :Input
     [-o[utput]           Vx                  (NULL      ).as(outFile::mrcImage   ) 
                          Vy                  (NULL      ).as(outFile::mrcImage   ) 
                          Vz                  (NULL      ).as(outFile::mrcImage   ) ] :Essential :OutputDataFile

diff --git a/src/Tools/mrcImage/mrcImageOpticalFlow/src/usage.c b/src/Tools/mrcImage/mrcImageOpticalFlow/src/usage.c
index 72ebc84..71fe40e 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageOpticalFlow/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageOpticalFlow/src/usage.c
@@ -9,7 +9,7 @@ usage(char* thisProgram)
     fprintf(stderr, "Options:\n");
     fprintf(stderr, "    [-i[nput]1           In1                 (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input\n");
     fprintf(stderr, "    [-i[nput]2           In2                 (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input\n");
-    fprintf(stderr, "    [-i[nput]2           In3                 (NULL      ).as(inFile::mrcImage    ) ] :Optional  :Input\n");
+    fprintf(stderr, "    [-i[nput]3           In3                 (NULL      ).as(inFile::mrcImage    ) ] :Optional  :Input\n");
     fprintf(stderr, "    [-o[utput]           Vx                  (NULL      ).as(outFile::mrcImage   ) \n                         Vy                  (NULL      ).as(outFile::mrcImage   ) \n                         Vz                  (NULL      ).as(outFile::mrcImage   ) ] :Essential :OutputDataFile\n");
     fprintf(stderr, "    [-o[utput]F          OutFx               (NULL      ).as(outFile::mrcImage   ) \n                         OutFy               (NULL      ).as(outFile::mrcImage   ) \n                         OutFz               (NULL      ).as(outFile::mrcImage   ) \n                         OutDi               (NULL      ).as(outFile::mrcImage   ) ] :Essential :OutputDataFile\n");
     fprintf(stderr, "    [-o[utput]Size       Size                (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output:Chimera\n");