OSDN Git Service

Please enter the commit message for your changes. Lines starting v2.3.56p0280
author安永卓生 <tacyas@yasunagatakuonoMacBook-Pro.local>
Sat, 25 Nov 2017 22:09:39 +0000 (07:09 +0900)
committer安永卓生 <tacyas@yasunagatakuonoMacBook-Pro.local>
Sat, 25 Nov 2017 22:09:39 +0000 (07:09 +0900)
 with '#' will be ignored, and an empty message aborts the commit.

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

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

 Changes to be committed:
new file:   bin/eosPointCurvatureInfo
new file:   bin/mrcImageMergeFFT
modified:   bin/wish/Display2/tclIndex
modified:   include/ctfInfo.h
modified:   include/eosBayes.h
modified:   include/mrcImage.h
modified:   lib/tclIndex
new file:   src/Objects/Config/Target.inc
modified:   src/Objects/DataManip/ctfInfo/doc/ctfInfo.html
modified:   src/Objects/DataManip/mrcImage/doc/mrcImage.html
modified:   src/Objects/DataManip/mrcImage/inc/mrcImage.h
modified:   src/Objects/DataManip/mrcImage/src/lmrcImagePattersonFunctionCalc.c
modified:   src/Objects/General/.Source.org
new file:   src/Objects/General/Config/Target.inc
new file:   src/Objects/General/Makefile
deleted:    src/Objects/General/SpecialNumber/src/.tmp1
deleted:    src/Objects/General/SpecialNumber/src/.tmp2
modified:   src/Objects/General/eosBayes/doc/eosBayes.html
new file:   src/Objects/Makefile
modified:   src/Tools/Config/Define.inc
modified:   src/Tools/Integration/Display2/src/Display2.html
modified:   src/Tools/Integration/ctfDisplay/src/ctfDisplay.html
modified:   src/Tools/Integration/imagesView/src/imagesView.html
modified:   src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.html
modified:   src/Tools/ctfInfo/ctfDeterminationFromThonRing/src/argCheck.c
modified:   src/Tools/ctfInfo/defocusDeterminationFromThonRing/src/argCheck.c
modified:   src/Tools/eosPoint/.Source.org
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/Config/Define.inc
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/Config/OptionControlFile
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/Config/Target.inc
renamed:    src/Tools/eosPoint/eosPointTracker/Makefile -> src/Tools/eosPoint/eosPointCurvatureInfo/Makefile
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/doc/Makefile
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/inc/config.h
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/inc/eosPointCurvatureInfo.h
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/.Depend
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/.Source
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/Makefile
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/X86MAC64
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/argCheck.c
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.c
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.html
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.pane
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/init.c
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/usage.c
new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/util.c
modified:   src/Tools/eosPoint/eosPointProjector/src/eosPointProjector.html
modified:   src/Tools/filter/.Source.org
modified:   src/Tools/filter/bin2mrc/src/bin2mrc.html
modified:   src/Tools/filter/tiff2mrc/src/tiff2mrc.html
modified:   src/Tools/mrcImage/.Source
modified:   src/Tools/mrcImage/.Source.org
modified:   src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
new file:   src/Tools/mrcImage/mrcImageMergeFFT/Config/Define.inc
new file:   src/Tools/mrcImage/mrcImageMergeFFT/Config/OptionControlFile
new file:   src/Tools/mrcImage/mrcImageMergeFFT/Config/Target.inc
new file:   src/Tools/mrcImage/mrcImageMergeFFT/Makefile
new file:   src/Tools/mrcImage/mrcImageMergeFFT/doc/Makefile
new file:   src/Tools/mrcImage/mrcImageMergeFFT/inc/config.h
new file:   src/Tools/mrcImage/mrcImageMergeFFT/inc/mrcImageMergeFFT.h
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/.Depend
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/.Source
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/Makefile
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/X86MAC64
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/argCheck.c
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/init.c
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.c
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.html
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.pane
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/usage.c
new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/util.c
modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/Config/OptionControlFile
modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/inc/mrcImagePattersonFunctionCalc.h
modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/init.c
modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/mrcImagePattersonFunctionCalc.c
modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/mrcImagePattersonFunctionCalc.html
modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/mrcImagePattersonFunctionCalc.pane
modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/usage.c
copied:     src/Tools/mrcImage/mrcImageUnbentROI/src/argCheck.c -> src/Tools/mrcImage/mrcImagePrint/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImagePrint3D/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageShapePCA/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageShapePCAFit/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageUnbentROI/src/argCheck.c
modified:   src/Tools/pdbUtil/pdbRhoFit/src/argCheck.c
modified:   src/Tools/pdbUtil/pdbRhoFitTm/src/argCheck.c
modified:   src/Tools/rec3d/llExtract/src/argCheck.c
modified:   src/Tools/timeSeries/.Source.org
new file:   src/Tools/timeSeries/Config/Target.inc
modified:   src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.html

90 files changed:
bin/eosPointCurvatureInfo [new symlink]
bin/mrcImageMergeFFT [new symlink]
bin/wish/Display2/tclIndex
include/ctfInfo.h
include/eosBayes.h
include/mrcImage.h
lib/tclIndex
src/Objects/Config/Target.inc [new file with mode: 0755]
src/Objects/DataManip/ctfInfo/doc/ctfInfo.html
src/Objects/DataManip/mrcImage/doc/mrcImage.html
src/Objects/DataManip/mrcImage/inc/mrcImage.h
src/Objects/DataManip/mrcImage/src/lmrcImagePattersonFunctionCalc.c
src/Objects/General/.Source.org
src/Objects/General/Config/Target.inc [new file with mode: 0755]
src/Objects/General/Makefile [new file with mode: 0755]
src/Objects/General/SpecialNumber/src/.tmp1 [deleted file]
src/Objects/General/SpecialNumber/src/.tmp2 [deleted file]
src/Objects/General/eosBayes/doc/eosBayes.html
src/Objects/Makefile [new file with mode: 0755]
src/Tools/Config/Define.inc
src/Tools/Integration/Display2/src/Display2.html
src/Tools/Integration/ctfDisplay/src/ctfDisplay.html
src/Tools/Integration/imagesView/src/imagesView.html
src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.html
src/Tools/ctfInfo/ctfDeterminationFromThonRing/src/argCheck.c
src/Tools/ctfInfo/defocusDeterminationFromThonRing/src/argCheck.c
src/Tools/eosPoint/.Source.org
src/Tools/eosPoint/eosPointCurvatureInfo/Config/Define.inc [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/Config/OptionControlFile [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/Config/Target.inc [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/Makefile [moved from src/Tools/eosPoint/eosPointTracker/Makefile with 100% similarity]
src/Tools/eosPoint/eosPointCurvatureInfo/doc/Makefile [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/inc/config.h [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/inc/eosPointCurvatureInfo.h [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/src/.Depend [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/src/.Source [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/src/Makefile [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/src/X86MAC64 [new symlink]
src/Tools/eosPoint/eosPointCurvatureInfo/src/argCheck.c [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.c [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.html [new file with mode: 0644]
src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.pane [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/src/init.c [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/src/usage.c [new file with mode: 0755]
src/Tools/eosPoint/eosPointCurvatureInfo/src/util.c [new file with mode: 0755]
src/Tools/eosPoint/eosPointProjector/src/eosPointProjector.html
src/Tools/filter/.Source.org
src/Tools/filter/bin2mrc/src/bin2mrc.html
src/Tools/filter/tiff2mrc/src/tiff2mrc.html
src/Tools/mrcImage/.Source
src/Tools/mrcImage/.Source.org
src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/argCheck.c
src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
src/Tools/mrcImage/mrcImageMergeFFT/Config/Define.inc [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/Config/OptionControlFile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/Config/Target.inc [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/doc/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/inc/config.h [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/inc/mrcImageMergeFFT.h [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/src/.Depend [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/src/.Source [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/src/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/src/X86MAC64 [new symlink]
src/Tools/mrcImage/mrcImageMergeFFT/src/argCheck.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/src/init.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.html [new file with mode: 0644]
src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.pane [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/src/usage.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImageMergeFFT/src/util.c [new file with mode: 0755]
src/Tools/mrcImage/mrcImagePattersonFunctionCalc/Config/OptionControlFile
src/Tools/mrcImage/mrcImagePattersonFunctionCalc/inc/mrcImagePattersonFunctionCalc.h
src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/argCheck.c
src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/init.c
src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/mrcImagePattersonFunctionCalc.c
src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/mrcImagePattersonFunctionCalc.html
src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/mrcImagePattersonFunctionCalc.pane
src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/usage.c
src/Tools/mrcImage/mrcImagePrint/src/argCheck.c
src/Tools/mrcImage/mrcImagePrint3D/src/argCheck.c
src/Tools/mrcImage/mrcImageShapePCA/src/argCheck.c
src/Tools/mrcImage/mrcImageShapePCAFit/src/argCheck.c
src/Tools/mrcImage/mrcImageUnbentROI/src/argCheck.c
src/Tools/pdbUtil/pdbRhoFit/src/argCheck.c
src/Tools/pdbUtil/pdbRhoFitTm/src/argCheck.c
src/Tools/rec3d/llExtract/src/argCheck.c
src/Tools/timeSeries/.Source.org [changed mode: 0755->0644]
src/Tools/timeSeries/Config/Target.inc [new file with mode: 0755]
src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.html [changed mode: 0644->0755]

diff --git a/bin/eosPointCurvatureInfo b/bin/eosPointCurvatureInfo
new file mode 120000 (symlink)
index 0000000..eddb955
--- /dev/null
@@ -0,0 +1 @@
+../sbin/MachineIndependent
\ No newline at end of file
diff --git a/bin/mrcImageMergeFFT b/bin/mrcImageMergeFFT
new file mode 120000 (symlink)
index 0000000..eddb955
--- /dev/null
@@ -0,0 +1 @@
+../sbin/MachineIndependent
\ No newline at end of file
index c4c3f5a..03796f9 100644 (file)
@@ -6,17 +6,43 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
-set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
-set auto_index(colormapChange) [list source [file join $dir Display2Colormap.wish]]
-set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
-set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
-set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
 set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]]
 set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]]
 set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]]
+set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
+set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
+set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
+set auto_index(colormapChange) [list source [file join $dir Display2Colormap.wish]]
+set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]]
+set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]]
+set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]]
+set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.wish]]
+set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
+set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
 set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]]
 set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]]
 set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]]
@@ -28,41 +54,7 @@ set auto_index(sectionInformationWinCreate) [list source [file join $dir Display
 set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]]
 set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]]
 set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]]
-set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]]
-set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]]
-set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.wish]]
-set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
-set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuExitCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]]
-set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]]
-set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]]
-set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]]
-set auto_index(menuRoiSingleMultiTransform) [list source [file join $dir Display2MenuROI.wish]]
-set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuROI.wish]]
-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]]
-set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]]
-set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
-set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
-set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
-set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
 set auto_index(roiAreaCreateStart) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(roiAreaCreateMotion) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(roiAreaCreateEnd) [list source [file join $dir RoiAreaCreate.wish]]
@@ -80,15 +72,22 @@ set auto_index(roiSplineEnd) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(splineCreate) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(knobShow) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(knobHide) [list source [file join $dir RoiAreaCreate.wish]]
-set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
-set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
-set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]]
-set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]]
-set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]]
-set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]]
-set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]]
-set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]]
-set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]]
+set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
+set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuExitCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]]
+set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]]
+set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]]
+set auto_index(menuRoiSingleMultiTransform) [list source [file join $dir Display2MenuROI.wish]]
+set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuROI.wish]]
+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(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]]
 set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]]
 set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]]
@@ -105,29 +104,18 @@ set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]]
 set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
 set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]]
 set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
-set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
-set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
-set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
+set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
+set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.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]]
+set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]]
+set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
 set auto_index(sectionInit) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionRecreateAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionRecreate) [list source [file join $dir SectionUtil.wish]]
@@ -136,4 +124,16 @@ set auto_index(sectionCreate) [list source [file join $dir SectionUtil.wish]]
 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(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
 set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
+set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]]
+set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]]
+set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]]
+set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]]
+set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]]
+set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]]
+set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]]
+set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
index 69f64f5..52033ab 100644 (file)
@@ -116,9 +116,11 @@ typedef struct ctfInfo {
        /* For Gaussian */
        long flagWithInElastic;
        float InElasticGaussian;
+
        /* For Table */
        long flagWithInElasticTable;
        molecularEnvelope InElasticEnvTable;    
+
        /* Lorentzian */        
        long flagInElastic;
        float InElastic;
@@ -127,6 +129,10 @@ typedef struct ctfInfo {
        float InElasticRing;
        float InElasticRingPosition;
        float InElasticRingWidth;
+
+       /* Phase Plate */
+       long flagAdditionalPhase;
+       float AdditionalPhase; // [radian] 
 } ctfInfo;
 
 /* struct end */
index 1c20f54..8689fdd 100644 (file)
@@ -66,7 +66,6 @@ extern void eosBayesRefinementCondition(FILE* fptIn, eosBayes* d, eosBayesDistri
 extern void eosBayesGettopthreepoint(eosBayesDistribution* d, float* value, float* prob);
 extern void eosBayesLiniearinterpolationofTopthreepoint(eosBayesDistribution* d, float* value, float* prob);
 
-
 // Initialize Each distribution of eosBayesDistributions
 extern void eosBayesDistributionInit(eosBayesDistribution* d,eosBayesDistributionInfo* info, int mode);
 
index c04ee62..79545aa 100644 (file)
@@ -758,8 +758,9 @@ extern void lmrcImageCorrelationModePrint(FILE* fpt);
 extern void lmrcImageFFTCenterChange(mrcImage* fft, int mode);
 
 /* in lMrcImagePattersonFunctionCalc.c */
-extern void lmrcImagePattersonFunctionCalc(mrcImage* out, mrcImage* in);
+extern void lmrcImagePattersonFunctionCalc(mrcImage* out, mrcImage* outFFT, mrcImage* in);
 extern void lmrcImagePattersonFunctionPrint(FILE* fpt, mrcImage* in, int mode);
+extern void lmrcImageGuinierFunctionPrint(FILE* fpt, mrcImage* in, int mode);
 
 #include "ctfInfo.h"
 extern void lmrcImageCorrelationWithCTFCompensation(mrcImage* out, mrcImage* in, ctfInfo* inctf, mrcImage* ref, ctfInfo* refctf, long mode);
index f808d10..eae6c6a 100644 (file)
@@ -6,43 +6,25 @@
 # 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(NotSupportedCommand) [list source [file join $dir tclUtil.wish]]
+set auto_index(debugPrint) [list source [file join $dir tclUtil.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(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]]
@@ -74,32 +56,19 @@ set auto_index(::CTF::ctfInfoCTFCalculation) [list source [file join $dir ctfInf
 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(defaultLoad) [list source [file join $dir defaultLoad.wish]]
-set auto_index(defaultLoadProcTemplate) [list source [file join $dir defaultLoad.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(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(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]]
@@ -119,23 +88,54 @@ 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(debugPrint) [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]]
+set auto_index(eosCommandExecute) [list source [file join $dir commandUtil.wish]]
+set auto_index(defaultLoad) [list source [file join $dir defaultLoad.wish]]
+set auto_index(defaultLoadProcTemplate) [list source [file join $dir defaultLoad.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(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(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]]
diff --git a/src/Objects/Config/Target.inc b/src/Objects/Config/Target.inc
new file mode 100755 (executable)
index 0000000..fedc88b
--- /dev/null
@@ -0,0 +1,109 @@
+all: 
+       for i in $(SOURCE); \
+       do \
+               echo $$i;    \
+               $(CD) $$i;   \
+               $(MAKE) all; \
+               $(CD) ..;    \
+       done
+
+install:
+       for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) install; $(CD) ..; \
+       done
+
+debug: 
+       for i in $(SOURCE); \
+       do \
+               echo $$i;    \
+               $(CD) $$i;   \
+               $(MAKE) debug; \
+               $(CD) ..;    \
+       done
+
+install-debug:
+       for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) install-debug; $(CD) ..; \
+       done
+
+clean: 
+       for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) clean; $(CD) ..; \
+       done
+
+put: 
+       for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) put; $(CD) ..; \
+       done
+
+depend: check
+       for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) depend; $(CD) ..; \
+       done
+
+check::
+       @if [ ! -d $(EOS_HOME)/lib ] ; then \
+               mkdir $(EOS_HOME)/lib ; \
+       fi
+       @if [ ! -d $(EOS_HOME)/include ] ; then \
+               mkdir $(EOS_HOME)/include ; \
+       fi
+       @for i in $(SOURCE);\
+       do \
+               $(CD) $$i; \
+               dotSourceInMakefileCreate ./ $$i $(WORLDNAME); \
+               $(RM) -f Makefile; \
+               $(CP) ../../Config/Template/$(WORLDNAME)ClassTemplate.Dir/Makefile Makefile; \
+               $(CD) Config; \
+               $(RM) -f Target.inc; \
+               $(CP) ../../../Config/Template/$(WORLDNAME)ClassTemplate.Dir/Config/Target.inc Target.inc; \
+               $(CD) ..; \
+               $(MAKE) check; \
+               $(CD) ..; \
+       done
+
+backup::
+       @cd ../..; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/Config ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/Makefile ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/.[A-z]*
+       @for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) backup; $(CD) ..; \
+       done
+
+backup-all::
+       @cd ../..; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/Config ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/Makefile ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/.[A-z]*
+       @for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) backup-all; $(CD) ..; \
+       done
+
+distribute::
+       @cd ../..; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/Config ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/Makefile ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/.[A-z]*
+       @for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) distribute; $(CD) ..; \
+       done
+
+distribute-all::
+       @cd ../..; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/Config ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/Makefile ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/.[A-z]*
+       @for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) distribute-all; $(CD) ..; \
+       done
+
index 9e74bde..dd81301 100755 (executable)
@@ -138,9 +138,11 @@ typedef struct ctfInfo {
        /* For Gaussian */
        long flagWithInElastic;
        float InElasticGaussian;
+
        /* For Table */
        long flagWithInElasticTable;
        molecularEnvelope InElasticEnvTable;    
+
        /* Lorentzian */        
        long flagInElastic;
        float InElastic;
@@ -149,6 +151,10 @@ typedef struct ctfInfo {
        float InElasticRing;
        float InElasticRingPosition;
        float InElasticRingWidth;
+
+       /* Phase Plate */
+       long flagAdditionalPhase;
+       float AdditionalPhase; // [radian] 
 } ctfInfo;
 
 /* struct end */
index 852be81..6ae232f 100755 (executable)
@@ -869,8 +869,9 @@ extern void lmrcImageCorrelationModePrint(FILE* fpt);
 extern void lmrcImageFFTCenterChange(mrcImage* fft, int mode);
 
 /* in lMrcImagePattersonFunctionCalc.c */
-extern void lmrcImagePattersonFunctionCalc(mrcImage* out, mrcImage* in);
+extern void lmrcImagePattersonFunctionCalc(mrcImage* out, mrcImage* outFFT, mrcImage* in);
 extern void lmrcImagePattersonFunctionPrint(FILE* fpt, mrcImage* in, int mode);
+extern void lmrcImageGuinierFunctionPrint(FILE* fpt, mrcImage* in, int mode);
 
 #include "ctfInfo.h"
 extern void lmrcImageCorrelationWithCTFCompensation(mrcImage* out, mrcImage* in, ctfInfo* inctf, mrcImage* ref, ctfInfo* refctf, long mode);
index c04ee62..79545aa 100755 (executable)
@@ -758,8 +758,9 @@ extern void lmrcImageCorrelationModePrint(FILE* fpt);
 extern void lmrcImageFFTCenterChange(mrcImage* fft, int mode);
 
 /* in lMrcImagePattersonFunctionCalc.c */
-extern void lmrcImagePattersonFunctionCalc(mrcImage* out, mrcImage* in);
+extern void lmrcImagePattersonFunctionCalc(mrcImage* out, mrcImage* outFFT, mrcImage* in);
 extern void lmrcImagePattersonFunctionPrint(FILE* fpt, mrcImage* in, int mode);
+extern void lmrcImageGuinierFunctionPrint(FILE* fpt, mrcImage* in, int mode);
 
 #include "ctfInfo.h"
 extern void lmrcImageCorrelationWithCTFCompensation(mrcImage* out, mrcImage* in, ctfInfo* inctf, mrcImage* ref, ctfInfo* refctf, long mode);
index 8eeac61..f1ceda7 100644 (file)
 #%Z%
 */
 static char __sccs_id[] = "%Z%lmrcImagePattersonFunctionCalc ver%I%; Date:%D% %Z%";
-
+#define DEBUG
+#include "genUtil.h"
 #include "../inc/mrcImage.h"
+#include "Memory.h"
 
 void
-lmrcImagePattersonFunctionCalc(mrcImage* out, mrcImage* in)
+lmrcImagePattersonFunctionCalc(mrcImage* out, mrcImage* outfft, mrcImage* in)
 {
        mrcImage fft;
-       int X, Y, Z;
+       mrcImage powfft;
+       mrcImageParaTypeReal X, Y, Z;
        double pow;
 
+    DEBUGPRINT("lmrcImagePattersonFunctionCalc");
        lmrcImageFFT(&fft, in, 0);
+    powfft.Header = fft.Header;
+    mrcInit(&powfft, NULL);
 
-       for(Z=-fft.HeaderN.z/2; Z< fft.HeaderN.z/2; Z++) {      
-       for(Y=-fft.HeaderN.y/2; Y< fft.HeaderN.y/2; Y++) {      
-       for(X=0;                X<=fft.HeaderN.x/2; X++) {      
+       for(Z=-fft.HeaderN.z/2.0; Z<  fft.HeaderN.z/2.0; Z++) { 
+       for(Y=-fft.HeaderN.y/2.0; Y<  fft.HeaderN.y/2.0; Y++) { 
+       for(X=0;                  X<= fft.HeaderN.x/2.0; X++) { 
                mrcPixelDataGet(&fft, X, Y, Z, &pow, mrcPixelPow,    mrcPixelHowNearest);
-               mrcPixelDataSet(&fft, X, Y, Z, pow,  mrcPixelRePart);
-               mrcPixelDataSet(&fft, X, Y, Z, 0,    mrcPixelImPart);
+               mrcPixelDataSet(&powfft, X, Y, Z, pow,  mrcPixelRePart);
+               mrcPixelDataSet(&powfft, X, Y, Z, 0,    mrcPixelImPart);
        }
        }
        }
-       lmrcImageFFT(out, &fft, 0);     
+       lmrcImageFFT(out, &powfft, 0);  
        mrcImageFree(&fft, "in lmrcImagePattersonFunction\n");
+    *outfft = powfft;
 }
 
 void
 lmrcImagePattersonFunctionPrint(FILE* fpt, mrcImage* pat, int mode)
 {
-       int x;
+       int x, y, z, ir;
        double data;
+    double r;
+    double* patData;
+    int* patDataCount;
 
-       for(x=0; x<=pat->HeaderN.x/2; x++) {
-               mrcPixelDataGet(pat, x, 0, 0, &data, mrcPixelRePart, mrcPixelHowNearest);
-               fprintf(fpt, "%d %f %f\n", x, x*pat->HeaderLength.x, data);
-       }
+    patData = memoryAllocate(sizeof(double)*(pat->HeaderN.x/2+1), "in ");
+    patDataCount = memoryAllocate(sizeof(int)*(pat->HeaderN.x/2+1), "in ");
+
+    for(ir=0; ir<pat->HeaderN.x/2; ir++) {
+               patData[ir] = 0;
+        patDataCount[ir] = 0;
+    }
+
+       for(z=0; z<pat->HeaderN.z; z++) {
+       for(y=0; y<pat->HeaderN.y; y++) {
+       for(x=0; x<pat->HeaderN.x; x++) {
+        mrcPixelDataGet(pat, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
+        r = sqrt(SQR(MIN(x,pat->HeaderN.x-x-1))+SQR(MIN(y,pat->HeaderN.y-y-1))+SQR(MIN(z,pat->HeaderN.z-z-1)));
+        ir = MIN((int)(r+0.5), pat->HeaderN.x/2);
+        patData[ir] += data; 
+        patDataCount[ir]++; 
+    }
+    }
+    }
+
+    for(ir=0; ir<pat->HeaderN.x/2; ir++) {
+        if(0<patDataCount[ir]) {
+               fprintf(fpt, "%d %f %f %d\n", ir, ir*pat->HeaderLength.x, patData[ir]/patDataCount[ir], patDataCount[ir]);
+        } else {
+               fprintf(fpt, "%d %f %f %d\n", ir, ir*pat->HeaderLength.x, patData[ir], patDataCount[ir]);
+        }
+    }
+}
+
+void
+lmrcImageGuinierFunctionPrint(FILE* fpt, mrcImage* guinier, int mode)
+{
+       int x, y, z, ir;
+       double data;
+    double r;
+    double* guinierData;
+    int* guinierDataCount;
+
+    guinierData = memoryAllocate(sizeof(double)*(guinier->HeaderN.x/2+1), "in ");
+    guinierDataCount = memoryAllocate(sizeof(int)*(guinier->HeaderN.x/2+1), "in ");
+
+    for(ir=0; ir<guinier->HeaderN.x/2; ir++) {
+               guinierData[ir] = 0;
+        guinierDataCount[ir] = 0;
+    }
+
+       for(z=-guinier->HeaderN.z/2.0; z<guinier->HeaderN.z/2.0; z++) {
+       for(y=-guinier->HeaderN.y/2.0; y<guinier->HeaderN.y/2.0; y++) {
+       for(x=-guinier->HeaderN.x/2.0; x<guinier->HeaderN.x/2.0; x++) {
+        mrcPixelDataGet(guinier, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
+        r = sqrt(SQR(x/(double)guinier->HeaderN.x)+SQR(y/(double)guinier->HeaderN.y)+SQR(z/(double)guinier->HeaderN.z))*guinier->HeaderN.x;
+        ir = MIN((int)(r+0.5), guinier->HeaderN.x/2);
+        guinierData[ir] += data; 
+        guinierDataCount[ir]++; 
+    }
+    }
+    }
+
+    for(ir=0; ir<guinier->HeaderN.x/2; ir++) {
+        if(0<guinierDataCount[ir]) {
+               fprintf(fpt, "%d %f %f %f %d\n", ir, ir/(guinier->HeaderN.x*guinier->HeaderLength.x), SQR(ir/(guinier->HeaderN.x*guinier->HeaderLength.x)), guinierData[ir]/guinierDataCount[ir], guinierDataCount[ir]);
+        } else {
+               fprintf(fpt, "%d %f %f %f %d\n", ir, ir/(guinier->HeaderN.x*guinier->HeaderLength.x), SQR(ir/(guinier->HeaderN.x*guinier->HeaderLength.x)), guinierData[ir], guinierDataCount[ir]);
+        }
+    }
 }
 
index a4507ac..65f6263 100644 (file)
@@ -14,7 +14,6 @@ Random \
 Raw \
 Socket \
 SpecialNumber \
-String \
 Vector \
 dummy \
 eosBayes \
@@ -23,5 +22,6 @@ eosFunc \
 eosList \
 eosPThread \
 eosPoint \
+eosString \
 genUtil \
 #LastSource
diff --git a/src/Objects/General/Config/Target.inc b/src/Objects/General/Config/Target.inc
new file mode 100755 (executable)
index 0000000..ccdf4c6
--- /dev/null
@@ -0,0 +1,108 @@
+all: 
+       for i in $(SOURCE); \
+       do \
+               echo "---- $$i ----" ; \
+               $(CD) $$i; $(MAKE) all; $(CD) ..; \
+       done
+
+install:
+       for i in $(SOURCE);\
+       do \
+               echo "---- $$i ----" ; \
+               $(CD) $$i; $(MAKE) install; $(CD) ..; \
+       done
+
+debug: 
+       for i in $(SOURCE); \
+       do \
+               echo "---- $$i ----" ; \
+               $(CD) $$i; $(MAKE) debug; $(CD) ..; \
+       done
+
+install-debug:
+       for i in $(SOURCE);\
+       do \
+               echo "---- $$i ----" ; \
+               $(CD) $$i; $(MAKE) install-debug; $(CD) ..; \
+       done
+
+clean: 
+       for i in $(SOURCE);\
+       do \
+               echo "---- $$i ----" ; \
+               $(CD) $$i; $(MAKE) clean; $(CD) ..; \
+       done
+
+depend: check
+       for i in $(SOURCE);\
+       do \
+               echo "---- $$i ----" ; \
+               $(CD) $$i; $(MAKE) depend; $(CD) ..; \
+       done
+
+check:: 
+       @for i in $(SOURCE);\
+       do \
+               echo "---- $$i ----" ; \
+               $(CD) $$i; \
+               dotSourceInMakefileCreate ./ $$i $(CLASSNAME); \
+               $(RM) -f Makefile; \
+               $(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/Makefile Makefile; \
+               $(CD) Config; \
+               $(RM) -f Target.inc; \
+               $(CP) ../../../../Config/Template/$(WORLDNAME)Template.Dir/Config/Target.inc Target.inc; \
+               $(CD) ..; \
+               $(MAKE) check; \
+               $(CD) ..; \
+       done
+
+backup:: 
+       @cd ../../.. ; \
+       echo $(CLASSNAME); \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile 
+       for i in $(SOURCE);\
+       do \
+               $(CD) $$i; \
+               $(MAKE) backup; \
+               $(CD) ..; \
+       done
+
+backup-all:: 
+       @cd ../../.. ; \
+       echo $(CLASSNAME); \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile 
+       for i in $(SOURCE);\
+       do \
+               $(CD) $$i; \
+               $(MAKE) backup-all; \
+               $(CD) ..; \
+       done
+
+distribute:: 
+       @cd ../../.. ; \
+       echo $(CLASSNAME); \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile 
+       @echo $(CLASSNAME); \
+       for i in $(SOURCE);\
+       do \
+               $(CD) $$i; $(MAKE) distribute; $(CD) ..; \
+       done
+
+distribute-all:: 
+       @cd ../../.. ; \
+       echo $(CLASSNAME); \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile 
+       @echo $(CLASSNAME); \
+       for i in $(SOURCE); \
+       do \
+               $(CD) $$i; $(MAKE) distribute-all; $(CD) ..; \
+       done
+
diff --git a/src/Objects/General/Makefile b/src/Objects/General/Makefile
new file mode 100755 (executable)
index 0000000..b69f906
--- /dev/null
@@ -0,0 +1,6 @@
+include ../../Config/Define.inc
+include ../Config/Define.inc
+include Config/Define.inc
+include .Source
+
+include Config/Target.inc
diff --git a/src/Objects/General/SpecialNumber/src/.tmp1 b/src/Objects/General/SpecialNumber/src/.tmp1
deleted file mode 100644 (file)
index 8009302..0000000
+++ /dev/null
@@ -1 +0,0 @@
-X86MAC64/pow2nn.sharedo
diff --git a/src/Objects/General/SpecialNumber/src/.tmp2 b/src/Objects/General/SpecialNumber/src/.tmp2
deleted file mode 100644 (file)
index 8009302..0000000
+++ /dev/null
@@ -1 +0,0 @@
-X86MAC64/pow2nn.sharedo
index 85993a1..366c76d 100644 (file)
@@ -3,25 +3,6 @@
 <H2>Information from source codes</H2>
 </A>
 <PRE>
-../src/eosBayesCondition.c:
-
-../src/eosBayesDistributionInit.c:
-
-../src/eosBayesDistributionInitialProbabilitySet.c:
-
-../src/eosBayesEstimation.c:
-
-../src/eosBayesFree.c:
-
-../src/eosBayesParameterOfMaxPosterior.c:
-
-../src/eosBayesRead.c:
-
-../src/eosBayesWrite.c:
-
-../src/eosBayesflag.c:
-
-../src/leosBayesInit.c:
 </PRE>
 <HR>
 <A NAME="include">
@@ -50,6 +31,9 @@ typedef struct eosBayesDistribution {
   float probofmaxposterior;
   int iofmaxposterior;
   int resetflag;
+  int rangechangeflag;
+  float percentageofrange;
+  int nofpartitions;
   int maxposteriorflag;
   int constantflag;
   eosBayesDistributionRefinementMode refmode;
@@ -101,6 +85,7 @@ extern void eosBayesDistributionInit(eosBayesDistribution* d,eosBayesDistributio
 extern void eosBayesDistributionInitialProbabilitySet(eosBayesDistribution* d, eosBayesDistributionInfo* info, int mode);
 extern void eosBayesProbabilityReset(FILE* fptIn,eosBayes* d, int n, int mode);
 extern void eosBayesProbabilitysetLinear(eosBayesDistribution* d, float a, float b);
+extern void eosBayesProbabilityRangeChange(eosBayes* d, int mode);
 
 /* eosBayesEstimation.c */
 extern void eosBayesEstimation(eosBayes* d, int mode);
@@ -117,7 +102,7 @@ extern void eosBayesWrite(FILE* fpt, eosBayes* d, int mode);
 // 0 min0 max0 delta0 n0 out.prior[0].prob[0] ...... prob[n-1]
 // 1 min1 max1 delta1 n1 out.prior[1].prob[0] ...... prob[n-1]
 
-extern void DistributionChangeCheck(eosBayes* d, int mode);
+extern void DistributionChangeCheck(eosBayes* d, int count, int mode);
 extern void LikelihoodChangeCheck(eosBayes* d, int count, int mode);
 //FileFoemat
 //min max delta n
@@ -140,6 +125,6 @@ extern void leosBayesParameterOfMaxPosteriorGet(eosBayesDistribution* d, int mod
 
 extern void eosBayesFree(eosBayes* d);
 extern void eosBayesMaxposteriorflagSet(eosBayes* d, int Distnum);
-
+extern void eosBayesRangeChangeflagSet(eosBayes*d, int Distnum, float percentageofrange, int nofpartitions);
 #endif /* EOS_BAYES_H */
 </PRE>
diff --git a/src/Objects/Makefile b/src/Objects/Makefile
new file mode 100755 (executable)
index 0000000..ad84110
--- /dev/null
@@ -0,0 +1,5 @@
+include ../Config/Define.inc
+include Config/Define.inc
+include .Source
+
+include Config/Target.inc
index 8f4745e..50205c9 100755 (executable)
@@ -1129,3 +1129,532 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
index e365ba5..3358776 100755 (executable)
@@ -1,3 +1,29 @@
-dyld: Library not loaded: /Users/tacyas/Eos/util/lib:/opt/X11/lib/libtk8.6.dylib
-  Referenced from: /Users/tacyas/Eos/src/Tools/Integration/Display2/src/Display2
-  Reason: image not found
+<HTML>
+<HEAD>
+<TITLE>Display2</TITLE>
+</HEAD>
+<BODY>
+<H1>Display2</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: Display2
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Optional  :Input:mrcImage
+    [-t[epmlate]         Template            (%d.roi   ).as(String              ) ] :Optional  :Template for InputFile 
+    [-H[ighForThres]     ThresHigh           (0.0       ).as(Real                ) ] :Optional  :HighThres
+    [-L[owForThres]      ThresLow            (0.0       ).as(Real                ) ] :Optional  :LowThres
+    [-Zoom               Zoom                (1.0       ).as(Real                ) ] :Optional  :Zoom for InputFile 
+    [-Inverse                                                                      ] :Optional  :Inverse (HighValue(dark)<->LowValue(bright)) for InputFile 
+    [-o[utput]           Out                 (.EosLog   ).as(String              ) ] :Optional  :OutputLogFile
+    [-def[ault]          Default             (~/.Eos/Display2).as(String              ) ] :Optional  :OutputLogFile
+    [-display            geometry            (:0.0      ).as(String              ) ] :Optional  :OutputLogFile
+    [-geometry           display             (1024x1024+0+0).as(String              ) ] :Optional  :OutputLogFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+New wish commands of Display2
+mrcInfoSet [z|min|max] value
+mrcInfoSet [log|pow] 
+mrcInfoGet [Nx|Ny|Nz|Max|Min|Mean|Hist]
+</PRE>
+</BODY>
+</HTML>
index 28bd238..6b771b9 100755 (executable)
@@ -1 +1,23 @@
-/bin/bash: ctfDisplay: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>ctfDisplay</TITLE>
+</HEAD>
+<BODY>
+<H1>ctfDisplay</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: ctfDisplay
+Options:
+    [-i[nput]            inMRC               (NULL      ).as(inFile              ) ] :Optional  :Input:MRC(FFT)
+    [-o[utput]           outCTF              (stdout    ).as(appendFile          ) ] :Optional  :Input/Output: ctfinfo
+    [-Rmax               Rmax                (0.2       ).as(Real                ) ] :Optional  :Rmax [A-1] 
+    [-Imax               Imax                (0.2       ).as(Real                ) ] :Optional  :Intensity: min-max
+    [-Imin               Imin                (0.02      ).as(Real                ) ] :Optional  :Intensity: min-max
+    [-AutoRange                                                                    ] :Optional  :Intensity: min-max
+    [-Log                                                                          ] :Optional  :Log of Intensity
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index 61fa8ab..59026b8 100755 (executable)
@@ -1 +1,19 @@
-/bin/bash: imagesView: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>imagesView</TITLE>
+</HEAD>
+<BODY>
+<H1>imagesView</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: imagesView
+Options:
+    [-i[nput]            In                  (.roi      ).as(String              ) ] :Optional  :Input: Suffixes for viewing
+    [-o[utput]           Out                 (.imagesView).as(String              ) ] :Optional  :Output: FileViewCondition
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+Additional Usage
+This command for viewing images with a suffix
+</PRE>
+</BODY>
+</HTML>
index 404936f..bd25cc6 100755 (executable)
@@ -1 +1,29 @@
-/bin/bash: ctfDeterminationByBayes: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>ctfDeterminationByBayes</TITLE>
+</HEAD>
+<BODY>
+<H1>ctfDeterminationByBayes</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: ctfDeterminationByBayes
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-i[nput]2           In2                 (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-i[nput]3           In3                 (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-i[nput]4           In4                 (NULL      ).as(inFileListNoOpen    ) ] :Essential :InputDataFile
+    [-n[um]              numDistribution     (3         ).as(Integer             ) 
+                         numLikelihood       (3         ).as(Integer             ) ] :Essential :Integer
+    [-rmax               rmax                (250       ).as(Real                ) ] :Optional  :rmax[1/A]
+    [-rintermediate      rintermediate       (250       ).as(Real                ) ] :Optional  :rintermediate[1/A]
+    [-rfiestpeak         rfirstpeak          (0.001     ).as(Real                ) ] :Optional  :rfirstpeak[1/A]
+    [-rmin               rmin                (0         ).as(Real                ) ] :Optional  :rmin[1/A]
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-MTFmode            MTFmode             (0         ).as(Integer             ) ] :Optional  :MTFmode
+    [-Ainmode            Ainmode             (0         ).as(Integer             ) ] :Optional  :Ainmode
+    [-Intensitymode      Intensitymode       (0         ).as(Integer             ) ] :Optional  :Intensitymode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index 69451be..ccd8b5b 100755 (executable)
@@ -145,41 +145,3 @@ argCheck(ctfDeterminationFromThonRingInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->R = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->R[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagR=count;
-                        }
-                    } 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;
-        } 
-    } 
-} 
index af81e97..f5eb790 100755 (executable)
@@ -210,41 +210,3 @@ argCheck(defocusDeterminationFromThonRingInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->R = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->R[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagR=count;
-                        }
-                    } 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;
-        } 
-    } 
-} 
index e0da20f..9f97404 100644 (file)
@@ -1,5 +1,5 @@
 SOURCE=\
+eosPointCurvatureInfo \
 eosPointProjector \
 eosPointRotation \
-eosPointTracker \
 #LastSource
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/Config/Define.inc b/src/Tools/eosPoint/eosPointCurvatureInfo/Config/Define.inc
new file mode 100755 (executable)
index 0000000..073f1fe
--- /dev/null
@@ -0,0 +1,4 @@
+OBJECTNAME = eosPointCurvatureInfo
+EXTRA_LIB  =
+EXTRA_CCOPTS =
+EXTRA_INC =
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/Config/OptionControlFile b/src/Tools/eosPoint/eosPointCurvatureInfo/Config/OptionControlFile
new file mode 100755 (executable)
index 0000000..465fc1c
--- /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","NULL"
+"-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/eosPoint/eosPointCurvatureInfo/Config/Target.inc b/src/Tools/eosPoint/eosPointCurvatureInfo/Config/Target.inc
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/doc/Makefile b/src/Tools/eosPoint/eosPointCurvatureInfo/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/eosPoint/eosPointCurvatureInfo/inc/config.h b/src/Tools/eosPoint/eosPointCurvatureInfo/inc/config.h
new file mode 100755 (executable)
index 0000000..a790fbd
--- /dev/null
@@ -0,0 +1,6 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "../inc/eosPointCurvatureInfo.h"
+
+#endif /* CONFIG_H */
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/inc/eosPointCurvatureInfo.h b/src/Tools/eosPoint/eosPointCurvatureInfo/inc/eosPointCurvatureInfo.h
new file mode 100755 (executable)
index 0000000..3211a1b
--- /dev/null
@@ -0,0 +1,46 @@
+#ifndef EOSPOINTCURVATUREINFO_H
+#define EOSPOINTCURVATUREINFO_H
+#include <stdio.h>
+#include <stdlib.h>
+
+#define OPTION_FLAG     '-'
+#define OPTION_FLAG_POS (0)
+#define OPTION_POS      (1)
+
+
+
+
+typedef struct eosPointCurvatureInfoInfo {
+    long flagRedirect;
+
+    long flagIn;
+    char* In;
+    FILE* fptIn;
+    
+    long flagOut;
+    char* Out;
+    FILE* fptOut;
+    
+    long flagconfigFile;
+    char* configFile;
+    FILE* fptconfigFile;
+    
+    long flagmode;
+    long mode;
+    
+} eosPointCurvatureInfoInfo;
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void argCheck(eosPointCurvatureInfoInfo* info, int argc, char* avgv[]);
+extern void khorosInit(int argc, char* avgv[]);
+extern void init0(eosPointCurvatureInfoInfo* info);
+extern void init1(eosPointCurvatureInfoInfo* info);
+extern void usage(char* usage);
+extern void additionalUsage(void);
+extern void htmlBeforeUsage(char* usage);
+extern void htmlAfterUsage(char* usage);
+#ifdef __cplusplus
+};
+#endif
+#endif /* EOSPOINTCURVATUREINFO_H */
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/src/.Depend b/src/Tools/eosPoint/eosPointCurvatureInfo/src/.Depend
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/src/.Source b/src/Tools/eosPoint/eosPointCurvatureInfo/src/.Source
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/src/Makefile b/src/Tools/eosPoint/eosPointCurvatureInfo/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/eosPoint/eosPointCurvatureInfo/src/X86MAC64 b/src/Tools/eosPoint/eosPointCurvatureInfo/src/X86MAC64
new file mode 120000 (symlink)
index 0000000..59b0c97
--- /dev/null
@@ -0,0 +1 @@
+../../../../../hostdepend/X86MAC64/src/Tools/eosPoint/eosPointCurvatureInfo/src/X86MAC64
\ No newline at end of file
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/src/argCheck.c b/src/Tools/eosPoint/eosPointCurvatureInfo/src/argCheck.c
new file mode 100755 (executable)
index 0000000..226ac2f
--- /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(eosPointCurvatureInfoInfo* 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/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.c b/src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.c
new file mode 100755 (executable)
index 0000000..7bb2c04
--- /dev/null
@@ -0,0 +1,53 @@
+/*
+# eosPointCurvatureInfo : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : eosPointCurvatureInfo
+# 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 "Class.h"
+
+/*
+Example:
+typedef struct leosPointCurvatureInfoInfo {
+       float a;
+       int   b;
+} leosPointCurvatureInfoInfo;
+
+typedef enum leosPointCurvatureInfoMode {
+       a=0,
+       b=1
+} leosPointCurvatureInfoMode;
+*/
+
+int
+main(int argc, char* argv[]) 
+{
+       eosPointCurvatureInfoInfo info;
+
+       init0(&info);
+    argCheck(&info, argc, argv);
+    init1(&info);
+
+       DEBUGPRINT("Program Start\n");
+
+       exit(EXIT_SUCCESS);
+}
+
+void
+additionalUsage()
+{
+       fprintf(stderr, "----- Additional Usage -----\n");
+}
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.html b/src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.html
new file mode 100644 (file)
index 0000000..0804fcb
--- /dev/null
@@ -0,0 +1 @@
+/bin/bash: eosPointCurvatureInfo: No such file or directory
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.pane b/src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.pane
new file mode 100755 (executable)
index 0000000..b4ea7ab
--- /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 ' ' eosPointCurvatureInfo
+      -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/eosPointCurvatureInfo
+        -H 1  5x1+41+0 'Help' 'help page' $EOS/src/Tools/eosPoint/eosPointCurvatureInfo/doc/eosPointCurvatureInfo.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/eosPoint/eosPointCurvatureInfo/src/init.c b/src/Tools/eosPoint/eosPointCurvatureInfo/src/init.c
new file mode 100755 (executable)
index 0000000..441b7e5
--- /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(eosPointCurvatureInfoInfo* info)
+{
+    info->fptIn = NULL;    info->flagIn = 0;
+    info->fptOut = NULL;    info->flagOut = 0;
+    info->fptconfigFile = NULL;    info->flagconfigFile = 0;
+    info->mode = 0;    info->flagmode = 0;
+}
+
+void
+init1(eosPointCurvatureInfoInfo* 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/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.pane", eospath);
+    khoros_initialize(argc, argv, "EOS");
+    fpt = fopen(panepath, "r");    if(NULL!=fpt) {
+        fclose(fpt);
+        kclui_initialize(panepath, KGEN_NONE, "EOS", "eosPointCurvatureInfo",
+                     func_usage_additions,
+                     func_get_args,
+                     func_free_args);
+    }
+}
+#endif /* KHOROS */ 
diff --git a/src/Tools/eosPoint/eosPointCurvatureInfo/src/usage.c b/src/Tools/eosPoint/eosPointCurvatureInfo/src/usage.c
new file mode 100755 (executable)
index 0000000..c3e4fc6
--- /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                 (NULL      ).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/eosPoint/eosPointCurvatureInfo/src/util.c b/src/Tools/eosPoint/eosPointCurvatureInfo/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 3159bde..83abaa6 100755 (executable)
@@ -1 +1,35 @@
-/bin/bash: eosPointProjector: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>eosPointProjector</TITLE>
+</HEAD>
+<BODY>
+<H1>eosPointProjector</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: eosPointProjector
+Options:
+    [-i[nput]            In                  (stdin     ).as(inFile::ASCII       ) ] :Optional  :Input: eosPoint
+    [-i[nput]t[ype]      InType              (3         ).as(Integer             ) ] :Optional  :Input: eosPointType
+    [-o[utput]           Out                 (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output: eosPoint
+    [-o[utput]t[ype]     OutType             (3         ).as(Integer             ) ] :Optional  :Input: eosPointType
+    [-E[uler]A[ngle]     EAMode              (YOYS      ).as(String              ) 
+                         Rot1                (0.0       ).as(Real                ) 
+                         Rot2                (0.0       ).as(Real                ) 
+                         Rot3                (0.0       ).as(Real                ) ] :Optional  :Input: EulerAngleMode Rot1 Rot2 Rot3
+    [-I[nput]            InList              (NULL      ).as(inFileList::ASCII   ) ] :Optional  :Input:  eosPointFileList
+    [-O[uput]            OutList             (NULL      ).as(outFileList::ASCII  ) ] :Optional  :Output: eosPointFileList
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+>> eosPointFileType
+type-0: x y z
+type-1: x y z sig
+type-2: x y z sigx sigy sigz
+type-3: x y z sig sigx sigy sigz
+>> mode
+0: x-projection
+1: y-projection
+2: z-projection
+</PRE>
+</BODY>
+</HTML>
index fdf794b..d27a56c 100644 (file)
@@ -20,6 +20,7 @@ mrc2tiff \
 mrc2viff \
 mrcImage2FFT \
 pdb2ucd \
+raw2mrc \
 test2 \
 tgaInfo \
 tiff2mrc \
index 7897bd5..7b64f1e 100755 (executable)
@@ -1,3 +1,18 @@
-dyld: Library not loaded: @rpath/libcudart.6.5.dylib
-  Referenced from: /Users/tacyas/Eos/src/Tools/filter/bin2mrc/src/bin2mrc
-  Reason: image not found
+<HTML>
+<HEAD>
+<TITLE>bin2mrc</TITLE>
+</HEAD>
+<BODY>
+<H1>bin2mrc</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: bin2mrc
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index 22524bf..fe6207e 100755 (executable)
@@ -1,3 +1,37 @@
-dyld: Library not loaded: /Applications/Eos.app/Eos/util/lib/libtiff.3.dylib
-  Referenced from: /Users/tacyas/Eos/src/Tools/filter/tiff2mrc/src/tiff2mrc
-  Reason: image not found
+<HTML>
+<HEAD>
+<TITLE>tiff2mrc</TITLE>
+</HEAD>
+<BODY>
+<H1>tiff2mrc</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: tiff2mrc
+Options:
+    [-i[nput]            inFile              (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           outFile             (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-r[esolution]       Resolution          (1.0       ).as(Real                ) ] :Optional  :Resolution[A]
+    [-t[ime]             time                (1.0       ).as(Real                ) ] :Optional  :x OptimalTime
+    [-d[irnum]           dirnum              (0         ).as(Integer             ) ] :Optional  :tiffDirectoryNumber
+    [-I[nverse]                                                                    ] :Optional  :Black<->White
+    [-Signed                                                                       ] :Optional  :Original image is Signed or Not: Default unsigned
+    [-Offset             Offset              (0.0       ).as(Real                ) ] :Optional  :OffsetValue
+    [-Max                Max                 (16        ).as(Real                ) ] :Optional  :MaxValue:2^Max
+    [-Min                Min                 (1         ).as(Real                ) ] :Optional  :MinValue:2^Min: without 0
+    [-realMin            realMin             (0.0       ).as(Real                ) ] :Optional  :Real MinValue
+    [-realMax            realMax             (0.0       ).as(Real                ) ] :Optional  :Real MaxValue
+    [-realMaxBit         realMaxBit          (14        ).as(Real                ) ] :Optional  :Real MaxValue Bit
+    [-sin                sinFile             (NULL      ).as(inFile              ) ] :Optional  :sin file from Zeiss
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-S[hrink]           Shrink              (8         ).as(Integer             ) ] :Optional  :ShrinkMode
+    [-M[ode]             Mode                (0         ).as(Integer             ) ] :Optional  :Mode: mrcMode: Def: if -m 0, -M 0. if -m 1 -M 2
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode: 0 (Direct), 1(Log10(65535/data))
+---- mode ----
+0x0000000f bits: Direct or Log
+0x000000f0 bits: Which Color
+                 R: 00
+                 G: 10
+                 B: 20
+</PRE>
+</BODY>
+</HTML>
index 4f34549..89d0432 100644 (file)
@@ -158,6 +158,7 @@ mrcImageMappingtoPdb \
 mrcImageMasking \
 mrcImageMaskingByImage \
 mrcImageMeanFreePathCalc \
+mrcImageMergeFFT \
 mrcImageMergebyside \
 mrcImageMirroring \
 mrcImageModeChange \
index 4f34549..89d0432 100644 (file)
@@ -158,6 +158,7 @@ mrcImageMappingtoPdb \
 mrcImageMasking \
 mrcImageMaskingByImage \
 mrcImageMeanFreePathCalc \
+mrcImageMergeFFT \
 mrcImageMergebyside \
 mrcImageMirroring \
 mrcImageModeChange \
index a6c7ac6..85c60d5 100755 (executable)
@@ -121,195 +121,3 @@ argCheck(mrcImageAutoFilamentExtractInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->roiLine = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->roiLine[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagroiLine=count;
-                        }
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("x") {
-                    if(i+1<argc) {
-                        info->x = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagx++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("ddYmax") {
-                    if(i+1<argc) {
-                        info->ddYmax = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagddYmax++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("ddYmin") {
-                    if(i+1<argc) {
-                        info->ddYmin = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagddYmin++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("T") {
-                    if(i+1<argc) {
-                        info->T = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagT++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("maxdY") {
-                    if(i+1<argc) {
-                        info->maxdY = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagmaxdY++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("HR") {
-                    if(i+1<argc) {
-                        info->HeightRange = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagHeightRange++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("RMaxX") {
-                    if(i+1<argc) {
-                        info->RMaxX = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagRMaxX++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("mag") {
-                    if(i+1<argc) {
-                        info->mag = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagmag++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("truePitch") {
-                    if(i+1<argc) {
-                        info->truePitch = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagtruePitch++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("PixelSize") {
-                    if(i+1<argc) {
-                        info->PixelSize = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagPixelSize++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("finaly") {
-                    if(i+1<argc) {
-                        info->finaly = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagfinaly++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("Ignore") {
-                    if(i+1<argc) {
-                        info->Ignore = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagIgnore++;
-                    } 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;
-        } 
-    } 
-} 
index 448885e..6f5b040 100755 (executable)
@@ -10,7 +10,7 @@ Usage: mrcImageDensityInfo
 Options:
     [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
     [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Optional  :OutputDataFile
-    [-C[ontour]          Contour             (10        ).as(Real                ) ] :Optional  :ContourLevel: 10 5.533535e-322ach
+    [-C[ontour]          Contour             (10        ).as(Real                ) ] :Optional  :ContourLevel: 10 6.953123e-310ach
     [-log                Log                 (NULL      ).as(appendFile          ) ] :Optional  :OutputDataFile
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/Config/Define.inc b/src/Tools/mrcImage/mrcImageMergeFFT/Config/Define.inc
new file mode 100755 (executable)
index 0000000..ddbe18b
--- /dev/null
@@ -0,0 +1,4 @@
+OBJECTNAME = mrcImageMergeFFT
+EXTRA_LIB  =
+EXTRA_CCOPTS =
+EXTRA_INC =
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageMergeFFT/Config/OptionControlFile
new file mode 100755 (executable)
index 0000000..8413149
--- /dev/null
@@ -0,0 +1,7 @@
+# OptionControlFile
+# FileFormat
+"-i","-i[nput]","InputDataFile","Essential","1","1","In","inFile","NULL"
+"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","NULL"
+"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
+"-n","-n","[pixel]","Optional","2","1","nx","Integer","0","2","ny","Integer","0"
+"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/Config/Target.inc b/src/Tools/mrcImage/mrcImageMergeFFT/Config/Target.inc
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/Makefile b/src/Tools/mrcImage/mrcImageMergeFFT/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/mrcImage/mrcImageMergeFFT/doc/Makefile b/src/Tools/mrcImage/mrcImageMergeFFT/doc/Makefile
new file mode 100755 (executable)
index 0000000..8215199
--- /dev/null
@@ -0,0 +1,2 @@
+install:
+       cd ../src; make install-doc; cd ../doc  
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/inc/config.h b/src/Tools/mrcImage/mrcImageMergeFFT/inc/config.h
new file mode 100755 (executable)
index 0000000..4c9f89a
--- /dev/null
@@ -0,0 +1,6 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "../inc/mrcImageMergeFFT.h"
+
+#endif /* CONFIG_H */
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/inc/mrcImageMergeFFT.h b/src/Tools/mrcImage/mrcImageMergeFFT/inc/mrcImageMergeFFT.h
new file mode 100755 (executable)
index 0000000..a35bef4
--- /dev/null
@@ -0,0 +1,52 @@
+#ifndef MRCIMAGEMERGEFFT_H
+#define MRCIMAGEMERGEFFT_H
+#include <stdio.h>
+#include <stdlib.h>
+
+#define OPTION_FLAG     '-'
+#define OPTION_FLAG_POS (0)
+#define OPTION_POS      (1)
+
+
+
+
+typedef struct mrcImageMergeFFTInfo {
+    long flagRedirect;
+
+    long flagIn;
+    char* In;
+    FILE* fptIn;
+    
+    long flagOut;
+    char* Out;
+    FILE* fptOut;
+    
+    long flagconfigFile;
+    char* configFile;
+    FILE* fptconfigFile;
+    
+    long flagnx;
+    long nx;
+    
+    long flagny;
+    long ny;
+    
+    long flagmode;
+    long mode;
+    
+} mrcImageMergeFFTInfo;
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void argCheck(mrcImageMergeFFTInfo* info, int argc, char* avgv[]);
+extern void khorosInit(int argc, char* avgv[]);
+extern void init0(mrcImageMergeFFTInfo* info);
+extern void init1(mrcImageMergeFFTInfo* info);
+extern void usage(char* usage);
+extern void additionalUsage(void);
+extern void htmlBeforeUsage(char* usage);
+extern void htmlAfterUsage(char* usage);
+#ifdef __cplusplus
+};
+#endif
+#endif /* MRCIMAGEMERGEFFT_H */
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/.Depend b/src/Tools/mrcImage/mrcImageMergeFFT/src/.Depend
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/.Source b/src/Tools/mrcImage/mrcImageMergeFFT/src/.Source
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/Makefile b/src/Tools/mrcImage/mrcImageMergeFFT/src/Makefile
new file mode 100755 (executable)
index 0000000..a360703
--- /dev/null
@@ -0,0 +1,430 @@
+include ../Config/Define.inc
+include ../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../../../Config/Define.inc
+
+EOSHOME=../../../../../
+DSTDIR=$(EOSHOME)/bin
+DSTDOC=$(EOSHOME)/doc
+DSTTAR=$(EOSHOME)/tar
+
+INCFILES   = 
+
+LIBFILES   = \
+                       $(LIBPREFIX)EosObjects$(LIBSUFFIX) 
+
+LIBFILESDEBUG   = \
+                       $(LIBPREFIX)EosObjects.debug$(LIBSUFFIX) 
+
+SRCC  = \
+                       $(OBJECTNAME).c \
+                       init.c \
+                       argCheck.c \
+                       usage.c  \
+                       util.c \
+
+SRCCXX  = \
+                       $(OBJECTNAME).cc \
+                       init.cc \
+                       argCheck.cc \
+                       usage.cc  \
+                       util.cc \
+
+MODULES    = \
+                       $(OBJECTNAME).o \
+                       init.o \
+                       argCheck.o \
+                       usage.o  \
+                       util.o \
+
+REALMODULES    = \
+                       $(OSTYPE)/$(OBJECTNAME).o \
+                       $(OSTYPE)/init.o \
+                       $(OSTYPE)/argCheck.o \
+                       $(OSTYPE)/usage.o \
+                       $(OSTYPE)/util.o 
+
+MODULESDEBUG    = \
+                       $(OBJECTNAME).debugo \
+                       init.debugo \
+                       argCheck.debugo \
+                       usage.debugo  \
+                       util.debugo \
+
+REALMODULESDEBUG    = \
+                       $(OSTYPE)/$(OBJECTNAME).debugo \
+                       $(OSTYPE)/init.debugo \
+                       $(OSTYPE)/argCheck.debugo \
+                       $(OSTYPE)/usage.debugo \
+                       $(OSTYPE)/util.debugo 
+
+
+all: $(OSTYPE)/$(OBJECTNAME) 
+       if [ ! -L $(OSTYPE) ] ; then \
+               moveHostdependent; \
+       fi
+
+debug: $(OSTYPE)/$(OBJECTNAME).debug
+
+cudagdb: $(OSTYPE)/$(OBJECTNAME).cudagdb
+
+
+$(OSTYPE)/$(OBJECTNAME)::
+       @$(RM) -f $(OSTYPE)/Makefile ; \
+       $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
+       cd $(OSTYPE); \
+       $(MAKE) $(OBJECTNAME)  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
+
+$(OSTYPE)/$(OBJECTNAME).debug::
+       @$(RM) -f $(OSTYPE)/Makefile ; \
+       $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
+       cd $(OSTYPE); \
+       $(MAKE) $(OBJECTNAME).debug  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
+
+$(OSTYPE)/$(OBJECTNAME).cudagdb::
+       @$(RM) -f $(OSTYPE)/Makefile ; \
+       $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
+       cd $(OSTYPE); \
+       $(MAKE) $(OBJECTNAME).cudagdb WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
+
+cvsupdate::
+       cvs -d $(EOS_CVSROOT) update -d 
+
+cvscommit::
+       cvs -d $(EOS_CVSROOT) commit 
+
+edit:
+       @if [ -r $(OBJECTNAME).c ]; \
+       then \
+               sccsEdit $(OBJECTNAME).c; \
+       else \
+               echo "Source files are already editable"; \
+       fi
+       @if [ -r wish/$(OBJECTNAME).wish ]; \
+       then \
+               cd wish; sccsEdit $(OBJECTNAME).wish; \
+       else \
+               echo "Source files (wish) are already editable."; \
+       fi
+       @if [ -r ruby/$(OBJECTNAME).rb ]; \
+       then \
+               cd ruby; sccsEdit $(OBJECTNAME).rb; \
+       else \
+               echo "Source files (ruby) are already editable."; \
+       fi
+       @if [ -r perl/$(OBJECTNAME).pl ]; \
+       then \
+               cd perl; sccsEdit $(OBJECTNAME).pl ; \
+       else \
+               echo "Source files (perl) are already editable."; \
+       fi
+       @if [ -r ../Config/OptionControlFile ]; \
+       then \
+               cd ../Config; sccsEdit OptionControlFile; \
+       else \
+               echo "OptionControlFile are already editable."; \
+       fi
+       
+unedit:
+       @if [ -w $(OBJECTNAME).c ]; \
+       then \
+               sccsUnedit $(OBJECTNAME).c; \
+       else \
+               echo "Source files are not editable"; \
+       fi
+       @if [ -w wish/$(OBJECTNAME).wish ]; \
+       then \
+               cd wish; sccsUnedit $(OBJECTNAME).wish; \
+       else \
+               echo "Source files (wish) are not editable."; \
+       fi
+       @if [ -w ruby/$(OBJECTNAME).rb]; \
+       then \
+               cd ruby; sccsUnedit $(OBJECTNAME).rb; \
+       else \
+               echo "Source files (ruby) are not editable."; \
+       fi
+       @if [ -w perl/$(OBJECTNAME).pl ]; \
+       then \
+               cd perl; sccsUnedit $(OBJECTNAME).pl ; \
+       else \
+               echo "Source files (ruby) are not editable."; \
+       fi
+       @if [ -w ../Config/OptionControlFile ]; \
+       then \
+               cd ../Config; sccsUnedit OptionControlFile; \
+       else \
+               echo "OptionControlFile are not editable."; \
+       fi
+       
+report:
+       @if [ -r $(OBJECTNAME).c ]; \
+       then \
+               sccsReport $(OBJECTNAME).c; \
+       else \
+               echo "Source files are already editable"; \
+       fi
+       @if [ -r wish/$(OBJECTNAME).wish ]; \
+       then \
+               cd wish; sccsReport $(OBJECTNAME).wish; \
+       else \
+               echo "Source files (wish) are already editable."; \
+       fi
+       @if [ -r ruby/$(OBJECTNAME).rb ]; \
+       then \
+               cd ruby; sccsReport $(OBJECTNAME).rb; \
+       else \
+               echo "Source files (ruby) are already editable."; \
+       fi
+       @if [ -r perl/$(OBJECTNAME).pl ] ; \
+       then \
+               cd perl; sccsReport $(OBJECTNAME).pl ; \
+       else \
+               echo "Source files (perl) are already editable."; \
+       fi
+       @if [ -r ../Config/OptionControlFile ]; \
+       then \
+               cd ../Config; sccsReport OptionControlFile; \
+       else \
+               echo "OptionControlFile are already editable."; \
+       fi
+
+clean : 
+       rm -f *.debugo $(OSTYPE)/*.debugo *.cudagdbo $(OSTYPE)/*.cudagdbo *.o $(OSTYPE)/*.o *.linkinfo $(OSTYPE)/*.linkinfo \
+               $(OSTYPE)/$(OBJECTNAME) $(OSTYPE)/*.$(OSTYPE) \
+               $(OSTYPE)/$(OBJECTNAME).debug $(OSTYPE)/*.$(OSTYPE).debug \
+               $(OSTYPE)/$(OBJECTNAME).cudagdb $(OSTYPE)/*.$(OSTYPE).cudagdb \
+               $(OSTYPE)/$(OBJECTNAME).linkinfo $(OSTYPE)/*.$(OSTYPE).linkinfo \
+               *.bak *.$(OSTYPE) core
+
+install: install-bin install-doc install-wish install-ruby install-shell install-perl
+       @if [ dummy$(KHOROS_KENGOBJ) != dummy ]  ; \
+       then \
+               if [ -x $(KHOROS_KGENOBJ) ] ;  \
+               then \
+                       make install-khoros ; \
+               fi; \
+       fi 
+
+install-bin:$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) 
+
+$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME) 
+       @echo ---- Installing to bin
+       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
+       @if [ ! -d $(DSTDIR)/$(OSTYPE) ]; \
+       then \
+               mkdir $(DSTDIR)/$(OSTYPE); \
+       fi
+       @if [ -x $(OSTYPE)/$(OBJECTNAME) ]; \
+       then \
+               echo "Compilation is complete"; \
+               $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+       else \
+               echo "Compilation is incomplete. $(OBJECTNAME)"; \
+       fi
+       @echo ---- end of bin
+
+install-wish:
+       @if [ -d wish ]; \
+       then \
+               echo "---- Tcl/Tk file Install"; \
+               if [ ! -d $(DSTDIR)/wish/$(OBJECTNAME) ]; \
+               then \
+                       mkdir $(DSTDIR)/wish/$(OBJECTNAME) ; \
+               fi ; \
+               $(CP) -f wish/* $(DSTDIR)/wish/$(OBJECTNAME); \
+               $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/*  ;\
+               touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
+               $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
+               echo "---- Tcl/Tk file Installed";\
+       fi
+
+install-ruby:
+       @if [ -d ruby ]; \
+       then \
+               echo "---- Ruby/Tk file Install"; \
+               if [ ! -d $(DSTDIR)/ruby/$(OBJECTNAME) ]; \
+               then \
+                       mkdir $(DSTDIR)/ruby/$(OBJECTNAME) ; \
+               fi ; \
+               $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
+               $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
+               echo "---- Ruby/Tk file Installed"; \
+       fi
+
+install-perl:
+       @if [ -d perl ]; \
+       then \
+               echo "---- Perl/Tk file Install"; \
+               if [ ! -d $(DSTDIR)/perl/$(OBJECTNAME) ]; \
+               then \
+                       mkdir $(DSTDIR)/perl/$(OBJECTNAME) ; \
+               fi; \
+               $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
+               $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
+               echo "---- Perl/Tk file Installed"; \
+       fi
+
+install-shell:
+       @if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \
+       then \
+               mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \
+       fi
+       @if [ -d shell ]; \
+       then \
+               echo "---- Shell file Install"; \
+               if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \
+               then \
+                       mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \
+               fi ; \
+               $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
+               $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
+               echo "---- Shell file Installed"; \
+       fi
+
+install-khoros:
+       @echo Installing to khoros
+       @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KGENOBJ) ]; \
+       then \
+               echo kgenobj;\
+               $(KHOROS_KGENOBJ) -tb Eos -oname $(OBJECTNAME) -type script -pane -cantata true -cat Eos -subcat $(CLASSNAME) -description $(OBJECTNAME) -bname $(OBJECTNAME) -form  -lang ksh ; \
+       fi
+       @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \
+       then \
+               $(KHOROS_KSET) -tb Eos -oname $(OBJECTNAME) -icon $(OBJECTNAME) ; \
+       fi
+       @if [ -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \
+       then \
+               $(CHMOD) -R 775 ../../../../../objects/script/$(OBJECTNAME) ; \
+               if [ $?  ] ; \
+               then \
+                       echo "-- setting khoros ---" ; \
+                       if [ -d ../../../../../objects/script/$(OBJECTNAME)/uis/ ] ; \
+                       then \
+                               $(CD) ../../../../../objects/script/$(OBJECTNAME)/uis/ ; \
+                               $(RM) -f $(OBJECTNAME).pane ; \
+                               $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
+                               $(CD) ../../ ; \
+                               $(CHMOD) -R 555 $(OBJECTNAME); \
+                       else \
+                               echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
+                       fi ; \
+               else \
+                       echo "Failed !!: Cannot chage mode in installing  $(OBJECTNAME) to khoros system"; \
+               fi ; \
+               echo "-- end of khoros-installing"; \
+       fi
+
+install-doc: html 
+       @if [ ! -d $(DSTDOC)/SmallTools ]; \
+       then \
+               mkdir $(DSTDOC)/SmallTools ;\
+       fi
+       @if [ -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ]; \
+       then \
+               $(RM) -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ;\
+       fi
+       @$(CP) $(OBJECTNAME).html  $(DSTDOC)/SmallTools/$(OBJECTNAME).html
+       @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html
+       @if [ -f ../doc/*.html ]; \
+       then \
+               $(CP) ../doc/*.html  $(DSTDOC)/SmallTools/ ;\
+       fi
+       @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html
+       @if [ -f $(DSTDOC)/SmallTools/Makefile ]; \
+       then \
+               cd $(DSTDOC)/SmallTools; $(MAKE); \
+       fi
+
+html: $(OBJECTNAME).html
+
+configFileRead:
+       @ctrl2configFileRead $(CLASSNAME) $(OBJECTNAME) ../Config/OptionControlFile
+
+$(OBJECTNAME).html: $(OSTYPE)/$(OBJECTNAME)
+       @echo creating html
+       @$(OSTYPE)/$(OBJECTNAME) -html 2> $(OBJECTNAME).html.tmp
+       @sed -e s/$(OSTYPE)\\/// $(OBJECTNAME).html.tmp > $(OBJECTNAME).html
+       @$(RM) $(OBJECTNAME).html.tmp
+
+$(DSTDIR)/$(OBJECTNAME): $(OSTYPE)/$(OBJECTNAME)
+       @ln -s -f ../sbin/MachineIndependent $@
+
+depend::
+       @echo dependency checking now
+       @if [ ! -L $(OSTYPE) ] ; then \
+               moveHostdependent; \
+       fi
+       rm -f $(OSTYPE)/.Depend 
+       #echo C
+       @if [ -f $(OBJECTNAME).c ] ; \
+       then \
+               echo "dependency: *.c"; \
+               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c   ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
+       fi
+       #echo CC
+       @if [ -f $(OBJECTNAME).cc ] ; \
+       then \
+               echo "dependency: *.cc"; \
+               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc >> $(OSTYPE)/.Depend ; \
+       fi
+       @if [ -f $(OBJECTNAME).ccm ] ; \
+       then \
+               echo "dependency: *.ccm"; \
+               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm >> $(OSTYPE)/.Depend ; \
+       fi
+       @if [ -f $(OBJECTNAME).cu ] ; \
+       then \
+               echo "dependency: *.cu"; \
+               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu >> $(OSTYPE)/.Depend ; \
+       fi
+
+update:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update
+
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
+changeName::
+
+Test:$(OSTYPE)/$(OBJECTNAME) TestDir
+       @if [ -f test/Makefile ] ; \
+       then \
+               cd test; make ; \
+       else \
+               echo "No test Makefile"; \
+       fi
+
+TestDir::
+       @if [ ! -d test ] ; \
+       then \
+               echo "Creating test dir"; \
+               mkdir  test; \
+       fi
+       @if [ ! -f test/Makefile ] ; \
+       then \
+               echo "Creating Makefile"; \
+               cd test; \
+               protoTestMakefileCreate; \
+       fi
+       @if [ ! -d test/data ]; \
+       then \
+               mkdir $(EOSHOME)/data/$(OBJECTNAME); \
+               cd test; \
+               ln -sf ../$(EOSHOME)/data/$(OBJECTNAME) data; \
+       fi 
+
+tar::
+       cd $(DSTTAR); tar cvf Tools.$(CLASSNAME).$(OBJECTNAME).tar ../bin/$(OBJECTNAME) \
+                                                            ../bin/*/$(OBJECTNAME).* \
+                                                            ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
+                               ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
+
+-include $(OSTYPE)/.Depend
+-include ../Config/Target.inc
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/X86MAC64 b/src/Tools/mrcImage/mrcImageMergeFFT/src/X86MAC64
new file mode 120000 (symlink)
index 0000000..dca327a
--- /dev/null
@@ -0,0 +1 @@
+../../../../../hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageMergeFFT/src/X86MAC64
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/argCheck.c b/src/Tools/mrcImage/mrcImageMergeFFT/src/argCheck.c
new file mode 100755 (executable)
index 0000000..4cb0eae
--- /dev/null
@@ -0,0 +1,110 @@
+#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(mrcImageMergeFFTInfo* 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("n") {
+                    if(i+2<argc) {
+                        info->nx = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagnx++;
+                        info->ny = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagny++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("m") {
+                    if(i+1<argc) {
+                        info->mode = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagmode++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("h") {
+                    usage(argv[0]);
+                    exit(EXIT_SUCCESS);
+                    break;
+                }
+                SCASE("html") {
+                    htmlBeforeUsage(argv[0]);
+                    usage(argv[0]);
+                    htmlAfterUsage(argv[0]);
+                    exit(EXIT_SUCCESS);
+                    break;
+                }
+                SDEFAULT {
+                    fprintf(stderr, "Not Supported Options: :%s\n", argv[i]);
+                    usage(argv[0]);
+                    exit(EXIT_FAILURE);
+                    break;
+                }
+            SSWITCHEND;
+        } 
+    } 
+} 
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/init.c b/src/Tools/mrcImage/mrcImageMergeFFT/src/init.c
new file mode 100755 (executable)
index 0000000..13f6cdd
--- /dev/null
@@ -0,0 +1,99 @@
+#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(mrcImageMergeFFTInfo* info)
+{
+    info->fptIn = NULL;    info->flagIn = 0;
+    info->fptOut = NULL;    info->flagOut = 0;
+    info->fptconfigFile = NULL;    info->flagconfigFile = 0;
+    info->nx = 0;    info->flagnx = 0;
+    info->ny = 0;    info->flagny = 0;
+    info->mode = 0;    info->flagmode = 0;
+}
+
+void
+init1(mrcImageMergeFFTInfo* 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->flagnx) {
+    }
+    
+    if(info->flagny) {
+    }
+    
+    if(info->flagmode) {
+    }
+    
+}
+#ifdef KHOROS
+#include <stdio.h>
+#include "bootstrap.h"
+#include "dataserv.h"
+#include "datamanip.h"
+extern void func_usage_additions(void);
+extern void func_free_args(kexit_status status, kaddr client_data);
+extern void func_get_args(kform* pane);
+
+void
+func_usage_additions(void)
+{
+}
+void
+func_free_args(kexit_status status, kaddr client_data)
+{
+}
+void
+func_get_args(kform* pane)
+{
+}
+void
+khorosInit(int argc, char* argv[])
+{
+    char* eospath;
+    char  panepath[1024];
+    FILE* fpt;
+    
+    eospath = getenv("EOS_HOME");
+    sprintf(panepath, "%s/src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.pane", eospath);
+    khoros_initialize(argc, argv, "EOS");
+    fpt = fopen(panepath, "r");    if(NULL!=fpt) {
+        fclose(fpt);
+        kclui_initialize(panepath, KGEN_NONE, "EOS", "mrcImageMergeFFT",
+                     func_usage_additions,
+                     func_get_args,
+                     func_free_args);
+    }
+}
+#endif /* KHOROS */ 
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.c b/src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.c
new file mode 100755 (executable)
index 0000000..9473f3e
--- /dev/null
@@ -0,0 +1,94 @@
+/*
+# mrcImageMergeFFT : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : mrcImageMergeFFT
+# Attention
+#   $Loccker$
+#      $State$ 
+#
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>                  
+#define GLOBAL_DECLARATION
+#include "../inc/config.h"
+
+#define DEBUG
+#include "genUtil.h"
+#include "mrcImage.h"
+
+typedef struct lmrcImageMergeFFTInfo {
+       int nx;
+    int ny;
+} lmrcImageMergeFFTInfo;
+
+typedef enum lmrcImageMergeFFTMode {
+       a=0,
+       b=1
+} lmrcImageMergeFFTMode;
+
+extern void lmrcImageMergeFFTInfoCalc(mrcImage* out, mrcImage* in, lmrcImageMergeFFTInfo linfo, int mode);
+
+int
+main(int argc, char* argv[]) 
+{
+    mrcImage in;
+    mrcImage out;
+       mrcImageMergeFFTInfo info;
+       lmrcImageMergeFFTInfo linfo;
+
+       init0(&info);
+    argCheck(&info, argc, argv);
+    init1(&info);
+
+       DEBUGPRINT("Program Start\n");
+    linfo.nx = info.nx;
+    linfo.ny = info.ny;
+    mrcFileRead(&in, info.In, "in main", 0);
+    
+    lmrcImageMergeFFTInfoCalc(&out, &in, linfo, info.mode); 
+
+    mrcFileWrite(&out, info.Out, "in main", 0);
+       exit(EXIT_SUCCESS);
+}
+
+void
+additionalUsage()
+{
+       fprintf(stderr, "----- Additional Usage -----\n");
+}
+
+
+void 
+lmrcImageMergeFFTInfoCalc(mrcImage* out, mrcImage* in, lmrcImageMergeFFTInfo linfo, int mode)
+{
+    mrcImageParaTypeReal x, y, z;
+    mrcImageParaTypeReal srcx, srcy, srcz;
+    mrcImageParaTypeReal X, Y, Z;
+    mrcImage part;
+    mrcImage fft;
+    mrcImage pow;
+    double data;
+
+    out->Header = in->Header;
+    out->HeaderN.x = in->HeaderN.x*2;
+    out->HeaderN.y = in->HeaderN.y*2;
+    mrcInit(out, NULL);
+
+    part->Header = in->Header;
+    part->HeaderN.x = linfo.nx;
+    part->HeaderN.y = linfo.ny;
+    mrcInit(&part, NULL);
+
+    for(y=0; y<in->HeaderN.y; y++) {
+    for(x=0; x<in->HeaderN.x; x++) {
+        for(srcy=x-linfo.nx/2; srcy<in->HeaderN.y; srcy++) {
+        for(srcx=y-linfo.ny/2; srcx<in->HeaderN.x; srcx++) {
+            mrcPixelDataGet(&mrc, srcx, srcy, 0, &data, 
+        }
+        }
+    }
+    }
+}
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.html b/src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.html
new file mode 100644 (file)
index 0000000..19bd76a
--- /dev/null
@@ -0,0 +1,20 @@
+<HTML>
+<HEAD>
+<TITLE>mrcImageMergeFFT</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageMergeFFT</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageMergeFFT
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-n                  nx                  (0         ).as(Integer             ) 
+                         ny                  (0         ).as(Integer             ) ] :Optional  :[pixel]
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.pane b/src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.pane
new file mode 100755 (executable)
index 0000000..91266a4
--- /dev/null
@@ -0,0 +1,17 @@
+-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 ' ' mrcImageMergeFFT
+      -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/mrcImageMergeFFT
+        -H 1  5x1+41+0 'Help' 'help page' $EOS/src/Tools/mrcImage/mrcImageMergeFFT/doc/mrcImageMergeFFT.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 0 1 0 1 -1x1+1+6 ' ' '0' 'nx' [pixel]
+        -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'mode' 'Mode' m
+    -E
+  -E
+-E
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/usage.c b/src/Tools/mrcImage/mrcImageMergeFFT/src/usage.c
new file mode 100755 (executable)
index 0000000..332c2ed
--- /dev/null
@@ -0,0 +1,37 @@
+#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                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile\n");
+    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
+    fprintf(stderr, "    [-n                  nx                  (0         ).as(Integer             ) \n                         ny                  (0         ).as(Integer             ) ] :Optional  :[pixel]\n");
+    fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
+    additionalUsage();
+}
+
+void
+htmlBeforeUsage(char* thisProgram)
+{
+    fprintf(stderr, "<HTML>\n");
+    fprintf(stderr, "<HEAD>\n");
+    fprintf(stderr, "<TITLE>%s</TITLE>\n", thisProgram);
+    fprintf(stderr, "</HEAD>\n");
+    fprintf(stderr, "<BODY>\n");
+    fprintf(stderr, "<H1>%s</H1>\n", thisProgram);
+    fprintf(stderr, "<H2>Usage</H2>\n");
+    fprintf(stderr, "<PRE>\n");
+}
+
+void
+htmlAfterUsage(char* thisProgram)
+{
+    fprintf(stderr, "</PRE>\n");
+    fprintf(stderr, "</BODY>\n");
+    fprintf(stderr, "</HTML>\n");
+}
diff --git a/src/Tools/mrcImage/mrcImageMergeFFT/src/util.c b/src/Tools/mrcImage/mrcImageMergeFFT/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 15fc4da..8769805 100755 (executable)
@@ -3,5 +3,7 @@
 "-i","-i[nput]","Input:mrcImage","Essential","1","1","In","inFile::mrcImage","NULL"
 "-o","-o[utput]","Output:mrcImage","Essential","1","1","Out","outFile::mrcImage","NULL"
 "-O","-O[utput]","Output:ASCII","Optional","1","1","OutPat","outFile::ASCII","stdout"
+"-oG","-o[utput]G[uinier]","Output:mrcImage","Optional","1","1","OutGuinier","outFile::mrcImage","NULL"
+"-OG","-O[utput]G[uinier]","Output:ASCII","Optional","1","1","OutGuinierPlot","outFile::ASCII","stdout"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
index 907526c..c42e79f 100755 (executable)
@@ -25,6 +25,14 @@ typedef struct mrcImagePattersonFunctionCalcInfo {
     char* OutPat;
     FILE* fptOutPat;
     
+    long flagOutGuinier;
+    char* OutGuinier;
+    FILE* fptOutGuinier;
+    
+    long flagOutGuinierPlot;
+    char* OutGuinierPlot;
+    FILE* fptOutGuinierPlot;
+    
     long flagconfigFile;
     char* configFile;
     FILE* fptconfigFile;
index f4851b3..982c1a8 100755 (executable)
@@ -61,6 +61,28 @@ argCheck(mrcImagePattersonFunctionCalcInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("oG") {
+                    if(i+1<argc) {
+                        info->OutGuinier = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagOutGuinier++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("OG") {
+                    if(i+1<argc) {
+                        info->OutGuinierPlot = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagOutGuinierPlot++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("c") {
                     if(i+1<argc) {
                         info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
index d732671..defa46d 100755 (executable)
@@ -15,6 +15,8 @@ init0(mrcImagePattersonFunctionCalcInfo* info)
     info->fptIn = NULL;    info->flagIn = 0;
     info->fptOut = NULL;    info->flagOut = 0;
     info->fptOutPat = stdout;    info->flagOutPat = 0;
+    info->fptOutGuinier = NULL;    info->flagOutGuinier = 0;
+    info->fptOutGuinierPlot = stdout;    info->flagOutGuinierPlot = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
 }
@@ -46,6 +48,14 @@ init1(mrcImagePattersonFunctionCalcInfo* info)
         info->fptOutPat = fileOpen(info->OutPat, "w");
     }
     
+    if(info->flagOutGuinier) {
+        info->fptOutGuinier = fileOpen(info->OutGuinier, "w");
+    }
+    
+    if(info->flagOutGuinierPlot) {
+        info->fptOutGuinierPlot = fileOpen(info->OutGuinierPlot, "w");
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }
index c0d9667..faded1a 100755 (executable)
@@ -38,6 +38,7 @@ main(int argc, char* argv[])
        mrcImagePattersonFunctionCalcInfo info;
        mrcImage in;
        mrcImage out;
+    mrcImage outfft;
 
        init0(&info);
     argCheck(&info, argc, argv);
@@ -46,14 +47,25 @@ main(int argc, char* argv[])
        DEBUGPRINT("Program Start\n");
        mrcFileRead(&in, info.In, "in main", 0);
 
-       lmrcImagePattersonFunctionCalc(&out, &in);
+       lmrcImagePattersonFunctionCalc(&out, &outfft, &in);
 
        if(info.flagOutPat) {
                lmrcImagePattersonFunctionPrint(info.fptOutPat, &out, info.mode);
        }
+
+       if(info.flagOutGuinierPlot) {
+               lmrcImageGuinierFunctionPrint(info.fptOutGuinierPlot, &outfft, info.mode);
+       }
+
        if(info.flagOut) {
+        DEBUGPRINT("Write^n");
                mrcFileWrite(&out, info.Out, "in main", 0);
        }
+
+       if(info.flagOutGuinier) {
+        DEBUGPRINT("Write^n");
+               mrcFileWrite(&outfft, info.OutGuinier, "in main", 0);
+       }
        
        exit(EXIT_SUCCESS);
 }
index c1561be..90138fc 100755 (executable)
@@ -11,6 +11,8 @@ Options:
     [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input:mrcImage
     [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output:mrcImage
     [-O[utput]           OutPat              (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output:ASCII
+    [-o[utput]G[uinier]  OutGuinier          (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output:mrcImage
+    [-O[utput]G[uinier]  OutGuinierPlot      (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output:ASCII
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 ----- Additional Usage -----
index ea935b7..0b97560 100755 (executable)
         -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'Input:mrcImage' i
         -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'Output:mrcImage' o
         -O 1 0 1 0 0 1 -1x1+1+4.500000 ' ' 'OutPat' 'Output:ASCII' O
-        -I 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'mode' 'Mode' m
+        -O 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'OutGuinier' 'Output:mrcImage' oG
+        -O 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'OutGuinierPlot' 'Output:ASCII' OG
+        -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
     -E
   -E
 -E
index 407a144..3770806 100755 (executable)
@@ -10,6 +10,8 @@ usage(char* thisProgram)
     fprintf(stderr, "    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input:mrcImage\n");
     fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output:mrcImage\n");
     fprintf(stderr, "    [-O[utput]           OutPat              (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output:ASCII\n");
+    fprintf(stderr, "    [-o[utput]G[uinier]  OutGuinier          (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output:mrcImage\n");
+    fprintf(stderr, "    [-O[utput]G[uinier]  OutGuinierPlot      (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output:ASCII\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();
index 3e01688..5550dbe 100755 (executable)
@@ -178,368 +178,3 @@ argCheck(mrcImagePrintInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->contourLevel = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->contourLevel[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagcontourLevel=count;
-                        }
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("I") {
-                    if(i+0<argc) {
-                        info->Inverse++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("A") {
-                    if(i+0<argc) {
-                        info->Auto++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("AC") {
-                    if(i+1<argc) {
-                        info->AutoContour = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagAutoContour++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("PC") {
-                    if(i+1<argc) {
-                        info->PeakContour = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagPeakContour++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("AC2") {
-                    if(i+1<argc) {
-                        info->AutoContour2 = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagAutoContour2++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("Y") {
-                    if(i+1<argc) {
-                        info->Yexpand = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagYexpand++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("RGB") {
-                    if(i+3<argc) {
-                        info->Red = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagRed++;
-                        info->Green = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagGreen++;
-                        info->Blue = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagBlue++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("RGBGradient") {
-                    if(i+6<argc) {
-                        info->RedFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagRedFirst++;
-                        info->GreenFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagGreenFirst++;
-                        info->BlueFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagBlueFirst++;
-                        info->RedLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagRedLast++;
-                        info->GreenLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagGreenLast++;
-                        info->BlueLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagBlueLast++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("HSB") {
-                    if(i+3<argc) {
-                        info->Hue = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagHue++;
-                        info->Saturation = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagSaturation++;
-                        info->Brightness = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagBrightness++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("HSBGradient") {
-                    if(i+6<argc) {
-                        info->HueFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagHueFirst++;
-                        info->SaturationFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagSaturationFirst++;
-                        info->BrightnessFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagBrightnessFirst++;
-                        info->HueLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagHueLast++;
-                        info->SaturationLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagSaturationLast++;
-                        info->BrightnessLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagBrightnessLast++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("LineColourRGB") {
-                    if(i+3<argc) {
-                        info->LineRed = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineRed++;
-                        info->LineGreen = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineGreen++;
-                        info->LineBlue = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineBlue++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("LineColourRGBGradient") {
-                    if(i+6<argc) {
-                        info->LineRedFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineRedFirst++;
-                        info->LineGreenFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineGreenFirst++;
-                        info->LineBlueFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineBlueFirst++;
-                        info->LineRedLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineRedLast++;
-                        info->LineGreenLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineGreenLast++;
-                        info->LineBlueLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineBlueLast++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("LineColourHSB") {
-                    if(i+3<argc) {
-                        info->LineHue = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineHue++;
-                        info->LineSaturation = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineSaturation++;
-                        info->LineBrightness = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineBrightness++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("LineColourHSBGradient") {
-                    if(i+6<argc) {
-                        info->LineHueFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineHueFirst++;
-                        info->LineSaturationFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineSaturationFirst++;
-                        info->LineBrightnessFirst = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineBrightnessFirst++;
-                        info->LineHueLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineHueLast++;
-                        info->LineSaturationLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineSaturationLast++;
-                        info->LineBrightnessLast = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineBrightnessLast++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("LineChange") {
-                    if(i+1<argc) {
-                        info->LineColorChange = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineColorChange++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("LineWidthStart") {
-                    if(i+1<argc) {
-                        info->LineWidthStart = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineWidthStart++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("LineWidthStep") {
-                    if(i+1<argc) {
-                        info->LineWidthStep = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagLineWidthStep++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("ReverseOrder") {
-                    if(i+0<argc) {
-                        info->ReverseOrder++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("Untwist") {
-                    if(i+1<argc) {
-                        info->untwist = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flaguntwist++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("UpsideDown") {
-                    if(i+0<argc) {
-                        info->UpsideDown++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("Centre") {
-                    if(i+0<argc) {
-                        info->Centre++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("CircleRadius") {
-                    if(i+1<argc) {
-                        info->CircleRadius = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagCircleRadius++;
-                    } 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;
-        } 
-    } 
-} 
index 3efd9dc..6d72307 100755 (executable)
@@ -137,41 +137,3 @@ argCheck(mrcImagePrint3DInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->contourLevel = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->contourLevel[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagcontourLevel=count;
-                        }
-                    } 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;
-        } 
-    } 
-} 
index f1f2ed8..470be04 100755 (executable)
@@ -78,41 +78,3 @@ argCheck(mrcImageShapePCAInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->Contour = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->Contour[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagContour=count;
-                        }
-                    } 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;
-        } 
-    } 
-} 
index c95cacc..4a51159 100755 (executable)
@@ -122,41 +122,3 @@ argCheck(mrcImageShapePCAFitInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->Contour = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->Contour[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagContour=count;
-                        }
-                    } 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;
-        } 
-    } 
-} 
index c743d40..18e99f0 100755 (executable)
@@ -56,129 +56,3 @@ argCheck(mrcImageUnbentROIInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->roiLine = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->roiLine[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagroiLine=count;
-                        }
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("x") {
-                    if(i+1<argc) {
-                        info->x = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagx++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("y") {
-                    if(i+1<argc) {
-                        info->y = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagy++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("W") {
-                    if(i+1<argc) {
-                        info->Width = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagWidth++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("H") {
-                    if(i+1<argc) {
-                        info->Height = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagHeight++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("cor") {
-                    if(i+1<argc) {
-                        info->Cor = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagCor++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("S") {
-                    if(i+1<argc) {
-                        info->Shrink = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagShrink++;
-                    } 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;
-        } 
-    } 
-} 
index 1f98625..781a5c5 100755 (executable)
@@ -400,41 +400,3 @@ argCheck(pdbRhoFitInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->contourLevel = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->contourLevel[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagcontourLevel=count;
-                        }
-                    } 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;
-        } 
-    } 
-} 
index df4e84a..d038eb4 100755 (executable)
@@ -422,41 +422,3 @@ argCheck(pdbRhoFitTmInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 1 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->contourLevel = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->contourLevel[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagcontourLevel=count;
-                        }
-                    } 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;
-        } 
-    } 
-} 
index 718368e..67f04b6 100755 (executable)
@@ -214,94 +214,3 @@ argCheck(llExtractInfo* info, int argc, char* argv[])
                         int j, nv, check, count, nitem;
                         nv    = argc - i - 1;
                         nitem = 8 ;
-                        check = nv%nitem ;
-                        count = nv/nitem ;
-                        if(0!=check) { fprintf(stderr, "Variable Number is strange. The number must be %d-times. nv: %d i\n", nitem, nv); usage(argv[0]); exit(EXIT_FAILURE);} 
-                        info->n = (long*)memoryAllocate(sizeof(long)*count, "in argCheck");
-                        info->l = (long*)memoryAllocate(sizeof(long)*count, "in argCheck");
-                        info->Y = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        info->leftMin = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        info->leftMax = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        info->rightMin = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        info->rightMax = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        info->weight = (float*)memoryAllocate(sizeof(float)*count, "in argCheck");
-                        for(j=0; j<count; j++) {
-                            info->n[j] = stringGetNthIntegerData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagn=count;
-                        for(j=0; j<count; j++) {
-                            info->l[j] = stringGetNthIntegerData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagl=count;
-                        for(j=0; j<count; j++) {
-                            info->Y[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagY=count;
-                        for(j=0; j<count; j++) {
-                            info->leftMin[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagleftMin=count;
-                        for(j=0; j<count; j++) {
-                            info->leftMax[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagleftMax=count;
-                        for(j=0; j<count; j++) {
-                            info->rightMin[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagrightMin=count;
-                        for(j=0; j<count; j++) {
-                            info->rightMax[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagrightMax=count;
-                        for(j=0; j<count; j++) {
-                            info->weight[j] = stringGetNthRealData(argv[i+j*nitem+1], 1, " ,");
-                        }
-                        i++;
-                        info->flagweight=count;
-                        }
-                    } 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("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;
-        } 
-    } 
-} 
old mode 100755 (executable)
new mode 100644 (file)
index e17b902..de014ba
@@ -1,2 +1,3 @@
-SOURCE_FILE =\
+SOURCE=\
+mrcImageSeriesInfoPerPixel \
 #LastSource
diff --git a/src/Tools/timeSeries/Config/Target.inc b/src/Tools/timeSeries/Config/Target.inc
new file mode 100755 (executable)
index 0000000..e69de29