Bug fixed: ctrl2init0

	modified:   sbin/awk/ctrl2init0.awk

diff --git a/env/.install-eos.sh.swp b/env/.install-eos.sh.swp
new file mode 100644 (file)
index 0000000..6e63abc
Binary files /dev/null and b/env/.install-eos.sh.swp differ

diff --git a/env/install-eos.sh b/env/install-eos.sh
index c14bc14..ededf91 100755 (executable)
--- a/env/install-eos.sh
+++ b/env/install-eos.sh
@@ -18,5 +18,3 @@ fi
 
 curl -L $ROOT_EOS_SOURCEFORGE/env/Eos_env
 
-
-

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSiemensStar b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSiemensStar
index 845802a..76e0cf9 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSiemensStar and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSiemensStar differ

diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSiemensStar/src/X86MAC64/mrcImageSiemensStar b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSiemensStar/src/X86MAC64/mrcImageSiemensStar
index 9ade48e..63a08bc 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSiemensStar/src/X86MAC64/mrcImageSiemensStar and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSiemensStar/src/X86MAC64/mrcImageSiemensStar differ

diff --git a/sbin/awk/ctrl2init0.awk b/sbin/awk/ctrl2init0.awk
index 8df8328..7130ba1 100755 (executable)
--- a/sbin/awk/ctrl2init0.awk
+++ b/sbin/awk/ctrl2init0.awk
@@ -25,7 +25,7 @@ BEGIN {
                printf("    info->%s=0;\n", $FullOptionField);
        }
        for(i=0; i<argNumber; i++) {
-               getEachField();
+               getEachField(i);
                if($Importance=="Variable") {
                        if(Type=="Integer") {
                                printf("    info->%s = NULL;",     Name);

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index fee1925..68ae427 100755 (executable)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -160,3 +160,10 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile
index 63232de..a146b11 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile
@@ -1,6 +1,4 @@
-# OptionControlFile
-# FileFormat
-"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","NULL"
+"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile::ASCII","stdout"
 "-N","-N[umber]","Number[pixel]","Optional","2","1","Nx","Integer","256","2","Ny","Integer","256"
 "-R","-R[adius]","Radius[pixel]","Optional","1","1","R","Integer","64"
 "-n","-n[umber]","nOfRadial","Optional","1","1","nRadial","Integer","18"

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/src/init.c b/src/Tools/mrcImage/mrcImageSiemensStar/src/init.c
index 8d35353..4f288b7 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/src/init.c
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/src/init.c
@@ -12,7 +12,7 @@
 void
 init0(mrcImageSiemensStarInfo* info)
 {
-    info->fptOut = NULL;    info->flagOut = 0;
+    info->fptOut = stdout;    info->flagOut = 0;
     info->Nx = 256;    info->flagNx = 0;
     info->Ny = 256;    info->flagNy = 0;
     info->R = 64;    info->flagR = 0;

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.html b/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.html
index 82e5298..9d2b78a 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.html
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.html
@@ -8,14 +8,22 @@
 <PRE>
 Usage: mrcImageSiemensStar
 Options:
-    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile
-    [-N[umber]           Nx                  (256       )Ny                  (256       )] :Optional  :Number[pixel]
-    [-R[adius]           R                   (64        )] :Optional  :Radius[pixel]
-    [-n[umber]           nRadial             (18        )] :Optional  :nOfRadial
-    [-delta              Delta               (1.72      )] :Optional  :Delta[A]
-    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         )] :Optional  :Mode
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-N[umber]           Nx                  (256       ).as(Integer             ) 
+                         Ny                  (256       ).as(Integer             ) ] :Optional  :Number[pixel]
+    [-R[adius]           R                   (64        ).as(Integer             ) ] :Optional  :Radius[pixel]
+    [-n[umber]           nRadial             (18        ).as(Integer             ) ] :Optional  :nOfRadial
+    [-delta              Delta               (1.72      ).as(Real                ) ] :Optional  :Delta[A]
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-Shape              Shape               (0         ).as(Integer             ) ] :Optional  :Mode
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 ----- Additional Usage -----
--mode : mrcImageHeaderMode: 2 float</PRE>
+-mode : mrcImageHeaderMode: 2 float
+                            0 char
+-Shape  0 : SiemensStar(Step)
+-Shape  1 : SiemensStar(Cos)
+-Shape  2 : Linear(Step)
+-Shape  3 : Linear(Cos)
+</PRE>
 </BODY>
 </HTML>

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/src/usage.c b/src/Tools/mrcImage/mrcImageSiemensStar/src/usage.c
index eead40a..6f86b1e 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/src/usage.c
@@ -7,7 +7,7 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (stdout    ).as(outFile::ASCII      ) ] :Essential :OutputDataFile\n");
     fprintf(stderr, "    [-N[umber]           Nx                  (256       ).as(Integer             ) \n                         Ny                  (256       ).as(Integer             ) ] :Optional  :Number[pixel]\n");
     fprintf(stderr, "    [-R[adius]           R                   (64        ).as(Integer             ) ] :Optional  :Radius[pixel]\n");
     fprintf(stderr, "    [-n[umber]           nRadial             (18        ).as(Integer             ) ] :Optional  :nOfRadial\n");