OSDN Git Service

Add a new command: v2.0.26p0007
authorTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Fri, 1 Aug 2014 21:06:17 +0000 (06:06 +0900)
committerTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Fri, 1 Aug 2014 21:06:17 +0000 (06:06 +0900)
new file:   mrcImageStack

34 files changed:
bin/wish/Display2/tclIndex
hostdepend/X86MAC64/bin/X86MAC64/mrcImageStack [new file with mode: 0755]
hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.debug.a
hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a
hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.debug.a
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageStack.sharedo [new file with mode: 0644]
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/.Depend
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/.Source
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.c [new symlink]
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.sharedo [new file with mode: 0644]
hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageStack/src/X86MAC64/mrcImageStack [new file with mode: 0755]
include/mrcImage.h
lib/tclIndex [new file with mode: 0644]
src/Objects/DataManip/mrcImage/doc/mrcImage.html
src/Objects/DataManip/mrcImage/inc/mrcImage.h
src/Objects/DataManip/mrcImage/src/lmrcImageStack.c [new file with mode: 0644]
src/Tools/Config/Define.inc
src/Tools/Makefile [changed from file to symlink]
src/Tools/mrcImage/Makefile [changed from file to symlink]
src/Tools/mrcImage/mrcImageStack/Config/OptionControlFile
src/Tools/mrcImage/mrcImageStack/Makefile [changed from file to symlink]
src/Tools/mrcImage/mrcImageStack/doc/Makefile [new symlink]
src/Tools/mrcImage/mrcImageStack/inc/mrcImageStack.h
src/Tools/mrcImage/mrcImageStack/src/argCheck.c
src/Tools/mrcImage/mrcImageStack/src/init.c
src/Tools/mrcImage/mrcImageStack/src/mrcImageStack.c
src/Tools/mrcImage/mrcImageStack/src/mrcImageStack.html
src/Tools/mrcImage/mrcImageStack/src/mrcImageStack.pane
src/Tools/mrcImage/mrcImageStack/src/test/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageStack/src/test/data [new symlink]
src/Tools/mrcImage/mrcImageStack/src/usage.c

index 75a715a..8fd9302 100644 (file)
@@ -49,6 +49,7 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR
 set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
+set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
 set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
@@ -131,4 +132,3 @@ set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
 set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
-set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageStack b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageStack
new file mode 100755 (executable)
index 0000000..c13627e
Binary files /dev/null and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageStack differ
index d4d5e40..6622ade 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a differ
index dacf73e..f94bd4a 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.debug.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.debug.a differ
index 915dc4a..2a09a13 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a differ
index 898d9bb..6618e69 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.debug.a and b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.debug.a differ
diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageStack.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageStack.sharedo
new file mode 100644 (file)
index 0000000..1dc340b
Binary files /dev/null and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageStack.sharedo differ
index 13711f7..d7ce18e 100644 (file)
@@ -110,6 +110,7 @@ X86MAC64/lmrcImageSobel.o:lmrcImageSobel.o
 X86MAC64/lmrcImageSolventFlattening.o:lmrcImageSolventFlattening.o
 X86MAC64/lmrcImageSphere.o:lmrcImageSphere.o
 X86MAC64/lmrcImageSplit.o:lmrcImageSplit.o
+X86MAC64/lmrcImageStack.o:lmrcImageStack.o
 X86MAC64/lmrcImageStudentCalculate.o:lmrcImageStudentCalculate.o
 X86MAC64/lmrcImageSubtractionCalc.o:lmrcImageSubtractionCalc.o
 X86MAC64/lmrcImageSummationCalculate.o:lmrcImageSummationCalculate.o
index fb0efd0..0d17cea 100644 (file)
@@ -111,6 +111,7 @@ lmrcImageSobel.c \
 lmrcImageSolventFlattening.c \
 lmrcImageSphere.c \
 lmrcImageSplit.c \
+lmrcImageStack.c \
 lmrcImageStudentCalculate.c \
 lmrcImageSubtractionCalc.c \
 lmrcImageSummationCalculate.c \
@@ -275,6 +276,7 @@ lmrcImageSobel.o \
 lmrcImageSolventFlattening.o \
 lmrcImageSphere.o \
 lmrcImageSplit.o \
+lmrcImageStack.o \
 lmrcImageStudentCalculate.o \
 lmrcImageSubtractionCalc.o \
 lmrcImageSummationCalculate.o \
@@ -439,6 +441,7 @@ lmrcImageSobel.sharedo \
 lmrcImageSolventFlattening.sharedo \
 lmrcImageSphere.sharedo \
 lmrcImageSplit.sharedo \
+lmrcImageStack.sharedo \
 lmrcImageStudentCalculate.sharedo \
 lmrcImageSubtractionCalc.sharedo \
 lmrcImageSummationCalculate.sharedo \
@@ -603,6 +606,7 @@ X86MAC64/lmrcImageSobel.o \
 X86MAC64/lmrcImageSolventFlattening.o \
 X86MAC64/lmrcImageSphere.o \
 X86MAC64/lmrcImageSplit.o \
+X86MAC64/lmrcImageStack.o \
 X86MAC64/lmrcImageStudentCalculate.o \
 X86MAC64/lmrcImageSubtractionCalc.o \
 X86MAC64/lmrcImageSummationCalculate.o \
@@ -767,6 +771,7 @@ X86MAC64/lmrcImageSobel.sharedo \
 X86MAC64/lmrcImageSolventFlattening.sharedo \
 X86MAC64/lmrcImageSphere.sharedo \
 X86MAC64/lmrcImageSplit.sharedo \
+X86MAC64/lmrcImageStack.sharedo \
 X86MAC64/lmrcImageStudentCalculate.sharedo \
 X86MAC64/lmrcImageSubtractionCalc.sharedo \
 X86MAC64/lmrcImageSummationCalculate.sharedo \
@@ -931,6 +936,7 @@ lmrcImageSobel.debugo \
 lmrcImageSolventFlattening.debugo \
 lmrcImageSphere.debugo \
 lmrcImageSplit.debugo \
+lmrcImageStack.debugo \
 lmrcImageStudentCalculate.debugo \
 lmrcImageSubtractionCalc.debugo \
 lmrcImageSummationCalculate.debugo \
@@ -1092,6 +1098,7 @@ X86MAC64/lmrcImageSobel.debugo \
 X86MAC64/lmrcImageSolventFlattening.debugo \
 X86MAC64/lmrcImageSphere.debugo \
 X86MAC64/lmrcImageSplit.debugo \
+X86MAC64/lmrcImageStack.debugo \
 X86MAC64/lmrcImageStudentCalculate.debugo \
 X86MAC64/lmrcImageSubtractionCalc.debugo \
 X86MAC64/lmrcImageSummationCalculate.debugo \
@@ -1256,6 +1263,7 @@ lmrcImageSobel.cudagdb.o \
 lmrcImageSolventFlattening.cudagdb.o \
 lmrcImageSphere.cudagdb.o \
 lmrcImageSplit.cudagdb.o \
+lmrcImageStack.cudagdb.o \
 lmrcImageStudentCalculate.cudagdb.o \
 lmrcImageSubtractionCalc.cudagdb.o \
 lmrcImageSummationCalculate.cudagdb.o \
@@ -1420,6 +1428,7 @@ X86MAC64/lmrcImageSobel.cudagdb.o \
 X86MAC64/lmrcImageSolventFlattening.cudagdb.o \
 X86MAC64/lmrcImageSphere.cudagdb.o \
 X86MAC64/lmrcImageSplit.cudagdb.o \
+X86MAC64/lmrcImageStack.cudagdb.o \
 X86MAC64/lmrcImageStudentCalculate.cudagdb.o \
 X86MAC64/lmrcImageSubtractionCalc.cudagdb.o \
 X86MAC64/lmrcImageSummationCalculate.cudagdb.o \
index 915dc4a..2a09a13 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a differ
index d9f7c10..6618e69 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a differ
diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.c b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.c
new file mode 120000 (symlink)
index 0000000..5ec6226
--- /dev/null
@@ -0,0 +1 @@
+../lmrcImageStack.c
\ No newline at end of file
diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.sharedo
new file mode 100644 (file)
index 0000000..1dc340b
Binary files /dev/null and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.sharedo differ
diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageStack/src/X86MAC64/mrcImageStack b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageStack/src/X86MAC64/mrcImageStack
new file mode 100755 (executable)
index 0000000..c13627e
Binary files /dev/null and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageStack/src/X86MAC64/mrcImageStack differ
index 5db834d..594c9b8 100644 (file)
@@ -903,9 +903,12 @@ extern void mrcImageSectionGet(mrcImage* dst, mrcImage* src, mrcImageParaTypeRea
 /* in mrcImageSectionSet.c */
 extern void mrcImageSectionSet(mrcImage* dst, mrcImage* src, mrcImageParaTypeReal z, long mode);
 
-
 extern double lmrcImageMaxDataGet(mrcImage* src, long mode);
 
+/* in lmrcImageStack.c */
+extern void lmrcImageStackAlloc(mrcImage* dst, mrcImage* src, int N, int* sp, int mode);
+extern void lmrcImageStackPush(mrcImage* dst, mrcImage* src, int* sp, int mode);
+
 /* prototype end */
 
 #ifdef __cplusplus
diff --git a/lib/tclIndex b/lib/tclIndex
new file mode 100644 (file)
index 0000000..31723a2
--- /dev/null
@@ -0,0 +1,138 @@
+# Tcl autoload index file, version 2.0
+# This file is generated by the "auto_mkindex" command
+# and sourced to set up indexing information for one or
+# more commands.  Typically each line is a command that
+# sets an element in the auto_index array, where the
+# element name is the name of a command and the value is
+# a script that loads the command.
+
+set auto_index(Blt_ActiveLegend) [list source [file join $dir bltGraph.wish]]
+set auto_index(Blt_Crosshairs) [list source [file join $dir bltGraph.wish]]
+set auto_index(Blt_ZoomStack) [list source [file join $dir bltGraph.wish]]
+set auto_index(Blt_PrintKey) [list source [file join $dir bltGraph.wish]]
+set auto_index(Blt_ClosestPoint) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ActivateLegend) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::DeactivateLegend) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::HighlightLegend) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::Crosshairs) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ZoomStack) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::PrintKey) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ClosestPoint) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::AddBindTag) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::FindElement) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::FlashPoint) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::GetCoords) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::MarkPoint) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::DestroyZoomTitle) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::PopZoom) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::PushZoom) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ResetZoom) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ZoomTitleNext) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ZoomTitleLast) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::SetZoomPoint) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::Box) [list source [file join $dir bltGraph.wish]]
+set auto_index(Blt_PostScriptDialog) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ResetPostScript) [list source [file join $dir bltGraph.wish]]
+set auto_index(Canvas) [list source [file join $dir Canvas.wish]]
+set auto_index(scrolledCanvas) [list source [file join $dir Canvas.wish]]
+set auto_index(colormapSet) [list source [file join $dir Colormap.wish]]
+set auto_index(CommandEntry) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithSelection) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithSelectionEntrySet) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithUpDown) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithUpDownUp) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithUpDownDown) [list source [file join $dir CommandEntry.wish]]
+set auto_index(eosCommandExecute) [list source [file join $dir commandUtil.wish]]
+set auto_index(::CTF::Init) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::Win) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoGraphInfoFrameCreate) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoGraphInfoFrameCreate1) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoGraphInfoFrameCreate2) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoSaveAsPS) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoSave) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoLoad) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoMolecEnvSet) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoCTFInfoFrameCreate) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoCTFInfoFrameCreate1) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInitSearch) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfFineTuning) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoCTFInfoFrameCreate2) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoMarkerSet) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoMarkerUnset) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoPredictedThonRing) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoPredictedMarkerOnCanvas) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoPredictedMarkerSet) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoPredictedMarkerUnset) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoMarkerReset) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoGraphUpdate) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoScatteringLineCreate) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoCTFLineCreate) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoGraphConfiguration) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoGraphPenCreate) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoCTFInfomationSet) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoCTFCalculation) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoScatteringCalc) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoListGet) [list source [file join $dir ctfInfo.wish]]
+set auto_index(::CTF::ctfInfoAppend) [list source [file join $dir ctfInfo.wish]]
+set auto_index(fileSaveSureWin) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveSureOK) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveSureCancel) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveSureWinResources) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSave) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveResources) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveBindings) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveList) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveOK) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveCancel) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveClick) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveTake) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveComplete) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSelect) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectResources) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectBindings) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectList) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectOK) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectCancel) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectClick) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectTake) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectComplete) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileCanBeOverwritten) [list source [file join $dir fileUtil.wish]]
+set auto_index(relativePathGet) [list source [file join $dir fileUtil.wish]]
+set auto_index(bltResetBindings) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltActivateLegend) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetActiveLegend) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetCrosshairs) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltFindElement) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltFlashPoint) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetClosestPoint) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltGetCoords) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltGetAnchor) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltGetAnchorX) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltBox) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltBoxX) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltScan) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltScanX) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltZoom) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltZoomX) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetZoom) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetZoomX) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetPrint) [list source [file join $dir graphFeature.wish]]
+set auto_index(seqFileTemplateChange) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelect) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectBindings) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectList) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileTemplateSelectOK) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileTemplateSelectComplete) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectOK) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectComplete) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectPrev) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectNext) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectCancel) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectClick) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectTake) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(NotSupportedCommand) [list source [file join $dir tclUtil.wish]]
+set auto_index(CheckButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
+set auto_index(RadioButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
+set auto_index(RadioButtonsCreateWithPackWithCommand) [list source [file join $dir VariousButton.wish]]
+set auto_index(RadioButtonsCreate) [list source [file join $dir VariousButton.wish]]
+set auto_index(CheckButtonsCreate) [list source [file join $dir VariousButton.wish]]
index 3faeda0..deb54fc 100755 (executable)
 <H2>Information from source codes</H2>
 </A>
 <PRE>
-../src/fftn.c:
-
-../src/lmrcFETnormalizeBySD.c:
-
-../src/lmrcFFTExpression.c:
-
-../src/lmrcFFTFGconj.c:
-
-../src/lmrcFFTFxG.c:
-
-../src/lmrcFFTInfo.c:
-
-../src/lmrcImage3DPad.c:
-
-../src/lmrcImage3DWindowing.c:
-
-../src/lmrcImageAddValue.c:
-
-../src/lmrcImageAsProbability.c:
-
-../src/lmrcImageAverage.c:
-
-../src/lmrcImageBandPassFilter.c:
-
-../src/lmrcImageBilateralFilter.c:
-
-../src/lmrcImageBinarization.c:
-
-../src/lmrcImageBottomHatTransform.c:
-
-../src/lmrcImageBoundaryInfo.c:
-
-../src/lmrcImageCTFCompensation.c:
-
-../src/lmrcImageCTFDetermination.c:
-
-../src/lmrcImageCTFObservation.c:
-
-../src/lmrcImageCTFSN.c:
-
-../src/lmrcImageCVE.c:
-
-../src/lmrcImageCalcArea.c:
-
-../src/lmrcImageCenterGet.c:
-
-../src/lmrcImageCentre.c:
-
-../src/lmrcImageClosing.c:
-
-../src/lmrcImageClusterAnalysis.c:
-
-../src/lmrcImageCommonLine.c:
-
-../src/lmrcImageConnection.c:
-
-../src/lmrcImageConnectivityNumberCalc.c:
-
-../src/lmrcImageContourSurface.c:
-
-../src/lmrcImageContraction.c:
-
-../src/lmrcImageCorrelation.c:
-     $lmrcImageEuclidDistanceCalc:  Calculate Euclid distance between two images $
-     $arg: in1:  input mrcImage1 $
-     $arg: in2:  input mrcImage2 $
-     $arg: mode: input int $
-     $mode: 0 Sum of SQR $
-     $mode: 1 Distance $
-     $return: EuclidDistance $
-
-../src/lmrcImageCorrelationPVM.c:
-
-../src/lmrcImageCorrelationWithCTFCompensation.c:
-
-../src/lmrcImageCorrelationinSpace.c:
-
-../src/lmrcImageCrystalCreate.c:
-
-../src/lmrcImageDataMaxAndMinGetByImage.c:
-
-../src/lmrcImageDataStraightCopy.c:
-
-../src/lmrcImageDeconvolution.c:
-
-../src/lmrcImageDensity.c:
-
-../src/lmrcImageDensityInverse.c:
-
-../src/lmrcImageDensityNormalizationByImage.c:
-
-../src/lmrcImageDifferential.c:
-
-../src/lmrcImageDilation.c:
-
-../src/lmrcImageDistanceConversion.c:
-
-../src/lmrcImageEdge.c:
-
-../src/lmrcImageEdgeAverage.c:
-
-../src/lmrcImageEdgeEnhancement.c:
-
-../src/lmrcImageErosion.c:
-
-../src/lmrcImageFFT.c:
-
-../src/lmrcImageFOMCalc.c:
-
-../src/lmrcImageFeatureExtraction.c:
-
-../src/lmrcImageFeatureExtractionCoOccurrence.c:
-
-../src/lmrcImageFeatureExtractionRunLength.c:
-
-../src/lmrcImageFilterCreate.c:
-
-../src/lmrcImageFirstNoiseReductionByRelaxation.c:
-
-../src/lmrcImageFloating.c:
-
-../src/lmrcImageFourierPowerSpectrum.c:
-
-../src/lmrcImageFourierShellCorrelation.c:
-
-../src/lmrcImageHighPassFilter.c:
-
-../src/lmrcImageHighlighting.c:
-
-../src/lmrcImageLabeling.c:
-
-../src/lmrcImageLogicalOperation.c:
-
-../src/lmrcImageLowPassFilter.c:
-
-../src/lmrcImageMasking.c:
-
-../src/lmrcImageMaxDataGet.c:
-
-../src/lmrcImageMirroring.c:
-     $lmrcImageMirroring: (mrcImage* out, mrcImage* in, lmrcImageMirroring mode) $
-
-../src/lmrcImageModeChange.c:
-
-../src/lmrcImageModelCreate.c:
-
-../src/lmrcImageMontageCreate.c:
-
-../src/lmrcImageMorphology.c:
-
-../src/lmrcImageMove.c:
-
-../src/lmrcImageMultiCTFCompensation.c:
-
-../src/lmrcImageMultiplying.c:
-
-../src/lmrcImageNegativeLaplacian.c:
-
-../src/lmrcImageNormalizing.c:
-
-../src/lmrcImageOneLineSimilarityCalc.c:
-
-../src/lmrcImageOpening.c:
-
-../src/lmrcImagePad.c:
-
-../src/lmrcImagePartImageSegmentation.c:
-
-../src/lmrcImagePixelSummationOfProbabilityGetByImage.c:
-
-../src/lmrcImagePosterization.c:
-
-../src/lmrcImagePrewitt.c:
-
-../src/lmrcImageProjection.c:
-
-../src/lmrcImageProportionalDensityLevelSetByImage.c:
-
-../src/lmrcImageROI2D.c:
-
-../src/lmrcImageROI3D.c:
-
-../src/lmrcImageROInotChangeHeaderLength.c:
-
-../src/lmrcImageRadialDistribution.c:
-
-../src/lmrcImageRhoFiltering.c:
-
-../src/lmrcImageRoberts.c:
-
-../src/lmrcImageRotation.c:
-
-../src/lmrcImageSSDA.c:
-
-../src/lmrcImageSamplingUnitChange.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxation.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationDijValueSet.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationQValueSet.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationRValueSet.c:
-
-../src/lmrcImageShapePCA.c:
-
-../src/lmrcImageShift.c:
-
-../src/lmrcImageShrink.c:
-
-../src/lmrcImageSigmaCalculate.c:
-
-../src/lmrcImageSinogram.c:
-
-../src/lmrcImageSinogramCorrelation.c:
-
-../src/lmrcImageSinogramFFT.c:
-
-../src/lmrcImageSmoothing.c:
-
-../src/lmrcImageSobel.c:
-
-../src/lmrcImageSolventFlattening.c:
-
-../src/lmrcImageSphere.c:
-
-../src/lmrcImageSplit.c:
-
-../src/lmrcImageStudentCalculate.c:
-
-../src/lmrcImageSubtractionCalc.c:
-
-../src/lmrcImageSummationCalculate.c:
-
-../src/lmrcImageSymmetryFind.c:
-
-../src/lmrcImageTfunction.c:
-
-../src/lmrcImageTopHatTransform.c:
-
-../src/lmrcImageTrans.c:
-
-../src/lmrcImageTransformDescartesIntoPolar.c:
-
-../src/lmrcImageTriming.c:
-
-../src/lmrcImageVolumeCalc.c:
-
-../src/lmrcImageWindowing.c:
-
-../src/lmrcImagesFTest.c:
-
-../src/lmrcImagesStatDataGet.c:
-
-../src/lmrcImagesTTest.c:
-
-../src/lmrcImagesVarianceAnalysis.c:
-
-../src/lmrcImagesVarianceMap.c:
-
-../src/lmrcSinogramFET.c:
-
-../src/lmrcSinogramFETPCA.c:
-
-../src/lmrcSinogramFETcalcWeight.c:
-
-../src/lmrcSinogramFETcorrelationMap.c:
-
-../src/lmrcSinogramFETnormalizedMap.c:
-
-../src/lmrcSinogramFETreferredCorrelation.c:
-
-../src/lmrcSinogramFETsmoothParameterMatching.c:
-
-../src/mrcImageCheckFFT.c:
-
-../src/mrcImageCheckSameSize.c:
-
-../src/mrcImageCopy.c:
-
-../src/mrcImageDataSet.c:
-
-../src/mrcImageError.c:
-
-../src/mrcImageGet.c:
-
-../src/mrcImageGetPixels.c:
-
-../src/mrcImageInfo.c:
-
-../src/mrcImageInit.c:
-
-../src/mrcImageOperation.c:
-
-../src/mrcImagePVM.c:
-
-../src/mrcImagePrint.c:
-
-../src/mrcImageRead.c:
-
-../src/mrcImageSectionGet.c:
-
-../src/mrcImageSectionSet.c:
-
-../src/mrcImageSet.c:
-
-../src/mrcImageTailer.c:
-
-../src/mrcImageToIntImage.c:
-
-../src/mrcImageUtil.c:
-
-../src/mrcImageUtilityforVariance.c:
-
-../src/mrcImageWrite.c:
-
-../src/mrcImageWrite2.c:
-
-../src/mrcImagefuncmin.c:
-
-../src/mrcRefUtil.c:
 </PRE>
 <HR>
 <A NAME="include">
@@ -1339,9 +1014,12 @@ extern void mrcImageSectionGet(mrcImage* dst, mrcImage* src, mrcImageParaTypeRea
 /* in mrcImageSectionSet.c */
 extern void mrcImageSectionSet(mrcImage* dst, mrcImage* src, mrcImageParaTypeReal z, long mode);
 
-
 extern double lmrcImageMaxDataGet(mrcImage* src, long mode);
 
+/* in lmrcImageStack.c */
+extern void lmrcImageStackAlloc(mrcImage* dst, mrcImage* src, int N, int* sp, int mode);
+extern void lmrcImageStackPush(mrcImage* dst, mrcImage* src, int* sp, int mode);
+
 /* prototype end */
 
 #ifdef __cplusplus
index 5db834d..594c9b8 100755 (executable)
@@ -903,9 +903,12 @@ extern void mrcImageSectionGet(mrcImage* dst, mrcImage* src, mrcImageParaTypeRea
 /* in mrcImageSectionSet.c */
 extern void mrcImageSectionSet(mrcImage* dst, mrcImage* src, mrcImageParaTypeReal z, long mode);
 
-
 extern double lmrcImageMaxDataGet(mrcImage* src, long mode);
 
+/* in lmrcImageStack.c */
+extern void lmrcImageStackAlloc(mrcImage* dst, mrcImage* src, int N, int* sp, int mode);
+extern void lmrcImageStackPush(mrcImage* dst, mrcImage* src, int* sp, int mode);
+
 /* prototype end */
 
 #ifdef __cplusplus
diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageStack.c b/src/Objects/DataManip/mrcImage/src/lmrcImageStack.c
new file mode 100644 (file)
index 0000000..182fdac
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% lmrcImageStack ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : lmrcImageStack 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%lmrcImageStack ver%I%; Date:%D% %Z%";
+#include <stdio.h>
+#include <stdlib.h>
+#include "../inc/mrcImage.h"
+
+
+void
+lmrcImageStackAlloc(mrcImage* dst, mrcImage* src, int N, int* sp, int mode)
+{
+       mrcImageParaTypeReal x, y;
+       double data;
+
+       dst->Header = src->Header;
+       if(1!=dst->HeaderN.z) {
+               fprintf(stderr, "lmrcImageStackAlloc: not supported 3D stack, just 2D stack\n");
+               exit(EXIT_FAILURE);
+       }
+       dst->HeaderN.z = N;
+       mrcInit(dst, NULL);
+       
+       *sp = 0;
+
+       for(x=0; x<dst->HeaderN.x; x++) {
+       for(y=0; y<dst->HeaderN.y; y++) {
+               mrcPixelDataGet(src, x, y,   0, &data, mrcPixelRePart, mrcPixelHowNearest);
+               mrcPixelDataSet(dst, x, y, *sp,  data, mrcPixelRePart);  
+       }
+       }
+}
+
+void
+lmrcImageStackPush(mrcImage* dst, mrcImage* src, int* sp, int mode)
+{
+       mrcImageParaTypeReal x, y;
+       double data;
+
+       if(dst->HeaderN.x!=src->HeaderN.x
+        ||dst->HeaderN.y!=src->HeaderN.y) {
+               fprintf(stderr, "Size not different: dst %d %d src %d %d\n",
+                       dst->HeaderN.x, dst->HeaderN.y,
+                       src->HeaderN.x, src->HeaderN.y);
+               exit(EXIT_FAILURE);     
+       }
+
+       *sp += 1;
+       if(dst->HeaderN.z<=*sp) {
+               fprintf(stderr, "Stack Overflow: %d : max %d\n", *sp, dst->HeaderN.z); 
+               exit(EXIT_FAILURE);
+       }
+
+       for(x=0; x<dst->HeaderN.x; x++) {
+       for(y=0; y<dst->HeaderN.y; y++) {
+               mrcPixelDataGet(src, x, y,   0, &data, mrcPixelRePart, mrcPixelHowNearest);
+               mrcPixelDataSet(dst, x, y, *sp,  data, mrcPixelRePart);  
+       }
+       }
+}
index bb62042..61a764e 100755 (executable)
@@ -150,3 +150,4 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
deleted file mode 100755 (executable)
index ad841104b1b4aa83ce554496adb2d2476544f988..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-include Config/Target.inc
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..80a2401a7dc3d8e1cdc121c22208bd28b6887cf3
--- /dev/null
@@ -0,0 +1 @@
+/Users/tacyas/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file
deleted file mode 100755 (executable)
index dfd525eab555f9091108b34834053d364b8bf0ad..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,107 +0,0 @@
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-all:
-       for dir in ${SOURCE} ; \
-       do \
-               if [ -d $${dir} ] ; then \
-                       $(CD) $${dir}; make all; $(CD) ..; \
-               fi \
-       done
-
-install:
-       for dir in ${SOURCE} ; \
-       do \
-               if [ -d $${dir} ] ; then \
-                       $(CD) $${dir}; make install; $(CD) ..; \
-               fi \
-       done
-
-put:
-       for dir in ${SOURCE} ; \
-       do \
-               if [ -d $${dir} ] ; then \
-                       $(CD) $${dir}; make put; $(CD) ..; \
-               fi \
-       done
-
-putSF:
-       if [ -f private ] ; then \
-               echo "$(WORLDNAME)/$(CLASSNAME) is private " ; \
-       else \
-               for dir in ${SOURCE} ; \
-               do \
-                       if [ -d $${dir} ] ; then \
-                               $(CD) $${dir}; make putSF; $(CD) ..; \
-                       fi \
-               done \
-       fi
-
-clean:
-       for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make clean; $(CD) ..; \
-       done
-
-check:
-       @for dir in ${SOURCE} ; do \
-               if [ -d $${dir} ] ; then \
-                       $(CD) $${dir}; \
-                       echo  $${dir}; \
-                       $(RM) Makefile; \
-                       $(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/Makefile Makefile ; \
-                       make check; \
-                       $(CD) ..; \
-               fi \
-       done
-
-depend: check
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make depend; $(CD) ..; \
-       done
-
-backup: 
-       cd ../../..; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
-       tar uvf ${EOS_HOME}/backup/EosBase.tar .[A-z]*
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make backup; $(CD) ..; \
-       done
-
-backup-all: 
-       cd ../../..; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
-       tar rvf ${EOS_HOME}/backup/EosBase.tar .[A-z]*
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make backup; $(CD) ..; \
-       done
-
-distribute: 
-       cd ../../..; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make distribute; $(CD) ..; \
-       done
-
-distribute-all: 
-       cd ../../..; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make distribute-all; $(CD) ..; \
-       done
-
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..01f58fa4fda07b9019cef70af10c561dec5bb121
--- /dev/null
@@ -0,0 +1 @@
+/Users/tacyas/Eos/src/Config/Template/ToolsClassTemplate.Dir/Makefile
\ No newline at end of file
index 762f42d..f121c96 100755 (executable)
@@ -1,6 +1,6 @@
 # OptionControlFile
 # FileFormat
-"-I","-I[nput array of file]","InputDataFiles","Optional","1","1","In","inFileListNoOpen","stdin"
-"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","NULL"
+"-I","-I[nput array of file]","InputDataFiles","Optional","1","1","In","inFileListNoOpen::mrcImage","stdin"
+"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile::mrcImage","NULL"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
deleted file mode 100755 (executable)
index 4dbb018acae5475bce203b3db2365124accfa24b..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,104 +0,0 @@
-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
-
-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
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ef1f6300ba0b84da4931ed574ccec31fc5b88177
--- /dev/null
@@ -0,0 +1 @@
+/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageStack/doc/Makefile b/src/Tools/mrcImage/mrcImageStack/doc/Makefile
new file mode 120000 (symlink)
index 0000000..d75d753
--- /dev/null
@@ -0,0 +1 @@
+/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file
index d9170a8..5276e47 100755 (executable)
@@ -14,8 +14,10 @@ typedef struct mrcImageStackInfo {
     long flagRedirect;
 
     long flagIn;
-    char* In;
-    FILE* fptIn;
+    char** In;
+    char* InList;
+    FILE** fptIn;
+    FILE* fptInList;
     
     long flagOut;
     char* Out;
index dd5bd3b..c4438c5 100755 (executable)
 void
 argCheck(mrcImageStackInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    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") {
+                SCASE("I") {
                     if(i+1<argc) {
-                        info->In = stringGetNthWord(argv[i+1], 1, " ,");
+                        info->InList = stringGetNthWord(argv[i+1], 1, " ,");
                         i++;
                         info->flagIn++;
                     } else {
index 05fa1e8..fc152e6 100755 (executable)
@@ -12,7 +12,7 @@
 void
 init0(mrcImageStackInfo* info)
 {
-    info->fptIn = NULL;    info->flagIn = 0;
+    info->fptIn     = stdin;    info->fptInList = stdin;    info->flagIn = 0;
     info->fptOut = NULL;    info->flagOut = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
@@ -23,18 +23,27 @@ init1(mrcImageStackInfo* info)
 {
     char s[1024];
     int i;
-    if(!info->flagIn) {
-        stringGetFromFile(s, "In", stdin, stdout, 0);
-        info->In = stringGetNthWord(s, 1, " ,");
-        info->flagIn++;
-    }
     if(info->flagIn) {
-        info->fptIn = fileOpen(info->In, "r");
+        info->fptInList = fileOpen(info->InList, "r");
+        fseek(info->fptInList, 0L, SEEK_SET);
+        i=0;
+        while(NULL!=stringGetFromFile(s, "", info->fptInList, stdout, 1)) {
+            i++;
+        }
+        info->fptIn = (FILE**)memoryAllocate(i*sizeof(FILE*), "in init1");
+        info->In    = (char**)memoryAllocate(i*sizeof(char*), "in init1");
+        info->flagIn = i;
+        fseek(info->fptInList, 0L, SEEK_SET);
+        i=0;
+        while(NULL!=stringGetFromFile(s, "", info->fptInList, stdout, 1)) {
+            info->In[i] = stringGetNthWord(s, 1, " ,\t");
+            i++;
+        }
     }
     
     if(!info->flagOut) {
         stringGetFromFile(s, "Out", stdin, stdout, 0);
-        info->Out = stringGetNthWord(s, 1, " ,");
+        info->Out = stringGetNthWord(s, 1, " ,\t");
         info->flagOut++;
     }
     if(info->flagOut) {
index 1ce155d..9b0a6b8 100755 (executable)
@@ -40,10 +40,10 @@ main(int argc, char* argv[])
        mrcImageStackInfo info;
 
 /* variables */
-       mrcImage in1;
-       mrcImage in2;
+       mrcImage in;
        mrcImage out;
        long i;
+       int sp;
 
 /* input patameters ,file open */
        init0(&info);
@@ -53,13 +53,18 @@ main(int argc, char* argv[])
 
 /* begin */
        DEBUGPRINT("Program Start\n");
-       mrcFileRead(&in1, info.In[0], "in main file", 0);
+
+       mrcFileRead(&in, info.In[0], "in main file", 0);
+       lmrcImageStackAlloc(&out, &in, info.flagIn, &sp, info.mode); 
+       mrcImageFree(&in,"");
+
        for(i=1; i<info.flagIn; i++) {
-           mrcFileRead(&in2, info.In[i], "in main file", 0);
-           lmrcImageStack(&in1, &in2);
-           mrcImageFree(&in2,"");
-         }
-       mrcFileWrite(&in1 ,info.Out ,"in main" ,0);
+           mrcFileRead(&in, info.In[i], "in main file", 0);
+           lmrcImageStackPush(&out, &in, &sp, info.mode);
+               DEBUGPRINT1("%d\n", sp);
+           mrcImageFree(&in,"");
+       }
+       mrcFileWrite(&out,info.Out ,"in main" ,0);
        exit(EXIT_SUCCESS);
 }
 
index 8c6babb..da058f5 100755 (executable)
@@ -1 +1,18 @@
-/bin/bash: mrcImageStack: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageStack</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageStack</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageStack
+Options:
+    [-I[nput array of file]In                  (stdin     ).as(inFileListNoOpen::mrcImage) ] :Optional  :InputDataFiles
+    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index 1534b78..a2251ae 100755 (executable)
@@ -7,7 +7,7 @@
         -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOS/bin/mrcImageStack
         -H 1  5x1+41+0 'Help' 'help page' $EOS/src/Tools/mrcImage/mrcImageStack/doc/mrcImageStack.doc help
         -Q 1 0 5.25x1+47+0 'Close'
-        -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'InputDataFile' i
+        -I 1 0 1 0 0 1 -1x1+1+1.500000 ' ' 'In' 'InputDataFiles' 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
diff --git a/src/Tools/mrcImage/mrcImageStack/src/test/Makefile b/src/Tools/mrcImage/mrcImageStack/src/test/Makefile
new file mode 100755 (executable)
index 0000000..519f747
--- /dev/null
@@ -0,0 +1,24 @@
+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/test.in -o data/test.out
+       @echo "----- Calc check -----"          
+
+clean:
+
+init:
+       rm -f data/test.in
+       for i in 00 10 20 30 40 50 60; do \
+               pdb2mrc2d -i data/121p.pdb -o data/121p-$$i.mrc -startEA YOYS $$i 0 0 -d 1.25 1.25 -s -40 -40 -n 64 64 -sig 2.0; \
+               echo "data/121p-$$i.mrc" >> data/test.in; \
+       done
diff --git a/src/Tools/mrcImage/mrcImageStack/src/test/data b/src/Tools/mrcImage/mrcImageStack/src/test/data
new file mode 120000 (symlink)
index 0000000..4b5296e
--- /dev/null
@@ -0,0 +1 @@
+../../../../../..//data/mrcImageStack
\ No newline at end of file
index 66a914c..269593d 100755 (executable)
@@ -7,10 +7,10 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-I[nput array of file]In                  (stdin     ).as(inFileListNoOpen::mrcImage) ] :Optional  :InputDataFiles\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :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();
 }