OSDN Git Service

Add mrc2tiff for ARM64 v2.4.14p0357
authorTakuo Yasunaga <yasuanga@phys.kyutech.ac.jp>
Fri, 15 Apr 2022 04:32:57 +0000 (13:32 +0900)
committerTakuo Yasunaga <yasuanga@phys.kyutech.ac.jp>
Fri, 15 Apr 2022 04:32:57 +0000 (13:32 +0900)
 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 ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)

 Changes to be committed:
new file:   bin/mrcImageMovingModelCreate
modified:   hostdepend/ARM64MAC64
modified:   src/Tools/Config/Define.inc
modified:   src/Tools/filter/mrc2tiff/src/mrc2tiff.html
modified:   src/Tools/mrcImage/.Source
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/Config/Define.inc
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/Config/OptionControlFile
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/Config/Target.inc
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/Makefile
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/doc/Makefile
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/inc/config.h
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/inc/mrcImageMovingModelCreate.h
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/.Depend
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/.Source
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/ARM64MAC64
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/Makefile
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/argCheck.c
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/init.c
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.c
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.html
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.pane
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/test/Makefile
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/test/data
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/usage.c
new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/util.c
modified:   util/src/Graphics/Makefile

 Changes not staged for commit:
modified:   hostdepend/ARM64MAC64 (new commits)
modified:   include/eosMATH.h

26 files changed:
bin/mrcImageMovingModelCreate [new symlink]
hostdepend/ARM64MAC64
src/Tools/Config/Define.inc
src/Tools/filter/mrc2tiff/src/mrc2tiff.html
src/Tools/mrcImage/.Source
src/Tools/mrcImage/mrcImageMovingModelCreate/Config/Define.inc [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/Config/OptionControlFile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/Config/Target.inc [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/doc/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/inc/config.h [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/inc/mrcImageMovingModelCreate.h [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/.Depend [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/.Source [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/ARM64MAC64 [new symlink]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/argCheck.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/init.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.html [new file with mode: 0644]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.pane [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/test/Makefile [new file with mode: 0644]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/test/data [new symlink]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/usage.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMovingModelCreate/src/util.c [new file with mode: 0755]
util/src/Graphics/Makefile

diff --git a/bin/mrcImageMovingModelCreate b/bin/mrcImageMovingModelCreate
new file mode 120000 (symlink)
index 0000000..eddb955
--- /dev/null
@@ -0,0 +1 @@
+../sbin/MachineIndependent
\ No newline at end of file
index 7c875f6..c306552 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7c875f6f9d1e61278a3839fbb3e1af4753cfb36a
+Subproject commit c3065522e7b0c8f309ff01f63e8a2ddfcf9b9116
index 2b24bf8..976d158 100644 (file)
@@ -3,3 +3,8 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
index 75db42b..637c789 100755 (executable)
@@ -1 +1,36 @@
-/bin/bash: mrc2tiff: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>mrc2tiff</TITLE>
+</HEAD>
+<BODY>
+<H1>mrc2tiff</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrc2tiff
+Options:
+    [-i[nput]            inFile              (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           outFile             (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-H[igh]             High                (0         ).as(Real                ) ] :Optional  :HighThreshold
+    [-L[ow]              Low                 (0         ).as(Real                ) ] :Optional  :LowThreshold
+    [-I[nverse]                                                                    ] :Optional  :Inverse(Black is white)
+    [-raw                                                                          ] :Optional  :raw
+    [-offset             Offset              (0         ).as(Real                ) ] :Optional  :raw
+    [-Z                  Z                   (0         ).as(Integer             ) ] :Optional  :Each: 0<=, SerialSection:-1
+    [-r[esolution]       Resolution          (1.0       ).as(Real                ) ] :Optional  :[A]
+    [-r[esolution]3      ResolutionX         (1.0       ).as(Real                ) 
+                         ResolutionY         (1.0       ).as(Real                ) 
+                         ResolutionZ         (1.0       ).as(Real                ) ] :Optional  :[A]
+    [-e[xtension]        format              (%s.%04d ).as(String              ) ] :Optional  :SerialSectionFormat
+    [-color              colorMode           (0         ).as(Integer             ) ] :Optional  :Color
+    [-colorRange         colorRangeMin       (0         ).as(Real                ) 
+                         colorRangeMax       (100       ).as(Real                ) ] :Optional  :ColorRange
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-M[ode]             Mode                (0         ).as(Integer             ) ] :Optional  :Mode: 0:char 1:short 2:float 6:unsigned short
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode: 
+                       0 (8bits), 1(16bits), 2(float)
+                       
+--- Attention ---
+Previously, the black and white were inter-changed between mrc and tiff.  Now they are not changed
+</PRE>
+</BODY>
+</HTML>
index fd52538..ca7e4d2 100644 (file)
@@ -175,6 +175,7 @@ mrcImageModelCreate \
 mrcImageModelSubfilamentsCreate \
 mrcImageMontageCreate \
 mrcImageMove \
+mrcImageMovingModelCreate \
 mrcImageMultiCTFCompensation \
 mrcImageMultiCTFDetermination \
 mrcImageMultiplying \
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/Config/Define.inc b/src/Tools/mrcImage/mrcImageMovingModelCreate/Config/Define.inc
new file mode 100755 (executable)
index 0000000..1d9b653
--- /dev/null
@@ -0,0 +1,4 @@
+OBJECTNAME = mrcImageMovingModelCreate
+EXTRA_LIB  =
+EXTRA_CCOPTS =
+EXTRA_INC =
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageMovingModelCreate/Config/OptionControlFile
new file mode 100755 (executable)
index 0000000..4bbb617
--- /dev/null
@@ -0,0 +1,10 @@
+# OptionControlFile
+# FileFormat
+"-i","-i[nput]","Input:Moving","Essential","1","1","In","inFile::Array","NULL"
+"-o","-o[utput]","Output","Optional","1","1","Out","outFile::ASCII","NULL"
+"-O","-O[utput]","Output","Optional","1","1","OutName","String","Movie_%04d.mrc"
+"-n","-n","numberOfMovie","Optional","1","1","Num","Integer","10"
+"-N","-N","Output:mrcImageSize","Optional","3","1","Nx","Integer","256","2","Ny","Integer","256","3","Nz","Integer","256"
+"-L","-L","Output:mrcImageLength","Optional","3","1","Lx","Real","1.0","2","Ly","Real","1.0","3","Lz","Real","1.0"
+"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
+"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/Config/Target.inc b/src/Tools/mrcImage/mrcImageMovingModelCreate/Config/Target.inc
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/Makefile b/src/Tools/mrcImage/mrcImageMovingModelCreate/Makefile
new file mode 100755 (executable)
index 0000000..3d1cbd9
--- /dev/null
@@ -0,0 +1,115 @@
+include ../../../Config/Define.inc
+include ../../Config/Define.inc
+include ../Config/Define.inc
+include Config/Define.inc
+
+all:
+       cd src; make all; cd ..
+
+install:
+       cd src; make install; cd ..
+
+
+putSF:
+       if [ -f private ] ; \
+       then \
+               echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \
+       else \
+               cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \
+       fi
+
+put:
+       cd src; make put; cd ..
+
+clean:
+       cd src; make clean; cd ..
+
+depend:
+       cd src; make depend; cd ..
+
+check:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
+               echo making directory; \
+               mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
+       fi
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; make depend
+
+update:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
+               echo making directory; \
+               mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
+       fi
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; echo "Y" | make update      
+
+cvsupdate::
+       cvs -d $(EOS_CVSROOT) update -d 
+
+cvscommit::
+       cvs -d $(EOS_CVSROOT) commit
+
+backup:
+       @cd ../../../..;     \
+       echo $(OBJECTNAME) ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
+
+backup-all:
+       @cd ../../../..;     \
+       echo $(OBJECTNAME) ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
+       
+distribute:
+       cd ../../../..;     \
+       echo $(OBJECTNAME) ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
+       
+distribute-all:
+       @cd ../../../..;     \
+       echo $(OBJECTNAME) ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
+
+eosintroduce:
+       ${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ 
+
+include Config/Target.inc
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/doc/Makefile b/src/Tools/mrcImage/mrcImageMovingModelCreate/doc/Makefile
new file mode 100755 (executable)
index 0000000..8215199
--- /dev/null
@@ -0,0 +1,2 @@
+install:
+       cd ../src; make install-doc; cd ../doc  
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/inc/config.h b/src/Tools/mrcImage/mrcImageMovingModelCreate/inc/config.h
new file mode 100755 (executable)
index 0000000..e21fe95
--- /dev/null
@@ -0,0 +1,6 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "../inc/mrcImageMovingModelCreate.h"
+
+#endif /* CONFIG_H */
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/inc/mrcImageMovingModelCreate.h b/src/Tools/mrcImage/mrcImageMovingModelCreate/inc/mrcImageMovingModelCreate.h
new file mode 100755 (executable)
index 0000000..f240010
--- /dev/null
@@ -0,0 +1,70 @@
+#ifndef MRCIMAGEMOVINGMODELCREATE_H
+#define MRCIMAGEMOVINGMODELCREATE_H
+#include <stdio.h>
+#include <stdlib.h>
+
+#define OPTION_FLAG     '-'
+#define OPTION_FLAG_POS (0)
+#define OPTION_POS      (1)
+
+
+
+
+typedef struct mrcImageMovingModelCreateInfo {
+    long flagRedirect;
+
+    long flagIn;
+    char* In;
+    FILE* fptIn;
+    
+    long flagOut;
+    char* Out;
+    FILE* fptOut;
+    
+    long flagOutName;
+    char* OutName;
+    
+    long flagNum;
+    long Num;
+    
+    long flagNx;
+    long Nx;
+    
+    long flagNy;
+    long Ny;
+    
+    long flagNz;
+    long Nz;
+    
+    long flagLx;
+    float Lx;
+    
+    long flagLy;
+    float Ly;
+    
+    long flagLz;
+    float Lz;
+    
+    long flagconfigFile;
+    char* configFile;
+    FILE* fptconfigFile;
+    
+    long flagmode;
+    long mode;
+    
+} mrcImageMovingModelCreateInfo;
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void argCheck(mrcImageMovingModelCreateInfo* info, int argc, char* avgv[]);
+extern void khorosInit(int argc, char* avgv[]);
+extern void init0(mrcImageMovingModelCreateInfo* info);
+extern void init1(mrcImageMovingModelCreateInfo* info);
+extern void usage(char* usage);
+extern void additionalUsage(void);
+extern void htmlBeforeUsage(char* usage);
+extern void htmlAfterUsage(char* usage);
+#ifdef __cplusplus
+};
+#endif
+#endif /* MRCIMAGEMOVINGMODELCREATE_H */
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/.Depend b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/.Depend
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/.Source b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/.Source
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/ARM64MAC64 b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/ARM64MAC64
new file mode 120000 (symlink)
index 0000000..9816069
--- /dev/null
@@ -0,0 +1 @@
+../../../../../hostdepend/ARM64MAC64/src/Tools/mrcImage/mrcImageMovingModelCreate/src/ARM64MAC64
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/Makefile b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/Makefile
new file mode 100755 (executable)
index 0000000..a360703
--- /dev/null
@@ -0,0 +1,430 @@
+include ../Config/Define.inc
+include ../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../../../Config/Define.inc
+
+EOSHOME=../../../../../
+DSTDIR=$(EOSHOME)/bin
+DSTDOC=$(EOSHOME)/doc
+DSTTAR=$(EOSHOME)/tar
+
+INCFILES   = 
+
+LIBFILES   = \
+                       $(LIBPREFIX)EosObjects$(LIBSUFFIX) 
+
+LIBFILESDEBUG   = \
+                       $(LIBPREFIX)EosObjects.debug$(LIBSUFFIX) 
+
+SRCC  = \
+                       $(OBJECTNAME).c \
+                       init.c \
+                       argCheck.c \
+                       usage.c  \
+                       util.c \
+
+SRCCXX  = \
+                       $(OBJECTNAME).cc \
+                       init.cc \
+                       argCheck.cc \
+                       usage.cc  \
+                       util.cc \
+
+MODULES    = \
+                       $(OBJECTNAME).o \
+                       init.o \
+                       argCheck.o \
+                       usage.o  \
+                       util.o \
+
+REALMODULES    = \
+                       $(OSTYPE)/$(OBJECTNAME).o \
+                       $(OSTYPE)/init.o \
+                       $(OSTYPE)/argCheck.o \
+                       $(OSTYPE)/usage.o \
+                       $(OSTYPE)/util.o 
+
+MODULESDEBUG    = \
+                       $(OBJECTNAME).debugo \
+                       init.debugo \
+                       argCheck.debugo \
+                       usage.debugo  \
+                       util.debugo \
+
+REALMODULESDEBUG    = \
+                       $(OSTYPE)/$(OBJECTNAME).debugo \
+                       $(OSTYPE)/init.debugo \
+                       $(OSTYPE)/argCheck.debugo \
+                       $(OSTYPE)/usage.debugo \
+                       $(OSTYPE)/util.debugo 
+
+
+all: $(OSTYPE)/$(OBJECTNAME) 
+       if [ ! -L $(OSTYPE) ] ; then \
+               moveHostdependent; \
+       fi
+
+debug: $(OSTYPE)/$(OBJECTNAME).debug
+
+cudagdb: $(OSTYPE)/$(OBJECTNAME).cudagdb
+
+
+$(OSTYPE)/$(OBJECTNAME)::
+       @$(RM) -f $(OSTYPE)/Makefile ; \
+       $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
+       cd $(OSTYPE); \
+       $(MAKE) $(OBJECTNAME)  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
+
+$(OSTYPE)/$(OBJECTNAME).debug::
+       @$(RM) -f $(OSTYPE)/Makefile ; \
+       $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
+       cd $(OSTYPE); \
+       $(MAKE) $(OBJECTNAME).debug  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
+
+$(OSTYPE)/$(OBJECTNAME).cudagdb::
+       @$(RM) -f $(OSTYPE)/Makefile ; \
+       $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
+       cd $(OSTYPE); \
+       $(MAKE) $(OBJECTNAME).cudagdb WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
+
+cvsupdate::
+       cvs -d $(EOS_CVSROOT) update -d 
+
+cvscommit::
+       cvs -d $(EOS_CVSROOT) commit 
+
+edit:
+       @if [ -r $(OBJECTNAME).c ]; \
+       then \
+               sccsEdit $(OBJECTNAME).c; \
+       else \
+               echo "Source files are already editable"; \
+       fi
+       @if [ -r wish/$(OBJECTNAME).wish ]; \
+       then \
+               cd wish; sccsEdit $(OBJECTNAME).wish; \
+       else \
+               echo "Source files (wish) are already editable."; \
+       fi
+       @if [ -r ruby/$(OBJECTNAME).rb ]; \
+       then \
+               cd ruby; sccsEdit $(OBJECTNAME).rb; \
+       else \
+               echo "Source files (ruby) are already editable."; \
+       fi
+       @if [ -r perl/$(OBJECTNAME).pl ]; \
+       then \
+               cd perl; sccsEdit $(OBJECTNAME).pl ; \
+       else \
+               echo "Source files (perl) are already editable."; \
+       fi
+       @if [ -r ../Config/OptionControlFile ]; \
+       then \
+               cd ../Config; sccsEdit OptionControlFile; \
+       else \
+               echo "OptionControlFile are already editable."; \
+       fi
+       
+unedit:
+       @if [ -w $(OBJECTNAME).c ]; \
+       then \
+               sccsUnedit $(OBJECTNAME).c; \
+       else \
+               echo "Source files are not editable"; \
+       fi
+       @if [ -w wish/$(OBJECTNAME).wish ]; \
+       then \
+               cd wish; sccsUnedit $(OBJECTNAME).wish; \
+       else \
+               echo "Source files (wish) are not editable."; \
+       fi
+       @if [ -w ruby/$(OBJECTNAME).rb]; \
+       then \
+               cd ruby; sccsUnedit $(OBJECTNAME).rb; \
+       else \
+               echo "Source files (ruby) are not editable."; \
+       fi
+       @if [ -w perl/$(OBJECTNAME).pl ]; \
+       then \
+               cd perl; sccsUnedit $(OBJECTNAME).pl ; \
+       else \
+               echo "Source files (ruby) are not editable."; \
+       fi
+       @if [ -w ../Config/OptionControlFile ]; \
+       then \
+               cd ../Config; sccsUnedit OptionControlFile; \
+       else \
+               echo "OptionControlFile are not editable."; \
+       fi
+       
+report:
+       @if [ -r $(OBJECTNAME).c ]; \
+       then \
+               sccsReport $(OBJECTNAME).c; \
+       else \
+               echo "Source files are already editable"; \
+       fi
+       @if [ -r wish/$(OBJECTNAME).wish ]; \
+       then \
+               cd wish; sccsReport $(OBJECTNAME).wish; \
+       else \
+               echo "Source files (wish) are already editable."; \
+       fi
+       @if [ -r ruby/$(OBJECTNAME).rb ]; \
+       then \
+               cd ruby; sccsReport $(OBJECTNAME).rb; \
+       else \
+               echo "Source files (ruby) are already editable."; \
+       fi
+       @if [ -r perl/$(OBJECTNAME).pl ] ; \
+       then \
+               cd perl; sccsReport $(OBJECTNAME).pl ; \
+       else \
+               echo "Source files (perl) are already editable."; \
+       fi
+       @if [ -r ../Config/OptionControlFile ]; \
+       then \
+               cd ../Config; sccsReport OptionControlFile; \
+       else \
+               echo "OptionControlFile are already editable."; \
+       fi
+
+clean : 
+       rm -f *.debugo $(OSTYPE)/*.debugo *.cudagdbo $(OSTYPE)/*.cudagdbo *.o $(OSTYPE)/*.o *.linkinfo $(OSTYPE)/*.linkinfo \
+               $(OSTYPE)/$(OBJECTNAME) $(OSTYPE)/*.$(OSTYPE) \
+               $(OSTYPE)/$(OBJECTNAME).debug $(OSTYPE)/*.$(OSTYPE).debug \
+               $(OSTYPE)/$(OBJECTNAME).cudagdb $(OSTYPE)/*.$(OSTYPE).cudagdb \
+               $(OSTYPE)/$(OBJECTNAME).linkinfo $(OSTYPE)/*.$(OSTYPE).linkinfo \
+               *.bak *.$(OSTYPE) core
+
+install: install-bin install-doc install-wish install-ruby install-shell install-perl
+       @if [ dummy$(KHOROS_KENGOBJ) != dummy ]  ; \
+       then \
+               if [ -x $(KHOROS_KGENOBJ) ] ;  \
+               then \
+                       make install-khoros ; \
+               fi; \
+       fi 
+
+install-bin:$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) 
+
+$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME) 
+       @echo ---- Installing to bin
+       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
+       @if [ ! -d $(DSTDIR)/$(OSTYPE) ]; \
+       then \
+               mkdir $(DSTDIR)/$(OSTYPE); \
+       fi
+       @if [ -x $(OSTYPE)/$(OBJECTNAME) ]; \
+       then \
+               echo "Compilation is complete"; \
+               $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+       else \
+               echo "Compilation is incomplete. $(OBJECTNAME)"; \
+       fi
+       @echo ---- end of bin
+
+install-wish:
+       @if [ -d wish ]; \
+       then \
+               echo "---- Tcl/Tk file Install"; \
+               if [ ! -d $(DSTDIR)/wish/$(OBJECTNAME) ]; \
+               then \
+                       mkdir $(DSTDIR)/wish/$(OBJECTNAME) ; \
+               fi ; \
+               $(CP) -f wish/* $(DSTDIR)/wish/$(OBJECTNAME); \
+               $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/*  ;\
+               touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
+               $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
+               echo "---- Tcl/Tk file Installed";\
+       fi
+
+install-ruby:
+       @if [ -d ruby ]; \
+       then \
+               echo "---- Ruby/Tk file Install"; \
+               if [ ! -d $(DSTDIR)/ruby/$(OBJECTNAME) ]; \
+               then \
+                       mkdir $(DSTDIR)/ruby/$(OBJECTNAME) ; \
+               fi ; \
+               $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
+               $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
+               echo "---- Ruby/Tk file Installed"; \
+       fi
+
+install-perl:
+       @if [ -d perl ]; \
+       then \
+               echo "---- Perl/Tk file Install"; \
+               if [ ! -d $(DSTDIR)/perl/$(OBJECTNAME) ]; \
+               then \
+                       mkdir $(DSTDIR)/perl/$(OBJECTNAME) ; \
+               fi; \
+               $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
+               $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
+               echo "---- Perl/Tk file Installed"; \
+       fi
+
+install-shell:
+       @if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \
+       then \
+               mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \
+       fi
+       @if [ -d shell ]; \
+       then \
+               echo "---- Shell file Install"; \
+               if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \
+               then \
+                       mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \
+               fi ; \
+               $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
+               $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
+               echo "---- Shell file Installed"; \
+       fi
+
+install-khoros:
+       @echo Installing to khoros
+       @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KGENOBJ) ]; \
+       then \
+               echo kgenobj;\
+               $(KHOROS_KGENOBJ) -tb Eos -oname $(OBJECTNAME) -type script -pane -cantata true -cat Eos -subcat $(CLASSNAME) -description $(OBJECTNAME) -bname $(OBJECTNAME) -form  -lang ksh ; \
+       fi
+       @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \
+       then \
+               $(KHOROS_KSET) -tb Eos -oname $(OBJECTNAME) -icon $(OBJECTNAME) ; \
+       fi
+       @if [ -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \
+       then \
+               $(CHMOD) -R 775 ../../../../../objects/script/$(OBJECTNAME) ; \
+               if [ $?  ] ; \
+               then \
+                       echo "-- setting khoros ---" ; \
+                       if [ -d ../../../../../objects/script/$(OBJECTNAME)/uis/ ] ; \
+                       then \
+                               $(CD) ../../../../../objects/script/$(OBJECTNAME)/uis/ ; \
+                               $(RM) -f $(OBJECTNAME).pane ; \
+                               $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
+                               $(CD) ../../ ; \
+                               $(CHMOD) -R 555 $(OBJECTNAME); \
+                       else \
+                               echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
+                       fi ; \
+               else \
+                       echo "Failed !!: Cannot chage mode in installing  $(OBJECTNAME) to khoros system"; \
+               fi ; \
+               echo "-- end of khoros-installing"; \
+       fi
+
+install-doc: html 
+       @if [ ! -d $(DSTDOC)/SmallTools ]; \
+       then \
+               mkdir $(DSTDOC)/SmallTools ;\
+       fi
+       @if [ -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ]; \
+       then \
+               $(RM) -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ;\
+       fi
+       @$(CP) $(OBJECTNAME).html  $(DSTDOC)/SmallTools/$(OBJECTNAME).html
+       @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html
+       @if [ -f ../doc/*.html ]; \
+       then \
+               $(CP) ../doc/*.html  $(DSTDOC)/SmallTools/ ;\
+       fi
+       @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html
+       @if [ -f $(DSTDOC)/SmallTools/Makefile ]; \
+       then \
+               cd $(DSTDOC)/SmallTools; $(MAKE); \
+       fi
+
+html: $(OBJECTNAME).html
+
+configFileRead:
+       @ctrl2configFileRead $(CLASSNAME) $(OBJECTNAME) ../Config/OptionControlFile
+
+$(OBJECTNAME).html: $(OSTYPE)/$(OBJECTNAME)
+       @echo creating html
+       @$(OSTYPE)/$(OBJECTNAME) -html 2> $(OBJECTNAME).html.tmp
+       @sed -e s/$(OSTYPE)\\/// $(OBJECTNAME).html.tmp > $(OBJECTNAME).html
+       @$(RM) $(OBJECTNAME).html.tmp
+
+$(DSTDIR)/$(OBJECTNAME): $(OSTYPE)/$(OBJECTNAME)
+       @ln -s -f ../sbin/MachineIndependent $@
+
+depend::
+       @echo dependency checking now
+       @if [ ! -L $(OSTYPE) ] ; then \
+               moveHostdependent; \
+       fi
+       rm -f $(OSTYPE)/.Depend 
+       #echo C
+       @if [ -f $(OBJECTNAME).c ] ; \
+       then \
+               echo "dependency: *.c"; \
+               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c   ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
+       fi
+       #echo CC
+       @if [ -f $(OBJECTNAME).cc ] ; \
+       then \
+               echo "dependency: *.cc"; \
+               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc >> $(OSTYPE)/.Depend ; \
+       fi
+       @if [ -f $(OBJECTNAME).ccm ] ; \
+       then \
+               echo "dependency: *.ccm"; \
+               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm >> $(OSTYPE)/.Depend ; \
+       fi
+       @if [ -f $(OBJECTNAME).cu ] ; \
+       then \
+               echo "dependency: *.cu"; \
+               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu >> $(OSTYPE)/.Depend ; \
+       fi
+
+update:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update
+
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
+changeName::
+
+Test:$(OSTYPE)/$(OBJECTNAME) TestDir
+       @if [ -f test/Makefile ] ; \
+       then \
+               cd test; make ; \
+       else \
+               echo "No test Makefile"; \
+       fi
+
+TestDir::
+       @if [ ! -d test ] ; \
+       then \
+               echo "Creating test dir"; \
+               mkdir  test; \
+       fi
+       @if [ ! -f test/Makefile ] ; \
+       then \
+               echo "Creating Makefile"; \
+               cd test; \
+               protoTestMakefileCreate; \
+       fi
+       @if [ ! -d test/data ]; \
+       then \
+               mkdir $(EOSHOME)/data/$(OBJECTNAME); \
+               cd test; \
+               ln -sf ../$(EOSHOME)/data/$(OBJECTNAME) data; \
+       fi 
+
+tar::
+       cd $(DSTTAR); tar cvf Tools.$(CLASSNAME).$(OBJECTNAME).tar ../bin/$(OBJECTNAME) \
+                                                            ../bin/*/$(OBJECTNAME).* \
+                                                            ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
+                               ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
+
+-include $(OSTYPE)/.Depend
+-include ../Config/Target.inc
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/argCheck.c b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/argCheck.c
new file mode 100755 (executable)
index 0000000..f2f11da
--- /dev/null
@@ -0,0 +1,152 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "../inc/config.h"
+#include "genUtil.h"
+#include "eosString.h"
+#include "File.h"
+#include "Memory.h"
+
+
+void
+argCheck(mrcImageMovingModelCreateInfo* info, int argc, char* argv[])
+{
+    long i;
+    char s[1024];
+    FILE* fpt;
+    
+    if(NULL==(fpt=fopen(".EosLog", "a+"))) { 
+        
+    } else {
+        for(i=0; i<argc; i++) {
+            fprintf(fpt, "%s ", argv[i]);
+        }
+        fprintf(fpt, "\n");
+        fclose(fpt);
+    }
+    for(i=1; i<argc; i++) {
+        if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) {
+            SSWITCH(argv[i]+OPTION_POS)
+                SCASE("i") {
+                    if(i+1<argc) {
+                        info->In = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagIn++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("o") {
+                    if(i+1<argc) {
+                        info->Out = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagOut++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("O") {
+                    if(i+1<argc) {
+                        info->OutName = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagOutName++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("n") {
+                    if(i+1<argc) {
+                        info->Num = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagNum++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("N") {
+                    if(i+3<argc) {
+                        info->Nx = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagNx++;
+                        info->Ny = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagNy++;
+                        info->Nz = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagNz++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("L") {
+                    if(i+3<argc) {
+                        info->Lx = stringGetNthRealData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagLx++;
+                        info->Ly = stringGetNthRealData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagLy++;
+                        info->Lz = stringGetNthRealData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagLz++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("c") {
+                    if(i+1<argc) {
+                        info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagconfigFile++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("m") {
+                    if(i+1<argc) {
+                        info->mode = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagmode++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("h") {
+                    usage(argv[0]);
+                    exit(EXIT_SUCCESS);
+                    break;
+                }
+                SCASE("html") {
+                    htmlBeforeUsage(argv[0]);
+                    usage(argv[0]);
+                    htmlAfterUsage(argv[0]);
+                    exit(EXIT_SUCCESS);
+                    break;
+                }
+                SDEFAULT {
+                    fprintf(stderr, "Not Supported Options: :%s\n", argv[i]);
+                    usage(argv[0]);
+                    exit(EXIT_FAILURE);
+                    break;
+                }
+            SSWITCHEND;
+        } 
+    } 
+} 
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/init.c b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/init.c
new file mode 100755 (executable)
index 0000000..6a06b0b
--- /dev/null
@@ -0,0 +1,118 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "../inc/config.h"
+#include "genUtil.h"
+#include "eosString.h"
+#include "File.h"
+#include "Memory.h"
+
+
+void
+init0(mrcImageMovingModelCreateInfo* info)
+{
+    info->fptIn = NULL;    info->flagIn = 0;
+    info->fptOut = NULL;    info->flagOut = 0;
+    info->OutName = stringGetNthWord("Movie_%04d.mrc", 1, "\0");    info->flagOutName = 0;
+    info->Num = 10;    info->flagNum = 0;
+    info->Nx = 256;    info->flagNx = 0;
+    info->Ny = 256;    info->flagNy = 0;
+    info->Nz = 256;    info->flagNz = 0;
+    info->Lx = 1.0;    info->flagLx = 0;
+    info->Ly = 1.0;    info->flagLy = 0;
+    info->Lz = 1.0;    info->flagLz = 0;
+    info->fptconfigFile = NULL;    info->flagconfigFile = 0;
+    info->mode = 0;    info->flagmode = 0;
+}
+
+void
+init1(mrcImageMovingModelCreateInfo* info)
+{
+    char s[1024];
+    int i;
+    if(!info->flagIn) {
+        stringGetFromFile(s, "In", stdin, stdout, 0);
+        info->In = stringGetNthWord(s, 1, " ,\t");
+        info->flagIn++;
+    }
+    if(info->flagIn) {
+        info->fptIn = fileOpen(info->In, "r");
+    }
+    
+    if(info->flagOut) {
+        info->fptOut = fileOpen(info->Out, "w");
+    }
+    
+    if(info->flagOutName) {
+    }
+    
+    if(info->flagNum) {
+    }
+    
+    if(info->flagNx) {
+    }
+    
+    if(info->flagNy) {
+    }
+    
+    if(info->flagNz) {
+    }
+    
+    if(info->flagLx) {
+    }
+    
+    if(info->flagLy) {
+    }
+    
+    if(info->flagLz) {
+    }
+    
+    if(info->flagconfigFile) {
+        info->fptconfigFile = fileOpen(info->configFile, "r");
+    }
+    
+    if(info->flagmode) {
+    }
+    
+}
+#ifdef KHOROS
+#include <stdio.h>
+#include "bootstrap.h"
+#include "dataserv.h"
+#include "datamanip.h"
+extern void func_usage_additions(void);
+extern void func_free_args(kexit_status status, kaddr client_data);
+extern void func_get_args(kform* pane);
+
+void
+func_usage_additions(void)
+{
+}
+void
+func_free_args(kexit_status status, kaddr client_data)
+{
+}
+void
+func_get_args(kform* pane)
+{
+}
+void
+khorosInit(int argc, char* argv[])
+{
+    char* eospath;
+    char  panepath[1024];
+    FILE* fpt;
+    
+    eospath = getenv("EOS_HOME");
+    sprintf(panepath, "%s/src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.pane", eospath);
+    khoros_initialize(argc, argv, "EOS");
+    fpt = fopen(panepath, "r");    if(NULL!=fpt) {
+        fclose(fpt);
+        kclui_initialize(panepath, KGEN_NONE, "EOS", "mrcImageMovingModelCreate",
+                     func_usage_additions,
+                     func_get_args,
+                     func_free_args);
+    }
+}
+#endif /* KHOROS */ 
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.c b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.c
new file mode 100755 (executable)
index 0000000..ee76d9c
--- /dev/null
@@ -0,0 +1,116 @@
+/*
+# mrcImageMovingModelCreate : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : mrcImageMovingModelCreate
+# Attention
+#   $Loccker$
+#      $State$ 
+#
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>                  
+#define GLOBAL_DECLARATION
+#include "../inc/config.h"
+
+#define DEBUG
+#include "genUtil.h"
+#include "mrcImage.h"
+
+typedef struct lmrcImageMovingModelCreateInfo {
+    mrcImage template;
+       char* OutName;
+       FILE* OutList;
+
+    int N;
+} lmrcImageMovingModelCreateInfo;
+
+typedef enum lmrcImageMovingModelCreateMode {
+       a=0,
+       b=1
+} lmrcImageMovingModelCreateMode;
+
+void lmrcImageMovingModelCreate(Array* in, lmrcImageMovingModelCreateInfo* linfo, lmrcImageMovingModelCreateMode mode);
+
+int
+main(int argc, char* argv[]) 
+{
+       mrcImageMovingModelCreateInfo info;
+       lmrcImageMovingModelCreateInfo linfo;
+       lmrcImageMovingModelCreateMode mode;
+    mrcImage out;
+    Array in;
+
+       init0(&info);
+    argCheck(&info, argc, argv);
+    init1(&info);
+
+       DEBUGPRINT("Program Start\n");
+    arrayReadFromFile(info.fptIn, &in, "in main");      
+    
+    linfo.OutName = info.OutName;
+    linfo.OutList = info.fptOut;
+    mrcDefaultHeaderValueSet(&linfo.template);
+    linfo.template.HeaderN.x = info.Nx; 
+    linfo.template.HeaderN.y = info.Ny; 
+    linfo.template.HeaderN.z = info.Nz; 
+    linfo.template.HeaderLength.x = info.Lx; 
+    linfo.template.HeaderLength.y = info.Ly; 
+    linfo.template.HeaderLength.z = info.Lz; 
+    linfo.template.HeaderMode = mrcFloatImage;
+    linfo.N = info.Num;
+
+    lmrcImageMovingModelCreate(&in, &linfo, mode);
+       exit(EXIT_SUCCESS);
+}
+
+void
+additionalUsage()
+{
+       fprintf(stderr, "----- Additional Usage -----\n");
+       fprintf(stderr, "input file type: Array type N:Number of Moving objects\n");
+       fprintf(stderr, "2 10 N\n");
+       fprintf(stderr, "intensity sigx sigy sigz startx starty startz vx vy vz\n");
+}
+
+void 
+lmrcImageMovingModelCreate(Array* in, lmrcImageMovingModelCreateInfo* linfo, lmrcImageMovingModelCreateMode mode)
+{
+    int i, j, k;
+    mrcImage tmp;
+    double I, sig[3], start[3], v[3], p[3];
+    float x, y, z;
+    double data, px, py, pz;
+    char tmpString[1024];
+
+    for(i=0; i<linfo->N; i++) {
+        tmp = linfo->template;
+        mrcInit(&tmp, NULL) ;
+        for(k=0; k < in->n[1]; k++) { // particle
+            I = in->A[0+k*in->n[0]];
+            for(j=0; j<3; j++) {
+                sig[j]   = in->A[1+j+k*in->n[0]]; 
+                start[j] = in->A[4+j+k*in->n[0]]; 
+                v[j]     = in->A[7+j+k*in->n[0]]; 
+                p[j] = start[j] + i*v[j];
+            }
+            DEBUGPRINT3("p %f %f %f\n", p[0], p[1], p[2]);
+            DEBUGPRINT3("sig %f %f %f\n", sig[0], sig[1], sig[2]);
+            for(z=0; z<tmp.HeaderN.z; z++) {
+            for(y=0; y<tmp.HeaderN.y; y++) {
+            for(x=0; x<tmp.HeaderN.x; x++) {
+                mrcPixelDataGet(&tmp, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
+                data += I*exp(-SQR(x-p[0])/SQR(sig[0])/2.0-SQR(y-p[1])/SQR(sig[1])/2.0-SQR(z-p[2])/SQR(sig[2])/2.0);
+                mrcPixelDataSet(&tmp, x, y, z, data, mrcPixelRePart);
+            }
+            }
+            }
+        }
+        sprintf(tmpString, linfo->OutName, i);
+        mrcFileWrite(&tmp, tmpString, "in main", 0);
+        fprintf(linfo->OutList, "%s\n", tmpString);fflush(linfo->OutList);
+        mrcImageFree(&tmp, "in main");
+    }
+}
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.html b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.html
new file mode 100644 (file)
index 0000000..d48e159
--- /dev/null
@@ -0,0 +1,29 @@
+<HTML>
+<HEAD>
+<TITLE>mrcImageMovingModelCreate</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageMovingModelCreate</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageMovingModelCreate
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::Array       ) ] :Essential :Input:Moving
+    [-o[utput]           Out                 (NULL      ).as(outFile::ASCII      ) ] :Optional  :Output
+    [-O[utput]           OutName             (Movie_%04d.mrc).as(String              ) ] :Optional  :Output
+    [-n                  Num                 (10        ).as(Integer             ) ] :Optional  :numberOfMovie
+    [-N                  Nx                  (256       ).as(Integer             ) 
+                         Ny                  (256       ).as(Integer             ) 
+                         Nz                  (256       ).as(Integer             ) ] :Optional  :Output:mrcImageSize
+    [-L                  Lx                  (1.0       ).as(Real                ) 
+                         Ly                  (1.0       ).as(Real                ) 
+                         Lz                  (1.0       ).as(Real                ) ] :Optional  :Output:mrcImageLength
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+input file type: Array type N:Number of Moving objects
+2 10 N
+intensity sigx sigy sigz startx starty startz vx vy vz
+</PRE>
+</BODY>
+</HTML>
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.pane b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/mrcImageMovingModelCreate.pane
new file mode 100755 (executable)
index 0000000..6444469
--- /dev/null
@@ -0,0 +1,20 @@
+-F 4.3 1 0 52x1+0+0 +0+0 'Cantata' cantata
+  -M 1 1 52x1+0+0 +1+0 ' ' subform
+    -P 1 0 52x1+0+1 +0+0 ' ' mrcImageMovingModelCreate
+      -D 1 0 9x1+0+0 'Options' _gui_options
+        -H 1  6x1+0+0 'License' 'license' $BOOTSTRAP/repos/license/License license
+        -E
+        -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOS/bin/mrcImageMovingModelCreate
+        -H 1  5x1+41+0 'Help' 'help page' $EOS/src/Tools/mrcImage/mrcImageMovingModelCreate/doc/mrcImageMovingModelCreate.doc help
+        -Q 1 0 5.25x1+47+0 'Close'
+        -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'Input:Moving' i
+        -O 1 0 1 0 0 1 -1x1+1+3.000000 ' ' 'Out' 'Output' o
+        -s 1 0 1 0 0 -1x1+1+4.500000 0 0 0 0 0 'OutName' 'Output' O
+        -i 1 0 1 0 0 -1x1+1+6.000000 0 0 10 0 0 'Num' 'numberOfMovie' n
+        -I  1 0 0 1 0 1 -1x1+1+7 ' ' '256' 'Nx' Output:mrcImageSize
+        -I  1 0 0 1 0 1 -1x1+1+9 ' ' '1.0' 'Lx' Output:mrcImageLength
+        -I 1 0 1 0 0 1 -1x1+1+10.500000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+12.000000 0 0 0 0 0 'mode' 'Mode' m
+    -E
+  -E
+-E
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/test/Makefile b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/test/Makefile
new file mode 100644 (file)
index 0000000..153cc10
--- /dev/null
@@ -0,0 +1,18 @@
+include ../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../../../Config/Define.inc
+include ../../../../../Config/Define.inc
+
+all: help exec
+
+help:
+       @echo "----- Help Message Check -----"
+       @../$(OSTYPE)/$(OBJECTNAME)      -h
+
+exec:
+       @echo "----- Execution Check -----"
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/test0.array -o data/test0.lst -O data/movie0_%04d.mrc
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/test.array -o data/test.lst -O data/movie_%04d.mrc
+       @echo "----- Calc check -----"          
+
+clean:
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/test/data b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/test/data
new file mode 120000 (symlink)
index 0000000..1ba79d8
--- /dev/null
@@ -0,0 +1 @@
+../../../../../..//data/mrcImageMovingModelCreate
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/usage.c b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/usage.c
new file mode 100755 (executable)
index 0000000..8c54361
--- /dev/null
@@ -0,0 +1,40 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include "../inc/config.h"
+
+void
+usage(char* thisProgram)
+{
+    fprintf(stderr, "Usage: %s\n", thisProgram);
+    fprintf(stderr, "Options:\n");
+    fprintf(stderr, "    [-i[nput]            In                  (NULL      ).as(inFile::Array       ) ] :Essential :Input:Moving\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile::ASCII      ) ] :Optional  :Output\n");
+    fprintf(stderr, "    [-O[utput]           OutName             (Movie_%%04d.mrc).as(String              ) ] :Optional  :Output\n");
+    fprintf(stderr, "    [-n                  Num                 (10        ).as(Integer             ) ] :Optional  :numberOfMovie\n");
+    fprintf(stderr, "    [-N                  Nx                  (256       ).as(Integer             ) \n                         Ny                  (256       ).as(Integer             ) \n                         Nz                  (256       ).as(Integer             ) ] :Optional  :Output:mrcImageSize\n");
+    fprintf(stderr, "    [-L                  Lx                  (1.0       ).as(Real                ) \n                         Ly                  (1.0       ).as(Real                ) \n                         Lz                  (1.0       ).as(Real                ) ] :Optional  :Output:mrcImageLength\n");
+    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
+    fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
+    additionalUsage();
+}
+
+void
+htmlBeforeUsage(char* thisProgram)
+{
+    fprintf(stderr, "<HTML>\n");
+    fprintf(stderr, "<HEAD>\n");
+    fprintf(stderr, "<TITLE>%s</TITLE>\n", thisProgram);
+    fprintf(stderr, "</HEAD>\n");
+    fprintf(stderr, "<BODY>\n");
+    fprintf(stderr, "<H1>%s</H1>\n", thisProgram);
+    fprintf(stderr, "<H2>Usage</H2>\n");
+    fprintf(stderr, "<PRE>\n");
+}
+
+void
+htmlAfterUsage(char* thisProgram)
+{
+    fprintf(stderr, "</PRE>\n");
+    fprintf(stderr, "</BODY>\n");
+    fprintf(stderr, "</HTML>\n");
+}
diff --git a/src/Tools/mrcImage/mrcImageMovingModelCreate/src/util.c b/src/Tools/mrcImage/mrcImageMovingModelCreate/src/util.c
new file mode 100755 (executable)
index 0000000..ee5e5f2
--- /dev/null
@@ -0,0 +1,4 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include "../inc/config.h"
+
index 48261fa..55c0744 100644 (file)
@@ -1 +1,38 @@
+include ${EOS_HOME}/src/Config/${EOS_HOST}.inc
+include ../../Config/Define.inc
+
+help:
+       @echo "make tiff"
+
+init:
+
+TIFFWHERE=http://download.osgeo.org/libtiff/
+TIFFNAME=tiff
+TIFFVERSION=4.3.0
+
+tiff:
+       make tiffInit
+       make tiffConfig
+       make tiffAll
+       make tiffClean
+       make tiffCleanAll
+
+tiffInit:
+       curl -o $(TIFFNAME)-$(TIFFVERSION).tar.gz -L $(TIFFWHERE)/$(TIFFNAME)-$(TIFFVERSION).tar.gz
+       tar xvzf $(TIFFNAME)-$(TIFFVERSION).tar.gz
+
+tiffConfig:
+       cd $(TIFFNAME)-$(TIFFVERSION); ./configure --prefix=${EOS_HOME}/hostdepend/${EOS_HOSTDIR}/ 
+
+tiffAll:
+       cd $(TIFFNAME)-$(TIFFVERSION); make -i install
+
+tiffClean:
+       cd $(TIFFNAME)-$(TIFFVERSION); make clean
+
+tiffCleanAll:
+       rm -rf $(TIFFNAME)-$(TIFFVERSION); rm $(TIFFNAME)-$(TIFFVERSION).tar.gz
+
 cleanAll:
+
+