OSDN Git Service

New command: mrc2ascii v2.3.58p0282
author安永卓生 <tacyas@yasunagatakuonoMacBook-Pro.local>
Fri, 1 Jun 2018 05:39:44 +0000 (14:39 +0900)
committer安永卓生 <tacyas@yasunagatakuonoMacBook-Pro.local>
Fri, 1 Jun 2018 05:39:44 +0000 (14:39 +0900)
Modified: mrcImageModeChange

 Committer: 安永卓生 <tacyas@yasunagatakuonoMacBook-Pro.local>

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

 Changes to be committed:
new file:   bin/mrc2ascii
modified:   include/mrcImage.h
modified:   src/Objects/DataManip/mrcImage/inc/mrcImage.h
modified:   src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c
modified:   src/Objects/DataManip/mrcImage/src/mrcImageGet.c
modified:   src/Tools/.Source
modified:   src/Tools/.Source.org
modified:   src/Tools/Config/Define.inc
modified:   src/Tools/filter/.Source
new file:   src/Tools/filter/mrc2ascii/Config/Define.inc
new file:   src/Tools/filter/mrc2ascii/Config/OptionControlFile
new file:   src/Tools/filter/mrc2ascii/Config/Target.inc
new file:   src/Tools/filter/mrc2ascii/Makefile
new file:   src/Tools/filter/mrc2ascii/doc/Makefile
new file:   src/Tools/filter/mrc2ascii/inc/config.h
new file:   src/Tools/filter/mrc2ascii/inc/mrc2ascii.h
new file:   src/Tools/filter/mrc2ascii/src/.Depend
new file:   src/Tools/filter/mrc2ascii/src/.Source
new file:   src/Tools/filter/mrc2ascii/src/Makefile
new file:   src/Tools/filter/mrc2ascii/src/X86MAC64
new file:   src/Tools/filter/mrc2ascii/src/argCheck.c
new file:   src/Tools/filter/mrc2ascii/src/init.c
new file:   src/Tools/filter/mrc2ascii/src/mrc2ascii.c
new file:   src/Tools/filter/mrc2ascii/src/mrc2ascii.html
new file:   src/Tools/filter/mrc2ascii/src/mrc2ascii.pane
new file:   src/Tools/filter/mrc2ascii/src/usage.c
new file:   src/Tools/filter/mrc2ascii/src/util.c
modified:   src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c
modified:   src/Tools/mrcImage/mrcImageModeChange/Config/OptionControlFile
modified:   src/Tools/mrcImage/mrcImageModeChange/inc/mrcImageModeChange.h
modified:   src/Tools/mrcImage/mrcImageModeChange/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageModeChange/src/init.c
modified:   src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.c
modified:   src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.html
modified:   src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.pane
modified:   src/Tools/mrcImage/mrcImageModeChange/src/usage.c

36 files changed:
bin/mrc2ascii [new symlink]
include/mrcImage.h
src/Objects/DataManip/mrcImage/inc/mrcImage.h
src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c
src/Objects/DataManip/mrcImage/src/mrcImageGet.c
src/Tools/.Source
src/Tools/.Source.org
src/Tools/Config/Define.inc
src/Tools/filter/.Source
src/Tools/filter/mrc2ascii/Config/Define.inc [new file with mode: 0755]
src/Tools/filter/mrc2ascii/Config/OptionControlFile [new file with mode: 0755]
src/Tools/filter/mrc2ascii/Config/Target.inc [new file with mode: 0755]
src/Tools/filter/mrc2ascii/Makefile [new file with mode: 0755]
src/Tools/filter/mrc2ascii/doc/Makefile [new file with mode: 0755]
src/Tools/filter/mrc2ascii/inc/config.h [new file with mode: 0755]
src/Tools/filter/mrc2ascii/inc/mrc2ascii.h [new file with mode: 0755]
src/Tools/filter/mrc2ascii/src/.Depend [new file with mode: 0755]
src/Tools/filter/mrc2ascii/src/.Source [new file with mode: 0755]
src/Tools/filter/mrc2ascii/src/Makefile [new file with mode: 0755]
src/Tools/filter/mrc2ascii/src/X86MAC64 [new symlink]
src/Tools/filter/mrc2ascii/src/argCheck.c [new file with mode: 0755]
src/Tools/filter/mrc2ascii/src/init.c [new file with mode: 0755]
src/Tools/filter/mrc2ascii/src/mrc2ascii.c [new file with mode: 0755]
src/Tools/filter/mrc2ascii/src/mrc2ascii.html [new file with mode: 0644]
src/Tools/filter/mrc2ascii/src/mrc2ascii.pane [new file with mode: 0755]
src/Tools/filter/mrc2ascii/src/usage.c [new file with mode: 0755]
src/Tools/filter/mrc2ascii/src/util.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c
src/Tools/mrcImage/mrcImageModeChange/Config/OptionControlFile
src/Tools/mrcImage/mrcImageModeChange/inc/mrcImageModeChange.h
src/Tools/mrcImage/mrcImageModeChange/src/argCheck.c
src/Tools/mrcImage/mrcImageModeChange/src/init.c
src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.c
src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.html
src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.pane
src/Tools/mrcImage/mrcImageModeChange/src/usage.c

diff --git a/bin/mrc2ascii b/bin/mrc2ascii
new file mode 120000 (symlink)
index 0000000..eddb955
--- /dev/null
@@ -0,0 +1 @@
+../sbin/MachineIndependent
\ No newline at end of file
index 79545aa..dc110c5 100644 (file)
@@ -388,6 +388,9 @@ typedef struct mrcImage {
        mrcImageParaTypeInteger   flagCCP4;
        mrcImageParaTypeInteger   ImageOffset;
        mrcImageSymmetryOperator* SymmetryOperator;
+
+    /* flag signed char/short */
+    int flagSigned;
 } mrcImage;
 
 typedef struct mrcImageInformation {
index 79545aa..dc110c5 100755 (executable)
@@ -388,6 +388,9 @@ typedef struct mrcImage {
        mrcImageParaTypeInteger   flagCCP4;
        mrcImageParaTypeInteger   ImageOffset;
        mrcImageSymmetryOperator* SymmetryOperator;
+
+    /* flag signed char/short */
+    int flagSigned;
 } mrcImage;
 
 typedef struct mrcImageInformation {
index f242bd8..788844c 100644 (file)
@@ -519,9 +519,9 @@ lmrcImage3DPadRectangle(mrcImage* out, mrcImage* in, lmrcImage3DPadInfo linfo, i
        cx=(in->HeaderN.x-1)*0.5;
        cy=(in->HeaderN.y-1)*0.5;
        cz=(in->HeaderN.z-1)*0.5;
-       sx=(out->HeaderN.x-in->HeaderN.x)*0.5;
+       sx=(out->HeaderN.x-in->HeaderN.x)*0.5; // 
        sy=(out->HeaderN.y-in->HeaderN.y)*0.5;
-       sz=(out->HeaderN.z-in->HeaderN.z)*0.5;
+       sz=(out->HeaderN.z-in->HeaderN.z)*0.5; 
        r2=SQR(linfo.rmax);
        ww = linfo.w*2;
        rmax  = linfo.rmax+linfo.w;
@@ -561,11 +561,14 @@ lmrcImage3DPadRectangle(mrcImage* out, mrcImage* in, lmrcImage3DPadInfo linfo, i
                        }
                        }
                        for (z=0;z<in->HeaderN.z;z++){
-                               wz = fabs(z-cz)*2.0;
+                               wz = fabs(z-cz)*2.0; // c[x|y|z]: centre of in
+                dstz = z + sz;
                        for (y=0;y<in->HeaderN.y;y++){
                                wy = fabs(y-cy)*2.0;
+                dsty = y + sy;
                        for (x=0;x<in->HeaderN.x;x++){
                                wx = fabs(x-cx)*2.0;
+                dstx =  x + sx;
 
                                mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
                                if (linfo.flagr) {
@@ -574,8 +577,12 @@ lmrcImage3DPadRectangle(mrcImage* out, mrcImage* in, lmrcImage3DPadInfo linfo, i
                                         ||(wz<linfo.zmax)) {
                                                mrcPixelDataSet(out, x+sx, y+sy, z+sz, data-offset, mrcPixelRePart);
                                        }
-                               } else {              
-                                       mrcPixelDataSet(out, x+sx, y+sy, z+sz , data-offset, mrcPixelRePart);
+                               } else { // s: start          
+                    if( -0.5<=dstx && dstx<out->HeaderN.x-0.5
+                     && -0.5<=dsty && dsty<out->HeaderN.y-0.5
+                     && -0.5<=dstz && dstz<out->HeaderN.z-0.5 ) {
+                                           mrcPixelDataSet(out, dstx, dsty, dstz, data-offset, mrcPixelRePart);
+                    }
                                }
                        }
                        }
index ee8a275..60e71b3 100755 (executable)
@@ -186,12 +186,20 @@ mrcPixelDataGet(mrcImage* mrc,
                                case mrcPixelRePart: {
                                        switch(mrc->HeaderMode) {
                                                case mrcCharImage: {
-                                                  *data = (double)mrc->ImageCharImage[n];
+                            if(mrc->flagSigned) {
+                                                       *data = (double)(signed char)mrc->ImageCharImage[n];
+                            } else {
+                                                       *data = (double)mrc->ImageCharImage[n];
+                            }
                                                   break;
                                                }
                                                case mrcShortImage: 
                                                case mrcUShortImage: {
-                                                  *data = (double)mrc->ImageShortImage[n];
+                            if(mrc->flagSigned) {
+                                                       *data = (double)(signed short)mrc->ImageShortImage[n];
+                            } else {
+                                                       *data = (double)mrc->ImageShortImage[n];
+                            }
                                                   break;
                                                }
                                                case mrcFloatImage: {
index d6983a6..9d406dc 100644 (file)
@@ -11,6 +11,7 @@ database \
 eosBayes \
 eosPoint \
 filter \
+fiter \
 hf2000 \
 khorosTool \
 largeIP \
index a57f74e..d6983a6 100644 (file)
@@ -25,6 +25,7 @@ psUtil \
 random \
 rec3d \
 simulation \
+timeSeries \
 transform \
 utils \
 vectorImage \
index 4799b90..f8b0da9 100755 (executable)
@@ -1660,3 +1660,7 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
index d27a56c..96b2567 100644 (file)
@@ -9,6 +9,7 @@ emData2mrc \
 imodst2mrc \
 ip2mrc \
 moi2mrc \
+mrc2ascii \
 mrc2bild \
 mrc2fld \
 mrc2gif \
diff --git a/src/Tools/filter/mrc2ascii/Config/Define.inc b/src/Tools/filter/mrc2ascii/Config/Define.inc
new file mode 100755 (executable)
index 0000000..8b0e585
--- /dev/null
@@ -0,0 +1,4 @@
+OBJECTNAME = mrc2ascii
+EXTRA_LIB  =
+EXTRA_CCOPTS =
+EXTRA_INC =
diff --git a/src/Tools/filter/mrc2ascii/Config/OptionControlFile b/src/Tools/filter/mrc2ascii/Config/OptionControlFile
new file mode 100755 (executable)
index 0000000..013ab02
--- /dev/null
@@ -0,0 +1,6 @@
+# OptionControlFile
+# FileFormat
+"-i","-i[nput]","InputDataFile","Essential","1","1","In","inFile","NULL"
+"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","stdout"
+"-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/filter/mrc2ascii/Config/Target.inc b/src/Tools/filter/mrc2ascii/Config/Target.inc
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/filter/mrc2ascii/Makefile b/src/Tools/filter/mrc2ascii/Makefile
new file mode 100755 (executable)
index 0000000..6c4a336
--- /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; 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; 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/filter/mrc2ascii/doc/Makefile b/src/Tools/filter/mrc2ascii/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/filter/mrc2ascii/inc/config.h b/src/Tools/filter/mrc2ascii/inc/config.h
new file mode 100755 (executable)
index 0000000..4b48b9b
--- /dev/null
@@ -0,0 +1,6 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "../inc/mrc2ascii.h"
+
+#endif /* CONFIG_H */
diff --git a/src/Tools/filter/mrc2ascii/inc/mrc2ascii.h b/src/Tools/filter/mrc2ascii/inc/mrc2ascii.h
new file mode 100755 (executable)
index 0000000..22d1646
--- /dev/null
@@ -0,0 +1,46 @@
+#ifndef MRC2ASCII_H
+#define MRC2ASCII_H
+#include <stdio.h>
+#include <stdlib.h>
+
+#define OPTION_FLAG     '-'
+#define OPTION_FLAG_POS (0)
+#define OPTION_POS      (1)
+
+
+
+
+typedef struct mrc2asciiInfo {
+    long flagRedirect;
+
+    long flagIn;
+    char* In;
+    FILE* fptIn;
+    
+    long flagOut;
+    char* Out;
+    FILE* fptOut;
+    
+    long flagconfigFile;
+    char* configFile;
+    FILE* fptconfigFile;
+    
+    long flagmode;
+    long mode;
+    
+} mrc2asciiInfo;
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void argCheck(mrc2asciiInfo* info, int argc, char* avgv[]);
+extern void khorosInit(int argc, char* avgv[]);
+extern void init0(mrc2asciiInfo* info);
+extern void init1(mrc2asciiInfo* info);
+extern void usage(char* usage);
+extern void additionalUsage(void);
+extern void htmlBeforeUsage(char* usage);
+extern void htmlAfterUsage(char* usage);
+#ifdef __cplusplus
+};
+#endif
+#endif /* MRC2ASCII_H */
diff --git a/src/Tools/filter/mrc2ascii/src/.Depend b/src/Tools/filter/mrc2ascii/src/.Depend
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/filter/mrc2ascii/src/.Source b/src/Tools/filter/mrc2ascii/src/.Source
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/filter/mrc2ascii/src/Makefile b/src/Tools/filter/mrc2ascii/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/filter/mrc2ascii/src/X86MAC64 b/src/Tools/filter/mrc2ascii/src/X86MAC64
new file mode 120000 (symlink)
index 0000000..50e0758
--- /dev/null
@@ -0,0 +1 @@
+../../../../../hostdepend/X86MAC64/src/Tools/filter/mrc2ascii/src/X86MAC64
\ No newline at end of file
diff --git a/src/Tools/filter/mrc2ascii/src/argCheck.c b/src/Tools/filter/mrc2ascii/src/argCheck.c
new file mode 100755 (executable)
index 0000000..2c326df
--- /dev/null
@@ -0,0 +1,96 @@
+#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(mrc2asciiInfo* 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("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/filter/mrc2ascii/src/init.c b/src/Tools/filter/mrc2ascii/src/init.c
new file mode 100755 (executable)
index 0000000..e32ce3b
--- /dev/null
@@ -0,0 +1,91 @@
+#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(mrc2asciiInfo* info)
+{
+    info->fptIn = NULL;    info->flagIn = 0;
+    info->fptOut = stdout;    info->flagOut = 0;
+    info->fptconfigFile = NULL;    info->flagconfigFile = 0;
+    info->mode = 0;    info->flagmode = 0;
+}
+
+void
+init1(mrc2asciiInfo* 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) {
+        stringGetFromFile(s, "Out", stdin, stdout, 0);
+        info->Out = stringGetNthWord(s, 1, " ,\t");
+        info->flagOut++;
+    }
+    if(info->flagOut) {
+        info->fptOut = fileOpen(info->Out, "w");
+    }
+    
+    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/filter/mrc2ascii/src/mrc2ascii.pane", eospath);
+    khoros_initialize(argc, argv, "EOS");
+    fpt = fopen(panepath, "r");    if(NULL!=fpt) {
+        fclose(fpt);
+        kclui_initialize(panepath, KGEN_NONE, "EOS", "mrc2ascii",
+                     func_usage_additions,
+                     func_get_args,
+                     func_free_args);
+    }
+}
+#endif /* KHOROS */ 
diff --git a/src/Tools/filter/mrc2ascii/src/mrc2ascii.c b/src/Tools/filter/mrc2ascii/src/mrc2ascii.c
new file mode 100755 (executable)
index 0000000..596e8f9
--- /dev/null
@@ -0,0 +1,116 @@
+/*
+# mrc2ascii : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : mrc2ascii
+# 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"
+
+/*
+Example:
+typedef struct lmrc2asciiInfo {
+       float a;
+       int   b;
+} lmrc2asciiInfo;
+
+typedef enum lmrc2asciiMode {
+       a=0,
+       b=1
+} lmrc2asciiMode;
+*/
+
+extern void lmrc2ascii(FILE* fpt, mrcImage* in, int mode);
+int
+main(int argc, char* argv[]) 
+{
+    mrcImage in;
+       mrc2asciiInfo info;
+
+       init0(&info);
+    argCheck(&info, argc, argv);
+    init1(&info);
+
+       DEBUGPRINT("Program Start\n");
+    mrcFileRead(&in, info.In, "in main", 0);
+
+    lmrc2ascii(info.fptOut, &in, info.mode);
+
+       exit(EXIT_SUCCESS);
+}
+
+void
+additionalUsage()
+{
+       fprintf(stderr, "----- Additional Usage -----\n");
+       fprintf(stderr, "-m \n");
+       fprintf(stderr, " 0: A\n");
+       fprintf(stderr, " 1: nm\n");
+       fprintf(stderr, " +16: Length is Sampling x N\n");
+       fprintf(stderr, " +32: Use start\n");
+       fprintf(stderr, " +64: Integer\n");
+}
+
+
+void 
+lmrc2ascii(FILE* fpt, mrcImage* in, int mode)
+{
+    float x, y, z;
+    int ix, iy, iz;
+    float offsetx, offsety, offsetz;
+    float lx, ly, lz;
+    double data;
+
+    if(mode&0x10) {
+        lx = in->HeaderLength.x/in->HeaderN.x;
+        ly = in->HeaderLength.y/in->HeaderN.y;
+        lz = in->HeaderLength.z/in->HeaderN.z;
+    } else {
+        lx = in->HeaderLength.x;
+        ly = in->HeaderLength.y;
+        lz = in->HeaderLength.z;
+    }
+    if(mode&0x1) {
+        lx /=10;
+        ly /=10;
+        lz /=10;
+    }
+    if(mode&0x20) {
+        offsetx = in->HeaderStartN.x*lx;
+        offsety = in->HeaderStartN.y*ly;
+        offsetz = in->HeaderStartN.z*lz;
+    } else {
+        offsetx = 0;
+        offsety = 0;
+        offsetz = 0;
+    }
+
+    for(iz=0; iz<in->HeaderN.z; iz++) {
+        z = iz*lz + offsetz;
+    for(iy=0; iy<in->HeaderN.y; iy++) {
+        y = iy*ly + offsety;
+    for(ix=0; ix<in->HeaderN.x; ix++) {
+        x = ix*lx + offsetx;
+        mrcPixelDataGet(in, ix, iy, iz, &data, mrcPixelRePart, mrcPixelHowNearest);
+        if(0x40&mode) {
+            fprintf(fpt, "%10d %10d %10d %10d\n", (int)x, (int)y, (int)z, (int)data);
+        } else {
+            fprintf(fpt, "%15.6f %15.6f %15.6f %15.6f\n", x, y, z, data);
+        }
+    }
+    }
+    }
+
+}
diff --git a/src/Tools/filter/mrc2ascii/src/mrc2ascii.html b/src/Tools/filter/mrc2ascii/src/mrc2ascii.html
new file mode 100644 (file)
index 0000000..26829ca
--- /dev/null
@@ -0,0 +1,24 @@
+<HTML>
+<HEAD>
+<TITLE>mrc2ascii</TITLE>
+</HEAD>
+<BODY>
+<H1>mrc2ascii</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrc2ascii
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+-m 
+ 0: A
+ 1: nm
+ +16: Length is Sampling x N
+ +32: Use start
+ +64: Integer
+</PRE>
+</BODY>
+</HTML>
diff --git a/src/Tools/filter/mrc2ascii/src/mrc2ascii.pane b/src/Tools/filter/mrc2ascii/src/mrc2ascii.pane
new file mode 100755 (executable)
index 0000000..496e430
--- /dev/null
@@ -0,0 +1,16 @@
+-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 ' ' mrc2ascii
+      -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/mrc2ascii
+        -H 1  5x1+41+0 'Help' 'help page' $EOS/src/Tools/filter/mrc2ascii/doc/mrc2ascii.doc help
+        -Q 1 0 5.25x1+47+0 'Close'
+        -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'InputDataFile' i
+        -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'OutputDataFile' o
+        -I 1 0 1 0 0 1 -1x1+1+4.500000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+6.000000 0 0 0 0 0 'mode' 'Mode' m
+    -E
+  -E
+-E
diff --git a/src/Tools/filter/mrc2ascii/src/usage.c b/src/Tools/filter/mrc2ascii/src/usage.c
new file mode 100755 (executable)
index 0000000..203a91c
--- /dev/null
@@ -0,0 +1,36 @@
+#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              ) ] :Essential :InputDataFile\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Essential :OutputDataFile\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/filter/mrc2ascii/src/util.c b/src/Tools/filter/mrc2ascii/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 f79c5cd..c319d67 100755 (executable)
@@ -63,14 +63,6 @@ main(int argc, char* argv[])
        linfo.flagFloating = info.Floating;
 
        DEBUGPRINT3("N: %d %d %d\n", linfo.Nx, linfo.Ny, linfo.Nz);
-       /*
-       if (!info.mode2){
-         lmrcImage3DPadfilament(&out, &in, linfo, info.mode);
-       } else {
-         lmrcImage3DPad(&out, &in, linfo, info.mode);
-       }
-       */
-       linfo.ShapeMode = info.mode2;
        lmrcImage3DPad(&out, &in, linfo, info.mode);
        mrcFileWrite(&out ,info.Out ,"in main" ,0);
        return EXIT_SUCCESS;
index ef4a2bd..6ed1b1d 100755 (executable)
@@ -5,5 +5,6 @@
 "-Min","-Min","Min","Optional","1","1","Min","Real","0.0"
 "-Max","-Max","Max","Optional","1","1","Max","Real","1.0"
 "-flagStat","-flagStat","StatCheck before mode change ","Optional","0"
+"-flagSigned","-flagSigned","in: signed char","Optional","0"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
index e101119..a34d3a6 100755 (executable)
@@ -29,6 +29,8 @@ typedef struct mrcImageModeChangeInfo {
     
     long flagStat;
 
+    long flagSigned;
+
     long flagconfigFile;
     char* configFile;
     FILE* fptconfigFile;
index b93047b..e4a7053 100755 (executable)
@@ -81,6 +81,15 @@ argCheck(mrcImageModeChangeInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("flagSigned") {
+                    if(i+0<argc) {
+                        info->flagSigned++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("c") {
                     if(i+1<argc) {
                         info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
index e5f87e3..2f86b76 100755 (executable)
@@ -17,6 +17,7 @@ init0(mrcImageModeChangeInfo* info)
     info->Min = 0.0;    info->flagMin = 0;
     info->Max = 1.0;    info->flagMax = 0;
     info->flagStat=0;
+    info->flagSigned=0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
 }
index 548ea62..1dedb8d 100755 (executable)
@@ -49,7 +49,12 @@ main(int argc, char* argv[])
        if(info.flagMax) {
                in.HeaderAMax = info.Max;
        } 
-       
+
+    if(info.flagSigned) {
+        in.flagSigned = 1;
+    } else {
+        in.flagSigned = 0;
+    }
        lmrcImageModeChange(&out, &in, info.mode);
 
        mrcFileWrite(&out, info.Out, "in main", 0);     
index 62471ca..2271fa5 100755 (executable)
@@ -13,6 +13,7 @@ Options:
     [-Min                Min                 (0.0       ).as(Real                ) ] :Optional  :Min
     [-Max                Max                 (1.0       ).as(Real                ) ] :Optional  :Max
     [-flagStat                                                                     ] :Optional  :StatCheck before mode change 
+    [-flagSigned                                                                   ] :Optional  :in: signed char
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 </PRE>
index a982df8..3cfa0b7 100755 (executable)
@@ -12,8 +12,9 @@
         -f 1 0 1 0 0 -1x1+1+4.500000 0 0 0.000000 0 0 0 'Min' 'Min' Min
         -f 1 0 1 0 0 -1x1+1+6.000000 0 0 1.000000 0 0 0 'Max' 'Max' Max
         -t 1 0 1 0 0 6x1+1+7 'flagStat' 'StatCheck before mode change ' flagStat
-        -I 1 0 1 0 0 1 -1x1+1+9.000000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+10.500000 0 0 0 0 0 'mode' 'Mode' m
+        -t 1 0 1 0 0 6x1+1+9 'flagSigned' 'in: signed char' flagSigned
+        -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
index 6934201..7fd26e7 100755 (executable)
@@ -12,6 +12,7 @@ usage(char* thisProgram)
     fprintf(stderr, "    [-Min                Min                 (0.0       ).as(Real                ) ] :Optional  :Min\n");
     fprintf(stderr, "    [-Max                Max                 (1.0       ).as(Real                ) ] :Optional  :Max\n");
     fprintf(stderr, "    [-flagStat                                                                     ] :Optional  :StatCheck before mode change \n");
+    fprintf(stderr, "    [-flagSigned                                                                   ] :Optional  :in: signed char\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();