OSDN Git Service

Stirng.h -> eosString.h v2.4.24p0375
authorTakuo Yasunaga <yasunaga@phys.kyutech.ac.jp>
Fri, 6 Jan 2023 01:28:14 +0000 (10:28 +0900)
committerTakuo Yasunaga <yasunaga@phys.kyutech.ac.jp>
Fri, 6 Jan 2023 01:28:14 +0000 (10:28 +0900)
Makefile changed: install dst

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is up-to-date with 'origin/master'.

 Changes to be committed:
new file:   bin/MachineIndependent
new file:   bin/mrcImageFilamentSearchResultShow
modified:   bin/wish/Display2/tclIndex
modified:   src/Config/Template/ObjectsTemplate.Dir/src/Makefile
modified:   src/Config/Template/ToolsTemplate.Dir/src/Makefile
modified:   src/Config/x86Linux64.inc
new file:   src/Objects/DataExpress/.Source.org
modified:   src/Objects/DataExpress/Contour/src/Makefile
modified:   src/Objects/DataExpress/TclTk/src/Makefile
modified:   src/Objects/DataExpress/TclTk/src/tkctfInfo.c
modified:   src/Objects/DataExpress/avsFile/src/Makefile
modified:   src/Objects/DataExpress/eosAlsa/src/Makefile
modified:   src/Objects/DataExpress/eosOpenGL/src/Makefile
modified:   src/Objects/DataExpress/eosRuby/src/Makefile
modified:   src/Objects/DataExpress/gifFile/src/Makefile
modified:   src/Objects/DataExpress/gifFile/src/lmrc2gif.c
modified:   src/Objects/DataExpress/pngFile/src/Makefile
modified:   src/Objects/DataExpress/psFile/src/Makefile
new file:   src/Objects/DataManip/.Source.org
modified:   src/Objects/DataManip/DCDFile/src/Makefile
modified:   src/Objects/DataManip/IMAGIC/src/Makefile
modified:   src/Objects/DataManip/bildFile/src/Makefile
modified:   src/Objects/DataManip/bmpFile/src/Makefile
modified:   src/Objects/DataManip/ctfInfo/src/Makefile
modified:   src/Objects/DataManip/ctfforBayes/src/Makefile
modified:   src/Objects/DataManip/dmFile/src/Makefile
modified:   src/Objects/DataManip/dsn6File/src/Makefile
modified:   src/Objects/DataManip/emData/src/Makefile
modified:   src/Objects/DataManip/eosMATH/src/Makefile
modified:   src/Objects/DataManip/eosMATH/src/eosBessel.c
modified:   src/Objects/DataManip/eosStarFile/doc/eosStarFile.html
modified:   src/Objects/DataManip/eosStarFile/src/Makefile
modified:   src/Objects/DataManip/khorosData/src/Makefile
modified:   src/Objects/DataManip/largeIP/src/Makefile
modified:   src/Objects/DataManip/llData/src/Makefile
modified:   src/Objects/DataManip/ltlgData/src/Makefile
modified:   src/Objects/DataManip/mapFile/src/Makefile
modified:   src/Objects/DataManip/mrcImage/src/Makefile
modified:   src/Objects/DataManip/mrcImageShape/src/Makefile
modified:   src/Objects/DataManip/pdbFile/src/Makefile
modified:   src/Objects/DataManip/rigakuImage/src/Makefile
modified:   src/Objects/DataManip/simulation/src/Makefile
modified:   src/Objects/DataManip/tgaFile/src/Makefile
modified:   src/Objects/DataManip/transform/src/Makefile
modified:   src/Objects/General/AI/src/Makefile
modified:   src/Objects/General/Array/src/Makefile
modified:   src/Objects/General/Cluster/src/Makefile
modified:   src/Objects/General/Crystal/src/Makefile
modified:   src/Objects/General/DataBase/src/Makefile
modified:   src/Objects/General/Eos/src/Makefile
modified:   src/Objects/General/File/src/Makefile
modified:   src/Objects/General/Map2D/src/Makefile
modified:   src/Objects/General/Matrix3D/src/Makefile
modified:   src/Objects/General/Memory/src/Makefile
modified:   src/Objects/General/PVM/src/Makefile
modified:   src/Objects/General/Random/src/Makefile
modified:   src/Objects/General/Raw/src/Makefile
modified:   src/Objects/General/Socket/src/Makefile
modified:   src/Objects/General/SpecialNumber/src/Makefile
modified:   src/Objects/General/Vector/src/Makefile
modified:   src/Objects/General/dummy/src/Makefile
modified:   src/Objects/General/eosBayes/src/Makefile
modified:   src/Objects/General/eosCuda/src/Makefile
modified:   src/Objects/General/eosFunc/src/Makefile
modified:   src/Objects/General/eosList/src/Makefile
modified:   src/Objects/General/eosMath/src/Makefile
modified:   src/Objects/General/eosPThread/src/Makefile
modified:   src/Objects/General/eosPoint/src/Makefile
modified:   src/Objects/General/eosString/src/Makefile
modified:   src/Objects/General/eosXMAIL/src/Makefile
modified:   src/Objects/General/genUtil/src/Makefile
modified:   src/Objects/MachineManip/hf2000/src/Makefile
modified:   src/Tools/Cluster/clusterLog2ToLog/src/Makefile
modified:   src/Tools/Cluster/clusterLogASCII2Binary/src/Makefile
modified:   src/Tools/Cluster/clusterShow/src/Makefile
modified:   src/Tools/Config/Define.inc
modified:   src/Tools/Coord/coordRotation/src/Makefile
modified:   src/Tools/Coord/pointsSetToPDB/src/Makefile
modified:   src/Tools/DCDFile/dcdAtomChangeDistanceFromAtom/src/Makefile
modified:   src/Tools/DCDFile/dcdAtomDistanceDistribution/src/Makefile
modified:   src/Tools/DCDFile/dcdCompareCA/src/Makefile
modified:   src/Tools/DCDFile/dcdDistanceAtomBetweenAtom/src/Makefile
modified:   src/Tools/DCDFile/dcdFilePrint/src/Makefile
modified:   src/Tools/DCDFile/dcdInfo/src/Makefile
modified:   src/Tools/DCDFile/dcdSelectAtoms/src/Makefile
modified:   src/Tools/DCDFile/dcdSerectAtom/src/Makefile
modified:   src/Tools/DCDFile/dcdTest/Makefile
typechange: src/Tools/DCDFile/dcdTest/doc/Makefile
modified:   src/Tools/DCDFile/dcdTest/src/Makefile
modified:   src/Tools/DCDFile/dcdTest/src/argCheck.c
copied:     src/Tools/openGL/molvie/src/molvie.html -> src/Tools/DCDFile/dcdTest/src/dcdTest.html
modified:   src/Tools/DCDFile/dcdTest/src/init.c
modified:   src/Tools/DCDFile/dcdTest/src/usage.c
modified:   src/Tools/DCDFile/dcdTimeSeriesBehavior/src/Makefile
modified:   src/Tools/Integration/Display2/src/Makefile
modified:   src/Tools/Integration/Display3/src/Makefile
modified:   src/Tools/Integration/Eos/src/Makefile
modified:   src/Tools/Integration/StereoDisplay/src/Makefile
modified:   src/Tools/Integration/StereoDisplay/src/StereoDisplay.c
modified:   src/Tools/Integration/Visualmake/src/Makefile
modified:   src/Tools/Integration/ctfDisplay/src/Makefile
modified:   src/Tools/Integration/imagesClustering/src/Makefile
modified:   src/Tools/Integration/imagesView/src/Makefile
modified:   src/Tools/Integration/imagesView/src/imagesView.html
modified:   src/Tools/Integration/obj3Don2DImageView/src/Makefile
modified:   src/Tools/Integration/smolet/src/Makefile
modified:   src/Tools/admin/mallocCheck/src/Makefile
modified:   src/Tools/array/arrayPCA/src/Makefile
modified:   src/Tools/bmpFile/bmpFileInfo/src/Makefile
modified:   src/Tools/crystal/crystalGetLatticeVolume/src/Makefile
modified:   src/Tools/crystal/crystalGetReciprocalLattice/src/Makefile
modified:   src/Tools/ctfInfo/ctfDeterminationByBayes/src/Makefile
modified:   src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.c
modified:   src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.html
modified:   src/Tools/ctfInfo/ctfDeterminationFromMultiImage/src/Makefile
modified:   src/Tools/ctfInfo/ctfDeterminationFromPhaseComparison/src/Makefile
modified:   src/Tools/ctfInfo/ctfDeterminationFromThonRing/src/Makefile
modified:   src/Tools/ctfInfo/ctfDetermine/src/Makefile
modified:   src/Tools/ctfInfo/ctfEnvelopFunction/src/Makefile
modified:   src/Tools/ctfInfo/ctfEnvelopFunctionEstimate/src/Makefile
modified:   src/Tools/ctfInfo/ctfFunction/src/Makefile
modified:   src/Tools/ctfInfo/ctfFunctionServer/src/Makefile
modified:   src/Tools/ctfInfo/ctfInfoSet/src/Makefile
modified:   src/Tools/ctfInfo/ctfMultiFunction/src/Makefile
modified:   src/Tools/ctfInfo/ctfMultiFunction/src/ctfMultiFunction.c
modified:   src/Tools/ctfInfo/ctfMultiFunction/src/ctfMultiFunction.html
modified:   src/Tools/ctfInfo/ctfWeightMapCreation/src/Makefile
modified:   src/Tools/ctfInfo/ctfZeroPoint/src/Makefile
modified:   src/Tools/ctfInfo/defocusDeterminationFromThonRing/src/Makefile
modified:   src/Tools/ctfInfo/electronWaveLength/src/Makefile
modified:   src/Tools/ctfInfo/molecularEnvelopeResampling/src/Makefile
modified:   src/Tools/ctfInfo/tiltInfoDetermine/src/Makefile
modified:   src/Tools/ctfInfo/tiltInfoDetermine/src/tiltInfoDetermine.c
modified:   src/Tools/ctfInfo/tiltInfoDetermine/src/tiltInfoDetermine.html
modified:   src/Tools/database/homology2PG/src/Makefile
modified:   src/Tools/database/pgDataBaseSelectServer/src/Makefile
modified:   src/Tools/database/pgJournalSelect/src/Makefile
modified:   src/Tools/database/pgJournalSelectCORBAClient/src/Makefile
modified:   src/Tools/database/pgJournalSelectCORBAServer/src/Makefile
modified:   src/Tools/database/pgMemoSelectCORBAServer/src/Makefile
modified:   src/Tools/database/pgSelect/src/Makefile
modified:   src/Tools/eosBayes/eosBayesInit/src/Makefile
modified:   src/Tools/eosBayes/eosBayesInit/src/eosBayesInit.c
modified:   src/Tools/eosMath/eosMathAverage/src/Makefile
modified:   src/Tools/eosMath/eosMathMedian/src/Makefile
modified:   src/Tools/eosMath/eosMathSorting/src/Makefile
modified:   src/Tools/eosPoint/eosPointAffineTransform/src/Makefile
modified:   src/Tools/eosPoint/eosPointCurvatureInfo/src/Makefile
modified:   src/Tools/eosPoint/eosPointICP/src/Makefile
modified:   src/Tools/eosPoint/eosPointPositionCorrection/src/Makefile
modified:   src/Tools/eosPoint/eosPointProjector/src/Makefile
modified:   src/Tools/eosPoint/eosPointRotation/src/Makefile
modified:   src/Tools/eosStarFile/eosStarFileCopy/src/Makefile
modified:   src/Tools/filter/array2mrc/src/Makefile
modified:   src/Tools/filter/bin2mrc/src/Makefile
modified:   src/Tools/filter/bmp2mrc/src/Makefile
modified:   src/Tools/filter/dm2mrc/src/Makefile
modified:   src/Tools/filter/dmInfo/src/Makefile
modified:   src/Tools/filter/dos2unix/src/Makefile
modified:   src/Tools/filter/emData2mrc/src/Makefile
modified:   src/Tools/filter/imodst2mrc/src/Makefile
modified:   src/Tools/filter/ip2mrc/src/Makefile
modified:   src/Tools/filter/moi2mrc/src/Makefile
modified:   src/Tools/filter/moi2mrc/src/moi2mrc.c
modified:   src/Tools/filter/moi2mrc/src/moi2mrc.html
modified:   src/Tools/filter/mrc2ascii/src/Makefile
modified:   src/Tools/filter/mrc2bild/src/Makefile
modified:   src/Tools/filter/mrc2fld/src/Makefile
modified:   src/Tools/filter/mrc2gif/src/Makefile
modified:   src/Tools/filter/mrc2hdf/src/Makefile
modified:   src/Tools/filter/mrc2lattice/src/Makefile
modified:   src/Tools/filter/mrc2mrc/src/Makefile
modified:   src/Tools/filter/mrc2png/src/Makefile
modified:   src/Tools/filter/mrc2pov/src/Makefile
modified:   src/Tools/filter/mrc2pov/src/mrc2pov.c
modified:   src/Tools/filter/mrc2tiff/src/Makefile
modified:   src/Tools/filter/mrc2viff/src/Makefile
modified:   src/Tools/filter/mrcImage2FFT/src/Makefile
modified:   src/Tools/filter/pdb2ucd/src/Makefile
modified:   src/Tools/filter/raw2mrc/src/Makefile
modified:   src/Tools/filter/tgaInfo/src/Makefile
modified:   src/Tools/filter/tiff2mrc/src/Makefile
modified:   src/Tools/hf2000/hf2000Init/src/Makefile
modified:   src/Tools/hf2000/hf2000LenzCurrent/src/Makefile
modified:   src/Tools/hf2000/hf2000SpecimenPosition/src/Makefile
modified:   src/Tools/khorosTool/khorosFilterGenerate/src/Makefile
modified:   src/Tools/khorosTool/khorosFilterGenerate/src/khorosFilterGenerate.c
modified:   src/Tools/largeIP/largeIPInfo/src/Makefile
modified:   src/Tools/llData/llDataAverage/src/Makefile
modified:   src/Tools/llData/llDataAxisSearch/src/Makefile
modified:   src/Tools/llData/llDataAxisSearch/src/llDataAxisSearch.c
modified:   src/Tools/llData/llDataAxisSearch/src/llDataAxisSearch.html
modified:   src/Tools/llData/llDataCTFCompensate/src/Makefile
modified:   src/Tools/llData/llDataCTFCompensate/src/llDataCTFCompensate.c
modified:   src/Tools/llData/llDataCTFCompensate/src/llDataCTFCompensate.html
modified:   src/Tools/llData/llDataCompare/src/Makefile
modified:   src/Tools/llData/llDataContributionCalcDifferentN/src/Makefile
modified:   src/Tools/llData/llDataDump/src/Makefile
modified:   src/Tools/llData/llDataEquatorAdd/src/Makefile
modified:   src/Tools/llData/llDataExtract/src/Makefile
modified:   src/Tools/llData/llDataFit/src/Makefile
modified:   src/Tools/llData/llDataFitServer/src/Makefile
modified:   src/Tools/llData/llDataInfo/src/Makefile
modified:   src/Tools/llData/llDataLowPassFiltering/src/Makefile
modified:   src/Tools/llData/llDataMultiCTFCompensation/src/Makefile
modified:   src/Tools/llData/llDataMultiCTFCompensation/src/llDataMultiCTFCompensation.c
modified:   src/Tools/llData/llDataMultiCTFCompensation/src/llDataMultiCTFCompensation.html
modified:   src/Tools/llData/llDataNEstimation/src/Makefile
modified:   src/Tools/llData/llDataNormalization/src/Makefile
modified:   src/Tools/llData/llDataPrint/src/Makefile
modified:   src/Tools/llData/llDataPrint/src/llDataPrint.html
modified:   src/Tools/llData/llDataRescaling/src/Makefile
modified:   src/Tools/llData/llDataResolutionCheck/src/Makefile
modified:   src/Tools/llData/llDataRotation/src/Makefile
modified:   src/Tools/llData/llDataSelectionEstimation/src/Makefile
modified:   src/Tools/llData/llDataSeparate/src/Makefile
modified:   src/Tools/llData/llDataSeparate/src/llDataSeparate.c
modified:   src/Tools/llData/llDataWeightSet/src/Makefile
modified:   src/Tools/llData/llDatarMaxLimit/src/Makefile
modified:   src/Tools/ltlgData/ltlgDataInfo/src/Makefile
modified:   src/Tools/matrix3D/matrix3DEulerAngleTransform/src/Makefile
modified:   src/Tools/matrix3D/matrix3DEulerAngleTransform/src/matrix3DEulerAngleTransform.c
modified:   src/Tools/matrix3D/matrix3DEulerAngleTransform/src/matrix3DEulerAngleTransform.html
modified:   src/Tools/matrix3D/matrix3DFromEulerAngle/src/Makefile
modified:   src/Tools/matrix3D/matrix3DFromEulerAngle/src/matrix3DFromEulerAngle.c
modified:   src/Tools/matrix3D/matrix3DFromEulerAngle/src/matrix3DFromEulerAngle.html
modified:   src/Tools/matrix3D/matrix3DInverse/src/Makefile
modified:   src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.c
copied:     src/Tools/openGL/molvieDock/src/molvieDock.html -> src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.html
modified:   src/Tools/matrix3D/matrix3DToEulerAngle/src/Makefile
modified:   src/Tools/mrcImage/.Source
modified:   src/Tools/mrcImage/.Source.org
modified:   src/Tools/mrcImage/fft2d/src/Makefile
modified:   src/Tools/mrcImage/mrc2dsn6/src/Makefile
modified:   src/Tools/mrcImage/mrc2hdf/src/Makefile
modified:   src/Tools/mrcImage/mrc2map/src/Makefile
modified:   src/Tools/mrcImage/mrc3DExtractZ/src/Makefile
modified:   src/Tools/mrcImage/mrcFETnormalizeBySD/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTBandPassFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTCTFCompensation/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTCTFCompensation/src/mrcFFTCTFCompensation.c
modified:   src/Tools/mrcImage/mrcFFTCTFCompensation/src/mrcFFTCTFCompensation.html
modified:   src/Tools/mrcImage/mrcFFTCentralSection/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTCentralSection/src/mrcFFTCentralSection.c
modified:   src/Tools/mrcImage/mrcFFTCentralSection/src/mrcFFTCentralSection.html
modified:   src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.c
modified:   src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.html
modified:   src/Tools/mrcImage/mrcFFTDigitize/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTExpression/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTFibreDiagram/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTFiltering/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTIQEstimation/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTIQEstimation/src/mrcFFTIQEstimation.c
modified:   src/Tools/mrcImage/mrcFFTIQEstimation/src/mrcFFTIQEstimation.html
modified:   src/Tools/mrcImage/mrcFFTInfo/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTLayerLineCheck/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTMedianFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTProjection/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTResampling/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTShellInfo/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTSizeChange/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTSpectrum/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTXFiltering/src/Makefile
modified:   src/Tools/mrcImage/mrcFFTplainreduce/src/Makefile
modified:   src/Tools/mrcImage/mrcFTMeridianEquatorRedece/src/Makefile
modified:   src/Tools/mrcImage/mrcImage1DProjectionfrom2D/src/Makefile
modified:   src/Tools/mrcImage/mrcImage1dAverageByCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImage1dCutAverage/src/Makefile
modified:   src/Tools/mrcImage/mrcImage1dShiftAverageByAnnealing/src/Makefile
modified:   src/Tools/mrcImage/mrcImage1dShiftByCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImage2DBackProjection/src/Makefile
modified:   src/Tools/mrcImage/mrcImage2DProjection/src/Makefile
modified:   src/Tools/mrcImage/mrcImage2pdb/src/Makefile
modified:   src/Tools/mrcImage/mrcImage3DCTFObservation/src/Makefile
modified:   src/Tools/mrcImage/mrcImage3DHighResoEmphasis/src/Makefile
modified:   src/Tools/mrcImage/mrcImage3DPad/src/Makefile
modified:   src/Tools/mrcImage/mrcImage3DPad2/src/Makefile
modified:   src/Tools/mrcImage/mrcImage3DPeakGet/src/Makefile
modified:   src/Tools/mrcImage/mrcImage3DSymmetryFind/src/Makefile
modified:   src/Tools/mrcImage/mrcImage3DWindowing/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAbnormalValueRemove/src/Makefile
modified:   src/Tools/mrcImage/mrcImageActinSingleParticleAnalysis/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAdaptiveBinalization/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAdd/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAddValue/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAreaCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAsProbability/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAssignedToTFofPDB/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAutoCorrelationWithWindowing/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAutoFilamentExtractResultAnalysis/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAutoRotationAverage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAutoRotationCorrelation3D/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAutoRotationCorrelationResultPrint/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAutoTriming/src/Makefile
modified:   src/Tools/mrcImage/mrcImageAverage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/Makefile
modified:   src/Tools/mrcImage/mrcImageBandPassFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcImageBilateralFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcImageBinalization/src/Makefile
modified:   src/Tools/mrcImage/mrcImageBlockMerge/src/Makefile
modified:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/Makefile
modified:   src/Tools/mrcImage/mrcImageBottomHatTransform/src/Makefile
modified:   src/Tools/mrcImage/mrcImageBoundaryInfo/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCCDNoiseRemove/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCTFCompensation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCTFCompensation/src/mrcImageCTFCompensation.c
modified:   src/Tools/mrcImage/mrcImageCTFCompensation/src/mrcImageCTFCompensation.html
modified:   src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/mrcImageCTFCompensationForTiltImage.c
modified:   src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/mrcImageCTFCompensationForTiltImage.html
modified:   src/Tools/mrcImage/mrcImageCTFDetermination/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCTFObservation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCTFSN/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCVE/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCenterDensityChange/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCenterGet/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCenterOfMassCalculate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageChainCodeCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCircumferentialProjection/src/Makefile
modified:   src/Tools/mrcImage/mrcImageClosing/src/Makefile
modified:   src/Tools/mrcImage/mrcImageClusterAnalysis/src/Makefile
modified:   src/Tools/mrcImage/mrcImageColoring/src/Makefile
modified:   src/Tools/mrcImage/mrcImageConnection/src/Makefile
modified:   src/Tools/mrcImage/mrcImageConnectivityNumberCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageContourSurfaceCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageConvolution/src/Makefile
modified:   src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html
modified:   src/Tools/mrcImage/mrcImageCoordinateChange/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCoreImageCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCoreImageCalc/src/mrcImageCoreImageCalc.c
modified:   src/Tools/mrcImage/mrcImageCoreImageCalc/src/mrcImageCoreImageCalc.html
modified:   src/Tools/mrcImage/mrcImageCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCorrelationInFourierSpace/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCorrelationServer/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCorrelationWithCTFCompensation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCrystalCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCrystalDeform/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCurl/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCutAndSetInArray/src/Makefile
modified:   src/Tools/mrcImage/mrcImageCylinderSection/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDeadPixelCorrection/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDeconvolution/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDensityChangeEstimation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDensityInfo/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDensityNormalization/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDensityNormalizationByImage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDilation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDisplayDensityAsTempFactor/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDistanceConversion/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDivergence/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDivideInfoForTomography/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDivideIntoTwoImages/src/Makefile
modified:   src/Tools/mrcImage/mrcImageDividedByFile/src/Makefile
modified:   src/Tools/mrcImage/mrcImageEdgeCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageEdgeEnhancement/src/Makefile
modified:   src/Tools/mrcImage/mrcImageEdgeImageGet/src/Makefile
modified:   src/Tools/mrcImage/mrcImageEdgeImageGet/src/mrcImageEdgeImageGet.c
modified:   src/Tools/mrcImage/mrcImageEdgeImageGet/src/mrcImageEdgeImageGet.html
modified:   src/Tools/mrcImage/mrcImageEnhancementWithFuzzySets/src/Makefile
modified:   src/Tools/mrcImage/mrcImageErosion/src/Makefile
modified:   src/Tools/mrcImage/mrcImageEstimateTiltImage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageExpression/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFFT/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFFTLayerLineExtraction/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFFTLayerLineExtraction/src/mrcImageFFTLayerLineExtraction.c
modified:   src/Tools/mrcImage/mrcImageFFTLayerLineExtraction/src/mrcImageFFTLayerLineExtraction.html
modified:   src/Tools/mrcImage/mrcImageFFTSetsExtract/src/Makefile
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/Config/Define.inc
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/Config/OptionControlFile
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/Config/OptionControlFile.org
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/Makefile
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/doc/Makefile
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/inc/config.h
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/inc/mrcImageFOMCalc.h
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/inc/mrcImageFOMCalc.h.org
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHA
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX5
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHAOSF1
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/ARM64MAC64
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/CELLLINUX64
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/HP
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/I386LINUX
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/I686LINUX
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/SGI
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/SPARC
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86LINUX64
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86LINUX64ICC
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86MAC64
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/init.c
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.c
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.c.org
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.html
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.pane
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/usage.c
deleted:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/util.c
modified:   src/Tools/mrcImage/mrcImageFOMCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFOMCalc/src/mrcImageFOMCalc.c
modified:   src/Tools/mrcImage/mrcImageFOMCalc/src/mrcImageFOMCalc.html
modified:   src/Tools/mrcImage/mrcImageFTest/Makefile
new file:   src/Tools/mrcImage/mrcImageFTest/doc/Makefile
modified:   src/Tools/mrcImage/mrcImageFTest/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFTest/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageFTest/src/init.c
modified:   src/Tools/mrcImage/mrcImageFTest/src/mrcImageFTest.html
modified:   src/Tools/mrcImage/mrcImageFTest/src/usage.c
modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFeatureExtraction/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFilamentSearch/src/Makefile
new file:   src/Tools/mrcImage/mrcImageFilamentSearchResultShow/Config/Define.inc
new file:   src/Tools/mrcImage/mrcImageFilamentSearchResultShow/Config/OptionControlFile
renamed:    src/Tools/mrcImage/mrcImageFOMCalc.org/Config/Target.inc -> src/Tools/mrcImage/mrcImageFilamentSearchResultShow/Config/Target.inc
new file:   src/Tools/mrcImage/mrcImageFilamentSearchResultShow/doc/Makefile
renamed:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/.Depend -> src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/.Depend
renamed:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/Makefile -> src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/Makefile
new file:   src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/X86LINUX64
modified:   src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/init.c
copied:     src/Tools/openGL/molvieMrcViewer/src/molvieMrcViewer.html -> src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/mrcImageFilamentSearchResultShow.html
modified:   src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/usage.c
modified:   src/Tools/mrcImage/mrcImageFilterCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFilteringbyFile/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFilteringbyFileForVariance/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFlatFieldCorrection/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFloating/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFourierPowerSpectrum/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFourierShellCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/Config/Define.inc
modified:   src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageFractalFrourierShellCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageGaussDisc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageGaussSphere/src/Makefile
modified:   src/Tools/mrcImage/mrcImageGradient/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHeaderChange/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHelicalAveraging/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHelicalConvolution/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHelicalConvolution/src/mrcImageHelicalConvolution.c
modified:   src/Tools/mrcImage/mrcImageHelicalConvolution/src/mrcImageHelicalConvolution.html
modified:   src/Tools/mrcImage/mrcImageHelicalMappingFrom2DImage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHelicalMasking/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHelicalMaskingBy2DImage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHelicalProjection/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHighPassFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHighlighting/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHoleFilling/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHoughTransform/src/Makefile
modified:   src/Tools/mrcImage/mrcImageHoughTransformInverse/src/Makefile
modified:   src/Tools/mrcImage/mrcImageInfo/src/Makefile
modified:   src/Tools/mrcImage/mrcImageLabeling/src/Makefile
modified:   src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/Makefile
modified:   src/Tools/mrcImage/mrcImageLogicalOperation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageLowPassFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMagnificationChange/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMake2DArrayImage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMakeCylinder/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMakeDump/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMakeFromTextFile/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMakeSphere/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMappingtoPdb/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMasking/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMaskingByImage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMergeFFT/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMergebyside/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMirroring/src/Makefile
modified:   src/Tools/mrcImage/mrcImageModeChange/src/Makefile
modified:   src/Tools/mrcImage/mrcImageModelCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageModelSubfilamentsCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMontageCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMove/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.c
modified:   src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.html
modified:   src/Tools/mrcImage/mrcImageMultiCTFDetermination/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMultiCTFDetermination/src/mrcImageMultiCTFDetermination.c
modified:   src/Tools/mrcImage/mrcImageMultiCTFDetermination/src/mrcImageMultiCTFDetermination.html
modified:   src/Tools/mrcImage/mrcImageMultiplying/src/Makefile
modified:   src/Tools/mrcImage/mrcImageMultiplyingbyFile/src/Makefile
modified:   src/Tools/mrcImage/mrcImageNLMeansFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcImageNfoldAxisSearch/src/Makefile
modified:   src/Tools/mrcImage/mrcImageNoiseAdd/src/Makefile
modified:   src/Tools/mrcImage/mrcImageNoiseCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageNormalDistributionTest/Makefile
new file:   src/Tools/mrcImage/mrcImageNormalDistributionTest/doc/Makefile
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHA
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX5
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHAOSF1
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/CELLLINUX64
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/HP
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I386LINUX
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I686LINUX
modified:   src/Tools/mrcImage/mrcImageNormalDistributionTest/src/Makefile
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SGI
deleted:    src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SPARC
modified:   src/Tools/mrcImage/mrcImageNormalDistributionTest/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageNormalDistributionTest/src/init.c
copied:     src/Tools/openGL/molvieFlight/src/molvieFlight.html -> src/Tools/mrcImage/mrcImageNormalDistributionTest/src/mrcImageNormalDistributionTest.html
modified:   src/Tools/mrcImage/mrcImageNormalDistributionTest/src/usage.c
modified:   src/Tools/mrcImage/mrcImageNormalizedSubtraction/src/Makefile
modified:   src/Tools/mrcImage/mrcImageNormalizing/src/Makefile
modified:   src/Tools/mrcImage/mrcImageNormalizing/src/mrcImageNormalizing.html
modified:   src/Tools/mrcImage/mrcImageNullImageCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageOddBoxel/src/Makefile
modified:   src/Tools/mrcImage/mrcImageOneLineSimilarityCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageOpening/src/Makefile
modified:   src/Tools/mrcImage/mrcImageOpticalFlow/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePCA/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePad/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePanoramaCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePanoramaCreate/src/mrcImagePanoramaCreate.c
modified:   src/Tools/mrcImage/mrcImagePanoramaCreate/src/mrcImagePanoramaCreate.html
modified:   src/Tools/mrcImage/mrcImageParticleCandidateExtract/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePeakSearch/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePerimeterCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePhaseCTFCompensationFromCTFINFO/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePixelDataGet/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePolyROI/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePosterization/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePrint/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePrint3D/src/Makefile
modified:   src/Tools/mrcImage/mrcImageProjection/src/Makefile
modified:   src/Tools/mrcImage/mrcImagePut3D/src/Makefile
modified:   src/Tools/mrcImage/mrcImageROI/src/Makefile
modified:   src/Tools/mrcImage/mrcImageROI3D/src/Makefile
modified:   src/Tools/mrcImage/mrcImageROIs/src/Makefile
modified:   src/Tools/mrcImage/mrcImageROIs/src/mrcImageROIs.c
modified:   src/Tools/mrcImage/mrcImageROIs/src/mrcImageROIs.html
modified:   src/Tools/mrcImage/mrcImageROItoPCAoutputImage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRadialDistribution/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRandomParticlesImageCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRealValueAdd/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRectangleGet/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRectangleGetByCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRefConv2D/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRefCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRefFFTConv2D/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRefScaleChangeWithPad/src/Makefile
modified:   src/Tools/mrcImage/mrcImageResolutionEstimateForFilaments/src/Makefile
modified:   src/Tools/mrcImage/mrcImageReverse/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRotation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageRotation3D/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSN/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSNEstimate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSamplingUnitChange/src/Makefile
modified:   src/Tools/mrcImage/mrcImageScalarAdd/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSectionGet/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSeriesNormalizing/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSetFunction/src/Makefile
modified:   src/Tools/mrcImage/mrcImageShapeOrientation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageShapePCA/src/Makefile
modified:   src/Tools/mrcImage/mrcImageShapePCAFit/src/Makefile
modified:   src/Tools/mrcImage/mrcImageShapeRelaxation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageShapeSearch/src/Makefile
modified:   src/Tools/mrcImage/mrcImageShift/src/Makefile
modified:   src/Tools/mrcImage/mrcImageShiftFollowingGC/src/Makefile
modified:   src/Tools/mrcImage/mrcImageShrink/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSiemensStar/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSimilarImageSearch/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSimilarityEstimate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSimilarityEstimate/src/mrcImageSimilarityEstimate.c
modified:   src/Tools/mrcImage/mrcImageSimilarityEstimate/src/mrcImageSimilarityEstimate.html
modified:   src/Tools/mrcImage/mrcImageSinogramCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSinogramCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSinogramFFT/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSmoothing/src/Makefile
new file:   src/Tools/mrcImage/mrcImageSoftEdge/src/.html
modified:   src/Tools/mrcImage/mrcImageSoftEdge/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSolventFlattening/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.c
modified:   src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.html
modified:   src/Tools/mrcImage/mrcImageSphere/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSphereCheck/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSplit/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSquare/src/Makefile
modified:   src/Tools/mrcImage/mrcImageStack/src/Makefile
modified:   src/Tools/mrcImage/mrcImageStandardDeviation/src/Makefile
modified:   src/Tools/mrcImage/mrcImageStreamLine/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSubtraction/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSuperResolution/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSurfaceAreaCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSurfaceCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSymmetryAverage/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSymmetryCentreFind/src/Makefile
modified:   src/Tools/mrcImage/mrcImageSymmetryFind/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTTest/Makefile
new file:   src/Tools/mrcImage/mrcImageTTest/doc/Makefile
modified:   src/Tools/mrcImage/mrcImageTTest/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTTest/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageTTest/src/init.c
modified:   src/Tools/mrcImage/mrcImageTTest/src/mrcImageTTest.html
modified:   src/Tools/mrcImage/mrcImageTTest/src/usage.c
modified:   src/Tools/mrcImage/mrcImageTfunction/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTiltAxisSearch/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTiltAxisSearchHelp/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTiltAxisSearchHelp/src/mrcImageTiltAxisSearchHelp.c
modified:   src/Tools/mrcImage/mrcImageTiltAxisSearchHelp/src/mrcImageTiltAxisSearchHelp.html
modified:   src/Tools/mrcImage/mrcImageToNAMDConstantForces/src/Makefile
modified:   src/Tools/mrcImage/mrcImageToPointsSet/src/Makefile
modified:   src/Tools/mrcImage/mrcImageToneReversal/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTopHatTransform/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTrans/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTransformDescartesIntoPolar/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTransformSign/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTranspose/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTwoImageTest/Makefile
new file:   src/Tools/mrcImage/mrcImageTwoImageTest/doc/Makefile
renamed:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/.Source -> src/Tools/mrcImage/mrcImageTwoImageTest/src/.Depend
new file:   src/Tools/mrcImage/mrcImageTwoImageTest/src/.Source
modified:   src/Tools/mrcImage/mrcImageTwoImageTest/src/Makefile
modified:   src/Tools/mrcImage/mrcImageTwoImageTest/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageTwoImageTest/src/init.c
modified:   src/Tools/mrcImage/mrcImageTwoImageTest/src/mrcImageTwoImageTest.html
modified:   src/Tools/mrcImage/mrcImageTwoImageTest/src/mrcImageTwoImageTest.pane
modified:   src/Tools/mrcImage/mrcImageTwoImageTest/src/usage.c
modified:   src/Tools/mrcImage/mrcImageUnbentROI/src/Makefile
renamed:    src/Tools/mrcImage/mrcImageFOMCalc.org/src/argCheck.c -> src/Tools/mrcImage/mrcImageUnbentROI/src/argCheck.c
modified:   src/Tools/mrcImage/mrcImageUnbentROI/src/mrcImageUnbentROI.html
modified:   src/Tools/mrcImage/mrcImageUnexpectedMassFromPDB/src/Makefile
modified:   src/Tools/mrcImage/mrcImageUnsharpening/src/Makefile
modified:   src/Tools/mrcImage/mrcImageUntwist/src/Makefile
modified:   src/Tools/mrcImage/mrcImageVarianceAnalysis/src/Makefile
modified:   src/Tools/mrcImage/mrcImageVarianceAnalysis/src/mrcImageVarianceAnalysis.c
modified:   src/Tools/mrcImage/mrcImageVarianceAnalysis/src/mrcImageVarianceAnalysis.html
modified:   src/Tools/mrcImage/mrcImageVarianceMap/src/Makefile
modified:   src/Tools/mrcImage/mrcImageVolumeCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcImageWindowing/src/Makefile
modified:   src/Tools/mrcImage/mrcImageZPad/src/Makefile
modified:   src/Tools/mrcImage/mrcImagepdbFileReduce/src/Makefile
modified:   src/Tools/mrcImage/mrcImagesSinogramCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcImagestoRef/src/Makefile
modified:   src/Tools/mrcImage/mrcInfo/src/Makefile
modified:   src/Tools/mrcImage/mrcInfoSet/src/Makefile
modified:   src/Tools/mrcImage/mrcMask/src/Makefile
modified:   src/Tools/mrcImage/mrcMeanYlinePos/src/Makefile
modified:   src/Tools/mrcImage/mrcMirrorImageCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/Makefile
modified:   src/Tools/mrcImage/mrcMultiFFTCentralSectionsSigmaCalc/src/Makefile
modified:   src/Tools/mrcImage/mrcRefCorEstimate/src/Makefile
modified:   src/Tools/mrcImage/mrcRefCorModify/src/Makefile
modified:   src/Tools/mrcImage/mrcRefCoreGet/src/Makefile
modified:   src/Tools/mrcImage/mrcRefCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcRefCorrelationConv/src/Makefile
modified:   src/Tools/mrcImage/mrcRefEstimate/src/Makefile
modified:   src/Tools/mrcImage/mrcRefFFTConvert/src/Makefile
modified:   src/Tools/mrcImage/mrcRefHeaderCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcRefHighPassFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcRefImageCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcRefImageOmegaCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcRefImagepwzCorEstimate/src/Makefile
modified:   src/Tools/mrcImage/mrcRefImagepwzCorModify/src/Makefile
modified:   src/Tools/mrcImage/mrcRefImagepwzCorPeakFind/src/Makefile
modified:   src/Tools/mrcImage/mrcRefImagepwzCorSmoothing/src/Makefile
modified:   src/Tools/mrcImage/mrcRefImagepwzCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcRefImagepwzCorrelationByFFT/src/Makefile
modified:   src/Tools/mrcImage/mrcRefImagexaFit/src/Makefile
modified:   src/Tools/mrcImage/mrcRefLowPassFilter/src/Makefile
modified:   src/Tools/mrcImage/mrcRefNoiseAdd/src/Makefile
modified:   src/Tools/mrcImage/mrcRefNormalizing/src/Makefile
modified:   src/Tools/mrcImage/mrcRefPhaseImageCreate/src/Makefile
modified:   src/Tools/mrcImage/mrcRefSmoothing/src/Makefile
modified:   src/Tools/mrcImage/mrcRefz1ImageCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcSinogramFET/src/Makefile
modified:   src/Tools/mrcImage/mrcSinogramFETcalcSDforNormalize/src/Makefile
modified:   src/Tools/mrcImage/mrcSinogramFETcalcWeight/src/Makefile
modified:   src/Tools/mrcImage/mrcSinogramFETcorrelationMap/src/Makefile
modified:   src/Tools/mrcImage/mrcSinogramFETnormalizedMap/src/Makefile
modified:   src/Tools/mrcImage/mrcSinogramFETreferredCorrelation/src/Makefile
modified:   src/Tools/mrcImage/mrcSinogramFETsmoothParameterMatching/src/Makefile
modified:   src/Tools/mrcImage/mrcView/src/Makefile
modified:   src/Tools/openGL/gmolvie/src/Makefile
modified:   src/Tools/openGL/molvie/src/Makefile
modified:   src/Tools/openGL/molvie/src/molvie.html
modified:   src/Tools/openGL/molvieDock/src/Makefile
modified:   src/Tools/openGL/molvieDock/src/molvieDock.html
modified:   src/Tools/openGL/molvieFlight/src/Makefile
modified:   src/Tools/openGL/molvieFlight/src/molvieFlight.html
modified:   src/Tools/openGL/molvieMrcViewer/src/Makefile
modified:   src/Tools/openGL/molvieMrcViewer/src/molvieMrcViewer.html
modified:   src/Tools/openGL/molvieProjection/src/Makefile
modified:   src/Tools/openGL/molvieProjection/src/molvieProjection.html
modified:   src/Tools/openGL/molvieViewer/src/Makefile
modified:   src/Tools/openGL/molvieViewer/src/molvieViewer.html
modified:   src/Tools/pdbUtil/pdb2SketchMacro/src/Makefile
modified:   src/Tools/pdbUtil/pdb2bender/src/Makefile
modified:   src/Tools/pdbUtil/pdb2mrc/src/Makefile
modified:   src/Tools/pdbUtil/pdb2mrc2d/src/Makefile
modified:   src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html
modified:   src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/Makefile
modified:   src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html
modified:   src/Tools/pdbUtil/pdbAtomSection/src/Makefile
modified:   src/Tools/pdbUtil/pdbAtomSection/src/pdbAtomSection.c
modified:   src/Tools/pdbUtil/pdbAtomSection/src/pdbAtomSection.html
modified:   src/Tools/pdbUtil/pdbCAOnly/src/Makefile
modified:   src/Tools/pdbUtil/pdbChargeFit/src/Makefile
modified:   src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html
modified:   src/Tools/pdbUtil/pdbCoordAdd/src/Makefile
modified:   src/Tools/pdbUtil/pdbCrystalCreate/src/Makefile
modified:   src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html
modified:   src/Tools/pdbUtil/pdbDisplay/src/Makefile
modified:   src/Tools/pdbUtil/pdbFileMerge/src/Makefile
modified:   src/Tools/pdbUtil/pdbHelix/src/Makefile
modified:   src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html
modified:   src/Tools/pdbUtil/pdbHomologySearch/src/Makefile
modified:   src/Tools/pdbUtil/pdbInfo/src/Makefile
modified:   src/Tools/pdbUtil/pdbListRMSDCalc/src/Makefile
modified:   src/Tools/pdbUtil/pdbListVectorCalc/src/Makefile
modified:   src/Tools/pdbUtil/pdbMatrixCreate/src/Makefile
modified:   src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html
modified:   src/Tools/pdbUtil/pdbMolecularInterfaceFind/src/Makefile
modified:   src/Tools/pdbUtil/pdbMove/src/Makefile
modified:   src/Tools/pdbUtil/pdbNAMDRestraintCreate/src/Makefile
modified:   src/Tools/pdbUtil/pdbNearAtomListShow/src/Makefile
modified:   src/Tools/pdbUtil/pdbOneProteinGet/src/Makefile
modified:   src/Tools/pdbUtil/pdbPCA/src/Makefile
modified:   src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html
modified:   src/Tools/pdbUtil/pdbProteinIDSet/src/Makefile
modified:   src/Tools/pdbUtil/pdbRhoFit/src/Makefile
modified:   src/Tools/pdbUtil/pdbRhoFitCoiledCoil/src/Makefile
modified:   src/Tools/pdbUtil/pdbRhoFitTm/src/Makefile
modified:   src/Tools/pdbUtil/pdbRotation/src/Makefile
modified:   src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html
modified:   src/Tools/pdbUtil/pdbSecondaryStructurePrint/src/Makefile
modified:   src/Tools/pdbUtil/pdbShapeFit/src/Makefile
modified:   src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html
modified:   src/Tools/pdbUtil/pdbSurface/src/Makefile
modified:   src/Tools/pdbUtil/pdbTempFactorSet/src/Makefile
modified:   src/Tools/pdbUtil/pdbTempFactorSet/src/pdbTempFactorSet.c
modified:   src/Tools/pdbUtil/pdbTempFactorSet/src/pdbTempFactorSet.html
modified:   src/Tools/pdbUtil/pdbTrans/src/Makefile
modified:   src/Tools/pdbUtil/pdbTrans/src/pdbTrans.c
modified:   src/Tools/pdbUtil/pdbTwoProteinFit/src/Makefile
modified:   src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
modified:   src/Tools/pdbUtil/pdbView/src/Makefile
modified:   src/Tools/pdbUtil/pdbWaterAdd/src/Makefile
modified:   src/Tools/pdbUtil/vector2pdb/src/Makefile
modified:   src/Tools/pickup/mrcImageNeuralNetParticleExtraction/src/Makefile
modified:   src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/Makefile
modified:   src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/mrcImageNeuralNetParticleLearning.c
modified:   src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/mrcImageNeuralNetParticleLearning.html
modified:   src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/test.c
modified:   src/Tools/psUtil/psFileMerge/src/Makefile
modified:   src/Tools/psUtil/psFilePageMerge/src/Makefile
modified:   src/Tools/random/randomNormalGet/src/Makefile
modified:   src/Tools/random/randomUniformGet/src/Makefile
modified:   src/Tools/rec3d/CheckCommonLineData/src/CheckCommonLineData.c
modified:   src/Tools/rec3d/CheckCommonLineData/src/CheckCommonLineData.html
modified:   src/Tools/rec3d/CheckCommonLineData/src/Makefile
modified:   src/Tools/rec3d/CheckOfOrientation/src/CheckOfOrientation.c
modified:   src/Tools/rec3d/CheckOfOrientation/src/CheckOfOrientation.html
modified:   src/Tools/rec3d/CheckOfOrientation/src/Makefile
modified:   src/Tools/rec3d/CheckOrientationByDegree/src/CheckOrientationByDegree.c
modified:   src/Tools/rec3d/CheckOrientationByDegree/src/Makefile
modified:   src/Tools/rec3d/CommonLineCalculation/src/CommonLineCalculation.c
modified:   src/Tools/rec3d/CommonLineCalculation/src/CommonLineCalculation.html
modified:   src/Tools/rec3d/CommonLineCalculation/src/Makefile
modified:   src/Tools/rec3d/EvaluateCorrelationMapwithCommonLine/src/Makefile
modified:   src/Tools/rec3d/FETOrientationSearchByAnnealing/src/Makefile
modified:   src/Tools/rec3d/FETOrientationSearchByFeatureAlignment/src/Makefile
modified:   src/Tools/rec3d/FETmapOrientationSearchBySimultaneousFitting/src/Makefile
modified:   src/Tools/rec3d/FETsmallMapSetCreate_forSimultaneousMinimization/src/Makefile
modified:   src/Tools/rec3d/LCalculationForOrientationSearch/src/LCalculationForOrientationSearch.c
modified:   src/Tools/rec3d/LCalculationForOrientationSearch/src/LCalculationForOrientationSearch.html
modified:   src/Tools/rec3d/LCalculationForOrientationSearch/src/Makefile
modified:   src/Tools/rec3d/ProjectionDirectionMapCreate/src/Makefile
modified:   src/Tools/rec3d/ProjectionDirectionMapCreate/src/ProjectionDirectionMapCreate.c
modified:   src/Tools/rec3d/ProjectionDirectionMapCreate/src/ProjectionDirectionMapCreate.html
modified:   src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/Makefile
typechange: src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/doc/Makefile
modified:   src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/Makefile
modified:   src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/TestForLcalculationOfOrientationSearchBySimultaneousMinimization.html
modified:   src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/argCheck.c
modified:   src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/init.c
modified:   src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/usage.c
modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearch/src/Makefile
modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearch/src/WeightCalculationOfCommonLineSearch.c
modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearch/src/WeightCalculationOfCommonLineSearch.html
modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearchByAllSinogram/src/Makefile
modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearchByAllSinogram/src/WeightCalculationOfCommonLineSearchByAllSinogram.c
modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearchByAllSinogram/src/WeightCalculationOfCommonLineSearchByAllSinogram.html
modified:   src/Tools/rec3d/calcCommonLine/src/Makefile
modified:   src/Tools/rec3d/commonLinesSearchByVoting/src/Makefile
modified:   src/Tools/rec3d/ll2ltlg/src/Makefile
modified:   src/Tools/rec3d/ll2ltlg/src/ll2ltlg.c
modified:   src/Tools/rec3d/ll2ltlg/src/ll2ltlg.html
modified:   src/Tools/rec3d/llExtract/src/Makefile
modified:   src/Tools/rec3d/llExtract/src/argCheck.c
modified:   src/Tools/rec3d/llExtract/src/llExtract.c
modified:   src/Tools/rec3d/llExtract/src/llExtract.html
modified:   src/Tools/rec3d/llExtractCtfinfFileCreate/src/Makefile
modified:   src/Tools/rec3d/llExtractCtrlFileCreate/src/Makefile
modified:   src/Tools/rec3d/llExtractWithLayerSeparation/src/Makefile
modified:   src/Tools/rec3d/llExtractWithLayerSeparation/src/llExtractWithLayerSeparation.c
modified:   src/Tools/rec3d/llExtractWithLayerSeparation/src/llExtractWithLayerSeparation.html
modified:   src/Tools/rec3d/llExtractWithLayerSeparationCtrlFileCreate/src/Makefile
modified:   src/Tools/rec3d/llExtractWithLayerSeparationCtrlFileCreateMyosin/src/Makefile
modified:   src/Tools/rec3d/llExtractWithLayerSeparationFilamentInfo/src/Makefile
modified:   src/Tools/rec3d/llExtractWithLayerSeparationServer/src/Makefile
modified:   src/Tools/rec3d/llExtractWithLayerSeparationSingle/src/Makefile
modified:   src/Tools/rec3d/ltlg2mrc/src/Makefile
modified:   src/Tools/rec3d/ltlg2mrc/src/ltlg2mrc.c
modified:   src/Tools/rec3d/ltlg2mrc/src/ltlg2mrc.html
modified:   src/Tools/rec3d/ltlg2ps/src/Makefile
modified:   src/Tools/rec3d/marker2Dto3DEstimator/src/Makefile
modified:   src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c
modified:   src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.html
modified:   src/Tools/rec3d/mrc2DFTto3DFT/src/Makefile
modified:   src/Tools/rec3d/mrc2Dto3D/src/Makefile
modified:   src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.c
modified:   src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.html
modified:   src/Tools/rec3d/mrc2Dto3DforVariation/src/Makefile
modified:   src/Tools/rec3d/mrc3Dto2D/src/Makefile
modified:   src/Tools/rec3d/mrc3Dto2DFFT/src/Makefile
modified:   src/Tools/rec3d/mrcImageCommonLineSearch/src/Makefile
modified:   src/Tools/rec3d/mrcImageInverseRadonTransform/src/Makefile
modified:   src/Tools/rec3d/mrcImageOrientationSearch/src/Makefile
modified:   src/Tools/rec3d/mrcImageOrientationSearch/src/mrcImageOrientationSearch.c
modified:   src/Tools/rec3d/mrcImageOrientationSearchByHigherSelection/src/Makefile
modified:   src/Tools/rec3d/mrcImageOrientationSearchByHigherSelection/src/mrcImageOrientationSearchByHigherSelection.c
modified:   src/Tools/rec3d/mrcImageOrientationSearchByHigherSelection/src/mrcImageOrientationSearchByHigherSelection.html
modified:   src/Tools/rec3d/mrcImageOrientationSearchByHybridization/src/Makefile
modified:   src/Tools/rec3d/mrcImageOrientationSearchByHybridization/src/mrcImageOrientationSearchByHybridization.c
modified:   src/Tools/rec3d/mrcImageOrientationSearchByHybridization/src/mrcImageOrientationSearchByHybridization.html
modified:   src/Tools/rec3d/mrcImageOrientationSearchBySimultaneousMinimization/src/Makefile
modified:   src/Tools/rec3d/mrcImageOrientationSearchBySimultaneousMinimization/src/mrcImageOrientationSearchBySimultaneousMinimization.c
modified:   src/Tools/rec3d/mrcImageOrientationSearchBySimultaneousMinimization/src/mrcImageOrientationSearchBySimultaneousMinimization.html
modified:   src/Tools/rec3d/mrcImageRadonTransform/src/Makefile
modified:   src/Tools/rec3d/mrcRadon2Dto3D/src/Makefile
modified:   src/Tools/rec3d/mrcRadon2Dto3D/src/mrcRadon2Dto3D.c
modified:   src/Tools/rec3d/mrcRadon2Dto3D/src/mrcRadon2Dto3D.html
modified:   src/Tools/simulation/energyTransferModelCheck/src/Makefile
modified:   src/Tools/simulation/energyTransferModelCheck/src/energyTransferModelCheck.c
modified:   src/Tools/simulation/energyTransferModelCheck/src/energyTransferModelCheck.html
modified:   src/Tools/simulation/energyTransferModelResultCheck/src/Makefile
modified:   src/Tools/simulation/muscleSimulation/src/Makefile
modified:   src/Tools/simulation/probabilityDensityFunction/src/Makefile
modified:   src/Tools/tiffFileUtil/tiffFileInfo/src/Makefile
modified:   src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/Makefile
modified:   src/Tools/transform/Descartes2Polar/src/Makefile
modified:   src/Tools/transform/Polar2Descartes/src/Makefile
modified:   src/Tools/transform/pointAffineTransform/src/Makefile
modified:   src/Tools/utils/angleMatchTest_k/Makefile
typechange: src/Tools/utils/angleMatchTest_k/doc/Makefile
modified:   src/Tools/utils/angleMatchTest_k/src/Makefile
new file:   src/Tools/utils/angleMatchTest_k/src/X86MAC64
modified:   src/Tools/utils/angleMatchTest_k/src/angleMatchTest_k.c
modified:   src/Tools/utils/angleMatchTest_k/src/angleMatchTest_k.html
modified:   src/Tools/utils/angleMatchTest_k/src/argCheck.c
modified:   src/Tools/utils/angleMatchTest_k/src/init.c
modified:   src/Tools/utils/angleMatchTest_k/src/usage.c
modified:   src/Tools/utils/anglediffchk/src/Makefile
modified:   src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/Makefile

864 files changed:
bin/MachineIndependent [new symlink]
bin/mrcImageFilamentSearchResultShow [new symlink]
bin/wish/Display2/tclIndex
src/Config/Template/ObjectsTemplate.Dir/src/Makefile
src/Config/Template/ToolsTemplate.Dir/src/Makefile
src/Config/x86Linux64.inc
src/Objects/DataExpress/.Source.org [new file with mode: 0644]
src/Objects/DataExpress/Contour/src/Makefile
src/Objects/DataExpress/TclTk/src/Makefile
src/Objects/DataExpress/TclTk/src/tkctfInfo.c
src/Objects/DataExpress/avsFile/src/Makefile
src/Objects/DataExpress/eosAlsa/src/Makefile
src/Objects/DataExpress/eosOpenGL/src/Makefile
src/Objects/DataExpress/eosRuby/src/Makefile
src/Objects/DataExpress/gifFile/src/Makefile
src/Objects/DataExpress/gifFile/src/lmrc2gif.c
src/Objects/DataExpress/pngFile/src/Makefile
src/Objects/DataExpress/psFile/src/Makefile
src/Objects/DataManip/.Source.org [new file with mode: 0644]
src/Objects/DataManip/DCDFile/src/Makefile
src/Objects/DataManip/IMAGIC/src/Makefile
src/Objects/DataManip/bildFile/src/Makefile
src/Objects/DataManip/bmpFile/src/Makefile
src/Objects/DataManip/ctfInfo/src/Makefile
src/Objects/DataManip/ctfforBayes/src/Makefile
src/Objects/DataManip/dmFile/src/Makefile
src/Objects/DataManip/dsn6File/src/Makefile
src/Objects/DataManip/emData/src/Makefile
src/Objects/DataManip/eosMATH/src/Makefile
src/Objects/DataManip/eosMATH/src/eosBessel.c
src/Objects/DataManip/eosStarFile/doc/eosStarFile.html
src/Objects/DataManip/eosStarFile/src/Makefile
src/Objects/DataManip/khorosData/src/Makefile
src/Objects/DataManip/largeIP/src/Makefile
src/Objects/DataManip/llData/src/Makefile
src/Objects/DataManip/ltlgData/src/Makefile
src/Objects/DataManip/mapFile/src/Makefile
src/Objects/DataManip/mrcImage/src/Makefile
src/Objects/DataManip/mrcImageShape/src/Makefile
src/Objects/DataManip/pdbFile/src/Makefile
src/Objects/DataManip/rigakuImage/src/Makefile
src/Objects/DataManip/simulation/src/Makefile
src/Objects/DataManip/tgaFile/src/Makefile
src/Objects/DataManip/transform/src/Makefile
src/Objects/General/AI/src/Makefile
src/Objects/General/Array/src/Makefile
src/Objects/General/Cluster/src/Makefile
src/Objects/General/Crystal/src/Makefile
src/Objects/General/DataBase/src/Makefile
src/Objects/General/Eos/src/Makefile
src/Objects/General/File/src/Makefile
src/Objects/General/Map2D/src/Makefile
src/Objects/General/Matrix3D/src/Makefile
src/Objects/General/Memory/src/Makefile
src/Objects/General/PVM/src/Makefile
src/Objects/General/Random/src/Makefile
src/Objects/General/Raw/src/Makefile
src/Objects/General/Socket/src/Makefile
src/Objects/General/SpecialNumber/src/Makefile
src/Objects/General/Vector/src/Makefile
src/Objects/General/dummy/src/Makefile
src/Objects/General/eosBayes/src/Makefile
src/Objects/General/eosCuda/src/Makefile
src/Objects/General/eosFunc/src/Makefile
src/Objects/General/eosList/src/Makefile
src/Objects/General/eosMath/src/Makefile
src/Objects/General/eosPThread/src/Makefile
src/Objects/General/eosPoint/src/Makefile
src/Objects/General/eosString/src/Makefile
src/Objects/General/eosXMAIL/src/Makefile
src/Objects/General/genUtil/src/Makefile
src/Objects/MachineManip/hf2000/src/Makefile
src/Tools/Cluster/clusterLog2ToLog/src/Makefile
src/Tools/Cluster/clusterLogASCII2Binary/src/Makefile
src/Tools/Cluster/clusterShow/src/Makefile
src/Tools/Config/Define.inc
src/Tools/Coord/coordRotation/src/Makefile
src/Tools/Coord/pointsSetToPDB/src/Makefile
src/Tools/DCDFile/dcdAtomChangeDistanceFromAtom/src/Makefile
src/Tools/DCDFile/dcdAtomDistanceDistribution/src/Makefile
src/Tools/DCDFile/dcdCompareCA/src/Makefile
src/Tools/DCDFile/dcdDistanceAtomBetweenAtom/src/Makefile
src/Tools/DCDFile/dcdFilePrint/src/Makefile
src/Tools/DCDFile/dcdInfo/src/Makefile
src/Tools/DCDFile/dcdSelectAtoms/src/Makefile
src/Tools/DCDFile/dcdSerectAtom/src/Makefile
src/Tools/DCDFile/dcdTest/Makefile
src/Tools/DCDFile/dcdTest/doc/Makefile [changed from symlink to file mode: 0755]
src/Tools/DCDFile/dcdTest/src/Makefile
src/Tools/DCDFile/dcdTest/src/argCheck.c
src/Tools/DCDFile/dcdTest/src/dcdTest.html
src/Tools/DCDFile/dcdTest/src/init.c
src/Tools/DCDFile/dcdTest/src/usage.c
src/Tools/DCDFile/dcdTimeSeriesBehavior/src/Makefile
src/Tools/Integration/Display2/src/Makefile
src/Tools/Integration/Display3/src/Makefile
src/Tools/Integration/Eos/src/Makefile
src/Tools/Integration/StereoDisplay/src/Makefile
src/Tools/Integration/StereoDisplay/src/StereoDisplay.c
src/Tools/Integration/Visualmake/src/Makefile
src/Tools/Integration/ctfDisplay/src/Makefile
src/Tools/Integration/imagesClustering/src/Makefile
src/Tools/Integration/imagesView/src/Makefile
src/Tools/Integration/imagesView/src/imagesView.html
src/Tools/Integration/obj3Don2DImageView/src/Makefile
src/Tools/Integration/smolet/src/Makefile
src/Tools/admin/mallocCheck/src/Makefile
src/Tools/array/arrayPCA/src/Makefile
src/Tools/bmpFile/bmpFileInfo/src/Makefile
src/Tools/crystal/crystalGetLatticeVolume/src/Makefile
src/Tools/crystal/crystalGetReciprocalLattice/src/Makefile
src/Tools/ctfInfo/ctfDeterminationByBayes/src/Makefile
src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.c
src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.html
src/Tools/ctfInfo/ctfDeterminationFromMultiImage/src/Makefile
src/Tools/ctfInfo/ctfDeterminationFromPhaseComparison/src/Makefile
src/Tools/ctfInfo/ctfDeterminationFromThonRing/src/Makefile
src/Tools/ctfInfo/ctfDetermine/src/Makefile
src/Tools/ctfInfo/ctfEnvelopFunction/src/Makefile
src/Tools/ctfInfo/ctfEnvelopFunctionEstimate/src/Makefile
src/Tools/ctfInfo/ctfFunction/src/Makefile
src/Tools/ctfInfo/ctfFunctionServer/src/Makefile
src/Tools/ctfInfo/ctfInfoSet/src/Makefile
src/Tools/ctfInfo/ctfMultiFunction/src/Makefile
src/Tools/ctfInfo/ctfMultiFunction/src/ctfMultiFunction.c
src/Tools/ctfInfo/ctfMultiFunction/src/ctfMultiFunction.html
src/Tools/ctfInfo/ctfWeightMapCreation/src/Makefile
src/Tools/ctfInfo/ctfZeroPoint/src/Makefile
src/Tools/ctfInfo/defocusDeterminationFromThonRing/src/Makefile
src/Tools/ctfInfo/electronWaveLength/src/Makefile
src/Tools/ctfInfo/molecularEnvelopeResampling/src/Makefile
src/Tools/ctfInfo/tiltInfoDetermine/src/Makefile
src/Tools/ctfInfo/tiltInfoDetermine/src/tiltInfoDetermine.c
src/Tools/ctfInfo/tiltInfoDetermine/src/tiltInfoDetermine.html
src/Tools/database/homology2PG/src/Makefile
src/Tools/database/pgDataBaseSelectServer/src/Makefile
src/Tools/database/pgJournalSelect/src/Makefile
src/Tools/database/pgJournalSelectCORBAClient/src/Makefile
src/Tools/database/pgJournalSelectCORBAServer/src/Makefile
src/Tools/database/pgMemoSelectCORBAServer/src/Makefile
src/Tools/database/pgSelect/src/Makefile
src/Tools/eosBayes/eosBayesInit/src/Makefile
src/Tools/eosBayes/eosBayesInit/src/eosBayesInit.c
src/Tools/eosMath/eosMathAverage/src/Makefile
src/Tools/eosMath/eosMathMedian/src/Makefile
src/Tools/eosMath/eosMathSorting/src/Makefile
src/Tools/eosPoint/eosPointAffineTransform/src/Makefile
src/Tools/eosPoint/eosPointCurvatureInfo/src/Makefile
src/Tools/eosPoint/eosPointICP/src/Makefile
src/Tools/eosPoint/eosPointPositionCorrection/src/Makefile
src/Tools/eosPoint/eosPointProjector/src/Makefile
src/Tools/eosPoint/eosPointRotation/src/Makefile
src/Tools/eosStarFile/eosStarFileCopy/src/Makefile
src/Tools/filter/array2mrc/src/Makefile
src/Tools/filter/bin2mrc/src/Makefile
src/Tools/filter/bmp2mrc/src/Makefile
src/Tools/filter/dm2mrc/src/Makefile
src/Tools/filter/dmInfo/src/Makefile
src/Tools/filter/dos2unix/src/Makefile
src/Tools/filter/emData2mrc/src/Makefile
src/Tools/filter/imodst2mrc/src/Makefile
src/Tools/filter/ip2mrc/src/Makefile
src/Tools/filter/moi2mrc/src/Makefile
src/Tools/filter/moi2mrc/src/moi2mrc.c
src/Tools/filter/moi2mrc/src/moi2mrc.html
src/Tools/filter/mrc2ascii/src/Makefile
src/Tools/filter/mrc2bild/src/Makefile
src/Tools/filter/mrc2fld/src/Makefile
src/Tools/filter/mrc2gif/src/Makefile
src/Tools/filter/mrc2hdf/src/Makefile
src/Tools/filter/mrc2lattice/src/Makefile
src/Tools/filter/mrc2mrc/src/Makefile
src/Tools/filter/mrc2png/src/Makefile
src/Tools/filter/mrc2pov/src/Makefile
src/Tools/filter/mrc2pov/src/mrc2pov.c
src/Tools/filter/mrc2tiff/src/Makefile
src/Tools/filter/mrc2viff/src/Makefile
src/Tools/filter/mrcImage2FFT/src/Makefile
src/Tools/filter/pdb2ucd/src/Makefile
src/Tools/filter/raw2mrc/src/Makefile
src/Tools/filter/tgaInfo/src/Makefile
src/Tools/filter/tiff2mrc/src/Makefile
src/Tools/hf2000/hf2000Init/src/Makefile
src/Tools/hf2000/hf2000LenzCurrent/src/Makefile
src/Tools/hf2000/hf2000SpecimenPosition/src/Makefile
src/Tools/khorosTool/khorosFilterGenerate/src/Makefile
src/Tools/khorosTool/khorosFilterGenerate/src/khorosFilterGenerate.c
src/Tools/largeIP/largeIPInfo/src/Makefile
src/Tools/llData/llDataAverage/src/Makefile
src/Tools/llData/llDataAxisSearch/src/Makefile
src/Tools/llData/llDataAxisSearch/src/llDataAxisSearch.c
src/Tools/llData/llDataAxisSearch/src/llDataAxisSearch.html
src/Tools/llData/llDataCTFCompensate/src/Makefile
src/Tools/llData/llDataCTFCompensate/src/llDataCTFCompensate.c
src/Tools/llData/llDataCTFCompensate/src/llDataCTFCompensate.html
src/Tools/llData/llDataCompare/src/Makefile
src/Tools/llData/llDataContributionCalcDifferentN/src/Makefile
src/Tools/llData/llDataDump/src/Makefile
src/Tools/llData/llDataEquatorAdd/src/Makefile
src/Tools/llData/llDataExtract/src/Makefile
src/Tools/llData/llDataFit/src/Makefile
src/Tools/llData/llDataFitServer/src/Makefile
src/Tools/llData/llDataInfo/src/Makefile
src/Tools/llData/llDataLowPassFiltering/src/Makefile
src/Tools/llData/llDataMultiCTFCompensation/src/Makefile
src/Tools/llData/llDataMultiCTFCompensation/src/llDataMultiCTFCompensation.c
src/Tools/llData/llDataMultiCTFCompensation/src/llDataMultiCTFCompensation.html
src/Tools/llData/llDataNEstimation/src/Makefile
src/Tools/llData/llDataNormalization/src/Makefile
src/Tools/llData/llDataPrint/src/Makefile
src/Tools/llData/llDataPrint/src/llDataPrint.html
src/Tools/llData/llDataRescaling/src/Makefile
src/Tools/llData/llDataResolutionCheck/src/Makefile
src/Tools/llData/llDataRotation/src/Makefile
src/Tools/llData/llDataSelectionEstimation/src/Makefile
src/Tools/llData/llDataSeparate/src/Makefile
src/Tools/llData/llDataSeparate/src/llDataSeparate.c
src/Tools/llData/llDataWeightSet/src/Makefile
src/Tools/llData/llDatarMaxLimit/src/Makefile
src/Tools/ltlgData/ltlgDataInfo/src/Makefile
src/Tools/matrix3D/matrix3DEulerAngleTransform/src/Makefile
src/Tools/matrix3D/matrix3DEulerAngleTransform/src/matrix3DEulerAngleTransform.c
src/Tools/matrix3D/matrix3DEulerAngleTransform/src/matrix3DEulerAngleTransform.html
src/Tools/matrix3D/matrix3DFromEulerAngle/src/Makefile
src/Tools/matrix3D/matrix3DFromEulerAngle/src/matrix3DFromEulerAngle.c
src/Tools/matrix3D/matrix3DFromEulerAngle/src/matrix3DFromEulerAngle.html
src/Tools/matrix3D/matrix3DInverse/src/Makefile
src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.c
src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.html
src/Tools/matrix3D/matrix3DToEulerAngle/src/Makefile
src/Tools/mrcImage/.Source
src/Tools/mrcImage/.Source.org
src/Tools/mrcImage/fft2d/src/Makefile
src/Tools/mrcImage/mrc2dsn6/src/Makefile
src/Tools/mrcImage/mrc2hdf/src/Makefile
src/Tools/mrcImage/mrc2map/src/Makefile
src/Tools/mrcImage/mrc3DExtractZ/src/Makefile
src/Tools/mrcImage/mrcFETnormalizeBySD/src/Makefile
src/Tools/mrcImage/mrcFFTBandPassFilter/src/Makefile
src/Tools/mrcImage/mrcFFTCTFCompensation/src/Makefile
src/Tools/mrcImage/mrcFFTCTFCompensation/src/mrcFFTCTFCompensation.c
src/Tools/mrcImage/mrcFFTCTFCompensation/src/mrcFFTCTFCompensation.html
src/Tools/mrcImage/mrcFFTCentralSection/src/Makefile
src/Tools/mrcImage/mrcFFTCentralSection/src/mrcFFTCentralSection.c
src/Tools/mrcImage/mrcFFTCentralSection/src/mrcFFTCentralSection.html
src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/Makefile
src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.c
src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.html
src/Tools/mrcImage/mrcFFTDigitize/src/Makefile
src/Tools/mrcImage/mrcFFTExpression/src/Makefile
src/Tools/mrcImage/mrcFFTFibreDiagram/src/Makefile
src/Tools/mrcImage/mrcFFTFiltering/src/Makefile
src/Tools/mrcImage/mrcFFTIQEstimation/src/Makefile
src/Tools/mrcImage/mrcFFTIQEstimation/src/mrcFFTIQEstimation.c
src/Tools/mrcImage/mrcFFTIQEstimation/src/mrcFFTIQEstimation.html
src/Tools/mrcImage/mrcFFTInfo/src/Makefile
src/Tools/mrcImage/mrcFFTLayerLineCheck/src/Makefile
src/Tools/mrcImage/mrcFFTMedianFilter/src/Makefile
src/Tools/mrcImage/mrcFFTProjection/src/Makefile
src/Tools/mrcImage/mrcFFTResampling/src/Makefile
src/Tools/mrcImage/mrcFFTShellInfo/src/Makefile
src/Tools/mrcImage/mrcFFTSizeChange/src/Makefile
src/Tools/mrcImage/mrcFFTSpectrum/src/Makefile
src/Tools/mrcImage/mrcFFTXFiltering/src/Makefile
src/Tools/mrcImage/mrcFFTplainreduce/src/Makefile
src/Tools/mrcImage/mrcFTMeridianEquatorRedece/src/Makefile
src/Tools/mrcImage/mrcImage1DProjectionfrom2D/src/Makefile
src/Tools/mrcImage/mrcImage1dAverageByCorrelation/src/Makefile
src/Tools/mrcImage/mrcImage1dCutAverage/src/Makefile
src/Tools/mrcImage/mrcImage1dShiftAverageByAnnealing/src/Makefile
src/Tools/mrcImage/mrcImage1dShiftByCorrelation/src/Makefile
src/Tools/mrcImage/mrcImage2DBackProjection/src/Makefile
src/Tools/mrcImage/mrcImage2DProjection/src/Makefile
src/Tools/mrcImage/mrcImage2pdb/src/Makefile
src/Tools/mrcImage/mrcImage3DCTFObservation/src/Makefile
src/Tools/mrcImage/mrcImage3DHighResoEmphasis/src/Makefile
src/Tools/mrcImage/mrcImage3DPad/src/Makefile
src/Tools/mrcImage/mrcImage3DPad2/src/Makefile
src/Tools/mrcImage/mrcImage3DPeakGet/src/Makefile
src/Tools/mrcImage/mrcImage3DSymmetryFind/src/Makefile
src/Tools/mrcImage/mrcImage3DWindowing/src/Makefile
src/Tools/mrcImage/mrcImageAbnormalValueRemove/src/Makefile
src/Tools/mrcImage/mrcImageActinSingleParticleAnalysis/src/Makefile
src/Tools/mrcImage/mrcImageAdaptiveBinalization/src/Makefile
src/Tools/mrcImage/mrcImageAdd/src/Makefile
src/Tools/mrcImage/mrcImageAddValue/src/Makefile
src/Tools/mrcImage/mrcImageAreaCalc/src/Makefile
src/Tools/mrcImage/mrcImageAsProbability/src/Makefile
src/Tools/mrcImage/mrcImageAssignedToTFofPDB/src/Makefile
src/Tools/mrcImage/mrcImageAutoCorrelationWithWindowing/src/Makefile
src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/Makefile
src/Tools/mrcImage/mrcImageAutoFilamentExtractResultAnalysis/src/Makefile
src/Tools/mrcImage/mrcImageAutoRotationAverage/src/Makefile
src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/Makefile
src/Tools/mrcImage/mrcImageAutoRotationCorrelation3D/src/Makefile
src/Tools/mrcImage/mrcImageAutoRotationCorrelationResultPrint/src/Makefile
src/Tools/mrcImage/mrcImageAutoTriming/src/Makefile
src/Tools/mrcImage/mrcImageAverage/src/Makefile
src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/Makefile
src/Tools/mrcImage/mrcImageBandPassFilter/src/Makefile
src/Tools/mrcImage/mrcImageBilateralFilter/src/Makefile
src/Tools/mrcImage/mrcImageBinalization/src/Makefile
src/Tools/mrcImage/mrcImageBlockMerge/src/Makefile
src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/Makefile
src/Tools/mrcImage/mrcImageBottomHatTransform/src/Makefile
src/Tools/mrcImage/mrcImageBoundaryInfo/src/Makefile
src/Tools/mrcImage/mrcImageCCDNoiseRemove/src/Makefile
src/Tools/mrcImage/mrcImageCTFCompensation/src/Makefile
src/Tools/mrcImage/mrcImageCTFCompensation/src/mrcImageCTFCompensation.c
src/Tools/mrcImage/mrcImageCTFCompensation/src/mrcImageCTFCompensation.html
src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/Makefile
src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/mrcImageCTFCompensationForTiltImage.c
src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/mrcImageCTFCompensationForTiltImage.html
src/Tools/mrcImage/mrcImageCTFDetermination/src/Makefile
src/Tools/mrcImage/mrcImageCTFObservation/src/Makefile
src/Tools/mrcImage/mrcImageCTFSN/src/Makefile
src/Tools/mrcImage/mrcImageCVE/src/Makefile
src/Tools/mrcImage/mrcImageCenterDensityChange/src/Makefile
src/Tools/mrcImage/mrcImageCenterGet/src/Makefile
src/Tools/mrcImage/mrcImageCenterOfMassCalculate/src/Makefile
src/Tools/mrcImage/mrcImageChainCodeCalc/src/Makefile
src/Tools/mrcImage/mrcImageCircumferentialProjection/src/Makefile
src/Tools/mrcImage/mrcImageClosing/src/Makefile
src/Tools/mrcImage/mrcImageClusterAnalysis/src/Makefile
src/Tools/mrcImage/mrcImageColoring/src/Makefile
src/Tools/mrcImage/mrcImageConnection/src/Makefile
src/Tools/mrcImage/mrcImageConnectivityNumberCalc/src/Makefile
src/Tools/mrcImage/mrcImageContourSurfaceCreate/src/Makefile
src/Tools/mrcImage/mrcImageConvolution/src/Makefile
src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html
src/Tools/mrcImage/mrcImageCoordinateChange/src/Makefile
src/Tools/mrcImage/mrcImageCoreImageCalc/src/Makefile
src/Tools/mrcImage/mrcImageCoreImageCalc/src/mrcImageCoreImageCalc.c
src/Tools/mrcImage/mrcImageCoreImageCalc/src/mrcImageCoreImageCalc.html
src/Tools/mrcImage/mrcImageCorrelation/src/Makefile
src/Tools/mrcImage/mrcImageCorrelationInFourierSpace/src/Makefile
src/Tools/mrcImage/mrcImageCorrelationServer/src/Makefile
src/Tools/mrcImage/mrcImageCorrelationWithCTFCompensation/src/Makefile
src/Tools/mrcImage/mrcImageCrystalCreate/src/Makefile
src/Tools/mrcImage/mrcImageCrystalDeform/src/Makefile
src/Tools/mrcImage/mrcImageCurl/src/Makefile
src/Tools/mrcImage/mrcImageCutAndSetInArray/src/Makefile
src/Tools/mrcImage/mrcImageCylinderSection/src/Makefile
src/Tools/mrcImage/mrcImageDeadPixelCorrection/src/Makefile
src/Tools/mrcImage/mrcImageDeconvolution/src/Makefile
src/Tools/mrcImage/mrcImageDensityChangeEstimation/src/Makefile
src/Tools/mrcImage/mrcImageDensityInfo/src/Makefile
src/Tools/mrcImage/mrcImageDensityNormalization/src/Makefile
src/Tools/mrcImage/mrcImageDensityNormalizationByImage/src/Makefile
src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/Makefile
src/Tools/mrcImage/mrcImageDilation/src/Makefile
src/Tools/mrcImage/mrcImageDisplayDensityAsTempFactor/src/Makefile
src/Tools/mrcImage/mrcImageDistanceConversion/src/Makefile
src/Tools/mrcImage/mrcImageDivergence/src/Makefile
src/Tools/mrcImage/mrcImageDivideInfoForTomography/src/Makefile
src/Tools/mrcImage/mrcImageDivideIntoTwoImages/src/Makefile
src/Tools/mrcImage/mrcImageDividedByFile/src/Makefile
src/Tools/mrcImage/mrcImageEdgeCalc/src/Makefile
src/Tools/mrcImage/mrcImageEdgeEnhancement/src/Makefile
src/Tools/mrcImage/mrcImageEdgeImageGet/src/Makefile
src/Tools/mrcImage/mrcImageEdgeImageGet/src/mrcImageEdgeImageGet.c
src/Tools/mrcImage/mrcImageEdgeImageGet/src/mrcImageEdgeImageGet.html
src/Tools/mrcImage/mrcImageEnhancementWithFuzzySets/src/Makefile
src/Tools/mrcImage/mrcImageErosion/src/Makefile
src/Tools/mrcImage/mrcImageEstimateTiltImage/src/Makefile
src/Tools/mrcImage/mrcImageExpression/src/Makefile
src/Tools/mrcImage/mrcImageFFT/src/Makefile
src/Tools/mrcImage/mrcImageFFTLayerLineExtraction/src/Makefile
src/Tools/mrcImage/mrcImageFFTLayerLineExtraction/src/mrcImageFFTLayerLineExtraction.c
src/Tools/mrcImage/mrcImageFFTLayerLineExtraction/src/mrcImageFFTLayerLineExtraction.html
src/Tools/mrcImage/mrcImageFFTSetsExtract/src/Makefile
src/Tools/mrcImage/mrcImageFOMCalc.org/Config/Define.inc [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/Config/OptionControlFile [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/Config/OptionControlFile.org [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/Makefile [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/doc/Makefile [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/inc/config.h [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/inc/mrcImageFOMCalc.h [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/inc/mrcImageFOMCalc.h.org [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHA [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX5 [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHAOSF1 [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/ARM64MAC64 [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/CELLLINUX64 [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/HP [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/I386LINUX [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/I686LINUX [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/SGI [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/SPARC [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86LINUX64 [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86LINUX64ICC [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86MAC64 [deleted symlink]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/argCheck.c [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/init.c [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.c [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.c.org [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.html [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.pane [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/usage.c [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc.org/src/util.c [deleted file]
src/Tools/mrcImage/mrcImageFOMCalc/src/Makefile
src/Tools/mrcImage/mrcImageFOMCalc/src/mrcImageFOMCalc.c
src/Tools/mrcImage/mrcImageFOMCalc/src/mrcImageFOMCalc.html
src/Tools/mrcImage/mrcImageFTest/Makefile
src/Tools/mrcImage/mrcImageFTest/doc/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageFTest/src/Makefile
src/Tools/mrcImage/mrcImageFTest/src/argCheck.c
src/Tools/mrcImage/mrcImageFTest/src/init.c
src/Tools/mrcImage/mrcImageFTest/src/mrcImageFTest.html
src/Tools/mrcImage/mrcImageFTest/src/usage.c
src/Tools/mrcImage/mrcImageFeatureCalc/src/Makefile
src/Tools/mrcImage/mrcImageFeatureExtraction/src/Makefile
src/Tools/mrcImage/mrcImageFilamentSearch/src/Makefile
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/Config/Define.inc [new file with mode: 0755]
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/Config/OptionControlFile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/Config/Target.inc [moved from src/Tools/mrcImage/mrcImageFOMCalc.org/Config/Target.inc with 100% similarity]
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/doc/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/.Depend [moved from src/Tools/mrcImage/mrcImageFOMCalc.org/src/.Depend with 100% similarity]
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/Makefile [moved from src/Tools/mrcImage/mrcImageFOMCalc.org/src/Makefile with 96% similarity]
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/X86LINUX64 [new symlink]
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/argCheck.c
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/init.c
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/mrcImageFilamentSearchResultShow.html [new file with mode: 0644]
src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/usage.c
src/Tools/mrcImage/mrcImageFilterCreate/src/Makefile
src/Tools/mrcImage/mrcImageFilteringbyFile/src/Makefile
src/Tools/mrcImage/mrcImageFilteringbyFileForVariance/src/Makefile
src/Tools/mrcImage/mrcImageFlatFieldCorrection/src/Makefile
src/Tools/mrcImage/mrcImageFloating/src/Makefile
src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/Makefile
src/Tools/mrcImage/mrcImageFourierPowerSpectrum/src/Makefile
src/Tools/mrcImage/mrcImageFourierShellCorrelation/src/Makefile
src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/Config/Define.inc
src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/Makefile
src/Tools/mrcImage/mrcImageFractalFrourierShellCorrelation/src/Makefile
src/Tools/mrcImage/mrcImageGaussDisc/src/Makefile
src/Tools/mrcImage/mrcImageGaussSphere/src/Makefile
src/Tools/mrcImage/mrcImageGradient/src/Makefile
src/Tools/mrcImage/mrcImageHeaderChange/src/Makefile
src/Tools/mrcImage/mrcImageHelicalAveraging/src/Makefile
src/Tools/mrcImage/mrcImageHelicalConvolution/src/Makefile
src/Tools/mrcImage/mrcImageHelicalConvolution/src/mrcImageHelicalConvolution.c
src/Tools/mrcImage/mrcImageHelicalConvolution/src/mrcImageHelicalConvolution.html
src/Tools/mrcImage/mrcImageHelicalMappingFrom2DImage/src/Makefile
src/Tools/mrcImage/mrcImageHelicalMasking/src/Makefile
src/Tools/mrcImage/mrcImageHelicalMaskingBy2DImage/src/Makefile
src/Tools/mrcImage/mrcImageHelicalProjection/src/Makefile
src/Tools/mrcImage/mrcImageHighPassFilter/src/Makefile
src/Tools/mrcImage/mrcImageHighlighting/src/Makefile
src/Tools/mrcImage/mrcImageHoleFilling/src/Makefile
src/Tools/mrcImage/mrcImageHoughTransform/src/Makefile
src/Tools/mrcImage/mrcImageHoughTransformInverse/src/Makefile
src/Tools/mrcImage/mrcImageInfo/src/Makefile
src/Tools/mrcImage/mrcImageLabeling/src/Makefile
src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/Makefile
src/Tools/mrcImage/mrcImageLogicalOperation/src/Makefile
src/Tools/mrcImage/mrcImageLowPassFilter/src/Makefile
src/Tools/mrcImage/mrcImageLucasKanade/src/Makefile
src/Tools/mrcImage/mrcImageMagnificationChange/src/Makefile
src/Tools/mrcImage/mrcImageMake2DArrayImage/src/Makefile
src/Tools/mrcImage/mrcImageMakeCylinder/src/Makefile
src/Tools/mrcImage/mrcImageMakeDump/src/Makefile
src/Tools/mrcImage/mrcImageMakeFromTextFile/src/Makefile
src/Tools/mrcImage/mrcImageMakeSphere/src/Makefile
src/Tools/mrcImage/mrcImageMappingtoPdb/src/Makefile
src/Tools/mrcImage/mrcImageMasking/src/Makefile
src/Tools/mrcImage/mrcImageMaskingByImage/src/Makefile
src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/Makefile
src/Tools/mrcImage/mrcImageMergeFFT/src/Makefile
src/Tools/mrcImage/mrcImageMergebyside/src/Makefile
src/Tools/mrcImage/mrcImageMirroring/src/Makefile
src/Tools/mrcImage/mrcImageModeChange/src/Makefile
src/Tools/mrcImage/mrcImageModelCreate/src/Makefile
src/Tools/mrcImage/mrcImageModelSubfilamentsCreate/src/Makefile
src/Tools/mrcImage/mrcImageMontageCreate/src/Makefile
src/Tools/mrcImage/mrcImageMove/src/Makefile
src/Tools/mrcImage/mrcImageMovingModelCreate/src/Makefile
src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/Makefile
src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.c
src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.html
src/Tools/mrcImage/mrcImageMultiCTFDetermination/src/Makefile
src/Tools/mrcImage/mrcImageMultiCTFDetermination/src/mrcImageMultiCTFDetermination.c
src/Tools/mrcImage/mrcImageMultiCTFDetermination/src/mrcImageMultiCTFDetermination.html
src/Tools/mrcImage/mrcImageMultiplying/src/Makefile
src/Tools/mrcImage/mrcImageMultiplyingbyFile/src/Makefile
src/Tools/mrcImage/mrcImageNLMeansFilter/src/Makefile
src/Tools/mrcImage/mrcImageNfoldAxisSearch/src/Makefile
src/Tools/mrcImage/mrcImageNoiseAdd/src/Makefile
src/Tools/mrcImage/mrcImageNoiseCreate/src/Makefile
src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/Makefile
src/Tools/mrcImage/mrcImageNormalDistributionTest/Makefile
src/Tools/mrcImage/mrcImageNormalDistributionTest/doc/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHA [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX5 [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHAOSF1 [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/CELLLINUX64 [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/HP [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I386LINUX [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I686LINUX [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/Makefile
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SGI [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SPARC [deleted symlink]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/argCheck.c
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/init.c
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/mrcImageNormalDistributionTest.html [changed mode: 0755->0644]
src/Tools/mrcImage/mrcImageNormalDistributionTest/src/usage.c
src/Tools/mrcImage/mrcImageNormalizedSubtraction/src/Makefile
src/Tools/mrcImage/mrcImageNormalizing/src/Makefile
src/Tools/mrcImage/mrcImageNormalizing/src/mrcImageNormalizing.html
src/Tools/mrcImage/mrcImageNullImageCreate/src/Makefile
src/Tools/mrcImage/mrcImageOddBoxel/src/Makefile
src/Tools/mrcImage/mrcImageOneLineSimilarityCalc/src/Makefile
src/Tools/mrcImage/mrcImageOpening/src/Makefile
src/Tools/mrcImage/mrcImageOpticalFlow/src/Makefile
src/Tools/mrcImage/mrcImagePCA/src/Makefile
src/Tools/mrcImage/mrcImagePad/src/Makefile
src/Tools/mrcImage/mrcImagePanoramaCreate/src/Makefile
src/Tools/mrcImage/mrcImagePanoramaCreate/src/mrcImagePanoramaCreate.c
src/Tools/mrcImage/mrcImagePanoramaCreate/src/mrcImagePanoramaCreate.html
src/Tools/mrcImage/mrcImageParticleCandidateExtract/src/Makefile
src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/Makefile
src/Tools/mrcImage/mrcImagePeakSearch/src/Makefile
src/Tools/mrcImage/mrcImagePerimeterCalc/src/Makefile
src/Tools/mrcImage/mrcImagePhaseCTFCompensationFromCTFINFO/src/Makefile
src/Tools/mrcImage/mrcImagePixelDataGet/src/Makefile
src/Tools/mrcImage/mrcImagePolyROI/src/Makefile
src/Tools/mrcImage/mrcImagePosterization/src/Makefile
src/Tools/mrcImage/mrcImagePrint/src/Makefile
src/Tools/mrcImage/mrcImagePrint3D/src/Makefile
src/Tools/mrcImage/mrcImageProjection/src/Makefile
src/Tools/mrcImage/mrcImagePut3D/src/Makefile
src/Tools/mrcImage/mrcImageROI/src/Makefile
src/Tools/mrcImage/mrcImageROI3D/src/Makefile
src/Tools/mrcImage/mrcImageROIs/src/Makefile
src/Tools/mrcImage/mrcImageROIs/src/mrcImageROIs.c
src/Tools/mrcImage/mrcImageROIs/src/mrcImageROIs.html
src/Tools/mrcImage/mrcImageROItoPCAoutputImage/src/Makefile
src/Tools/mrcImage/mrcImageRadialDistribution/src/Makefile
src/Tools/mrcImage/mrcImageRandomParticlesImageCreate/src/Makefile
src/Tools/mrcImage/mrcImageRealValueAdd/src/Makefile
src/Tools/mrcImage/mrcImageRectangleGet/src/Makefile
src/Tools/mrcImage/mrcImageRectangleGetByCorrelation/src/Makefile
src/Tools/mrcImage/mrcImageRefConv2D/src/Makefile
src/Tools/mrcImage/mrcImageRefCreate/src/Makefile
src/Tools/mrcImage/mrcImageRefFFTConv2D/src/Makefile
src/Tools/mrcImage/mrcImageRefScaleChangeWithPad/src/Makefile
src/Tools/mrcImage/mrcImageResolutionEstimateForFilaments/src/Makefile
src/Tools/mrcImage/mrcImageReverse/src/Makefile
src/Tools/mrcImage/mrcImageRotation/src/Makefile
src/Tools/mrcImage/mrcImageRotation3D/src/Makefile
src/Tools/mrcImage/mrcImageSN/src/Makefile
src/Tools/mrcImage/mrcImageSNEstimate/src/Makefile
src/Tools/mrcImage/mrcImageSamplingUnitChange/src/Makefile
src/Tools/mrcImage/mrcImageScalarAdd/src/Makefile
src/Tools/mrcImage/mrcImageSectionGet/src/Makefile
src/Tools/mrcImage/mrcImageSeriesNormalizing/src/Makefile
src/Tools/mrcImage/mrcImageSetFunction/src/Makefile
src/Tools/mrcImage/mrcImageShapeOrientation/src/Makefile
src/Tools/mrcImage/mrcImageShapePCA/src/Makefile
src/Tools/mrcImage/mrcImageShapePCAFit/src/Makefile
src/Tools/mrcImage/mrcImageShapeRelaxation/src/Makefile
src/Tools/mrcImage/mrcImageShapeSearch/src/Makefile
src/Tools/mrcImage/mrcImageShift/src/Makefile
src/Tools/mrcImage/mrcImageShiftFollowingGC/src/Makefile
src/Tools/mrcImage/mrcImageShrink/src/Makefile
src/Tools/mrcImage/mrcImageSiemensStar/src/Makefile
src/Tools/mrcImage/mrcImageSimilarImageSearch/src/Makefile
src/Tools/mrcImage/mrcImageSimilarityEstimate/src/Makefile
src/Tools/mrcImage/mrcImageSimilarityEstimate/src/mrcImageSimilarityEstimate.c
src/Tools/mrcImage/mrcImageSimilarityEstimate/src/mrcImageSimilarityEstimate.html
src/Tools/mrcImage/mrcImageSinogramCorrelation/src/Makefile
src/Tools/mrcImage/mrcImageSinogramCreate/src/Makefile
src/Tools/mrcImage/mrcImageSinogramFFT/src/Makefile
src/Tools/mrcImage/mrcImageSmoothing/src/Makefile
src/Tools/mrcImage/mrcImageSoftEdge/src/.html [new file with mode: 0644]
src/Tools/mrcImage/mrcImageSoftEdge/src/Makefile
src/Tools/mrcImage/mrcImageSolventFlattening/src/Makefile
src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/Makefile
src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.c
src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.html
src/Tools/mrcImage/mrcImageSphere/src/Makefile
src/Tools/mrcImage/mrcImageSphereCheck/src/Makefile
src/Tools/mrcImage/mrcImageSplit/src/Makefile
src/Tools/mrcImage/mrcImageSquare/src/Makefile
src/Tools/mrcImage/mrcImageStack/src/Makefile
src/Tools/mrcImage/mrcImageStandardDeviation/src/Makefile
src/Tools/mrcImage/mrcImageStreamLine/src/Makefile
src/Tools/mrcImage/mrcImageSubtraction/src/Makefile
src/Tools/mrcImage/mrcImageSuperResolution/src/Makefile
src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/Makefile
src/Tools/mrcImage/mrcImageSurfaceAreaCalc/src/Makefile
src/Tools/mrcImage/mrcImageSurfaceCalc/src/Makefile
src/Tools/mrcImage/mrcImageSymmetryAverage/src/Makefile
src/Tools/mrcImage/mrcImageSymmetryCentreFind/src/Makefile
src/Tools/mrcImage/mrcImageSymmetryFind/src/Makefile
src/Tools/mrcImage/mrcImageTTest/Makefile
src/Tools/mrcImage/mrcImageTTest/doc/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageTTest/src/Makefile
src/Tools/mrcImage/mrcImageTTest/src/argCheck.c
src/Tools/mrcImage/mrcImageTTest/src/init.c
src/Tools/mrcImage/mrcImageTTest/src/mrcImageTTest.html
src/Tools/mrcImage/mrcImageTTest/src/usage.c
src/Tools/mrcImage/mrcImageTfunction/src/Makefile
src/Tools/mrcImage/mrcImageTiltAxisSearch/src/Makefile
src/Tools/mrcImage/mrcImageTiltAxisSearchHelp/src/Makefile
src/Tools/mrcImage/mrcImageTiltAxisSearchHelp/src/mrcImageTiltAxisSearchHelp.c
src/Tools/mrcImage/mrcImageTiltAxisSearchHelp/src/mrcImageTiltAxisSearchHelp.html
src/Tools/mrcImage/mrcImageToNAMDConstantForces/src/Makefile
src/Tools/mrcImage/mrcImageToPointsSet/src/Makefile
src/Tools/mrcImage/mrcImageToneReversal/src/Makefile
src/Tools/mrcImage/mrcImageTopHatTransform/src/Makefile
src/Tools/mrcImage/mrcImageTrans/src/Makefile
src/Tools/mrcImage/mrcImageTransformDescartesIntoPolar/src/Makefile
src/Tools/mrcImage/mrcImageTransformSign/src/Makefile
src/Tools/mrcImage/mrcImageTranspose/src/Makefile
src/Tools/mrcImage/mrcImageTwoImageTest/Makefile
src/Tools/mrcImage/mrcImageTwoImageTest/doc/Makefile [new file with mode: 0755]
src/Tools/mrcImage/mrcImageTwoImageTest/src/.Depend [moved from src/Tools/mrcImage/mrcImageFOMCalc.org/src/.Source with 100% similarity]
src/Tools/mrcImage/mrcImageTwoImageTest/src/.Source [new file with mode: 0755]
src/Tools/mrcImage/mrcImageTwoImageTest/src/Makefile
src/Tools/mrcImage/mrcImageTwoImageTest/src/argCheck.c
src/Tools/mrcImage/mrcImageTwoImageTest/src/init.c
src/Tools/mrcImage/mrcImageTwoImageTest/src/mrcImageTwoImageTest.html
src/Tools/mrcImage/mrcImageTwoImageTest/src/mrcImageTwoImageTest.pane
src/Tools/mrcImage/mrcImageTwoImageTest/src/usage.c
src/Tools/mrcImage/mrcImageUnbentROI/src/Makefile
src/Tools/mrcImage/mrcImageUnbentROI/src/argCheck.c
src/Tools/mrcImage/mrcImageUnbentROI/src/mrcImageUnbentROI.html
src/Tools/mrcImage/mrcImageUnexpectedMassFromPDB/src/Makefile
src/Tools/mrcImage/mrcImageUnsharpening/src/Makefile
src/Tools/mrcImage/mrcImageUntwist/src/Makefile
src/Tools/mrcImage/mrcImageVarianceAnalysis/src/Makefile
src/Tools/mrcImage/mrcImageVarianceAnalysis/src/mrcImageVarianceAnalysis.c
src/Tools/mrcImage/mrcImageVarianceAnalysis/src/mrcImageVarianceAnalysis.html
src/Tools/mrcImage/mrcImageVarianceMap/src/Makefile
src/Tools/mrcImage/mrcImageVolumeCalc/src/Makefile
src/Tools/mrcImage/mrcImageWindowing/src/Makefile
src/Tools/mrcImage/mrcImageZPad/src/Makefile
src/Tools/mrcImage/mrcImagepdbFileReduce/src/Makefile
src/Tools/mrcImage/mrcImagesSinogramCorrelation/src/Makefile
src/Tools/mrcImage/mrcImagestoRef/src/Makefile
src/Tools/mrcImage/mrcInfo/src/Makefile
src/Tools/mrcImage/mrcInfoSet/src/Makefile
src/Tools/mrcImage/mrcMask/src/Makefile
src/Tools/mrcImage/mrcMeanYlinePos/src/Makefile
src/Tools/mrcImage/mrcMirrorImageCreate/src/Makefile
src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/Makefile
src/Tools/mrcImage/mrcMultiFFTCentralSectionsSigmaCalc/src/Makefile
src/Tools/mrcImage/mrcRefCorEstimate/src/Makefile
src/Tools/mrcImage/mrcRefCorModify/src/Makefile
src/Tools/mrcImage/mrcRefCoreGet/src/Makefile
src/Tools/mrcImage/mrcRefCorrelation/src/Makefile
src/Tools/mrcImage/mrcRefCorrelationConv/src/Makefile
src/Tools/mrcImage/mrcRefEstimate/src/Makefile
src/Tools/mrcImage/mrcRefFFTConvert/src/Makefile
src/Tools/mrcImage/mrcRefHeaderCreate/src/Makefile
src/Tools/mrcImage/mrcRefHighPassFilter/src/Makefile
src/Tools/mrcImage/mrcRefImageCorrelation/src/Makefile
src/Tools/mrcImage/mrcRefImageOmegaCorrelation/src/Makefile
src/Tools/mrcImage/mrcRefImagepwzCorEstimate/src/Makefile
src/Tools/mrcImage/mrcRefImagepwzCorModify/src/Makefile
src/Tools/mrcImage/mrcRefImagepwzCorPeakFind/src/Makefile
src/Tools/mrcImage/mrcRefImagepwzCorSmoothing/src/Makefile
src/Tools/mrcImage/mrcRefImagepwzCorrelation/src/Makefile
src/Tools/mrcImage/mrcRefImagepwzCorrelationByFFT/src/Makefile
src/Tools/mrcImage/mrcRefImagexaFit/src/Makefile
src/Tools/mrcImage/mrcRefLowPassFilter/src/Makefile
src/Tools/mrcImage/mrcRefNoiseAdd/src/Makefile
src/Tools/mrcImage/mrcRefNormalizing/src/Makefile
src/Tools/mrcImage/mrcRefPhaseImageCreate/src/Makefile
src/Tools/mrcImage/mrcRefSmoothing/src/Makefile
src/Tools/mrcImage/mrcRefz1ImageCorrelation/src/Makefile
src/Tools/mrcImage/mrcSinogramFET/src/Makefile
src/Tools/mrcImage/mrcSinogramFETcalcSDforNormalize/src/Makefile
src/Tools/mrcImage/mrcSinogramFETcalcWeight/src/Makefile
src/Tools/mrcImage/mrcSinogramFETcorrelationMap/src/Makefile
src/Tools/mrcImage/mrcSinogramFETnormalizedMap/src/Makefile
src/Tools/mrcImage/mrcSinogramFETreferredCorrelation/src/Makefile
src/Tools/mrcImage/mrcSinogramFETsmoothParameterMatching/src/Makefile
src/Tools/mrcImage/mrcView/src/Makefile
src/Tools/openGL/gmolvie/src/Makefile
src/Tools/openGL/molvie/src/Makefile
src/Tools/openGL/molvie/src/molvie.html
src/Tools/openGL/molvieDock/src/Makefile
src/Tools/openGL/molvieDock/src/molvieDock.html
src/Tools/openGL/molvieFlight/src/Makefile
src/Tools/openGL/molvieFlight/src/molvieFlight.html
src/Tools/openGL/molvieMrcViewer/src/Makefile
src/Tools/openGL/molvieMrcViewer/src/molvieMrcViewer.html
src/Tools/openGL/molvieProjection/src/Makefile
src/Tools/openGL/molvieProjection/src/molvieProjection.html
src/Tools/openGL/molvieViewer/src/Makefile
src/Tools/openGL/molvieViewer/src/molvieViewer.html
src/Tools/pdbUtil/pdb2SketchMacro/src/Makefile
src/Tools/pdbUtil/pdb2bender/src/Makefile
src/Tools/pdbUtil/pdb2mrc/src/Makefile
src/Tools/pdbUtil/pdb2mrc2d/src/Makefile
src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html
src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/Makefile
src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html
src/Tools/pdbUtil/pdbAtomSection/src/Makefile
src/Tools/pdbUtil/pdbAtomSection/src/pdbAtomSection.c
src/Tools/pdbUtil/pdbAtomSection/src/pdbAtomSection.html
src/Tools/pdbUtil/pdbCAOnly/src/Makefile
src/Tools/pdbUtil/pdbChargeFit/src/Makefile
src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html
src/Tools/pdbUtil/pdbCoordAdd/src/Makefile
src/Tools/pdbUtil/pdbCrystalCreate/src/Makefile
src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html
src/Tools/pdbUtil/pdbDisplay/src/Makefile
src/Tools/pdbUtil/pdbFileMerge/src/Makefile
src/Tools/pdbUtil/pdbHelix/src/Makefile
src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html
src/Tools/pdbUtil/pdbHomologySearch/src/Makefile
src/Tools/pdbUtil/pdbInfo/src/Makefile
src/Tools/pdbUtil/pdbListRMSDCalc/src/Makefile
src/Tools/pdbUtil/pdbListVectorCalc/src/Makefile
src/Tools/pdbUtil/pdbMatrixCreate/src/Makefile
src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html
src/Tools/pdbUtil/pdbMolecularInterfaceFind/src/Makefile
src/Tools/pdbUtil/pdbMove/src/Makefile
src/Tools/pdbUtil/pdbNAMDRestraintCreate/src/Makefile
src/Tools/pdbUtil/pdbNearAtomListShow/src/Makefile
src/Tools/pdbUtil/pdbOneProteinGet/src/Makefile
src/Tools/pdbUtil/pdbPCA/src/Makefile
src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html
src/Tools/pdbUtil/pdbProteinIDSet/src/Makefile
src/Tools/pdbUtil/pdbRhoFit/src/Makefile
src/Tools/pdbUtil/pdbRhoFitCoiledCoil/src/Makefile
src/Tools/pdbUtil/pdbRhoFitTm/src/Makefile
src/Tools/pdbUtil/pdbRotation/src/Makefile
src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html
src/Tools/pdbUtil/pdbSecondaryStructurePrint/src/Makefile
src/Tools/pdbUtil/pdbShapeFit/src/Makefile
src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html
src/Tools/pdbUtil/pdbSurface/src/Makefile
src/Tools/pdbUtil/pdbTempFactorSet/src/Makefile
src/Tools/pdbUtil/pdbTempFactorSet/src/pdbTempFactorSet.c
src/Tools/pdbUtil/pdbTempFactorSet/src/pdbTempFactorSet.html
src/Tools/pdbUtil/pdbTrans/src/Makefile
src/Tools/pdbUtil/pdbTrans/src/pdbTrans.c
src/Tools/pdbUtil/pdbTwoProteinFit/src/Makefile
src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
src/Tools/pdbUtil/pdbView/src/Makefile
src/Tools/pdbUtil/pdbWaterAdd/src/Makefile
src/Tools/pdbUtil/vector2pdb/src/Makefile
src/Tools/pickup/mrcImageNeuralNetParticleExtraction/src/Makefile
src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/Makefile
src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/mrcImageNeuralNetParticleLearning.c
src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/mrcImageNeuralNetParticleLearning.html
src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/test.c
src/Tools/psUtil/psFileMerge/src/Makefile
src/Tools/psUtil/psFilePageMerge/src/Makefile
src/Tools/random/randomNormalGet/src/Makefile
src/Tools/random/randomUniformGet/src/Makefile
src/Tools/rec3d/CheckCommonLineData/src/CheckCommonLineData.c
src/Tools/rec3d/CheckCommonLineData/src/CheckCommonLineData.html
src/Tools/rec3d/CheckCommonLineData/src/Makefile
src/Tools/rec3d/CheckOfOrientation/src/CheckOfOrientation.c
src/Tools/rec3d/CheckOfOrientation/src/CheckOfOrientation.html
src/Tools/rec3d/CheckOfOrientation/src/Makefile
src/Tools/rec3d/CheckOrientationByDegree/src/CheckOrientationByDegree.c
src/Tools/rec3d/CheckOrientationByDegree/src/Makefile
src/Tools/rec3d/CommonLineCalculation/src/CommonLineCalculation.c
src/Tools/rec3d/CommonLineCalculation/src/CommonLineCalculation.html
src/Tools/rec3d/CommonLineCalculation/src/Makefile
src/Tools/rec3d/EvaluateCorrelationMapwithCommonLine/src/Makefile
src/Tools/rec3d/FETOrientationSearchByAnnealing/src/Makefile
src/Tools/rec3d/FETOrientationSearchByFeatureAlignment/src/Makefile
src/Tools/rec3d/FETmapOrientationSearchBySimultaneousFitting/src/Makefile
src/Tools/rec3d/FETsmallMapSetCreate_forSimultaneousMinimization/src/Makefile
src/Tools/rec3d/LCalculationForOrientationSearch/src/LCalculationForOrientationSearch.c
src/Tools/rec3d/LCalculationForOrientationSearch/src/LCalculationForOrientationSearch.html
src/Tools/rec3d/LCalculationForOrientationSearch/src/Makefile
src/Tools/rec3d/ProjectionDirectionMapCreate/src/Makefile
src/Tools/rec3d/ProjectionDirectionMapCreate/src/ProjectionDirectionMapCreate.c
src/Tools/rec3d/ProjectionDirectionMapCreate/src/ProjectionDirectionMapCreate.html
src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/Makefile
src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/doc/Makefile [changed from symlink to file mode: 0755]
src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/Makefile
src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/TestForLcalculationOfOrientationSearchBySimultaneousMinimization.html
src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/argCheck.c
src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/init.c
src/Tools/rec3d/TestForLcalculationOfOrientationSearchBySimultaneousMinimization/src/usage.c
src/Tools/rec3d/WeightCalculationOfCommonLineSearch/src/Makefile
src/Tools/rec3d/WeightCalculationOfCommonLineSearch/src/WeightCalculationOfCommonLineSearch.c
src/Tools/rec3d/WeightCalculationOfCommonLineSearch/src/WeightCalculationOfCommonLineSearch.html
src/Tools/rec3d/WeightCalculationOfCommonLineSearchByAllSinogram/src/Makefile
src/Tools/rec3d/WeightCalculationOfCommonLineSearchByAllSinogram/src/WeightCalculationOfCommonLineSearchByAllSinogram.c
src/Tools/rec3d/WeightCalculationOfCommonLineSearchByAllSinogram/src/WeightCalculationOfCommonLineSearchByAllSinogram.html
src/Tools/rec3d/calcCommonLine/src/Makefile
src/Tools/rec3d/commonLinesSearchByVoting/src/Makefile
src/Tools/rec3d/ll2ltlg/src/Makefile
src/Tools/rec3d/ll2ltlg/src/ll2ltlg.c
src/Tools/rec3d/ll2ltlg/src/ll2ltlg.html
src/Tools/rec3d/llExtract/src/Makefile
src/Tools/rec3d/llExtract/src/argCheck.c
src/Tools/rec3d/llExtract/src/llExtract.c
src/Tools/rec3d/llExtract/src/llExtract.html
src/Tools/rec3d/llExtractCtfinfFileCreate/src/Makefile
src/Tools/rec3d/llExtractCtrlFileCreate/src/Makefile
src/Tools/rec3d/llExtractWithLayerSeparation/src/Makefile
src/Tools/rec3d/llExtractWithLayerSeparation/src/llExtractWithLayerSeparation.c
src/Tools/rec3d/llExtractWithLayerSeparation/src/llExtractWithLayerSeparation.html
src/Tools/rec3d/llExtractWithLayerSeparationCtrlFileCreate/src/Makefile
src/Tools/rec3d/llExtractWithLayerSeparationCtrlFileCreateMyosin/src/Makefile
src/Tools/rec3d/llExtractWithLayerSeparationFilamentInfo/src/Makefile
src/Tools/rec3d/llExtractWithLayerSeparationServer/src/Makefile
src/Tools/rec3d/llExtractWithLayerSeparationSingle/src/Makefile
src/Tools/rec3d/ltlg2mrc/src/Makefile
src/Tools/rec3d/ltlg2mrc/src/ltlg2mrc.c
src/Tools/rec3d/ltlg2mrc/src/ltlg2mrc.html
src/Tools/rec3d/ltlg2ps/src/Makefile
src/Tools/rec3d/marker2Dto3DEstimator/src/Makefile
src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c
src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.html
src/Tools/rec3d/mrc2DFTto3DFT/src/Makefile
src/Tools/rec3d/mrc2Dto3D/src/Makefile
src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.c
src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.html
src/Tools/rec3d/mrc2Dto3DforVariation/src/Makefile
src/Tools/rec3d/mrc3Dto2D/src/Makefile
src/Tools/rec3d/mrc3Dto2DFFT/src/Makefile
src/Tools/rec3d/mrcImageCommonLineSearch/src/Makefile
src/Tools/rec3d/mrcImageInverseRadonTransform/src/Makefile
src/Tools/rec3d/mrcImageOrientationSearch/src/Makefile
src/Tools/rec3d/mrcImageOrientationSearch/src/mrcImageOrientationSearch.c
src/Tools/rec3d/mrcImageOrientationSearchByHigherSelection/src/Makefile
src/Tools/rec3d/mrcImageOrientationSearchByHigherSelection/src/mrcImageOrientationSearchByHigherSelection.c
src/Tools/rec3d/mrcImageOrientationSearchByHigherSelection/src/mrcImageOrientationSearchByHigherSelection.html
src/Tools/rec3d/mrcImageOrientationSearchByHybridization/src/Makefile
src/Tools/rec3d/mrcImageOrientationSearchByHybridization/src/mrcImageOrientationSearchByHybridization.c
src/Tools/rec3d/mrcImageOrientationSearchByHybridization/src/mrcImageOrientationSearchByHybridization.html
src/Tools/rec3d/mrcImageOrientationSearchBySimultaneousMinimization/src/Makefile
src/Tools/rec3d/mrcImageOrientationSearchBySimultaneousMinimization/src/mrcImageOrientationSearchBySimultaneousMinimization.c
src/Tools/rec3d/mrcImageOrientationSearchBySimultaneousMinimization/src/mrcImageOrientationSearchBySimultaneousMinimization.html
src/Tools/rec3d/mrcImageRadonTransform/src/Makefile
src/Tools/rec3d/mrcRadon2Dto3D/src/Makefile
src/Tools/rec3d/mrcRadon2Dto3D/src/mrcRadon2Dto3D.c
src/Tools/rec3d/mrcRadon2Dto3D/src/mrcRadon2Dto3D.html
src/Tools/simulation/energyTransferModelCheck/src/Makefile
src/Tools/simulation/energyTransferModelCheck/src/energyTransferModelCheck.c
src/Tools/simulation/energyTransferModelCheck/src/energyTransferModelCheck.html
src/Tools/simulation/energyTransferModelResultCheck/src/Makefile
src/Tools/simulation/muscleSimulation/src/Makefile
src/Tools/simulation/probabilityDensityFunction/src/Makefile
src/Tools/tiffFileUtil/tiffFileInfo/src/Makefile
src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/Makefile
src/Tools/transform/Descartes2Polar/src/Makefile
src/Tools/transform/Polar2Descartes/src/Makefile
src/Tools/transform/pointAffineTransform/src/Makefile
src/Tools/utils/angleMatchTest_k/Makefile
src/Tools/utils/angleMatchTest_k/doc/Makefile [changed from symlink to file mode: 0755]
src/Tools/utils/angleMatchTest_k/src/Makefile
src/Tools/utils/angleMatchTest_k/src/X86MAC64 [new symlink]
src/Tools/utils/angleMatchTest_k/src/angleMatchTest_k.c
src/Tools/utils/angleMatchTest_k/src/angleMatchTest_k.html
src/Tools/utils/angleMatchTest_k/src/argCheck.c
src/Tools/utils/angleMatchTest_k/src/init.c
src/Tools/utils/angleMatchTest_k/src/usage.c
src/Tools/utils/anglediffchk/src/Makefile
src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/Makefile

diff --git a/bin/MachineIndependent b/bin/MachineIndependent
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/mrcImageFilamentSearchResultShow b/bin/mrcImageFilamentSearchResultShow
new file mode 120000 (symlink)
index 0000000..eddb955
--- /dev/null
@@ -0,0 +1 @@
+../sbin/MachineIndependent
\ No newline at end of file
index ddbd17b..c4c3f5a 100644 (file)
@@ -54,6 +54,7 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR
 set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
+set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
 set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
@@ -136,4 +137,3 @@ set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
 set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
-set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 96a6a21..941f5b3 100755 (executable)
@@ -68,7 +68,7 @@ CHGRP  = /bin/chgrp
 DEPENDCOMMAND = gcc $(CCOPT) -E -M
 
 #HOSTDEPENDENTLIB =  -L/usr/cxsoft/lib /usr/lib/libc.a /usr/lib/libisamstub.1 
-HOSTDEPENDENTLIB =  -lm -lc -lnsl -L$(EOS_HOME)/util/$(OSTYPE)/lib -lfftw3f_threads -lfftw3f
+HOSTDEPENDENTLIB =  -lm -lc -lnsl -L$(EOS_HOME)/util/$(OSTYPE)/lib -lfftw3f_threads -lfftw3f -lpthread
 
 # X11 
 #LIBX11         = -L/usr/local/X11R6/lib/ -L/usr/lib64 -L/usr/lib -lXext -lXt -lSM -lICE -lX11 
@@ -262,7 +262,8 @@ INCCUDA = -I$(EOS_HOME)/util/$(OSTYPE)/cuda/inc -I$(EOS_HOME)/util/$(OSTYPE)/cud
 #LIBCUDA = -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -lcudart_static -lcufft
 LIBCUDA = -L/usr/local/cuda/lib64 -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -lcudart_static -lcufft -lpthread -ldl -lrt -lstdc++
 
-HOSTDEPENDENTLIB += $(LIBCUDA)
+#HOSTDEPENDENTLIB += $(LIBCUDA)
+#HOSTDEPENDENTLIB += $(LIBCUDA)
 
 
 
diff --git a/src/Objects/DataExpress/.Source.org b/src/Objects/DataExpress/.Source.org
new file mode 100644 (file)
index 0000000..c941e3d
--- /dev/null
@@ -0,0 +1,11 @@
+SOURCE=\
+Contour \
+TclTk \
+avsFile \
+eosAlsa \
+eosOpenGL \
+eosRuby \
+gifFile \
+pngFile \
+psFile \
+#LastSource
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index a2d0485..44376ac 100755 (executable)
@@ -19,7 +19,7 @@ static char __sccs_id[] = "%Z%tkctfInfo ver%I%; Date:%D% %Z%";
 #undef DEBUG2
 #include "genUtil.h"
 #include <tk.h>
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "tkctfInfo.h"
 #include "ctfZeroPoint.h"
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index c7a5bb5..84b5bfb 100755 (executable)
@@ -76,7 +76,7 @@ lmrc2gif(char* out, mrcImage* mrc, ColorMapObject* ColorMap, long mode)
        }
        
        DEBUGPRINT("Close-Start");
-       if(EGifCloseFile(GifFile) == GIF_ERROR) {
+       if(EGifCloseFile(GifFile, NULL) == GIF_ERROR) {
                free((char *) ScanLine);
                return HandleGifError(GifFile);
        }
@@ -187,7 +187,7 @@ lmrc2gifColor(char* out, mrcImage* r, mrcImage* g, mrcImage* b, ColorMapObject*
                GifQprintf("\b\b\b\b%-4d", i);
        }
        DEBUGPRINT("Close");    
-       if(EGifCloseFile(GifFile) == GIF_ERROR) {
+       if(EGifCloseFile(GifFile, NULL) == GIF_ERROR) {
                free((char *) ScanLine);
                return HandleGifError(GifFile);
        }
@@ -199,7 +199,7 @@ int HandleGifError(GifFileType *GifFile)
 {
        int i = GifLastError();
        
-       if (EGifCloseFile(GifFile) == GIF_ERROR) {
+       if (EGifCloseFile(GifFile, NULL) == GIF_ERROR) {
                GifLastError();
        }
        return i;
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
diff --git a/src/Objects/DataManip/.Source.org b/src/Objects/DataManip/.Source.org
new file mode 100644 (file)
index 0000000..8c4a3e7
--- /dev/null
@@ -0,0 +1,25 @@
+SOURCE=\
+DCDFile \
+IMAGIC \
+bildFile \
+bmpFile \
+ctfInfo \
+ctfforBayes \
+dmFile \
+dsn6File \
+emData \
+eosMATH \
+eosStarFile \
+khorosData \
+largeIP \
+llData \
+ltlgData \
+mapFile \
+mrcImage \
+mrcImageShape \
+pdbFile \
+rigakuImage \
+simulation \
+tgaFile \
+transform \
+#LastSource
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 0c74b2d..4e499f6 100644 (file)
@@ -11,7 +11,7 @@
 */
 static char __sccs_id[] = "%Z%eosBessel ver%I%; Date:%D% %Z%";
 
-#include "../inc/eosMATH.h"
+#include "../inc/eosMath.h"
 
 double
 eosBessel_I(double x, int n)
index ffd575c..b5d0a3f 100644 (file)
@@ -3,6 +3,13 @@
 <H2>Information from source codes</H2>
 </A>
 <PRE>
+../src/eosStarFileDataGet.c:
+
+../src/eosStarFileLoopDataGet.c:
+
+../src/eosStarFileRead.c:
+
+../src/eosStarFileWrite.c:
 </PRE>
 <HR>
 <A NAME="include">
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index 030c1e5..bec1425 100755 (executable)
@@ -14,7 +14,7 @@ LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so
 LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
 
-DSTDIR=../../../../../lib/$(OSTYPE)/
+DSTDIR=$(EOS_HOME)/lib/$(OSTYPE)/
 SOURCE=$(OSTYPE)/.Source
 ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
 
@@ -164,7 +164,7 @@ $(DSTDIR)/$(LIBNAME): static-lib
 $(DSTDIR)/$(LIBNAMEDEBUG): debug 
        @echo Installing lib: $(LIBNAMEDEBUG)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) $(DSTDIR)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        @echo Link EosObjects
        @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
@@ -183,7 +183,7 @@ $(DSTDIR)/$(LIBNAMEDEBUG): debug
 $(DSTDIR)/$(SHAREDLIB): shared-lib
        @echo Installing lib: $(SHAREDLIB)
        @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
-       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) $(DSTDIR)
        @echo LIBNAME:$(SHAREDLIB)
        @echo Link EosObjects
        @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index ee2bc8b..510aea1 100644 (file)
@@ -7,3 +7,8 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 0bd2ebb..3d1cbd9 100755 (executable)
@@ -32,14 +32,22 @@ check:
                echo making directory; \
                mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
        fi
-       @if [ ! -L src/$(OSTYPE) ]; then \
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; make depend
+
+update:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
                echo making directory; \
-               ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); \
+               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
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; echo "Y" | make update      
 
 cvsupdate::
        cvs -d $(EOS_CVSROOT) update -d 
deleted file mode 120000 (symlink)
index 79f84d0a805118317ff88a7e8d2bec1a8157714f..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-/home/people/yukari/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..8215199e1b812b793f7b4d14ffc255baef0373dc
--- /dev/null
@@ -0,0 +1,2 @@
+install:
+       cd ../src; make install-doc; cd ../doc  
index dd44d0d..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -210,18 +210,20 @@ 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 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) ]; \
+       @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
-       @$(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE)
-       @$(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @$(CHGRP) Eos $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
        @echo ---- end of bin
 
 install-wish:
@@ -236,7 +238,6 @@ install-wish:
                $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/*  ;\
                touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
                $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
-               $(CHGRP) Eos $(DSTDIR)/wish/$(OBJECTNAME)/*;\
                echo "---- Tcl/Tk file Installed";\
        fi
 
@@ -250,7 +251,6 @@ install-ruby:
                fi ; \
                $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
                echo "---- Ruby/Tk file Installed"; \
        fi
 
@@ -264,7 +264,6 @@ install-perl:
                fi; \
                $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
                echo "---- Perl/Tk file Installed"; \
        fi
 
@@ -282,7 +281,6 @@ install-shell:
                fi ; \
                $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
-               $(CHGRP) Eos $(DSTDIR)/shell/$(OBJECTNAME)/*; \
                echo "---- Shell file Installed"; \
        fi
 
@@ -309,7 +307,6 @@ install-khoros:
                                $(RM) -f $(OBJECTNAME).pane ; \
                                $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
                                $(CD) ../../ ; \
-                               $(CHGRP) -R Eos $(OBJECTNAME); \
                                $(CHMOD) -R 555 $(OBJECTNAME); \
                        else \
                                echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
@@ -360,12 +357,13 @@ depend::
        @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 ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
        fi
        #echo CC
        @if [ -f $(OBJECTNAME).cc ] ; \
@@ -390,6 +388,9 @@ depend::
 update:../Config/OptionControlFile
        maketool $(CLASSNAME) $(OBJECTNAME) update
 
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
 changeName::
 
 Test:$(OSTYPE)/$(OBJECTNAME) TestDir
@@ -425,5 +426,5 @@ tar::
                                                             ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
                                ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
 
-include $(OSTYPE)/.Depend
-include ../Config/Target.inc
+-include $(OSTYPE)/.Depend
+-include ../Config/Target.inc
index 6e57b54..2353c18 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -12,7 +12,7 @@
 void
 argCheck(dcdTestInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
     FILE* fpt;
     
index f60affb..478ebbb 100755 (executable)
@@ -1 +1,18 @@
-/bin/bash: dcdTest: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>dcdTest</TITLE>
+</HEAD>
+<BODY>
+<H1>dcdTest</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: dcdTest
+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 1f15364..b79d460 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -25,7 +25,7 @@ init1(dcdTestInfo* info)
     int i;
     if(!info->flagIn) {
         stringGetFromFile(s, "In", stdin, stdout, 0);
-        info->In = stringGetNthWord(s, 1, " ,");
+        info->In = stringGetNthWord(s, 1, " ,\t");
         info->flagIn++;
     }
     if(info->flagIn) {
@@ -34,7 +34,7 @@ init1(dcdTestInfo* info)
     
     if(!info->flagOut) {
         stringGetFromFile(s, "Out", stdin, stdout, 0);
-        info->Out = stringGetNthWord(s, 1, " ,");
+        info->Out = stringGetNthWord(s, 1, " ,\t");
         info->flagOut++;
     }
     if(info->flagOut) {
index 66a914c..c3e4fc6 100755 (executable)
@@ -7,10 +7,10 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-i[nput]            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();
 }
 
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 3cbba8f..6176317 100755 (executable)
@@ -22,7 +22,7 @@
 #include "genUtil.h"
 #include "Memory.h"
 #include "File.h"
-#include "String.h"
+#include "eosString.h"
 #include "tgaFile.h"
 
 
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 4b45573..59026b8 100755 (executable)
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> refs/remotes/origin/master
 <HTML>
 <HEAD>
 <TITLE>imagesView</TITLE>
@@ -21,9 +17,3 @@ This command for viewing images with a suffix
 </PRE>
 </BODY>
 </HTML>
-<<<<<<< HEAD
-=======
-=======
-/bin/bash: imagesView: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index d2cc7b3..2328ce9 100755 (executable)
@@ -22,7 +22,7 @@
 #define DEBUG
 #include "genUtil.h"
 #include "ctfDeterminationByBayes.h"
-#include "String.h"
+#include "eosString.h"
 
 /*
 Example:
index 2a577e2..bd25cc6 100755 (executable)
@@ -1 +1,29 @@
-/bin/bash: ctfDeterminationByBayes: そのようなファイルやディレクトリはありません
+<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 a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 9de63c8..cad6a26 100755 (executable)
@@ -18,7 +18,7 @@ static char __sccs_id[] = "%Z%ctfMultiFunction ver%I%; Date:%D% %Z%";
 #include "../inc/config.h"
 
 #define DEBUG
-#include "String.h"
+#include "eosString.h"
 #include "genUtil.h"
 #define SECTION_MARK " \t,"
 #include "Memory.h"
index dfcf7b2..d5a740d 100755 (executable)
@@ -1 +1,29 @@
-/bin/bash: ctfMultiFunction: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>ctfMultiFunction</TITLE>
+</HEAD>
+<BODY>
+<H1>ctfMultiFunction</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: ctfMultiFunction
+Options:
+    [-I[nput array of file]In                  (NULL      ).as(inFileListNoOpen    ) ] :Optional  :InputDataFiles
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-Rmax               Rmax                (0.1       ).as(Real                ) ] :Optional  :Rmax[/A]
+    [-dR                 dR                  (0.0001    ).as(Real                ) ] :Optional  :dR[/A]
+    [-Ain                Ain                 (0.02      ).as(Real                ) ] :Optional  :IlluminationAperture[mrad]
+    [-ctfMode            ctfMode             (33        ).as(Integer             ) ] :Optional  :CTFMode
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+>>>> ctfMode <<<< 
+ 0: Phase CTF 
+ 1: PhaseCTF + ratio*AmpCTF 
+ 32: EnvFromAillumination*()
+>>>> File Format <<<< 
+Defocus[A] Cs[mm] AccV[kV] AmplitudeContrast 
+Info file was made by llExtractWithLayerSeparationFilamentInfo -oI 
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 59b009c..7b1b148 100755 (executable)
@@ -23,7 +23,7 @@
 #include "Memory.h"
 #include "mrcImage.h"
 #include "File.h"
-#include "String.h"
+#include "eosString.h"
 #include "lmrcImageROI2D.h"
 #include "lmrcImageMontage.h"
 
index bde86d9..b07e8c2 100755 (executable)
@@ -1 +1,20 @@
-/bin/bash: tiltInfoDetermine: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>tiltInfoDetermine</TITLE>
+</HEAD>
+<BODY>
+<H1>tiltInfoDetermine</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: tiltInfoDetermine
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-defocusIn[put]     defocus             (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
+    [-M[ag]              mag                 (2.4       ).as(Real                ) ] :Optional  :Mag
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 4ffa918..a7725f6 100755 (executable)
@@ -17,7 +17,7 @@
 
 #define DEBUG
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "eosBayes.h"
 
 /*
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index e3dd170..08e5d70 100755 (executable)
@@ -20,7 +20,7 @@ static char __sccs_id[] = "%Z%moi2mrc ver%I%; Date:%D% %Z%";
 #include "genUtil.h"
 #include "Memory.h"
 #include "File.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 
 typedef int            MedOpticsInteger;
index d70e306..8aa370f 100755 (executable)
@@ -1 +1,24 @@
-/bin/bash: moi2mrc: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>moi2mrc</TITLE>
+</HEAD>
+<BODY>
+<H1>moi2mrc</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: moi2mrc
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-Mag[nification]    Mag                 (150       ).as(Real                ) ] :Optional  :Magnification[xk]:
+    [-Mag2[nification]   Mag2                (1.64      ).as(Real                ) ] :Optional  :Magnification[CCD/Film]
+    [-ADUperE            ADUperE             (20        ).as(Real                ) ] :Optional  :[ADU/electron]
+    [-info               Info                (1         ).as(Integer             ) ] :Optional  :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (1         ).as(Integer             ) ] :Optional  :Mode: 0:char(mean+-3sd) 1:short(direct) 2:float(e-)
+----- Additional Usage -----
+>>>> -info Integer
+ 1: All Header Info List 
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 3c1999d..e48e3cc 100755 (executable)
@@ -19,7 +19,7 @@ static char __sccs_id[] = "%Z%mrc2pov ver%I%; Date:%D% %Z%";
 
 #define DEBUG
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "mrcImage.h"
 /*
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index e6beaa6..ffef9b4 100755 (executable)
@@ -16,7 +16,7 @@ static char __sccs_id[] = "%Z%khorosFilterGenerate ver%I%; Date:%D% %Z%";
 #include <math.h>                  
 #define GLOBAL_DECLARATION
 #include "../inc/config.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 #include "khorosData.h"
 #include "kapputils/kapputils.h"
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 1eadbcd..b09a343 100755 (executable)
@@ -108,7 +108,7 @@ additionalUsage()
 }
 
 #include <stdio.h>
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 void
 configFileRead(FILE* fpt, llDataAxisSearchInfo* info)
@@ -217,7 +217,7 @@ configFileRead(FILE* fpt, llDataAxisSearchInfo* info)
     
 }
 #include <stdio.h>
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 void
 configFileUsage(FILE* fpt)
index 8410b65..99794ea 100755 (executable)
@@ -1 +1,50 @@
-/bin/bash: llDataAxisSearch: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>llDataAxisSearch</TITLE>
+</HEAD>
+<BODY>
+<H1>llDataAxisSearch</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: llDataAxisSearch
+Options:
+    [-i1[nput]           In1                 (NULL      ).as(inFile              ) ] :Optional  :In: NearSide
+    [-i2[nput]           In2                 (NULL      ).as(inFile              ) ] :Optional  :In: FarSide
+    [-o1[utput]          Out1                (NULL      ).as(outFile             ) ] :Optional  :Out: NearSide
+    [-o2[utput]          Out2                (NULL      ).as(outFile             ) ] :Optional  :Out: FarSide
+    [-a[verage]          Avg                 (NULL      ).as(outFile             ) ] :Optional  :Out: Average
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :Out: FitParam
+    [-op2[utput]         OutP2               (NULL      ).as(outFile             ) ] :Optional  :OutParam2: FitParam Distribution [mrcImage]
+    [-t[ruePitch]        truePitch           (0.0       ).as(Real                ) ] :Optional  :TruePitch[A]
+    [-l[ayer]            L                   (NULL      ).as(inFile              ) ] :Optional  :LayerInfo
+    [-O[mega]            Omin                (0.0       ).as(Real                ) 
+                         Omax                (0.0       ).as(Real                ) 
+                         Odelta              (1.0       ).as(Real                ) ] :Optional  :Omega[degree]
+    [-x[shift]           xmin                (-10.0     ).as(Real                ) 
+                         xmax                (10.0      ).as(Real                ) 
+                         xdelta              (0.1       ).as(Real                ) ] :Optional  :shiftx[A]
+    [-R                  R                   (10.0      ).as(Real                ) ] :Optional  :Resolution[A]
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+----- Layer Line Information File ----- 
+L N Weight
+..........
+
+----- Control File -----
+In1[inFile:NULL]                               #In: NearSide
+In2[inFile:NULL]                               #In: FarSide
+Out1[outFile:NULL]                             #Out: NearSide
+Out2[outFile:NULL]                             #Out: FarSide
+Avg[outFile:NULL]                              #Out: Average
+Out[outFile:NULL]                              #Out: FitParam
+truePitch[Real:NULL]                           #TruePitch[A]
+L[inFile:NULL]                         #LayerInfo
+Omin[Real:0.0] Omax[Real:0.0]  Odelta[Real:1.0]                                #Omega[degree]
+xmin[Real:-10.0]       xmax[Real:10.0] xdelta[Real:0.1]                                #shiftx[A]
+R[Real:10.0]                           #Resolution[A]
+mode[Integer:0]                                #Mode
+----- Inside Axis Search Parameter File -----
+info.In1, info.In2, paraFit.Para.R*DEGREE, paraFit.Para.x.Value, paraFit.Para.Omega.Value
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 7fa5253..d5a7410 100755 (executable)
@@ -17,7 +17,7 @@ static char __sccs_id[] = "%Z%llDataCTFCompensate ver%I%; Date:%D% %Z%";
 #define GLOBAL_DECLARATION
 #include "../inc/config.h"
 #include "llData.h"
-#include "String.h"
+#include "eosString.h"
 #include "genUtil.h"
 #include "ctfInfo.h"
 #define SECTION_MARK " \t,"
index 647830e..b8e367c 100755 (executable)
@@ -1 +1,35 @@
-/bin/bash: llDataCTFCompensate: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>llDataCTFCompensate</TITLE>
+</HEAD>
+<BODY>
+<H1>llDataCTFCompensate</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: llDataCTFCompensate
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-I[nput]            In1                 (NULL      ).as(inFile              ) ] :Optional  :InputCTFInformation
+    [-I2[nput]           In2                 (NULL      ).as(inFile              ) ] :Optional  :InputCTFInformation2
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-t[ruePitch]        truePitch           (430.0     ).as(Real                ) ] :Essential :truePitch[A]
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+----- CTFInformation file 1 -----
+RR0 F0 PHI0   : If R.lt.RR0, F0=0; If RR0.le.R.lt.RR1, Linear Interpolation F0, F1
+RR1 F1 PHI1   : If RR1.le.R <RR2,
+.................................................
+RRn Fn PHIn   : If RRn<= R     , F*0     PHI = 0
+----- Control File -----
+In[inFile:NULL]                                #InputDataFile
+In1[inFile:NULL]                               #InputCTFInformation
+Out[outFile:NULL]                              #OutputDataFile
+truePitch[Real:100.0]                          #truePitch[A]
+mode[Integer:0]                                #Mode
+----- CTFInformation file 2 -----
+dF[A] Cs[mm] Acc[kV] ratioOfAmpToPhase
+----- How to make file 1 or file 2 -----
+llExtractCtfinfFileCreate make these files.
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 8bc76fa..c313796 100755 (executable)
@@ -18,7 +18,7 @@ static char __sccs_id[] = "%Z%llDataMultiCTFCompensation ver%I%; Date:%D% %Z%";
 #define DEBUG
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "../inc/config.h"
 #include "llData.h"
 #include "ctfInfo.h"
index 17ee693..03ec028 100755 (executable)
@@ -1 +1,42 @@
-/bin/bash: llDataMultiCTFCompensation: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>llDataMultiCTFCompensation</TITLE>
+</HEAD>
+<BODY>
+<H1>llDataMultiCTFCompensation</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: llDataMultiCTFCompensation
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFileList          ) ] :Essential :Input: FileList
+    [-M[odel]            Ref                 (NULL      ).as(inFile              ) ] :Essential :Input: Model Data
+    [-l[ayerLine]        llInfo              (NULL      ).as(inFile              ) ] :Essential :Input: Layer Line Information
+    [-A[verageFile]      Ave                 (NULL      ).as(outFile             ) ] :Essential :Output: AverageFile
+    [-o[utput]           OutParam            (NULL      ).as(appendFile          ) ] :Optional  :Output: FittedParameter
+    [-O[utput]           Out                 (NULL      ).as(outFileList         ) ] :Optional  :Output: FileList:  PhaseShift of Each Filament
+    [-o2[utput]          OutParam2           (NULL      ).as(outFileList         ) ] :Optional  :Output: [phi, z] map
+    [-P2[output]         OutParamP2          (NULL      ).as(outFile             ) ] :Optional  :Output: For P-P' 
+    [-N[oise]            Noise               (0.0       ).as(Real                ) ] :Optional  :Noise Ratio
+    [-t[ruePitch]        truePitch           (761.4     ).as(Real                ) ] :Essential :truePitch[A]
+    [-d[eltaR]           deltaR              (1.0       ).as(Real                ) ] :Optional  :deltaR[A]
+    [-r[adial]           rmin                (1.0       ).as(Real                ) 
+                         rmax                (1.0       ).as(Real                ) 
+                         dr                  (1.0       ).as(Real                ) ] :Optional  :Radial[Ratio]
+    [-p[hi]              phimin              (0.0       ).as(Real                ) 
+                         phimax              (180.0     ).as(Real                ) 
+                         dphi                (1.0       ).as(Real                ) ] :Optional  :Phi [degree]
+    [-z[shift]           zmin                (0.0       ).as(Real                ) 
+                         zmax                (180.0     ).as(Real                ) 
+                         dz                  (1.0       ).as(Real                ) ] :Optional  :z [A]
+    [-Rmax               Rmax                (0.1       ).as(Real                ) ] :Optional  :Rmax [/A]
+    [-MaxIter[ation]     MaxIter             (1         ).as(Integer             ) ] :Optional  :MaxIteration
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+---- InputFileFormat ----
+filename weight(NumberOfAveragedFile) deltaF[A] Cs[mm] kV[kV] ratioOfAmpToPhase
+----- Mode -----
+    0: |CTFi|/Sigma(SQR(CTFi))
+    1:  CTFi /Sigma(SQR(CTFi))
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 19fe97f..9aece68 100755 (executable)
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> refs/remotes/origin/master
 <HTML>
 <HEAD>
 <TITLE>llDataPrint</TITLE>
@@ -24,9 +20,3 @@ Options:
 </PRE>
 </BODY>
 </HTML>
-<<<<<<< HEAD
-=======
-=======
-/bin/bash: llDataPrint: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index c25fefe..92da754 100755 (executable)
@@ -19,7 +19,7 @@ static char __sccs_id[] = "%Z%llDataSeparate ver%I%; Date:%D% %Z%";
 
 #define DEBUG
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "Memory.h"
 #include "mrcImage.h"
 #include "llData.h"
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index bdbda2a..aaa6103 100755 (executable)
@@ -1 +1,29 @@
-/bin/bash: matrix3DEulerAngleTransform: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>matrix3DEulerAngleTransform</TITLE>
+</HEAD>
+<BODY>
+<H1>matrix3DEulerAngleTransform</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: matrix3DEulerAngleTransform
+Options:
+    [-i[nputlist]        In                  (NULL      ).as(inFileListNoOpen    ) ] :Essential :InputDataFileList
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-R[otationalMode]   RotationalMode      (ZONS      ).as(String              ) ] :Optional  :RotationalMode
+    [-M[ultiplyEulerAngle]RotMode             (ZONS      ).as(String              ) 
+                         Rot1                (0.0       ).as(Real                ) 
+                         Rot2                (0.0       ).as(Real                ) 
+                         Rot3                (0.0       ).as(Real                ) ] :Optional  :M * input
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+
+----- input file format -----
+ filename rotationalMode phi theta psi
+    .          .          .    .    . 
+    .          .          .    .    . 
+    .          .          .    .    . 
+
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 42aeae9..a03479c 100755 (executable)
@@ -1 +1,22 @@
-/bin/bash: matrix3DFromEulerAngle: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>matrix3DFromEulerAngle</TITLE>
+</HEAD>
+<BODY>
+<H1>matrix3DFromEulerAngle</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: matrix3DFromEulerAngle
+Options:
+    [-i[nput]            In                  (stdin     ).as(inFile              ) ] :Optional  :InputDataFile
+    [-R[ot]              EMode               (ZONS      ).as(String              ) 
+                         Rot1                (0.0       ).as(Real                ) 
+                         Rot2                (0.0       ).as(Real                ) 
+                         Rot3                (0.0       ).as(Real                ) ] :Optional  :Input: RotAngle[degree]
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Optional  :Output: Matrix
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 32ee9ad..1980dd6 100755 (executable)
@@ -19,7 +19,7 @@
 #include "genUtil.h"
 #include "Matrix3D.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 
 /*
 Example:
index 6d2cf46..17b6c97 100755 (executable)
@@ -1 +1,18 @@
-/bin/bash: matrix3DInverse: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>matrix3DInverse</TITLE>
+</HEAD>
+<BODY>
+<H1>matrix3DInverse</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: matrix3DInverse
+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 a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 52ea617..89b51ff 100644 (file)
@@ -120,7 +120,6 @@ mrcImageFFT \
 mrcImageFFTLayerLineExtraction \
 mrcImageFFTSetsExtract \
 mrcImageFOMCalc \
-mrcImageFOMCalc.org \
 mrcImageFeatureCalc \
 mrcImageFeatureExtraction \
 mrcImageFilamentSearch \
index 52ea617..89b51ff 100644 (file)
@@ -120,7 +120,6 @@ mrcImageFFT \
 mrcImageFFTLayerLineExtraction \
 mrcImageFFTSetsExtract \
 mrcImageFOMCalc \
-mrcImageFOMCalc.org \
 mrcImageFeatureCalc \
 mrcImageFeatureExtraction \
 mrcImageFilamentSearch \
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index b052d69..ac1c605 100755 (executable)
@@ -6,7 +6,7 @@
 #include "../inc/config.h"
 #include "mrcImage.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 
 #define SQR(x) ((x)*(x))
 #define SECTION_MARK " ,"
index 2ab5ff1..d038e2e 100755 (executable)
@@ -1 +1,23 @@
-/bin/bash: mrcFFTCTFCompensation: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcFFTCTFCompensation</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcFFTCTFCompensation</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcFFTCTFCompensation
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-I[nputWeight]      CTFIn               (NULL      ).as(inFile              ) ] :Essential :InputWeightFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+>>> CTFWeigting File
+RR0 F0 : If R<RR0, Weight=0. If RR0<=R<RR1,  Weight={(RR1-R)*F0+(R-RR0)*F1}/(RR1-RR0), i.e., Linear Interpolation
+RR1 F1 : 
+...................................
+RRn Fn : If RRn<=R, Fn
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index bcfe036..2b0d4e0 100755 (executable)
@@ -17,7 +17,7 @@
 
 #define DEBUG
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "lmrcFFTCentralSection.h"
 
 int
index c14006e..6d580c4 100755 (executable)
@@ -1 +1,27 @@
-/bin/bash: mrcFFTCentralSection: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcFFTCentralSection</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcFFTCentralSection</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcFFTCentralSection
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: mrc(3D)
+    [-t[emplate]         Template            (NULL      ).as(inFile::mrcImage    ) ] :Optional  :Input: mrcFFT(2D)
+    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output: mrcFFT(2D)
+    [-o[utput]I[mage]    OutImage            (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output: mrcImage(2D)
+    [-E[uler]A[ngle]     EAMode              (YOYS      ).as(String              ) 
+                         Rot1                (0.0       ).as(Real                ) 
+                         Rot2                (0.0       ).as(Real                ) 
+                         Rot3                (0.0       ).as(Real                ) ] :Optional  :EulerAngle
+    [-trans[late]        TransX              (0.0       ).as(Real                ) 
+                         TransY              (0.0       ).as(Real                ) ] :Optional  :Traslation(2D)
+    [-InterpMode         InterpMode          (0         ).as(Integer             ) ] :Optional  :Interpolation Mode
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+-t[emplate] : If not set, the size of out (Nx, Ny) is set as the size of in (Nx, Ny).</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index d9db825..9f687f9 100755 (executable)
@@ -1 +1,26 @@
-/bin/bash: mrcFFTCentralSectionCompare: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcFFTCentralSectionCompare</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcFFTCentralSectionCompare</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcFFTCentralSectionCompare
+Options:
+    [-i[nput]            In2D                (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: 2D(FFT)
+    [-i[nput]3d          In3D                (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: 3D(FFT)
+    [-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: EulerAngle
+    [-trans[late]        TransX              (0.0       ).as(Real                ) 
+                         TransY              (0.0       ).as(Real                ) ] :Optional  :Input: Translation
+    [-InterpMode         InterpMode          (0         ).as(Integer             ) ] :Optional  :Interpolation Mode
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Optional  :Output:Likelihood
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a0bacd3..2e32d66 100755 (executable)
@@ -21,7 +21,7 @@ static char __sccs_id[] = "%Z%mrcFFTIQEstimation ver%I%; Date:%D% %Z%";
 #include "genUtil.h"
 #include "File.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 
 
index 11ccdd9..9682e90 100755 (executable)
@@ -1 +1,20 @@
-/bin/bash: mrcFFTIQEstimation: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcFFTIQEstimation</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcFFTIQEstimation</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcFFTIQEstimation
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input: MRC
+    [-sp[otList]         SpotList            (stdin     ).as(inFile              ) ] :Essential :Input: SpotList: X Y Z
+    [-radius             radius              (3         ).as(Integer             ) ] :Optional  :Input: [pixel]
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output: ASCII
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 19c6d1b..70e678e 100755 (executable)
@@ -18,7 +18,7 @@ static char __sccs_id[] = "@(#)mrcImageCTFCompensation ver1.1; Date:96/05/28 @(#
 #define GLOBAL_DECLARATION
 #include "../inc/config.h"
 #define DEBUG 
-#include "String.h"
+#include "eosString.h"
 #include "Memory.h"
 #include "genUtil.h"
 #define SECTION_MARK " \t"
index 86248a8..62f9711 100755 (executable)
@@ -1 +1,48 @@
-/bin/bash: mrcImageCTFCompensation: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageCTFCompensation</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageCTFCompensation</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageCTFCompensation
+Options:
+    [-i[nput]            In                  (stdin     ).as(inFile              ) ] :Essential :InputFile
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Essential :OutputDataFile
+    [-info[mation]       Info                (NULL      ).as(inFile              ) ] :Optional  :InformationFile(Essense only)
+    [-info[mation]2      Info2               (NULL      ).as(inFile              ) ] :Optional  :InformationFile2(Display2 ctfinfo format)
+    [-kV                 kV                  (200       ).as(Real                ) ] :Optional  :AccVol[kV]
+    [-Cs                 Cs                  (2.1       ).as(Real                ) ] :Optional  :Cs[mm]
+    [-df                 Defocus             (27000     ).as(Real                ) ] :Optional  :Defocus[A]:under(+)
+    [-white              WhiteNoise          (0.1       ).as(Real                ) ] :Optional  :WhiteNoise(N/S)
+    [-whiteRaise         WhiteNoiseRaising   (0.1       ).as(Real                ) ] :Optional  :WhiteNoiseRaising(A)
+    [-SinWin             SinWinRmin          (0.1       ).as(Real                ) 
+                         SinWinRmax          (1.0       ).as(Real                ) ] :Optional  :Windowing by sine function from Rmin[/A] to Rmax[/A].Default: No Window.
+    [-A[mplitude contrast]Amp                 (0.1       ).as(Real                ) ] :Optional  :The ratio of amplitude contrast to phase contrast
+    [-Astig[matism]      dfMin               (0         ).as(Real                ) 
+                         dfMax               (0         ).as(Real                ) 
+                         asAxis              (0         ).as(Real                ) ] :Optional  :With Astigmatism
+    [-NoAstig[matism]                                                              ] :Optional  :Without Astigmatism
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- mode -----
+mode 0: No Correction
+mode 1: x ctf/|ctf|, phase flipping
+mode 2: x ctf,       phase flipping and ctf-multiplying
+mode 3: x 1/ctf    (0.1<|ctf|       phase flipping and ctf-divided
+mode 4: x ctf/(SQR(ctf)+SQR(NS))    phase-flipping + Winner Filtering 
+mode 5: x SQR(ctf) x ctf/|ctf|      phase-flipping + ctf-Weighted
+mode 6: x 1/|ctf|  (0.1<|ctf|)      No phase-flipping + ctf-divided
+mode 7: x |ctf|/(SQR(ctf)+SQR(NS))  No phase flipping + Winner Filtering 
+mode 8: x  ctf /(SQR(ctf)+SQR(NS*exp(a*R)))  phase flipping + Winner Filtering + NS-raising 
+mode 9: x |ctf|/(SQR(ctf)+SQR(NS*exp(a*R)))  No phase flipping + Winner Filtering + NS-raising 
+----- Note -----
+You can enter information from -info
+Info file was made by llExtractWithLayerSeparationFilamentInfo -oI 
+defocus Cs kV AmplitudeContrast
+----- Note1 -----
+-NoStig is the highest priority and so -Astig and parameters in -info2 are ignored.
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index e443751..4b9e574 100755 (executable)
@@ -1 +1,20 @@
-/bin/bash: mrcImageCTFCompensationForTiltImage: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageCTFCompensationForTiltImage</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageCTFCompensationForTiltImage</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageCTFCompensationForTiltImage
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-I[nformation]      Info                (NULL      ).as(inFile              ) ] :Essential :Infomation
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [cut[Back]           cut                 (6         ).as(Integer             ) ] :Optional  :Cut
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 4978684..66d3381 100755 (executable)
@@ -1,38 +1 @@
-<<<<<<< HEAD
 /bin/bash: mrcImageConvolution: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-<HTML>
-<HEAD>
-<TITLE>mrcImageConvolution</TITLE>
-</HEAD>
-<BODY>
-<H1>mrcImageConvolution</H1>
-<H2>Usage</H2>
-<PRE>
-Usage: mrcImageConvolution
-Options:
-    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input: mrcImage
-    [-i[nput]k[ernal]a[rray]InKernelArray       (NULL      ).as(inFile              ) ] :Optional  :Input: Array
-    [-i[nput]k[ernal]m[rc]InKernelMRC         (NULL      ).as(inFile              ) ] :Optional  :Input: mrcImage
-    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
-    [-times              times               (1         ).as(Integer             ) ] :Optional  :Repeat time
-    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
------ Additional Usage -----
->>> Array Format under Eos. 'nvalue' indicates the number of values in one line, in usual case, nvalue=N0. If so, you need not define nvalue.<<<<
-ndim N0 N1 N2 ... [nvalue]
-data(0,   0,   0,...,        0) data(1,   0,   0,...,        0) data(2,   0,   0,...,        0) ... data(N0-1,   0,   0,...,        0)
-data(0,   1,   0,...,        0) data(1,   1,   0,...,        0) data(2,   1,   0,...,        0) ... data(N0-1,   1,   0,...,        0)
-..............................................................
-data(0,N1-1,   0,...,        0) data(1,N1-1,   0,...,        0) data(2,N1-1,   0,...,        0) ... data(N0-1,N1-1,   0,...,        0)
-data(0,   0,   1,...,        0) data(1,   0,   1,...,        0) data(2,   0,   1,...,        0) ... data(N0-1,   0,   1,...,        0)
-..............................................................
-data(0,N1-1,N2-1,...,Nndim-1-1) data(1,N1-1,N2-1,...,Nndim-1-1) data(2,N1-1,N2-1,...,Nndim-1-1) ... data(N0-1,N1-1,N2-1,...,Nndim-1-1)
-</PRE>
-</BODY>
-</HTML>
-=======
-/bin/bash: mrcImageConvolution: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index c636213..bbe4efe 100755 (executable)
@@ -17,7 +17,7 @@
 
 #define DEBUG
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "Memory.h"
 #include "mrcImage.h"
 #include "nr2.h"
index 58ccbbd..98c00ae 100755 (executable)
@@ -1 +1,36 @@
-/bin/bash: mrcImageCoreImageCalc: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageCoreImageCalc</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageCoreImageCalc</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageCoreImageCalc
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input: Pretreated Core-loss Image
+    [-e[neryg]l[oss]     EL                  (180       ).as(Real                ) ] :Essential :Input: EnergyLoss
+    [-bg[List]           BG                  (NULL      ).as(inFileList          ) ] :Essential :Input: Bg File List
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output: Core-Loss Image
+    [-O[utputBG]         OutBG               (NULL      ).as(outFile             ) ] :Optional  :Output: BG-Image
+    [-Chi[sq]            OutChi              (NULL      ).as(outFile             ) ] :Optional  :Output: Chi-Image
+    [-initial[Value]     A1                  (5040      ).as(Real                ) 
+                         A2                  (500       ).as(Real                ) 
+                         A3                  (-12       ).as(Real                ) ] :Optional  :Input: A1 + A2*EELS^A3
+    [-limitA3            LimitA3Min          (-16       ).as(Real                ) 
+                         LimitA3Max          (-5        ).as(Real                ) ] :Optional  :Input: limit A3
+    [-baseEELS           BaseEELS            (160.0     ).as(Real                ) ] :Optional  :Input: BaseEELS as 1.0
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+>>> BGFile List 
+FileName1 EEL
+FileName2 EEL
+AAA       160
+BBB       170
+>>> Mode 
+Mode 0: Multi Window Method 
+        Need more than three pre- and post- edge images to calculate background
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 8b94874..63b17c4 100755 (executable)
@@ -18,7 +18,7 @@
 #undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 
 typedef struct lmrcImageEdgeImageGetInfo {
index cb09c33..4af7482 100755 (executable)
@@ -1 +1,22 @@
-/bin/bash: mrcImageEdgeImageGet: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageEdgeImageGet</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageEdgeImageGet</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageEdgeImageGet
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input: mrcImage
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :Output: mrcImage
+    [-s[ize]             Size                (64        ).as(Integer             ) ] :Optional  :Size: [pixel]
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+mode: 
+       0: 4 Edge (x-y plane) from Image(0-3)
+       1: 8 Edge (x-y plane) + centre from Image(0-8)
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index b5a862e..a6d3183 100755 (executable)
@@ -19,7 +19,7 @@ static char __sccs_id[] = "%Z%mrcImageFFTLayerLineExtraction ver%I%; Date:%D% %Z
 
 #define DEBUG
 #define UNDEBUG2
-#include "String.h"
+#include "eosString.h"
 #include "genUtil.h"
 #define SECTION_MARK " \t,"
 #include "mrcImage.h"
index 61f6369..79a9c6d 100755 (executable)
@@ -1 +1,24 @@
-/bin/bash: mrcImageFFTLayerLineExtraction: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageFFTLayerLineExtraction</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageFFTLayerLineExtraction</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageFFTLayerLineExtraction
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-[input] I[nformation]InI                 (NULL      ).as(inFile              ) ] :Optional  :InputDataFile
+    [-truePitch          truePitch           (430       ).as(Real                ) ] :Optional  :true Pitch [A]
+    [-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 -----
+Input File Format
+FileName  x  z  dY 
+---------------------- 
+-I option is stronger than -dY option.
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/Config/Define.inc b/src/Tools/mrcImage/mrcImageFOMCalc.org/Config/Define.inc
deleted file mode 100755 (executable)
index ad5104c..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-OBJECTNAME = mrcImageFOMCalc
-EXTRA_LIB  =
-EXTRA_CCOPTS =
-EXTRA_INC =
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageFOMCalc.org/Config/OptionControlFile
deleted file mode 100755 (executable)
index cb8ef1a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# OptionControlFile
-# FileFormat
-"-i","-i[nput]","TestData","Optional","1","1","In","inFile","NULL"
-"-w","-w[eight]","Weight","Optional","1","1","Weight","Real","1.0"
-"-I","-I[nput]","TestData Set","Optional","1","1","InList","inFileList","NULL"
-"-r","-r[ef]","Ref, Model Data","Essential","1","1","Ref","inFile","NULL"
-"-o","-o[utput]","Output: ","Optional","1","1","Out","outFile","stdout"
-"-RR","-RR[ange]","Ring Range","Optional","2","1","Rmin","Real","0.0","2","Rmax","Real","0.1"
-"-dR","-dR[ange]","Ring Width","Optional","1","1","dR","Real","0.0"
-"-nS","-nS[ector]","Sector Number","Optional","1","1","nSector","Integer","1"
-"-dA","-dA[lpha]","delta Alpha","Optional","1","1","dAlpha","Real","5"
-"-XMax","-XMax","Xmax: If not set, one calc Xmax","Optional","1","1","XMax","Real","0.0"
-"-AS","-A[uto]S[cale]","Auto Scaling","Optional","0"
-"-AAS","-A[llArea]A[uto]S[cale]","All Area Auto Scaling","Optional","1","1","AASRMax","Real","0.05"
-"-RS","-RS[cale]","R Scaling","Optional","0"
-"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
-"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/Config/OptionControlFile.org b/src/Tools/mrcImage/mrcImageFOMCalc.org/Config/OptionControlFile.org
deleted file mode 100755 (executable)
index cb8ef1a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# OptionControlFile
-# FileFormat
-"-i","-i[nput]","TestData","Optional","1","1","In","inFile","NULL"
-"-w","-w[eight]","Weight","Optional","1","1","Weight","Real","1.0"
-"-I","-I[nput]","TestData Set","Optional","1","1","InList","inFileList","NULL"
-"-r","-r[ef]","Ref, Model Data","Essential","1","1","Ref","inFile","NULL"
-"-o","-o[utput]","Output: ","Optional","1","1","Out","outFile","stdout"
-"-RR","-RR[ange]","Ring Range","Optional","2","1","Rmin","Real","0.0","2","Rmax","Real","0.1"
-"-dR","-dR[ange]","Ring Width","Optional","1","1","dR","Real","0.0"
-"-nS","-nS[ector]","Sector Number","Optional","1","1","nSector","Integer","1"
-"-dA","-dA[lpha]","delta Alpha","Optional","1","1","dAlpha","Real","5"
-"-XMax","-XMax","Xmax: If not set, one calc Xmax","Optional","1","1","XMax","Real","0.0"
-"-AS","-A[uto]S[cale]","Auto Scaling","Optional","0"
-"-AAS","-A[llArea]A[uto]S[cale]","All Area Auto Scaling","Optional","1","1","AASRMax","Real","0.05"
-"-RS","-RS[cale]","R Scaling","Optional","0"
-"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
-"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/Makefile b/src/Tools/mrcImage/mrcImageFOMCalc.org/Makefile
deleted file mode 100755 (executable)
index 3d1cbd9..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-include ../../../Config/Define.inc
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-
-all:
-       cd src; make all; cd ..
-
-install:
-       cd src; make install; cd ..
-
-
-putSF:
-       if [ -f private ] ; \
-       then \
-               echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \
-       else \
-               cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \
-       fi
-
-put:
-       cd src; make put; cd ..
-
-clean:
-       cd src; make clean; cd ..
-
-depend:
-       cd src; make depend; cd ..
-
-check:
-       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
-               echo making directory; \
-               mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
-       fi
-       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
-       @$(RM) src/Makefile
-       @echo "New src/Makefile" 
-       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
-       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; make depend
-
-update:
-       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
-               echo making directory; \
-               mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
-       fi
-       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
-       @$(RM) src/Makefile
-       @echo "New src/Makefile" 
-       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
-       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; echo "Y" | make update      
-
-cvsupdate::
-       cvs -d $(EOS_CVSROOT) update -d 
-
-cvscommit::
-       cvs -d $(EOS_CVSROOT) commit
-
-backup:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-
-backup-all:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-       
-distribute:
-       cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-       
-distribute-all:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-
-eosintroduce:
-       ${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ 
-
-include Config/Target.inc
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/doc/Makefile b/src/Tools/mrcImage/mrcImageFOMCalc.org/doc/Makefile
deleted file mode 120000 (symlink)
index b483694..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/home/people/murakami/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/inc/config.h b/src/Tools/mrcImage/mrcImageFOMCalc.org/inc/config.h
deleted file mode 100755 (executable)
index 8bf4a2f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "../inc/mrcImageFOMCalc.h"
-
-#endif /* CONFIG_H */
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/inc/mrcImageFOMCalc.h b/src/Tools/mrcImage/mrcImageFOMCalc.org/inc/mrcImageFOMCalc.h
deleted file mode 100755 (executable)
index 01bf1ca..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef MRCIMAGEFOMCALC_H
-#define MRCIMAGEFOMCALC_H
-#include <stdio.h>
-#include <stdlib.h>
-
-#define OPTION_FLAG     '-'
-#define OPTION_FLAG_POS (0)
-#define OPTION_POS      (1)
-
-
-
-
-typedef struct mrcImageFOMCalcInfo {
-    long flagRedirect;
-
-    long flagIn;
-    char* In;
-    FILE* fptIn;
-    
-    long flagWeight;
-    float Weight;
-    
-    long flagInList;
-    char** InList;
-    char* InListList;
-    FILE** fptInList;
-    FILE* fptInListList;
-    
-    long flagRef;
-    char* Ref;
-    FILE* fptRef;
-    
-    long flagOut;
-    char* Out;
-    FILE* fptOut;
-    
-    long flagRmin;
-    float Rmin;
-    
-    long flagRmax;
-    float Rmax;
-    
-    long flagdR;
-    float dR;
-    
-    long flagnSector;
-    long nSector;
-    
-    long flagdAlpha;
-    float dAlpha;
-    
-    long flagXMax;
-    float XMax;
-    
-    long AutoScale;
-
-    long flagAASRMax;
-    float AASRMax;
-    
-    long RScale;
-
-    long flagconfigFile;
-    char* configFile;
-    FILE* fptconfigFile;
-    
-    long flagmode;
-    long mode;
-    
-} mrcImageFOMCalcInfo;
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern void argCheck(mrcImageFOMCalcInfo* info, int argc, char* avgv[]);
-extern void khorosInit(int argc, char* avgv[]);
-extern void init0(mrcImageFOMCalcInfo* info);
-extern void init1(mrcImageFOMCalcInfo* info);
-extern void usage(char* usage);
-extern void additionalUsage(void);
-extern void htmlBeforeUsage(char* usage);
-extern void htmlAfterUsage(char* usage);
-#ifdef __cplusplus
-};
-#endif
-#endif /* MRCIMAGEFOMCALC_H */
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/inc/mrcImageFOMCalc.h.org b/src/Tools/mrcImage/mrcImageFOMCalc.org/inc/mrcImageFOMCalc.h.org
deleted file mode 100755 (executable)
index d5c818f..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef MRCIMAGEFOMCALC_H
-#define MRCIMAGEFOMCALC_H
-#include <stdio.h>
-#include <stdlib.h>
-
-#define OPTION_FLAG     '-'
-#define OPTION_FLAG_POS (0)
-#define OPTION_POS      (1)
-
-
-
-
-typedef struct mrcImageFOMCalcInfo {
-    long flagRedirect;
-
-    long flagIn;
-    char* In;
-    FILE* fptIn;
-    
-    long flagWeight;
-    float Weight;
-    
-    long flagInList;
-    char** InList;
-    char* InListList;
-    FILE** fptInList;
-    FILE* fptInListList;
-    
-    long flagRef;
-    char* Ref;
-    FILE* fptRef;
-    
-    long flagOut;
-    char* Out;
-    FILE* fptOut;
-    
-    long flagRmin;
-    float Rmin;
-    
-    long flagRmax;
-    float Rmax;
-    
-    long flagdR;
-    float dR;
-    
-    long flagdAlpha;
-    float dAlpha;
-    
-    long flagconfigFile;
-    char* configFile;
-    FILE* fptconfigFile;
-    
-    long flagmode;
-    long mode;
-    
-} mrcImageFOMCalcInfo;
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern void argCheck(mrcImageFOMCalcInfo* info, int argc, char* avgv[]);
-extern void khorosInit(int argc, char* avgv[]);
-extern void init0(mrcImageFOMCalcInfo* info);
-extern void init1(mrcImageFOMCalcInfo* info);
-extern void usage(char* usage);
-extern void additionalUsage(void);
-extern void htmlBeforeUsage(char* usage);
-extern void htmlAfterUsage(char* usage);
-#ifdef __cplusplus
-};
-#endif
-#endif /* MRCIMAGEFOMCALC_H */
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHA b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHA
deleted file mode 120000 (symlink)
index 6b6e021..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/ALPHA/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHA
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX
deleted file mode 120000 (symlink)
index bd6d64e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/ALPHALINUX/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX5 b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX5
deleted file mode 120000 (symlink)
index 91330fe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/ALPHALINUX5/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHALINUX5
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHAOSF1 b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHAOSF1
deleted file mode 120000 (symlink)
index adca0eb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/ALPHAOSF1/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ALPHAOSF1
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ARM64MAC64 b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/ARM64MAC64
deleted file mode 120000 (symlink)
index 38fb703..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/ARM64MAC64/src/Tools/mrcImage/mrcImageFOMCalc/src/ARM64MAC64
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/CELLLINUX64 b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/CELLLINUX64
deleted file mode 120000 (symlink)
index 0fd1f04..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/CELLLINUX64/src/Tools/mrcImage/mrcImageFOMCalc.org/src/CELLLINUX64
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/HP b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/HP
deleted file mode 120000 (symlink)
index a62f4cc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/HP/src/Tools/mrcImage/mrcImageFOMCalc.org/src/HP
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/I386LINUX b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/I386LINUX
deleted file mode 120000 (symlink)
index f754281..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/I386LINUX/src/Tools/mrcImage/mrcImageFOMCalc.org/src/I386LINUX
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/I686LINUX b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/I686LINUX
deleted file mode 120000 (symlink)
index 10b21ed..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/I686LINUX/src/Tools/mrcImage/mrcImageFOMCalc.org/src/I686LINUX
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/SGI b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/SGI
deleted file mode 120000 (symlink)
index 2080cb6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/SGI/src/Tools/mrcImage/mrcImageFOMCalc.org/src/SGI
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/SPARC b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/SPARC
deleted file mode 120000 (symlink)
index dede16d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/SPARC/src/Tools/mrcImage/mrcImageFOMCalc.org/src/SPARC
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86LINUX64 b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86LINUX64
deleted file mode 120000 (symlink)
index 1d510ed..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFOMCalc/src/X86LINUX64
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86LINUX64ICC b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86LINUX64ICC
deleted file mode 120000 (symlink)
index 3200887..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/X86LINUX64ICC/src/Tools/mrcImage/mrcImageFOMCalc/src/X86LINUX64ICC
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86MAC64 b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/X86MAC64
deleted file mode 120000 (symlink)
index efd6ad6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageFOMCalc/src/X86MAC64
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/argCheck.c b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/argCheck.c
deleted file mode 100755 (executable)
index 5d4b484..0000000
+++ /dev/null
@@ -1,216 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include "../inc/config.h"
-#include "genUtil.h"
-#include "String.h"
-#include "File.h"
-#include "Memory.h"
-
-
-void
-argCheck(mrcImageFOMCalcInfo* info, int argc, char* argv[])
-{
-    long i, j, nv;
-    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("w") {
-                    if(i+1<argc) {
-                        info->Weight = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagWeight++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("I") {
-                    if(i+1<argc) {
-                        info->InListList = stringGetNthWord(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagInList++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("r") {
-                    if(i+1<argc) {
-                        info->Ref = stringGetNthWord(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagRef++;
-                    } 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("RR") {
-                    if(i+2<argc) {
-                        info->Rmin = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagRmin++;
-                        info->Rmax = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagRmax++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("dR") {
-                    if(i+1<argc) {
-                        info->dR = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagdR++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("nS") {
-                    if(i+1<argc) {
-                        info->nSector = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagnSector++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("dA") {
-                    if(i+1<argc) {
-                        info->dAlpha = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagdAlpha++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("XMax") {
-                    if(i+1<argc) {
-                        info->XMax = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagXMax++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("AS") {
-                    if(i+0<argc) {
-                        info->AutoScale++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("AAS") {
-                    if(i+1<argc) {
-                        info->AASRMax = stringGetNthRealData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagAASRMax++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("RS") {
-                    if(i+0<argc) {
-                        info->RScale++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("c") {
-                    if(i+1<argc) {
-                        info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagconfigFile++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("m") {
-                    if(i+1<argc) {
-                        info->mode = stringGetNthIntegerData(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagmode++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
-                SCASE("h") {
-                    usage(argv[0]);
-                    exit(EXIT_SUCCESS);
-                    break;
-                }
-                SCASE("html") {
-                    htmlBeforeUsage(argv[0]);
-                    usage(argv[0]);
-                    htmlAfterUsage(argv[0]);
-                    exit(EXIT_SUCCESS);
-                    break;
-                }
-                SDEFAULT {
-                    fprintf(stderr, "Not Supported Options: :%s\n", argv[i]);
-                    usage(argv[0]);
-                    exit(EXIT_FAILURE);
-                    break;
-                }
-            SSWITCHEND;
-        } 
-    } 
-} 
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/init.c b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/init.c
deleted file mode 100755 (executable)
index e3cd08c..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include "../inc/config.h"
-#include "genUtil.h"
-#include "String.h"
-#include "File.h"
-#include "Memory.h"
-
-
-void
-init0(mrcImageFOMCalcInfo* info)
-{
-    info->fptIn = NULL;    info->flagIn = 0;
-    info->Weight = 1.0;    info->flagWeight = 0;
-    info->fptInList     = NULL;    info->fptInListList = NULL;    info->flagInList = 0;
-    info->fptRef = NULL;    info->flagRef = 0;
-    info->fptOut = stdout;    info->flagOut = 0;
-    info->Rmin = 0.0;    info->flagRmin = 0;
-    info->Rmax = 0.1;    info->flagRmax = 0;
-    info->dR = 0.0;    info->flagdR = 0;
-    info->nSector = 1;    info->flagnSector = 0;
-    info->dAlpha = 5;    info->flagdAlpha = 0;
-    info->XMax = 0.0;    info->flagXMax = 0;
-    info->AutoScale=0;
-    info->AASRMax = 0.05;    info->flagAASRMax = 0;
-    info->RScale=0;
-    info->fptconfigFile = NULL;    info->flagconfigFile = 0;
-    info->mode = 0;    info->flagmode = 0;
-}
-
-void
-init1(mrcImageFOMCalcInfo* info)
-{
-    char s[1024];
-    int i;
-    if(info->flagIn) {
-        info->fptIn = fileOpen(info->In, "r");
-    }
-    
-    if(info->flagWeight) {
-    }
-    
-    if(info->flagInList) {
-        info->fptInListList = fileOpen(info->InListList, "r");
-        fseek(info->fptInListList, 0L, SEEK_SET);
-        i=0;
-        while(NULL!=stringGetFromFile(s, "", info->fptInListList, stdout, 1)) {
-            i++;
-        }
-        info->fptInList = (FILE**)memoryAllocate(i*sizeof(FILE*), "in init1");
-        info->InList    = (char**)memoryAllocate(i*sizeof(char*), "in init1");
-        info->flagInList = i;
-        fseek(info->fptInListList, 0L, SEEK_SET);
-        i=0;
-        while(NULL!=stringGetFromFile(s, "", info->fptInListList, stdout, 1)) {
-            info->InList[i] = stringGetNthWord(s, 1, " ,\t");
-            info->fptInList[i] = fileOpen(info->InList[i],"r");
-            i++;
-        }
-    }
-    
-    if(!info->flagRef) {
-        stringGetFromFile(s, "Ref", stdin, stdout, 0);
-        info->Ref = stringGetNthWord(s, 1, " ,\t");
-        info->flagRef++;
-    }
-    if(info->flagRef) {
-        info->fptRef = fileOpen(info->Ref, "r");
-    }
-    
-    if(info->flagOut) {
-        info->fptOut = fileOpen(info->Out, "w");
-    }
-    
-    if(info->flagRmin) {
-    }
-    
-    if(info->flagRmax) {
-    }
-    
-    if(info->flagdR) {
-    }
-    
-    if(info->flagnSector) {
-    }
-    
-    if(info->flagdAlpha) {
-    }
-    
-    if(info->flagXMax) {
-    }
-    
-    if(info->flagAASRMax) {
-    }
-    
-    if(info->flagconfigFile) {
-        info->fptconfigFile = fileOpen(info->configFile, "r");
-    }
-    
-    if(info->flagmode) {
-    }
-    
-}
-#ifdef KHOROS
-#include <stdio.h>
-#include "bootstrap.h"
-#include "dataserv.h"
-#include "datamanip.h"
-extern void func_usage_additions(void);
-extern void func_free_args(kexit_status status, kaddr client_data);
-extern void func_get_args(kform* pane);
-
-void
-func_usage_additions(void)
-{
-}
-void
-func_free_args(kexit_status status, kaddr client_data)
-{
-}
-void
-func_get_args(kform* pane)
-{
-}
-void
-khorosInit(int argc, char* argv[])
-{
-    char* eospath;
-    char  panepath[1024];
-    FILE* fpt;
-    
-    eospath = getenv("EOS_HOME");
-    sprintf(panepath, "%s/src/Tools/mrcImage/mrcImageFOMCalc/src/mrcImageFOMCalc.pane", eospath);
-    khoros_initialize(argc, argv, "EOS");
-    fpt = fopen(panepath, "r");    if(NULL!=fpt) {
-        fclose(fpt);
-        kclui_initialize(panepath, KGEN_NONE, "EOS", "mrcImageFOMCalc",
-                     func_usage_additions,
-                     func_get_args,
-                     func_free_args);
-    }
-}
-#endif /* KHOROS */ 
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.c b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.c
deleted file mode 100755 (executable)
index b97fae4..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-# mrcImageFOMCalc : $Revision$  
-# $Date$ 
-# Created by $Author$
-# Usage : mrcImageFOMCalc
-# Attention
-#   $Loccker$
-#      $State$ 
-#
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>                  
-#define GLOBAL_DECLARATION
-#include "../inc/config.h"
-
-#define DEBUG
-//#undef  DEBUG
-#include "genUtil.h"
-#include "Memory.h"
-#include "String.h"
-#include "mrcImage.h"
-#include "lmrcImageFOMCalc.h"
-
-
-int
-main(int argc, char* argv[]) 
-{
-       mrcImageFOMCalcInfo info;
-       mrcImage* in;
-       mrcImage  ref;
-       lmrcImageFOMCalcInfo linfo;
-       int i, k, sector;       
-       double* FOM;
-       double* XXMax;
-       double** Scale;
-       double  XMax;
-       int*    Num;
-       double nRing;
-       char s[1024];
-       double* allAreaScale;
-
-       init0(&info);
-    argCheck(&info, argc, argv);
-    init1(&info);
-
-       DEBUGPRINT("Program Start\n");
-
-       // Input Files
-       if(info.flagIn && info.flagInList) {
-               fprintf(stderr, "You should select -i or -I.\n");
-               exit(EXIT_FAILURE);
-       } else if(info.flagIn) {
-               in = memoryAllocate(sizeof(mrcImage)*1, "in main");
-               linfo.inImageNumber = 1;
-               linfo.Weight        = memoryAllocate(sizeof(double)*1, "in main");
-               linfo.Weight[0]     = info.Weight; 
-               mrcFileRead(in, info.In, "in main", 0);
-               DEBUGPRINT2("%s %f\n", info.In, linfo.Weight[0])
-       } else if(info.flagInList)      {
-               in = memoryAllocate(sizeof(mrcImage)*info.flagInList, "in main");
-               linfo.inImageNumber = info.flagInList;
-               linfo.Weight        = memoryAllocate(sizeof(double)*info.flagInList, "in main");
-               fseek(info.fptInListList, 0L, SEEK_SET);
-               for(i=0; i<linfo.inImageNumber; i++) {
-                       mrcFileRead(&in[i], info.InList[i], "in main", 0);
-                       stringGetFromFile(s, "in main", info.fptInList[i], stdout, 3);
-                       linfo.Weight[i] = stringGetNthRealData(s, 2, " ,\t");
-               }
-       } else {
-               fprintf(stderr, "You should select -i or -I.\n");
-               exit(EXIT_FAILURE);
-       }
-
-       // Input Ref.
-       mrcFileRead(&ref, info.Ref, "in main", 0);
-
-       linfo.deltaAlpha = info.dAlpha*RADIAN; 
-       linfo.flagRScale = info.RScale;
-
-
-       allAreaScale = memoryAllocate(sizeof(double)*linfo.inImageNumber, "in main"); 
-       if(info.flagAASRMax) {
-               float X, Y, Z;
-               double dat1, dat2, sum1, sum2;
-               double RRLimit, delX, delY, delZ;
-               DEBUGPRINT1("All Area Scaling Calc. Start: %d\n", linfo.inImageNumber);
-               sum1 = sum2 = 0.0;
-               RRLimit = SQR(info.AASRMax);
-               delX = 1.0/in->HeaderLength.x/in->HeaderN.x; 
-               delY = 1.0/in->HeaderLength.y/in->HeaderN.y; 
-               delZ = 1.0/in->HeaderLength.z/in->HeaderN.z; 
-               for(i=0; i<linfo.inImageNumber; i++) {
-                       for(Z=-in->HeaderN.z/2.0; Z< in->HeaderN.z/2.0; Z++) {
-                       for(Y=-in->HeaderN.y/2.0; Y< in->HeaderN.y/2.0; Y++) {
-                       for(X=0;                  X<=in->HeaderN.x/2.0; X++) {  
-                               if(SQR(X*delX)+SQR(Y*delY)+SQR(Z*delZ)<RRLimit) {
-                                       mrcPixelDataGet(&in[i],  X, Y, Z, &dat1, mrcPixelMag, mrcPixelHowNearest);      
-                                       mrcPixelDataGet(&ref,    X, Y, Z, &dat2, mrcPixelMag, mrcPixelHowNearest);      
-                                       sum1 += dat1;
-                                       sum2 += dat2;
-                               }
-                       }
-                       }
-                       }
-                       allAreaScale[i] = sum2/sum1; 
-                       DEBUGPRINT4("ScalingFactor %d: %g = %g/%g\n", i, allAreaScale[i], sum1, sum2);
-               }
-       }
-
-       if(0<info.dR) {
-               nRing = (int)((info.Rmax - info.Rmin)/info.dR);         
-       } else {
-               nRing = 1;
-               info.dR = info.Rmax - info.Rmin;
-       }
-       FOM   = memoryAllocate(sizeof(double) *nRing, "in main"); 
-       Num   = memoryAllocate(sizeof(int)    *nRing, "in main"); 
-       Scale = memoryAllocate(sizeof(double*)*nRing, "in main"); 
-       XXMax = memoryAllocate(sizeof(double) *nRing, "in main"); 
-
-       linfo.delSector = M_PI/2.0/info.nSector; 
-       for(sector=0; sector<info.nSector; sector++) {
-               linfo.minSector =  sector   *linfo.delSector;
-               linfo.maxSector = (sector+1)*linfo.delSector;
-               // Calculation
-               XMax = 0;
-               for(i=0; i<nRing; i++) {
-                       linfo.minR =  i   *info.dR + info.Rmin;
-                       linfo.maxR = (i+1)*info.dR + info.Rmin;
-
-                       // Set Scale(R)
-                       Scale[i] = memoryAllocate(sizeof(double)*linfo.inImageNumber, "in main");
-                       for(k=0; k<linfo.inImageNumber; k++) {
-                               if(info.AutoScale) {
-                                       Scale[i][k] = lmrcImageFOMScaleCalc(&in[k], &ref, &linfo, 0);
-                               } else if(info.flagAASRMax){
-                                       Scale[i][k] = allAreaScale[k];
-                               } else {
-                                       Scale[i][k]     = 1.0;
-                               }
-                       }
-
-                       // Set XXMax
-                       linfo.Scale = Scale[i];
-                       XXMax[i] = lmrcImageFOMXMaxCalc(in, &ref, &linfo, 0);
-                       if(XMax<XXMax[i]) {
-                                       XMax = XXMax[i];
-                       }
-                       // FOM[i] = i; // For test for memoryArea
-               }
-
-               //DEBUGPRINT1("XMax: %g\n", XMax);
-               for(i=0; i<nRing; i++) {
-                       linfo.minR =  i   *info.dR + info.Rmin;
-                       linfo.maxR = (i+1)*info.dR + info.Rmin;
-                       linfo.Scale = Scale[i];
-
-                       if(info.flagXMax)  {
-                               linfo.XXMax = info.XMax;
-                       } else {
-                               linfo.XXMax = XXMax[i];
-                       }
-
-                       FOM[i] = lmrcImageFOMCalc(in, &ref, &linfo, 0); 
-                       Num[i] = linfo.Num;
-                       // FOM[i] = i; // For test for memoryArea
-               }
-
-
-               // 
-               // Output
-               //
-               fprintf(info.fptOut, "##Sector index %5d/%5d %11.2f %11.2f %11.2f\n", sector, info.nSector, linfo.minSector*DEGREE, linfo.maxSector*DEGREE, linfo.delSector*DEGREE)     ;
-               fprintf(info.fptOut, "##%11s %13s %13s %13s %13s %13s\n", "minR<", "<=maxR", "FOM", "Num", "XMax", "Scaling")   ;
-               for(i=0; i<nRing; i++) {
-                       linfo.minR = i    *info.dR + info.Rmin;
-                       linfo.maxR = (i+1)*info.dR + info.Rmin;
-                       fprintf(info.fptOut, "%13.4e %13.4e %13.4f %13d %13.4e", linfo.minR, linfo.maxR, FOM[i], Num[i], XXMax[i]);     
-                       for(k=0; k<linfo.inImageNumber; k++) {
-                                       fprintf(info.fptOut, " %13.4e", Scale[i][k]*linfo.Weight[k]);
-                       }
-                       fprintf(info.fptOut, "\n");
-               }
-       } // sector
-       return EXIT_SUCCESS;
-}
-
-void
-additionalUsage()
-{
-       fprintf(stderr, "----- Additional Usage -----\n");
-       fprintf(stderr, "This algorithm is originated from K. Yonekura for Layer Lines. Nature/SupplmentTable 2 \n");
-}
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.c.org b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.c.org
deleted file mode 100755 (executable)
index b97fae4..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-# mrcImageFOMCalc : $Revision$  
-# $Date$ 
-# Created by $Author$
-# Usage : mrcImageFOMCalc
-# Attention
-#   $Loccker$
-#      $State$ 
-#
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>                  
-#define GLOBAL_DECLARATION
-#include "../inc/config.h"
-
-#define DEBUG
-//#undef  DEBUG
-#include "genUtil.h"
-#include "Memory.h"
-#include "String.h"
-#include "mrcImage.h"
-#include "lmrcImageFOMCalc.h"
-
-
-int
-main(int argc, char* argv[]) 
-{
-       mrcImageFOMCalcInfo info;
-       mrcImage* in;
-       mrcImage  ref;
-       lmrcImageFOMCalcInfo linfo;
-       int i, k, sector;       
-       double* FOM;
-       double* XXMax;
-       double** Scale;
-       double  XMax;
-       int*    Num;
-       double nRing;
-       char s[1024];
-       double* allAreaScale;
-
-       init0(&info);
-    argCheck(&info, argc, argv);
-    init1(&info);
-
-       DEBUGPRINT("Program Start\n");
-
-       // Input Files
-       if(info.flagIn && info.flagInList) {
-               fprintf(stderr, "You should select -i or -I.\n");
-               exit(EXIT_FAILURE);
-       } else if(info.flagIn) {
-               in = memoryAllocate(sizeof(mrcImage)*1, "in main");
-               linfo.inImageNumber = 1;
-               linfo.Weight        = memoryAllocate(sizeof(double)*1, "in main");
-               linfo.Weight[0]     = info.Weight; 
-               mrcFileRead(in, info.In, "in main", 0);
-               DEBUGPRINT2("%s %f\n", info.In, linfo.Weight[0])
-       } else if(info.flagInList)      {
-               in = memoryAllocate(sizeof(mrcImage)*info.flagInList, "in main");
-               linfo.inImageNumber = info.flagInList;
-               linfo.Weight        = memoryAllocate(sizeof(double)*info.flagInList, "in main");
-               fseek(info.fptInListList, 0L, SEEK_SET);
-               for(i=0; i<linfo.inImageNumber; i++) {
-                       mrcFileRead(&in[i], info.InList[i], "in main", 0);
-                       stringGetFromFile(s, "in main", info.fptInList[i], stdout, 3);
-                       linfo.Weight[i] = stringGetNthRealData(s, 2, " ,\t");
-               }
-       } else {
-               fprintf(stderr, "You should select -i or -I.\n");
-               exit(EXIT_FAILURE);
-       }
-
-       // Input Ref.
-       mrcFileRead(&ref, info.Ref, "in main", 0);
-
-       linfo.deltaAlpha = info.dAlpha*RADIAN; 
-       linfo.flagRScale = info.RScale;
-
-
-       allAreaScale = memoryAllocate(sizeof(double)*linfo.inImageNumber, "in main"); 
-       if(info.flagAASRMax) {
-               float X, Y, Z;
-               double dat1, dat2, sum1, sum2;
-               double RRLimit, delX, delY, delZ;
-               DEBUGPRINT1("All Area Scaling Calc. Start: %d\n", linfo.inImageNumber);
-               sum1 = sum2 = 0.0;
-               RRLimit = SQR(info.AASRMax);
-               delX = 1.0/in->HeaderLength.x/in->HeaderN.x; 
-               delY = 1.0/in->HeaderLength.y/in->HeaderN.y; 
-               delZ = 1.0/in->HeaderLength.z/in->HeaderN.z; 
-               for(i=0; i<linfo.inImageNumber; i++) {
-                       for(Z=-in->HeaderN.z/2.0; Z< in->HeaderN.z/2.0; Z++) {
-                       for(Y=-in->HeaderN.y/2.0; Y< in->HeaderN.y/2.0; Y++) {
-                       for(X=0;                  X<=in->HeaderN.x/2.0; X++) {  
-                               if(SQR(X*delX)+SQR(Y*delY)+SQR(Z*delZ)<RRLimit) {
-                                       mrcPixelDataGet(&in[i],  X, Y, Z, &dat1, mrcPixelMag, mrcPixelHowNearest);      
-                                       mrcPixelDataGet(&ref,    X, Y, Z, &dat2, mrcPixelMag, mrcPixelHowNearest);      
-                                       sum1 += dat1;
-                                       sum2 += dat2;
-                               }
-                       }
-                       }
-                       }
-                       allAreaScale[i] = sum2/sum1; 
-                       DEBUGPRINT4("ScalingFactor %d: %g = %g/%g\n", i, allAreaScale[i], sum1, sum2);
-               }
-       }
-
-       if(0<info.dR) {
-               nRing = (int)((info.Rmax - info.Rmin)/info.dR);         
-       } else {
-               nRing = 1;
-               info.dR = info.Rmax - info.Rmin;
-       }
-       FOM   = memoryAllocate(sizeof(double) *nRing, "in main"); 
-       Num   = memoryAllocate(sizeof(int)    *nRing, "in main"); 
-       Scale = memoryAllocate(sizeof(double*)*nRing, "in main"); 
-       XXMax = memoryAllocate(sizeof(double) *nRing, "in main"); 
-
-       linfo.delSector = M_PI/2.0/info.nSector; 
-       for(sector=0; sector<info.nSector; sector++) {
-               linfo.minSector =  sector   *linfo.delSector;
-               linfo.maxSector = (sector+1)*linfo.delSector;
-               // Calculation
-               XMax = 0;
-               for(i=0; i<nRing; i++) {
-                       linfo.minR =  i   *info.dR + info.Rmin;
-                       linfo.maxR = (i+1)*info.dR + info.Rmin;
-
-                       // Set Scale(R)
-                       Scale[i] = memoryAllocate(sizeof(double)*linfo.inImageNumber, "in main");
-                       for(k=0; k<linfo.inImageNumber; k++) {
-                               if(info.AutoScale) {
-                                       Scale[i][k] = lmrcImageFOMScaleCalc(&in[k], &ref, &linfo, 0);
-                               } else if(info.flagAASRMax){
-                                       Scale[i][k] = allAreaScale[k];
-                               } else {
-                                       Scale[i][k]     = 1.0;
-                               }
-                       }
-
-                       // Set XXMax
-                       linfo.Scale = Scale[i];
-                       XXMax[i] = lmrcImageFOMXMaxCalc(in, &ref, &linfo, 0);
-                       if(XMax<XXMax[i]) {
-                                       XMax = XXMax[i];
-                       }
-                       // FOM[i] = i; // For test for memoryArea
-               }
-
-               //DEBUGPRINT1("XMax: %g\n", XMax);
-               for(i=0; i<nRing; i++) {
-                       linfo.minR =  i   *info.dR + info.Rmin;
-                       linfo.maxR = (i+1)*info.dR + info.Rmin;
-                       linfo.Scale = Scale[i];
-
-                       if(info.flagXMax)  {
-                               linfo.XXMax = info.XMax;
-                       } else {
-                               linfo.XXMax = XXMax[i];
-                       }
-
-                       FOM[i] = lmrcImageFOMCalc(in, &ref, &linfo, 0); 
-                       Num[i] = linfo.Num;
-                       // FOM[i] = i; // For test for memoryArea
-               }
-
-
-               // 
-               // Output
-               //
-               fprintf(info.fptOut, "##Sector index %5d/%5d %11.2f %11.2f %11.2f\n", sector, info.nSector, linfo.minSector*DEGREE, linfo.maxSector*DEGREE, linfo.delSector*DEGREE)     ;
-               fprintf(info.fptOut, "##%11s %13s %13s %13s %13s %13s\n", "minR<", "<=maxR", "FOM", "Num", "XMax", "Scaling")   ;
-               for(i=0; i<nRing; i++) {
-                       linfo.minR = i    *info.dR + info.Rmin;
-                       linfo.maxR = (i+1)*info.dR + info.Rmin;
-                       fprintf(info.fptOut, "%13.4e %13.4e %13.4f %13d %13.4e", linfo.minR, linfo.maxR, FOM[i], Num[i], XXMax[i]);     
-                       for(k=0; k<linfo.inImageNumber; k++) {
-                                       fprintf(info.fptOut, " %13.4e", Scale[i][k]*linfo.Weight[k]);
-                       }
-                       fprintf(info.fptOut, "\n");
-               }
-       } // sector
-       return EXIT_SUCCESS;
-}
-
-void
-additionalUsage()
-{
-       fprintf(stderr, "----- Additional Usage -----\n");
-       fprintf(stderr, "This algorithm is originated from K. Yonekura for Layer Lines. Nature/SupplmentTable 2 \n");
-}
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.html b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.html
deleted file mode 100755 (executable)
index 42f0007..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/bin/bash: mrcImageFOMCalc: そのようなファイルやディレクトリはありません
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.pane b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.pane
deleted file mode 100755 (executable)
index 43f8e71..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
--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 ' ' mrcImageFOMCalc
-      -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/mrcImageFOMCalc
-        -H 1  5x1+41+0 'Help' 'help page' $EOS/src/Tools/mrcImage/mrcImageFOMCalc/doc/mrcImageFOMCalc.doc help
-        -Q 1 0 5.25x1+47+0 'Close'
-        -I 1 0 1 0 0 1 -1x1+1+1.500000 ' ' 'In' 'TestData' i
-        -f 1 0 1 0 0 -1x1+1+3.000000 0 0 1.000000 0 0 0 'Weight' 'Weight' w
-        -I 1 0 1 0 0 1 -1x1+1+4.500000 ' ' 'InList' 'TestData Set' I
-        -I 1 0 1 1 0 1 -1x1+1+6.000000 ' ' 'Ref' 'Ref, Model Data' r
-        -O 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'Out' 'Output: ' o
-        -I  1 0 0 1 0 1 -1x1+1+9 ' ' '0.0' 'Rmin' Ring Range
-        -f 1 0 1 0 0 -1x1+1+10.500000 0 0 0.000000 0 0 0 'dR' 'Ring Width' dR
-        -i 1 0 1 0 0 -1x1+1+12.000000 0 0 1 0 0 'nSector' 'Sector Number' nS
-        -f 1 0 1 0 0 -1x1+1+13.500000 0 0 5.000000 0 0 0 'dAlpha' 'delta Alpha' dA
-        -f 1 0 1 0 0 -1x1+1+15.000000 0 0 0.000000 0 0 0 'XMax' 'Xmax: If not set, one calc Xmax' XMax
-        -t 1 0 1 0 0 6x1+1+16 'AS' 'Auto Scaling' AS
-        -f 1 0 1 0 0 -1x1+1+18.000000 0 0 0.050000 0 0 0 'AASRMax' 'All Area Auto Scaling' AAS
-        -t 1 0 1 0 0 6x1+1+19 'RS' 'R Scaling' RS
-        -I 1 0 1 0 0 1 -1x1+1+21.000000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+22.500000 0 0 0 0 0 'mode' 'Mode' m
-    -E
-  -E
--E
diff --git a/src/Tools/mrcImage/mrcImageFOMCalc.org/src/usage.c b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/usage.c
deleted file mode 100755 (executable)
index c8a4a2b..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#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      )] :Optional  :TestData\n");
-    fprintf(stderr, "    [-w[eight]           Weight              (1.0       )] :Optional  :Weight\n");
-    fprintf(stderr, "    [-I[nput]            InList              (NULL      )] :Optional  :TestData Set\n");
-    fprintf(stderr, "    [-r[ef]              Ref                 (NULL      )] :Essential :Ref, Model Data\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (stdout    )] :Optional  :Output: \n");
-    fprintf(stderr, "    [-RR[ange]           Rmin                (0.0       )Rmax                (0.1       )] :Optional  :Ring Range\n");
-    fprintf(stderr, "    [-dR[ange]           dR                  (0.0       )] :Optional  :Ring Width\n");
-    fprintf(stderr, "    [-nS[ector]          nSector             (1         )] :Optional  :Sector Number\n");
-    fprintf(stderr, "    [-dA[lpha]           dAlpha              (5         )] :Optional  :delta Alpha\n");
-    fprintf(stderr, "    [-XMax               XMax                (0.0       )] :Optional  :Xmax: If not set, one calc Xmax\n");
-    fprintf(stderr, "    [-A[uto]S[cale]      ] :Optional  :Auto Scaling\n");
-    fprintf(stderr, "    [-A[llArea]A[uto]S[cale]AASRMax             (0.05      )] :Optional  :All Area Auto Scaling\n");
-    fprintf(stderr, "    [-RS[cale]           ] :Optional  :R Scaling\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :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/mrcImageFOMCalc.org/src/util.c b/src/Tools/mrcImage/mrcImageFOMCalc.org/src/util.c
deleted file mode 100755 (executable)
index ee5e5f2..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "../inc/config.h"
-
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index b2bea2e..02ac2a3 100755 (executable)
@@ -19,7 +19,7 @@
 //#undef  DEBUG
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 #include "lmrcImageFOMCalc.h"
 
index 42f0007..15aedda 100755 (executable)
@@ -1 +1,36 @@
-/bin/bash: mrcImageFOMCalc: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageFOMCalc</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageFOMCalc</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageFOMCalc
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Optional  :TestData
+    [-w[eight]           Weight              (1.0       ).as(Real                ) ] :Optional  :Weight
+    [-I[nput]            InList              (NULL      ).as(inFileList          ) ] :Optional  :TestData Set
+    [-r[ef]              Ref                 (NULL      ).as(inFile              ) ] :Essential :Ref, Model Data
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Optional  :Output: 
+    [-RR[ange]           Rmin                (0.0       ).as(Real                ) 
+                         Rmax                (0.1       ).as(Real                ) ] :Optional  :Ring Range
+    [-dR[ange]           dR                  (0.0       ).as(Real                ) ] :Optional  :Ring Width
+    [-nS[ector]          nSector             (1         ).as(Integer             ) ] :Optional  :Sector Number
+    [-dA[lpha]           dAlpha              (5         ).as(Real                ) ] :Optional  :delta Alpha
+    [-XMax               XMax                (0.0       ).as(Real                ) ] :Optional  :Xmax: If not set, one calc Xmax
+    [-A[uto]S[cale]                                                                ] :Optional  :Auto Scaling
+    [-A[llArea]A[uto]S[cale]AASRMax             (0.05      ).as(Real                ) ] :Optional  :All Area Auto Scaling
+    [-RS[cale]                                                                     ] :Optional  :R Scaling
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+>> -I FileFormat 
+mrc[0]   weight[0]
+mrc[1]   weight[1]
+.....
+mrc[n-1] weight[n-1]
+This algorithm is originated from K. Yonekura for Layer Lines. Nature/SupplmentTable 2 
+</PRE>
+</BODY>
+</HTML>
index 0bd2ebb..3d1cbd9 100755 (executable)
@@ -32,14 +32,22 @@ check:
                echo making directory; \
                mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
        fi
-       @if [ ! -L src/$(OSTYPE) ]; then \
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; make depend
+
+update:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
                echo making directory; \
-               ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); \
+               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
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; echo "Y" | make update      
 
 cvsupdate::
        cvs -d $(EOS_CVSROOT) update -d 
diff --git a/src/Tools/mrcImage/mrcImageFTest/doc/Makefile b/src/Tools/mrcImage/mrcImageFTest/doc/Makefile
new file mode 100755 (executable)
index 0000000..8215199
--- /dev/null
@@ -0,0 +1,2 @@
+install:
+       cd ../src; make install-doc; cd ../doc  
index dd44d0d..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -210,18 +210,20 @@ 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 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) ]; \
+       @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
-       @$(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE)
-       @$(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @$(CHGRP) Eos $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
        @echo ---- end of bin
 
 install-wish:
@@ -236,7 +238,6 @@ install-wish:
                $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/*  ;\
                touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
                $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
-               $(CHGRP) Eos $(DSTDIR)/wish/$(OBJECTNAME)/*;\
                echo "---- Tcl/Tk file Installed";\
        fi
 
@@ -250,7 +251,6 @@ install-ruby:
                fi ; \
                $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
                echo "---- Ruby/Tk file Installed"; \
        fi
 
@@ -264,7 +264,6 @@ install-perl:
                fi; \
                $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
                echo "---- Perl/Tk file Installed"; \
        fi
 
@@ -282,7 +281,6 @@ install-shell:
                fi ; \
                $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
-               $(CHGRP) Eos $(DSTDIR)/shell/$(OBJECTNAME)/*; \
                echo "---- Shell file Installed"; \
        fi
 
@@ -309,7 +307,6 @@ install-khoros:
                                $(RM) -f $(OBJECTNAME).pane ; \
                                $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
                                $(CD) ../../ ; \
-                               $(CHGRP) -R Eos $(OBJECTNAME); \
                                $(CHMOD) -R 555 $(OBJECTNAME); \
                        else \
                                echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
@@ -360,12 +357,13 @@ depend::
        @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 ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
        fi
        #echo CC
        @if [ -f $(OBJECTNAME).cc ] ; \
@@ -390,6 +388,9 @@ depend::
 update:../Config/OptionControlFile
        maketool $(CLASSNAME) $(OBJECTNAME) update
 
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
 changeName::
 
 Test:$(OSTYPE)/$(OBJECTNAME) TestDir
@@ -425,5 +426,5 @@ tar::
                                                             ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
                                ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
 
-include $(OSTYPE)/.Depend
-include ../Config/Target.inc
+-include $(OSTYPE)/.Depend
+-include ../Config/Target.inc
index bcd3826..2f32463 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
 void
 argCheck(mrcImageFTestInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
+    FILE* fpt;
+    
+    if(NULL==(fpt=fopen(".EosLog", "a+"))) { 
+        
+    } else {
+        for(i=0; i<argc; i++) {
+            fprintf(fpt, "%s ", argv[i]);
+        }
+        fprintf(fpt, "\n");
+        fclose(fpt);
+    }
     for(i=1; i<argc; i++) {
         if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) {
             SSWITCH(argv[i]+OPTION_POS)
index d5160e5..5c91c8f 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -27,7 +27,7 @@ init1(mrcImageFTestInfo* info)
     int i;
     if(!info->flagIn) {
         stringGetFromFile(s, "In", stdin, stdout, 0);
-        info->InList = stringGetNthWord(s, 1, " ,");
+        info->InList = stringGetNthWord(s, 1, " ,\t");
         info->flagIn++;
     }
     if(info->flagIn) {
@@ -43,7 +43,7 @@ init1(mrcImageFTestInfo* info)
         fseek(info->fptInList, 0L, SEEK_SET);
         i=0;
         while(NULL!=stringGetFromFile(s, "", info->fptInList, stdout, 1)) {
-            info->In[i] = stringGetNthWord(s, 1, " ,");
+            info->In[i] = stringGetNthWord(s, 1, " ,\t");
             info->fptIn[i] = fileOpen(info->In[i],"r");
             i++;
         }
@@ -51,7 +51,7 @@ init1(mrcImageFTestInfo* info)
     
     if(!info->flagRef) {
         stringGetFromFile(s, "Ref", stdin, stdout, 0);
-        info->RefList = stringGetNthWord(s, 1, " ,");
+        info->RefList = stringGetNthWord(s, 1, " ,\t");
         info->flagRef++;
     }
     if(info->flagRef) {
@@ -67,7 +67,7 @@ init1(mrcImageFTestInfo* info)
         fseek(info->fptRefList, 0L, SEEK_SET);
         i=0;
         while(NULL!=stringGetFromFile(s, "", info->fptRefList, stdout, 1)) {
-            info->Ref[i] = stringGetNthWord(s, 1, " ,");
+            info->Ref[i] = stringGetNthWord(s, 1, " ,\t");
             info->fptRef[i] = fileOpen(info->Ref[i],"r");
             i++;
         }
@@ -75,7 +75,7 @@ init1(mrcImageFTestInfo* info)
     
     if(!info->flagOut) {
         stringGetFromFile(s, "Out", stdin, stdout, 0);
-        info->Out = stringGetNthWord(s, 1, " ,");
+        info->Out = stringGetNthWord(s, 1, " ,\t");
         info->flagOut++;
     }
     if(info->flagOut) {
index 2dc1e74..f65030e 100755 (executable)
@@ -8,12 +8,12 @@
 <PRE>
 Usage: mrcImageFTest
 Options:
-    [-i[nput]            In                  (NULL      )] :Essential :IN: InputDataFile
-    [-r[ef]              Ref                 (NULL      )] :Essential :Ref: InputDataFile
-    [-o[utput]           Out                 (NULL      )] :Essential :Output: Probability
-    [-f[Value]           OutF                (NULL      )] :Optional  :Output: F-Value
-    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         )] :Optional  :Mode
+    [-i[nput]            In                  (NULL      ).as(inFileList          ) ] :Essential :IN: InputDataFile
+    [-r[ef]              Ref                 (NULL      ).as(inFileList          ) ] :Essential :Ref: InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output: Probability
+    [-f[Value]           OutF                (NULL      ).as(outFile             ) ] :Optional  :Output: F-Value
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 ----- Additional Usage -----
 </PRE>
 </BODY>
index 214a27d..5e95f7e 100755 (executable)
@@ -7,12 +7,12 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Essential :IN: InputDataFile\n");
-    fprintf(stderr, "    [-r[ef]              Ref                 (NULL      )] :Essential :Ref: InputDataFile\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :Output: Probability\n");
-    fprintf(stderr, "    [-f[Value]           OutF                (NULL      )] :Optional  :Output: F-Value\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-i[nput]            In                  (NULL      ).as(inFileList          ) ] :Essential :IN: InputDataFile\n");
+    fprintf(stderr, "    [-r[ef]              Ref                 (NULL      ).as(inFileList          ) ] :Essential :Ref: InputDataFile\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output: Probability\n");
+    fprintf(stderr, "    [-f[Value]           OutF                (NULL      ).as(outFile             ) ] :Optional  :Output: F-Value\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 a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
diff --git a/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/Config/Define.inc b/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/Config/Define.inc
new file mode 100755 (executable)
index 0000000..3c9efd0
--- /dev/null
@@ -0,0 +1,4 @@
+OBJECTNAME = mrcImageFilamentSearchResultShow
+EXTRA_LIB  =
+EXTRA_CCOPTS =
+EXTRA_INC =
diff --git a/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/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/mrcImage/mrcImageFilamentSearchResultShow/doc/Makefile b/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/doc/Makefile
new file mode 100755 (executable)
index 0000000..8215199
--- /dev/null
@@ -0,0 +1,2 @@
+install:
+       cd ../src; make install-doc; cd ../doc  
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
diff --git a/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/X86LINUX64 b/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/X86LINUX64
new file mode 120000 (symlink)
index 0000000..c563c07
--- /dev/null
@@ -0,0 +1 @@
+../../../../../hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/X86LINUX64
\ No newline at end of file
index b352862..ac67636 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -12,7 +12,7 @@
 void
 argCheck(mrcImageFilamentSearchResultShowInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
     FILE* fpt;
     
index 1b0b0ea..2433dd7 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -25,7 +25,7 @@ init1(mrcImageFilamentSearchResultShowInfo* info)
     int i;
     if(!info->flagIn) {
         stringGetFromFile(s, "In", stdin, stdout, 0);
-        info->In = stringGetNthWord(s, 1, " ,");
+        info->In = stringGetNthWord(s, 1, " ,\t");
         info->flagIn++;
     }
     if(info->flagIn) {
@@ -34,7 +34,7 @@ init1(mrcImageFilamentSearchResultShowInfo* info)
     
     if(!info->flagOut) {
         stringGetFromFile(s, "Out", stdin, stdout, 0);
-        info->Out = stringGetNthWord(s, 1, " ,");
+        info->Out = stringGetNthWord(s, 1, " ,\t");
         info->flagOut++;
     }
     if(info->flagOut) {
diff --git a/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/mrcImageFilamentSearchResultShow.html b/src/Tools/mrcImage/mrcImageFilamentSearchResultShow/src/mrcImageFilamentSearchResultShow.html
new file mode 100644 (file)
index 0000000..30038b8
--- /dev/null
@@ -0,0 +1,18 @@
+<HTML>
+<HEAD>
+<TITLE>mrcImageFilamentSearchResultShow</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageFilamentSearchResultShow</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageFilamentSearchResultShow
+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 66a914c..c3e4fc6 100755 (executable)
@@ -7,10 +7,10 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-i[nput]            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();
 }
 
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 7b29e8c..e6102e4 100755 (executable)
@@ -101,7 +101,7 @@ lmrcImageHelicalConvolution(mrcImage* out,
                        src.y = (dst.y - dstc.y) + srcc.y; 
                        src.z = dst.z;
                } else {
-                       src.z = ()/in->HeaaderLength.x;
+                       //src.z = ()/in->HeaaderLength.x;
                }
        }
        }
index 52bd310..13ac8b2 100755 (executable)
@@ -1 +1,23 @@
-/bin/bash: mrcImageHelicalConvolution: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageHelicalConvolution</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageHelicalConvolution</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageHelicalConvolution
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input:mrc
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output:mrc
+    [-d[elta]p[hi]       delPhi              (30        ).as(Real                ) ] :Optional  :deltaPhi [degree]
+    [-d[elta]z           delZ                (5.5       ).as(Real                ) ] :Optional  :deltaZ [degree]
+    [-Nx                 Nx                  (0         ).as(Integer             ) ] :Optional  :[pixel]
+    [-Ny                 Ny                  (0         ).as(Integer             ) ] :Optional  :[pixel]
+    [-Nz                 Nz                  (0         ).as(Integer             ) ] :Optional  :[pixel]
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 34b13aa..717d65f 100755 (executable)
@@ -20,7 +20,7 @@ static char __sccs_id[] = "@(#)mrcImageMultiCTFCompensation ver1.3; Date:96/04/2
 #include "../inc/config.h"
 #undef DEBUG
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "Memory.h"
 #include "mrcImage.h"
 #include "ctfInfo.h"
index aed89ab..be927bc 100755 (executable)
@@ -1 +1,43 @@
-/bin/bash: mrcImageMultiCTFCompensation: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageMultiCTFCompensation</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageMultiCTFCompensation</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageMultiCTFCompensation
+Options:
+    [-i[nput]            In                  (stdin     ).as(inFileList          ) ] :Essential :Input: filename ...
+    [-info2              CTF                 (stdin     ).as(inFileList          ) ] :Optional  :InputFileList: the same order as the input: ctfinfo from Display2/ctfDisplay
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Essential :OutputDataFile(average file)
+    [-f[ft]              fftOut              (stdout    ).as(outFile             ) ] :Optional  :OutputDataFile(averaged fft file)
+    [-W[hiteNoise]       WhiteNoise          (1.0       ).as(Real                ) ] :Optional  :
+    [-W[hiteNoise]R[aising]WhiteNoiseRaising   (1.0       ).as(Real                ) ] :Optional  :Weight:W*exp(WR*R)
+    [-maxW[hiteNoise]R[aising]MaxWhiteNoise       (1.0       ).as(Real                ) ] :Optional  :max(W*exp(WR*R),maxWhiteNoise)
+    [-Ndep[endent]W[hiteNoise]R[aising]NdependentWhiteNoise(1         ).as(Integer             ) ] :Optional  :W*exp(WR*R)/sqrt(N)
+    [-SinWin             SinWinRmin          (0.1       ).as(Real                ) 
+                         SinWinRmax          (1.0       ).as(Real                ) ] :Optional  :Windowing by sine function from Rmin[/A] to Rmax[/A]
+    [-MaxIter[ation]     MaxIter             (10        ).as(Integer             ) ] :Optional  :Max Iteration
+    [-ctfMode            CTFMode             (1         ).as(Integer             ) ] :Optional  :CTFMode: refer to mrcImageCTFObservation
+    [-solventMode        solventMode         (0         ).as(Real                ) ] :Optional  :If solvent flatterning is used, NEED
+    [-solventSTD         solventSTD          (-1.0      ).as(Real                ) ] :Optional  :If solvent flatterning is used as mode=1, NEED 
+    [-log[file]          Log                 (stderr    ).as(outFile             ) ] :Optional  :Log File Name
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- InputFileFormat -----
+filename0 deltaF[A] Cs[mm] kV[kV] ratioOfAmpToPhase
+filename1 deltaF[A] Cs[mm] kV[kV] ratioOfAmpToPhase
+.................
+
+----- Input: ctfinfo, with the same order as the input; from Display2/ctfDisplay -----
+filename0.ctfinfo 
+filename1.ctfinfo 
+.................
+
+mode: 0  : CTF-weighted compensation, CTF/(SQR(CTF) + (NS)^2)
+mode: +1 : Adding solvent-flattening process
+mode: +16: Without phase flipping, in case of images after phase only correction.
+ </PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index e2c5407..2923c92 100755 (executable)
@@ -20,7 +20,7 @@ static char __sccs_id[] = "%Z%mrcImageMultiCTFDetermination ver%I%; Date:%D% %Z%
 #define DEBUG
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 
 typedef struct lmrcImageMultiCTFDeterminationInfo {
index 0ccaf1f..ce3ec63 100755 (executable)
@@ -1 +1,28 @@
-/bin/bash: mrcImageMultiCTFDetermination: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageMultiCTFDetermination</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageMultiCTFDetermination</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageMultiCTFDetermination
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFileList          ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Optional  :Output Optimum
+    [-oP[utput]          Out2                (NULL      ).as(outFile             ) ] :Optional  :Output Distribution
+    [-kV                 kV                  (200       ).as(Real                ) ] :Optional  :AccVol[kV]
+    [-Cs                 Cs                  (1.7       ).as(Real                ) ] :Optional  :Cs[mm]
+    [-AoverP             minAoverP           (0.0       ).as(Real                ) 
+                         maxAoverP           (1.0       ).as(Real                ) 
+                         delAoverP           (0.01      ).as(Real                ) ] :Optional  :AoverP[A]
+    [-Rmax               Rmax                (0.1       ).as(Real                ) ] :Optional  :Rmax[/A]
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+>>>> inputfile format <<<<
+filename minDef[A] maxDef[A] deltaDef[A]
+.....
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 0bd2ebb..3d1cbd9 100755 (executable)
@@ -32,14 +32,22 @@ check:
                echo making directory; \
                mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
        fi
-       @if [ ! -L src/$(OSTYPE) ]; then \
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; make depend
+
+update:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
                echo making directory; \
-               ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); \
+               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
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; echo "Y" | make update      
 
 cvsupdate::
        cvs -d $(EOS_CVSROOT) update -d 
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/doc/Makefile b/src/Tools/mrcImage/mrcImageNormalDistributionTest/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/mrcImageNormalDistributionTest/src/ALPHA b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHA
deleted file mode 120000 (symlink)
index bd450f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/ALPHA/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHA
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX
deleted file mode 120000 (symlink)
index 0956df2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/ALPHALINUX/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX5 b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX5
deleted file mode 120000 (symlink)
index da77c95..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/ALPHALINUX5/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHALINUX5
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHAOSF1 b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHAOSF1
deleted file mode 120000 (symlink)
index 027a4cf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/ALPHAOSF1/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/ALPHAOSF1
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/CELLLINUX64 b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/CELLLINUX64
deleted file mode 120000 (symlink)
index 08b3dd5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/CELLLINUX64/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/CELLLINUX64
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/HP b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/HP
deleted file mode 120000 (symlink)
index 473be70..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/HP/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/HP
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I386LINUX b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I386LINUX
deleted file mode 120000 (symlink)
index ca30fa8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/I386LINUX/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I386LINUX
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I686LINUX b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I686LINUX
deleted file mode 120000 (symlink)
index 24d8c75..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/I686LINUX/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/I686LINUX
\ No newline at end of file
index dd44d0d..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -210,18 +210,20 @@ 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 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) ]; \
+       @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
-       @$(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE)
-       @$(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @$(CHGRP) Eos $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
        @echo ---- end of bin
 
 install-wish:
@@ -236,7 +238,6 @@ install-wish:
                $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/*  ;\
                touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
                $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
-               $(CHGRP) Eos $(DSTDIR)/wish/$(OBJECTNAME)/*;\
                echo "---- Tcl/Tk file Installed";\
        fi
 
@@ -250,7 +251,6 @@ install-ruby:
                fi ; \
                $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
                echo "---- Ruby/Tk file Installed"; \
        fi
 
@@ -264,7 +264,6 @@ install-perl:
                fi; \
                $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
                echo "---- Perl/Tk file Installed"; \
        fi
 
@@ -282,7 +281,6 @@ install-shell:
                fi ; \
                $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
-               $(CHGRP) Eos $(DSTDIR)/shell/$(OBJECTNAME)/*; \
                echo "---- Shell file Installed"; \
        fi
 
@@ -309,7 +307,6 @@ install-khoros:
                                $(RM) -f $(OBJECTNAME).pane ; \
                                $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
                                $(CD) ../../ ; \
-                               $(CHGRP) -R Eos $(OBJECTNAME); \
                                $(CHMOD) -R 555 $(OBJECTNAME); \
                        else \
                                echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
@@ -360,12 +357,13 @@ depend::
        @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 ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
        fi
        #echo CC
        @if [ -f $(OBJECTNAME).cc ] ; \
@@ -390,6 +388,9 @@ depend::
 update:../Config/OptionControlFile
        maketool $(CLASSNAME) $(OBJECTNAME) update
 
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
 changeName::
 
 Test:$(OSTYPE)/$(OBJECTNAME) TestDir
@@ -425,5 +426,5 @@ tar::
                                                             ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
                                ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
 
-include $(OSTYPE)/.Depend
-include ../Config/Target.inc
+-include $(OSTYPE)/.Depend
+-include ../Config/Target.inc
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SGI b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SGI
deleted file mode 120000 (symlink)
index 058be86..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/SGI/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SGI
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SPARC b/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SPARC
deleted file mode 120000 (symlink)
index 25094dc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../hostdepend/SPARC/src/Tools/mrcImage/mrcImageNormalDistributionTest/src/SPARC
\ No newline at end of file
index cd5e162..b443ad9 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
 void
 argCheck(mrcImageNormalDistributionTestInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
+    FILE* fpt;
+    
+    if(NULL==(fpt=fopen(".EosLog", "a+"))) { 
+        
+    } else {
+        for(i=0; i<argc; i++) {
+            fprintf(fpt, "%s ", argv[i]);
+        }
+        fprintf(fpt, "\n");
+        fclose(fpt);
+    }
     for(i=1; i<argc; i++) {
         if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) {
             SSWITCH(argv[i]+OPTION_POS)
index 1d36eb9..8ab6aa9 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -25,7 +25,7 @@ init1(mrcImageNormalDistributionTestInfo* info)
     int i;
     if(!info->flagIn) {
         stringGetFromFile(s, "In", stdin, stdout, 0);
-        info->In = stringGetNthWord(s, 1, " ,");
+        info->In = stringGetNthWord(s, 1, " ,\t");
         info->flagIn++;
     }
     if(info->flagIn) {
@@ -34,7 +34,7 @@ init1(mrcImageNormalDistributionTestInfo* info)
     
     if(!info->flagOut) {
         stringGetFromFile(s, "Out", stdin, stdout, 0);
-        info->Out = stringGetNthWord(s, 1, " ,");
+        info->Out = stringGetNthWord(s, 1, " ,\t");
         info->flagOut++;
     }
     if(info->flagOut) {
old mode 100755 (executable)
new mode 100644 (file)
index f1c199f..916187f
@@ -8,10 +8,10 @@
 <PRE>
 Usage: mrcImageNormalDistributionTest
 Options:
-    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile
-    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile
-    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         )] :Optional  :Mode
+    [-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>
index 66a914c..c3e4fc6 100755 (executable)
@@ -7,10 +7,10 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-i[nput]            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();
 }
 
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index fb0b7fb..f167c60 100755 (executable)
@@ -38,12 +38,9 @@ Options:
                   data = A*Normalized(data) + B , where normalized means (average=0, SD=1)
   6: Min-75percent: Background and Object(75)
                   data = A*(data-Min)/(75percent-Min)x0.75 + B 
-<<<<<<< HEAD
-=======
   7: LowValueArea to HighValueArea: 
                   data = A*(data-MeanOfLowValueArea)/(meanOfHighValue-meanOfLowValueArea) + B, using LowValueArea and HighValueArea
 ----- HighValueArea and LowValueArea for 007 -----
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
 </PRE>
 </BODY>
 </HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index f1021af..b15390c 100755 (executable)
@@ -18,7 +18,7 @@
 #define DEBUG
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 
 typedef struct lmrcImagePanoramaCreateInfo {
index 82dbdd2..411b5a3 100755 (executable)
@@ -1 +1,26 @@
-/bin/bash: mrcImagePanoramaCreate: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImagePanoramaCreate</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImagePanoramaCreate</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImagePanoramaCreate
+Options:
+    [-I[nput]            In                  (stdin     ).as(inFileList          ) ] :Essential :Input:FileList[mrcImage x y z]
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output:mrcImage
+    [-o[utput]C[ount]    Count               (NULL      ).as(outFile             ) ] :Optional  :Output(Count):mrcImage
+    [-N                  Nx                  (0         ).as(Integer             ) 
+                         Ny                  (0         ).as(Integer             ) 
+                         Nz                  (0         ).as(Integer             ) ] :Optional  :Input:OutImageSize
+    [-M[ode]             InterpolationMode   (0         ).as(Integer             ) ] :Optional  :InterpolationMode
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+>>>InputFileList Format
+FileName OffsetX OffsetY OffsetZ
+.....
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index fc4219b..86f877d 100755 (executable)
@@ -21,7 +21,7 @@ static char __sccs_id[] = "%Z%mrcImageROIs ver%I%; Date:%D% %Z%";
 #include "genUtil.h"
 #include "Memory.h"
 #include "File.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 #include "lmrcImageROI2D.h"
 #include "lmrcImageMontage.h"
index 405ad66..0402f5b 100755 (executable)
@@ -1 +1,37 @@
-/bin/bash: mrcImageROIs: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageROIs</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageROIs</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageROIs
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-I[nformation]      Info                (NULL      ).as(inFile              ) ] :Essential :Information
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :MontageFile
+    [-S[hrink]           Shrink              (NULL      ).as(Integer             ) ] :Optional  :When inputimage was shrunk
+    [-width              Width               (0.0       ).as(Real                ) ] :Optional  :Width
+    [-height             Height              (0.0       ).as(Real                ) ] :Optional  :Height
+    [-NonPeriodic                                                                  ] :Optional  :Zero Outof Range
+    [-PadMode            PadMode             (0         ).as(Integer             ) ] :Optional  :PadMode(refer to mrcImagePad)
+    [-M[ode]             Mode                (2         ).as(Integer             ) ] :Optional  :ImageType:0 byte 1 short 2 float
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+----- Mode -----
+0: Nearest 
+1: Bilinear
+2: CubicConvolution
+----- Information File Format -----
+Shape ShapeInfo1 ... [Additional AdditionalInfo1 ...]
+...............
+Shape: OutFileName Rect       blx bly brx bry trx try tlx tly
+Shape: OutFileName TiltRect   blx bly brx bry trx try tlx tly
+Shape: OutFileName Rect2      centerx centery width height 
+Shape: OutFileName Circle     centerx centery radius 
+Shape: OutFileName Line       startx starty endx endy
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 2e94bd7..6644f37 100755 (executable)
@@ -18,7 +18,7 @@ static char __sccs_id[] = "%Z%mrcImageSimilarityEstimate ver%I%; Date:%D% %Z%";
 #include "../inc/config.h"
 
 #define DEBUG
-#include "String.h"
+#include "eosString.h"
 #include "genUtil.h"
 #define SECTION_MARK " \t,"
 #include "Memory.h"
index 0553b28..6b7d69c 100755 (executable)
@@ -1 +1,31 @@
-/bin/bash: mrcImageSimilarityEstimate: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageSimilarityEstimate</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageSimilarityEstimate</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageSimilarityEstimate
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput] information fileOut                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-o[utput] Cor[relation]OutCor              (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-ref[erence array of file]ref                 (stdin     ).as(inFileListNoOpen    ) ] :Essential :InputDataFiles
+    [-cor[relation] file namecorfilename         (stdin     ).as(inFileListNoOpen    ) ] :Optional  :InputDataFiles
+    [-cormode            cormode             (0         ).as(Integer             ) ] :Optional  :Mode
+    [-ctfinfo            ctfinfo             (NULL      ).as(inFile              ) ] :Optional  :InputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+cormode:(lmrcImageCorrelation)
+0: Normal Correlation FxG*
+1: Phase  Correlation FxG*/     |FxG*|
+2: Phase  Correlation FxG*/sqrt(|FxG*|)
+3: Normalized Normal Correlation FxG*/|F||G|)
+16: (0,0) = 0
+ctfmode:1 (Phase and Amplitude)
+ctfinf format:defocus Cs kV AoverP
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
diff --git a/src/Tools/mrcImage/mrcImageSoftEdge/src/.html b/src/Tools/mrcImage/mrcImageSoftEdge/src/.html
new file mode 100644 (file)
index 0000000..d3c5dd6
--- /dev/null
@@ -0,0 +1 @@
+/bin/bash: : ディレクトリです
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a0d4b1d..3f792dd 100755 (executable)
@@ -19,7 +19,7 @@
 #include "genUtil.h"
 #include "Memory.h"
 #include "mrcImage.h"
-#include "String.h"
+#include "eosString.h"
 #include "lmrcImageSpatialFrequencyFilter.h"
 
 extern void filterFileRead(FILE* fpt, lmrcImageSpatialFrequencyFilterInfo* linfo , int colR, int colW, int mode);
index 943af4b..0291b3e 100755 (executable)
@@ -1 +1,23 @@
-/bin/bash: mrcImageSpatialFrequencyFilter: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageSpatialFrequencyFilter</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageSpatialFrequencyFilter</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageSpatialFrequencyFilter
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: mrcImage
+    [-filter             filterIn            (NULL      ).as(inFile::ASCII       ) ] :Essential :Input: filterFile
+    [-filterCol[lumn]    colR                (1         ).as(Integer             ) 
+                         colW                (2         ).as(Integer             ) ] :Optional  :R W
+    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output: mrcImage
+    [-L[owCut]           Low                 (-0.1      ).as(Real                ) ] :Optional  :LowCut: [/A]
+    [-H[ighCut]          High                (1.0       ).as(Real                ) ] :Optional  :HighCut: [/A]
+    [-c[onfig]           configFile          (NULL      ).as(inFile::ASCII       ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 0bd2ebb..3d1cbd9 100755 (executable)
@@ -32,14 +32,22 @@ check:
                echo making directory; \
                mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
        fi
-       @if [ ! -L src/$(OSTYPE) ]; then \
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; make depend
+
+update:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
                echo making directory; \
-               ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); \
+               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
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; echo "Y" | make update      
 
 cvsupdate::
        cvs -d $(EOS_CVSROOT) update -d 
diff --git a/src/Tools/mrcImage/mrcImageTTest/doc/Makefile b/src/Tools/mrcImage/mrcImageTTest/doc/Makefile
new file mode 100755 (executable)
index 0000000..8215199
--- /dev/null
@@ -0,0 +1,2 @@
+install:
+       cd ../src; make install-doc; cd ../doc  
index dd44d0d..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -210,18 +210,20 @@ 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 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) ]; \
+       @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
-       @$(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE)
-       @$(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @$(CHGRP) Eos $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
        @echo ---- end of bin
 
 install-wish:
@@ -236,7 +238,6 @@ install-wish:
                $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/*  ;\
                touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
                $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
-               $(CHGRP) Eos $(DSTDIR)/wish/$(OBJECTNAME)/*;\
                echo "---- Tcl/Tk file Installed";\
        fi
 
@@ -250,7 +251,6 @@ install-ruby:
                fi ; \
                $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
                echo "---- Ruby/Tk file Installed"; \
        fi
 
@@ -264,7 +264,6 @@ install-perl:
                fi; \
                $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
                echo "---- Perl/Tk file Installed"; \
        fi
 
@@ -282,7 +281,6 @@ install-shell:
                fi ; \
                $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
-               $(CHGRP) Eos $(DSTDIR)/shell/$(OBJECTNAME)/*; \
                echo "---- Shell file Installed"; \
        fi
 
@@ -309,7 +307,6 @@ install-khoros:
                                $(RM) -f $(OBJECTNAME).pane ; \
                                $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
                                $(CD) ../../ ; \
-                               $(CHGRP) -R Eos $(OBJECTNAME); \
                                $(CHMOD) -R 555 $(OBJECTNAME); \
                        else \
                                echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
@@ -360,12 +357,13 @@ depend::
        @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 ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
        fi
        #echo CC
        @if [ -f $(OBJECTNAME).cc ] ; \
@@ -390,6 +388,9 @@ depend::
 update:../Config/OptionControlFile
        maketool $(CLASSNAME) $(OBJECTNAME) update
 
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
 changeName::
 
 Test:$(OSTYPE)/$(OBJECTNAME) TestDir
@@ -425,5 +426,5 @@ tar::
                                                             ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
                                ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
 
-include $(OSTYPE)/.Depend
-include ../Config/Target.inc
+-include $(OSTYPE)/.Depend
+-include ../Config/Target.inc
index 6decc56..23f802e 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
 void
 argCheck(mrcImageTTestInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
+    FILE* fpt;
+    
+    if(NULL==(fpt=fopen(".EosLog", "a+"))) { 
+        
+    } else {
+        for(i=0; i<argc; i++) {
+            fprintf(fpt, "%s ", argv[i]);
+        }
+        fprintf(fpt, "\n");
+        fclose(fpt);
+    }
     for(i=1; i<argc; i++) {
         if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) {
             SSWITCH(argv[i]+OPTION_POS)
index 1b3fa09..d1492c4 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -48,7 +48,7 @@ init1(mrcImageTTestInfo* info)
         fseek(info->fptInList, 0L, SEEK_SET);
         i=0;
         while(NULL!=stringGetFromFile(s, "", info->fptInList, stdout, 1)) {
-            info->In[i] = stringGetNthWord(s, 1, " ,");
+            info->In[i] = stringGetNthWord(s, 1, " ,\t");
             info->fptIn[i] = fileOpen(info->In[i],"r");
             i++;
         }
@@ -84,7 +84,7 @@ init1(mrcImageTTestInfo* info)
         fseek(info->fptRefList, 0L, SEEK_SET);
         i=0;
         while(NULL!=stringGetFromFile(s, "", info->fptRefList, stdout, 1)) {
-            info->Ref[i] = stringGetNthWord(s, 1, " ,");
+            info->Ref[i] = stringGetNthWord(s, 1, " ,\t");
             info->fptRef[i] = fileOpen(info->Ref[i],"r");
             i++;
         }
index 756aaa5..08216a4 100755 (executable)
@@ -8,16 +8,22 @@
 <PRE>
 Usage: mrcImageTTest
 Options:
-    [-i[nput]            In                  (NULL      )] :Optional  :In: InputList
-    [-I[nput]            In2                 (NULL      )In2Var              (NULL      )In2N                (0         )] :Optional  :In: Average Variable N
-    [-Nor[malizingParameter]NorA                (0.0       )NorB                (1.0       )] :Optional  :In: A + B*x: NormalizingParameter
-    [-r[ef]              Ref                 (NULL      )] :Optional  :Ref: InputList
-    [-R[ef]              Ref2                (NULL      )Ref2Var             (NULL      )Ref2N               (0         )] :Optional  :Ref: Average Variable N
-    [-Nor[malizingParameter]RNorARef             (0.0       )NorBRef             (1.0       )] :Optional  :In: A + B*x: NormalizingParameter for Ref
-    [-o[utput]           Out                 (NULL      )] :Optional  :Output: Probability
-    [-t[Value]           OutT                (NULL      )] :Optional  :Output: t-value
-    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         )] :Optional  :Mode
+    [-i[nput]            In                  (NULL      ).as(inFileList          ) ] :Optional  :In: InputList
+    [-I[nput]            In2                 (NULL      ).as(inFile              ) 
+                         In2Var              (NULL      ).as(inFile              ) 
+                         In2N                (0         ).as(Integer             ) ] :Optional  :In: Average Variable N
+    [-Nor[malizingParameter]NorA                (0.0       ).as(Real                ) 
+                         NorB                (1.0       ).as(Real                ) ] :Optional  :In: A + B*x: NormalizingParameter
+    [-r[ef]              Ref                 (NULL      ).as(inFileList          ) ] :Optional  :Ref: InputList
+    [-R[ef]              Ref2                (NULL      ).as(inFile              ) 
+                         Ref2Var             (NULL      ).as(inFile              ) 
+                         Ref2N               (0         ).as(Integer             ) ] :Optional  :Ref: Average Variable N
+    [-Nor[malizingParameter]RNorARef             (0.0       ).as(Real                ) 
+                         NorBRef             (1.0       ).as(Real                ) ] :Optional  :In: A + B*x: NormalizingParameter for Ref
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :Output: Probability
+    [-t[Value]           OutT                (NULL      ).as(outFile             ) ] :Optional  :Output: t-value
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 ----- Additional Usage -----
 </PRE>
 </BODY>
index 7f4829a..7a4ad41 100755 (executable)
@@ -7,16 +7,16 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Optional  :In: InputList\n");
-    fprintf(stderr, "    [-I[nput]            In2                 (NULL      )In2Var              (NULL      )In2N                (0         )] :Optional  :In: Average Variable N\n");
-    fprintf(stderr, "    [-Nor[malizingParameter]NorA                (0.0       )NorB                (1.0       )] :Optional  :In: A + B*x: NormalizingParameter\n");
-    fprintf(stderr, "    [-r[ef]              Ref                 (NULL      )] :Optional  :Ref: InputList\n");
-    fprintf(stderr, "    [-R[ef]              Ref2                (NULL      )Ref2Var             (NULL      )Ref2N               (0         )] :Optional  :Ref: Average Variable N\n");
-    fprintf(stderr, "    [-Nor[malizingParameter]RNorARef             (0.0       )NorBRef             (1.0       )] :Optional  :In: A + B*x: NormalizingParameter for Ref\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Optional  :Output: Probability\n");
-    fprintf(stderr, "    [-t[Value]           OutT                (NULL      )] :Optional  :Output: t-value\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-i[nput]            In                  (NULL      ).as(inFileList          ) ] :Optional  :In: InputList\n");
+    fprintf(stderr, "    [-I[nput]            In2                 (NULL      ).as(inFile              ) \n                         In2Var              (NULL      ).as(inFile              ) \n                         In2N                (0         ).as(Integer             ) ] :Optional  :In: Average Variable N\n");
+    fprintf(stderr, "    [-Nor[malizingParameter]NorA                (0.0       ).as(Real                ) \n                         NorB                (1.0       ).as(Real                ) ] :Optional  :In: A + B*x: NormalizingParameter\n");
+    fprintf(stderr, "    [-r[ef]              Ref                 (NULL      ).as(inFileList          ) ] :Optional  :Ref: InputList\n");
+    fprintf(stderr, "    [-R[ef]              Ref2                (NULL      ).as(inFile              ) \n                         Ref2Var             (NULL      ).as(inFile              ) \n                         Ref2N               (0         ).as(Integer             ) ] :Optional  :Ref: Average Variable N\n");
+    fprintf(stderr, "    [-Nor[malizingParameter]RNorARef             (0.0       ).as(Real                ) \n                         NorBRef             (1.0       ).as(Real                ) ] :Optional  :In: A + B*x: NormalizingParameter for Ref\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :Output: Probability\n");
+    fprintf(stderr, "    [-t[Value]           OutT                (NULL      ).as(outFile             ) ] :Optional  :Output: t-value\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 a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 3d9e9ea..2c18fd5 100755 (executable)
@@ -18,7 +18,7 @@
 #undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 
 typedef struct lmrcImageTiltAxisSearchHelpInfo {
index 89e50bd..57db32d 100755 (executable)
@@ -1 +1,30 @@
-/bin/bash: mrcImageTiltAxisSearchHelp: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageTiltAxisSearchHelp</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageTiltAxisSearchHelp</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageTiltAxisSearchHelp
+Options:
+    [-I[nput]            InList              (NULL      ).as(inFileList          ) ] :Essential :Input:ImageFileList
+    [-o[utput]1d         Out1D               (NULL      ).as(outFile             ) ] :Optional  :Output:
+    [-o[utput]1de[nlarged]Out1DEnlarged       (NULL      ).as(outFile             ) ] :Optional  :Output:
+    [-o[utput]2d         Out2D               (NULL      ).as(outFile             ) ] :Optional  :Output:
+    [-a[xis]P[osition]   OriginX             (0.0       ).as(Real                ) 
+                         OriginY             (0.0       ).as(Real                ) 
+                         OriginZ             (0.0       ).as(Real                ) ] :Optional  :Input: AxisPosition
+    [-a[xisAngle]        AxisAngleYaw        (0.0       ).as(Real                ) 
+                         AxisAnglePitch      (0.0       ).as(Real                ) ] :Optional  :Input: AxisAngleYaw/Pitch[degree]
+    [-R                  Rmin                (0.05      ).as(Real                ) 
+                         Rmax                (0.1       ).as(Real                ) ] :Optional  :Input: LowPathFiltering
+    [-Interp[olationMode]InterpolationMode   (2         ).as(Integer             ) ] :Optional  :Input: InterpolationMode
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+-I fileList format
+filename tiltAngle[degree] relativeTiltAxisYaw[degree] relativeTiltAxisPitch[degree] relativePosX[pixel] relativePosY[pixel] relativePosZ[pixel]
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 0bd2ebb..3d1cbd9 100755 (executable)
@@ -32,14 +32,22 @@ check:
                echo making directory; \
                mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
        fi
-       @if [ ! -L src/$(OSTYPE) ]; then \
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; make depend
+
+update:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
                echo making directory; \
-               ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); \
+               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
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; echo "Y" | make update      
 
 cvsupdate::
        cvs -d $(EOS_CVSROOT) update -d 
diff --git a/src/Tools/mrcImage/mrcImageTwoImageTest/doc/Makefile b/src/Tools/mrcImage/mrcImageTwoImageTest/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/mrcImageTwoImageTest/src/.Source b/src/Tools/mrcImage/mrcImageTwoImageTest/src/.Source
new file mode 100755 (executable)
index 0000000..e69de29
index dd44d0d..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -210,18 +210,20 @@ 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 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) ]; \
+       @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
-       @$(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE)
-       @$(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @$(CHGRP) Eos $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
        @echo ---- end of bin
 
 install-wish:
@@ -236,7 +238,6 @@ install-wish:
                $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/*  ;\
                touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
                $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
-               $(CHGRP) Eos $(DSTDIR)/wish/$(OBJECTNAME)/*;\
                echo "---- Tcl/Tk file Installed";\
        fi
 
@@ -250,7 +251,6 @@ install-ruby:
                fi ; \
                $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
                echo "---- Ruby/Tk file Installed"; \
        fi
 
@@ -264,7 +264,6 @@ install-perl:
                fi; \
                $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
                echo "---- Perl/Tk file Installed"; \
        fi
 
@@ -282,7 +281,6 @@ install-shell:
                fi ; \
                $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
-               $(CHGRP) Eos $(DSTDIR)/shell/$(OBJECTNAME)/*; \
                echo "---- Shell file Installed"; \
        fi
 
@@ -309,7 +307,6 @@ install-khoros:
                                $(RM) -f $(OBJECTNAME).pane ; \
                                $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
                                $(CD) ../../ ; \
-                               $(CHGRP) -R Eos $(OBJECTNAME); \
                                $(CHMOD) -R 555 $(OBJECTNAME); \
                        else \
                                echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
@@ -360,12 +357,13 @@ depend::
        @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 ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
        fi
        #echo CC
        @if [ -f $(OBJECTNAME).cc ] ; \
@@ -390,6 +388,9 @@ depend::
 update:../Config/OptionControlFile
        maketool $(CLASSNAME) $(OBJECTNAME) update
 
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
 changeName::
 
 Test:$(OSTYPE)/$(OBJECTNAME) TestDir
@@ -425,5 +426,5 @@ tar::
                                                             ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
                                ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
 
-include $(OSTYPE)/.Depend
-include ../Config/Target.inc
+-include $(OSTYPE)/.Depend
+-include ../Config/Target.inc
index 6d1de40..f458829 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
 void
 argCheck(mrcImageTwoImageTestInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
+    FILE* fpt;
+    
+    if(NULL==(fpt=fopen(".EosLog", "a+"))) { 
+        
+    } else {
+        for(i=0; i<argc; i++) {
+            fprintf(fpt, "%s ", argv[i]);
+        }
+        fprintf(fpt, "\n");
+        fclose(fpt);
+    }
     for(i=1; i<argc; i++) {
         if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) {
             SSWITCH(argv[i]+OPTION_POS)
index 1bfebd9..1373c7b 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -12,8 +12,8 @@
 void
 init0(mrcImageTwoImageTestInfo* info)
 {
-    info->fptIn1 = NULL;    info->fptIn1List = NULL;    info->flagIn1 = 0;
-    info->fptIn2 = NULL;    info->fptIn2List = NULL;    info->flagIn2 = 0;
+    info->fptIn1     = NULL;    info->fptIn1List = NULL;    info->flagIn1 = 0;
+    info->fptIn2     = NULL;    info->fptIn2List = NULL;    info->flagIn2 = 0;
     info->fpttTest = NULL;    info->flagtTest = 0;
     info->fptFTest = NULL;    info->flagFTest = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
@@ -27,7 +27,7 @@ init1(mrcImageTwoImageTestInfo* info)
     int i;
     if(!info->flagIn1) {
         stringGetFromFile(s, "In1", stdin, stdout, 0);
-        info->In1List = stringGetNthWord(s, 1, " ,");
+        info->In1List = stringGetNthWord(s, 1, " ,\t");
         info->flagIn1++;
     }
     if(info->flagIn1) {
@@ -43,7 +43,7 @@ init1(mrcImageTwoImageTestInfo* info)
         fseek(info->fptIn1List, 0L, SEEK_SET);
         i=0;
         while(NULL!=stringGetFromFile(s, "", info->fptIn1List, stdout, 1)) {
-            info->In1[i] = stringGetNthWord(s, 1, " ,");
+            info->In1[i] = stringGetNthWord(s, 1, " ,\t");
             info->fptIn1[i] = fileOpen(info->In1[i],"r");
             i++;
         }
@@ -51,7 +51,7 @@ init1(mrcImageTwoImageTestInfo* info)
     
     if(!info->flagIn2) {
         stringGetFromFile(s, "In2", stdin, stdout, 0);
-        info->In2List = stringGetNthWord(s, 1, " ,");
+        info->In2List = stringGetNthWord(s, 1, " ,\t");
         info->flagIn2++;
     }
     if(info->flagIn2) {
@@ -67,7 +67,7 @@ init1(mrcImageTwoImageTestInfo* info)
         fseek(info->fptIn2List, 0L, SEEK_SET);
         i=0;
         while(NULL!=stringGetFromFile(s, "", info->fptIn2List, stdout, 1)) {
-            info->In2[i] = stringGetNthWord(s, 1, " ,");
+            info->In2[i] = stringGetNthWord(s, 1, " ,\t");
             info->fptIn2[i] = fileOpen(info->In2[i],"r");
             i++;
         }
index 6990fe2..3c13711 100755 (executable)
@@ -1 +1 @@
-/bin/bash: mrcImageTwoImageTest: No such file or directory
+/bin/bash: mrcImageTwoImageTest: そのようなファイルやディレクトリはありません
index a7b1023..ff4cd40 100755 (executable)
@@ -4,7 +4,7 @@
       -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' $EOSBIN/mrcImageTwoImageTest
+        -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOS/bin/mrcImageTwoImageTest
         -H 1  5x1+41+0 'Help' 'help page' $EOS/src/Tools/mrcImage/mrcImageTwoImageTest/doc/mrcImageTwoImageTest.doc help
         -Q 1 0 5.25x1+47+0 'Close'
         -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In1' 'InputDataFileList1' i1
index 5751f34..0ae4829 100755 (executable)
@@ -7,12 +7,12 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i1[nput]           In1                 (NULL      )] :Essential :InputDataFileList1\n");
-    fprintf(stderr, "    [-i2[nput]           In2                 (NULL      )] :Essential :InputDataFileList2\n");
-    fprintf(stderr, "    [-t[-test]           tTest               (NULL      )] :Optional  :OutputDataFile\n");
-    fprintf(stderr, "    [-F[-test]           FTest               (NULL      )] :Optional  :OutputDataFile\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-i1[nput]           In1                 (NULL      ).as(inFileList          ) ] :Essential :InputDataFileList1\n");
+    fprintf(stderr, "    [-i2[nput]           In2                 (NULL      ).as(inFileList          ) ] :Essential :InputDataFileList2\n");
+    fprintf(stderr, "    [-t[-test]           tTest               (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile\n");
+    fprintf(stderr, "    [-F[-test]           FTest               (NULL      ).as(outFile             ) ] :Optional  :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();
 }
 
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 18e99f0..c743d40 100755 (executable)
@@ -56,3 +56,129 @@ 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 d6ee42f..d043c58 100755 (executable)
@@ -1 +1,24 @@
-/bin/bash: mrcImageUnbentROI: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageUnbentROI</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageUnbentROI</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageUnbentROI
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-r[oi]              roiLine             (NULL      ).as(Real                ) ... ] :Variable  :
+    [-x                  x                   (1.0       ).as(Real                ) ] :Essential :Width :Source 
+    [-y                  y                   (1.0       ).as(Real                ) ] :Optional  :Height:Source
+    [-W                  Width               (1.0       ).as(Real                ) ] :Optional  :Width :Dst 
+    [-H                  Height              (1.0       ).as(Real                ) ] :Optional  :Height:Dst 
+    [-cor                Cor                 (360.0     ).as(Real                ) ] :Optional  :Correlation Window along Y-axis [A]
+    [-S[hrink]           Shrink              (1         ).as(Integer             ) ] :Optional  :When inputfile is shrinked:
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 343cbb6..230408d 100755 (executable)
@@ -20,7 +20,7 @@ static char __sccs_id[] = "%Z%mrcImageVarianceAnalysis ver%I%; Date:%D% %Z%";
 #define DEBUG
 #include "genUtil.h"
 #include "File.h"
-#include "String.h"
+#include "eosString.h"
 #include "Memory.h"
 #include "mrcImage.h"
 #include "lmrcImagesStatDataGet.h"
index 5f6e722..fc09dcb 100755 (executable)
@@ -1 +1,43 @@
-/bin/bash: mrcImageVarianceAnalysis: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageVarianceAnalysis</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageVarianceAnalysis</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageVarianceAnalysis
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFileList          ) ] :Optional  :In: InputList
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :Output: Variance Probability
+    [-v[arianceAnalysis] OutV                (NULL      ).as(outFile             ) ] :Optional  :Output: Variance Analysis
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+-i inFileList
+>>>>> Within inFileList
+In1 
+In2 
+... 
+>>>>> Within In1 etc. A + B*density 
+filename1-1 A B 
+.....
+---- Variance Analysis-----
+-- Algorithm
+   VarianceRatio := VarinceBetweenClasses/(SumOfVarianceWithinEachClass)
+                  VarinceBetweenClasses: variance between classes
+                  VarinceWithClasses:    variance within each class 
+                  
+   
+   ---- General Information -----
+   Kai-distribution: Kai^2 = SumOf (Xi - AvgOfXi)^2/sigma^2  
+                           = s^2*(n-1)/sigma^2  : degree of freedom n-1 
+                             when variables Xi are due to N(u, sigma^2)
+   Kai-distribution: Kai^2 = Kai1^2 + Kai2^2 : degree of freedom m1 + m2
+   F-distribution: F = (Kai1^2/k1)/(Kai2^2/k2)           : degree of freedom : (k1, k2)
+                       (s1^2/sigma1^2)/(s2^2/sigma2^2)   : degree of freedom : (k1-1, k2-1)
+   If sigma1 == sigma2, then                    
+                       s1^2/s2^2  (Variance Ratio)       : degree of freedom : (k1-1, k2-1)
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 3230d87..8637479 100755 (executable)
@@ -1,18 +1 @@
-<HTML>
-<HEAD>
-<TITLE>molvie</TITLE>
-</HEAD>
-<BODY>
-<H1>molvie</H1>
-<H2>Usage</H2>
-<PRE>
-Usage: molvie
-Options:
-    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
-    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
-    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
------ Additional Usage -----
-</PRE>
-</BODY>
-</HTML>
+/bin/bash: molvie: そのようなファイルやディレクトリはありません
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index d3bfe6b..08485a5 100755 (executable)
@@ -1,18 +1 @@
-<HTML>
-<HEAD>
-<TITLE>molvieDock</TITLE>
-</HEAD>
-<BODY>
-<H1>molvieDock</H1>
-<H2>Usage</H2>
-<PRE>
-Usage: molvieDock
-Options:
-    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
-    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
-    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
------ Additional Usage -----
-</PRE>
-</BODY>
-</HTML>
+/bin/bash: molvieDock: そのようなファイルやディレクトリはありません
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a37d6aa..b94f740 100755 (executable)
@@ -1,18 +1 @@
-<HTML>
-<HEAD>
-<TITLE>molvieFlight</TITLE>
-</HEAD>
-<BODY>
-<H1>molvieFlight</H1>
-<H2>Usage</H2>
-<PRE>
-Usage: molvieFlight
-Options:
-    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
-    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
-    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
------ Additional Usage -----
-</PRE>
-</BODY>
-</HTML>
+/bin/bash: molvieFlight: そのようなファイルやディレクトリはありません
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 60aa064..fbbd605 100755 (executable)
@@ -1,18 +1 @@
-<HTML>
-<HEAD>
-<TITLE>molvieMrcViewer</TITLE>
-</HEAD>
-<BODY>
-<H1>molvieMrcViewer</H1>
-<H2>Usage</H2>
-<PRE>
-Usage: molvieMrcViewer
-Options:
-    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
-    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
-    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
------ Additional Usage -----
-</PRE>
-</BODY>
-</HTML>
+/bin/bash: molvieMrcViewer: そのようなファイルやディレクトリはありません
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 1e85f32..f5ae1c5 100755 (executable)
@@ -1,18 +1 @@
-<HTML>
-<HEAD>
-<TITLE>molvieProjection</TITLE>
-</HEAD>
-<BODY>
-<H1>molvieProjection</H1>
-<H2>Usage</H2>
-<PRE>
-Usage: molvieProjection
-Options:
-    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
-    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
-    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
------ Additional Usage -----
-</PRE>
-</BODY>
-</HTML>
+/bin/bash: molvieProjection: そのようなファイルやディレクトリはありません
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index bca79ac..ce835d0 100755 (executable)
@@ -1,18 +1 @@
-<HTML>
-<HEAD>
-<TITLE>molvieViewer</TITLE>
-</HEAD>
-<BODY>
-<H1>molvieViewer</H1>
-<H2>Usage</H2>
-<PRE>
-Usage: molvieViewer
-Options:
-    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
-    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
-    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
------ Additional Usage -----
-</PRE>
-</BODY>
-</HTML>
+/bin/bash: molvieViewer: そのようなファイルやディレクトリはありません
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 6db5fbd..a4a042b 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdb2mrc2d: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdb2mrc2d: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdb2mrc2d: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 3c06557..8c39a09 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdb2mrc2dWithCTF: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdb2mrc2dWithCTF: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdb2mrc2dWithCTF: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 4d30343..6c3661c 100755 (executable)
@@ -18,7 +18,7 @@ static char __sccs_id[] = "%Z%pdbAtomSection ver%I%; Date:%D% %Z%";
 #include "pdbFile.h"
 #include "Memory.h"
 #include "psFile.h"
-#include "String.h"
+#include "eosString.h"
 #include "Vector.h"
 
 #undef DEBUG
index a515648..72689ca 100755 (executable)
@@ -1 +1,44 @@
-/bin/bash: pdbAtomSection: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>pdbAtomSection</TITLE>
+</HEAD>
+<BODY>
+<H1>pdbAtomSection</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdbAtomSection
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-i[nput of ]f[lags] InFlags             (NULL      ).as(inFile              ) ] :Optional  :InputFlagsFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-dist[ance]         distance            (2.5       ).as(Real                ) ] :Optional  :DistanceOfSections
+    [-zmin[imum]         zmin                (0.0       ).as(Real                ) ] :Optional  :Minimum of Z
+    [-zmax[imum]         zmax                (90.0      ).as(Real                ) ] :Optional  :Maximum of Z
+    [-f[lag]m[ode]       flagMode            (13        ).as(Integer             ) ] :Optional  :flag mode
+    [-r[adius]           radius              (1.0       ).as(Real                ) ] :Optional  :radius of the circle
+    [-c[ircle]l[ine]w[idth]clinewidth          (0.1       ).as(Real                ) ] :Optional  :circle line width
+    [-p[eptide bond]l[ine]w[idth]plinewidth          (0.1       ).as(Real                ) ] :Optional  :peptide bond line width
+    [-fontsize           fontsize            (2.0       ).as(Real                ) ] :Optional  :font size
+    [-A[bsolute]S[caleofPSFile]scale               (1.0       ).as(Real                ) ] :Optional  :absolute scale of PS file (-AS 1 := 1 mm/A)
+    [-shiftx             shiftx              (0.0       ).as(Real                ) ] :Optional  :pdb Shift x [A]
+    [-shifty             shifty              (0.0       ).as(Real                ) ] :Optional  :pdb Shift y [A]
+    [-shiftz             shiftz              (0.0       ).as(Real                ) ] :Optional  :pdb Shift z [A]
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+
+
+
+format for Flags File
+one line of the file
+chainIdertifier&sequenceNumber(R123) FlagMode circleRedius circlelinewidth fontsize
+FlagMode
+     0: display nothing
+     1: one char amino acid name
+     2: three char amino acid name
+     4: chain identifier
+     8: sequence number
+    16: display any atom
+     default: 13 (display R123T)
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index e1887bb..d9a63fd 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdbChargeFit: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdbChargeFit: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdbChargeFit: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index c7a3ad0..c37d61a 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdbCrystalCreate: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdbCrystalCreate: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdbCrystalCreate: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index f72610e..a4548c8 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdbHelix: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdbHelix: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdbHelix: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index f0f8f44..ebfde53 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdbMatrixCreate: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdbMatrixCreate: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdbMatrixCreate: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 8886a78..420bcc5 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdbPCA: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdbPCA: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdbPCA: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index d6ed1ed..ba95de8 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdbRotation: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdbRotation: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdbRotation: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 253d0ad..1c28df4 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdbShapeFit: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdbShapeFit: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdbShapeFit: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index ac1bf55..dda888d 100755 (executable)
@@ -19,7 +19,7 @@ static char __sccs_id[] = "%Z%pdbTempFactorSet ver%I%; Date:%D% %Z%";
 
 #define DEBUG
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "pdbFile.h"
 
 typedef struct lpdbTempFactorSetInfo {
index 7feca78..fd03bee 100755 (executable)
@@ -1 +1,19 @@
-/bin/bash: pdbTempFactorSet: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>pdbTempFactorSet</TITLE>
+</HEAD>
+<BODY>
+<H1>pdbTempFactorSet</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdbTempFactorSet
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input: pdbFile
+    [-r[eference]        Ref                 (stdin     ).as(inFile              ) ] :Optional  :Input: selectionFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output: pdbFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 8463af7..d91ffe8 100755 (executable)
@@ -6,7 +6,7 @@
 #define DEBUG  
 #include "../inc/config.h"
 #include "pdbFile.h"
-#include "String.h"
+#include "eosString.h"
 #include "genUtil.h"
 #ifdef CUDA
 #include "eosCuda.h"
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 43060c1..71873eb 100755 (executable)
@@ -1,9 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdbTwoProteinFit: そのようなファイルやディレクトリはありません
-=======
-<<<<<<< HEAD
-/bin/bash: pdbTwoProteinFit: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdbTwoProteinFit: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa
->>>>>>> refs/remotes/origin/master
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 0297f10..535261d 100755 (executable)
@@ -1 +1,24 @@
-/bin/bash: mrcImageNeuralNetParticleLearning: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageNeuralNetParticleLearning</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageNeuralNetParticleLearning</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageNeuralNetParticleLearning
+Options:
+    [-i[nput]p[ositive]  InPositive          (NULL      ).as(inFileList          ) ] :Essential :Input: partile image list filename
+    [-i[nput]n[egative]  InNegative          (NULL      ).as(inFileList          ) ] :Essential :Input: background image list filename
+    [-o[utput]           Out                 (NULL      ).as(outFileList         ) ] :Essential :Output: Neural Net Parameters after Learning
+                       FileNameOfWeightForTheBelowLayer NumOfCellOfThisLayer BiasOfThisLayer
+    [-B[ias0]            Bias                (1.0       ).as(Real                ) ] :Optional  :Bias: The value of the bias of the input layer
+    [-max[Counter]       MaxCounter          (10        ).as(Integer             ) ] :Optional  :MaxCounter
+    [-EPS                EPS                 (0.005     ).as(Real                ) ] :Optional  :Final Error
+    [-lambda             Lambda              (0.1       ).as(Real                ) ] :Optional  :step for backpropagation
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a88a50e..e2ba41e 100755 (executable)
@@ -20,7 +20,7 @@
 #include "genUtil.h"
 #include "mrcImage.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #define Maxcounter    5000
 #define EPS           0.005
 #define E             0.1
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index d69641d..867935f 100755 (executable)
@@ -20,7 +20,7 @@
 #include "genUtil.h"
 #include "Memory.h"
 #include "mrcImage.h"
-#include "String.h"
+#include "eosString.h"
 #include "lCommonLineCalculation.h"
 
 typedef struct EulerData{
index b943290..5974a75 100755 (executable)
@@ -1 +1,23 @@
-/bin/bash: CheckCommonLineData: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>CheckCommonLineData</TITLE>
+</HEAD>
+<BODY>
+<H1>CheckCommonLineData</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: CheckCommonLineData
+Options:
+    [-I[nput]            In                  (NULL      ).as(inFileListNoOpen    ) ] :Essential :InputDataFileList
+    [-o[utput]R[eal]     OutR                (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-o[utput]I[m]       OutI                (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-o[utput]L[ength]   OutL                (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-o[utput]P[hase]    OutP                (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-o[utput]LL         OutLL               (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-Log                Log                 (NULL      ).as(outFile             ) ] :Essential :LogFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 6a06303..a058b1a 100755 (executable)
@@ -20,7 +20,7 @@
 #include "genUtil.h"
 #include "Memory.h"
 #include "Matrix3D.h"
-#include "String.h"
+#include "eosString.h"
 
 typedef struct lCheckOfOrientationInfo {
        int        FileNum;
index 6f680e3..71bf2b1 100755 (executable)
@@ -1 +1,23 @@
-/bin/bash: CheckOfOrientation: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>CheckOfOrientation</TITLE>
+</HEAD>
+<BODY>
+<H1>CheckOfOrientation</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: CheckOfOrientation
+Options:
+    [-I[nputFileList]    InList              (NULL      ).as(inFileListNoOpen    ) ] :Essential :InputDataFileList
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-o[utput]v[alue]    OutV                (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+
+----------- Output file  -------------
+-o  : output Matrix data
+-ov : output Value data
+
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 82ef5c4..ce8e276 100755 (executable)
@@ -19,7 +19,7 @@
 #define WORDLEN 1024
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "Matrix3D.h"
 
 typedef struct EulerAngleInfo {
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 754987d..01e58cb 100755 (executable)
@@ -19,7 +19,7 @@
 #include "genUtil.h"
 #include "Matrix3D.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "lCommonLineCalculation.h"
 
 #define WORDLEN 1024
index 6d2f4f2..e7f5b07 100755 (executable)
@@ -1 +1,42 @@
-/bin/bash: CommonLineCalculation: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>CommonLineCalculation</TITLE>
+</HEAD>
+<BODY>
+<H1>CommonLineCalculation</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: CommonLineCalculation
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Optional  :InputDataFile
+    [-I[nputfilelist]    InList              (NULL      ).as(inFileListNoOpen    ) ] :Optional  :InputDatalistFile
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (1         ).as(Integer             ) ] :Optional  :Mode
+    [-I[nput]m[ode]      Inputmode           (0         ).as(Integer             ) ] :Optional  :InputMode
+
+----- mode -----
+-m : 0 : in 2004/07/22 
+     1 : in 2004/09/23 (vector product)
+
+----- input file format -----
+-Im : 0
+RotationalMode1 angle1 angle2 angle3 RotationalMode2 angle1 angle2 angle3
+RotationalMode1 angle1 angle2 angle3 RotationalMode2 angle1 angle2 angle3
+      .           .      .      .          .           .      .      .   
+      .           .      .      .          .           .      .      .   
+      .           .      .      .          .           .      .      .   
+      .           .      .      .          .           .      .      .   
+      .           .      .      .          .           .      .      .   
+
+-Im : 1
+filename RotationalMode angle1 angle2 angle3
+   .           .           .      .      .  
+   .           .           .      .      .  
+   .           .           .      .      .  
+   .           .           .      .      .  
+   .           .           .      .      .  
+
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 68336ca..4d4fac0 100755 (executable)
@@ -19,7 +19,7 @@
 #define WORDLEN 256
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 
 typedef struct lLCalculationForOrientationSearchInfo {
        int    num;
index 3d1464c..d2937a0 100755 (executable)
@@ -1 +1,18 @@
-/bin/bash: LCalculationForOrientationSearch: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>LCalculationForOrientationSearch</TITLE>
+</HEAD>
+<BODY>
+<H1>LCalculationForOrientationSearch</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: LCalculationForOrientationSearch
+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 a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index c554de9..19e2b7f 100755 (executable)
@@ -1 +1,38 @@
-/bin/bash: ProjectionDirectionMapCreate: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>ProjectionDirectionMapCreate</TITLE>
+</HEAD>
+<BODY>
+<H1>ProjectionDirectionMapCreate</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: ProjectionDirectionMapCreate
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-p[ost]s[cript]     Ps                  (NULL      ).as(outFile             ) ] :Optional  :OutputPostScriptFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-R[otation]m[ode]   Rmode               (0         ).as(Integer             ) ] :Optional  :Mode
+----- Rotational Mode -----
+Final rotation of projection is only Z .
+
+----- input file format -----
+filename rotationalmode angle angle angle
+   .             .        .     .     .  
+   .             .        .     .     .  
+   .             .        .     .     .  
+   .             .        .     .     .  
+
+----- mode -----
+-m : 0 : Not separate plus and minus of theta. Create one line data
+     1 :     separate plus and minus of theta. Create one line data
+     2 :     separate plus and minus of theta. Create two line data
+     3 : Mollweide expressionn
+----- mode -----
+-Rm : 0 : Not change rotational mode
+      1 :     Change rotational mode to ZONS
+
+</PRE>
+</BODY>
+</HTML>
index 0bd2ebb..3d1cbd9 100755 (executable)
@@ -32,14 +32,22 @@ check:
                echo making directory; \
                mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
        fi
-       @if [ ! -L src/$(OSTYPE) ]; then \
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; make depend
+
+update:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
                echo making directory; \
-               ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); \
+               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
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; echo "Y" | make update      
 
 cvsupdate::
        cvs -d $(EOS_CVSROOT) update -d 
deleted file mode 120000 (symlink)
index 128f578763ae95bb2d19011cf70eb7157b8880c3..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-/home/people/takashiu/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..8215199e1b812b793f7b4d14ffc255baef0373dc
--- /dev/null
@@ -0,0 +1,2 @@
+install:
+       cd ../src; make install-doc; cd ../doc  
index dd44d0d..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -210,18 +210,20 @@ 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 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) ]; \
+       @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
-       @$(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE)
-       @$(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @$(CHGRP) Eos $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
        @echo ---- end of bin
 
 install-wish:
@@ -236,7 +238,6 @@ install-wish:
                $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/*  ;\
                touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
                $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
-               $(CHGRP) Eos $(DSTDIR)/wish/$(OBJECTNAME)/*;\
                echo "---- Tcl/Tk file Installed";\
        fi
 
@@ -250,7 +251,6 @@ install-ruby:
                fi ; \
                $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
                echo "---- Ruby/Tk file Installed"; \
        fi
 
@@ -264,7 +264,6 @@ install-perl:
                fi; \
                $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
                echo "---- Perl/Tk file Installed"; \
        fi
 
@@ -282,7 +281,6 @@ install-shell:
                fi ; \
                $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
-               $(CHGRP) Eos $(DSTDIR)/shell/$(OBJECTNAME)/*; \
                echo "---- Shell file Installed"; \
        fi
 
@@ -309,7 +307,6 @@ install-khoros:
                                $(RM) -f $(OBJECTNAME).pane ; \
                                $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
                                $(CD) ../../ ; \
-                               $(CHGRP) -R Eos $(OBJECTNAME); \
                                $(CHMOD) -R 555 $(OBJECTNAME); \
                        else \
                                echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
@@ -360,12 +357,13 @@ depend::
        @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 ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
        fi
        #echo CC
        @if [ -f $(OBJECTNAME).cc ] ; \
@@ -390,6 +388,9 @@ depend::
 update:../Config/OptionControlFile
        maketool $(CLASSNAME) $(OBJECTNAME) update
 
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
 changeName::
 
 Test:$(OSTYPE)/$(OBJECTNAME) TestDir
@@ -425,5 +426,5 @@ tar::
                                                             ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
                                ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
 
-include $(OSTYPE)/.Depend
-include ../Config/Target.inc
+-include $(OSTYPE)/.Depend
+-include ../Config/Target.inc
index f1fa947..22cd0da 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -12,7 +12,7 @@
 void
 argCheck(TestForLcalculationOfOrientationSearchBySimultaneousMinimizationInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
     FILE* fpt;
     
index ae110d6..b7fd3bf 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -36,7 +36,7 @@ init1(TestForLcalculationOfOrientationSearchBySimultaneousMinimizationInfo* info
     int i;
     if(!info->flagIn) {
         stringGetFromFile(s, "In", stdin, stdout, 0);
-        info->InList = stringGetNthWord(s, 1, " ,");
+        info->InList = stringGetNthWord(s, 1, " ,\t");
         info->flagIn++;
     }
     if(info->flagIn) {
@@ -52,14 +52,14 @@ init1(TestForLcalculationOfOrientationSearchBySimultaneousMinimizationInfo* info
         fseek(info->fptInList, 0L, SEEK_SET);
         i=0;
         while(NULL!=stringGetFromFile(s, "", info->fptInList, stdout, 1)) {
-            info->In[i] = stringGetNthWord(s, 1, " ,");
+            info->In[i] = stringGetNthWord(s, 1, " ,\t");
             i++;
         }
     }
     
     if(!info->flagiid) {
         stringGetFromFile(s, "iid", stdin, stdout, 0);
-        info->iid = stringGetNthWord(s, 1, " ,");
+        info->iid = stringGetNthWord(s, 1, " ,\t");
         info->flagiid++;
     }
     if(info->flagiid) {
@@ -68,7 +68,7 @@ init1(TestForLcalculationOfOrientationSearchBySimultaneousMinimizationInfo* info
     
     if(!info->flagOut) {
         stringGetFromFile(s, "Out", stdin, stdout, 0);
-        info->Out = stringGetNthWord(s, 1, " ,");
+        info->Out = stringGetNthWord(s, 1, " ,\t");
         info->flagOut++;
     }
     if(info->flagOut) {
index fbf51b5..49d03f2 100755 (executable)
@@ -7,21 +7,21 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-I[nputFileList]    In                  (NULL      )] :Essential :InputDataFileList\n");
-    fprintf(stderr, "    [-i[nput]i[nitial]d[ata]iid                 (NULL      )] :Essential :InputInitialDataFile\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
-    fprintf(stderr, "    [-m[ode]2            mode2               (0         )] :Optional  :Mode2\n");
-    fprintf(stderr, "    [-dt[heta]           dtheta              (0         )] :Optional  :dtheta\n");
-    fprintf(stderr, "    [-dp[si]             dpsi                (0         )] :Optional  :dpsi\n");
-    fprintf(stderr, "    [-e[rror]p[oint]     ep                  (0         )] :Optional  :ErrorPoint\n");
-    fprintf(stderr, "    [-m[ode]L[calculation]modeL               (0         )] :Optional  :Mode of L calculation\n");
-    fprintf(stderr, "    [-m[ode]T[hreshold]A[ngularweight]modeTA              (0         )] :Optional  :Mode of threshold of Angular weight\n");
-    fprintf(stderr, "    [-L[ogFile]          Log                 (stdout    )] :Optional  :LogFileName\n");
-    fprintf(stderr, "    [-L[ogFile]2         Log2                (stdout    )] :Optional  :LogFileName2 : phi theta psi\n");
-    fprintf(stderr, "    [-m[rcImage]2[D]     m2                  (NULL      )] :Optional  :mrcImage 2D name\n");
-    fprintf(stderr, "    [-m[rcImage]3[D]     m3                  (NULL      )] :Optional  :mrcImage 3D name\n");
+    fprintf(stderr, "    [-I[nputFileList]    In                  (NULL      ).as(inFileListNoOpen    ) ] :Essential :InputDataFileList\n");
+    fprintf(stderr, "    [-i[nput]i[nitial]d[ata]iid                 (NULL      ).as(inFile              ) ] :Essential :InputInitialDataFile\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");
+    fprintf(stderr, "    [-m[ode]2            mode2               (0         ).as(Integer             ) ] :Optional  :Mode2\n");
+    fprintf(stderr, "    [-dt[heta]           dtheta              (0         ).as(Integer             ) ] :Optional  :dtheta\n");
+    fprintf(stderr, "    [-dp[si]             dpsi                (0         ).as(Integer             ) ] :Optional  :dpsi\n");
+    fprintf(stderr, "    [-e[rror]p[oint]     ep                  (0         ).as(Integer             ) ] :Optional  :ErrorPoint\n");
+    fprintf(stderr, "    [-m[ode]L[calculation]modeL               (0         ).as(Integer             ) ] :Optional  :Mode of L calculation\n");
+    fprintf(stderr, "    [-m[ode]T[hreshold]A[ngularweight]modeTA              (0         ).as(Integer             ) ] :Optional  :Mode of threshold of Angular weight\n");
+    fprintf(stderr, "    [-L[ogFile]          Log                 (stdout    ).as(outFile             ) ] :Optional  :LogFileName\n");
+    fprintf(stderr, "    [-L[ogFile]2         Log2                (stdout    ).as(outFile             ) ] :Optional  :LogFileName2 : phi theta psi\n");
+    fprintf(stderr, "    [-m[rcImage]2[D]     m2                  (NULL      ).as(outFile             ) ] :Optional  :mrcImage 2D name\n");
+    fprintf(stderr, "    [-m[rcImage]3[D]     m3                  (NULL      ).as(outFile             ) ] :Optional  :mrcImage 3D name\n");
     additionalUsage();
 }
 
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index bc0ad46..03eb6b3 100755 (executable)
@@ -1 +1,32 @@
-/bin/bash: WeightCalculationOfCommonLineSearch: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>WeightCalculationOfCommonLineSearch</TITLE>
+</HEAD>
+<BODY>
+<H1>WeightCalculationOfCommonLineSearch</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: WeightCalculationOfCommonLineSearch
+Options:
+    [-I[nput]            In                  (NULL      ).as(inFileList          ) ] :Essential :InputDataFileList
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-L[ength]T[hreshold]M[ode]LengthThresholdMode (0         ).as(Integer             ) ] :Essential :Length threshold mode in LengthCorrelation
+    [-L[ength]T[hreshold]R[atio]LengthThresholdRatio(0.25      ).as(Real                ) ] :Optional  :Length threshold ratio in LengthCorrelation : -LTM=0
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+
+----- Mode -----
+-m :
+    0 : Addition weight
+    1 : Multiplication weight
+
+----- input file format -----
+filename(sin) rotationalmode angle angle angle
+   .                .          .     .     .  
+   .                .          .     .     .  
+   .                .          .     .     .  
+   .                .          .     .     .  
+
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 41f177a..78ddb41 100755 (executable)
@@ -1 +1,36 @@
-/bin/bash: WeightCalculationOfCommonLineSearchByAllSinogram: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>WeightCalculationOfCommonLineSearchByAllSinogram</TITLE>
+</HEAD>
+<BODY>
+<H1>WeightCalculationOfCommonLineSearchByAllSinogram</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: WeightCalculationOfCommonLineSearchByAllSinogram
+Options:
+    [-I[nput]1           In1                 (NULL      ).as(inFileListNoOpen    ) ] :Optional  :InputDataFileList1 : normal correlation
+    [-I[nput]2           In2                 (NULL      ).as(inFileListNoOpen    ) ] :Optional  :InputDataFileList2 : derivation1D correlation
+    [-I[nput]3           In3                 (NULL      ).as(inFileListNoOpen    ) ] :Optional  :InputDataFileList3 : derivation2D correlation
+    [-I[nput]4           In4                 (NULL      ).as(inFileListNoOpen    ) ] :Optional  :InputDataFileList4 : length correlation
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-M[ode]             Mode                (15        ).as(Integer             ) ] :Optional  :Mode : choice of used Correlation
+    [-v[ariance]         variance            (5         ).as(Real                ) ] :Optional  :variance of Gaussian weight function
+
+----- Mode -----
+-M : 1 : ued to Normal Correlation
+     2 : ued to Derivation1D Correlation
+     4 : ued to Derivation2D Correlation
+     8 : ued to Length Correlation
+    15 : ued to All Correlation
+     (* inupt sum)
+
+
+----- mode -----
+-m : 0 :       get memory of mrcImage 
+     1 : don't get memory of mrcImage 
+
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 6518fd5..f1dfcdd 100755 (executable)
@@ -19,7 +19,7 @@ static char __sccs_id[] = "%Z%ll2ltlg ver%I%; Date:%D% %Z%";
 #undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "llData.h"
 #include "ltlgData.h"
index 2637261..ea690d7 100755 (executable)
@@ -1 +1,32 @@
-/bin/bash: ll2ltlg: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>ll2ltlg</TITLE>
+</HEAD>
+<BODY>
+<H1>ll2ltlg</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: ll2ltlg
+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
+    [-t[itle]            Title               (NULL      ).as(String              ) ] :Optional  :Title
+    [-l[lMax]            llMax               (1         ).as(Integer             ) ] :Optional  :llMax
+    [-D[elRInv]          delRInv             (1.0       ).as(Real                ) ] :Optional  :delRInv[A]
+    [-R[MaxInv]          RMaxInv             (1.0       ).as(Real                ) ] :Optional  :RMaxInv[A]
+    [-d[elr]             delr                (1.0       ).as(Real                ) ] :Optional  :delr[A]
+    [-r[Max]             rMax                (1.0       ).as(Real                ) ] :Optional  :rMax[A]
+    [-f[lagOutputInfo]   flagOutputInfo      (0         ).as(Integer             ) ] :Optional  :flagOutputInfo
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+>> controlFile Format : replaced by other options which are definitely shown.
+
+Title  [char*80]
+InFile [char*80]
+OutFile[char*80]
+InveseOfllDataSamplingSize[Angstrom] llMax llDataMuxiumResolution[Angstrom]
+ltlgDataSamplingSize[Angstrom] ltlgDataMaximumRadius[Angstrom]
+IList(mode)
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 67f04b6..718368e 100755 (executable)
@@ -214,3 +214,94 @@ 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;
+        } 
+    } 
+} 
index 9116448..d01099c 100755 (executable)
@@ -100,7 +100,7 @@ additionalUsage()
 }
 
 #include <stdio.h>
-#include "String.h"
+#include "eosString.h"
 #include "Memory.h"
 #include "File.h"
 void
@@ -282,7 +282,7 @@ configFileRead(FILE* fpt, llExtractInfo* info)
 }
 
 #include <stdio.h>
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 void
 configFileUsage(FILE* fpt)
index 533c434..4e1da99 100755 (executable)
@@ -1 +1,59 @@
-/bin/bash: llExtract: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>llExtract</TITLE>
+</HEAD>
+<BODY>
+<H1>llExtract</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: llExtract
+Options:
+    [-t[itle]            Title               (NULL      ).as(String              ) ] :Optional  :Title[80]
+    [-s[tep]             xStep               (1.0       ).as(Real                ) 
+                         yStep               (1.0       ).as(Real                ) ] :Optional  :Step[A]
+    [-M[ax]              MaxX                (1.0       ).as(Real                ) 
+                         MaxY                (1.0       ).as(Real                ) ] :Optional  :Max[GridUnit]
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Optional  :InputDataFile[mrcImage]
+    [-1[output]          Nea                 (NULL      ).as(outFile             ) ] :Optional  :NearSide[llData]
+    [-2[output]          Far                 (NULL      ).as(outFile             ) ] :Optional  :FarSide [llData]
+    [-R[otationAngle]    RotationAngle       (0.0       ).as(Real                ) ] :Optional  :Ratation Angle [Degree]
+    [-O[mega]            Omega               (0.0       ).as(Real                ) ] :Optional  :Omega[Degree]
+    [-S[hear]            Shear               (0.0       ).as(Real                ) ] :Optional  :Shear[Degree]
+    [-I[every]           ievery              (0         ).as(Integer             ) ] :Optional  :ievery
+    [-axl                axl                 (0.0       ).as(Real                ) ] :Optional  :axl
+    [-ayl                ayl                 (0.0       ).as(Real                ) ] :Optional  :ayl
+    [-x[Shift]           xShift              (0.0       ).as(Real                ) ] :Optional  :[GridUnit]
+    [-l[lMax]            llMax               (0         ).as(Integer             ) ] :Optional  :
+    [-d[elRInv]          delRInv             (0.0       ).as(Real                ) ] :Optional  :[A]
+    [-f[lagOutputInfo]                                                             ] :Optional  :
+    [-L[ayerLineInfo]    n                   (0         ).as(Integer             ) 
+                         l                   (0         ).as(Integer             ) 
+                         Y                   (0.0       ).as(Real                ) 
+                         leftMin             (0.0       ).as(Real                ) 
+                         leftMax             (0.0       ).as(Real                ) 
+                         rightMin            (0.0       ).as(Real                ) 
+                         rightMax            (0.0       ).as(Real                ) 
+                         weight              (1.0       ).as(Real                ) ... ] :Variable  :
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+----- Control File -----
+Title[String:NULL]                             #Title[80]
+xStep[Real:1.0]        yStep[Real:1.0]                         #Step[A]
+MaxX[Real:1.0] MaY[Real:1.0]                           #Max[GridUnit]
+In[inFile:NULL]                                #InputDataFile[mrcImage]
+Nea[outFile:NULL]                              #NearSide[llData]
+Far[outFile:NULL]                              #FarSide [llData]
+RotationAngle[Real:0.0]                                #Ratation Angle [Degree]
+Omega[Real:0.0]                                #Omega[Degree]
+Shear[Real:0.0]                                #Shear[Degree]
+ievery[Integer:0]                              #ievery
+axl[Real:0.0]                          #axl
+ayl[Real:0.0]                          #ayl
+xShift[Real:0.0]                               #[GridUnit]
+llMax[Integer:0]                               #
+delRInv[Real:0.0]                              #[A]
+flagOutputInfo[0or1]                   #
+n[Integer:0]   l[Integer:0]    Y[Real:0.0]     leftMin[Real:0.0]       leftMax[Real:0.0]       rightMin[Real:0.0]      rightMax[Real:0.0]      weight[Real:1.0]                                #
+...............
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 86bb5ae..d607043 100755 (executable)
@@ -20,7 +20,7 @@ static char __sccs_id[] = "%Z%llDataWithLayerSeparation ver%I%; Date:%D% %Z%";
 
 #define DEBUG
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 #include "mrcImage.h"
index ab6b161..562eb27 100755 (executable)
@@ -1 +1,93 @@
-/bin/bash: llExtractWithLayerSeparation: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>llExtractWithLayerSeparation</TITLE>
+</HEAD>
+<BODY>
+<H1>llExtractWithLayerSeparation</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: llExtractWithLayerSeparation
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFileListNoOpen    ) ] :Essential :InputDataFile(mrcImage:Fourier Space)
+    [-I[nput]            InLLNea             (NULL      ).as(inFileListNoOpen    ) 
+                         InLLFar             (NULL      ).as(inFileListNoOpen    ) ] :Optional  :InputDataFile(llData:Already separated)
+    [-r[ef]              Ref                 (NULL      ).as(inFile              ) ] :Optional  :ReferenceData(llData:Gnl(R) Space)
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile(llData: Average File)
+    [-o2[utput]          Out2                (NULL      ).as(outFileListNoOpen   ) ] :Optional  :OutputDataFileList(llData: Each Filament which has the same orientation as average)
+    [-o3[utput]          Out3                (NULL      ).as(outFileListNoOpen   ) ] :Optional  :OutputDataFileList(llData: Difference of each filament)
+    [-o4[utput]          Out4                (NULL      ).as(outFileListNoOpen   ) ] :Optional  :OutputDataFileList(llData: Each Filament which has the same orientaion as original filament)
+    [-o5[utput]          Out5                (NULL      ).as(outFileListNoOpen   ) ] :Optional  :OutputDataFileList(mrcImage: P-Value)
+    [-o6[utput]          Out6                (NULL      ).as(outFileListNoOpen   ) ] :Optional  :OutputDataFileList(mrcImage: Q-Value)
+    [-o7[utput]          Out7                (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile(Text: Two subsets for resolution estimation)
+    [-o8[utput]          Out8                (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile(Text: For Back Projection)
+    [-o9[utput]          Out9                (NULL      ).as(outFileListNoOpen   ) ] :Optional  :OutputDataFileList(Text: x shift, z shift and dY information)
+    [-comment            InComment           (NULL      ).as(String              ) ] :Optional  :Comment
+    [-symmetry           symmetry            (1.0       ).as(Real                ) ] :Optional  :Symmetry for back projection text file
+    [-l[ayerInfo]        llInfo              (NULL      ).as(inFileListNoOpen    ) ] :Essential :LayerLineInformation
+    [-l[ayerInfo]final   llInfoFinal         (NULL      ).as(inFile              ) ] :Optional  :LayerLineInformation(Final)
+    [-li[ayerInfo]       llInfoImp           (NULL      ).as(inFileListNoOpen    ) ] :Optional  :LayerLineInformationImportant
+    [-liw[ayerInfo]      liWeight            (1.0       ).as(Real                ) ] :Optional  :Weight of Important Layer
+    [-liwStart[ayerInfo] liWeightStart       (1.0       ).as(Real                ) ] :Optional  :Weight of Important Layer
+    [-liwStep[ayerInfo]  liWeightStep        (1.0       ).as(Real                ) ] :Optional  :Weight of Important Layer
+    [-la[ayerInfo]       llInfoAxis          (NULL      ).as(inFileListNoOpen    ) ] :Optional  :LayerLineInformationForAxisSearch
+    [-law[ayerInfo]      laWeight            (1.0       ).as(Real                ) ] :Optional  :Weight of Important Layer for AS
+    [-lawStart[ayerInfo] laWeightStart       (1.0       ).as(Real                ) ] :Optional  :Weight of Important Layer for AS
+    [-lawStep[ayerInfo]  laWeightStep        (1.0       ).as(Real                ) ] :Optional  :Weight of Important Layer for AS
+    [-truePitch          truePitch           (430.0     ).as(Real                ) ] :Essential :true pitch [A]
+    [-rMax               rMax                (100.0     ).as(Real                ) ] :Essential :rMax [A]
+    [-rMaxMin            rMaxMin             (100.0     ).as(Real                ) ] :Optional  :rMaxMin [A]
+    [-RMax               RMax                (0.1       ).as(Real                ) ] :Optional  :RMax [/A]
+    [-RMaxFirst          RMaxFirst           (0.04      ).as(Real                ) ] :Optional  :RMaxFirst [/A]: Def: RMax
+    [-RMaxStep           RMaxStep            (0.02      ).as(Real                ) ] :Optional  :RMaxStep [/A]
+    [-RRMax              RRMax               (0.1       ).as(Real                ) ] :Optional  :Radial RMax [/A]
+    [-RRMaxFirst         RRMaxFirst          (0.04      ).as(Real                ) ] :Optional  :Radial RMaxFirst [/A]: Def: RMax
+    [-RRMaxStep          RRMaxStep           (0.02      ).as(Real                ) ] :Optional  :Radial RMaxStep [/A]
+    [-delBR              delBR               (0.0002    ).as(Real                ) ] :Optional  :delBR [/A]
+    [-rms                rms                 (1e-6      ).as(Real                ) ] :Optional  :rms:
+    [-narrowSearch       narrowSearch        (1.0       ).as(Real                ) ] :Optional  :narrowSearch[Degree]: P-Value and Q-Value
+    [-nextTimes          nextTimes           (1e-4      ).as(Real                ) ] :Optional  :nextTimes: rms
+    [-maxIter[ation]     MaxIteration        (10        ).as(Integer             ) ] :Optional  :max iteration:
+    [-maxIter2[ation]    MaxIter2            (1         ).as(Integer             ) ] :Optional  :max iteration on the same RMax and RRMax:
+    [-maxIter3[ation]    MaxIter3            (1         ).as(Integer             ) ] :Optional  :max iteration on the same RMax, RRMax, and Weight:
+    [-lambda             lambda              (1.0       ).as(Real                ) ] :Optional  :labda:
+    [-ctf                CTF                 (0         ).as(Integer             ) ] :Optional  :CTF Compensation
+    [-WhiteNoise         WhiteNoise          (0.0       ).as(Real                ) ] :Optional  :White Noise
+    [-below              below               (90.0      ).as(Real                ) ] :Optional  :below
+    [-noantipole                                                                   ] :Optional  :No Antipole
+    [-magLimit                                                                     ] :Optional  :magLimit
+    [-eachTime                                                                     ] :Optional  :each time
+    [-continue           Continue            (NULL      ).as(inFile              ) ] :Optional  :continue
+    [-forContinue        ForContinue         (NULL      ).as(outFile             ) ] :Optional  :For continue
+    [-phi                phimin              (0.0       ).as(Real                ) 
+                         phimax              (360.0     ).as(Real                ) 
+                         delphi              (10.0      ).as(Real                ) ] :Optional  :phi:[degree]
+    [-z                  zmin                (0.0       ).as(Real                ) 
+                         zmax                (30.0      ).as(Real                ) 
+                         delz                (5.0       ).as(Real                ) ] :Optional  :z:[A]
+    [-shift              shiftmin            (-10.0     ).as(Real                ) 
+                         shiftmax            (10.0      ).as(Real                ) 
+                         delshift            (1.0       ).as(Real                ) ] :Optional  :shift:[A]
+    [-log                Log                 (stdout    ).as(outFile             ) ] :Optional  :LogFile
+    [-Normalization                                                                ] :Optional  :Normalization
+    [-pvm                pvm                 (0         ).as(Integer             ) ] :Optional  :pvmNumber
+    [-pvmList            pvmList             (NULL      ).as(inFile              ) ] :Optional  :pvmList
+    [-pvmServer                                                                    ] :Optional  :Work as a server !!
+    [-pvmClient                                                                    ] :Optional  :Work as a client !!
+    [-wd                 WorkingDir          (./        ).as(String              ) ] :Optional  :Working Directory !!
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+-m 0: The 1st version algorism(Sharing)
+-m 1: The 2nd version algorism(Least Square)
+>> -ctf option <<
+----- Mode -----
+    0: |CTFi|/Sigma(SQR(CTFi))
+    1:  CTFi /Sigma(SQR(CTFi))
+>> If -ctf, the file list indicated by -i must include the below information
+filename weight  defocus[A] Cs[mm] AccV[kV] ratioOfAmpToPhase mode
+>> llDataSepartionControlFile <<
+llMax(different)
+nl Z numberOfN n0 n1 n2...
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index de364f4..127f53d 100755 (executable)
@@ -19,7 +19,7 @@ static char __sccs_id[] = "@(#)ltlg2mrc ver1.6; Date:97/05/23 @(#)";
 #include "genUtil.h"
 #include "Memory.h"
 #include "File.h"
-#include "String.h"
+#include "eosString.h"
 #include "ltlgData.h"
 #include "mrcImage.h"
 
index 5289d4a..23986c0 100755 (executable)
@@ -1 +1,60 @@
-/bin/bash: ltlg2mrc: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>ltlg2mrc</TITLE>
+</HEAD>
+<BODY>
+<H1>ltlg2mrc</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: ltlg2mrc
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Optional  :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-t[itle]            Title               (NULL      ).as(String              ) ] :Optional  :Title
+    [-d[elta]            delta               (2.5       ).as(Real                ) ] :Optional  :delta[A]
+    [-C                  RepeatDistance      (2.5       ).as(Real                ) ] :Optional  :RepeatDistance[A]
+    [-r[Max]             rMax                (2.5       ).as(Real                ) ] :Optional  :rMax[A]
+    [-p[hiStart]         phiStart            (0         ).as(Real                ) ] :Optional  :phiStart[degree]
+    [-zmi[n]             zMin                (0.0       ).as(Real                ) ] :Optional  :zMin
+    [-zma[x]             zMax                (55.0      ).as(Real                ) ] :Optional  :zMax
+    [-zde[lta]           deltaz              (2.5       ).as(Real                ) ] :Optional  :deltaz
+    [-w[eight]           WeightOf0thLayer    (0.5       ).as(Real                ) ] :Optional  :WeightOf0thLayer
+    [-l[Weight]          Layer               (NULL      ).as(inFile              ) ] :Optional  :Layer WeightOfEachLayer
+    [-f9[9]                                                                        ] :Optional  :IF(NN(LL)!=NL(LL)) WT(LL) = 0.0
+    [-O[ffset]           CUT                 (0.5       ).as(Real                ) ] :Optional  :CUT
+    [-a[mean]            Mean                (0.0       ).as(Real                ) ] :Optional  :Mean
+    [-s[igma]            Sigma               (0.0       ).as(Real                ) ] :Optional  :Sigma
+    [-I[nverse]                                                                    ] :Optional  :Nega-Posi Reverse
+    [-n[otInteractive]                                                             ] :Optional  :not Intaracitve
+    [-AntiPole                                                                     ] :Optional  :Anti Pole: zmax -> zmin:  Else zmin->zmax
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :
+                               0: Normarize
+                               1: Not Normarize bu edge average is zero.
+                               2: Not Normarize
+                               defalt: 0
+Mode:
+
+
+If control file is used, control file fora filename to output
+
+InputFileName(char[72])A])
+Title(char[60])A])
+Y|N(char[1])                              : No use
+deltaX[A](if Y)||deltaY[A](if N)(F10.5)   : You need not care for deltaX or deltaY in this tool because deltaX = deltaY. You had better care for that for compatibility.
+C[A]rMax[A](2F7.0)                        : C[A]: Spacing of the 1st layer line in real space ; rMax: Maximum of radial elements.
+phiStart[degree](F7.0)                    : phi at Z = 0
+zMin[A],zMax[A],deltaz[A](3F7.0)          : z-section parameters for(z=zMin; z<zMax; z+=deltaz)
+Weight(F7.0)                              : Weight of the 0th layer line
+NNL,WEIGHT(I2,F8.0)                       : IF(NNL==99 && NN(LL)!=NL(LL)) WT(LL) = 0.0; IF(NNL!=0 && NNL==NL(LL)) WT(LL) = WEIGHT  and Repeat until NNL == 0 or 99 or None
+ACUT(F7.0)                                : IF(ACUT>Density[x][y]) Density[x][y]= 0.0
+Mean,Sigma(2F7.0)                         : Mean : Mean of hrzData?; Sigma : Standard Deviation of hrzData?
+OutputFile                                : hrz-data filename to output
+
+#### Attention ####
+ In using this tool, you need not keep promises about format(F7.0 etc.).
+Instead, you need separate numbers with more space than one.
+Usually compatible but you need care when numbers have a line with no space.
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 1364659..fd98d31 100755 (executable)
@@ -19,7 +19,7 @@
 #define DEBUG
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "eosPoint.h"
 
 typedef struct lmarker2Dto3DEstimatorInfo {
index 4010305..83e4804 100755 (executable)
@@ -1 +1,31 @@
-/bin/bash: marker2Dto3DEstimator: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>marker2Dto3DEstimator</TITLE>
+</HEAD>
+<BODY>
+<H1>marker2Dto3DEstimator</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: marker2Dto3DEstimator
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFileList::ASCII   ) ] :Essential :Input: 
+    [-i[nput]t[ype]      InType              (2         ).as(Integer             ) ] :Optional  :Input: 
+    [-o[utput]           Out                 (NULL      ).as(outFileList::ASCII  ) ] :Essential :Output: 
+    [-o[utput]t[ype]     OutType             (2         ).as(Integer             ) ] :Optional  :Input: 
+    [-o[utput]EA         OutEA               (NULL      ).as(outFileList::ASCII  ) ] :Essential :Output: 
+    [-zero               ZeroPlane           (0         ).as(Integer             ) ] :Optional  :Zero Plane
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+----- input; -i  -----
+-i pointListPerEachImage
+point2d.000 YOYS tiltAngle0 tiltAxisBeta0 tiltAxisAlpha0 axisShiftX0 axisShiftY0
+point2d.001 YOYS tiltAngle1 tiltAxisBeta1 tiltAxisAlpha1 axisShiftX1 axisShiftY1
+.....
+EachFile::eosPoint(type)
+x0 y0 0 weight0 sigx0 sigy0 0
+x1 y1 0 weight1 sigx1 sigy1 0
+.....
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 907c43a..96c19ff 100755 (executable)
@@ -19,7 +19,7 @@ static char __sccs_id[] = "%Z%mrc2Dto3D ver%I%; Date:%D% %Z%";
 #include "../inc/config.h"
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 #include "Matrix3D.h"
 #include "eosPThread.h"
index f01f680..6583451 100755 (executable)
@@ -1 +1,72 @@
-/bin/bash: mrc2Dto3D: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrc2Dto3D</TITLE>
+</HEAD>
+<BODY>
+<H1>mrc2Dto3D</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrc2Dto3D
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Optional  :InputDataFile
+    [-I[nput]            In2                 (NULL      ).as(inFileListNoOpen    ) ] :Optional  :InputDataFile
+    [-each                                                                         ] :Optional  :Read each projection file if necessary, not at once.
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-O[utput]           Out2                (NULL      ).as(outFile             ) ] :Optional  :OutputDataFile[2DMulti]
+    [-Rmax               Rmax                (1.0       ).as(Real                ) ] :Optional  :Rmax: High Cut [/A]
+    [-single             single              (1         ).as(Integer             ) ] :Optional  :SingleTiltMode
+    [-singleFilter       singleFilter        (0         ).as(Integer             ) ] :Optional  :SingleFilterMode
+    [-InterpolationMode  InterpolationMode   (1         ).as(Integer             ) ] :Optional  :InterpolationMode
+    [-Double                                                                       ] :Optional  :DoubleTiltMode
+    [-DoubleCounter      DoubleCounter       (NULL      ).as(outFile             ) ] :Optional  :DoubleCounter
+    [-CounterThreshold   CounterThreshold    (1e-6      ).as(Real                ) ] :Optional  :CounterThreshold
+    [-CounterThresholdModeCounterThresholdMode(0         ).as(Integer             ) ] :Optional  :CounterThresholdMode
+    [-WeightMode         WeightMode          (0         ).as(Integer             ) ] :Optional  :WeightMode
+    [-thicknessWeight                                                              ] :Optional  :ThicknessWeight
+    [-Sub[Sampling]      SubSampling         (1         ).as(Integer             ) ] :Optional  :SubSampling: [pixel]
+    [-PlusXrot                                                                     ] :Optional  :plus x-rotation by 180 for rasmol.
+    [-N                  Nx                  (0         ).as(Integer             ) 
+                         Ny                  (0         ).as(Integer             ) 
+                         Nz                  (0         ).as(Integer             ) ] :Optional  :OutputSize
+    [-SIRT                                                                         ] :Optional  :by SIRT
+    [-max[Iter]          maxIter             (30        ).as(Integer             ) ] :Optional  :MaxIteration for SIRT
+    [-rms                rms                 (1.0       ).as(Real                ) ] :Optional  :Ending Conditions: rms for SIRT
+    [-CTF[Info]          CTFInfo             (NULL      ).as(inFileList          ) ] :Optional  :CTFInfo: for SIRT
+    [-pthread            pthreadMax          (1         ).as(Integer             ) ] :Optional  :pthread: max
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+-m Option
+    0:SimpleBackProjection
+    1:FilteredBackProjection(Fourier Space)
+    2:WeightedBackProjection(Real Space)
+-single 0|1 
+    0: tilt axis is parallel to x-axis
+    1: tilt axis is parallel to y-axis
+-singleFilter 0|1|2 
+    0: simple rho filter
+    1: Ram-Lak Filter
+    2: Shepp-Logan Filter
+-Double 
+    Double Tilt 
+-WeightMode 
+    1 : RealSpace: Circle(same density)
+    2 : RealSpace: Circle(weighted density)
+    3 : RealSpace: Square(weighted density) 
+    4 : Fourier Space : Plane(same density) -CounterThreshold 0.5
+    5 : Fourier Space : Plane(Linear Gradient)-CounterThreshold 0.5
+    6 : Fourier Space : Plane(Cosine Gradient) Current Recommende using -CounterThreshold 0.5
+-------------------------------
+-I Option file format
+filename0 RotationOrder0 rot1 rot2 rot3
+filename1 RotationOrder1 rot1 rot2 rot3
+.......................................
+>>> RotationOrder : Eular Angle Expression <<< 
+Example: YOYS : RotY(rot3)RotX(rot2)RotY(rot1)*v
+First Rotation  : y-axis : Y: Y     : [X|Y|Z] Axis used initially
+Second Rotation : x-axis : O: Odd   : [O|E]   Parity of axis permutation
+Last Rotation   : z-axis : Y: Yes   : [Y|N]   Repetition of initial axis as last
+v1 = A v0                : S: Staic : [S|R]   Frame from which axes are taken
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 0c261d8..1757c2c 100755 (executable)
@@ -19,7 +19,7 @@
 #include "genUtil.h"
 #include "mrcImage.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "lCommonLineCalculation.h"
 
 #define WORDLEN 1024
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 6a0aa5c..e7c5331 100755 (executable)
@@ -1 +1,26 @@
-/bin/bash: mrcImageOrientationSearchByHigherSelection: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageOrientationSearchByHigherSelection</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageOrientationSearchByHigherSelection</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageOrientationSearchByHigherSelection
+Options:
+    [-I[nputFileList]    In                  (NULL      ).as(inFileListNoOpen    ) ] :Essential :InputDataFileList
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-n[umber]           n                   (10        ).as(Integer             ) ] :Optional  :Number of selection
+
+----- Input file format -----
+filename LminAve
+   .        .   
+   .        .   
+   .        .   
+   .        .   
+
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index adbf1dc..af4719d 100755 (executable)
@@ -1 +1,40 @@
-/bin/bash: mrcImageOrientationSearchByHybridization: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageOrientationSearchByHybridization</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageOrientationSearchByHybridization</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageOrientationSearchByHybridization
+Options:
+    [-I[nputFileLiest]   In                  (NULL      ).as(inFileListNoOpen    ) ] :Essential :InputDataFileList
+    [-o[utput]           Out                 (NULL      ).as(String              ) ] :Essential :OutputDataFileHeader
+    [-e[xtension]        extension           (NULL      ).as(String              ) ] :Essential :OutputDataFileExtension
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-i[ncrease]r[ate]   ir                  (1         ).as(Integer             ) ] :Optional  :IncreaseRate
+    [-h[ybridization]p[oint]n[umber]hpn                 (1         ).as(Integer             ) ] :Optional  :HybridizationPointNumber
+    [-m[ode]s[election]  ms                  (0         ).as(Integer             ) ] :Optional  :ModeOfSelection
+    [-i[nitial]r[andom]d[ata]ird                 (0         ).as(Integer             ) ] :Optional  :InitialRandomData
+
+>> This algrithm use results of mrcImageOrientationSearchBySimultaneousMinimization
+
+----- IncreaseRate -----
+-ir : 1 >> Increase number is 45 (filenum = 10)
+      2 >> Increase number is 90 (filenum = 10)
+
+----- HybridizationPointNumber -----
+-hpn : The number of hybridization points 
+
+----- Mode of selection -----
+-ms : 0 : random
+      1 : myself (-ird)
+
+----- Mode -----
+-m : 0 : create children angle file
+     1 : do not create children angle file , create match angle file
+
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 67f40d7..37fba60 100755 (executable)
@@ -1 +1,80 @@
-/bin/bash: mrcImageOrientationSearchBySimultaneousMinimization: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageOrientationSearchBySimultaneousMinimization</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageOrientationSearchBySimultaneousMinimization</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageOrientationSearchBySimultaneousMinimization
+Options:
+    [-I[nputFileList]    In                  (NULL      ).as(inFileListNoOpen    ) ] :Essential :InputDataFileList
+    [-o[utput]           Out                 (NULL      ).as(outFileNoOpen       ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+    [-dt[heta]           dtheta              (1         ).as(Real                ) ] :Optional  :dtheta
+    [-dp[si]             dpsi                (1         ).as(Real                ) ] :Optional  :dpsi
+    [-m[odeof]s[election]ms                  (0         ).as(Integer             ) ] :Optional  :modeofselection
+    [-i[nitial]r[andom]d[ata]ird                 (1         ).as(Integer             ) ] :Optional  :InitialRandomData
+    [-M[ax]C[ount]       MC                  (100       ).as(Integer             ) ] :Optional  :MaxCount
+    [-F[ileName]H[eader] FileNameHeader      (EulerAngle).as(String              ) ] :Optional  :FileNameHeader
+    [-m[odeof]i[nitial]d[ada]mid                 (0         ).as(Integer             ) ] :Optional  :modeofinitialdata
+    [-i[nputFile]i[nitial]d[ata]InInitial           (NULL      ).as(inFile              ) ] :Optional  :InputDataFileOfInitialData
+    [-m[odeof]s[tart]p[oint]msp                 (0         ).as(Integer             ) ] :Optional  :mode of start point
+    [-m[odeof]a[ngular]a[rea]maa                 (0         ).as(Integer             ) ] :Optional  :mode of angular area
+    [-p[revious]dt[heta] pdtheta             (0         ).as(Integer             ) ] :Optional  :previous dtheta
+    [-p[revious]dp[si]   pdpsi               (0         ).as(Integer             ) ] :Optional  :previous dpsi
+    [-m[ode]L[calculation]modeL               (0         ).as(Integer             ) ] :Optional  :Mode of L calculation
+    [-m[ode]T[hreshold]A[ngularweight]modeTA              (0         ).as(Integer             ) ] :Optional  :Mode of Threshold of AngularWeight
+    [-m[ode]c[alculation]a[rea]modeCA              (0         ).as(Integer             ) ] :Optional  :mode of Lvalue of calculation area
+    [-t[hreshold]c[alculation]a[rea]TCA                 (0         ).as(Real                ) ] :Optional  :Threshold of Lvalue of calculation area
+    [-m[ode]f[ix]        modeF               (0         ).as(Integer             ) ] :Optional  :mode of fix
+
+----- ModeSelection -----
+-ms : 0 : random
+    : 1 : myself (-ird)
+
+----- Mode --------------
+-m : 0 : input data --> sinogram
+   : 1 :            --> sinogramFT
+
+----- Angle -------------
+-dt    : DEGREE
+-dp    : DEGREE
+-pdt   : DEGREE
+-pdp   : DEGREE
+
+----- ModeOfInitialData -------------
+-mid : 0 : There is not initial data
+       1 : There is     initial data (-iid)
+
+----- ModeOfLcalculation -------------
+-mL : 0 : differential of length
+      1 : differential of phase
+      2 : addition to derivation1D (multiply)
+      3 : addition to derivation1D (difference)
+
+----- ModeOfThresholdAngularWeight -------------
+-mTA : 0 : 1.0e-4
+       1 : 1 degree
+       2 : dpsi
+
+----- ModeOfStartPoint -------------
+-msp : 0 : origin
+       1 : initial data (-iid)
+
+----- ModeOfAngularArea -------------
+-maa : 0 : all area
+       1 : aroud previous delta (-pdt -pdp)
+
+----- ModeOfCalculationArea -------------
+-mca : 0 : all area
+       1 : cut under -tca(1/angstrom)
+
+----- ModeOfFix -------------
+-mf : 0 : don't fix one plane
+      1 :       fix one plane (first file is fixed)
+
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index e02d867..a600263 100755 (executable)
@@ -18,7 +18,7 @@
 #define DEBUG
 #include "genUtil.h"
 #include "Memory.h"
-#include "String.h"
+#include "eosString.h"
 #include "mrcImage.h"
 #include "Matrix3D.h"
 #include "lmrcImageRhoFiltering.h"
index 8ee1d74..bc7179c 100755 (executable)
@@ -1 +1,29 @@
-/bin/bash: mrcRadon2Dto3D: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcRadon2Dto3D</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcRadon2Dto3D</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcRadon2Dto3D
+Options:
+    [-I[nput]            In2                 (NULL      ).as(inFileList          ) ] :Essential :InputDataFileList
+    [-I[nput]b[efore]    InBefore            (NULL      ).as(inFileList          ) ] :Optional  :InputDataFileListBefore
+    [-i[nput]b[efore]    inbefore            (NULL      ).as(inFile              ) ] :Optional  :InputDataFileBeforeData: mrcImageRadon3D
+    [-i[nput]w[eight]b[efore]inWbefore           (NULL      ).as(inFile              ) ] :Optional  :InputWeightDataFileBeforeData: mrcImageRadon3D
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile: radon3D
+    [-o[utput]w[eight]   OutW                (NULL      ).as(outFile             ) ] :Essential :OutputDataFile: weight
+    [-dp                 dp                  (2.0       ).as(Real                ) ] :Essential :Input: deltaP
+    [-dtheta             dtheta              (1         ).as(Real                ) ] :Essential :Input: deltaTheta
+    [-dphi               dphi                (1         ).as(Real                ) ] :Essential :Input: deltaPhi
+    [-T[hreshold]        T                   (1.0       ).as(Real                ) ] :Optional  :Threshold
+    [-InterpolationMode  InterpolationMode   (0         ).as(Integer             ) ] :Optional  :InterpolationMode
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Radon2Dto3D Intepolation Mode
+
+----- mode -----
+ 0 = NearestNeighbor
+ 1 = HigherOrder     (-T)
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 8b88b3d..a2c6148 100755 (executable)
@@ -21,7 +21,7 @@ static char __sccs_id[] = "%Z%energyTransferModelCheck ver%I%; Date:%D% %Z%";
 
 #undef DEBUG
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "Memory.h"
 #include "mrcImage.h"
 #include "mrcImage.h"
index e526c78..848f159 100755 (executable)
@@ -1 +1,64 @@
-/bin/bash: energyTransferModelCheck: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>energyTransferModelCheck</TITLE>
+</HEAD>
+<BODY>
+<H1>energyTransferModelCheck</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: energyTransferModelCheck
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-p[db]              PDB                 (NULL      ).as(inFile              ) ] :Optional  :Excluded Area by PDB: Input[PDB]
+    [-P[dbs]             PDBs                (NULL      ).as(inFileList          ) ] :Optional  :Excluded Area by PDB: Input[PDBFileList]
+    [-P[DBs]W[ithInfo]                                                             ] :Optional  :PDBFileList With Info: filename sigma[A]
+    [-sigma              sigma               (1.0       ).as(Real                ) ] :Optional  :SigmaOfAtom for All: sigma [pixel]x delta[A/pixel]
+    [-sigmaA             sigmaA              (1.0       ).as(Real                ) ] :Optional  :SigmaOfAtom for All: sigma [A]
+    [-mrc                MRC                 (NULL      ).as(inFile              ) ] :Optional  :Excluded Area by mrc: Input[MRC]
+    [-MRC                MRCs                (NULL      ).as(inFileList          ) ] :Optional  :Excluded Area by MRC: Input[MRCFileList]
+    [-MRCW[ithInfo]                                                                ] :Optional  :MRCFileList with Info: filename contour near[A]
+    [-C[ontour]          EContour            (10.       ).as(Real                ) ] :Optional  :ContourLevel for Exclusion: Density<ContourLevel -> 0
+    [-Near               ENear               (1.        ).as(Real                ) ] :Optional  :Near [pixel]: Exclusion Area: near[pixel] x delta [A/pixel]
+    [-NearA              ENearA              (1.        ).as(Real                ) ] :Optional  :Near [A]: Exclusion Area: near [A]
+    [-r[estrict]         Rest                (NULL      ).as(inFile              ) ] :Optional  :Restricted Area: Input[mrc]
+    [-R[estrict]         Rests               (NULL      ).as(inFileList          ) ] :Optional  :Restricted Area: InputDataFileList[mrcs]
+    [-contour            Contour             (10.       ).as(Real                ) ] :Optional  :ContourLevel for Restriction
+    [-near               Near                (1.        ).as(Real                ) ] :Optional  :Near [pixel]: Restriction Area: near[pixel] x delta [A/pixel]
+    [-nearA              NearA               (1.        ).as(Real                ) ] :Optional  :Near [A]: Restriction Area: near[A] 
+    [-R[estrictWithInfo]                                                           ] :Optional  :WithInfo: filename contour near[A]
+    [-r[estrict]P        RestP               (NULL      ).as(inFile              ) ] :Optional  :Restricted Area: InputDataFile[pdb]
+    [-R[estrict]P        RestsP              (NULL      ).as(inFileList          ) ] :Optional  :Restricted Area: InputDataFileList[pdbs]: format: filename near[pixel]
+    [-sigmaP             SigmaP              (1.        ).as(Real                ) ] :Optional  :Sigma[pixel]: Restriction Area: sigma x delta [A]
+    [-sigmaPA            SigmaPA             (1.        ).as(Real                ) ] :Optional  :Sigma[A]: Restriction Area: sigma [A]
+    [-nearP              NearP               (1.        ).as(Real                ) ] :Optional  :Near [pixel]: Restriction Area: near x delta [A]
+    [-nearPA             NearPA              (1.        ).as(Real                ) ] :Optional  :Near [A]: Restriction Area: near [A]
+    [-R[estrict]PW                                                                 ] :Optional  :WithInfo: filename near[A] sigma[A]
+    [-delta              deltax              (5         ).as(Real                ) 
+                         deltay              (5         ).as(Real                ) 
+                         deltaz              (5         ).as(Real                ) ] :Optional  :delta [A]
+    [-sdelta             sdeltax             (5         ).as(Real                ) 
+                         sdeltay             (5         ).as(Real                ) 
+                         sdeltaz             (5         ).as(Real                ) ] :Optional  :starting delta [A]
+    [-start              startx              (5         ).as(Real                ) 
+                         starty              (5         ).as(Real                ) 
+                         startz              (5         ).as(Real                ) ] :Optional  :start [A]
+    [-end                endx                (5         ).as(Real                ) 
+                         endy                (5         ).as(Real                ) 
+                         endz                (5         ).as(Real                ) ] :Optional  :end [A]
+    [-maxIter            maxIter             (1         ).as(Integer             ) ] :Optional  :Max Iteration 
+    [-startIter          startIter           (0         ).as(Integer             ) ] :Optional  :Start Iteration 
+    [-neglect            neglect             (1e-4      ).as(Real                ) ] :Optional  :neglect: probability for each term: not final probability
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+----- Point Information : Each ID has no space character. -----
+ID fix     x y z rootB radius(noUse)
+......
+ID unfix   x y z rootB radius
+......
+ID connect ID length rootB
+......
+</PRE>
+</BODY>
+</HTML>
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index 4dbb018..3d1cbd9 100755 (executable)
@@ -36,7 +36,18 @@ check:
        @$(RM) src/Makefile
        @echo "New src/Makefile" 
        @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
-       @cd src; touch $(OSTYPE)/.Depend; make depend
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; make depend
+
+update:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
+               echo making directory; \
+               mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
+       fi
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; rm -f $(OSTYPE)/.Depend; touch $(OSTYPE)/.Depend; echo "Y" | make update      
 
 cvsupdate::
        cvs -d $(EOS_CVSROOT) update -d 
deleted file mode 120000 (symlink)
index e35804f775b978dd4820ad5f2b4685ac38f78349..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-/home/people/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..8215199e1b812b793f7b4d14ffc255baef0373dc
--- /dev/null
@@ -0,0 +1,2 @@
+install:
+       cd ../src; make install-doc; cd ../doc  
index 7beb110..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
@@ -388,6 +388,9 @@ depend::
 update:../Config/OptionControlFile
        maketool $(CLASSNAME) $(OBJECTNAME) update
 
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
 changeName::
 
 Test:$(OSTYPE)/$(OBJECTNAME) TestDir
diff --git a/src/Tools/utils/angleMatchTest_k/src/X86MAC64 b/src/Tools/utils/angleMatchTest_k/src/X86MAC64
new file mode 120000 (symlink)
index 0000000..078c03e
--- /dev/null
@@ -0,0 +1 @@
+../../../../../hostdepend/X86MAC64/src/Tools/utils/angleMatchTest_k/src/X86MAC64
\ No newline at end of file
index f93c39b..a3f1a42 100755 (executable)
@@ -16,7 +16,7 @@
 #include "../inc/config.h"
 
 #define DEBUG
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 
 #include "genUtil.h"
index a0276dd..d0c4dad 100755 (executable)
@@ -1 +1,26 @@
-/bin/bash: angleMatchTest_k: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>angleMatchTest_k</TITLE>
+</HEAD>
+<BODY>
+<H1>angleMatchTest_k</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: angleMatchTest_k
+Options:
+    [-i[nput]1           In1                 (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-i[nput]2           In2                 (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-s[tep]s[ize]       SS                  (15        ).as(Integer             ) ] :Optional  :StepSize
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Optional  :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+>>>>> InputFileFormat
+filename MODE Rot1 Rot2 Rot3
+....
+>>>>> Algorithm 
+1. Calc each unit directional vector
+   (sin(Rot2)*cos(Rot1), sin(Rot2)*sin(Rot1), cos(Rot2))
+</PRE>
+</BODY>
+</HTML>
index 3e8af6f..66e5b1c 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
@@ -12,7 +12,7 @@
 void
 argCheck(angleMatchTest_kInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
     FILE* fpt;
     
index 1511ca3..df09830 100755 (executable)
@@ -4,7 +4,7 @@
 #include <math.h>
 #include "../inc/config.h"
 #include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
 #include "File.h"
 #include "Memory.h"
 
index a5685c7..3689d54 100755 (executable)
@@ -7,12 +7,12 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]1           In1                 (NULL      )] :Essential :InputDataFile\n");
-    fprintf(stderr, "    [-i[nput]2           In2                 (NULL      )] :Essential :InputDataFile\n");
-    fprintf(stderr, "    [-s[tep]s[ize]       SS                  (15        )] :Optional  :StepSize\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (stdout    )] :Optional  :OutputDataFile\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-i[nput]1           In1                 (NULL      ).as(inFile              ) ] :Essential :InputDataFile\n");
+    fprintf(stderr, "    [-i[nput]2           In2                 (NULL      ).as(inFile              ) ] :Essential :InputDataFile\n");
+    fprintf(stderr, "    [-s[tep]s[ize]       SS                  (15        ).as(Integer             ) ] :Optional  :StepSize\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Optional  :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();
 }
 
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
index a360703..8c06a54 100755 (executable)
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -219,8 +219,8 @@ $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME
        then \
                echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
-               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
-               $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
        else \
                echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi