OSDN Git Service

updated: mrcImageClusterAnalysis for pthread
authorTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Sat, 3 Jan 2015 06:42:56 +0000 (15:42 +0900)
committerTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Sat, 3 Jan 2015 06:42:56 +0000 (15:42 +0900)
283 files changed:
hostdepend/X86MAC64/bin/X86MAC64/mrcImageClusterAnalysis
hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a
hostdepend/X86MAC64/lib/X86MAC64/shared/fftn.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcFETnormalizeBySD.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcFFTExpression.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcFFTInfo.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImage3DPad.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImage3DWindowing.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAddValue.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAddValueCuda.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAverage.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageBandPassFilter.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageBilateralFilter.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageBinarization.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFCompensation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFDetermination.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFObservation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFSN.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCVE.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCalcArea.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageClusterAnalysis.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCommonLine.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageConnectivityNumberCalc.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCorrelation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCorrelationinSpace.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDeconvolution.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDensity.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDensityNormalizationByImage.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDifferential.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageEdge.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageEdgeAverage.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFFT.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFOMCalc.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFeatureExtraction.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFeatureExtractionCoOccurrence.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFilterCreate.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFloating.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFourierNeighborCorrelation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFourierPowerSpectrum.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFourierShellCorrelation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageHighPassFilter.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageHighlighting.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageHoughTransform.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageLabeling.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageLowPassFilter.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMasking.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMirroring.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageModeChange.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageModelCreate.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMontageCreate.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMorphology.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMove.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMultiCTFCompensation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageNormalizing.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageOneLineSimilarityCalc.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagePad.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagePixelSummationOfProbabilityGetByImage.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagePrewitt.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageROI2D.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageROInotChangeHeaderLength.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRadialDistribution.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRhoFiltering.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRoberts.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRotation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSSDA.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSecondNoiseReductionByRelaxationRValueSet.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageShapePCA.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageShift.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSigmaCalculate.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSinogram.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSinogramCorrelation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSmoothing.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSobel.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSplit.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageStack.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSymmetryFind.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTfunction.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTransformDescartesIntoPolar.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTriming.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageVolumeCalc.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageWindowing.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesFTest.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesStatDataGet.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesTTest.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesVarianceAnalysis.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesVarianceMap.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFET.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETPCA.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETcalcWeight.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETcorrelationMap.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETnormalizedMap.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETreferredCorrelation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETsmoothParameterMatching.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageCheckFFT.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageDataSet.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageError.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageGet.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageGetPixels.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageGetPixelsCUDA.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageInfo.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageInit.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageOperation.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImagePrint.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageRead.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageSectionGet.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageSet.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageToIntImage.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite2.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImagefuncmin.sharedo
hostdepend/X86MAC64/lib/X86MAC64/shared/mrcRefUtil.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/fftn.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcFETnormalizeBySD.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcFFTExpression.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcFFTInfo.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DPad.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DWindowing.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAddValue.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAddValueCuda.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAverage.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageBandPassFilter.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageBilateralFilter.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageBinarization.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFCompensation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFDetermination.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFObservation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFSN.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCVE.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCalcArea.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageClusterAnalysis.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCommonLine.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageConnectivityNumberCalc.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelationinSpace.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDeconvolution.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDensity.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDensityNormalizationByImage.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDifferential.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageEdge.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageEdgeAverage.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFFT.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFOMCalc.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFeatureExtraction.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFeatureExtractionCoOccurrence.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFilterCreate.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFloating.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFourierNeighborCorrelation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFourierPowerSpectrum.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFourierShellCorrelation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageHighPassFilter.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageHighlighting.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageHoughTransform.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageLabeling.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageLowPassFilter.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMasking.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMirroring.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageModeChange.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageModelCreate.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMontageCreate.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMorphology.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMove.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMultiCTFCompensation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageNormalizing.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageOneLineSimilarityCalc.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePad.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePixelSummationOfProbabilityGetByImage.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePrewitt.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageROI2D.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageROInotChangeHeaderLength.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRadialDistribution.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRhoFiltering.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRoberts.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRotation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSSDA.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSecondNoiseReductionByRelaxationRValueSet.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageShapePCA.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageShift.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSigmaCalculate.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSinogram.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSinogramCorrelation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSmoothing.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSobel.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSplit.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSymmetryFind.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageTfunction.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageTransformDescartesIntoPolar.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageTriming.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageVolumeCalc.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageWindowing.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesFTest.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesStatDataGet.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesTTest.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesVarianceAnalysis.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesVarianceMap.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFET.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETPCA.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETcalcWeight.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETcorrelationMap.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETnormalizedMap.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETreferredCorrelation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETsmoothParameterMatching.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageCheckFFT.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageDataSet.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageError.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageGet.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageGetPixels.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageGetPixelsCUDA.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageInfo.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageInit.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImagePrint.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageRead.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSectionGet.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSet.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageToIntImage.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageWrite.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageWrite2.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImagefuncmin.sharedo
hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcRefUtil.sharedo
hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86MAC64/mrcImageClusterAnalysis
include/lmrcImageClusterAnalysis.h
include/lmrcImageCorrelation.h
src/Config/x86Mac64.inc
src/Objects/DataManip/mrcImage/doc/mrcImage.html
src/Objects/DataManip/mrcImage/src/.lmrcImageHoughTransform.c.swp [deleted file]
src/Objects/DataManip/mrcImage/src/: [deleted file]
src/Objects/DataManip/mrcImage/src/lmrcFETnormalizeBySD.c
src/Objects/DataManip/mrcImage/src/lmrcImageAverage.c
src/Objects/DataManip/mrcImage/src/lmrcImageBinarization.c
src/Objects/DataManip/mrcImage/src/lmrcImageCTFCompensation.c
src/Objects/DataManip/mrcImage/src/lmrcImageCalcArea.c
src/Objects/DataManip/mrcImage/src/lmrcImageClusterAnalysis.c
src/Objects/DataManip/mrcImage/src/lmrcImageClusterAnalysis.h
src/Objects/DataManip/mrcImage/src/lmrcImageCommonLine.c
src/Objects/DataManip/mrcImage/src/lmrcImageConnection.c
src/Objects/DataManip/mrcImage/src/lmrcImageCorrelation.c
src/Objects/DataManip/mrcImage/src/lmrcImageCorrelation.h
src/Objects/DataManip/mrcImage/src/lmrcImageDeconvolution.c
src/Objects/DataManip/mrcImage/src/lmrcImageDensity.c
src/Objects/DataManip/mrcImage/src/lmrcImageDensityNormalizationByImage.c
src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c
src/Objects/DataManip/mrcImage/src/lmrcImageFOMCalc.c
src/Objects/DataManip/mrcImage/src/lmrcImageHoughTransform.c
src/Objects/DataManip/mrcImage/src/lmrcImageLabeling.c
src/Objects/DataManip/mrcImage/src/lmrcImageLowPassFilter.c
src/Objects/DataManip/mrcImage/src/lmrcImageOneLineSimilarityCalc.c
src/Objects/DataManip/mrcImage/src/lmrcImageRadialDistribution.c
src/Objects/DataManip/mrcImage/src/lmrcImageRhoFiltering.c
src/Objects/DataManip/mrcImage/src/lmrcImageShift.c
src/Objects/DataManip/mrcImage/src/lmrcImageSinogram.c
src/Objects/DataManip/mrcImage/src/lmrcImageSinogramCorrelation.c
src/Objects/DataManip/mrcImage/src/lmrcImageSolventFlattening.c
src/Objects/DataManip/mrcImage/src/lmrcImageSymmetryFind.c
src/Objects/DataManip/mrcImage/src/lmrcImageTransformDescartesIntoPolar.c
src/Objects/DataManip/mrcImage/src/lmrcImageWindowing.c
src/Objects/DataManip/mrcImage/src/lmrcImagesVarianceAnalysis.c
src/Objects/DataManip/mrcImage/src/lmrcImagesVarianceMap.c
src/Objects/DataManip/mrcImage/src/lmrcSinogramFET.c
src/Objects/DataManip/mrcImage/src/lmrcSinogramFETsmoothParameterMatching.c
src/Objects/DataManip/mrcImage/src/mrcImageGet.c
src/Objects/DataManip/mrcImage/src/mrcImageGetPixels.c
src/Objects/DataManip/mrcImage/src/mrcImageWrite2.c
src/Tools/Config/Define.inc
src/Tools/Makefile [changed from file to symlink]
src/Tools/mrcImage/mrcImageClusterAnalysis/Config/OptionControlFile
src/Tools/mrcImage/mrcImageClusterAnalysis/inc/mrcImageClusterAnalysis.h
src/Tools/mrcImage/mrcImageClusterAnalysis/src/argCheck.c
src/Tools/mrcImage/mrcImageClusterAnalysis/src/init.c
src/Tools/mrcImage/mrcImageClusterAnalysis/src/mrcImageClusterAnalysis.c
src/Tools/mrcImage/mrcImageClusterAnalysis/src/mrcImageClusterAnalysis.html
src/Tools/mrcImage/mrcImageClusterAnalysis/src/mrcImageClusterAnalysis.pane
src/Tools/mrcImage/mrcImageClusterAnalysis/src/test/Makefile
src/Tools/mrcImage/mrcImageClusterAnalysis/src/usage.c

index 4215dc4..e657469 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageClusterAnalysis and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageClusterAnalysis differ
index 68d6d1f..d71f00c 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a differ
index f961535..b493f9b 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a differ
index e3d079d..d812c0d 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/fftn.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/fftn.sharedo differ
index 6729dc2..a692efc 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcFETnormalizeBySD.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcFETnormalizeBySD.sharedo differ
index 9e54a1f..5ac1c4e 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcFFTExpression.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcFFTExpression.sharedo differ
index da05bb3..d1a58de 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcFFTInfo.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcFFTInfo.sharedo differ
index 83b170b..e4913ba 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImage3DPad.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImage3DPad.sharedo differ
index 8d6f582..4459f43 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImage3DWindowing.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImage3DWindowing.sharedo differ
index 9c31879..d4601d5 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAddValue.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAddValue.sharedo differ
index 142a776..014ab51 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAddValueCuda.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAddValueCuda.sharedo differ
index e498713..6f94f8d 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAverage.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAverage.sharedo differ
index ab6d226..3b2a63a 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageBandPassFilter.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageBandPassFilter.sharedo differ
index 6ec7591..5094a3d 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageBilateralFilter.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageBilateralFilter.sharedo differ
index e752cf6..8934f57 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageBinarization.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageBinarization.sharedo differ
index 4f2e8cd..213f778 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFCompensation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFCompensation.sharedo differ
index a44bddf..61c3eef 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFDetermination.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFDetermination.sharedo differ
index 2fc8ba2..a897155 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFObservation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFObservation.sharedo differ
index 28f9efc..6225328 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFSN.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFSN.sharedo differ
index 6de67ec..c415740 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCVE.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCVE.sharedo differ
index 940b55f..c29603e 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCalcArea.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCalcArea.sharedo differ
index 27dc380..74a5ec6 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageClusterAnalysis.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageClusterAnalysis.sharedo differ
index 955755c..5dc2871 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCommonLine.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCommonLine.sharedo differ
index 7131280..d9dda25 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageConnectivityNumberCalc.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageConnectivityNumberCalc.sharedo differ
index 3d97882..afb806c 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCorrelation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCorrelation.sharedo differ
index 8543bb1..2e31276 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCorrelationinSpace.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCorrelationinSpace.sharedo differ
index 3d48198..a728c26 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDeconvolution.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDeconvolution.sharedo differ
index 4c183df..200dd1a 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDensity.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDensity.sharedo differ
index 046207a..267f168 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDensityNormalizationByImage.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDensityNormalizationByImage.sharedo differ
index 0d33c6a..bf6bbb5 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDifferential.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageDifferential.sharedo differ
index e73aa7c..ae28556 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageEdge.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageEdge.sharedo differ
index 0331c0d..2f5faac 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageEdgeAverage.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageEdgeAverage.sharedo differ
index 7ce1bb7..f8678fd 100755 (executable)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFFT.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFFT.sharedo differ
index 871cb9b..94b3704 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFOMCalc.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFOMCalc.sharedo differ
index 536c943..8cf0cd1 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFeatureExtraction.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFeatureExtraction.sharedo differ
index 29318a3..e59c34f 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFeatureExtractionCoOccurrence.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFeatureExtractionCoOccurrence.sharedo differ
index f046199..8d23d5f 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFilterCreate.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFilterCreate.sharedo differ
index 9cbeac2..44aa54a 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFloating.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFloating.sharedo differ
index 66c8f06..7f0d254 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFourierNeighborCorrelation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFourierNeighborCorrelation.sharedo differ
index ac8c55c..47860f7 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFourierPowerSpectrum.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFourierPowerSpectrum.sharedo differ
index 156d942..b13bb32 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFourierShellCorrelation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFourierShellCorrelation.sharedo differ
index 91ebfdb..d288154 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageHighPassFilter.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageHighPassFilter.sharedo differ
index df3dd84..39b85ab 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageHighlighting.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageHighlighting.sharedo differ
index 2a36a7a..96c0b06 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageHoughTransform.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageHoughTransform.sharedo differ
index 87f20bf..5316be9 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageLabeling.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageLabeling.sharedo differ
index 7960808..beb1a97 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageLowPassFilter.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageLowPassFilter.sharedo differ
index 55a8f5f..9f0b87f 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMasking.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMasking.sharedo differ
index 457b2bf..ccb96ff 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMirroring.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMirroring.sharedo differ
index b2694a4..6b1333b 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageModeChange.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageModeChange.sharedo differ
index f6a3aca..186b47a 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageModelCreate.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageModelCreate.sharedo differ
index cb0bffb..482d903 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMontageCreate.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMontageCreate.sharedo differ
index 3b8c9cd..af58131 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMorphology.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMorphology.sharedo differ
index 41aa3b8..8a8642f 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMove.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMove.sharedo differ
index 38f40b2..48e08ae 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMultiCTFCompensation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageMultiCTFCompensation.sharedo differ
index e603c57..fb7b240 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageNormalizing.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageNormalizing.sharedo differ
index 6d3de4e..7ccca74 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageOneLineSimilarityCalc.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageOneLineSimilarityCalc.sharedo differ
index abf76e3..03f3deb 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagePad.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagePad.sharedo differ
index f1c9603..0f169a3 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagePixelSummationOfProbabilityGetByImage.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagePixelSummationOfProbabilityGetByImage.sharedo differ
index 8355314..0320a12 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagePrewitt.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagePrewitt.sharedo differ
index 60dab14..ba3cef6 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageROI2D.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageROI2D.sharedo differ
index ee075d4..e7f323d 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageROInotChangeHeaderLength.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageROInotChangeHeaderLength.sharedo differ
index cd63092..1ae084c 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRadialDistribution.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRadialDistribution.sharedo differ
index 75a211c..c3bd041 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRhoFiltering.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRhoFiltering.sharedo differ
index 5e4e023..9b8415b 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRoberts.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRoberts.sharedo differ
index 45600df..02d87c4 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRotation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageRotation.sharedo differ
index 5deae2c..62ef1ee 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSSDA.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSSDA.sharedo differ
index cbc9284..e3c6140 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.sharedo differ
index 02d81bc..265f43d 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.sharedo differ
index 38474a6..f5d3e96 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSecondNoiseReductionByRelaxationRValueSet.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSecondNoiseReductionByRelaxationRValueSet.sharedo differ
index 99c3d3a..288fb01 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageShapePCA.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageShapePCA.sharedo differ
index 191333f..efd04bf 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageShift.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageShift.sharedo differ
index 1b9a7a4..9fc02a0 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSigmaCalculate.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSigmaCalculate.sharedo differ
index 8b50afa..f4b89ac 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSinogram.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSinogram.sharedo differ
index 64e4ea3..aca8bf9 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSinogramCorrelation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSinogramCorrelation.sharedo differ
index 43a52a1..488d2d6 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSmoothing.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSmoothing.sharedo differ
index ec4b218..261549f 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSobel.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSobel.sharedo differ
index 0c10496..4916289 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo differ
index 03e6334..c8abb58 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSplit.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSplit.sharedo differ
index abbadee..1431972 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageStack.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageStack.sharedo differ
index 1aa9d04..99309b0 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSymmetryFind.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSymmetryFind.sharedo differ
index 36ad324..0ee8760 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTfunction.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTfunction.sharedo differ
index 3e610fa..78d1268 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTransformDescartesIntoPolar.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTransformDescartesIntoPolar.sharedo differ
index 54325cb..de3fe67 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTriming.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTriming.sharedo differ
index a36f56a..59e26c2 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageVolumeCalc.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageVolumeCalc.sharedo differ
index c87052c..924d079 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageWindowing.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageWindowing.sharedo differ
index f85c7ce..bd2a30d 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesFTest.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesFTest.sharedo differ
index ec96b9e..ff1b2f1 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesStatDataGet.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesStatDataGet.sharedo differ
index a862f85..87b0ed5 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesTTest.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesTTest.sharedo differ
index 2e742a7..6ffffd1 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesVarianceAnalysis.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesVarianceAnalysis.sharedo differ
index a7f22c4..b2b493e 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesVarianceMap.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImagesVarianceMap.sharedo differ
index f23c140..f8c6291 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFET.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFET.sharedo differ
index 94460f0..20a5ad0 100755 (executable)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETPCA.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETPCA.sharedo differ
index 85028ee..7593dd0 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETcalcWeight.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETcalcWeight.sharedo differ
index 17a14de..249d5da 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETcorrelationMap.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETcorrelationMap.sharedo differ
index 3b3ea78..a6db781 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETnormalizedMap.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETnormalizedMap.sharedo differ
index fbef9e2..1776fb6 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETreferredCorrelation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETreferredCorrelation.sharedo differ
index 66bb5a2..9ddce71 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETsmoothParameterMatching.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcSinogramFETsmoothParameterMatching.sharedo differ
index cb56f35..7b1524e 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageCheckFFT.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageCheckFFT.sharedo differ
index 062e4bd..7f424f7 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageDataSet.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageDataSet.sharedo differ
index 661ff35..ebd0f3d 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageError.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageError.sharedo differ
index 77c57f8..cbb03b0 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageGet.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageGet.sharedo differ
index 13cb951..a632d36 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageGetPixels.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageGetPixels.sharedo differ
index 7fe5e23..034bfbc 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageGetPixelsCUDA.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageGetPixelsCUDA.sharedo differ
index 9533650..7cb8493 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageInfo.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageInfo.sharedo differ
index 1a619cf..fe78cd5 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageInit.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageInit.sharedo differ
index 8bb4e7b..210902e 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageOperation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageOperation.sharedo differ
index 6f094d7..aaac855 100755 (executable)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImagePrint.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImagePrint.sharedo differ
index 6da3f37..d80b04a 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageRead.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageRead.sharedo differ
index d5e8f69..233b46c 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageSectionGet.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageSectionGet.sharedo differ
index 43e7cf9..db7aab1 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageSet.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageSet.sharedo differ
index 071395c..eb3fa27 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageToIntImage.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageToIntImage.sharedo differ
index ea42cf6..3ac395e 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite.sharedo differ
index ab346be..833af19 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite2.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite2.sharedo differ
index 32e0a64..c884860 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImagefuncmin.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImagefuncmin.sharedo differ
index 5644b6a..132a554 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcRefUtil.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcRefUtil.sharedo differ
index e3d079d..d812c0d 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/fftn.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/fftn.sharedo differ
index f961535..b493f9b 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a differ
index 06aa857..2a8403b 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a differ
index 6729dc2..a692efc 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcFETnormalizeBySD.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcFETnormalizeBySD.sharedo differ
index 9e54a1f..5ac1c4e 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcFFTExpression.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcFFTExpression.sharedo differ
index da05bb3..d1a58de 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcFFTInfo.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcFFTInfo.sharedo differ
index 83b170b..e4913ba 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DPad.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DPad.sharedo differ
index 8d6f582..4459f43 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DWindowing.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DWindowing.sharedo differ
index 9c31879..d4601d5 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAddValue.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAddValue.sharedo differ
index 142a776..014ab51 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAddValueCuda.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAddValueCuda.sharedo differ
index e498713..6f94f8d 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAverage.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAverage.sharedo differ
index ab6d226..3b2a63a 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageBandPassFilter.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageBandPassFilter.sharedo differ
index 6ec7591..5094a3d 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageBilateralFilter.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageBilateralFilter.sharedo differ
index e752cf6..8934f57 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageBinarization.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageBinarization.sharedo differ
index 4f2e8cd..213f778 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFCompensation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFCompensation.sharedo differ
index a44bddf..61c3eef 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFDetermination.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFDetermination.sharedo differ
index 2fc8ba2..a897155 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFObservation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFObservation.sharedo differ
index 28f9efc..6225328 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFSN.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFSN.sharedo differ
index 6de67ec..c415740 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCVE.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCVE.sharedo differ
index 940b55f..c29603e 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCalcArea.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCalcArea.sharedo differ
index 27dc380..74a5ec6 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageClusterAnalysis.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageClusterAnalysis.sharedo differ
index 955755c..5dc2871 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCommonLine.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCommonLine.sharedo differ
index 7131280..d9dda25 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageConnectivityNumberCalc.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageConnectivityNumberCalc.sharedo differ
index 3d97882..afb806c 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.sharedo differ
index 8543bb1..2e31276 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelationinSpace.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelationinSpace.sharedo differ
index 3d48198..a728c26 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDeconvolution.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDeconvolution.sharedo differ
index 4c183df..200dd1a 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDensity.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDensity.sharedo differ
index 046207a..267f168 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDensityNormalizationByImage.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDensityNormalizationByImage.sharedo differ
index 0d33c6a..bf6bbb5 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDifferential.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageDifferential.sharedo differ
index e73aa7c..ae28556 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageEdge.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageEdge.sharedo differ
index 0331c0d..2f5faac 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageEdgeAverage.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageEdgeAverage.sharedo differ
index 7ce1bb7..f8678fd 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFFT.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFFT.sharedo differ
index 871cb9b..94b3704 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFOMCalc.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFOMCalc.sharedo differ
index 536c943..8cf0cd1 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFeatureExtraction.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFeatureExtraction.sharedo differ
index 29318a3..e59c34f 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFeatureExtractionCoOccurrence.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFeatureExtractionCoOccurrence.sharedo differ
index f046199..8d23d5f 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFilterCreate.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFilterCreate.sharedo differ
index 9cbeac2..44aa54a 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFloating.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFloating.sharedo differ
index 66c8f06..7f0d254 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFourierNeighborCorrelation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFourierNeighborCorrelation.sharedo differ
index ac8c55c..47860f7 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFourierPowerSpectrum.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFourierPowerSpectrum.sharedo differ
index 156d942..b13bb32 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFourierShellCorrelation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFourierShellCorrelation.sharedo differ
index 91ebfdb..d288154 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageHighPassFilter.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageHighPassFilter.sharedo differ
index df3dd84..39b85ab 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageHighlighting.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageHighlighting.sharedo differ
index 2a36a7a..96c0b06 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageHoughTransform.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageHoughTransform.sharedo differ
index 87f20bf..5316be9 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageLabeling.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageLabeling.sharedo differ
index 7960808..beb1a97 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageLowPassFilter.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageLowPassFilter.sharedo differ
index 55a8f5f..9f0b87f 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMasking.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMasking.sharedo differ
index 457b2bf..ccb96ff 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMirroring.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMirroring.sharedo differ
index b2694a4..6b1333b 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageModeChange.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageModeChange.sharedo differ
index f6a3aca..186b47a 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageModelCreate.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageModelCreate.sharedo differ
index cb0bffb..482d903 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMontageCreate.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMontageCreate.sharedo differ
index 3b8c9cd..af58131 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMorphology.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMorphology.sharedo differ
index 41aa3b8..8a8642f 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMove.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMove.sharedo differ
index 38f40b2..48e08ae 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMultiCTFCompensation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageMultiCTFCompensation.sharedo differ
index e603c57..fb7b240 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageNormalizing.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageNormalizing.sharedo differ
index 6d3de4e..7ccca74 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageOneLineSimilarityCalc.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageOneLineSimilarityCalc.sharedo differ
index abf76e3..03f3deb 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePad.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePad.sharedo differ
index f1c9603..0f169a3 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePixelSummationOfProbabilityGetByImage.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePixelSummationOfProbabilityGetByImage.sharedo differ
index 8355314..0320a12 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePrewitt.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePrewitt.sharedo differ
index 60dab14..ba3cef6 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageROI2D.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageROI2D.sharedo differ
index ee075d4..e7f323d 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageROInotChangeHeaderLength.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageROInotChangeHeaderLength.sharedo differ
index cd63092..1ae084c 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRadialDistribution.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRadialDistribution.sharedo differ
index 75a211c..c3bd041 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRhoFiltering.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRhoFiltering.sharedo differ
index 5e4e023..9b8415b 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRoberts.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRoberts.sharedo differ
index 45600df..02d87c4 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRotation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRotation.sharedo differ
index 5deae2c..62ef1ee 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSSDA.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSSDA.sharedo differ
index cbc9284..e3c6140 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.sharedo differ
index 02d81bc..265f43d 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.sharedo differ
index 38474a6..f5d3e96 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSecondNoiseReductionByRelaxationRValueSet.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSecondNoiseReductionByRelaxationRValueSet.sharedo differ
index 99c3d3a..288fb01 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageShapePCA.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageShapePCA.sharedo differ
index 191333f..efd04bf 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageShift.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageShift.sharedo differ
index 1b9a7a4..9fc02a0 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSigmaCalculate.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSigmaCalculate.sharedo differ
index 8b50afa..f4b89ac 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSinogram.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSinogram.sharedo differ
index 64e4ea3..aca8bf9 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSinogramCorrelation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSinogramCorrelation.sharedo differ
index 43a52a1..488d2d6 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSmoothing.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSmoothing.sharedo differ
index ec4b218..261549f 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSobel.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSobel.sharedo differ
index 0c10496..4916289 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo differ
index 03e6334..c8abb58 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSplit.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSplit.sharedo differ
index abbadee..1431972 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageStack.sharedo differ
index 1aa9d04..99309b0 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSymmetryFind.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSymmetryFind.sharedo differ
index 36ad324..0ee8760 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageTfunction.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageTfunction.sharedo differ
index 3e610fa..78d1268 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageTransformDescartesIntoPolar.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageTransformDescartesIntoPolar.sharedo differ
index 54325cb..de3fe67 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageTriming.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageTriming.sharedo differ
index a36f56a..59e26c2 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageVolumeCalc.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageVolumeCalc.sharedo differ
index c87052c..924d079 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageWindowing.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageWindowing.sharedo differ
index f85c7ce..bd2a30d 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesFTest.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesFTest.sharedo differ
index ec96b9e..ff1b2f1 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesStatDataGet.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesStatDataGet.sharedo differ
index a862f85..87b0ed5 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesTTest.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesTTest.sharedo differ
index 2e742a7..6ffffd1 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesVarianceAnalysis.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesVarianceAnalysis.sharedo differ
index a7f22c4..b2b493e 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesVarianceMap.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagesVarianceMap.sharedo differ
index f23c140..f8c6291 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFET.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFET.sharedo differ
index 94460f0..20a5ad0 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETPCA.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETPCA.sharedo differ
index 85028ee..7593dd0 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETcalcWeight.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETcalcWeight.sharedo differ
index 17a14de..249d5da 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETcorrelationMap.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETcorrelationMap.sharedo differ
index 3b3ea78..a6db781 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETnormalizedMap.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETnormalizedMap.sharedo differ
index fbef9e2..1776fb6 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETreferredCorrelation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETreferredCorrelation.sharedo differ
index 66bb5a2..9ddce71 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETsmoothParameterMatching.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcSinogramFETsmoothParameterMatching.sharedo differ
index cb56f35..7b1524e 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageCheckFFT.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageCheckFFT.sharedo differ
index 062e4bd..7f424f7 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageDataSet.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageDataSet.sharedo differ
index 661ff35..ebd0f3d 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageError.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageError.sharedo differ
index 77c57f8..cbb03b0 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageGet.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageGet.sharedo differ
index 13cb951..a632d36 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageGetPixels.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageGetPixels.sharedo differ
index 7fe5e23..034bfbc 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageGetPixelsCUDA.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageGetPixelsCUDA.sharedo differ
index 9533650..7cb8493 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageInfo.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageInfo.sharedo differ
index 1a619cf..fe78cd5 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageInit.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageInit.sharedo differ
index 8bb4e7b..210902e 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo differ
index 6f094d7..aaac855 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImagePrint.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImagePrint.sharedo differ
index 6da3f37..d80b04a 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageRead.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageRead.sharedo differ
index d5e8f69..233b46c 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSectionGet.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSectionGet.sharedo differ
index 43e7cf9..db7aab1 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSet.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSet.sharedo differ
index 071395c..eb3fa27 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageToIntImage.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageToIntImage.sharedo differ
index ea42cf6..3ac395e 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageWrite.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageWrite.sharedo differ
index ab346be..833af19 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageWrite2.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageWrite2.sharedo differ
index 32e0a64..c884860 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImagefuncmin.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImagefuncmin.sharedo differ
index 5644b6a..132a554 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcRefUtil.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcRefUtil.sharedo differ
index 4215dc4..4ea1be9 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86MAC64/mrcImageClusterAnalysis and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86MAC64/mrcImageClusterAnalysis differ
index 7381693..f9db051 100644 (file)
@@ -79,11 +79,11 @@ extern "C" {
 
 void lmrcImageClusterAnalysis(int* group, mrcImage* in, int finalclusternum, int N, lmrcImageClusterAnalysisInfo* linfo);
 void lmrcImageClusterMerge(mrcImage* in1, mrcImage* in2, int* index, int* averagednum, int m, int n, int* N);
-float lmrcImageDistanceCalc(mrcImage* in1, mrcImage* in2, int mode);
-float lmrcImageDistanceCalcByWardMethod(mrcImage* in1, mrcImage* in2, int num1, int num2, int mode);
+void lmrcImageDistanceCalc(float* dis, mrcImage* in1, mrcImage* in2, int mode);
+void lmrcImageDistanceCalcByWardMethod(float* dis, mrcImage* in1, mrcImage* in2, int num1, int num2, int mode);
 
-float lmrcImageDistanceCalcWithAutoRotation(mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode);
-float lmrcImageDistanceCalcByWardMethodWithAutoRotation(mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, int num1, int num2,  lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode);
+void lmrcImageDistanceCalcWithAutoRotation(float* dis, mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode);
+void lmrcImageDistanceCalcByWardMethodWithAutoRotation(float* dis, mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, int num1, int num2,  lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode);
 
 float lmrcImageClusterAnalysisByIteration(int* group, mrcImage* in, int clusternum, int N, int mode);
 
index c62cbdd..2e35561 100644 (file)
@@ -44,6 +44,8 @@ typedef struct lmrcImageAutoRotationCorrelationInfo {
        int   flagXshiftOnly;
        int   flagNoShift;
 
+/* Control */
+
 /* Output */
        float max; //
        float maxTheta; //
@@ -136,8 +138,10 @@ typedef struct lmrcImageCorrelationPVMInfo {
 extern void lmrcImageAutoRotationCorrelation(mrcImage* out, mrcImage* cor, mrcImage* in, mrcImage* ref, lmrcImageAutoRotationCorrelationInfo* linfo, int mode);
 extern void lmrcImageAutoRotationCorrelationRotationalCrossCorrelationFunction(mrcImage* out, mrcImage* cor, mrcImage* in, mrcImage* ref, lmrcImageAutoRotationCorrelationInfo* linfo, int mode);
 extern double lmrcImageLinearCorrelation(mrcImage* in1, mrcImage* in2, long mode);
+extern void lmrcImageLinearCorrelation2(double* cor, mrcImage* in1, mrcImage* in2, long mode);
 extern void lmrcImageCorrelation(mrcImage* cor, mrcImage* in, mrcImage* ref, long mode);
 extern double lmrcImageEuclidDistanceCalc(mrcImage* in1, mrcImage* in2, int mode); 
+extern void lmrcImageEuclidDistanceCalc2(double* cor, mrcImage* in1, mrcImage* in2, int mode); 
 extern void lmrcImageCorrelationRefinement(mrcImage* cor, mrcImage* shift, mrcImage* in, mrcImage* ref, lmrcImageCorrelationRefinementInfo* info, long mode);
 
 
index 88c4b86..dce1c22 100755 (executable)
@@ -9,14 +9,14 @@ CD      = cd
 
 INSTALL =  /usr/bin/install
 
-CC     = gcc --std=gnu99
+CC     = gcc --std=gnu99 -fno-builtin
 #CC     = icc 
 
 CXX    = g++
 #CXX    = /opt/intel/compiler80/bin/icc 
 #CXX    = icc 
 
-SHAREDCC     = gcc --std=gnu99 -fpic 
+SHAREDCC     = gcc --std=gnu99 -fpic -fno-builtin
 #CC     = icc 
 
 SHAREDCXX    = g++ -fpic 
index cac76e7..6eed6dd 100755 (executable)
 <H2>Information from source codes</H2>
 </A>
 <PRE>
-../src/fftn.c:
-
-../src/lmrcFETnormalizeBySD.c:
-
-../src/lmrcFFTExpression.c:
-
-../src/lmrcFFTFGconj.c:
-
-../src/lmrcFFTFxG.c:
-
-../src/lmrcFFTInfo.c:
-
-../src/lmrcImage3DPad.c:
-
-../src/lmrcImage3DWindowing.c:
-
-../src/lmrcImageAddValue.c:
-
-../src/lmrcImageAsProbability.c:
-
-../src/lmrcImageAverage.c:
-
-../src/lmrcImageBandPassFilter.c:
-
-../src/lmrcImageBilateralFilter.c:
-
-../src/lmrcImageBinarization.c:
-
-../src/lmrcImageBottomHatTransform.c:
-
-../src/lmrcImageBoundaryInfo.c:
-
-../src/lmrcImageCTFCompensation.c:
-
-../src/lmrcImageCTFDetermination.c:
-
-../src/lmrcImageCTFObservation.c:
-
-../src/lmrcImageCTFSN.c:
-
-../src/lmrcImageCVE.c:
-
-../src/lmrcImageCalcArea.c:
-
-../src/lmrcImageCenterGet.c:
-
-../src/lmrcImageCentre.c:
-
-../src/lmrcImageClosing.c:
-
-../src/lmrcImageClusterAnalysis.c:
-
-../src/lmrcImageCommonLine.c:
-
-../src/lmrcImageConnection.c:
-
-../src/lmrcImageConnectivityNumberCalc.c:
-
-../src/lmrcImageContourSurface.c:
-
-../src/lmrcImageContraction.c:
-
-../src/lmrcImageCorrelation.c:
-     $lmrcImageEuclidDistanceCalc:  Calculate Euclid distance between two images $
-     $arg: in1:  input mrcImage1 $
-     $arg: in2:  input mrcImage2 $
-     $arg: mode: input int $
-     $mode: 0 Sum of SQR $
-     $mode: 1 Distance $
-     $return: EuclidDistance $
-
-../src/lmrcImageCorrelationPVM.c:
-
-../src/lmrcImageCorrelationWithCTFCompensation.c:
-
-../src/lmrcImageCorrelationinSpace.c:
-
-../src/lmrcImageCrystalCreate.c:
-
-../src/lmrcImageDataMaxAndMinGetByImage.c:
-
-../src/lmrcImageDataStraightCopy.c:
-
-../src/lmrcImageDeconvolution.c:
-
-../src/lmrcImageDensity.c:
-
-../src/lmrcImageDensityInverse.c:
-
-../src/lmrcImageDensityNormalizationByImage.c:
-
-../src/lmrcImageDifferential.c:
-
-../src/lmrcImageDilation.c:
-
-../src/lmrcImageDistanceConversion.c:
-
-../src/lmrcImageEdge.c:
-
-../src/lmrcImageEdgeAverage.c:
-
-../src/lmrcImageEdgeEnhancement.c:
-
-../src/lmrcImageErosion.c:
-
-../src/lmrcImageFFT.c:
-
-../src/lmrcImageFOMCalc.c:
-
-../src/lmrcImageFeatureExtraction.c:
-
-../src/lmrcImageFeatureExtractionCoOccurrence.c:
-
-../src/lmrcImageFeatureExtractionRunLength.c:
-
-../src/lmrcImageFilterCreate.c:
-
-../src/lmrcImageFirstNoiseReductionByRelaxation.c:
-
-../src/lmrcImageFloating.c:
-
-../src/lmrcImageFourierNeighborCorrelation.c:
-
-../src/lmrcImageFourierPowerSpectrum.c:
-
-../src/lmrcImageFourierShellCorrelation.c:
-
-../src/lmrcImageHighPassFilter.c:
-
-../src/lmrcImageHighlighting.c:
-
-../src/lmrcImageLabeling.c:
-
-../src/lmrcImageLogicalOperation.c:
-
-../src/lmrcImageLowPassFilter.c:
-
-../src/lmrcImageMasking.c:
-
-../src/lmrcImageMaxDataGet.c:
-
-../src/lmrcImageMirroring.c:
-     $lmrcImageMirroring: (mrcImage* out, mrcImage* in, lmrcImageMirroring mode) $
-
-../src/lmrcImageModeChange.c:
-
-../src/lmrcImageModelCreate.c:
-
-../src/lmrcImageMontageCreate.c:
-
-../src/lmrcImageMorphology.c:
-
-../src/lmrcImageMove.c:
-
-../src/lmrcImageMultiCTFCompensation.c:
-
-../src/lmrcImageMultiplying.c:
-
-../src/lmrcImageNegativeLaplacian.c:
-
-../src/lmrcImageNoiseCreate.c:
-
-../src/lmrcImageNormalizing.c:
-
-../src/lmrcImageOneLineSimilarityCalc.c:
-
-../src/lmrcImageOpening.c:
-
-../src/lmrcImagePad.c:
-
-../src/lmrcImagePartImageSegmentation.c:
-
-../src/lmrcImagePixelSummationOfProbabilityGetByImage.c:
-
-../src/lmrcImagePosterization.c:
-
-../src/lmrcImagePrewitt.c:
-
-../src/lmrcImageProjection.c:
-
-../src/lmrcImageProportionalDensityLevelSetByImage.c:
-
-../src/lmrcImageROI2D.c:
-
-../src/lmrcImageROI3D.c:
-
-../src/lmrcImageROInotChangeHeaderLength.c:
-
-../src/lmrcImageRadialDistribution.c:
-
-../src/lmrcImageRhoFiltering.c:
-
-../src/lmrcImageRoberts.c:
-
-../src/lmrcImageRotation.c:
-
-../src/lmrcImageSSDA.c:
-
-../src/lmrcImageSamplingUnitChange.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxation.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationDijValueSet.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationQValueSet.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationRValueSet.c:
-
-../src/lmrcImageShapePCA.c:
-
-../src/lmrcImageShift.c:
-
-../src/lmrcImageShrink.c:
-
-../src/lmrcImageSigmaCalculate.c:
-
-../src/lmrcImageSinogram.c:
-
-../src/lmrcImageSinogramCorrelation.c:
-
-../src/lmrcImageSinogramFFT.c:
-
-../src/lmrcImageSmoothing.c:
-
-../src/lmrcImageSobel.c:
-
-../src/lmrcImageSolventFlattening.c:
-
-../src/lmrcImageSpatialFrequencyFilter.c:
-
-../src/lmrcImageSphere.c:
-
-../src/lmrcImageSplit.c:
-
-../src/lmrcImageStack.c:
-
-../src/lmrcImageStudentCalculate.c:
-
-../src/lmrcImageSubtractionCalc.c:
-
-../src/lmrcImageSummationCalculate.c:
-
-../src/lmrcImageSymmetryFind.c:
-
-../src/lmrcImageTfunction.c:
-
-../src/lmrcImageTopHatTransform.c:
-
-../src/lmrcImageTrans.c:
-
-../src/lmrcImageTransformDescartesIntoPolar.c:
-
-../src/lmrcImageTriming.c:
-
-../src/lmrcImageVolumeCalc.c:
-
-../src/lmrcImageWindowing.c:
-
-../src/lmrcImagesFTest.c:
-
-../src/lmrcImagesStatDataGet.c:
-
-../src/lmrcImagesTTest.c:
-
-../src/lmrcImagesVarianceAnalysis.c:
-
-../src/lmrcImagesVarianceMap.c:
-
-../src/lmrcSinogramFET.c:
-
-../src/lmrcSinogramFETPCA.c:
-
-../src/lmrcSinogramFETcalcWeight.c:
-
-../src/lmrcSinogramFETcorrelationMap.c:
-
-../src/lmrcSinogramFETnormalizedMap.c:
-
-../src/lmrcSinogramFETreferredCorrelation.c:
-
-../src/lmrcSinogramFETsmoothParameterMatching.c:
-
-../src/mrcImageCheckFFT.c:
-
-../src/mrcImageCheckSameSize.c:
-
-../src/mrcImageCopy.c:
-
-../src/mrcImageDataSet.c:
-
-../src/mrcImageError.c:
-
-../src/mrcImageGet.c:
-
-../src/mrcImageGetPixels.c:
-
-../src/mrcImageInfo.c:
-
-../src/mrcImageInit.c:
-
-../src/mrcImageOperation.c:
-
-../src/mrcImagePVM.c:
-
-../src/mrcImagePrint.c:
-
-../src/mrcImageRead.c:
-
-../src/mrcImageSectionGet.c:
-
-../src/mrcImageSectionSet.c:
-
-../src/mrcImageSet.c:
-
-../src/mrcImageTailer.c:
-
-../src/mrcImageToIntImage.c:
-
-../src/mrcImageUtil.c:
-
-../src/mrcImageUtilityforVariance.c:
-
-../src/mrcImageWrite.c:
-
-../src/mrcImageWrite2.c:
-
-../src/mrcImagefuncmin.c:
-
-../src/mrcRefUtil.c:
 </PRE>
 <HR>
 <A NAME="include">
diff --git a/src/Objects/DataManip/mrcImage/src/.lmrcImageHoughTransform.c.swp b/src/Objects/DataManip/mrcImage/src/.lmrcImageHoughTransform.c.swp
deleted file mode 100644 (file)
index b64cc6d..0000000
Binary files a/src/Objects/DataManip/mrcImage/src/.lmrcImageHoughTransform.c.swp and /dev/null differ
diff --git a/src/Objects/DataManip/mrcImage/src/: b/src/Objects/DataManip/mrcImage/src/:
deleted file mode 100644 (file)
index ebb5ad7..0000000
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
-# %M% %Y% %I%
-# The latest update : %G% at %U%
-#
-#%Z% lmrcImageMultiCTFCompensation ver %I%
-#%Z% Created by tacyas
-#%Z%
-#%Z% Usage : void lmrcImageMultiCTFCompensation(mrcImage* dst, mrcImage* src, ctfInfo* ctf, long nfile, long mode)
-#%Z% Attention
-#%Z%
-*/
-static char __sccs_id[] = "%Z%lmrcImageMultiCTFCompensation ver%I%; Date:%D% %Z%";
-#define DEBUG
-#include "genUtil.h"
-#include "Memory.h"
-#include "../inc/mrcImage.h"
-#include "ctfInfo.h"
-#include "./lmrcImageCTFCompensation.h"
-
-extern void __lmrcImageMultiCTFCompensationMode0(mrcImage* dst, mrcImage* src, ctfInfo* ctf, long nfile, lmrcImageMultiCTFCompensationInfo info, long mode);
-extern void __lmrcImageMultiCTFCompensationMode1(mrcImage* dst, mrcImage* src, ctfInfo* ctf, long nfile, lmrcImageMultiCTFCompensationInfo info, long mode);
-
-void
-lmrcImageMultiCTFCompensation(mrcImage* dst, mrcImage* src, ctfInfo* ctf, long nfile, lmrcImageMultiCTFCompensationInfo info, long mode)
-{
-       switch(mode&0xf) {
-               case 0: {
-                       __lmrcImageMultiCTFCompensationMode0(dst, src, ctf, nfile, info, mode);
-                       break;
-               }
-               case 1: {
-                       __lmrcImageMultiCTFCompensationMode1(dst, src, ctf, nfile, info, mode);
-                       break;
-               }
-               default: {
-                       fprintf(stderr, "Not supported mode in lmrcImageMultiCTFCompensation: %ld\n", mode);
-                       exit(EXIT_FAILURE);
-               }
-       }
-}
-
-void
-lmrcImageMultiCTFCompensationUsage(FILE* fpt)
-{
-       fprintf(fpt, "mode: 0  : CTF-weighted compensation, CTF/(SQR(CTF) + (NS)^2)\n");
-       fprintf(fpt, "mode: +1 : Adding solvent-flattening process\n");
-       fprintf(fpt, "mode: +16: Without phase flipping, in case of images after phase only correction.\n ");
-}
-
-void
-__lmrcImageMultiCTFCompensationMode1(mrcImage* dstfft, /* Fourier transform of CTF-corrected image */ 
-                                                                        mrcImage* srcfft, /* Fourier transforms of observed images */
-                                                                        ctfInfo* ctf,     /* CTFs of observed images */
-                                                                        long nfile,       /* Number of observed images */
-                                                                        lmrcImageMultiCTFCompensationInfo info,
-                                                                        long mode)
-{
-       long i;
-       mrcImage* predict;                         /* Predicted observed images */
-       mrcImage* predictfft;                      /* Fourier transforms of predicted observed images */
-       mrcImage* deltasrc;                        
-       mrcImage* deltasrcfft;                     
-       mrcImage  deltadstfft;
-       mrcImage  deltadst;
-       mrcImage* src;                             /* Observed images */
-       mrcImage  dst;                             /* CTF-coorected image */ 
-       mrcImage  mindst;                          /* CTF-coorected image (minimum)*/ 
-       mrcImageParaTypeReal x, y, z;
-       double rms, minrms;
-       double okrms, diversefactor = 10;
-       double data, delta, tmppredict, tmpsrc;
-       long   iteration, maxiteration; 
-       double* hist;
-       double maxhist, maxhistdens;
-       long    nhist;
-
-       maxiteration = info.maxiteration;
-       okrms         = info.okrms;
-       diversefactor = info.diversefactor;
-       z = info.z;
-       nhist = info.nhist;
-
-       predictfft = (mrcImage*)memoryAllocate(sizeof(mrcImage)*nfile, "in __lmrcImageMultiCTFCompensation");
-       predict    = (mrcImage*)memoryAllocate(sizeof(mrcImage)*nfile, "in __lmrcImageMultiCTFCompensation");
-       src        = (mrcImage*)memoryAllocate(sizeof(mrcImage)*nfile, "in __lmrcImageMultiCTFCompensation");
-
-       deltasrcfft = predictfft;
-       deltasrc    = predict;
-
-       /* Create the observed images */ 
-       for(i=0; i<nfile; i++) {
-               DEBUGPRINT1("Create the observed image[%ld]\n", i);
-               /* lfft2d(&(src[i]), &(srcfft[i])); */
-               lmrcImageFFT(&(src[i]), &(srcfft[i]), 0);
-       }
-
-       /* Create the fisrt CTF-corrected image and its Fourier transform */
-       DEBUGPRINT("Create the first CTF-corrected image on Fourier space\n");
-       __lmrcImageMultiCTFCompensationMode0(dstfft, srcfft, ctf, nfile, info, mode);
-       for(i=0; i<nfile; i++) {
-               mrcImageFree(&(srcfft[i]), "in __mrcImageMultiCTFCompensation");
-       }
-
-       DEBUGPRINT("Create the first CTF-corrected image on real space\n");
-       /* lfft2d(&dst, dstfft); */
-       lmrcImageFFT(&dst, dstfft, 0);
-       mrcImageFree(dstfft, "in __lmrcImageMultiModeCTFCompensation");
-
-       rms = minrms = 1e6;
-       iteration = 0;
-       mindst.Image = NULL;
-       do {
-               DEBUGPRINT1("#Iter: %10ld Start\n", iteration);
-               switch(info.solventMode) {
-                       case lmrcImageMultiCTFCompensationSolventFlatteningModeDensityPeakIsSolvent: {
-
-                       /* non-linear filtering : solvent flattening : mode of density is density of solvent*/
-                       /*                                             density in the defined solvent area is density of solvent*/
-                               mrcStatDataSet(&dst, 0);
-                               lmrcImageHistgram(&hist, nhist, &dst); 
-                               maxhist     = 0.0;
-                               maxhistdens = 0;
-                               for(i=0; i<nhist; i++) {
-                                       if(maxhist<hist[i]) {
-                                               maxhist     = hist[i];
-                                               maxhistdens = i;
-                                       }
-                               }
-                               free(hist);
-                               maxhistdens = maxhistdens/(nhist-1)*(dst.HeaderAMax - dst.HeaderAMin) + dst.HeaderAMin;
-                               for(x=0; x<dst.HeaderN.x; x++) {
-                                       for(y=0; y<dst.HeaderN.y; y++) {
-                                               mrcPixelDataGet(&dst, x, y, z, &data, mrcPixelMag, mrcPixelHowNearest); 
-                                               if(data<maxhistdens) {
-                                                       mrcPixelDataSet(&dst, x, y, z, (double)maxhistdens, mrcPixelMag);
-                                               }
-                                       }
-                               }
-                               break;
-                       }
-                       case lmrcImageMultiCTFCompensationSolventFlatteningModeDefinedSTDIsSolvent: {
-                               mrcImageInformation imageInfo;
-                               double threshold; 
-
-                               imageInfo.mode = meanOfAll;
-                               lmrcImageInformation(&imageInfo, &dst); 
-                               threshold = imageInfo.mean + imageInfo.sd*info.definedSTD; 
-                               for(x=0; x<dst.HeaderN.x; x++) {
-                                       for(y=0; y<dst.HeaderN.y; y++) {
-                                               mrcPixelDataGet(&dst, x, y, z, &data, mrcPixelMag, mrcPixelHowNearest); 
-                                               if(data<threshold) {
-                                                       mrcPixelDataSet(&dst, x, y, z, (double)threshold, mrcPixelMag);
-                                               }
-                                       }
-                               }
-                               break;
-                       }
-                       default: {
-                               fprintf(stderr, "Not supported Mode for lmrcImageMultiCTFCompensationSolventFlatteningMode %d", info.solventMode);
-                               exit(EXIT_FAILURE);
-                       }
-               }
-               DEBUGPRINT("Create Fourier transforms of CTF-corrected image\n");
-               /* lfft2d(dstfft, &dst); */
-               lmrcImageFFT(dstfft, &dst, 0);
-
-               DEBUGPRINT("Create the predicted observed images\n");
-               for(i=0; i<nfile; i++) {
-                       /* Determine CTF : on real space*/
-                       /*                 If r is max, then OK !! */
-
-                       /* Create Fourier transforms of the predicted observed images */
-                       DEBUGPRINT1("%ld: CTF Observation dstfft -> predictfft \n", i);
-                       lmrcImageCTFObservation(&(predictfft[i]), dstfft, &(ctf[i]), 0);
-
-                       /* Create the predicted images to observe */
-                       DEBUGPRINT1("%ld: fft predictfft to predict\n", i);
-                       /* lfft2d(&(predict[i]), &(predictfft[i])); */
-                       lmrcImageFFT(&(predict[i]), &(predictfft[i]), 0);
-
-                       /* predictfft Image Area Free */
-                       mrcImageFree(&(predictfft[i]), "in __lmrcImageMultiModeCTFCompensation");
-               }
-               mrcImageFree(dstfft, "in __lmrcImageMultiModeCTFCompensation");
-
-               /* Normarize the observed image against the predicted observed image */ 
-               /*     Now not supported for normalization */ 
-               /*
-
-               */      
-
-               /* Compare the predicted defocused image with real images and change dst*/ 
-               for(x=0; x<dst.HeaderN.x; x++) {
-                       for(y=0; y<dst.HeaderN.y; y++) {
-                               /* check the difference between predicted images (predict) and obseved images (src) */
-                               for(i=0; i<nfile; i++) {
-                                       /* predict -> deltasrc : Attention !!! Now common memories are used */
-                                       mrcPixelDataGet(&(predict[i]),  x, y, z, &tmppredict, mrcPixelMag, mrcPixelHowNearest); 
-                                       mrcPixelDataGet(&(src[i]),      x, y, z, &tmpsrc,     mrcPixelMag, mrcPixelHowNearest); 
-                                       /* src - predict */
-                                       delta = tmpsrc - tmppredict;
-                                       mrcPixelDataSet(&(deltasrc[i]), x, y, z, delta  , mrcPixelMag);
-                               }
-                       }
-               }
-               /* deltasrc -> deltasrcfft */
-               for(i=0; i<nfile; i++) {
-                       DEBUGPRINT1("%ld: fft deltasrc to deltasrcfft \n", i);
-                       /* lfft2d(&(deltasrcfft[i]), &(deltasrc[i])); */
-                       lmrcImageFFT(&(deltasrcfft[i]), &(deltasrc[i]), 0);
-                       mrcImageFree(&(deltasrc[i]), "in __lmrcImageMultiModeCTFCompensation");
-               }
-
-               /* deltasrcfft -> deltadst */
-               DEBUGPRINT1("Create the %ld th delta image \n", iteration);
-               __lmrcImageMultiCTFCompensationMode0(&deltadstfft, deltasrcfft, ctf, nfile, info, mode);
-               for(i=0; i<nfile; i++) {
-                       mrcImageFree(&(deltasrcfft[i]), "in __lmrcImageMultiModeCTFCompensation");
-               }
-               /* lfft2d(&deltadst, &deltadstfft); */
-               lmrcImageFFT(&deltadst, &deltadstfft, 0);
-               mrcImageFree(&deltadstfft, "in __lmrcImageMultiModeCTFCompensation");
-
-               /* change the CTF-corrected image (dst = dst - deltadst ) */
-               for(x=0; x<dst.HeaderN.x; x++) {
-                       for(y=0; y<dst.HeaderN.y; y++) {
-                               mrcPixelDataGet(&deltadst, x, y, z, &delta, mrcPixelMag, mrcPixelHowNearest); 
-                               rms += SQR(delta);
-                               mrcPixelDataGet(&dst, x, y, z, &data, mrcPixelMag, mrcPixelHowNearest); 
-                               data += delta;  
-                               mrcPixelDataSet(&dst, x, y, z, data, mrcPixelMag); 
-                       }
-               }
-               mrcStatDataSet(&dst, 0);
-               rms = sqrt(rms/dst.HeaderN.x/dst.HeaderN.y)/dst.HeaderAMean;
-               mrcImageFree(&deltadst, "in __lmrcImageMultiModeCTFCompensation");
-
-               fprintf(info.logfile, "iter %10ld : rms %15.6e : min %15.6e\n", iteration, rms, minrms);
-               DEBUGPRINT3("iter %10ld : rms %15.6e : min %15.6e\n", iteration, rms, minrms);
-               if(rms<minrms) {
-                       if(fabs(rms-minrms)<1e-6) {
-                               break;
-                       }
-                       minrms = rms;
-                       if(NULL!=mindst.Image) {
-                               DEBUGPRINT("old mindst free\n");
-                               mrcImageFree(&mindst, "in __lmrcImageMultiMOdeCTFCompensation");
-                       }
-                       mindst = dst;
-                       dst.Image = NULL;
-                       mrcInit(&dst, NULL);
-                       for(x=0; x<dst.HeaderN.x; x++) {
-                               for(y=0; y<dst.HeaderN.y; y++) {
-                                       mrcPixelDataGet(&mindst, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
-                                       mrcPixelDataSet(&dst, x, y, z, data, mrcPixelRePart);
-                               }
-                       }
-               }
-               iteration++;
-       } while(okrms     < rms 
-                && iteration < maxiteration 
-                && rms       < diversefactor*minrms); /* Condition for ending iteration */
-       /* lfft2d(dstfft, &dst); */
-       lmrcImageFFT(dstfft, &mindst, 0);
-       mrcImageFree(&mindst, "in __mrcImageMultiCTFCompensationMode1");
-       mrcImageFree(&dst, "in __mrcImageMultiCTFCompensationMode1");
-}
-
-void
-__lmrcImageMultiCTFCompensationMode0(mrcImage* dst, mrcImage* src, ctfInfo* ctf, long nfile, lmrcImageMultiCTFCompensationInfo info, long mode)
-{
-       double W, NW;
-       double Win;
-       double re, im, dstre, dstim;    
-       double* Weight;
-       float X, Y, R;
-       float dX, dY;
-       long i;
-
-       DEBUGPRINT(" __lmrcImageMultiCTFCompensationMode0\n");
-       Weight = (double*)memoryAllocate(sizeof(double)*nfile, "in __lmrcImageMultiCTFCompensation");
-       dst->Header = src[0].Header;
-       mrcInit(dst, NULL);     
-       for(X=0; X <= dst->HeaderN.x/2; X++) {
-               for(Y=-dst->HeaderN.y/2; Y < dst->HeaderN.y/2; Y++) {
-                       W = 0.0;
-                       mrcPixelDataSet(dst, X, Y, 0.0, 0.0, mrcPixelRePart);
-                       mrcPixelDataSet(dst, X, Y, 0.0, 0.0, mrcPixelImPart);
-                       for(i=0; i<nfile; i++) {
-                               dX = 1.0/(src[i].HeaderN.x*src[i].HeaderLength.x);
-                               dY = 1.0/(src[i].HeaderN.y*src[i].HeaderLength.y);
-                               R = sqrt(SQR(X*dX) + SQR(Y*dY));
-
-                               if(ctf[i].flagAstigmatism) {
-                                       Weight[i] = ctfFunction2D(&(ctf[i]), X*dX, Y*dY, 0);
-                               } else {
-                                       Weight[i] = ctfFunction(&(ctf[i]), R, 0);
-                               }       
-                               if(mode&0x10) {
-                                       Weight[i] = fabs(Weight[i]);
-                               }
-                               W += SQR(Weight[i]);
-                               
-
-                               if(ctf[i].flagWhiteNoiseRaising) {
-                                       NW = SQR(ctf[i].WhiteNoise*exp(ctf[i].WhiteNoiseRaising*R));
-                               } else if(ctf[i].flagWhiteNoise) {
-                                       NW = SQR(ctf[i].WhiteNoise);
-                               } 
-                               W += NW;
-                               DEBUGPRINT3("R: %f Weight %f NW %f\n", R, Weight[i], NW);
-                               if(ctf[i].flagWin) {
-                                       if(R<ctf[i].CutLow) {
-                                               Win = 1.0;
-                                       } else if(ctf[i].CutLow<R && R<ctf[i].CutHigh) {
-                                               Win = (cos((R - ctf[i].CutLow)/(ctf[i].CutHigh - ctf[i].CutLow)*M_PI)+1.0)/2.0;
-                                               DEBUGPRINT2("%f %f\n", R, Win);
-                                       } else {
-                                               Win = 0.0;
-                                       }
-                               } else {
-                                       Win = 1.0;
-                               }
-
-                               mrcPixelDataGet(dst, X, Y, 0.0, &dstre, mrcPixelRePart, mrcPixelHowNearest);
-                               mrcPixelDataGet(dst, X, Y, 0.0, &dstim, mrcPixelImPart, mrcPixelHowNearest);
-                               mrcPixelDataGet(&(src[i]), X, Y, 0.0, &re, mrcPixelRePart, mrcPixelHowNearest);
-                               mrcPixelDataGet(&(src[i]), X, Y, 0.0, &im, mrcPixelImPart, mrcPixelHowNearest);
-                               dstre += (re*Weight[i]*Win);
-                               dstim += (im*Weight[i]*Win);
-                               mrcPixelDataSet(dst, X, Y, 0.0, dstre, mrcPixelRePart);
-                               mrcPixelDataSet(dst, X, Y, 0.0, dstim, mrcPixelImPart);
-                       }
-
-                       mrcPixelDataGet(dst, X, Y, 0.0, &dstre, mrcPixelRePart, mrcPixelHowNearest);
-                       mrcPixelDataGet(dst, X, Y, 0.0, &dstim, mrcPixelImPart, mrcPixelHowNearest);
-                       if(0.0!=W) {
-                               mrcPixelDataSet(dst, X, Y, 0.0, dstre/W, mrcPixelRePart);
-                               mrcPixelDataSet(dst, X, Y, 0.0, dstim/W, mrcPixelImPart);
-                       } else {
-                               mrcPixelDataSet(dst, X, Y, 0.0, 0.0, mrcPixelRePart);
-                               mrcPixelDataSet(dst, X, Y, 0.0, 0.0, mrcPixelImPart);
-                       }
-               }
-       }
-}
-
-
index ca53683..fa72423 100755 (executable)
@@ -12,7 +12,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "String.h"
index f8ea277..a83d313 100644 (file)
@@ -10,7 +10,7 @@
 */
 /* $Log$ */
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "./lmrcImageAverage.h"
index 731f59b..7f09cda 100755 (executable)
@@ -15,7 +15,7 @@ static char __sccs_id[] = "%Z%lmrcImageBinarization ver%I%; Date:%D% %Z%";
 #include <string.h>
 #include <math.h>                  
 
-//#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "../inc/mrcImage.h"
index 3cb53b3..9fe127e 100755 (executable)
@@ -12,7 +12,7 @@
 static char __sccs_id[] = "%Z%lmrcImageCTFCompensation ver%I%; Date:%D% %Z%";
 
 #include <stdlib.h>
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "mrcImage.h"
 #include "ctfInfo.h"
index a9a67c2..a89e8d5 100755 (executable)
@@ -9,7 +9,7 @@
 #
 */
 /* $Log$ */
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "./lmrcImageLabeling.h"
index 1e7ca43..19782da 100755 (executable)
@@ -15,11 +15,39 @@ static char __sccs_id[] = "%Z%mrcImageClusterAnalysis ver%I%; Date:%D% %Z%";
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>                  
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
+#include "eosPThread.h"
 #include "Memory.h"
 #include "./lmrcImageClusterAnalysis.h"
 
+typedef struct lmrcImageDistanceCalc0ForPThreadArgs {
+       int iCount;
+       mrcImage* out;
+       mrcImage* cor;
+       mrcImage* clusterN;
+       mrcImage* clusterM;
+       int numN;
+       int numM;
+       lmrcImageClusterAnalysisInfo linfo;
+       float** distance; 
+       int n;
+       int m;
+       double retValue;
+       int prevN;
+       int prevM;
+       int* minn;
+       int* minm;
+       float* min;
+       mrcImage* minCor; 
+       mrcImage* minOut; 
+       lmrcImageAutoRotationCorrelationInfo* minInfo;
+
+
+       eosPThread* pthread;
+       int flagSkip;
+       int flagNoValue;
+} lmrcImageDistanceCalc0ForPThreadArgs;
 
 /*
        Historically, we created the mrcImageClusterAnalysis first.
@@ -44,25 +72,25 @@ lmrcImageClusterAnalysisDistanceToLog(FILE* fpt, int n, int m, int prevM, int pr
        fflush(fpt);
 }
 
-double
-lmrcImageDistanceCalc0(mrcImage* out, mrcImage* cor, mrcImage* clusterN, mrcImage* clusterM, int numN, int numM, lmrcImageClusterAnalysisInfo* linfo) {
-       double distance = 0;
+void
+lmrcImageDistanceCalc0(mrcImage* out, mrcImage* cor, mrcImage* clusterN, mrcImage* clusterM, int numN, int numM, lmrcImageClusterAnalysisInfo* linfo, float* distance) {
+       //double distance = 0;
        mrcImageParaTypeRealCoord offset;
-
+    *distance = 0;
        offset.x = offset.y = offset.z = 0;
 
-       DEBUGPRINT("n lmrcImageDistanceCalc0:");
+       DEBUGPRINT2("lmrcImageDistanceCalc0: numN %d numM %d\n", numN, numM);
        switch(linfo->mode) {
                case lmrcImageClusterAnalysisModeCorrelation:
                case lmrcImageClusterAnalysisModeLinearCorrelation:
                case lmrcImageClusterAnalysisModeEuclidDistance: {
                  if(linfo->flagAutoRotation) {
-                       distance = lmrcImageDistanceCalcWithAutoRotation(out, cor, 
+                       lmrcImageDistanceCalcWithAutoRotation(distance, out, cor, 
                                                          clusterN, clusterM, 
                                                  &(linfo->arInitial), linfo->correlationMode, linfo->mode);
                  } else {
                        DEBUGPRINT("ByCorrelation:");
-                   distance = lmrcImageDistanceCalc(clusterN, clusterM, linfo->mode);
+                   lmrcImageDistanceCalc(distance, clusterN, clusterM, linfo->mode);
                        *out = *clusterN;
                        cor->Image = NULL;
                  }
@@ -71,13 +99,13 @@ lmrcImageDistanceCalc0(mrcImage* out, mrcImage* cor, mrcImage* clusterN, mrcImag
                case lmrcImageClusterAnalysisModeWardMethod: 
                case lmrcImageClusterAnalysisModeWardMethodLinearCorrelation: {
                  if(linfo->flagAutoRotation) {
-                       distance = lmrcImageDistanceCalcByWardMethodWithAutoRotation(out, cor,
+                       lmrcImageDistanceCalcByWardMethodWithAutoRotation(distance, out, cor,
                                           clusterN,    clusterM, 
                                           numN, numM,
                                                           &(linfo->arInitial), linfo->correlationMode, linfo->mode);
                  } else {
                        DEBUGPRINT("By Ward: ");
-            distance = lmrcImageDistanceCalcByWardMethod(
+            lmrcImageDistanceCalcByWardMethod(distance, 
                                                           clusterN, clusterM, 
                                       numN, numM, 
                                       linfo->mode);
@@ -95,14 +123,58 @@ lmrcImageDistanceCalc0(mrcImage* out, mrcImage* cor, mrcImage* clusterN, mrcImag
                  break;
                }
        }
-       DEBUGPRINT1("Distance: %f\n", distance)
-       if(0<distance) {
-               return distance;
+       DEBUGPRINT1("Distance: %f\n", *distance)
+/*     
+       if(0<*distance) {
+               return *distance;
        } else {
                return (0);
        }
+*/
 } 
 
+void
+lmrcImageDistanceCalc0ForPThread(void* args)
+{
+       int n;
+       int m;
+       float data;
+       lmrcImageDistanceCalc0ForPThreadArgs* Arg ;
+
+       Arg = (lmrcImageDistanceCalc0ForPThreadArgs*)args;
+    DEBUGPRINT2("lmrcImageDistanceCalc0ForPThread: %d %d\n", Arg->n, Arg->m)
+       n = Arg->n;
+       m = Arg->m;
+
+       lmrcImageDistanceCalc0(Arg->out, Arg->cor, Arg->clusterN, Arg->clusterM, Arg->numN, Arg->numM, &(Arg->linfo), &data);
+
+       eosPThreadMutexLock(Arg->pthread);
+       Arg->distance[n][m] = data;
+       DEBUGPRINT3("%d %d %f\n", n, m, Arg->distance[n][m]);
+       /* Evaluate Distance betweeen cluster[index[n]] and cluster[index[m]] */
+       if(Arg->distance[n][m]<=*Arg->min) { 
+               *Arg->min  = Arg->distance[n][m];
+               *Arg->minn = n;
+               *Arg->minm = m;
+               if(Arg->flagSkip) {
+                       Arg->flagNoValue = 1;
+               } else {
+                       Arg->flagNoValue = 0;
+                       mrcImageFree(Arg->minCor, "in lmrcImageClusterAnalysis");
+                       mrcImageFree(Arg->minOut, "in lmrcImageClusterAnalysis");
+                       *Arg->minCor = *Arg->cor;
+                       *Arg->minOut = *Arg->out;
+                       *Arg->minInfo = Arg->linfo.arInitial;
+               }
+       } else {
+               if(!Arg->flagSkip) {
+                       mrcImageFree(Arg->cor, "in lmrcImageClusterAnalysis");
+                       mrcImageFree(Arg->out, "in lmrcImageClusterAnalysis");
+               }
+       }
+       eosPThreadMutexUnlock(Arg->pthread);
+}
+
 void 
 lmrcImageClusterAnalysis(
        int* group,                         /* Output: Group Index */
@@ -122,6 +194,8 @@ lmrcImageClusterAnalysis(
   mrcImageParaTypeRealCoord offset;
   mrcImage out;
   mrcImage cor;
+  mrcImage* outs;
+  mrcImage* cors;
   mrcImage minOut;
   mrcImage minCor;
   lmrcImageAutoRotationCorrelationInfo minInfo; 
@@ -129,7 +203,13 @@ lmrcImageClusterAnalysis(
   int flagNoValue= 1;
   int flagNoSkip = 0;
   clusterLog* clusterLog=NULL;
+  int threadNum   = 1;        /* Thrad Number */
+  int iThread     = 0;        /* Thread ID */
+  eosPThread pthread;
+  lmrcImageDistanceCalc0ForPThreadArgs* pthreadArg=NULL;
+  int flagMutex = 0;
 
+  DEBUGPRINT("Start lmrcImageClusterAnalysis\n");      
   minn       = minm = 0;
   clusternum = N; /* the current number of clusters */
   prevN      = N; /* previous N */
@@ -144,7 +224,7 @@ lmrcImageClusterAnalysis(
   linfo->averagedImage = (mrcImage*)memoryAllocate(sizeof(mrcImage)*N, "Enough memory is not available!");
 
   if(linfo->flagLogIn) {
-       DEBUGPRINT("LogIn\n");
+       DEBUGPRINT("Use LogIn\n");
        fseek(linfo->fptLogIn, 0L, SEEK_SET);
        clusterLog = clusterLogReadAll(clusterLog, linfo->fptLogIn, 0); 
        clusterLogClusterNumberSet2(clusterLog, linfo->previousFileNumber, 0); 
@@ -196,72 +276,178 @@ lmrcImageClusterAnalysis(
    *: Calc
    -: No Calc
   */
+  DEBUGPRINT2("eosPThread: flag %d Num %d\n", __eosPThread__, __eosPThreadNum__);
+  if(__eosPThread__) {
+    threadNum = __eosPThreadNum__;
+    eosPThreadInit(&pthread, threadNum, 0);
+       eosPThreadMutexInit(&pthread);
+       pthreadArg =(lmrcImageDistanceCalc0ForPThreadArgs*) 
+       memoryAllocate(sizeof(lmrcImageDistanceCalc0ForPThreadArgs)*threadNum, "in lmrcImageClusterAnalysis");
+       outs = (mrcImage*)memoryAllocate(sizeof(mrcImage)*threadNum, "in lmrcImageClusterAnalysis");
+       cors = (mrcImage*)memoryAllocate(sizeof(mrcImage)*threadNum, "in lmrcImageClusterAnalysis");
+       for(iThread=0; iThread<threadNum; iThread++) {
+               pthreadArg[iThread].out    = &(outs[iThread]); // work out 
+               pthreadArg[iThread].cor    = &(cors[iThread]); // work cor
+               pthreadArg[iThread].linfo   = *linfo;          // work linfo
+               pthreadArg[iThread].distance = distance;       // Output: distance[N][M] ; Shared
+               pthreadArg[iThread].minCor = &minCor;          // Output: minCor
+               pthreadArg[iThread].minOut = &minOut;          // Output: minOut
+               pthreadArg[iThread].minn = &minn;              // Output: minN
+               pthreadArg[iThread].minm = &minm;                          // Output: minM
+               pthreadArg[iThread].min  = &min;               // Output: min
+               pthreadArg[iThread].minInfo  = &minInfo;       // Output: minInfo
+               pthreadArg[iThread].pthread = &pthread;        // control: pthread
+       }
+       eosPThreadMutexInit(&pthread);
+  } else {
+       threadNum = 1;
+  }
 
+  i = 0;
+  DEBUGPRINT2("cluster condition %d<%d?\n", finalclusternum, clusternum);
   while (finalclusternum<clusternum) {
     min=MAXFLOAT;
     for (n=0; n<clusternum; n++) {
       for (m=0; m<n; m++) {
+               if(__eosPThread__) {
+                       eosPThreadMutexLock(&pthread);
 
-               /* Check whether correlation between index[n] and index[m] must be calculated. */       
-               if( clusternum != N       /* At the first step (N==clusternum), we cannot skip */
-                && index[n]   != index[prevM]          
-                && index[m]   != index[prevM]
-                && min <= distance[n][m]) {      
-                       flagSkip = 1;
-               } else {
-                       flagSkip = 0;
-               }
-               if(linfo->flagLogIn && !flagSkip && !flagNoSkip) {
-                       clusterTypeReal d = -1;
-                       clusterLog->current = clusterLogGetDistance(clusterLog, n, m, clusternum - (N - linfo->previousFileNumber), &d);
-                       if(d<=0) {
-                               DEBUGPRINT3("Zero:: n: %d m: %d d: %g\n", n, m, d);
-                               flagNoSkip = 1; /* The log file has an error log line */
+                       iThread = i%threadNum;
+                       DEBUGPRINT4("thread %d/%d at (n: %d, m: %d)\n", iThread, i, n, m);
+                       eosPThreadMutexUnlock(&pthread);
+
+                       if(pthread.status[iThread] == eosPThreadStatusRunning) {
+                               eosPThreadJoin(&pthread, iThread, 0);
                        }
-                       if(0<d) {
-                               distance[n][m] = d;
-                               flagSkip = 1;
+                       eosPThreadMutexLock(&pthread);
+
+                       /* Check whether correlation between index[n] and index[m] must be calculated. */       
+                       if( clusternum != N       /* At the first step (N==clusternum), we cannot skip */
+                        && index[n]   != index[prevM]          
+                        && index[m]   != index[prevM]
+                        && min <= distance[n][m]) {      
+                               flagSkip = 1;
                        } else {
                                flagSkip = 0;
                        }
-               } 
+                       if(linfo->flagLogIn && !flagSkip && !flagNoSkip) {
+                               clusterTypeReal d = -1;
+                               clusterLog->current = clusterLogGetDistance(clusterLog, n, m, clusternum - (N - linfo->previousFileNumber), &d);
+                               if(d<=0) {
+                                       DEBUGPRINT3("Zero:: n: %d m: %d d: %g\n", n, m, d);
+                                       flagNoSkip = 1; /* The log file has an error log line */
+                               }
+                               if(0<d) {
+                                       distance[n][m] = d;
+                                       flagSkip = 1;
+                               } else {
+                                       flagSkip = 0;
+                               }
+                       } 
+                       /* Calc distance[n][m] */
+                       if(flagSkip && 0 < distance[n][m]) { 
+                               DEBUGPRINT4("skip:   n: %d m: %d prevM: %d prevN: %d\n", n, m, prevM, prevN);
+                               DEBUGPRINT4("index:  n: %d m: %d prevM: %d prevN: %d\n", index[n], index[m], index[prevM], index[prevN]);
+                               /* Skip because of no need of calculation */
+                               eosPThreadMutexUnlock(&pthread);        
+                       } else {
+                               DEBUGPRINT4("noskip: n: %d m: %d prevM: %d prevN: %d\n", n, m, prevM, prevN);
+                               DEBUGPRINT4("index:  n: %d m: %d prevM: %d prevN: %d\n", index[n], index[m], index[prevM], index[prevN]);
+                               distance[n][m] = 0;
+                               pthreadArg[iThread].iCount = iThread;   
+                               pthreadArg[iThread].clusterN= &(cluster[index[n]]);     
+                               pthreadArg[iThread].clusterM= &(cluster[index[m]]);     
+                               pthreadArg[iThread].numN    = averagednum[index[n]];    
+                               pthreadArg[iThread].numM    = averagednum[index[m]];    
+                               pthreadArg[iThread].n = n;
+                               pthreadArg[iThread].m = m;
+                               pthreadArg[iThread].prevN = prevN;
+                               pthreadArg[iThread].prevM = prevM;
+                               pthreadArg[iThread].flagSkip = flagSkip;
+                               pthreadArg[iThread].flagNoValue = flagNoValue;
+                       
+                               eosPThreadMutexUnlock(&pthread);        
+       
+                               eosPThreadCreate(&pthread, iThread, (void*)lmrcImageDistanceCalc0ForPThread, &(pthreadArg[iThread]), 0);
+                       }
 
-               /* Calc distance[n][m] */
-               if(flagSkip && 0 < distance[n][m]) { 
-                       DEBUGPRINT4("skip:   n: %d m: %d prevM: %d prevN: %d\n", n, m, prevM, prevN);
-                       DEBUGPRINT4("index:  n: %d m: %d prevM: %d prevN: %d\n", index[n], index[m], index[prevM], index[prevN]);
-                       /* Skip because of no need of calculation */
+                       eosPThreadMutexLock(&pthread);  
+                       i++;
+                       eosPThreadMutexUnlock(&pthread);        
                } else {
-                       DEBUGPRINT4("noskip: n: %d m: %d prevM: %d prevN: %d\n", n, m, prevM, prevN);
-                       DEBUGPRINT4("index:  n: %d m: %d prevM: %d prevN: %d\n", index[n], index[m], index[prevM], index[prevN]);
-                       distance[n][m] = lmrcImageDistanceCalc0(&out, &cor, 
-                               &cluster[index[n]], &cluster[index[m]], 
-                               averagednum[index[n]], averagednum[index[m]], linfo); 
-               } 
-
-               /* Evaluate Distance betweeen cluster[index[n]] and cluster[index[m]] */
-               if(distance[n][m]<=min) { 
-                       min  = distance[n][m];
-                   minn = n;
-                   minm = m;
-                       if(flagSkip) {
-                               flagNoValue = 1;
+                       /* Check whether correlation between index[n] and index[m] must be calculated. */       
+                       if( clusternum != N       /* At the first step (N==clusternum), we cannot skip */
+                        && index[n]   != index[prevM]          
+                        && index[m]   != index[prevM]
+                        && min <= distance[n][m]) {      
+                               flagSkip = 1;
                        } else {
-                               flagNoValue = 0;
-                               mrcImageFree(&minCor, "in lmrcImageClusterAnalysis");
-                               mrcImageFree(&minOut, "in lmrcImageClusterAnalysis");
-                               minCor = cor;
-                               minOut = out;
-                               minInfo = linfo->arInitial;
+                               flagSkip = 0;
                        }
-               } else {
-                       if(!flagSkip) {
-                               mrcImageFree(&cor, "in lmrcImageClusterAnalysis");
-                               mrcImageFree(&out, "in lmrcImageClusterAnalysis");
+                       if(linfo->flagLogIn && !flagSkip && !flagNoSkip) {
+                               clusterTypeReal d = -1;
+                               clusterLog->current = clusterLogGetDistance(clusterLog, n, m, clusternum - (N - linfo->previousFileNumber), &d);
+                               if(d<=0) {
+                                       DEBUGPRINT3("Zero:: n: %d m: %d d: %g\n", n, m, d);
+                                       flagNoSkip = 1; /* The log file has an error log line */
+                               }
+                               if(0<d) {
+                                       distance[n][m] = d;
+                                       flagSkip = 1;
+                               } else {
+                                       flagSkip = 0;
+                               }
+                       } 
+                       /* Calc distance[n][m] */
+                       if(flagSkip && 0 < distance[n][m]) { 
+                               DEBUGPRINT4("skip:   n: %d m: %d prevM: %d prevN: %d\n", n, m, prevM, prevN);
+                               DEBUGPRINT4("index:  n: %d m: %d prevM: %d prevN: %d\n", index[n], index[m], index[prevM], index[prevN]);
+                               /* Skip because of no need of calculation */
+                       } else {
+                               DEBUGPRINT4("noskip: n: %d m: %d prevM: %d prevN: %d\n", n, m, prevM, prevN);
+                               DEBUGPRINT4("index:  n: %d m: %d prevM: %d prevN: %d\n", index[n], index[m], index[prevM], index[prevN]);
+                               lmrcImageDistanceCalc0(&out, &cor, 
+                                               &cluster[index[n]], &cluster[index[m]], 
+                                               averagednum[index[n]], averagednum[index[m]], linfo, &distance[n][m]); 
+                       } 
+                       /* Evaluate Distance betweeen cluster[index[n]] and cluster[index[m]] */
+                       if(distance[n][m]<=min) { 
+                               min  = distance[n][m];
+                               minn = n;
+                       minm = m;
+                               if(flagSkip) {
+                                       flagNoValue = 1;
+                               } else {
+                                       flagNoValue = 0;
+                                       mrcImageFree(&minCor, "in lmrcImageClusterAnalysis");
+                                       mrcImageFree(&minOut, "in lmrcImageClusterAnalysis");
+                                       minCor = cor;
+                                       minOut = out;
+                                       minInfo = linfo->arInitial;
+                               }
+                       } else {
+                               if(!flagSkip) {
+                                       mrcImageFree(&cor, "in lmrcImageClusterAnalysis");
+                                       mrcImageFree(&out, "in lmrcImageClusterAnalysis");
+                               }
                        }
+                       lmrcImageClusterAnalysisDistanceToLog(linfo->fptLog, n, m, prevN, prevM, distance[n][m]); 
                }
-               lmrcImageClusterAnalysisDistanceToLog(linfo->fptLog, n, m, prevN, prevM, distance[n][m]); 
-      }
+         }
+
+         if(__eosPThread__) {
+               DEBUGPRINT4("Log: thread %d/%d at (n: %d m: %d)\n", iThread, i, n, m);
+               for(iThread=0; iThread < threadNum ; iThread++) { 
+                       if(pthread.status[iThread] == eosPThreadStatusRunning) {
+                               eosPThreadJoin(&pthread, iThread, 0);
+                       }
+               }
+               eosPThreadMutexLock(&pthread);
+        for (m=0; m<n; m++) {
+                       lmrcImageClusterAnalysisDistanceToLog(linfo->fptLog, n, m, prevN, prevM, distance[n][m]); 
+           }
+               eosPThreadMutexUnlock(&pthread);
+         }
     } /* End: Calc Distance */
 
 #ifdef DEBUG
@@ -284,9 +470,9 @@ lmrcImageClusterAnalysis(
                averagednum
     */
        if(flagNoValue) {
-               distance[minn][minm] = lmrcImageDistanceCalc0(&out, &cor,
+               lmrcImageDistanceCalc0(&out, &cor,
                        &cluster[index[minn]], &cluster[index[minm]], 
-                       averagednum[index[minn]], averagednum[index[minm]], linfo); 
+                       averagednum[index[minn]], averagednum[index[minm]], linfo, &distance[minn][minm]); 
                mrcImageFree(&minCor, "in lmrcImageClusterAnalysis");
                mrcImageFree(&minOut, "in lmrcImageClusterAnalysis");
                minCor = cor;
@@ -426,24 +612,24 @@ void lmrcImageClusterMerge(mrcImage* in1, mrcImage* in2, int* index, int* averag
   mrcImageFree(&in2mul,"");
 }
 
-float 
-lmrcImageDistanceCalcWithAutoRotation(mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode)
+void
+lmrcImageDistanceCalcWithAutoRotation(float* distance, mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode)
 {
-       double distance;
+       //double distance;
        switch(mode) {
                case lmrcImageClusterAnalysisModeCorrelation: {
                        lmrcImageAutoRotationCorrelation(out, cor, in1, in2, linfo, lmode); 
-                       distance = -linfo->max;
+                       *distance = -linfo->max;
                        break;
                }
                case lmrcImageClusterAnalysisModeEuclidDistance: {
                        lmrcImageAutoRotationCorrelation(out, cor, in1, in2, linfo, lmode); 
-                       distance = linfo->EuclidDistance;
+                       *distance = linfo->EuclidDistance;
                        break;
                }
                case lmrcImageClusterAnalysisModeLinearCorrelation: {
                        lmrcImageAutoRotationCorrelation(out, cor, in1, in2, linfo, lmode); 
-                       distance = linfo->LinearCorrelation;
+                       *distance = linfo->LinearCorrelation;
                        break;
                }
                default: {
@@ -452,32 +638,37 @@ lmrcImageDistanceCalcWithAutoRotation(mrcImage* out, mrcImage* cor, mrcImage* in
                        break;
                }
        }
-       return distance;
+       //return distance;
 }
 
-float 
-lmrcImageDistanceCalc(mrcImage* in1, mrcImage* in2, int mode)
+void
+lmrcImageDistanceCalc(float* data, mrcImage* in1, mrcImage* in2, int mode)
 {
-  double data;
+  //double data;
   
   switch (mode) {
        case lmrcImageClusterAnalysisModeCorrelation: {
-       data = -lmrcImageCorrelationinSpace(in1, in2, 0);
+       *data = lmrcImageCorrelationinSpace(in1, in2, 0);
+               *data *= (-1);
        break;
        }
        case lmrcImageClusterAnalysisModeEuclidDistance: {
-               data = lmrcImageEuclidDistanceCalc(in1, in2, 1);
+               double d;
+               lmrcImageEuclidDistanceCalc2(&d, in1, in2, 1);
+               *data = d;
                break;
        }
        case lmrcImageClusterAnalysisModeWardMethod: {
-               data = lmrcImageEuclidDistanceCalc(in1, in2, 1);
-               data = SQR(data);
+               double d;
+               lmrcImageEuclidDistanceCalc2(&d, in1, in2, 1);
+               *data = SQR(d);
                break;
        }
        case lmrcImageClusterAnalysisModeWardMethodLinearCorrelation: 
        case lmrcImageClusterAnalysisModeLinearCorrelation: {
-               data = lmrcImageLinearCorrelation(in1, in2, 1);
-               data = exp(SQR(data-1.0)/(1/log(1e4)))-1.0;
+               double d;
+               lmrcImageLinearCorrelation2(&d, in1, in2, 1);
+               *data = exp(SQR(d-1.0)/(1/log(1e4)))-1.0;
                break;
        }       
        default: {
@@ -486,22 +677,23 @@ lmrcImageDistanceCalc(mrcImage* in1, mrcImage* in2, int mode)
                break;
        }
   }
-  return data;
+  //return data;
 }
 
-float 
-lmrcImageDistanceCalcByWardMethodWithAutoRotation(mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, int num1, int num2, lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode)
+void
+lmrcImageDistanceCalcByWardMethodWithAutoRotation(float* distance, mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, int num1, int num2, lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode)
 {
-       double distance;
+       //double distance;
+       DEBUGPRINT2("lmrcImageDistanceCalcByWardMethodWithAutoRotation: %p %p\n", distance, linfo);
        switch(mode) {
                case lmrcImageClusterAnalysisModeWardMethod: {
                        lmrcImageAutoRotationCorrelation(out, cor, in1, in2, linfo, lmode); 
-                       distance = SQR(linfo->EuclidDistance)*(num1*num2)/(num1+num2);
+                       *distance = SQR(linfo->EuclidDistance)*(num1*num2)/(num1+num2);
                        break;
                }
                case lmrcImageClusterAnalysisModeWardMethodLinearCorrelation: {
                        lmrcImageAutoRotationCorrelation(out, cor, in1, in2, linfo, lmode);
-                       distance = (exp(SQR(linfo->LinearCorrelation-1.0)/(1/log(1e4)))-1.0)*(num1*num2)/(num1+num2);
+                       *distance = (exp(SQR(linfo->LinearCorrelation-1.0)/(1/log(1e4)))-1.0)*(num1*num2)/(num1+num2);
                        break;
                }
                default: {
@@ -510,27 +702,28 @@ lmrcImageDistanceCalcByWardMethodWithAutoRotation(mrcImage* out, mrcImage* cor,
                        break;
                }
        }
-       return distance;
+       //return distance;
 }
 
-float 
-lmrcImageDistanceCalcByWardMethod(mrcImage* in1, mrcImage* in2, int num1, int num2, int mode)
+void
+lmrcImageDistanceCalcByWardMethod(float* distance, mrcImage* in1, mrcImage* in2, int num1, int num2, int mode)
 {
        double data;
-       double distance;
+       //double distance;
 
+       DEBUGPRINT3("lmrcImageDistanceCalcByWardMethod: distance %p num1 %d num2 %d\n", distance, num1, num2);
        switch(mode) {
                case lmrcImageClusterAnalysisModeWardMethod: {
-                       data = lmrcImageEuclidDistanceCalc(in1, in2, 0);
-                       distance = (data)*((num1*num2)/(num1+num2));
+                       lmrcImageEuclidDistanceCalc2(&data, in1, in2, 0);
+                       *distance = (data)*((num1*num2)/(num1+num2));
                        break;
                }
                case lmrcImageClusterAnalysisModeWardMethodLinearCorrelation: {
-                       data = lmrcImageLinearCorrelation(in1, in2, 0); 
+                       lmrcImageLinearCorrelation2(&data, in1, in2, 0); 
                        if(0<data) {
-                               distance = (200.0/(data+1.0)-100)*(num1*num2)/(num1+num2);
+                               *distance = (200.0/(data+1.0)-100)*(num1*num2)/(num1+num2);
                        } else {
-                               distance = (200.0/(data+1.0)-100)*(num1*num2)/(num1+num2);
+                               *distance = (200.0/(data+1.0)-100)*(num1*num2)/(num1+num2);
                        }
                        break;
                }
@@ -540,7 +733,7 @@ lmrcImageDistanceCalcByWardMethod(mrcImage* in1, mrcImage* in2, int num1, int nu
                        break;
                }
        }
-       return data;
+       //return data;
 }
 
 float lmrcImageClusterAnalysisByIteration(int* group, mrcImage* in, int clusternum, int N, int mode)
@@ -586,7 +779,7 @@ float lmrcImageClusterAnalysisByIteration(int* group, mrcImage* in, int clustern
     for (n=0; n<N; n++){
       distancemin = 1e+16;
       for (m=0; m<clusternum; m++){
-       distance = lmrcImageDistanceCalc(&in[n], &center[m], mode);
+           lmrcImageDistanceCalc(&distance, &in[n], &center[m], mode);
        if (distance < distancemin){
          distancemin = distance;         
          group[n] = m;
@@ -607,13 +800,17 @@ float lmrcImageClusterAnalysisByIteration(int* group, mrcImage* in, int clustern
   mrcImageFree(&tmpimage, "");
   clustervar=0;
   for (n=0; n<clusternum; n++){
-    clustervar += lmrcImageDistanceCalc(&centerofclusters, &center[n], 2);
+       float data;
+    lmrcImageDistanceCalc(&data, &centerofclusters, &center[n], 2);
+    clustervar += data;
   }
   clustervar /= clusternum;
   if (mode != 2){
     distancesum = 0;
     for (n=0; n<N; n++){
-      distancesum += lmrcImageDistanceCalc(&in[n], &center[group[n]], 2);
+        float data;
+      lmrcImageDistanceCalc(&data, &in[n], &center[group[n]], 2);
+      distancesum += data;
     }
   }
   distancesum/=N;
index 7381693..f9db051 100755 (executable)
@@ -79,11 +79,11 @@ extern "C" {
 
 void lmrcImageClusterAnalysis(int* group, mrcImage* in, int finalclusternum, int N, lmrcImageClusterAnalysisInfo* linfo);
 void lmrcImageClusterMerge(mrcImage* in1, mrcImage* in2, int* index, int* averagednum, int m, int n, int* N);
-float lmrcImageDistanceCalc(mrcImage* in1, mrcImage* in2, int mode);
-float lmrcImageDistanceCalcByWardMethod(mrcImage* in1, mrcImage* in2, int num1, int num2, int mode);
+void lmrcImageDistanceCalc(float* dis, mrcImage* in1, mrcImage* in2, int mode);
+void lmrcImageDistanceCalcByWardMethod(float* dis, mrcImage* in1, mrcImage* in2, int num1, int num2, int mode);
 
-float lmrcImageDistanceCalcWithAutoRotation(mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode);
-float lmrcImageDistanceCalcByWardMethodWithAutoRotation(mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, int num1, int num2,  lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode);
+void lmrcImageDistanceCalcWithAutoRotation(float* dis, mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode);
+void lmrcImageDistanceCalcByWardMethodWithAutoRotation(float* dis, mrcImage* out, mrcImage* cor, mrcImage* in1, mrcImage* in2, int num1, int num2,  lmrcImageAutoRotationCorrelationInfo* linfo, int lmode, int mode);
 
 float lmrcImageClusterAnalysisByIteration(int* group, mrcImage* in, int clusternum, int N, int mode);
 
index de63a94..2ec76c6 100755 (executable)
@@ -10,7 +10,7 @@
 #%Z%
 */
 static char __sccs_id[] = "%Z%lmrcImageCommonLine ver%I%; Date:%D% %Z%";
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "./lmrcImageSinogram.h"
 #include "./lmrcImageCommonLine.h"
index 2eb649d..21a7065 100755 (executable)
@@ -12,7 +12,7 @@
 static char __sccs_id[] = "%Z%lmrcImageConnection ver%I%; Date:%D% %Z%";
 
 #include "lmrcImageConnection.h"
-#define DEBUG
+#undef DEBUG
 
 void
 lmrcImageConnection( mrcImage* out,
index 59124d1..c9ee972 100755 (executable)
@@ -36,6 +36,14 @@ static char __sccs_id[] = "%Z%lmrcImageCorrelation ver%I%; Date:%D% %Z%";
 double 
 lmrcImageEuclidDistanceCalc(mrcImage* in1, mrcImage* in2, int mode)
 {
+       double r;
+       lmrcImageEuclidDistanceCalc2(&r, in1, in2, mode);
+       return r;
+}
+
+void
+lmrcImageEuclidDistanceCalc2(double* r, mrcImage* in1, mrcImage* in2, int mode)
+{
        double data1, data2;
        double data;
        mrcImageParaTypeReal x, y, z;
@@ -44,7 +52,7 @@ lmrcImageEuclidDistanceCalc(mrcImage* in1, mrcImage* in2, int mode)
         ||in1->HeaderN.y!=in2->HeaderN.y
         ||in1->HeaderN.z!=in2->HeaderN.z) {
                fprintf(stderr, "Attention in lmrcImageEuclidDistanceCalc\n");
-               fprintf(stderr, "size is different (%f, %f, %f) != (%f, %f, %f)\n", 
+               fprintf(stderr, "size is different (%d, %d, %d) != (%d, %d, %d)\n", 
                        in1->HeaderN.x, in1->HeaderN.y, in1->HeaderN.z,
                        in2->HeaderN.x, in2->HeaderN.y, in2->HeaderN.z);
        }
@@ -76,7 +84,8 @@ lmrcImageEuclidDistanceCalc(mrcImage* in1, mrcImage* in2, int mode)
                data /= count;
        }
 
-       return data;
+       *r = data;
+       //return data;
 }
 
 /*
@@ -127,6 +136,7 @@ lmrcImageAutoRotationCorrelation(mrcImage* out,  mrcImage* cor,
 {
        int i;
        int ntheta;
+       int itheta;
        float dtheta;
        float theta;
        float minTheta;
@@ -139,6 +149,7 @@ lmrcImageAutoRotationCorrelation(mrcImage* out,  mrcImage* cor,
        mrcImage inImage;
        double data;
        mrcImageParaTypeReal x, y, z;
+       double distance;
 
        DEBUGPRINT("Start lmrcImageAutoRotationCorrelation---\n");
        /* 
@@ -152,7 +163,7 @@ lmrcImageAutoRotationCorrelation(mrcImage* out,  mrcImage* cor,
                lmrcImageFFT(&inImage, in, 0);
                inFFT = *in;
        } else {
-               fprintf(stderr, "Not supported mode: %ld\n", in->HeaderMode);
+               fprintf(stderr, "Not supported mode: %d\n", in->HeaderMode);
        }
        
        /* 
@@ -177,7 +188,9 @@ lmrcImageAutoRotationCorrelation(mrcImage* out,  mrcImage* cor,
                case lmrcImageAutoRotationCorrelationMethodRotationAndCorrelationSSDA: {
                        current  = -1e30; linfo->max = maxOld = -1e30; /* Initial */ 
                        for(i=0; i<linfo->iter; i++) {
-                               for(theta=minTheta; theta<maxTheta; theta+=dtheta) {
+                               //for(theta=minTheta; theta<maxTheta; theta+=dtheta) {
+                               for(itheta=0; itheta<ntheta; itheta++) {
+                                       theta = minTheta +  itheta*dtheta;
                                        /* Rotate ref to rotproj */ 
                                        //fprintf(stderr, "nRot: %d theta: %f %f<->%f delta %f\n", ntheta, theta*DEGREE, maxTheta*DEGREE, minTheta*DEGREE, dtheta*DEGREE);
                                        DEBUGPRINT5("nRot: %d theta: %f %f<->%f delta %f\n", ntheta, theta, maxTheta, minTheta, dtheta);
@@ -323,8 +336,10 @@ lmrcImageAutoRotationCorrelation(mrcImage* out,  mrcImage* cor,
        lmrcImageRotation2DPeriodicBoundary(out, &rotproj, -linfo->maxTheta, mrcPixelHowCubicConv); 
        //lmrcImageRotation2DPeriodicBoundary(&rotproj, &inImage, -linfo->maxTheta, mrcPixelHowCubicConv); 
        //lmrcImageShift(&out, &rotproj, currentp, mrcPixelHowCubicConv); 
-       linfo->EuclidDistance    = lmrcImageEuclidDistanceCalc(out, ref, 1);  
-       linfo->LinearCorrelation = lmrcImageLinearCorrelation (out, ref, 1);  
+       lmrcImageEuclidDistanceCalc2(&distance, out, ref, 1);  
+       linfo->EuclidDistance = distance;       
+       lmrcImageLinearCorrelation2 (&distance,out, ref, 1);  
+       linfo->LinearCorrelation = distance;
        DEBUGPRINT1("EuclidDistance:    %f \n", linfo->EuclidDistance); 
        DEBUGPRINT1("LinearCorrelation: %f \n", linfo->LinearCorrelation); 
 
@@ -334,7 +349,7 @@ lmrcImageAutoRotationCorrelation(mrcImage* out,  mrcImage* cor,
        } else if(IsFT(in, "IsFT", 0)) {
                mrcImageFree(&inImage, 0);
        } else {
-               fprintf(stderr, "Not supported mode: %ld\n", in->HeaderMode);
+               fprintf(stderr, "Not supported mode: %d\n", in->HeaderMode);
        }
 }
 
@@ -375,7 +390,7 @@ lmrcImageCorrelationRefinement(mrcImage* out, mrcImage* shift, mrcImage* in, mrc
         inFFT = *in;
         refFFT = *ref;
     } else {
-        fprintf(stderr, "Nut supported Mode (in %ld, ref %ld)\n", in->HeaderMode, ref->HeaderMode);
+        fprintf(stderr, "Nut supported Mode (in %d, ref %d)\n", in->HeaderMode, ref->HeaderMode);
         exit(EXIT_FAILURE);
        }
 
@@ -450,7 +465,7 @@ lmrcImageCorrelationRefinement(mrcImage* out, mrcImage* shift, mrcImage* in, mrc
                                        break;
                                }
                                default: {
-                                       fprintf(stderr, "Not supported mode: %ld in lmrcImageCorrelation\n", info->mode);
+                                       fprintf(stderr, "Not supported mode: %d in lmrcImageCorrelation\n", info->mode);
                                        exit(EXIT_FAILURE);
                                        break;
                                }
@@ -517,13 +532,22 @@ lmrcImageCorrelationRefinement(mrcImage* out, mrcImage* shift, mrcImage* in, mrc
 double
 lmrcImageLinearCorrelation(mrcImage* in1, mrcImage* in2, long mode)
 {
+       double r;
+
+       lmrcImageLinearCorrelation2(&r, in1, in2, mode);
+       return r;
+}
+
+void
+lmrcImageLinearCorrelation2(double* r, mrcImage* in1, mrcImage* in2, long mode)
+{
        mrcImageParaTypeReal x, y, z;
        double data1, data2;
        double sum1, sum2;
        double avg1, avg2;
        double xy, xx, yy;
        double count;
-       double r;
+       //double r;
 
        sum1 = sum2 = count = 0.0;
        for(x=0; x<in1->HeaderN.x; x++) {
@@ -554,12 +578,12 @@ lmrcImageLinearCorrelation(mrcImage* in1, mrcImage* in2, long mode)
        }
        }
 
-       r = xy/sqrt(xx)/sqrt(yy);
+       *r = xy/sqrt(xx)/sqrt(yy);
 
-       return r;
+       //return r;
 }
 
-void 
+void
 lmrcImageCorrelation(mrcImage* out, mrcImage* in, mrcImage* ref, long mode)
 {
     mrcImage  inFFT;
@@ -573,7 +597,7 @@ lmrcImageCorrelation(mrcImage* out, mrcImage* in, mrcImage* ref, long mode)
     if(!(   in->HeaderN.x==ref->HeaderN.x
           &&in->HeaderN.y==ref->HeaderN.y
           &&in->HeaderN.z==ref->HeaderN.z)) {
-        fprintf(stderr, "Different size between in(%ld,%ld,%ld) and ref(%ld,%ld,%ld)\n"
+        fprintf(stderr, "Different size between in(%d,%d,%d) and ref(%d,%d,%d)\n"
                         ,in->HeaderN.x, ref->HeaderN.x
                         ,in->HeaderN.y, ref->HeaderN.y
                         ,in->HeaderN.z, ref->HeaderN.z);
@@ -596,7 +620,7 @@ lmrcImageCorrelation(mrcImage* out, mrcImage* in, mrcImage* ref, long mode)
         inFFT = *in;
         refFFT = *ref;
     } else {
-        fprintf(stderr, "Nut supported Mode (in %ld, ref %ld)\n", in->HeaderMode, ref->HeaderMode);
+        fprintf(stderr, "Nut supported Mode (in %d, ref %d)\n", in->HeaderMode, ref->HeaderMode);
         exit(EXIT_FAILURE);
     }
        switch(mode&0x0000000f) {
@@ -694,8 +718,8 @@ lmrcImageAutoRotationCorretionForManyReferences(mrcImage* in, mrcImage* ref,
     mrcImage out;
        mrcImage fit;
        mrcImage cor;
-    long i, inext;
-    long i1, i2, i3;
+    int i, inext;
+    int i1, i2, i3;
     mrcImageParaTypeReal x, y;
     char s[5];
     double correlationMax=-1e30;
@@ -822,7 +846,7 @@ lmrcImageAutoRotationCorretionForManyReferences(mrcImage* in, mrcImage* ref,
                 mrcPixelDataSet(&out, 5, 0, i, y, mrcPixelRePart);
                 mrcPixelDataSet(&out, 6, 0, i, correlation, mrcPixelRePart);
 
-                fprintf(info->fptOutASC, "%ld: ", i);
+                fprintf(info->fptOutASC, "%d: ", i);
                 strncpy(s, ref->Tailer[i].Cont.EulerAngleMode, 4);
                 LOGPRINT12(info->fptOutASC, "", "", \
                     "%4s %15.6f %15.6f %15.6f : %15.6f theta %15.6f at %15.6f %15.6f onMap %15.6f %15.6f %s Cor %15.6f\n",
index c62cbdd..2e35561 100755 (executable)
@@ -44,6 +44,8 @@ typedef struct lmrcImageAutoRotationCorrelationInfo {
        int   flagXshiftOnly;
        int   flagNoShift;
 
+/* Control */
+
 /* Output */
        float max; //
        float maxTheta; //
@@ -136,8 +138,10 @@ typedef struct lmrcImageCorrelationPVMInfo {
 extern void lmrcImageAutoRotationCorrelation(mrcImage* out, mrcImage* cor, mrcImage* in, mrcImage* ref, lmrcImageAutoRotationCorrelationInfo* linfo, int mode);
 extern void lmrcImageAutoRotationCorrelationRotationalCrossCorrelationFunction(mrcImage* out, mrcImage* cor, mrcImage* in, mrcImage* ref, lmrcImageAutoRotationCorrelationInfo* linfo, int mode);
 extern double lmrcImageLinearCorrelation(mrcImage* in1, mrcImage* in2, long mode);
+extern void lmrcImageLinearCorrelation2(double* cor, mrcImage* in1, mrcImage* in2, long mode);
 extern void lmrcImageCorrelation(mrcImage* cor, mrcImage* in, mrcImage* ref, long mode);
 extern double lmrcImageEuclidDistanceCalc(mrcImage* in1, mrcImage* in2, int mode); 
+extern void lmrcImageEuclidDistanceCalc2(double* cor, mrcImage* in1, mrcImage* in2, int mode); 
 extern void lmrcImageCorrelationRefinement(mrcImage* cor, mrcImage* shift, mrcImage* in, mrcImage* ref, lmrcImageCorrelationRefinementInfo* info, long mode);
 
 
index 562f6ff..3a85273 100644 (file)
@@ -16,7 +16,7 @@ static char __sccs_id[] = "%Z%lmrcImageDeconvoluton ver%I%; Date:%D% %Z%";
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>       
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "../inc/mrcImage.h"
 #include "./lmrcImageDeconvolution.h"
index 5f52d69..daf7a6d 100755 (executable)
@@ -15,7 +15,7 @@ static char __sccs_id[] = "%Z%mrcImageDensityInfo ver%I%; Date:%D% %Z%";
 #include <string.h>
 #include <math.h>                  
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "mrcImage.h"
index ff88974..6c51009 100755 (executable)
@@ -10,7 +10,7 @@
 #%Z%
 */
 static char __sccs_id[] = "%Z%lmrcImageDensityNormalizationByImage ver%I%; Date:%D% %Z%";
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "nr2.h"
index 3a6db1a..b817468 100755 (executable)
@@ -12,7 +12,6 @@
 static char __sccs_id[] = "%Z%lmrcImageFFT ver%I%; Date:%D% %Z%";
 
 #undef DEBUG
-//#define DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "eosPThread.h"
index ee52450..01f75da 100755 (executable)
@@ -10,7 +10,6 @@
 */
 /* $Log$ */
 
-//#define DEBUG
 #undef  DEBUG
 #include "genUtil.h"
 #include "Memory.h"
index d8c22eb..35b0e68 100644 (file)
@@ -11,7 +11,7 @@
 */
 static char __sccs_id[] = "%Z%lmrcImageHoughTransform ver%I%; Date:%D% %Z%";
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "./lmrcImageHoughTransform.h"
 
index 35847f1..b4a75dd 100755 (executable)
@@ -10,7 +10,7 @@
 */
 /* $Log$ */
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "./lmrcImageLabeling.h"
 
index 7daf78d..1e2e066 100755 (executable)
@@ -14,7 +14,7 @@ static char __sccs_id[] = "%Z%lmrcImageLowPassFilter ver%I%; Date:%D% %Z%";
 #include <stdlib.h>
 #include <math.h>
 #include "../inc/mrcImage.h"
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 
index 8708742..0898fcb 100755 (executable)
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <math.h>
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "../inc/mrcImage.h"
index 623700a..779f340 100755 (executable)
@@ -11,7 +11,7 @@
 */
 static char __sccs_id[] = "%Z%lmrcImageRadialDistribution ver%I%; Date:%D% %Z%";
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "mrcImage.h"
 #include "lmrcImageRadialDistribution.h"
index ed0f24d..67362e3 100755 (executable)
@@ -188,7 +188,7 @@ lmrcImageRhoFiltering2(mrcImage* out, mrcImage* counter, int index, Matrix3D M,
                                        DEBUGPRINT("FFT End\n")
                                        mrcPixelDataGet(&counterFFT, 0, 0, 0, &F000, mrcPixelMag, mrcPixelHowNearest);
                                        if(0==F000) fprintf(stderr, "F000 = %f\n", F000);
-#define DEBUG
+#undef DEBUG
 #ifdef  DEBUG
                                        DEBUGPRINT1("F000:%g\n", F000);
                                mrcPixelDataGet(counter, 0, 0, 0, &re, mrcPixelMag, mrcPixelHowNearest);
index 1bf68e0..b135d45 100755 (executable)
@@ -1,5 +1,5 @@
 #include <math.h>
-#define DEBUG
+#undef DEBUG
 #include "../inc/mrcImage.h"
 #include "genUtil.h"
 #include "mrcImage.h"
index 8399923..30d866f 100755 (executable)
@@ -11,7 +11,7 @@
 */
 static char __sccs_id[] = "%Z%lmrcImageSinogram ver%I%; Date:%D% %Z%";
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "./lmrcImageSinogram.h"
 #include "./lmrcImageBinarization.h"
index bee4ce0..fbd777d 100755 (executable)
@@ -9,7 +9,7 @@
 #
 */
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "./lmrcImageSinogram.h"
 #include "./lmrcImageBinarization.h"
index e77892b..07dffac 100755 (executable)
@@ -12,7 +12,8 @@
 static char __sccs_id[] = "%Z%lmrcImageSolventFlattening ver%I%; Date:%D% %Z%";
 #include "../inc/mrcImage.h"
 #include "lmrcImageSolventFlattening.h"
-#define DEBUG
+#undef DEBUG
+#include "genUtil.h"
 
 void
 lmrcImageSolventFlattening( mrcImage* out,
index 7f63d3b..815428b 100755 (executable)
@@ -18,7 +18,7 @@ static char __sccs_id[] = "%Z%lmrcImageSymmetryFind ver%I%; Date:%D% %Z%";
 #include <math.h>                  
 #define GLOBAL_DECLARATION
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "mrcImage.h"
index ab63b14..c8ef983 100755 (executable)
@@ -17,7 +17,7 @@ static char __sccs_id[] = "%Z%lmrcImageSymmetryFind ver%I%; Date:%D% %Z%";
 #include <math.h>                  
 #define GLOBAL_DECLARATION
 
-#define DEBUG
+#undef DEBUG
 #undef  DEBUG2
 #include "genUtil.h"
 #include "../inc/mrcImage.h"
index a59b34a..057113b 100755 (executable)
@@ -14,7 +14,7 @@
 static char __sccs_id[] = "%Z%lmrcImageWindowing ver%I%; Date:%D% %Z%";
 #include <stdlib.h>
 #include <math.h>
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 
 #include "../inc/mrcImage.h"
index 0f9419d..2f5a3e3 100755 (executable)
@@ -14,7 +14,7 @@
 static char __sccs_id[] = "@(#)lmrcImagesTTest ver1.1; Date:97/01/23 @(#)";
 
 #include <stdlib.h>
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "nr2.h"
index 66645a4..6b96d6c 100755 (executable)
@@ -14,7 +14,7 @@
 static char __sccs_id[] = "@(#)lmrcImagesTTest ver1.1; Date:97/01/23 @(#)";
 
 #include <stdlib.h>
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "nr2.h"
index fa6d592..787fffc 100755 (executable)
@@ -18,7 +18,7 @@
 #include "../inc/mrcImage.h"
 #include "lmrcSinogramFET.h"
 
-#define DEBUG
+#undef DEBUG
 #include "lmrcImageBinarization.h"
 #include "lmrcImagePosterization.h"
 
index b832446..ffce84e 100755 (executable)
@@ -518,8 +518,8 @@ mrcPixelDataGet(mrcImage* mrc,
             break;
                } 
         case mrcPixelHowLinear: {
-                       static mrcImageParaTypeInteger ix0, iy0, iz0;
-                       static mrcImageParaTypeInteger ix1, iy1, iz1;
+                       mrcImageParaTypeInteger ix0, iy0, iz0;
+                       mrcImageParaTypeInteger ix1, iy1, iz1;
                        ix0 = floor(x);
                        iy0 = floor(y);
                        iz0 = floor(z);
index ec8d264..d6806c7 100644 (file)
@@ -11,7 +11,7 @@
 */
 static char __sccs_id[] = "%Z%mrcImageGetPixels ver%I%; Date:%D% %Z%";
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "eosCuda.h"
index 7c00c8c..ed61a64 100755 (executable)
@@ -10,7 +10,7 @@
 #%Z%
 */
 static char __sccs_id[] = "%Z%mrcImageWrite2 ver%I%; Date:%D% %Z%";
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "../inc/mrcImage.h"
 
index ad63e4f..38d3e31 100755 (executable)
@@ -527,3 +527,4 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
deleted file mode 100755 (executable)
index ad841104b1b4aa83ce554496adb2d2476544f988..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-include Config/Target.inc
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..80a2401a7dc3d8e1cdc121c22208bd28b6887cf3
--- /dev/null
@@ -0,0 +1 @@
+/Users/tacyas/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file
index 7b24be7..9f75b84 100755 (executable)
 "-ARiter","-A[uto]R[otation]iter[ation]","AutoRotationIteration","Optional","1","1","AutoRotationIteration","Integer","2"
 "-ARMethod","-A[uto]R[otation]Method","Method for Correlation for Auto Rotation","Optional","1","1","AutoRotationMethod","Integer","0"
 "-M","-M[odeForCorrelation]","Correlation Mode for AutoRotation","Optional","1","1","correlationMode","Integer","19"
-"-pvm","-pvm","Parallel Analysis by PVM","Optional","0"
-"-pvmList","-pvmList","pvmList: Input","Optional","1","1","pvmList","inFile","NULL"
 "-Log","-Log","Log: Output","Optional","1","1","Log","appendFile","stdout"
 "-Log2","-Log2","Log2: Output: ClusterNode Only","Optional","1","1","Log2","appendFile","NULL"
 "-LogIn","-LogIn","previousLog: Input","Optional","1","1","LogIn","inFile","NULL"
 "-prevF","-prevF[ileNum]","previousLogFileNum: Input","Optional","1","1","prevFileNum","Integer","0"
+"-pthread","-pthread","pthread: Input","Optional","1","1","pthread","Integer","0"
+"-pvm","-pvm","Parallel Analysis by PVM","Optional","0"
+"-pvmList","-pvmList","pvmList: Input","Optional","1","1","pvmList","inFile","NULL"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","2"
index 5bd7c9f..8f5b4ef 100755 (executable)
@@ -51,12 +51,6 @@ typedef struct mrcImageClusterAnalysisInfo {
     long flagcorrelationMode;
     long correlationMode;
     
-    long pvm;
-
-    long flagpvmList;
-    char* pvmList;
-    FILE* fptpvmList;
-    
     long flagLog;
     char* Log;
     FILE* fptLog;
@@ -72,6 +66,15 @@ typedef struct mrcImageClusterAnalysisInfo {
     long flagprevFileNum;
     long prevFileNum;
     
+    long flagpthread;
+    long pthread;
+    
+    long pvm;
+
+    long flagpvmList;
+    char* pvmList;
+    FILE* fptpvmList;
+    
     long flagconfigFile;
     char* configFile;
     FILE* fptconfigFile;
index 31247de..9d843b0 100755 (executable)
@@ -148,64 +148,75 @@ argCheck(mrcImageClusterAnalysisInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
-                SCASE("pvm") {
-                    if(i+0<argc) {
-                        info->pvm++;
+                SCASE("Log") {
+                    if(i+1<argc) {
+                        info->Log = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagLog++;
                     } else {
                         usage(argv[0]);
                         exit(EXIT_FAILURE);
                     }
                     SBREAK;
                 }
-                SCASE("pvmList") {
+                SCASE("Log2") {
                     if(i+1<argc) {
-                        info->pvmList = stringGetNthWord(argv[i+1], 1, " ,");
+                        info->Log2 = stringGetNthWord(argv[i+1], 1, " ,");
                         i++;
-                        info->flagpvmList++;
+                        info->flagLog2++;
                     } else {
                         usage(argv[0]);
                         exit(EXIT_FAILURE);
                     }
                     SBREAK;
                 }
-                SCASE("Log") {
+                SCASE("LogIn") {
                     if(i+1<argc) {
-                        info->Log = stringGetNthWord(argv[i+1], 1, " ,");
+                        info->LogIn = stringGetNthWord(argv[i+1], 1, " ,");
                         i++;
-                        info->flagLog++;
+                        info->flagLogIn++;
                     } else {
                         usage(argv[0]);
                         exit(EXIT_FAILURE);
                     }
                     SBREAK;
                 }
-                SCASE("Log2") {
+                SCASE("prevF") {
                     if(i+1<argc) {
-                        info->Log2 = stringGetNthWord(argv[i+1], 1, " ,");
+                        info->prevFileNum = stringGetNthIntegerData(argv[i+1], 1, " ,");
                         i++;
-                        info->flagLog2++;
+                        info->flagprevFileNum++;
                     } else {
                         usage(argv[0]);
                         exit(EXIT_FAILURE);
                     }
                     SBREAK;
                 }
-                SCASE("LogIn") {
+                SCASE("pthread") {
                     if(i+1<argc) {
-                        info->LogIn = stringGetNthWord(argv[i+1], 1, " ,");
+                        info->pthread = stringGetNthIntegerData(argv[i+1], 1, " ,");
                         i++;
-                        info->flagLogIn++;
+                        info->flagpthread++;
                     } else {
                         usage(argv[0]);
                         exit(EXIT_FAILURE);
                     }
                     SBREAK;
                 }
-                SCASE("prevF") {
+                SCASE("pvm") {
+                    if(i+0<argc) {
+                        info->pvm++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("pvmList") {
                     if(i+1<argc) {
-                        info->prevFileNum = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        info->pvmList = stringGetNthWord(argv[i+1], 1, " ,");
                         i++;
-                        info->flagprevFileNum++;
+                        info->flagpvmList++;
                     } else {
                         usage(argv[0]);
                         exit(EXIT_FAILURE);
index 73459e3..b6812a2 100755 (executable)
@@ -24,12 +24,13 @@ init0(mrcImageClusterAnalysisInfo* info)
     info->AutoRotationIteration = 2;    info->flagAutoRotationIteration = 0;
     info->AutoRotationMethod = 0;    info->flagAutoRotationMethod = 0;
     info->correlationMode = 19;    info->flagcorrelationMode = 0;
-    info->pvm=0;
-    info->fptpvmList = NULL;    info->flagpvmList = 0;
     info->fptLog = stdout;    info->flagLog = 0;
     info->fptLog2 = NULL;    info->flagLog2 = 0;
     info->fptLogIn = NULL;    info->flagLogIn = 0;
     info->prevFileNum = 0;    info->flagprevFileNum = 0;
+    info->pthread = 0;    info->flagpthread = 0;
+    info->pvm=0;
+    info->fptpvmList = NULL;    info->flagpvmList = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 2;    info->flagmode = 0;
 }
@@ -90,10 +91,6 @@ init1(mrcImageClusterAnalysisInfo* info)
     if(info->flagcorrelationMode) {
     }
     
-    if(info->flagpvmList) {
-        info->fptpvmList = fileOpen(info->pvmList, "r");
-    }
-    
     if(info->flagLog) {
         info->fptLog = fopen(info->Log, "a+");
     }
@@ -109,6 +106,13 @@ init1(mrcImageClusterAnalysisInfo* info)
     if(info->flagprevFileNum) {
     }
     
+    if(info->flagpthread) {
+    }
+    
+    if(info->flagpvmList) {
+        info->fptpvmList = fileOpen(info->pvmList, "r");
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }
index 4be8ad2..6eda53c 100755 (executable)
@@ -18,8 +18,9 @@ static char __sccs_id[] = "%Z%mrcImageClusterAnalysis ver%I%; Date:%D% %Z%";
 #define GLOBAL_DECLARATION
 #include "../inc/config.h"
 
-#undef DEBUG
+#define DEBUG
 #include "genUtil.h"
+#include "eosPThread.h"
 #include "mrcImage.h"
 #include "nr2.h"
 #include "mrcRefUtil.h"
@@ -127,6 +128,11 @@ void lmrcImageClusterAnalysisInfoSet(
        linfo->flagLog2         = info.flagLog2;
        linfo->fptLog2          = info.fptLog2;
 
+       if(info.pthread>0) {
+               __eosPThread__ = 1;     
+               __eosPThreadNum__ = info.pthread;
+               DEBUGPRINT2("pthread: %d %d\n", __eosPThread__, __eosPThreadNum__);
+       }
 
        DEBUGPRINT3("AutoRotatio Initial Param: %d %d %d\n", linfo->arInitial.nRot, linfo->arInitial.Method, linfo->arInitial.iter);    
 }
index 85556d8..a1ba251 100755 (executable)
@@ -20,12 +20,13 @@ Options:
     [-A[uto]R[otation]iter[ation]AutoRotationIteration(2         ).as(Integer             ) ] :Optional  :AutoRotationIteration
     [-A[uto]R[otation]MethodAutoRotationMethod  (0         ).as(Integer             ) ] :Optional  :Method for Correlation for Auto Rotation
     [-M[odeForCorrelation]correlationMode     (19        ).as(Integer             ) ] :Optional  :Correlation Mode for AutoRotation
-    [-pvm                                                                          ] :Optional  :Parallel Analysis by PVM
-    [-pvmList            pvmList             (NULL      ).as(inFile              ) ] :Optional  :pvmList: Input
     [-Log                Log                 (stdout    ).as(appendFile          ) ] :Optional  :Log: Output
     [-Log2               Log2                (NULL      ).as(appendFile          ) ] :Optional  :Log2: Output: ClusterNode Only
     [-LogIn              LogIn               (NULL      ).as(inFile              ) ] :Optional  :previousLog: Input
     [-prevF[ileNum]      prevFileNum         (0         ).as(Integer             ) ] :Optional  :previousLogFileNum: Input
+    [-pthread            pthread             (0         ).as(Integer             ) ] :Optional  :pthread: Input
+    [-pvm                                                                          ] :Optional  :Parallel Analysis by PVM
+    [-pvmList            pvmList             (NULL      ).as(inFile              ) ] :Optional  :pvmList: Input
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (2         ).as(Integer             ) ] :Optional  :Mode
 ----- Additional Usage -----
index 4715164..3c39035 100755 (executable)
         -i 1 0 1 0 0 -1x1+1+13.500000 0 0 2 0 0 'AutoRotationIteration' 'AutoRotationIteration' ARiter
         -i 1 0 1 0 0 -1x1+1+15.000000 0 0 0 0 0 'AutoRotationMethod' 'Method for Correlation for Auto Rotation' ARMethod
         -i 1 0 1 0 0 -1x1+1+16.500000 0 0 19 0 0 'correlationMode' 'Correlation Mode for AutoRotation' M
-        -t 1 0 1 0 0 6x1+1+18 'pvm' 'Parallel Analysis by PVM' pvm
-        -I 1 0 1 0 0 1 -1x1+1+19.500000 ' ' 'pvmList' 'pvmList: Input' pvmList
-        -I 1 0 1 0 0 1 -1x1+1+21.000000 ' ' 'Log' 'Log: Output' Log
-        -I 1 0 1 0 0 1 -1x1+1+22.500000 ' ' 'Log2' 'Log2: Output: ClusterNode Only' Log2
-        -I 1 0 1 0 0 1 -1x1+1+24.000000 ' ' 'LogIn' 'previousLog: Input' LogIn
-        -i 1 0 1 0 0 -1x1+1+25.500000 0 0 0 0 0 'prevFileNum' 'previousLogFileNum: Input' prevF
-        -I 1 0 1 0 0 1 -1x1+1+27.000000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+28.500000 0 0 2 0 0 'mode' 'Mode' m
+        -I 1 0 1 0 0 1 -1x1+1+18.000000 ' ' 'Log' 'Log: Output' Log
+        -I 1 0 1 0 0 1 -1x1+1+19.500000 ' ' 'Log2' 'Log2: Output: ClusterNode Only' Log2
+        -I 1 0 1 0 0 1 -1x1+1+21.000000 ' ' 'LogIn' 'previousLog: Input' LogIn
+        -i 1 0 1 0 0 -1x1+1+22.500000 0 0 0 0 0 'prevFileNum' 'previousLogFileNum: Input' prevF
+        -i 1 0 1 0 0 -1x1+1+24.000000 0 0 0 0 0 'pthread' 'pthread: Input' pthread
+        -t 1 0 1 0 0 6x1+1+25 'pvm' 'Parallel Analysis by PVM' pvm
+        -I 1 0 1 0 0 1 -1x1+1+27.000000 ' ' 'pvmList' 'pvmList: Input' pvmList
+        -I 1 0 1 0 0 1 -1x1+1+28.500000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+30.000000 0 0 2 0 0 'mode' 'Mode' m
     -E
   -E
 -E
index 84c2594..af6d061 100755 (executable)
@@ -3,6 +3,9 @@ include ../../../Config/Define.inc
 include ../../../../Config/Define.inc
 include ../../../../../Config/Define.inc
 
+AR=24
+PTHREAD=4
+
 all: help exec
 
 help:
@@ -29,13 +32,19 @@ initial-data:
 
 exec:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME) -I data/test.roiinfo -O -N 1 -AR 12 -o data/test.cluster -ARMethod 0 -m 2 -Log data/test.distance -Log2 data/test.log2 2> data/test.err | tee data/test.log 
-       diff data/test.cluster data/test.cluster.org
+       time ../$(OSTYPE)/$(OBJECTNAME) -I data/test.roiinfo -O -N 1 -AR $(AR) -o data/test.cluster -ARMethod 0 -m 2 -Log data/test.distance -Log2 data/test.log2 2> data/test.err | tee data/test.log 
+       diff data/test.distance data/test.distance.org
+       @echo "----- Calc check -----"          
+
+exec-pthread:
+       @echo "----- Execution Check -----"
+       time ../$(OSTYPE)/$(OBJECTNAME) -I data/test.roiinfo -O -N 1 -AR $(AR) -o data/test.cluster-pthread -ARMethod 0 -m 2 -Log data/test.distance-pthread -Log2 data/test.log2-pthread -pthread $(PTHREAD) 2> data/test.err-pthread| tee data/test.log-pthread
+       diff data/test.distance-pthread data/test.distance.org
        @echo "----- Calc check -----"          
 
 exec2:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME) -I data/test.roiinfo -O -N 1 -AR 12 -o data/test2.cluster -ARMethod 2 -m 2 -Log data/test2.distance -Log2 data/testlog2 2> data/test2.err | tee data/test2.log 
+       time ../$(OSTYPE)/$(OBJECTNAME) -I data/test.roiinfo -O -N 1 -AR $(AR) -o data/test2.cluster -ARMethod 2 -m 2 -Log data/test2.distance -Log2 data/testlog2 2> data/test2.err | tee data/test2.log 
        diff data/test.cluster data/test.cluster.org
        @echo "----- Calc check -----"          
 
index 8eb317b..322b51f 100755 (executable)
@@ -18,12 +18,13 @@ usage(char* thisProgram)
     fprintf(stderr, "    [-A[uto]R[otation]iter[ation]AutoRotationIteration(2         ).as(Integer             ) ] :Optional  :AutoRotationIteration\n");
     fprintf(stderr, "    [-A[uto]R[otation]MethodAutoRotationMethod  (0         ).as(Integer             ) ] :Optional  :Method for Correlation for Auto Rotation\n");
     fprintf(stderr, "    [-M[odeForCorrelation]correlationMode     (19        ).as(Integer             ) ] :Optional  :Correlation Mode for AutoRotation\n");
-    fprintf(stderr, "    [-pvm                                                                          ] :Optional  :Parallel Analysis by PVM\n");
-    fprintf(stderr, "    [-pvmList            pvmList             (NULL      ).as(inFile              ) ] :Optional  :pvmList: Input\n");
     fprintf(stderr, "    [-Log                Log                 (stdout    ).as(appendFile          ) ] :Optional  :Log: Output\n");
     fprintf(stderr, "    [-Log2               Log2                (NULL      ).as(appendFile          ) ] :Optional  :Log2: Output: ClusterNode Only\n");
     fprintf(stderr, "    [-LogIn              LogIn               (NULL      ).as(inFile              ) ] :Optional  :previousLog: Input\n");
     fprintf(stderr, "    [-prevF[ileNum]      prevFileNum         (0         ).as(Integer             ) ] :Optional  :previousLogFileNum: Input\n");
+    fprintf(stderr, "    [-pthread            pthread             (0         ).as(Integer             ) ] :Optional  :pthread: Input\n");
+    fprintf(stderr, "    [-pvm                                                                          ] :Optional  :Parallel Analysis by PVM\n");
+    fprintf(stderr, "    [-pvmList            pvmList             (NULL      ).as(inFile              ) ] :Optional  :pvmList: Input\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-m[ode]             mode                (2         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();