Create eosPThread for parallel computing

	new file:   include/eosPThread.h
	new file:   src/Objects/General/eosPThread/inc/eosPThread.h
	new file:   src/Objects/General/eosPThread/src/eosPThreadCreate.c
	new file:   src/Objects/General/eosPThread/src/eosPThreadInit.c
	new file:   src/Objects/General/eosPThread/src/eosPThreadJoin.c
	new file:   src/Objects/General/eosPThread/src/eosPThreadMutex.c

Apply eosPThread to mrc3Dto2D
	modified:   include/lmrc3Dto2D.h
	modified:   src/Objects/DataManip/transform/src/lmrc3Dto2D.c
	modified:   src/Objects/DataManip/transform/src/lmrc3Dto2D.h
	modified:   src/Tools/rec3d/mrc3Dto2D/Config/OptionControlFile
	modified:   src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.c

Modified
	modified:   src/Objects/DataManip/mrcImage/src/mrcImageWrite.c
    ** Append mode -> Write mode
	modified:   src/Objects/DataManip/transform/src/lFETOrientationSearchByFeatureAlignmentInitSet.c
	** Apply arrayPCA version up

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrc3Dto2D b/hostdepend/X86MAC64/bin/X86MAC64/mrc3Dto2D
index 3b3037f..052b260 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrc3Dto2D and b/hostdepend/X86MAC64/bin/X86MAC64/mrc3Dto2D differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
index 7ea1899..98a5866 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libMemory.a b/hostdepend/X86MAC64/lib/X86MAC64/libMemory.a
index f7f8d0d..863184d 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libMemory.a and b/hostdepend/X86MAC64/lib/X86MAC64/libMemory.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libeosPThread.a b/hostdepend/X86MAC64/lib/X86MAC64/libeosPThread.a
new file mode 100644 (file)
index 0000000..e16abb8
Binary files /dev/null and b/hostdepend/X86MAC64/lib/X86MAC64/libeosPThread.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libeosPThread.so b/hostdepend/X86MAC64/lib/X86MAC64/libeosPThread.so
new file mode 100644 (file)
index 0000000..1ed6551
Binary files /dev/null and b/hostdepend/X86MAC64/lib/X86MAC64/libeosPThread.so differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a
index fd961ac..ef875b9 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libtransform.a b/hostdepend/X86MAC64/lib/X86MAC64/libtransform.a
index bd40f9d..05f8968 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libtransform.a and b/hostdepend/X86MAC64/lib/X86MAC64/libtransform.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThread.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThread.sharedo
new file mode 100644 (file)
index 0000000..87cb5f3
Binary files /dev/null and b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThread.sharedo differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadCreate.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadCreate.sharedo
new file mode 100644 (file)
index 0000000..2d3798a
Binary files /dev/null and b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadCreate.sharedo differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadInit.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadInit.sharedo
new file mode 100644 (file)
index 0000000..2689a41
Binary files /dev/null and b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadInit.sharedo differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadJoin.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadJoin.sharedo
new file mode 100644 (file)
index 0000000..9523c26
Binary files /dev/null and b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadJoin.sharedo differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadMutex.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadMutex.sharedo
new file mode 100644 (file)
index 0000000..0c70a04
Binary files /dev/null and b/hostdepend/X86MAC64/lib/X86MAC64/shared/eosPThreadMutex.sharedo differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/lFETOrientationSearchByFeatureAlignmentInitSet.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/lFETOrientationSearchByFeatureAlignmentInitSet.sharedo
index 6d246f4..373aa13 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lFETOrientationSearchByFeatureAlignmentInitSet.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lFETOrientationSearchByFeatureAlignmentInitSet.sharedo differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrc3Dto2D.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrc3Dto2D.sharedo
index 9bcda71..a1737a6 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrc3Dto2D.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrc3Dto2D.sharedo differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite.sharedo
index dd410b6..11fb281 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageWrite.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a
index fd961ac..ef875b9 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

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a
index f8882af..cf95ad7 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageWrite.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageWrite.sharedo
index dd410b6..11fb281 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

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/.Depend b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/.Depend
index 80b88a7..c3c5d2e 100644 (file)
--- a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/.Depend
+++ b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/.Depend
@@ -1,32 +1,997 @@
-X86MAC64/lAllCommonLineCalculation.o:lAllCommonLineCalculation.o
-X86MAC64/lAngularWeightCalculation.o:lAngularWeightCalculation.o
-X86MAC64/lCommonLineCalculation.o:lCommonLineCalculation.o
-X86MAC64/lCommonLineDataSetInPlaneRotation.o:lCommonLineDataSetInPlaneRotation.o
-X86MAC64/lCommonLinesDataSet.o:lCommonLinesDataSet.o
-X86MAC64/lDescartesIntoPolar.o:lDescartesIntoPolar.o
-X86MAC64/lEvaluateCorrelationMapwithCommonLine.o:lEvaluateCorrelationMapwithCommonLine.o
-X86MAC64/lFETOrientationSearchByAnnealing.o:lFETOrientationSearchByAnnealing.o
-X86MAC64/lFETOrientationSearchByFeatureAlignment.o:lFETOrientationSearchByFeatureAlignment.o
-X86MAC64/lFETOrientationSearchByFeatureAlignmentInitSet.o:lFETOrientationSearchByFeatureAlignmentInitSet.o
-X86MAC64/lFETOrientationSearchByFeatureAlignmentSphere.o:lFETOrientationSearchByFeatureAlignmentSphere.o
-X86MAC64/lFETmapOrientationSearchBySimultaneousFitting.o:lFETmapOrientationSearchBySimultaneousFitting.o
-X86MAC64/lFETsmallMapSetCreate_forSimultaneousMinimization.o:lFETsmallMapSetCreate_forSimultaneousMinimization.o
-X86MAC64/lInitialDataFileRead.o:lInitialDataFileRead.o
-X86MAC64/lJcalulation.o:lJcalulation.o
-X86MAC64/lLcalculation.o:lLcalculation.o
-X86MAC64/lPlaneRotationAngleSet.o:lPlaneRotationAngleSet.o
-X86MAC64/lllDataSeparationInfoPrint.o:lllDataSeparationInfoPrint.o
-X86MAC64/lllDataSeparationInfoRead.o:lllDataSeparationInfoRead.o
-X86MAC64/lllDataSeparationInfoSet.o:lllDataSeparationInfoSet.o
-X86MAC64/lllDatarMaxLimitForSeparation.o:lllDatarMaxLimitForSeparation.o
-X86MAC64/lllExtract.o:lllExtract.o
-X86MAC64/lllExtractCtfinfFileCreate.o:lllExtractCtfinfFileCreate.o
-X86MAC64/lllExtractWithSeparation.o:lllExtractWithSeparation.o
-X86MAC64/lllExtractdYEstimate.o:lllExtractdYEstimate.o
-X86MAC64/lmrc2Dto3D.o:lmrc2Dto3D.o
-X86MAC64/lmrc2Dto3DSIRT.o:lmrc2Dto3DSIRT.o
-X86MAC64/lmrc3Dto2D.o:lmrc3Dto2D.o
-X86MAC64/lmrcImageFileListAndEulerAngleDataRead.o:lmrcImageFileListAndEulerAngleDataRead.o
-X86MAC64/lmrcImageOneLineGet.o:lmrcImageOneLineGet.o
-X86MAC64/lmrcImageSinogramCorrelationAdditionalWeight.o:lmrcImageSinogramCorrelationAdditionalWeight.o
+lAllCommonLineCalculation.o: lAllCommonLineCalculation.c \
+  lmrcImageOrientationSearchBySimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h
+lAngularWeightCalculation.o: lAngularWeightCalculation.c \
+  lmrcImageOrientationSearchBySimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h
+lCommonLineCalculation.o: lCommonLineCalculation.c \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h lCommonLineCalculation.h \
+  /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
+  /usr/include/machine/_types.h /usr/include/i386/_types.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /usr/include/stdlib.h /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Array.h
+lCommonLineDataSetInPlaneRotation.o: lCommonLineDataSetInPlaneRotation.c \
+  lmrcImageOrientationSearchBySimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h
+lCommonLinesDataSet.o: lCommonLinesDataSet.c \
+  lmrcImageOrientationSearchBySimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h
+lDescartesIntoPolar.o: lDescartesIntoPolar.c /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lDescartesIntoPolar.h
+lEvaluateCorrelationMapwithCommonLine.o:  \
+ lEvaluateCorrelationMapwithCommonLine.c \
+  /Applications/Eos.app/Eos/include/string.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/File.h ../../mrcImage/inc/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  lEvaluateCorrelationMapwithCommonLine.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h
+lFETOrientationSearchByAnnealing.o: lFETOrientationSearchByAnnealing.c \
+  /Applications/Eos.app/Eos/include/string.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/File.h \
+  /Applications/Eos.app/Eos/include/Random.h /usr/include/time.h \
+  /usr/include/_structs.h ../../mrcImage/inc/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  lFETOrientationSearchByAnnealing.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h
+lFETOrientationSearchByFeatureAlignment.o:  \
+ lFETOrientationSearchByFeatureAlignment.c \
+  /Applications/Eos.app/Eos/include/string.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h lFETOrientationSearchByFeatureAlignment.h \
+  /usr/include/stdlib.h /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /Applications/Eos.app/Eos/include/File.h \
+  /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/lmrcSinogramFET.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  lFETmapOrientationSearchBySimultaneousFitting.h
+lFETOrientationSearchByFeatureAlignmentInitSet.o:  \
+ lFETOrientationSearchByFeatureAlignmentInitSet.c \
+  lFETOrientationSearchByFeatureAlignment.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /Applications/Eos.app/Eos/include/File.h \
+  /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/lmrcSinogramFET.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  lFETmapOrientationSearchBySimultaneousFitting.h \
+  /Applications/Eos.app/Eos/include/Random.h /usr/include/time.h \
+  /usr/include/_structs.h
+lFETOrientationSearchByFeatureAlignmentSphere.o:  \
+ lFETOrientationSearchByFeatureAlignmentSphere.c \
+  lFETOrientationSearchByFeatureAlignment.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /Applications/Eos.app/Eos/include/File.h \
+  /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/lmrcSinogramFET.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  lFETmapOrientationSearchBySimultaneousFitting.h
+lFETmapOrientationSearchBySimultaneousFitting.o:  \
+ lFETmapOrientationSearchBySimultaneousFitting.c \
+  /Applications/Eos.app/Eos/include/string.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/File.h ../../mrcImage/inc/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  lEvaluateCorrelationMapwithCommonLine.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  lFETmapOrientationSearchBySimultaneousFitting.h
+lFETsmallMapSetCreate_forSimultaneousMinimization.o:  \
+ lFETsmallMapSetCreate_forSimultaneousMinimization.c \
+  /Applications/Eos.app/Eos/include/string.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/File.h ../../mrcImage/inc/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  lFETsmallMapSetCreate_forSimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h
+lInitialDataFileRead.o: lInitialDataFileRead.c \
+  lmrcImageOrientationSearchBySimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h
+lJcalulation.o: lJcalulation.c \
+  lmrcImageOrientationSearchBySimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h
+lLcalculation.o: lLcalculation.c \
+  lmrcImageOrientationSearchBySimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/lmrcImageSinogram.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h
+lPlaneRotationAngleSet.o: lPlaneRotationAngleSet.c \
+  lmrcImageOrientationSearchBySimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h
 lllDataSeparationInfoPrint.o: lllDataSeparationInfoPrint.c
+lllDataSeparationInfoRead.o: lllDataSeparationInfoRead.c lllExtract.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDataFit.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDatarMaxLimit.h \
+  /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h
+lllDataSeparationInfoSet.o: lllDataSeparationInfoSet.c lllExtract.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDataFit.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDatarMaxLimit.h
+lllDatarMaxLimitForSeparation.o: lllDatarMaxLimitForSeparation.c \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/stdlib.h \
+  /usr/include/_types.h /usr/include/sys/_types.h \
+  /usr/include/machine/_types.h /usr/include/i386/_types.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h lllExtract.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDataFit.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDatarMaxLimit.h
+lllExtract.o: lllExtract.c /Applications/Eos.app/Eos/include/genUtil.h \
+  /usr/include/math.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h \
+  /Applications/Eos.app/Eos/include/Memory.h /usr/include/stdio.h \
+  /usr/include/_types.h /usr/include/sys/_types.h \
+  /usr/include/machine/_types.h /usr/include/i386/_types.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h lllExtract.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDataFit.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDatarMaxLimit.h
+lllExtractCtfinfFileCreate.o: lllExtractCtfinfFileCreate.c \
+  lllExtractCtfinfFileCreate.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/ctfZeroPoint.h
+lllExtractWithSeparation.o: lllExtractWithSeparation.c \
+  /usr/include/stdlib.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/sys/wait.h \
+  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
+  /usr/include/machine/signal.h /usr/include/i386/signal.h \
+  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
+  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
+  /usr/include/sys/resource.h /usr/include/machine/endian.h \
+  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
+  /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/genUtil.h \
+  /usr/include/math.h /Applications/Eos.app/Eos/include/nr2.h \
+  lllExtract.h /Applications/Eos.app/Eos/include/mrcImage.h \
+  /usr/include/stdio.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDataFit.h \
+  /Applications/Eos.app/Eos/include/llData.h \
+  /Applications/Eos.app/Eos/include/lllDatarMaxLimit.h \
+  /Applications/Eos.app/Eos/include/lllDataMergeDifferentN.h
+lllExtractdYEstimate.o: lllExtractdYEstimate.c /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h lllExtractdYEstimate.h
+lmrc2Dto3D.o: lmrc2Dto3D.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h lmrc2Dto3D.h \
+  /Applications/Eos.app/Eos/include/lmrcImageRhoFiltering.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/lmrcImageMultiplying.h lmrc3Dto2D.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h
+lmrc2Dto3DSIRT.o: lmrc2Dto3DSIRT.c \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h lmrc3Dto2D.h /usr/include/stdio.h \
+  /usr/include/_types.h /usr/include/sys/_types.h \
+  /usr/include/machine/_types.h /usr/include/i386/_types.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /usr/include/stdlib.h /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h lmrc3Dto2D.h lmrc2Dto3D.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/lmrcImageRhoFiltering.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/lmrcImageMultiplying.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/lmrcImageSubtractionCalc.h \
+  /Applications/Eos.app/Eos/include/lmrcImageDensityNormalizationByImage.h
+lmrc3Dto2D.o: lmrc3Dto2D.c lmrc3Dto2D.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h lmrc3Dto2D.h
+lmrcImageFileListAndEulerAngleDataRead.o:  \
+ lmrcImageFileListAndEulerAngleDataRead.c \
+  lmrcImageFileListAndEulerAngleDataRead.h /usr/include/stdlib.h \
+  /usr/include/Availability.h /usr/include/AvailabilityInternal.h \
+  /usr/include/_types.h /usr/include/sys/_types.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/sys/wait.h \
+  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
+  /usr/include/machine/signal.h /usr/include/i386/signal.h \
+  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
+  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
+  /usr/include/sys/resource.h /usr/include/machine/endian.h \
+  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
+  /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/include/stdio.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/genUtil.h
+lmrcImageOneLineGet.o: lmrcImageOneLineGet.c \
+  lmrcImageOrientationSearchBySimultaneousMinimization.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/genUtil.h lCommonLineCalculation.h \
+  /Applications/Eos.app/Eos/include/string.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h
+lmrcImageSinogramCorrelationAdditionalWeight.o:  \
+ lmrcImageSinogramCorrelationAdditionalWeight.c \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h \
+  /Applications/Eos.app/Eos/include/./lmrcImageSinogram.h \
+  /Applications/Eos.app/Eos/include/./mrcImage.h /usr/include/stdio.h \
+  /usr/include/_types.h /usr/include/sys/_types.h \
+  /usr/include/machine/_types.h /usr/include/i386/_types.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/./genUtil.h \
+  /Applications/Eos.app/Eos/include/./ctfInfo.h \
+  /Applications/Eos.app/Eos/include/./Vector.h \
+  /Applications/Eos.app/Eos/include/./Matrix3D.h \
+  /Applications/Eos.app/Eos/include/./Array.h \
+  /Applications/Eos.app/Eos/include/./lmrcImageBinarization.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/lFETOrientationSearchByFeatureAlignmentInitSet.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/lFETOrientationSearchByFeatureAlignmentInitSet.sharedo
index 6d246f4..373aa13 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/lFETOrientationSearchByFeatureAlignmentInitSet.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/lFETOrientationSearchByFeatureAlignmentInitSet.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/libtransform.a b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/libtransform.a
index bd40f9d..05f8968 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/libtransform.a and b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/libtransform.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/libtransform.debug.a b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/libtransform.debug.a
index b46097a..3bcdcfa 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/libtransform.debug.a and b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/libtransform.debug.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/lmrc3Dto2D.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/lmrc3Dto2D.sharedo
index 9bcda71..a1737a6 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/lmrc3Dto2D.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/transform/src/X86MAC64/lmrc3Dto2D.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/.Depend b/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/.Depend
index 191cd23..c5f22aa 100644 (file)
--- a/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/.Depend
+++ b/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/.Depend
@@ -1,13 +1,10 @@
-X86MAC64/memoryAllocate.o:memoryAllocate.o
-X86MAC64/memoryByteSwap.o:memoryByteSwap.o
-X86MAC64/memoryClear.o:memoryClear.o
-X86MAC64/memoryCopy.o:memoryCopy.o
 memoryAllocate.o: memoryAllocate.c /usr/include/stdio.h \
-  /usr/include/_types.h /usr/include/sys/_types.h \
-  /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
   /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
   /usr/include/secure/_common.h /usr/include/stdlib.h \
-  /usr/include/Availability.h /usr/include/AvailabilityInternal.h \
   /usr/include/sys/wait.h /usr/include/sys/signal.h \
   /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
   /usr/include/i386/signal.h /usr/include/i386/_structs.h \
@@ -18,22 +15,53 @@ memoryAllocate.o: memoryAllocate.c /usr/include/stdio.h \
   /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
   /usr/include/machine/types.h /usr/include/i386/types.h \
   /usr/include/i386/_types.h ../inc/Memory.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/syslimits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
   /usr/include/limits.h /usr/include/machine/limits.h \
   /usr/include/i386/limits.h /usr/include/i386/_limits.h \
   /usr/include/sys/syslimits.h
-memoryClear.o: memoryClear.c ../inc/Memory.h /usr/include/stdio.h \
+memoryByteSwap.o: memoryByteSwap.c \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/stdio.h \
   /usr/include/_types.h /usr/include/sys/_types.h \
-  /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
+  /usr/include/machine/_types.h /usr/include/i386/_types.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  ../inc/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h
+memoryClear.o: memoryClear.c ../inc/Memory.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
   /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
   /usr/include/secure/_common.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/syslimits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
   /usr/include/limits.h /usr/include/machine/limits.h \
   /usr/include/i386/limits.h /usr/include/i386/_limits.h \
   /usr/include/sys/syslimits.h /usr/include/stdlib.h \
-  /usr/include/Availability.h /usr/include/AvailabilityInternal.h \
   /usr/include/sys/wait.h /usr/include/sys/signal.h \
   /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
   /usr/include/i386/signal.h /usr/include/i386/_structs.h \
@@ -44,24 +72,27 @@ memoryClear.o: memoryClear.c ../inc/Memory.h /usr/include/stdio.h \
   /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
   /usr/include/machine/types.h /usr/include/i386/types.h \
   /usr/include/i386/_types.h
-memoryCopy.o: memoryCopy.c /usr/include/stdio.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
-  /usr/include/stdlib.h /usr/include/Availability.h \
-  /usr/include/AvailabilityInternal.h /usr/include/sys/wait.h \
-  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
-  /usr/include/machine/signal.h /usr/include/i386/signal.h \
-  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
-  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
-  /usr/include/sys/resource.h /usr/include/machine/endian.h \
-  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
-  /usr/include/libkern/_OSByteOrder.h \
+memoryCopy.o: memoryCopy.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
   /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
   /usr/include/machine/types.h /usr/include/i386/types.h \
   /usr/include/i386/_types.h ../inc/Memory.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/syslimits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
   /usr/include/limits.h /usr/include/machine/limits.h \
   /usr/include/i386/limits.h /usr/include/i386/_limits.h \
   /usr/include/sys/syslimits.h

diff --git a/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/libMemory.a b/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/libMemory.a
index f7f8d0d..863184d 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/libMemory.a and b/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/libMemory.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/libMemory.debug.a b/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/libMemory.debug.a
index 2316aaa..0d1f5ed 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/libMemory.debug.a and b/hostdepend/X86MAC64/src/Objects/General/Memory/src/X86MAC64/libMemory.debug.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/.Depend b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/.Depend
new file mode 100755 (executable)
index 0000000..02eda5c
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/.Depend
@@ -0,0 +1,87 @@
+eosPThread.o: eosPThread.c ../inc/eosPThread.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /usr/include/pthread.h \
+  /usr/include/pthread_impl.h /usr/include/sched.h /usr/include/time.h \
+  /usr/include/_structs.h /usr/include/errno.h /usr/include/sys/errno.h
+eosPThreadCreate.o: eosPThreadCreate.c \
+  /Applications/Eos.app/Eos/include/genUtil.h /usr/include/math.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h ../inc/eosPThread.h \
+  /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
+  /usr/include/machine/_types.h /usr/include/i386/_types.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /usr/include/stdlib.h /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /usr/include/pthread.h \
+  /usr/include/pthread_impl.h /usr/include/sched.h /usr/include/time.h \
+  /usr/include/_structs.h /usr/include/errno.h /usr/include/sys/errno.h
+eosPThreadInit.o: eosPThreadInit.c \
+  /Applications/Eos.app/Eos/include/Memory.h /usr/include/stdio.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h ../inc/eosPThread.h /usr/include/pthread.h \
+  /usr/include/pthread_impl.h /usr/include/sched.h /usr/include/time.h \
+  /usr/include/_structs.h /usr/include/errno.h /usr/include/sys/errno.h
+eosPThreadJoin.o: eosPThreadJoin.c ../inc/eosPThread.h \
+  /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /usr/include/pthread.h \
+  /usr/include/pthread_impl.h /usr/include/sched.h /usr/include/time.h \
+  /usr/include/_structs.h /usr/include/errno.h /usr/include/sys/errno.h
+eosPThreadMutex.o: eosPThreadMutex.c

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/.Source b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/.Source
new file mode 100755 (executable)
index 0000000..6793611
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/.Source
@@ -0,0 +1,64 @@
+SRC = \
+eosPThread.c \
+eosPThreadCreate.c \
+eosPThreadInit.c \
+eosPThreadJoin.c \
+eosPThreadMutex.c \
+
+OBJ = \
+eosPThread.o \
+eosPThreadCreate.o \
+eosPThreadInit.o \
+eosPThreadJoin.o \
+eosPThreadMutex.o \
+
+SHAREDOBJ = \
+eosPThread.sharedo \
+eosPThreadCreate.sharedo \
+eosPThreadInit.sharedo \
+eosPThreadJoin.sharedo \
+eosPThreadMutex.sharedo \
+
+REALOBJ = \
+X86MAC64/eosPThread.o \
+X86MAC64/eosPThreadCreate.o \
+X86MAC64/eosPThreadInit.o \
+X86MAC64/eosPThreadJoin.o \
+X86MAC64/eosPThreadMutex.o \
+
+REALSHAREDOBJ = \
+X86MAC64/eosPThread.sharedo \
+X86MAC64/eosPThreadCreate.sharedo \
+X86MAC64/eosPThreadInit.sharedo \
+X86MAC64/eosPThreadJoin.sharedo \
+X86MAC64/eosPThreadMutex.sharedo \
+
+OBJDEBUG = \
+eosPThread.debugo \
+eosPThreadCreate.debugo \
+eosPThreadInit.debugo \
+eosPThreadJoin.debugo \
+eosPThreadMutex.debugo \
+
+REALOBJDEBUG = \
+X86MAC64/eosPThread.debugo \
+X86MAC64/eosPThreadCreate.debugo \
+X86MAC64/eosPThreadInit.debugo \
+X86MAC64/eosPThreadJoin.debugo \
+X86MAC64/eosPThreadMutex.debugo \
+
+OBJCUDAGDB = \
+eosPThread.cudagdb.o \
+eosPThreadCreate.cudagdb.o \
+eosPThreadInit.cudagdb.o \
+eosPThreadJoin.cudagdb.o \
+eosPThreadMutex.cudagdb.o \
+
+REALOBJCUDAGDB = \
+X86MAC64/eosPThread.cudagdb.o \
+X86MAC64/eosPThreadCreate.cudagdb.o \
+X86MAC64/eosPThreadInit.cudagdb.o \
+X86MAC64/eosPThreadJoin.cudagdb.o \
+X86MAC64/eosPThreadMutex.cudagdb.o \
+
+

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/Makefile b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/Makefile
new file mode 100755 (executable)
index 0000000..28e9069
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/Makefile
@@ -0,0 +1,34 @@
+SHELL=/bin/ksh
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/Config/Define.inc
+include $(EOS_HOME)/src/Config/DefineObject.inc
+
+include .Source
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.CHeader
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.CCHeader
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.Wish
+
+LIBNAME=lib$(OBJECTNAME).a
+SHAREDLIB=lib$(OBJECTNAME).so
+LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
+LIBNAMECUDAGDB=lib$(OBJECTNAME).cudagdb.a
+
+$(LIBNAME): $(OBJ)
+       @echo LIBNAME:$(LIBNAME)
+       $(AR) rs $(LIBNAME) $(OBJ)
+
+$(SHAREDLIB): $(SHAREDOBJ)
+       @COMPILEDOBJ=`ls $(SHAREDOBJ)` ; echo "#### Compiled Objects"; echo $${COMPILEDOBJ};  echo "################"; \
+       $(SHARED) $(SHAREDLIB) $${COMPILEDOBJ} 
+
+$(LIBNAMEDEBUG): $(OBJDEBUG)
+       @echo LIBNAME:$(LIBNAMEDEBUG)
+       $(AR) rs $(LIBNAMEDEBUG) $(OBJDEBUG)
+
+$(LIBNAMECUDAGDB): $(OBJCUDAGDB)
+       @echo LIBNAME:$(LIBNAMECUDAGDB)
+       $(AR) rs $(LIBNAMECUDAGDB) $(OBJCUDAGDB)
+
+include .Depend
+

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThread.c b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThread.c
new file mode 120000 (symlink)
index 0000000..b159499
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThread.c
@@ -0,0 +1 @@
+../eosPThread.c
\ No newline at end of file

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThread.sharedo b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThread.sharedo
new file mode 100644 (file)
index 0000000..87cb5f3
Binary files /dev/null and b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThread.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadCreate.c b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadCreate.c
new file mode 120000 (symlink)
index 0000000..326565b
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadCreate.c
@@ -0,0 +1 @@
+../eosPThreadCreate.c
\ No newline at end of file

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadCreate.sharedo b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadCreate.sharedo
new file mode 100644 (file)
index 0000000..2d3798a
Binary files /dev/null and b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadCreate.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadInit.c b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadInit.c
new file mode 120000 (symlink)
index 0000000..d88f3a0
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadInit.c
@@ -0,0 +1 @@
+../eosPThreadInit.c
\ No newline at end of file

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadInit.sharedo b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadInit.sharedo
new file mode 100644 (file)
index 0000000..2689a41
Binary files /dev/null and b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadInit.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadJoin.c b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadJoin.c
new file mode 120000 (symlink)
index 0000000..520e7db
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadJoin.c
@@ -0,0 +1 @@
+../eosPThreadJoin.c
\ No newline at end of file

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadJoin.sharedo b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadJoin.sharedo
new file mode 100644 (file)
index 0000000..9523c26
Binary files /dev/null and b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadJoin.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadMutex.sharedo b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadMutex.sharedo
new file mode 100644 (file)
index 0000000..0c70a04
Binary files /dev/null and b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/eosPThreadMutex.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.a b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.a
new file mode 100644 (file)
index 0000000..e16abb8
Binary files /dev/null and b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.debug.a b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.debug.a
new file mode 100644 (file)
index 0000000..107e9a1
Binary files /dev/null and b/hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.debug.a differ

diff --git a/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/.Depend b/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/.Depend
index 1e5efe5..2dac7a7 100644 (file)
--- a/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/.Depend
+++ b/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/.Depend
@@ -1,32 +1,122 @@
-usage.o: usage.c /usr/include/stdio.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
-  /usr/include/stdlib.h /usr/include/Availability.h \
-  /usr/include/AvailabilityInternal.h /usr/include/sys/wait.h \
-  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
-  /usr/include/machine/signal.h /usr/include/i386/signal.h \
-  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
-  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
-  /usr/include/sys/resource.h /usr/include/machine/endian.h \
-  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
-  /usr/include/libkern/_OSByteOrder.h \
+argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h ../inc/config.h ../inc/../inc/mrc3Dto2D.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/File.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h
+init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h ../inc/config.h ../inc/../inc/mrc3Dto2D.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/File.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h
+mrc3Dto2D.o: mrc3Dto2D.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h ../inc/config.h ../inc/../inc/mrc3Dto2D.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/lmrc3Dto2D.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/lmrc3Dto2D.h
+usage.o: usage.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
   /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
   /usr/include/machine/types.h /usr/include/i386/types.h \
   /usr/include/i386/_types.h ../inc/config.h ../inc/../inc/mrc3Dto2D.h
-util.o: util.c /usr/include/stdio.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
-  /usr/include/stdlib.h /usr/include/Availability.h \
-  /usr/include/AvailabilityInternal.h /usr/include/sys/wait.h \
-  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
-  /usr/include/machine/signal.h /usr/include/i386/signal.h \
-  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
-  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
-  /usr/include/sys/resource.h /usr/include/machine/endian.h \
-  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
-  /usr/include/libkern/_OSByteOrder.h \
+util.o: util.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
   /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
   /usr/include/machine/types.h /usr/include/i386/types.h \
   /usr/include/i386/_types.h ../inc/config.h ../inc/../inc/mrc3Dto2D.h

diff --git a/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/Makefile b/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/Makefile
index f938d74..2a9beb5 100755 (executable)
--- a/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/Makefile
+++ b/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/Makefile
@@ -1,7 +1,7 @@
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
-include ../../../../../Config/DefineTool.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/Config/Define.inc
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
 LIBFILES   = \
                        $(LIBPREFIX)EosObjects$(LIBSUFFIX) 
@@ -60,23 +60,23 @@ REALMODULESDEBUG    = \
 
 
 $(OBJECTNAME): $(MODULES) $(LIBFILES)
-       @if [ -f ../$(OBJECTNAME).c ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
        then \
                echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
        fi
-       @if [ -f ../$(OBJECTNAME).cc ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
        then \
                echo $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).ccm ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
        then \
                echo "MICO"; \
                echo $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).cu ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
        then \
                echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
@@ -84,23 +84,23 @@ $(OBJECTNAME): $(MODULES) $(LIBFILES)
 
 
 $(OBJECTNAME).debug: $(MODULESDEBUG) $(LIBFILESDEBUG)
-       @if [ -f ../$(OBJECTNAME).c ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
        then \
                echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
        fi
-       @if [ -f ../$(OBJECTNAME).cc ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
        then \
                echo $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).ccm ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
        then \
                echo "MICO"; \
                echo $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).cu ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
        then \
                echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
@@ -111,4 +111,4 @@ $(OBJECTNAME).cudagdb: $(MODULESCUDAGDB) $(LIBFILESDEBUG)
        $(NVCC) $(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@
 
 include ./.Depend
-include ../../Config/Target.inc
+include  $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Target.inc

diff --git a/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/mrc3Dto2D b/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/mrc3Dto2D
index 3b3037f..ad5574f 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/mrc3Dto2D and b/hostdepend/X86MAC64/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/mrc3Dto2D differ

diff --git a/include/eosPThread.h b/include/eosPThread.h
new file mode 100644 (file)
index 0000000..8c86d6a
--- /dev/null
+++ b/include/eosPThread.h
@@ -0,0 +1,68 @@
+/*
+# eosPThread.h : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : eosPThread.h 
+# Attention
+#   $Loccker$
+#      $State$ 
+#
+*/
+/* $Log$ */
+#ifndef EOS_PTHREAD_H
+#define EOS_PTHRED_H 
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <errno.h>
+
+/* constant begin */
+
+extern int __eosPThread__;
+extern int __eosPThreadNum__;
+
+/* constant end */
+
+/* struct begin */
+
+typedef enum eosPThreadStatus {
+       eosPThreadStatusWaiting = 0,
+       eosPThreadStatusRunning = 1
+} eosPThreadStatus;
+
+typedef struct eosPThread {
+       pthread_t*                      th;         /* [max] thread */
+       eosPThreadStatus*       status;     /* [max] thread status */
+       long*                           id;         /* [max] thread ID indicated by count */
+
+       int                             max;            /* maximum thread number working simultaneously. */ 
+       long                            count;          /* count of created threads */   
+       long                            latest;     /* working thread ID which started latest */
+       long                            oldest;     /* working thread ID which started oldest */
+} eosPThread;
+
+/* struct end */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* prototype begin */
+extern void eosPThreadInit   (eosPThread* t, int max, int mode);
+extern int  eosPThreadCreateOnWaitingThread (eosPThread* t, void* (*start_routine)(void *), void * arg, int mode);
+extern int  eosPThreadCreate (eosPThread* t, int i, void* (*start_routine)(void *), void * arg, int mode);
+extern void eosPThreadJoin   (eosPThread* t, int i, int mode);
+extern void eosPThreadJoinAll(eosPThread* t, int mode);
+
+extern void eosPThreadMutexInit(eosPThread* t);
+extern void eosPThreadMutexLock(eosPThread* t);
+extern void eosPThreadMutexUnlock(eosPThread* t);
+
+/* prototype end */
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif  /* EOS_PTHREAD_H */ 

diff --git a/include/lmrc3Dto2D.h b/include/lmrc3Dto2D.h
index 9ca6bf3..992ed19 100644 (file)
--- a/include/lmrc3Dto2D.h
+++ b/include/lmrc3Dto2D.h
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>                  
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Matrix3D.h"
 #include "Vector.h"
@@ -57,6 +57,12 @@ typedef struct lmrc3Dto2DInfo {
 
        /* PVM */
        int flagPVM;    
+
+       /* fileListInformation */
+       int flagFileList;
+       char* filenamePrefix;
+       char* filenameSuffix;
+       char* filenameNumberFormat; 
 } lmrc3Dto2DInfo;
 
 typedef struct lmrc3Dto2DSingleInfo {

diff --git a/src/Objects/DataManip/mrcImage/src/mrcImageWrite.c b/src/Objects/DataManip/mrcImage/src/mrcImageWrite.c
index 9dddd4e..9ae52f0 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/mrcImageWrite.c
+++ b/src/Objects/DataManip/mrcImage/src/mrcImageWrite.c
@@ -56,7 +56,11 @@ mrcFileWrite(mrcImage* mrc, char* filename, char* message, long mode)
     if(NULL==mrc) { 
                fprintf(stderr, "Something Wrong!!");
     }
-
+       {
+       FILE* fpt;      
+       fpt = fileOpen(filename, "w");
+       fclose(fpt);
+       }
     mrcHeaderWrite(mrc, filename, "in mrcWriteFile", mode);
 #ifdef DEBUG
        {

diff --git a/src/Objects/DataManip/transform/doc/transform.html b/src/Objects/DataManip/transform/doc/transform.html
deleted file mode 100755 (executable)
index 3205fad..0000000
--- a/src/Objects/DataManip/transform/doc/transform.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<H4> Update Time 05/08/13---17:59:02 </H4>
-<HR>
-<A NAME="Information">
-<H2>Information from source codes</H2>
-</A>
-<PRE>
-</PRE>
-<HR>
-<A NAME="include">
-<H2>transform.h</H2>
-</A>
-<PRE>
-/*
-# %M% %Y% %I%
-# The latest update : %G% at %U%
-#
-#%Z% transform.h ver %I%
-#%Z% Created by 
-#%Z%
-#%Z% Usage : transform.h 
-#%Z% Attention
-#%Z%
-*/
-</PRE>

diff --git a/src/Objects/DataManip/transform/src/.EosLog b/src/Objects/DataManip/transform/src/.EosLog
index ec8b24e..53797a6 100755 (executable)
--- a/src/Objects/DataManip/transform/src/.EosLog
+++ b/src/Objects/DataManip/transform/src/.EosLog
@@ -9,3 +9,4 @@
 /home/people/kayabuki/Eos/bin/I686LINUX/FETOrientationSearchByFeatureAlignment -h 
 /home/people/koyasako/Eos/bin/X86LINUX64/mrc2Dto3D -h 
 /home/people/koyasako/Eos/bin/X86LINUX64/mrc2Dto3D -h 
+/Applications/Eos.app/Eos/bin/X86MAC64/mrcInfo -i 121p-centre-fileList-000044.mrc2d 

diff --git a/src/Objects/DataManip/transform/src/:q b/src/Objects/DataManip/transform/src/:q
new file mode 100644 (file)
index 0000000..9b60101
--- /dev/null
+++ b/src/Objects/DataManip/transform/src/:q
@@ -0,0 +1,381 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% lmrc3Dto2D ver %I%
+#%Z% Created by tacyas
+#%Z%
+#%Z% Usage : mrc3Dto2D
+#%Z% Attention
+#%Z%
+*/
+
+#include "File.h"
+#include "Memory.h"
+#include "eosPThread.h"
+#include "./lmrc3Dto2D.h"
+
+
+typedef struct lmrcImage3Dto2DSingleForPThreadArg {
+       mrcImage* dst;
+       FILE* fptInfo;
+       mrcImage* out2D;
+       mrcImage* in3D;
+       char   Mode[4];
+       double Rot1;
+       double Rot2;
+       double Rot3;
+       lmrc3Dto2DInfo* linfo;
+       lmrc3Dto2DSingleInfo* llinfo;
+       int mode;
+       int outSection;
+       eosPThread pthread;
+} lmrcImage3Dto2DSingleForPThreadArg;
+
+
+extern void lmrcImage3Dto2DSingleForPThread(void* arg);
+extern void lmrcImage3Dto2DSinglePost(FILE* fptInfo, mrcImage* dst, int outSection, mrcImage* out, lmrc3Dto2DInfo* linfo, int mode);
+
+void
+lmrcImage3Dto2DSingle(mrcImage* out2D, mrcImage* in3D, 
+                       char   Mode[4],
+                       double Rot1,    
+                       double Rot2,    
+                       double Rot3,    
+                       lmrc3Dto2DInfo* linfo,
+                       lmrc3Dto2DSingleInfo* llinfo,
+                       int mode)
+{
+       int max;
+       double sum;
+       mrcImageParaTypeReal gx, gy, gz;
+       mrcImageParaTypeReal g3x, g3y, g3z;
+       mrcImageParaTypeReal r3x, r3y, r3z;
+       mrcImageParaTypeReal x, y, z;
+       mrcImageParaTypeReal prjx, prjy, prjz;
+       floatVector v;
+       Matrix3D MatrixAnti;
+       double data;
+
+       max = MAX(in3D->HeaderN.x, MAX(in3D->HeaderN.y, in3D->HeaderN.z));
+
+       if(llinfo->flagInit) {
+               out2D->Header = in3D->Header;
+               out2D->HeaderN.x = max;
+               out2D->HeaderN.y = max;
+               out2D->HeaderN.z = 1;
+               mrcInit(out2D, NULL);
+       } 
+
+       floatVectorInit(&v, 4);
+       r3x = g3x = (in3D->HeaderN.x - 1)/2.0;
+       r3y = g3y = (in3D->HeaderN.y - 1)/2.0;
+       r3z = g3z = (in3D->HeaderN.z - 1)/2.0;
+       gx  = (max - 1)/2.0;
+       gy  = (max - 1)/2.0;
+       gz  = (max - 1)/2.0;
+
+       matrix3DRotationAntiSetFollowingEulerAngle(MatrixAnti,
+               Mode, Rot1, Rot2, Rot3, MATRIX_3D_MODE_INITIALIZE);
+
+       v.data[3] = 1;
+
+       for(prjx=0; prjx<max; prjx++) {
+       for(prjy=0; prjy<max; prjy++) {
+               sum =0.0;
+               for(prjz=0; prjz<max; prjz++) {
+                       v.data[0] = prjx - gx;
+                       v.data[1] = prjy - gy;
+                       v.data[2] = prjz - gz;
+                       matrix3DMultiplyVector(&v, MatrixAnti);
+                       x = v.data[0] + g3x;
+                       y = v.data[1] + g3y;
+                       z = v.data[2] + g3z;
+                       switch(linfo->AreaMode) {
+                               lmrc3Dto2DInfoAreaModeGlobular: {
+                                       if(SQR((x - g3x)/r3x) 
+                                        + SQR((y - g3y)/r3y) 
+                                        + SQR((z - g3z)/r3z) <= 1.0) {
+                                               mrcPixelDataGet(in3D, x, y, z, &data, 
+                                                       mrcPixelRePart, linfo->InterpolationMode);
+                                       } else {
+                                               data = 0;
+                                       }
+                                       break;
+                               }
+                               lmrc3Dto2DInfoAreaModeCubic: 
+                               default: {
+                                       if(-0.5<=x && x<in3D->HeaderN.x-0.5
+                                        &&-0.5<=y && y<in3D->HeaderN.y-0.5
+                                        &&-0.5<=z && z<in3D->HeaderN.z-0.5) {
+                                               mrcPixelDataGet(in3D, x, y, z, &data, 
+                                                       mrcPixelRePart, linfo->InterpolationMode);
+                                       } else {
+                                               data = 0;
+                                       }
+                                       break;
+                               }
+                       }
+                       sum+=data;
+               }
+               mrcPixelDataSet(out2D, prjx,  prjy, llinfo->section, sum/max, mrcPixelRePart);
+       }
+       }
+}
+
+void
+lmrcImage3Dto2DFollowingTailer(mrcImage* out2Ds, mrcImage* in3D, mrcImage* ref2Ds, 
+       lmrc3Dto2DInfo* linfo, 
+       int mode)
+{
+       int max;
+       int count;
+       lmrc3Dto2DSingleInfo llinfo;
+
+       out2Ds->Header = ref2Ds->Header;
+       mrcInit(out2Ds, 0);
+       max = ref2Ds->HeaderN.z;  
+       out2Ds->numTailer = max;
+       mrcTailerInit(out2Ds, 0);
+
+       llinfo.flagInit = 0;
+       for(count=0; count<max; count++) {
+               llinfo.section = count;
+
+               out2Ds->Tailer[count] = ref2Ds->Tailer[count]; 
+
+               lmrcImage3Dto2DSingle(out2Ds, in3D,  
+                       out2Ds->Tailer[count].Cont.EulerAngleMode,
+                       out2Ds->Tailer[count].Cont.Rot1,
+                       out2Ds->Tailer[count].Cont.Rot2,
+                       out2Ds->Tailer[count].Cont.Rot3,
+                       linfo, &llinfo, mode);
+
+       }
+}
+
+void
+lmrcImage3Dto2D(mrcImage* dst, mrcImage* in, lmrc3Dto2DInfo* linfo, int mode)
+{
+       mrcImage* out;
+       int* outSection;
+       int threadNum;
+       int iThread;
+       lmrcImage3Dto2DSingleForPThreadArg pthreadArg;
+       eosPThread pthread;     
+       int i, n;
+       int max;
+       int count;
+       int section;
+       double Rot1, Rot2, Rot3;
+       double RatiodRot1=1;
+       double RatiodRot2=1;
+       double RatiodRot3=1;
+       int    nRot1, nRot2, nRot3;
+       int    iRot1, iRot2, iRot3;
+       lmrc3Dto2DSingleInfo* llinfo;
+       char informationFile[1024]; 
+       FILE* fptInfo;
+       int ret;
+
+       if(__eosPThread__) {
+               threadNum = __eosPThreadNum__; 
+               eosPThreadInit(&pthread, threadNum, 0);
+               eosPThreadMutexInit(&pthread);
+       } else {
+               threadNum = 1;
+       }
+       out        = (mrcImage*)memoryAllocate(sizeof(mrcImage)*threadNum, "in lmrcImage3Dto2D");
+       outSection = (int*)     memoryAllocate(sizeof(int)*threadNum, "in lmrcImage3Dto2D");
+       llinfo     = (lmrc3Dto2DSingleInfo*)memoryAllocate(sizeof(lmrc3Dto2DSingleInfo)*threadNum, "in lmrcImage3Dto2D");
+
+       sprintf(informationFile, "%s.%s", linfo->filenamePrefix, linfo->filenameSuffix);
+       fptInfo = fileOpen(informationFile, "w");
+
+       n=linfo->nRot1*linfo->nRot2*linfo->nRot3;
+       max = MAX(in->HeaderN.x, MAX(in->HeaderN.y, in->HeaderN.z));
+       for(iThread=0; iThread<threadNum; iThread++) {
+               // Header Information 
+               out[iThread].Header.Cont = in->Header.Cont;
+               mrcDefaultHeaderValueSetOnlyFixedValue(&out[iThread]);
+               out[iThread].HeaderN.x = max;
+               out[iThread].HeaderN.y = max;
+               out[iThread].HeaderN.z = 1;
+               out[iThread].HeaderMode = mrcFloatImage;
+               // Image Allocation 
+               mrcInit(&out[iThread], NULL);
+
+               // Tailer Information 
+               out[iThread].numTailer = 1;
+               // Tailer Allocation
+               mrcTailerInit(&out[iThread], 0);
+       }
+
+       if(!linfo->flagFileList) {
+               dst->Header.Cont = in->Header.Cont;
+               mrcDefaultHeaderValueSetOnlyFixedValue(dst);
+               dst->HeaderN.x = max;
+               dst->HeaderN.y = max;
+               dst->HeaderN.z = n;     
+               dst->HeaderMode = mrcFloatImage;
+               mrcInit(dst, NULL);
+               dst->numTailer = n;     
+               mrcTailerInit(dst, 0);
+       }
+
+       if(__eosPThread__) {
+               pthreadArg.in3D  = in;
+               pthreadArg.linfo = linfo;
+               pthreadArg.mode = mode;
+               pthreadArg.dst  = dst;
+               pthreadArg.fptInfo = fptInfo;
+               pthreadArg.pthread = pthread;
+       }
+
+       count = 0;
+       nRot1 = linfo->nRot1;
+       for(iRot1=0; iRot1<nRot1; iRot1++) {
+               Rot1 = linfo->Rot1Start + iRot1*linfo->Rot1Delta*RatiodRot1;
+               if(0x01&mode) {
+                       nRot2 = MAX(1,(int)(linfo->nRot2*fabs(sin(Rot1))+0.5));
+                       RatiodRot2 = 2*M_PI/nRot2/linfo->Rot2Delta;
+               } else {
+                       nRot2 = linfo->nRot2;           
+               }       
+
+       for(iRot2=0; iRot2<nRot2; iRot2++) {
+               Rot2 = linfo->Rot2Start + iRot2*linfo->Rot2Delta*RatiodRot2;
+               nRot3 = linfo->nRot3;
+
+       for(iRot3=0; iRot3<linfo->nRot3; iRot3++) {
+               Rot3 = linfo->Rot3Start + iRot3*linfo->Rot3Delta*RatiodRot3;
+               if(linfo->flagFileList) {
+                       section = 0;
+               } else {
+                       section = count;
+               }
+               iThread = count%threadNum;
+
+               if(__eosPThread__) {
+                       if(pthread.status[iThread] == eosPThreadStatusRunning) { 
+                               eosPThreadJoin(&pthread, iThread, 0);   
+                       }
+               }
+
+               DEBUGPRINT3("%d / %d iThread: %d\n", count, n, iThread);
+
+               // 
+               out[iThread].Tailer[0].Cont.Mode = mrcImageTailerMode2DProjection;
+               for(i=0; i<4; i++) out[iThread].Tailer[0].Cont.EulerAngleMode[i] = linfo->EulerAngleMode[i]; 
+               out[iThread].Tailer[0].Cont.Rot1 = Rot1;
+               out[iThread].Tailer[0].Cont.Rot2 = Rot2;
+               out[iThread].Tailer[0].Cont.Rot3 = Rot3;
+               llinfo[iThread].flagInit = 0;
+               llinfo[iThread].section  = section;
+               outSection[iThread] = count;
+
+               //
+               if(__eosPThread__) {
+                       //
+                       pthreadArg.out2D = &(out[iThread]);
+                       for(i=0; i<4; i++) pthreadArg.Mode[i]  = out[iThread].Tailer[0].Cont.EulerAngleMode[i];
+                       pthreadArg.Rot1  = out[iThread].Tailer[0].Cont.Rot1;
+                       pthreadArg.Rot2  = out[iThread].Tailer[0].Cont.Rot2;
+                       pthreadArg.Rot3  = out[iThread].Tailer[0].Cont.Rot3;    
+                       pthreadArg.llinfo = &llinfo[iThread]; 
+                       pthreadArg.outSection = outSection[iThread];
+                       // 
+                       DEBUGPRINT2("Thread: %d Count: %d\n", iThread, count);
+                       eosPThreadCreate(&pthread, iThread, (void*)lmrcImage3Dto2DSingleForPThread, &pthreadArg, 0);
+                       DEBUGPRINT("Thread Created");
+               } else {
+                       DEBUGPRINT5("lmrcImage3Dto2DSingle: %d %s %f %f %f\n", iThread,
+                               out[iThread].Tailer[0].Cont.EulerAngleMode,
+                               out[iThread].Tailer[0].Cont.Rot1,
+                               out[iThread].Tailer[0].Cont.Rot2,
+                               out[iThread].Tailer[0].Cont.Rot3);
+                       lmrcImage3Dto2DSingle(&(out[iThread]), in, 
+                               out[iThread].Tailer[0].Cont.EulerAngleMode,
+                               out[iThread].Tailer[0].Cont.Rot1,
+                               out[iThread].Tailer[0].Cont.Rot2,
+                               out[iThread].Tailer[0].Cont.Rot3,
+                               linfo, 
+                               &(llinfo[iThread]), 
+                               mode);
+                       lmrcImage3Dto2DSinglePost(fptInfo, dst, outSection[iThread], &out[iThread], linfo, mode);
+               }
+       
+               count++;
+               if(n<count) {
+                       fprintf(stderr, "Something wrong: count %d n %d\n", count, n);
+                       exit(EXIT_FAILURE);
+               }
+       }
+       }
+       }
+       eosPThreadJoinAll(&pthread, 0); 
+       //
+       if(linfo->flagFileList) {
+               dst->HeaderN.z = 1;
+               dst->numTailer = 1;
+       } else {
+               dst->HeaderN.z = count;
+               dst->numTailer = count;
+       }
+}
+
+
+void
+lmrcImage3Dto2DSingleForPThread(void* arg)
+{
+       lmrcImage3Dto2DSingleForPThreadArg* thisArg;
+
+       thisArg = arg;
+
+       DEBUGPRINT("lmrcImage3Dto2DSingle Start\n");
+       lmrcImage3Dto2DSingle(
+                       thisArg->out2D, thisArg->in3D, 
+                       thisArg->Mode,  thisArg->Rot1,          thisArg->Rot2,  thisArg->Rot3,  
+                       thisArg->linfo, thisArg->llinfo,        thisArg->mode);
+       DEBUGPRINT("lmrcImage3Dto2DSingle End\n");
+       DEBUGPRINT("lmrcImage3Dto2DSinglePost Start\n");
+       eosPThreadMutexLock(&(thisArg->pthread));
+       lmrcImage3Dto2DSinglePost(
+                       thisArg->fptInfo, thisArg->dst, thisArg->outSection, thisArg->out2D, thisArg->linfo, thisArg->mode);
+       eosPThreadMutexUnlock(&(thisArg->pthread));
+       DEBUGPRINT("lmrcImage3Dto2DSinglePost End\n");
+}
+
+void
+lmrcImage3Dto2DSinglePost(FILE* fptInfo, mrcImage* dst, int outSection, mrcImage* out, lmrc3Dto2DInfo* linfo, int mode) 
+{
+       int i;
+       char filename[1024];
+       char Mode[5];
+
+       if(linfo->flagFileList) {
+               sprintf(filename, linfo->filenameNumberFormat, linfo->filenamePrefix, outSection, linfo->filenameSuffix);
+               DEBUGPRINT2("%d: %s\n", outSection, filename);  
+               DEBUGPRINT2("Nz: %d numTailer: %d\n", out->HeaderN.z, out->numTailer);  
+               mrcFileWrite(out, filename, "in lmrc3Dto2D", 0);
+               for(i=0; i<4; i++) {
+                       Mode[i] = out->Tailer[0].Cont.EulerAngleMode[i];
+               }
+               Mode[4] = '\0';
+               fprintf(fptInfo, "%s %4s %15.6f %15.6f %15.6f\n", 
+                               filename, 
+                               Mode,
+                               out->Tailer[0].Cont.Rot1*DEGREE, 
+                               out->Tailer[0].Cont.Rot2*DEGREE, 
+                               out->Tailer[0].Cont.Rot3*DEGREE);
+       } else {
+               DEBUGPRINT1("Section(%d) Set for dst\n", outSection);
+               for(i=0; i<4; i++) dst->Tailer[outSection].Cont.EulerAngleMode[i]  = out->Tailer[0].Cont.EulerAngleMode[i];
+               dst->Tailer[outSection].Cont.Rot1  = out->Tailer[0].Cont.Rot1;
+               dst->Tailer[outSection].Cont.Rot2  = out->Tailer[0].Cont.Rot2;
+               dst->Tailer[outSection].Cont.Rot3  = out->Tailer[0].Cont.Rot3;  
+
+               mrcImageSectionSet(dst, out, outSection, mode);
+       }
+}
+

diff --git a/src/Objects/DataManip/transform/src/:w b/src/Objects/DataManip/transform/src/:w
new file mode 100644 (file)
index 0000000..ae10023
--- /dev/null
+++ b/src/Objects/DataManip/transform/src/:w
@@ -0,0 +1,384 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% lmrc3Dto2D ver %I%
+#%Z% Created by tacyas
+#%Z%
+#%Z% Usage : mrc3Dto2D
+#%Z% Attention
+#%Z%
+*/
+
+#include "File.h"
+#include "Memory.h"
+#include "eosPThread.h"
+#include "./lmrc3Dto2D.h"
+
+
+typedef struct lmrcImage3Dto2DSingleForPThreadArg {
+       mrcImage* dst;
+       FILE* fptInfo;
+       mrcImage* out2D;
+       mrcImage* in3D;
+       char   Mode[4];
+       double Rot1;
+       double Rot2;
+       double Rot3;
+       lmrc3Dto2DInfo* linfo;
+       lmrc3Dto2DSingleInfo* llinfo;
+       int mode;
+       int outSection;
+       eosPThread pthread;
+} lmrcImage3Dto2DSingleForPThreadArg;
+
+
+extern void lmrcImage3Dto2DSingleForPThread(void* arg);
+extern void lmrcImage3Dto2DSinglePost(FILE* fptInfo, mrcImage* dst, int outSection, mrcImage* out, lmrc3Dto2DInfo* linfo, int mode);
+
+void
+lmrcImage3Dto2DSingle(mrcImage* out2D, mrcImage* in3D, 
+                       char   Mode[4],
+                       double Rot1,    
+                       double Rot2,    
+                       double Rot3,    
+                       lmrc3Dto2DInfo* linfo,
+                       lmrc3Dto2DSingleInfo* llinfo,
+                       int mode)
+{
+       int max;
+       double sum;
+       mrcImageParaTypeReal gx, gy, gz;
+       mrcImageParaTypeReal g3x, g3y, g3z;
+       mrcImageParaTypeReal r3x, r3y, r3z;
+       mrcImageParaTypeReal x, y, z;
+       mrcImageParaTypeReal prjx, prjy, prjz;
+       floatVector v;
+       Matrix3D MatrixAnti;
+       double data;
+
+       max = MAX(in3D->HeaderN.x, MAX(in3D->HeaderN.y, in3D->HeaderN.z));
+
+       if(llinfo->flagInit) {
+               out2D->Header = in3D->Header;
+               out2D->HeaderN.x = max;
+               out2D->HeaderN.y = max;
+               out2D->HeaderN.z = 1;
+               mrcInit(out2D, NULL);
+       } 
+
+       floatVectorInit(&v, 4);
+       r3x = g3x = (in3D->HeaderN.x - 1)/2.0;
+       r3y = g3y = (in3D->HeaderN.y - 1)/2.0;
+       r3z = g3z = (in3D->HeaderN.z - 1)/2.0;
+       gx  = (max - 1)/2.0;
+       gy  = (max - 1)/2.0;
+       gz  = (max - 1)/2.0;
+
+       matrix3DRotationAntiSetFollowingEulerAngle(MatrixAnti,
+               Mode, Rot1, Rot2, Rot3, MATRIX_3D_MODE_INITIALIZE);
+
+       v.data[3] = 1;
+
+       for(prjx=0; prjx<max; prjx++) {
+       for(prjy=0; prjy<max; prjy++) {
+               sum =0.0;
+               for(prjz=0; prjz<max; prjz++) {
+                       v.data[0] = prjx - gx;
+                       v.data[1] = prjy - gy;
+                       v.data[2] = prjz - gz;
+                       matrix3DMultiplyVector(&v, MatrixAnti);
+                       x = v.data[0] + g3x;
+                       y = v.data[1] + g3y;
+                       z = v.data[2] + g3z;
+                       switch(linfo->AreaMode) {
+                               lmrc3Dto2DInfoAreaModeGlobular: {
+                                       if(SQR((x - g3x)/r3x) 
+                                        + SQR((y - g3y)/r3y) 
+                                        + SQR((z - g3z)/r3z) <= 1.0) {
+                                               mrcPixelDataGet(in3D, x, y, z, &data, 
+                                                       mrcPixelRePart, linfo->InterpolationMode);
+                                       } else {
+                                               data = 0;
+                                       }
+                                       break;
+                               }
+                               lmrc3Dto2DInfoAreaModeCubic: 
+                               default: {
+                                       if(-0.5<=x && x<in3D->HeaderN.x-0.5
+                                        &&-0.5<=y && y<in3D->HeaderN.y-0.5
+                                        &&-0.5<=z && z<in3D->HeaderN.z-0.5) {
+                                               mrcPixelDataGet(in3D, x, y, z, &data, 
+                                                       mrcPixelRePart, linfo->InterpolationMode);
+                                       } else {
+                                               data = 0;
+                                       }
+                                       break;
+                               }
+                       }
+                       sum+=data;
+               }
+               mrcPixelDataSet(out2D, prjx,  prjy, llinfo->section, sum/max, mrcPixelRePart);
+       }
+       }
+}
+
+void
+lmrcImage3Dto2DFollowingTailer(mrcImage* out2Ds, mrcImage* in3D, mrcImage* ref2Ds, 
+       lmrc3Dto2DInfo* linfo, 
+       int mode)
+{
+       int max;
+       int count;
+       lmrc3Dto2DSingleInfo llinfo;
+
+       out2Ds->Header = ref2Ds->Header;
+       mrcInit(out2Ds, 0);
+       max = ref2Ds->HeaderN.z;  
+       out2Ds->numTailer = max;
+       mrcTailerInit(out2Ds, 0);
+
+       llinfo.flagInit = 0;
+       for(count=0; count<max; count++) {
+               llinfo.section = count;
+
+               out2Ds->Tailer[count] = ref2Ds->Tailer[count]; 
+
+               lmrcImage3Dto2DSingle(out2Ds, in3D,  
+                       out2Ds->Tailer[count].Cont.EulerAngleMode,
+                       out2Ds->Tailer[count].Cont.Rot1,
+                       out2Ds->Tailer[count].Cont.Rot2,
+                       out2Ds->Tailer[count].Cont.Rot3,
+                       linfo, &llinfo, mode);
+
+       }
+}
+
+void
+lmrcImage3Dto2D(mrcImage* dst, mrcImage* in, lmrc3Dto2DInfo* linfo, int mode)
+{
+       mrcImage* out;
+       int* outSection;
+       int threadNum;
+       int iThread;
+       lmrcImage3Dto2DSingleForPThreadArg pthreadArg;
+       eosPThread pthread;     
+       int i, n;
+       int max;
+       int count;
+       int section;
+       double Rot1, Rot2, Rot3;
+       double RatiodRot1=1;
+       double RatiodRot2=1;
+       double RatiodRot3=1;
+       int    nRot1, nRot2, nRot3;
+       int    iRot1, iRot2, iRot3;
+       lmrc3Dto2DSingleInfo* llinfo;
+       char informationFile[1024]; 
+       FILE* fptInfo;
+       int ret;
+
+       if(__eosPThread__) {
+               threadNum = __eosPThreadNum__; 
+               eosPThreadInit(&pthread, threadNum, 0);
+               eosPThreadMutexInit(&pthread);
+       } else {
+               threadNum = 1;
+       }
+       out        = (mrcImage*)memoryAllocate(sizeof(mrcImage)*threadNum, "in lmrcImage3Dto2D");
+       outSection = (int*)     memoryAllocate(sizeof(int)*threadNum, "in lmrcImage3Dto2D");
+       llinfo     = (lmrc3Dto2DSingleInfo*)memoryAllocate(sizeof(lmrc3Dto2DSingleInfo)*threadNum, "in lmrcImage3Dto2D");
+
+       sprintf(informationFile, "%s.%s", linfo->filenamePrefix, linfo->filenameSuffix);
+       fptInfo = fileOpen(informationFile, "w");
+
+       n=linfo->nRot1*linfo->nRot2*linfo->nRot3;
+       max = MAX(in->HeaderN.x, MAX(in->HeaderN.y, in->HeaderN.z));
+       for(iThread=0; iThread<threadNum; iThread++) {
+               // Header Information 
+               out[iThread].Header.Cont = in->Header.Cont;
+               mrcDefaultHeaderValueSetOnlyFixedValue(&out[iThread]);
+               out[iThread].HeaderN.x = max;
+               out[iThread].HeaderN.y = max;
+               out[iThread].HeaderN.z = 1;
+               out[iThread].HeaderMode = mrcFloatImage;
+               // Image Allocation 
+               mrcInit(&out[iThread], NULL);
+
+               // Tailer Information 
+               out[iThread].numTailer = 1;
+               // Tailer Allocation
+               mrcTailerInit(&out[iThread], 0);
+       }
+
+       if(!linfo->flagFileList) {
+               dst->Header.Cont = in->Header.Cont;
+               mrcDefaultHeaderValueSetOnlyFixedValue(dst);
+               dst->HeaderN.x = max;
+               dst->HeaderN.y = max;
+               dst->HeaderN.z = n;     
+               dst->HeaderMode = mrcFloatImage;
+               mrcInit(dst, NULL);
+               dst->numTailer = n;     
+               mrcTailerInit(dst, 0);
+       }
+
+       if(__eosPThread__) {
+               pthreadArg.in3D  = in;
+               pthreadArg.linfo = linfo;
+               pthreadArg.mode = mode;
+               pthreadArg.dst  = dst;
+               pthreadArg.fptInfo = fptInfo;
+               pthreadArg.pthread = pthread;
+       }
+
+       count = 0;
+       nRot1 = linfo->nRot1;
+       for(iRot1=0; iRot1<nRot1; iRot1++) {
+               Rot1 = linfo->Rot1Start + iRot1*linfo->Rot1Delta*RatiodRot1;
+               if(0x01&mode) {
+                       nRot2 = MAX(1,(int)(linfo->nRot2*fabs(sin(Rot1))+0.5));
+                       RatiodRot2 = 2*M_PI/nRot2/linfo->Rot2Delta;
+               } else {
+                       nRot2 = linfo->nRot2;           
+               }       
+
+       for(iRot2=0; iRot2<nRot2; iRot2++) {
+               Rot2 = linfo->Rot2Start + iRot2*linfo->Rot2Delta*RatiodRot2;
+               nRot3 = linfo->nRot3;
+
+       for(iRot3=0; iRot3<linfo->nRot3; iRot3++) {
+               Rot3 = linfo->Rot3Start + iRot3*linfo->Rot3Delta*RatiodRot3;
+               if(linfo->flagFileList) {
+                       section = 0;
+               } else {
+                       section = count;
+               }
+               iThread = count%threadNum;
+
+               if(__eosPThread__) {
+                       if(pthread.status[iThread] == eosPThreadStatusRunning) { 
+                               eosPThreadJoin(&pthread, iThread, 0);   
+                       }
+               }
+
+               DEBUGPRINT3("%d / %d iThread: %d\n", count, n, iThread);
+
+               // 
+               out[iThread].Tailer[0].Cont.Mode = mrcImageTailerMode2DProjection;
+               for(i=0; i<4; i++) out[iThread].Tailer[0].Cont.EulerAngleMode[i] = linfo->EulerAngleMode[i]; 
+               out[iThread].Tailer[0].Cont.Rot1 = Rot1;
+               out[iThread].Tailer[0].Cont.Rot2 = Rot2;
+               out[iThread].Tailer[0].Cont.Rot3 = Rot3;
+               llinfo[iThread].flagInit = 0;
+               llinfo[iThread].section  = section;
+               outSection[iThread] = count;
+
+               //
+               if(__eosPThread__) {
+                       //
+                       eosPThreadMutexLock(&pthread);
+                       pthreadArg.out2D = &(out[iThread]);
+                       for(i=0; i<4; i++) pthreadArg.Mode[i]  = out[iThread].Tailer[0].Cont.EulerAngleMode[i];
+                       pthreadArg.Rot1  = out[iThread].Tailer[0].Cont.Rot1;
+                       pthreadArg.Rot2  = out[iThread].Tailer[0].Cont.Rot2;
+                       pthreadArg.Rot3  = out[iThread].Tailer[0].Cont.Rot3;    
+                       pthreadArg.llinfo = &llinfo[iThread]; 
+                       pthreadArg.outSection = outSection[iThread];
+                       // 
+                       DEBUGPRINT2("Thread: %d Count: %d\n", iThread, count);
+                       eosPThreadMutexUnlock(&pthread);
+
+                       eosPThreadCreate(&pthread, iThread, (void*)lmrcImage3Dto2DSingleForPThread, &pthreadArg, 0);
+                       DEBUGPRINT("Thread Created");
+               } else {
+                       DEBUGPRINT5("lmrcImage3Dto2DSingle: %d %s %f %f %f\n", iThread,
+                               out[iThread].Tailer[0].Cont.EulerAngleMode,
+                               out[iThread].Tailer[0].Cont.Rot1,
+                               out[iThread].Tailer[0].Cont.Rot2,
+                               out[iThread].Tailer[0].Cont.Rot3);
+                       lmrcImage3Dto2DSingle(&(out[iThread]), in, 
+                               out[iThread].Tailer[0].Cont.EulerAngleMode,
+                               out[iThread].Tailer[0].Cont.Rot1,
+                               out[iThread].Tailer[0].Cont.Rot2,
+                               out[iThread].Tailer[0].Cont.Rot3,
+                               linfo, 
+                               &(llinfo[iThread]), 
+                               mode);
+                       lmrcImage3Dto2DSinglePost(fptInfo, dst, outSection[iThread], &out[iThread], linfo, mode);
+               }
+       
+               count++;
+               if(n<count) {
+                       fprintf(stderr, "Something wrong: count %d n %d\n", count, n);
+                       exit(EXIT_FAILURE);
+               }
+       }
+       }
+       }
+       eosPThreadJoinAll(&pthread, 0); 
+       //
+       if(linfo->flagFileList) {
+               dst->HeaderN.z = 1;
+               dst->numTailer = 1;
+       } else {
+               dst->HeaderN.z = count;
+               dst->numTailer = count;
+       }
+}
+
+
+void
+lmrcImage3Dto2DSingleForPThread(void* arg)
+{
+       lmrcImage3Dto2DSingleForPThreadArg* thisArg;
+
+       thisArg = arg;
+
+       DEBUGPRINT("lmrcImage3Dto2DSingle Start\n");
+       lmrcImage3Dto2DSingle(
+                       thisArg->out2D, thisArg->in3D, 
+                       thisArg->Mode,  thisArg->Rot1,          thisArg->Rot2,  thisArg->Rot3,  
+                       thisArg->linfo, thisArg->llinfo,        thisArg->mode);
+       DEBUGPRINT("lmrcImage3Dto2DSingle End\n");
+       DEBUGPRINT("lmrcImage3Dto2DSinglePost Start\n");
+       eosPThreadMutexLock(&(thisArg->pthread));
+       lmrcImage3Dto2DSinglePost(
+                       thisArg->fptInfo, thisArg->dst, thisArg->outSection, thisArg->out2D, thisArg->linfo, thisArg->mode);
+       eosPThreadMutexUnlock(&(thisArg->pthread));
+       DEBUGPRINT("lmrcImage3Dto2DSinglePost End\n");
+}
+
+void
+lmrcImage3Dto2DSinglePost(FILE* fptInfo, mrcImage* dst, int outSection, mrcImage* out, lmrc3Dto2DInfo* linfo, int mode) 
+{
+       int i;
+       char filename[1024];
+       char Mode[5];
+
+       if(linfo->flagFileList) {
+               sprintf(filename, linfo->filenameNumberFormat, linfo->filenamePrefix, outSection, linfo->filenameSuffix);
+               DEBUGPRINT2("%d: %s\n", outSection, filename);  
+               DEBUGPRINT2("Nz: %d numTailer: %d\n", out->HeaderN.z, out->numTailer);  
+               mrcFileWrite(out, filename, "in lmrc3Dto2D", 0);
+               for(i=0; i<4; i++) {
+                       Mode[i] = out->Tailer[0].Cont.EulerAngleMode[i];
+               }
+               Mode[4] = '\0';
+               fprintf(fptInfo, "%s %4s %15.6f %15.6f %15.6f\n", 
+                               filename, 
+                               Mode,
+                               out->Tailer[0].Cont.Rot1*DEGREE, 
+                               out->Tailer[0].Cont.Rot2*DEGREE, 
+                               out->Tailer[0].Cont.Rot3*DEGREE);
+       } else {
+               DEBUGPRINT1("Section(%d) Set for dst\n", outSection);
+               for(i=0; i<4; i++) dst->Tailer[outSection].Cont.EulerAngleMode[i]  = out->Tailer[0].Cont.EulerAngleMode[i];
+               dst->Tailer[outSection].Cont.Rot1  = out->Tailer[0].Cont.Rot1;
+               dst->Tailer[outSection].Cont.Rot2  = out->Tailer[0].Cont.Rot2;
+               dst->Tailer[outSection].Cont.Rot3  = out->Tailer[0].Cont.Rot3;  
+
+               mrcImageSectionSet(dst, out, outSection, mode);
+       }
+}
+

diff --git a/src/Objects/DataManip/transform/src/lFETOrientationSearchByFeatureAlignmentInitSet.c b/src/Objects/DataManip/transform/src/lFETOrientationSearchByFeatureAlignmentInitSet.c
index 95ad870..71998ef 100644 (file)
--- a/src/Objects/DataManip/transform/src/lFETOrientationSearchByFeatureAlignmentInitSet.c
+++ b/src/Objects/DataManip/transform/src/lFETOrientationSearchByFeatureAlignmentInitSet.c
@@ -1081,7 +1081,7 @@ __alignLXgroupPCA(lFETFeatureAlignmentImageQSInfo* in, int* ts, int tnum, int l,
        int i,j,k,counter,excep,lrcount;
        int maxi, temp;
        double data, data2, lam;
-       Array X, X2, C, lambda, u;
+       Array X, X2, C, lambda, u, ave;
        
        X.dim = 2; X.n[0] = 2; X.n[1] = tnum; arrayInit(&X, "X in __alignLXgroup0");
        counter = 0;
@@ -1099,7 +1099,7 @@ __alignLXgroupPCA(lFETFeatureAlignmentImageQSInfo* in, int* ts, int tnum, int l,
                arrayDataSet2(u, 0, 1, -1.0/pow(2,0.5));
                arrayDataSet2(u, 1, 1, 1.0/pow(2,0.5));
        }else{
-               arrayPCA(&u, &C, &lambda, &X, 0);
+               arrayPCA(&u, &C, &lambda, &X, &ave, 0);
        }
        //fprintf(stdout,"%d-%d::\t",l,r);
        if((mode&0x04) == 4){
@@ -1137,7 +1137,7 @@ __alignLXgroupPCA(lFETFeatureAlignmentImageQSInfo* in, int* ts, int tnum, int l,
                        }}
                        excep = counter;
                        //fprintf(stdout,"%d-%d::\n",l,r);
-                       arrayPCA(&u, &C, &lambda, &X2, 0);
+                       arrayPCA(&u, &C, &lambda, &X2, &ave, 0);
                        //fprintf(stdout,"%d-%d::\n",l,r);
                }else{ 
                        //fprintf(stdout,"else \n");

diff --git a/src/Objects/DataManip/transform/src/lmrc2Dto3D.c b/src/Objects/DataManip/transform/src/lmrc2Dto3D.c
index 3468c87..3f0eade 100755 (executable)
--- a/src/Objects/DataManip/transform/src/lmrc2Dto3D.c
+++ b/src/Objects/DataManip/transform/src/lmrc2Dto3D.c
@@ -195,17 +195,6 @@ lmrc2Dto3D(mrcImage* out, mrcImage* in, lmrc2Dto3DInfo* linfo, long mode)
                                                                } else {
                                                                        projdata = 0; 
                                                                }
-                                                       /*
-                                                       weight = SQR((x-g3x)/lenx)+SQR((y-g3y)/leny)+SQR((z-g3z)/lenz);
-                                                       //DEBUGPRINT1("Weight: %lf\n", weight);
-                                                       if(weight<1) {
-                                                               weight = 1;
-                                                       } else {
-                                                               weight = (1/3.0 - 1/weight)/(1/3.0 - 1.0);
-                                                       }       
-                                                       //DEBUGPRINT1("Weight: %lf\n", weight);
-                                                       projdata *= weight;                                                     
-                                                       */
                                                        } 
                                                        mrcPixelDataSet(out, x, y, z, data + projdata, mrcPixelRePart);
                                                }

diff --git a/src/Objects/DataManip/transform/src/lmrc3Dto2D.c b/src/Objects/DataManip/transform/src/lmrc3Dto2D.c
index a0acb47..5796277 100755 (executable)
--- a/src/Objects/DataManip/transform/src/lmrc3Dto2D.c
+++ b/src/Objects/DataManip/transform/src/lmrc3Dto2D.c
@@ -10,8 +10,32 @@
 #%Z%
 */
 
+#include "File.h"
+#include "Memory.h"
+#include "eosPThread.h"
 #include "./lmrc3Dto2D.h"
 
+
+typedef struct lmrcImage3Dto2DSingleForPThreadArg {
+       mrcImage* dst;
+       FILE* fptInfo;
+       mrcImage* out2D;
+       mrcImage* in3D;
+       char   Mode[4];
+       double Rot1;
+       double Rot2;
+       double Rot3;
+       lmrc3Dto2DInfo* linfo;
+       lmrc3Dto2DSingleInfo* llinfo;
+       int mode;
+       int outSection;
+       eosPThread pthread;
+} lmrcImage3Dto2DSingleForPThreadArg;
+
+
+extern void lmrcImage3Dto2DSingleForPThread(void* arg);
+extern void lmrcImage3Dto2DSinglePost(FILE* fptInfo, mrcImage* dst, int outSection, mrcImage* out, lmrc3Dto2DInfo* linfo, int mode);
+
 void
 lmrcImage3Dto2DSingle(mrcImage* out2D, mrcImage* in3D, 
                        char   Mode[4],
@@ -131,57 +155,93 @@ lmrcImage3Dto2DFollowingTailer(mrcImage* out2Ds, mrcImage* in3D, mrcImage* ref2D
 }
 
 void
-lmrcImage3Dto2D(mrcImage* out, mrcImage* in, lmrc3Dto2DInfo* linfo, int mode)
+lmrcImage3Dto2D(mrcImage* dst, mrcImage* in, lmrc3Dto2DInfo* linfo, int mode)
 {
-       int n;
+       mrcImage* out;
+       int* outSection;
+       int threadNum;
+       int iThread;
+       lmrcImage3Dto2DSingleForPThreadArg* pthreadArg;
+       eosPThread pthread;     
+       int i, j, n;
        int max;
        int count;
+       int section;
        double Rot1, Rot2, Rot3;
        double RatiodRot1=1;
        double RatiodRot2=1;
        double RatiodRot3=1;
        int    nRot1, nRot2, nRot3;
        int    iRot1, iRot2, iRot3;
-       double sum;
-       mrcImageParaTypeReal gx, gy, gz;
-       mrcImageParaTypeReal g3x, g3y, g3z;
-       mrcImageParaTypeReal r3x, r3y, r3z;
-       mrcImageParaTypeReal x, y, z;
-       mrcImageParaTypeReal prjx, prjy, prjz;
-       floatVector v;
-       /* Matrix3D Matrix; */
-       Matrix3D MatrixAnti;
-       double data;
-       mrcImage tmp;
-       lmrc3Dto2DSingleInfo llinfo;
+       lmrc3Dto2DSingleInfo* llinfo;
+       char informationFile[1024]; 
+       FILE* fptInfo;
+       int ret;
+
+       if(__eosPThread__) {
+               threadNum = __eosPThreadNum__; 
+               eosPThreadInit(&pthread, threadNum, 0);
+               eosPThreadMutexInit(&pthread);
+       } else {
+               threadNum = 1;
+       }
+       out        = (mrcImage*)memoryAllocate(sizeof(mrcImage)*threadNum, "in lmrcImage3Dto2D");
+       outSection = (int*)     memoryAllocate(sizeof(int)*threadNum, "in lmrcImage3Dto2D");
+       llinfo     = (lmrc3Dto2DSingleInfo*)memoryAllocate(sizeof(lmrc3Dto2DSingleInfo)*threadNum, "in lmrcImage3Dto2D");
+       pthreadArg = (lmrcImage3Dto2DSingleForPThreadArg*)memoryAllocate(sizeof(lmrcImage3Dto2DSingleForPThreadArg)*threadNum, "in lmrcImage3Dto2D"); 
 
+       sprintf(informationFile, "%s.%s", linfo->filenamePrefix, linfo->filenameSuffix);
+       fptInfo = fileOpen(informationFile, "w");
 
        n=linfo->nRot1*linfo->nRot2*linfo->nRot3;
        max = MAX(in->HeaderN.x, MAX(in->HeaderN.y, in->HeaderN.z));
-       out->Header.Cont = in->Header.Cont;
-       out->HeaderN.x = max;
-       out->HeaderN.y = max;
-       out->HeaderN.z = n;
-       mrcInit(out, NULL);
-       out->numTailer = n;
-       mrcTailerInit(out, 0);
-
-       tmp.Header.Cont = in->Header.Cont;
-       tmp.HeaderN.x = max;
-       tmp.HeaderN.y = max;
-       tmp.HeaderN.z = max;
-       mrcInit(&tmp, NULL);
+       for(iThread=0; iThread<threadNum; iThread++) {
+               // Header Information 
+               out[iThread].Header.Cont = in->Header.Cont;
+               mrcDefaultHeaderValueSetOnlyFixedValue(&out[iThread]);
+               out[iThread].HeaderN.x = max;
+               out[iThread].HeaderN.y = max;
+               out[iThread].HeaderN.z = 1;
+               out[iThread].HeaderMode = mrcFloatImage;
+               // Image Allocation 
+               mrcInit(&out[iThread], NULL);
 
-       floatVectorInit(&v, 4);
-       r3x = g3x = (in->HeaderN.x - 1)/2.0;
-       r3y = g3y = (in->HeaderN.y - 1)/2.0;
-       r3z = g3z = (in->HeaderN.z - 1)/2.0;
-       gx  = (tmp.HeaderN.x - 1)/2.0;
-       gy  = (tmp.HeaderN.y - 1)/2.0;
-       gz  = (tmp.HeaderN.z - 1)/2.0;
+               // Tailer Information 
+               out[iThread].numTailer = 1;
+               // Tailer Allocation
+               mrcTailerInit(&out[iThread], 0);
+       }
 
+<<<<<<< HEAD
+       if(!linfo->flagFileList) {
+               dst->Header.Cont = in->Header.Cont;
+               mrcDefaultHeaderValueSetOnlyFixedValue(dst);
+               dst->HeaderN.x = max;
+               dst->HeaderN.y = max;
+               dst->HeaderN.z = n;     
+               dst->HeaderMode = mrcFloatImage;
+               mrcInit(dst, NULL);
+               dst->numTailer = n;     
+               mrcTailerInit(dst, 0);
+       }
+=======
        count = 0;
+>>>>>>> FETCH_HEAD
 
+       if(__eosPThread__) {
+               for(i=0; i<threadNum; i++) {
+                       pthreadArg[i].in3D  = in;
+                       pthreadArg[i].linfo = linfo;
+                       pthreadArg[i].mode = mode;
+                       pthreadArg[i].dst  = dst;
+                       pthreadArg[i].fptInfo = fptInfo;
+                       pthreadArg[i].pthread = pthread;
+                       for(j=0; j<4; j++) pthreadArg[i].Mode[j] = linfo->EulerAngleMode[j]; 
+                       pthreadArg[i].out2D = &(out[i]);
+               }
+       }
+
+       count = 0;
        nRot1 = linfo->nRot1;
        for(iRot1=0; iRot1<nRot1; iRot1++) {
                Rot1 = linfo->Rot1Start + iRot1*linfo->Rot1Delta*RatiodRot1;
@@ -191,12 +251,27 @@ lmrcImage3Dto2D(mrcImage* out, mrcImage* in, lmrc3Dto2DInfo* linfo, int mode)
                } else {
                        nRot2 = linfo->nRot2;           
                }       
+
        for(iRot2=0; iRot2<nRot2; iRot2++) {
                Rot2 = linfo->Rot2Start + iRot2*linfo->Rot2Delta*RatiodRot2;
                nRot3 = linfo->nRot3;
+
        for(iRot3=0; iRot3<linfo->nRot3; iRot3++) {
                Rot3 = linfo->Rot3Start + iRot3*linfo->Rot3Delta*RatiodRot3;
+               if(linfo->flagFileList) {
+                       section = 0;
+               } else {
+                       section = count;
+               }
+               iThread = count%threadNum;
 
+<<<<<<< HEAD
+               if(__eosPThread__) {
+                       if(pthread.status[iThread] == eosPThreadStatusRunning) { 
+                               eosPThreadJoin(&pthread, iThread, 0);   
+                       }
+               }
+=======
                DEBUGPRINT2("%d / %d\n", count, n);
                out->Tailer[count].Cont.Mode = mrcImageTailerMode2DProjection;
                out->Tailer[count].Cont.EulerAngleMode[0] = linfo->EulerAngleMode[0]; 
@@ -217,7 +292,50 @@ lmrcImage3Dto2D(mrcImage* out, mrcImage* in, lmrc3Dto2DInfo* linfo, int mode)
                        linfo, 
                        &llinfo, 
                        mode);
+>>>>>>> FETCH_HEAD
+
+               fprintf(stderr, "%d / %d iThread: %d\n", count, n, iThread);
+               DEBUGPRINT3("%d / %d iThread: %d\n", count, n, iThread);
+
+               // 
+               out[iThread].Tailer[0].Cont.Mode = mrcImageTailerMode2DProjection;
+               for(i=0; i<4; i++) out[iThread].Tailer[0].Cont.EulerAngleMode[i] = linfo->EulerAngleMode[i]; 
+               out[iThread].Tailer[0].Cont.Rot1 = Rot1;
+               out[iThread].Tailer[0].Cont.Rot2 = Rot2;
+               out[iThread].Tailer[0].Cont.Rot3 = Rot3;
+               llinfo[iThread].flagInit = 0;
+               llinfo[iThread].section  = section;
+               outSection[iThread] = count;
 
+               //
+               if(__eosPThread__) {
+                       //
+                       pthreadArg[iThread].Rot1  = out[iThread].Tailer[0].Cont.Rot1;
+                       pthreadArg[iThread].Rot2  = out[iThread].Tailer[0].Cont.Rot2;
+                       pthreadArg[iThread].Rot3  = out[iThread].Tailer[0].Cont.Rot3;   
+                       pthreadArg[iThread].llinfo = &llinfo[iThread]; 
+                       pthreadArg[iThread].outSection = outSection[iThread];
+                       // 
+                       DEBUGPRINT3(">>> Thread: %d Count: %d outSection: %d\n", iThread, count, outSection[iThread]);
+                       eosPThreadCreate(&pthread, iThread, (void*)lmrcImage3Dto2DSingleForPThread, &(pthreadArg[iThread]), 0);
+                       DEBUGPRINT1("Thread Created: %d\n", iThread);
+               } else {
+                       DEBUGPRINT5("lmrcImage3Dto2DSingle: %d %s %f %f %f\n", iThread,
+                               out[iThread].Tailer[0].Cont.EulerAngleMode,
+                               out[iThread].Tailer[0].Cont.Rot1,
+                               out[iThread].Tailer[0].Cont.Rot2,
+                               out[iThread].Tailer[0].Cont.Rot3);
+                       lmrcImage3Dto2DSingle(&(out[iThread]), in, 
+                               out[iThread].Tailer[0].Cont.EulerAngleMode,
+                               out[iThread].Tailer[0].Cont.Rot1,
+                               out[iThread].Tailer[0].Cont.Rot2,
+                               out[iThread].Tailer[0].Cont.Rot3,
+                               linfo, 
+                               &(llinfo[iThread]), 
+                               mode);
+                       lmrcImage3Dto2DSinglePost(fptInfo, dst, outSection[iThread], &out[iThread], linfo, mode);
+               }
+       
                count++;
                if(n<count) {
                        fprintf(stderr, "Something wrong: count %d n %d\n", count, n);
@@ -226,7 +344,67 @@ lmrcImage3Dto2D(mrcImage* out, mrcImage* in, lmrc3Dto2DInfo* linfo, int mode)
        }
        }
        }
-       out->HeaderN.z = count;
-       out->numTailer = count;
+       eosPThreadJoinAll(&pthread, 0); 
+       //
+       if(linfo->flagFileList) {
+               dst->HeaderN.z = 1;
+               dst->numTailer = 1;
+       } else {
+               dst->HeaderN.z = count;
+               dst->numTailer = count;
+       }
+}
+
+
+void
+lmrcImage3Dto2DSingleForPThread(void* arg)
+{
+       lmrcImage3Dto2DSingleForPThreadArg* thisArg;
+
+       thisArg = arg;
+
+       DEBUGPRINT1("lmrcImage3Dto2DSingle Start: %d\n", thisArg->outSection);
+       lmrcImage3Dto2DSingle(
+                       thisArg->out2D, thisArg->in3D, 
+                       thisArg->Mode,  thisArg->Rot1,          thisArg->Rot2,  thisArg->Rot3,  
+                       thisArg->linfo, thisArg->llinfo,        thisArg->mode);
+       DEBUGPRINT("lmrcImage3Dto2DSingle End\n");
+       DEBUGPRINT("lmrcImage3Dto2DSinglePost Start\n");
+       lmrcImage3Dto2DSinglePost(
+                       thisArg->fptInfo, thisArg->dst, thisArg->outSection, thisArg->out2D, thisArg->linfo, thisArg->mode);
+       DEBUGPRINT("lmrcImage3Dto2DSinglePost End\n");
+}
+
+void
+lmrcImage3Dto2DSinglePost(FILE* fptInfo, mrcImage* dst, int outSection, mrcImage* out, lmrc3Dto2DInfo* linfo, int mode) 
+{
+       int i;
+       char filename[1024];
+       char Mode[5];
+
+       if(linfo->flagFileList) {
+               sprintf(filename, linfo->filenameNumberFormat, linfo->filenamePrefix, outSection, linfo->filenameSuffix);
+               DEBUGPRINT2("%d: %s\n", outSection, filename);  
+               DEBUGPRINT2("Nz: %d numTailer: %d\n", out->HeaderN.z, out->numTailer);  
+               mrcFileWrite(out, filename, "in lmrc3Dto2D", 0);
+               for(i=0; i<4; i++) {
+                       Mode[i] = out->Tailer[0].Cont.EulerAngleMode[i];
+               }
+               Mode[4] = '\0';
+               fprintf(fptInfo, "%s %4s %15.6f %15.6f %15.6f\n", 
+                               filename, 
+                               Mode,
+                               out->Tailer[0].Cont.Rot1*DEGREE, 
+                               out->Tailer[0].Cont.Rot2*DEGREE, 
+                               out->Tailer[0].Cont.Rot3*DEGREE);
+       } else {
+               DEBUGPRINT1("Section(%d) Set for dst\n", outSection);
+               for(i=0; i<4; i++) dst->Tailer[outSection].Cont.EulerAngleMode[i]  = out->Tailer[0].Cont.EulerAngleMode[i];
+               dst->Tailer[outSection].Cont.Rot1  = out->Tailer[0].Cont.Rot1;
+               dst->Tailer[outSection].Cont.Rot2  = out->Tailer[0].Cont.Rot2;
+               dst->Tailer[outSection].Cont.Rot3  = out->Tailer[0].Cont.Rot3;  
+
+               mrcImageSectionSet(dst, out, outSection, mode);
+       }
 }
 

diff --git a/src/Objects/DataManip/transform/src/lmrc3Dto2D.h b/src/Objects/DataManip/transform/src/lmrc3Dto2D.h
index 9ca6bf3..992ed19 100755 (executable)
--- a/src/Objects/DataManip/transform/src/lmrc3Dto2D.h
+++ b/src/Objects/DataManip/transform/src/lmrc3Dto2D.h
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>                  
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Matrix3D.h"
 #include "Vector.h"
@@ -57,6 +57,12 @@ typedef struct lmrc3Dto2DInfo {
 
        /* PVM */
        int flagPVM;    
+
+       /* fileListInformation */
+       int flagFileList;
+       char* filenamePrefix;
+       char* filenameSuffix;
+       char* filenameNumberFormat; 
 } lmrc3Dto2DInfo;
 
 typedef struct lmrc3Dto2DSingleInfo {

diff --git a/src/Objects/General/eosPThread/Config/Define.inc b/src/Objects/General/eosPThread/Config/Define.inc
new file mode 100755 (executable)
index 0000000..939c87c
--- /dev/null
+++ b/src/Objects/General/eosPThread/Config/Define.inc
@@ -0,0 +1,3 @@
+OBJECTNAME = eosPThread
+EXTRA_INC =
+EXTRA_CCOPTS =

diff --git a/src/Objects/General/eosPThread/Config/Target.inc b/src/Objects/General/eosPThread/Config/Target.inc
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/src/Objects/General/eosPThread/Makefile b/src/Objects/General/eosPThread/Makefile
new file mode 120000 (symlink)
index 0000000..405b9e2
--- /dev/null
+++ b/src/Objects/General/eosPThread/Makefile
@@ -0,0 +1 @@
+/Applications/Eos.app/Eos/src/Config/Template/ObjectsTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/doc/.eosPThread.html b/src/Objects/General/eosPThread/doc/.eosPThread.html
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/src/Objects/General/eosPThread/doc/.footer b/src/Objects/General/eosPThread/doc/.footer
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/src/Objects/General/eosPThread/doc/.header b/src/Objects/General/eosPThread/doc/.header
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/src/Objects/General/eosPThread/doc/Makefile b/src/Objects/General/eosPThread/doc/Makefile
new file mode 100755 (executable)
index 0000000..3e2d53b
--- /dev/null
+++ b/src/Objects/General/eosPThread/doc/Makefile
@@ -0,0 +1,41 @@
+include ../../../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../Config/Define.inc
+include ../Config/Define.inc
+
+SOURCEDOC  = $(OBJECTNAME).html
+DOCDSTDIR  = $(EOS_HOME)/doc/Objects
+TARGETDOC  = $(DOCDSTDIR)/$(SOURCEDOC)
+
+all: $(SOURCEDOC)
+
+install : $(TARGETDOC) 
+
+$(TARGETDOC):$(SOURCEDOC)
+       $(INSTALL) -m 444 *.html $(DOCDSTDIR)
+       @cd $(DOCDSTDIR); make
+
+$(SOURCEDOC) : .$(SOURCEDOC) .header .footer ../inc/$(OBJECTNAME).h Makefile ../src/*.c
+       @echo Creating $(OBJECTNAME).html
+       @cat .header                             > $(SOURCEDOC)
+       @htmlUpdateTime                         >> $(SOURCEDOC)
+       @cat .$(SOURCEDOC)                      >> $(SOURCEDOC)
+       @echo \<HR\>                            >> $(SOURCEDOC)
+       @echo "<A NAME=\"Information\">" >> $(SOURCEDOC)
+       @echo "<H2>Information from source codes</H2>" >> $(SOURCEDOC)
+       @echo "</A>"               >> $(SOURCEDOC)
+       @echo "<PRE>"               >> $(SOURCEDOC)
+       -@ident ../src/*.c                      >> $(SOURCEDOC)
+       @echo "</PRE>"              >> $(SOURCEDOC)
+       @echo \<HR\>                            >> $(SOURCEDOC)
+       @echo \<A NAME=\"include\"\>>> $(SOURCEDOC)
+       @echo "<H2>$(OBJECTNAME).h</H2>">> $(SOURCEDOC)
+       @echo \</A\>                            >>$(SOURCEDOC)
+       @echo \<PRE\>                           >> $(SOURCEDOC)
+       @cat ../inc/$(OBJECTNAME).h >> $(SOURCEDOC)
+       @echo \</PRE\>                          >> $(SOURCEDOC) 
+       @cat .footer                            >> $(SOURCEDOC)
+
+clean:
+
+depend:

diff --git a/src/Objects/General/eosPThread/doc/eosPThread.html b/src/Objects/General/eosPThread/doc/eosPThread.html
new file mode 100644 (file)
index 0000000..ce358ae
--- /dev/null
+++ b/src/Objects/General/eosPThread/doc/eosPThread.html
@@ -0,0 +1,90 @@
+<H4> Update Time 05/12/13---04:52:43 </H4>
+<HR>
+<A NAME="Information">
+<H2>Information from source codes</H2>
+</A>
+<PRE>
+../src/eosPThread.c:
+
+../src/eosPThreadCreate.c:
+
+../src/eosPThreadInit.c:
+
+../src/eosPThreadJoin.c:
+
+../src/eosPThreadMutex.c:
+</PRE>
+<HR>
+<A NAME="include">
+<H2>eosPThread.h</H2>
+</A>
+<PRE>
+/*
+# eosPThread.h : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : eosPThread.h 
+# Attention
+#   $Loccker$
+#      $State$ 
+#
+*/
+/* $Log$ */
+#ifndef EOS_PTHREAD_H
+#define EOS_PTHRED_H 
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <errno.h>
+
+/* constant begin */
+
+extern int __eosPThread__;
+extern int __eosPThreadNum__;
+
+/* constant end */
+
+/* struct begin */
+
+typedef enum eosPThreadStatus {
+       eosPThreadStatusWaiting = 0,
+       eosPThreadStatusRunning = 1
+} eosPThreadStatus;
+
+typedef struct eosPThread {
+       pthread_t*                      th;         /* [max] thread */
+       eosPThreadStatus*       status;     /* [max] thread status */
+       long*                           id;         /* [max] thread ID indicated by count */
+
+       int                             max;            /* maximum thread number working simultaneously. */ 
+       long                            count;          /* count of created threads */   
+       long                            latest;     /* working thread ID which started latest */
+       long                            oldest;     /* working thread ID which started oldest */
+} eosPThread;
+
+/* struct end */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* prototype begin */
+extern void eosPThreadInit   (eosPThread* t, int max, int mode);
+extern int  eosPThreadCreateOnWaitingThread (eosPThread* t, void* (*start_routine)(void *), void * arg, int mode);
+extern int  eosPThreadCreate (eosPThread* t, int i, void* (*start_routine)(void *), void * arg, int mode);
+extern void eosPThreadJoin   (eosPThread* t, int i, int mode);
+extern void eosPThreadJoinAll(eosPThread* t, int mode);
+
+extern void eosPThreadMutexInit(eosPThread* t);
+extern void eosPThreadMutexLock(eosPThread* t);
+extern void eosPThreadMutexUnlock(eosPThread* t);
+
+/* prototype end */
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif  /* EOS_PTHREAD_H */ 
+</PRE>

diff --git a/src/Objects/General/eosPThread/inc/Makefile b/src/Objects/General/eosPThread/inc/Makefile
new file mode 100755 (executable)
index 0000000..e1bd97e
--- /dev/null
+++ b/src/Objects/General/eosPThread/inc/Makefile
@@ -0,0 +1,31 @@
+include ../../../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../Config/Define.inc
+include ../Config/Define.inc
+
+INCFILE = $(OBJECTNAME).h
+
+all: 
+
+install:$(EOS_HOME)/include/$(INCFILE)
+
+$(EOS_HOME)/include/$(INCFILE):$(INCFILE)
+       if [ ! -d  $(EOS_HOME)/include ] ; then \
+               mkdir $(EOS_HOME)/include ; \
+       fi
+       $(INSTALL) -m 444 $(INCFILE) $(EOS_HOME)/include/
+
+clean:
+       $(RM) -f *.bak
+
+depend:
+       $(RM) -f *.bak  
+
+cvsupdate::
+       cvs -d $(EOS_CVSROOT) update 
+
+cvscommit::
+       @echo "cvs -d $(EOS_CVSROOT) commit"  
+
+cvsadd::
+       @echo "cvs -d $(EOS_CVSROOT) add"  

diff --git a/src/Objects/General/eosPThread/inc/eosPThread.h b/src/Objects/General/eosPThread/inc/eosPThread.h
new file mode 100644 (file)
index 0000000..8c86d6a
--- /dev/null
+++ b/src/Objects/General/eosPThread/inc/eosPThread.h
@@ -0,0 +1,68 @@
+/*
+# eosPThread.h : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : eosPThread.h 
+# Attention
+#   $Loccker$
+#      $State$ 
+#
+*/
+/* $Log$ */
+#ifndef EOS_PTHREAD_H
+#define EOS_PTHRED_H 
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <errno.h>
+
+/* constant begin */
+
+extern int __eosPThread__;
+extern int __eosPThreadNum__;
+
+/* constant end */
+
+/* struct begin */
+
+typedef enum eosPThreadStatus {
+       eosPThreadStatusWaiting = 0,
+       eosPThreadStatusRunning = 1
+} eosPThreadStatus;
+
+typedef struct eosPThread {
+       pthread_t*                      th;         /* [max] thread */
+       eosPThreadStatus*       status;     /* [max] thread status */
+       long*                           id;         /* [max] thread ID indicated by count */
+
+       int                             max;            /* maximum thread number working simultaneously. */ 
+       long                            count;          /* count of created threads */   
+       long                            latest;     /* working thread ID which started latest */
+       long                            oldest;     /* working thread ID which started oldest */
+} eosPThread;
+
+/* struct end */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* prototype begin */
+extern void eosPThreadInit   (eosPThread* t, int max, int mode);
+extern int  eosPThreadCreateOnWaitingThread (eosPThread* t, void* (*start_routine)(void *), void * arg, int mode);
+extern int  eosPThreadCreate (eosPThread* t, int i, void* (*start_routine)(void *), void * arg, int mode);
+extern void eosPThreadJoin   (eosPThread* t, int i, int mode);
+extern void eosPThreadJoinAll(eosPThread* t, int mode);
+
+extern void eosPThreadMutexInit(eosPThread* t);
+extern void eosPThreadMutexLock(eosPThread* t);
+extern void eosPThreadMutexUnlock(eosPThread* t);
+
+/* prototype end */
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif  /* EOS_PTHREAD_H */ 

diff --git a/src/Objects/General/eosPThread/inc/eosPThread.h.org b/src/Objects/General/eosPThread/inc/eosPThread.h.org
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/Objects/General/eosPThread/src/.CCHeader b/src/Objects/General/eosPThread/src/.CCHeader
new file mode 100755 (executable)
index 0000000..73e038f
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/.CCHeader
@@ -0,0 +1,2 @@
+CCHeader = \
+

diff --git a/src/Objects/General/eosPThread/src/.CHeader b/src/Objects/General/eosPThread/src/.CHeader
new file mode 100755 (executable)
index 0000000..35bb91e
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/.CHeader
@@ -0,0 +1,2 @@
+CHeader = \
+

diff --git a/src/Objects/General/eosPThread/src/.Ruby b/src/Objects/General/eosPThread/src/.Ruby
new file mode 100755 (executable)
index 0000000..02cfa9b
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/.Ruby
@@ -0,0 +1,2 @@
+Ruby = \
+

diff --git a/src/Objects/General/eosPThread/src/.Wish b/src/Objects/General/eosPThread/src/.Wish
new file mode 100755 (executable)
index 0000000..ee878ff
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/.Wish
@@ -0,0 +1,2 @@
+Wish = \
+

diff --git a/src/Objects/General/eosPThread/src/ALPHA b/src/Objects/General/eosPThread/src/ALPHA
new file mode 120000 (symlink)
index 0000000..8542e3c
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/ALPHA
@@ -0,0 +1 @@
+../../../../../hostdepend/ALPHA/src/Objects/General/eosPThread/src/ALPHA
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/ALPHALINUX b/src/Objects/General/eosPThread/src/ALPHALINUX
new file mode 120000 (symlink)
index 0000000..2cc07c3
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/ALPHALINUX
@@ -0,0 +1 @@
+../../../../../hostdepend/ALPHALINUX/src/Objects/General/eosPThread/src/ALPHALINUX
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/ALPHALINUX5 b/src/Objects/General/eosPThread/src/ALPHALINUX5
new file mode 120000 (symlink)
index 0000000..6ea0450
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/ALPHALINUX5
@@ -0,0 +1 @@
+../../../../../hostdepend/ALPHALINUX5/src/Objects/General/eosPThread/src/ALPHALINUX5
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/ALPHAOSF1 b/src/Objects/General/eosPThread/src/ALPHAOSF1
new file mode 120000 (symlink)
index 0000000..14f8a19
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/ALPHAOSF1
@@ -0,0 +1 @@
+../../../../../hostdepend/ALPHAOSF1/src/Objects/General/eosPThread/src/ALPHAOSF1
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/CELLLINUX64 b/src/Objects/General/eosPThread/src/CELLLINUX64
new file mode 120000 (symlink)
index 0000000..9cfbb74
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/CELLLINUX64
@@ -0,0 +1 @@
+../../../../../hostdepend/CELLLINUX64/src/Objects/General/eosPThread/src/CELLLINUX64
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/HP b/src/Objects/General/eosPThread/src/HP
new file mode 120000 (symlink)
index 0000000..84ee48d
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/HP
@@ -0,0 +1 @@
+../../../../../hostdepend/HP/src/Objects/General/eosPThread/src/HP
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/I386LINUX b/src/Objects/General/eosPThread/src/I386LINUX
new file mode 120000 (symlink)
index 0000000..daeb422
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/I386LINUX
@@ -0,0 +1 @@
+../../../../../hostdepend/I386LINUX/src/Objects/General/eosPThread/src/I386LINUX
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/I686LINUX b/src/Objects/General/eosPThread/src/I686LINUX
new file mode 120000 (symlink)
index 0000000..b7c7d66
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/I686LINUX
@@ -0,0 +1 @@
+../../../../../hostdepend/I686LINUX/src/Objects/General/eosPThread/src/I686LINUX
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/Makefile b/src/Objects/General/eosPThread/src/Makefile
new file mode 100755 (executable)
index 0000000..7e5dae3
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/Makefile
@@ -0,0 +1,345 @@
+SHELL=/bin/ksh
+include ../Config/Define.inc
+include ../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../../../Config/Define.inc
+
+include $(OSTYPE)/.Source
+include .CHeader
+include .CCHeader
+include .Wish
+include .Ruby
+
+LIBNAME=lib$(OBJECTNAME).a
+SHAREDLIB=lib$(OBJECTNAME).so
+LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
+
+DSTDIR=../../../../../lib/$(OSTYPE)/
+SOURCE=$(OSTYPE)/.Source
+ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
+
+all: hostdepend static-lib shared-lib ruby-lib debug
+       @echo LIBNAME:$(LIBNAME)
+       @echo OBJECTNAME:$(OBJECTNAME)
+
+hostdepend:
+       @if [ ! -L $(OSTYPE) ] ; then  \
+               moveHostdependent ; \
+       fi
+
+debug: debug-lib
+
+static-lib::
+       @echo static-lib:LIBNAME:$(LIBNAME) ; \
+       $(RM) -f $(OSTYPE)/Makefile; \
+       $(CP) $(ARCHTEMPLATEDIR)/Makefile $(OSTYPE)/Makefile ; \
+       cd $(OSTYPE); \
+       $(MAKE) $(LIBNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) WORLDNAME=$(WORLDNAME) 
+
+shared-lib::
+       @echo shared-lib:LIBNAME:$(LIBNAME) ; \
+       $(RM) -f $(OSTYPE)/Makefile;  \
+       $(CP) $(ARCHTEMPLATEDIR)/Makefile $(OSTYPE)/Makefile ; \
+       cd  $(OSTYPE); \
+       $(MAKE) $(SHAREDLIB) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) WORLDNAME=$(WORLDNAME) 
+
+ruby-lib::
+       @if [ -d Swig ]; then \
+               echo "--- Swig ---"; \
+               cd Swig; \
+               if [ -f extconf.rb ] ; then \
+                       swig -ruby -I/usr/include -I$(EOS_HOME)/include *.i ; \
+                       ruby extconf.rb --with-Eos-include=$(EOS_HOME)/include --with-Eos-lib=$(EOS_HOME)/lib/$(OSTYPE) --with-opt-lib=$LD_LIBRARY_PATH --with-opt-lib=$(EOS_HOME)/util/$(OSTYPE)/lib --with-GL-lib=/usr/lib ; \
+                       make ; \
+                       make sitearchdir=$(EOS_HOME)/lib/$(OSTYPE) install; \
+               fi ; \
+       fi  
+
+debug-lib::
+       @cd $(OSTYPE); \
+       $(RM) -f Makefile; \
+       $(CP) $(ARCHTEMPLATEDIR)/Makefile Makefile ; \
+       $(MAKE) $(LIBNAMEDEBUG) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) WORLDNAME=$(WORLDNAME) 
+
+clean: 
+       rm -f *.[oa] *.debugo *.cudagdbo *.so *.sharedo *.linkinfo $(OSTYPE)/*.[ao] $(OSTYPE)/*.debugo $(OSTYPE)/*.cudagdbo $(OSTYPE)/*.linkinfo *.bak core $(OSTYPE)/*.sharedo $(OSTYPE)/*.so
+
+Makefile:
+       touch .Source
+       touch .CHeader
+       touch .CCHeader
+
+install: all install-static install-shared install-ascii 
+       @echo "Installation has completed: $(LIBNAME)" 
+
+install-static: $(DSTDIR)/$(LIBNAME)
+install-shared: $(DSTDIR)/$(SHAREDLIB)
+
+install-debug: debug $(DSTDIR)/$(LIBNAMEDEBUG) install-ascii 
+       @echo "Installation has completed: $(LIBNAMEDEBUG)" 
+
+install-ascii: h hh wish ruby 
+
+h:
+       @if [ -n "$(CHeader)" ] ; \
+       then\
+               echo "C Header Install" ; \
+               for file in $(CHeader) dummy ; \
+               do \
+                       if [ -f $${file} ] ; \
+                       then\
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+                       fi;\
+               done; \
+       fi
+
+hh:
+       @if [ -n "$(CCHeader)" ] ; \
+       then \
+               echo "C++ Header Install" ; \
+               for file in $(CCHeader) dummy ; \
+               do \
+                       if [ -f $${file} ] ; \
+                       then\
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+                       fi;\
+               done; \
+       fi
+
+wish:
+       @if [ -n "$(Wish)" ] ; \
+       then \
+               echo "Wish Install" ; \
+               for file in $(Wish) dummy ; \
+               do \
+                       if [ -f $${file} ] ; \
+                       then\
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+                       fi;\
+               done; \
+       fi
+
+ruby:
+       @if [ -n "$(Ruby)" ] ; \
+       then \
+               echo "Ruby Install" ; \
+               for file in $(Ruby) dummy ; \
+               do \
+                       if [ -f $${file} ] ; \
+                       then\
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+                       fi;\
+               done; \
+       fi
+
+put:
+       @Files=`ls -l | grep $${USER} | grep rw | grep -e "\.c" ` ;\
+       for file in $${Files} dummy; \
+       do \
+               if [ -w $${file} ] ; \
+               then\
+                       echo $${file}; sccsPut $${file} ; \
+               fi;\
+       done
+
+$(DSTDIR)/$(LIBNAME): static-lib
+       @echo Installing lib: $(LIBNAME)
+       @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAME) ../$(DSTDIR)
+       @echo LIBNAME:$(LIBNAME)
+       @echo Link EosObjects
+       @OBJLIST=`ls $(OSTYPE)/*.o `;\
+       echo $${OBJLIST} | sed -f ../../../../Config/o2nl.sed > .tmp1 ; \
+       echo $(REALOBJ)  | sed -f ../../../../Config/o2nl.sed > .tmp2 ; \
+       echo "#### Attention Uncompiled file ####";\
+       comm -13 .tmp1 .tmp2 ; \
+       echo "########";\
+       echo $(AR) r $(DSTDIR)/libEosObjects.a $${OBJLIST} ; \
+       $(AR) r $(DSTDIR)/libEosObjects.a $${OBJLIST}; \
+       echo $(AR) s $(DSTDIR)/libEosObjects.a ; \
+       $(AR) s $(DSTDIR)/libEosObjects.a \
+       chmod 660 $(DSTDIR)/libEosObjects.a
+       @rm .tmp1 .tmp2
+
+$(DSTDIR)/$(LIBNAMEDEBUG): debug 
+       @echo Installing lib: $(LIBNAMEDEBUG)
+       @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+       @echo LIBNAME:$(LIBNAMEDEBUG)
+       @echo Link EosObjects
+       @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
+       echo $${OBJLISTDEBUG} | sed -f ../../../../Config/o2nl.sed > .tmp1 ; \
+       echo $(REALOBJDEBUG)  | sed -f ../../../../Config/o2nl.sed > .tmp2 ; \
+       echo "#### Attention Uncompiled file ####";\
+       comm -13 .tmp1 .tmp2 ; \
+       echo "########";\
+       echo $(AR) r $(DSTDIR)/libEosObjects.debug.a $${OBJLISTDEBUG} ; \
+       $(AR) r $(DSTDIR)/libEosObjects.debug.a $${OBJLISTDEBUG}; 
+       echo $(AR) s $(DSTDIR)/libEosObjects.debug.a ; \
+       $(AR) s $(DSTDIR)/libEosObjects.debug.a 
+       chmod 660 $(DSTDIR)/libEosObjects.debug.a
+       @rm .tmp1 .tmp2
+
+$(DSTDIR)/$(SHAREDLIB): shared-lib
+       @echo Installing lib: $(SHAREDLIB)
+       @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
+       @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+       @echo LIBNAME:$(SHAREDLIB)
+       @echo Link EosObjects
+       @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
+       echo $${OBJLIST} | sed -f ../../../../Config/o2nl.sed > .tmp1 ; \
+       echo $(REALSHAREDOBJ)  | sed -f ../../../../Config/o2nl.sed > .tmp2 ; \
+       echo "#### Attention Uncompiled file ####";\
+       comm -13 .tmp1 .tmp2 ; \
+       echo "########"; \
+       if [ ! -d  $(DSTDIR)/shared ] ; then \
+               mkdir $(DSTDIR)/shared; \
+       fi; \
+       $(CP) $${OBJLIST} $(DSTDIR)/shared ; \
+       echo "$(CP) $${OBJLIST} $(DSTDIR)/shared" ; \
+       $(SHARED) $(DSTDIR)/libEosObjects.so $(DSTDIR)/shared/*.sharedo ; \
+       echo "$(SHARED) $(DSTDIR)/libEosObjects.so $(DSTDIR)/shared/*.sharedo" ; \
+       chmod 660 $(DSTDIR)/libEosObjects.so
+       @rm .tmp1 .tmp2
+
+install-all: 
+       @cd ..  ; $(MAKE) install
+
+install-ruby: ruby-lib
+       cd $(OSTYPE); $(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(SHAREDLIB) $(RUBYSHAREDLIB)/$(SHAREDLIB)     
+
+depend:
+       @echo dependency checking now 
+       @echo $(OSTYPE)
+       @echo SRC = \\ > $(SOURCE) 
+       @ls -1 *.c  | sed -e "s/\.c/.c \\\\/"   >> $(SOURCE)
+       @ls -1 *.cc | sed -e "s/\.cc/.cc \\\\/" >> $(SOURCE)
+       @ls -1 *.ccm | sed -e "s/\.ccm/.ccm \\\\/" >> $(SOURCE)
+       @ls -1 *.idl | sed -e "s/\.idl/.idl \\\\/" >> $(SOURCE)
+       @ls -1 *.cu | sed -e "s/\.cu/.cu \\\\/" >> $(SOURCE)
+       @echo >> $(SOURCE)
+       @#
+       @echo OBJ = \\ >> $(SOURCE)
+       @ls -1 *.c   | sed -e "s/\.c/.o \\\\/"    >> $(SOURCE)
+       @ls -1 *.cc  | sed -e "s/\.cc/.o  \\\\/"  >> $(SOURCE)
+       @ls -1 *.ccm  | sed -e "s/\.ccm/.o  \\\\/"  >> $(SOURCE)
+       @ls -1 *.idl | sed -e "s/\.idl/.o  \\\\/" >> $(SOURCE)
+       @ls -1 *.cu  | sed -e "s/\.cu/.o  \\\\/"  >> $(SOURCE)
+       @echo >> $(SOURCE)
+       @#
+       @echo SHAREDOBJ = \\ >> $(SOURCE)
+       @ls -1 *.c   | sed -e "s/\.c/.sharedo \\\\/"    >> $(SOURCE)
+       @ls -1 *.cc  | sed -e "s/\.cc/.sharedo  \\\\/"  >> $(SOURCE)
+       @ls -1 *.ccm  | sed -e "s/\.ccm/.sharedo  \\\\/"  >> $(SOURCE)
+       @ls -1 *.idl | sed -e "s/\.idl/.sharedo  \\\\/" >> $(SOURCE)
+       @ls -1 *.cu  | sed -e "s/\.cu/.sharedo  \\\\/"  >> $(SOURCE)
+       @echo >> $(SOURCE)
+       @#
+       @echo REALOBJ = \\ >> $(SOURCE)
+       @ls -1 *.c   | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.c/.o \\\\/"  >> $(SOURCE)
+       @ls -1 *.cc  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cc/.o \\\\/" >> $(SOURCE)
+       @ls -1 *.ccm  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.ccm/.o \\\\/" >> $(SOURCE)
+       @ls -1 *.idl | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.idl/.o \\\\/" >> $(SOURCE)
+       @ls -1 *.cu  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cu/.o \\\\/" >> $(SOURCE)
+       @echo >> $(SOURCE) 
+       @echo REALSHAREDOBJ = \\ >> $(SOURCE)
+       @ls -1 *.c   | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.c/.sharedo \\\\/"  >> $(SOURCE)
+       @ls -1 *.cc  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cc/.sharedo \\\\/" >> $(SOURCE)
+       @ls -1 *.ccm  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.ccm/.sharedo \\\\/" >> $(SOURCE)
+       @ls -1 *.idl | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.idl/.sharedo \\\\/" >> $(SOURCE)
+       @ls -1 *.cu  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cu/.sharedo \\\\/" >> $(SOURCE)
+       @echo >> $(SOURCE) 
+       @echo OBJDEBUG = \\ >> $(SOURCE)
+       @ls -1 *.c   | sed -e "s/\.c/.debugo \\\\/"    >> $(SOURCE)
+       @ls -1 *.cc  | sed -e "s/\.cc/.debugo  \\\\/"  >> $(SOURCE)
+       @ls -1 *.ccm  | sed -e "s/\.ccm/.debugo  \\\\/"  >> $(SOURCE)
+       @ls -1 *.idl | sed -e "s/\.idl/.debugo  \\\\/" >> $(SOURCE)
+       @echo >> $(SOURCE)
+       @#
+       @echo REALOBJDEBUG = \\ >> $(SOURCE)
+       @ls -1 *.c   | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.c/.debugo \\\\/"  >> $(SOURCE)
+       @ls -1 *.cc  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cc/.debugo \\\\/" >> $(SOURCE)
+       @ls -1 *.ccm  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.ccm/.debugo \\\\/" >> $(SOURCE)
+       @ls -1 *.idl | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.idl/.debugo \\\\/" >> $(SOURCE)
+       @ls -1 *.cu  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cu/.debugo \\\\/" >> $(SOURCE)
+       @echo >> $(SOURCE) 
+       @echo OBJCUDAGDB = \\ >> $(SOURCE)
+       @ls -1 *.c   | sed -e "s/\.c/.cudagdb.o \\\\/"    >> $(SOURCE)
+       @ls -1 *.cc  | sed -e "s/\.cc/.cudagdb.o  \\\\/"  >> $(SOURCE)
+       @ls -1 *.cu  | sed -e "s/\.cu/.cudagdb.o  \\\\/"  >> $(SOURCE)
+       @echo >> $(SOURCE)
+       @#
+       @echo REALOBJCUDAGDB = \\ >> $(SOURCE)
+       @ls -1 *.c   | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.c/.cudagdb.o \\\\/"  >> $(SOURCE)
+       @ls -1 *.cc  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cc/.cudagdb.o \\\\/" >> $(SOURCE)
+       @ls -1 *.cu  | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cu/.cudagdb.o \\\\/" >> $(SOURCE)
+       @echo >> $(SOURCE) 
+       @#
+       @echo >> $(SOURCE)
+       @echo CCHeader = \\ > .CCHeader
+       @ls -1 *.hh | sed -e "s/\.hh/.hh \\\\/" >> .CCHeader
+       @echo >> .CCHeader
+       @#
+       @echo CHeader = \\ > .CHeader
+       @ls -1 *.h | sed -e "s/\.h/.h \\\\/" >> .CHeader
+       @echo >> .CHeader
+       @#
+       @echo Wish = \\ > .Wish
+       @ls -1 *.wish | sed -e "s/\.wish/.wish \\\\/" >> .Wish
+       @echo >> .Wish
+       @#
+       @echo Ruby = \\ > .Ruby
+       @ls -1 *.rb | sed -e "s/\.rb/.rb \\\\/" >> .Ruby
+       @echo >> .Ruby
+       @#
+       @ls -1 *.c *.cc *.ccm | \
+       awk -vHostType=$(OSTYPE) -f$(EOS_HOME)/sbin/awk/objectdependency.awk > $(OSTYPE)/.Depend
+       @#
+       @$(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(KHOROS_INCS) *.c *.cc *.ccm >> $(OSTYPE)/.Depend
+       @for file in $(SRC) dummy ; \
+       do  \
+               if [ -f $${file} ] ; \
+               then \
+                       echo $${file} ; \
+                       ln -sf ../$${file} $(OSTYPE)/$${file}; \
+               fi ;\
+       done
+
+#
+#
+#
+test::
+       @if [ -d test ] ; then \
+               cd test; \
+               $(MAKE); \
+       else \
+               echo "No test directory: making test"; \
+               mkdir test; \
+               cd test; \
+               touch Makefile; \
+       fi
+
+#
+# cvs
+#
+cvsupdate::
+       cvs -d $(EOS_CVSROOT) update -d 
+
+cvslogin::
+       cvs -d $(EOS_CVSROOT) login 
+
+cvscommit::
+       @echo "cvs -d $(EOS_CVSROOT) commit -m @"message@" filename"
+
+cvsadd::
+       @echo "cvs -d $(EOS_CVSROOT) add  filename|dirname"
+       @echo "Need Commit for filename"
+       @echo "make cvscommit"
+
+cvsremove::
+       @echo "cvs -d $(EOS_CVSROOT) remove filename"
+       @echo "Need Commit for filename"
+       @echo "make cvscommit" 
+
+include $(OSTYPE)/.Depend
+include ../Config/Target.inc

diff --git a/src/Objects/General/eosPThread/src/SGI b/src/Objects/General/eosPThread/src/SGI
new file mode 120000 (symlink)
index 0000000..695890a
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/SGI
@@ -0,0 +1 @@
+../../../../../hostdepend/SGI/src/Objects/General/eosPThread/src/SGI
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/SPARC b/src/Objects/General/eosPThread/src/SPARC
new file mode 120000 (symlink)
index 0000000..d3281c6
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/SPARC
@@ -0,0 +1 @@
+../../../../../hostdepend/SPARC/src/Objects/General/eosPThread/src/SPARC
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/X86LINUX64 b/src/Objects/General/eosPThread/src/X86LINUX64
new file mode 120000 (symlink)
index 0000000..83687b3
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/X86LINUX64
@@ -0,0 +1 @@
+../../../../../hostdepend/X86LINUX64/src/Objects/General/eosPThread/src/X86LINUX64
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/X86MAC64 b/src/Objects/General/eosPThread/src/X86MAC64
new file mode 120000 (symlink)
index 0000000..8bd43b0
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/X86MAC64
@@ -0,0 +1 @@
+../../../../../hostdepend/X86MAC64/src/Objects/General/eosPThread/src/X86MAC64
\ No newline at end of file

diff --git a/src/Objects/General/eosPThread/src/eosPThread.c b/src/Objects/General/eosPThread/src/eosPThread.c
new file mode 100644 (file)
index 0000000..a1aae7d
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/eosPThread.c
@@ -0,0 +1,17 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosPThread ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosPThread 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosPThread ver%I%; Date:%D% %Z%";
+
+#include "../inc/eosPThread.h"
+
+int __eosPThread__=0;
+int __eosPThreadNum__=1;

diff --git a/src/Objects/General/eosPThread/src/eosPThreadCreate.c b/src/Objects/General/eosPThread/src/eosPThreadCreate.c
new file mode 100644 (file)
index 0000000..349659f
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/eosPThreadCreate.c
@@ -0,0 +1,80 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosPThreadCreate ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosPThreadCreate 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosPThreadCreate ver%I%; Date:%D% %Z%";
+
+#undef DEBUG
+#include "genUtil.h"
+
+#include "../inc/eosPThread.h"
+
+
+int
+eosPThreadCreateOnWaitingThread(eosPThread* t, void* (*start_routine)(void *), void * arg, int mode)
+{
+       int i;
+
+       while(1) { 
+               for(i=0; i<t->max; i++) {
+                       if( t->status[i] == eosPThreadStatusWaiting) {
+                               eosPThreadCreate(t, i, start_routine, arg, mode);
+                               return 0;
+                       } 
+               }
+       }
+       return -1;
+}
+
+int
+eosPThreadCreate(eosPThread* t, int i, void* (*start_routine)(void *), void * arg, int mode)
+{
+       int status;
+
+       DEBUGPRINT("eosPThreadCreate\n");
+       if( t->status[i] == eosPThreadStatusRunning) {
+               DEBUGPRINT2("ID: $d threadID: %x pthread_join in eosPThreadCreate\n", i, t->th[i]);
+               eosPThreadJoin(t, i, mode);
+       } 
+       status = pthread_create(&(t->th[i]), NULL, start_routine, arg);
+       DEBUGPRINT1("%d\n", status);
+       switch(status) {
+               case 0: {
+                       t->status[i] = eosPThreadStatusRunning; 
+                       t->count++;
+                       t->id[i]  = t->count;
+                       t->latest = t->count;
+                       if(t->oldest==0) t->oldest = t->count;
+
+                       DEBUGPRINT2("ID: %d ThreadID: %p in pthread_create\n", i, t->th[i]);
+                       break;
+               }
+               case EINVAL: {
+                       perror("eosPThreadCreate");
+                       fprintf(stderr, "The value specified by attr is invalid.\n");
+                       exit(EXIT_FAILURE);
+                       break;
+               }
+               case EAGAIN: {
+                       perror("eosPThreadCreate");
+                       fprintf(stderr, "The system locked the necessary resources to create another thread, \n");
+                       fprintf(stderr, "or the system-imposed limit on the total number of threads in a process would be exceeded.\n");
+                       exit(EXIT_FAILURE);
+                       break;
+               }
+
+               default: {
+                       fprintf(stderr, "Something wrong\n");
+                       exit(EXIT_FAILURE);
+                       break;
+               }
+       }
+       return status;
+}

diff --git a/src/Objects/General/eosPThread/src/eosPThreadInit.c b/src/Objects/General/eosPThread/src/eosPThreadInit.c
new file mode 100644 (file)
index 0000000..e1e7e02
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/eosPThreadInit.c
@@ -0,0 +1,34 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosPThreadInit ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosPThreadInit 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosPThreadInit ver%I%; Date:%D% %Z%";
+
+#include "Memory.h"
+#include "../inc/eosPThread.h"
+
+void 
+eosPThreadInit(eosPThread* t, int max, int mode)
+{
+       int i;
+       t->max = max;
+       t->th     = (pthread_t*)       memoryAllocate(sizeof(pthread_t)       *max, "in eosPThreadInit");
+       t->status = (eosPThreadStatus*)memoryAllocate(sizeof(eosPThreadStatus)*max, "in eosPThreadInit");
+       t->id     = (long*)            memoryAllocate(sizeof(long)            *max, "in eosPThreadInit");
+       for(i=0; i<max; i++) {
+               t->status[i] = eosPThreadStatusWaiting;
+       }
+       for(i=0; i<max; i++) {
+               t->id[i] = 0;
+       }
+       t->count=0;
+       t->oldest=0;
+       t->latest=0;
+}

diff --git a/src/Objects/General/eosPThread/src/eosPThreadJoin.c b/src/Objects/General/eosPThread/src/eosPThreadJoin.c
new file mode 100644 (file)
index 0000000..cf6da69
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/eosPThreadJoin.c
@@ -0,0 +1,63 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosPThreadJoin ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosPThreadJoin 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosPThreadJoin ver%I%; Date:%D% %Z%";
+
+
+#include "../inc/eosPThread.h"
+
+void
+eosPThreadJoin(eosPThread* th, int i, int mode)
+{
+       int j;
+       int oldest;
+       int latest;
+
+       if(th->status[i] == eosPThreadStatusRunning) {
+               pthread_join(th->th[i], NULL);
+       } else {
+               return;
+       }
+       th->status[i] = eosPThreadStatusWaiting;
+       if(th->latest!=th->oldest) {
+               if(th->id[i]==th->oldest) {
+                       for(oldest=th->latest, j=0; j<th->max; j++) {
+                               if(th->status[j] == eosPThreadStatusRunning 
+                               && th->id[j]<oldest) {
+                                       oldest = th->id[j];
+                               }
+                       }
+                       th->oldest = oldest;
+               }
+               if(th->id[i]==th->latest) {
+                       for(latest=th->oldest, j=th->max-1; 0<=j; j--) {
+                               if(th->status[j] == eosPThreadStatusRunning 
+                               && latest<th->id[j]) {
+                                       latest = th->id[j];
+                               }
+                       }
+                       th->latest = latest;
+               }
+       } else {
+               th->latest = 0;
+               th->oldest = 0;
+       }
+}
+
+void
+eosPThreadJoinAll(eosPThread* th, int mode)
+{
+       int i;
+       for(i=0; i<th->max; i++) {
+               eosPThreadJoin(th, i, mode);
+       }
+}
+

diff --git a/src/Objects/General/eosPThread/src/eosPThreadMutex.c b/src/Objects/General/eosPThread/src/eosPThreadMutex.c
new file mode 100644 (file)
index 0000000..f9e11cb
--- /dev/null
+++ b/src/Objects/General/eosPThread/src/eosPThreadMutex.c
@@ -0,0 +1,61 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosPThreadMutex ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosPThreadMutex 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosPThreadMutex ver%I%; Date:%D% %Z%";
+
+#undef DEBUG 
+#include "genUtil.h"
+
+#include <pthread.h>
+#include "../inc/eosPThread.h"
+
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
+void
+eosPThreadMutexInit(eosPThread* t)
+{
+       pthread_mutex_init(&mutex, NULL);
+}
+
+void
+eosPThreadMutexLock(eosPThread* t)
+{
+       int ret;
+       ret = pthread_mutex_lock(&mutex);
+       DEBUGPRINT("LOCK\n");
+       switch(ret) {
+               case 0: {
+                       DEBUGPRINT("Success! MutexLock");
+                       break;
+               }
+               case EAGAIN: {
+                       DEBUGPRINT("The value specified by mutex is invalid.");
+                       perror("eosPThreadMutexLock");
+                       exit(EXIT_FAILURE);
+                       break;
+               }
+               case EDEADLK: {
+                       DEBUGPRINT("A deadlock would occur if the thread blocked waiting for mutex.");
+                       perror("eosPThreadMutexLock");
+                       exit(EXIT_FAILURE);
+                       break;
+               }
+       }
+}
+
+
+void
+eosPThreadMutexUnlock(eosPThread* t)
+{
+       pthread_mutex_unlock(&mutex);
+}
+
+

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 2b5f0c3..3238c47 100755 (executable)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -62,3 +62,6 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/rec3d/Makefile b/src/Tools/rec3d/Makefile
deleted file mode 100755 (executable)
index dfd525eab555f9091108b34834053d364b8bf0ad..0000000000000000000000000000000000000000
--- a/src/Tools/rec3d/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-all:
-       for dir in ${SOURCE} ; \
-       do \
-               if [ -d $${dir} ] ; then \
-                       $(CD) $${dir}; make all; $(CD) ..; \
-               fi \
-       done
-
-install:
-       for dir in ${SOURCE} ; \
-       do \
-               if [ -d $${dir} ] ; then \
-                       $(CD) $${dir}; make install; $(CD) ..; \
-               fi \
-       done
-
-put:
-       for dir in ${SOURCE} ; \
-       do \
-               if [ -d $${dir} ] ; then \
-                       $(CD) $${dir}; make put; $(CD) ..; \
-               fi \
-       done
-
-putSF:
-       if [ -f private ] ; then \
-               echo "$(WORLDNAME)/$(CLASSNAME) is private " ; \
-       else \
-               for dir in ${SOURCE} ; \
-               do \
-                       if [ -d $${dir} ] ; then \
-                               $(CD) $${dir}; make putSF; $(CD) ..; \
-                       fi \
-               done \
-       fi
-
-clean:
-       for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make clean; $(CD) ..; \
-       done
-
-check:
-       @for dir in ${SOURCE} ; do \
-               if [ -d $${dir} ] ; then \
-                       $(CD) $${dir}; \
-                       echo  $${dir}; \
-                       $(RM) Makefile; \
-                       $(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/Makefile Makefile ; \
-                       make check; \
-                       $(CD) ..; \
-               fi \
-       done
-
-depend: check
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make depend; $(CD) ..; \
-       done
-
-backup: 
-       cd ../../..; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
-       tar uvf ${EOS_HOME}/backup/EosBase.tar .[A-z]*
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make backup; $(CD) ..; \
-       done
-
-backup-all: 
-       cd ../../..; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
-       tar rvf ${EOS_HOME}/backup/EosBase.tar .[A-z]*
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make backup; $(CD) ..; \
-       done
-
-distribute: 
-       cd ../../..; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make distribute; $(CD) ..; \
-       done
-
-distribute-all: 
-       cd ../../..; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]*
-       @for dir in ${SOURCE} ; \
-       do \
-               $(CD) $${dir}; make distribute-all; $(CD) ..; \
-       done
-

diff --git a/src/Tools/rec3d/Makefile b/src/Tools/rec3d/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..1ea01f850fb1127724d429e930b00fa7e51f48e3
--- /dev/null
+++ b/src/Tools/rec3d/Makefile
@@ -0,0 +1 @@
+/Applications/Eos.app/Eos/src/Config/Template/ToolsClassTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/rec3d/mrc3Dto2D/Config/OptionControlFile b/src/Tools/rec3d/mrc3Dto2D/Config/OptionControlFile
index 75063de..1cdb1b7 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/Config/OptionControlFile
+++ b/src/Tools/rec3d/mrc3Dto2D/Config/OptionControlFile
@@ -1,12 +1,14 @@
 # OptionControlFile
 # FileFormat
-"-i","-i[nput]","InputDataFile","Essential","1","1","In","inFile","NULL"
-"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","NULL"
-"-Rot1","-Rot1","OutputDataFile","Optional","3","1","Rot1Start","Real","0.0","1","Rot1End","Real","360.0","3","Rot1Delta","Real","10"
-"-Rot2","-Rot2","OutputDataFile","Optional","3","1","Rot2Start","Real","0.0","1","Rot2End","Real","360.0","3","Rot2Delta","Real","10"
-"-Rot3","-Rot3","OutputDataFile","Optional","3","1","Rot3Start","Real","0.0","1","Rot3End","Real","360.0","3","Rot3Delta","Real","10"
+"-i","-i[nput]","Input: mrcImage[3D]","Essential","1","1","In","inFile","NULL"
+"-o","-o[utput]","Output: mrcImage[2D]","Optional","1","1","Out","outFile","NULL"
+"-fileList","-fileList","Output: mrcImage[2D] List ","Optional","3","1","filenamePrefix","String","2D","2","filenameSuffix","String","2d","3","filenameFormat","String","%s-%05d.%s"
+"-Rot1","-Rot1","OutputDataFile","Optional","3","1","Rot1Start","Real","0.0","2","Rot1End","Real","360.0","3","Rot1Delta","Real","10"
+"-Rot2","-Rot2","OutputDataFile","Optional","3","1","Rot2Start","Real","0.0","2","Rot2End","Real","360.0","3","Rot2Delta","Real","10"
+"-Rot3","-Rot3","OutputDataFile","Optional","3","1","Rot3Start","Real","0.0","2","Rot3End","Real","360.0","3","Rot3Delta","Real","10"
 "-EulerMode","-EulerMode","OutputDataFile","Optional","1","1","EulerMode","String","ZOYS"
 "-InterpolationMode","-InterpolationMode","OutputDataFile","Optional","1","1","InterpolationMode","Integer","1"
 "-AreaMode","-AreaMode","Cubic: 0, Globular: 1 ","Optional","1","1","AreaMode","Integer","0"
+"-pthread","-pthread","pthread: max","Optional","1","1","pthreadMax","Integer","1"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"

diff --git a/src/Tools/rec3d/mrc3Dto2D/Makefile b/src/Tools/rec3d/mrc3Dto2D/Makefile
deleted file mode 100755 (executable)
index cf583bda5caf22ea6b484fd2f57d17c251220e08..0000000000000000000000000000000000000000
--- a/src/Tools/rec3d/mrc3Dto2D/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-include ../../../Config/Define.inc
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-
-all:
-       cd src; make all; cd ..
-
-install:
-       cd src; make install; cd ..
-
-
-putSF:
-       if [ -f private ] ; \
-       then \
-               echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \
-       else \
-               cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \
-       fi
-
-put:
-       cd src; make put; cd ..
-
-clean:
-       cd src; make clean; cd ..
-
-depend:
-       cd src; make depend; cd ..
-
-check:
-       @if [ ! -d src/$(OSTYPE) ]; then \
-               echo making directory; \
-               mkdir src/$(OSTYPE); \
-       fi
-       @$(RM) src/Makefile
-       @echo "New src/Makefile" 
-       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
-       @cd src; touch $(OSTYPE)/.Depend; make depend
-
-cvsupdate::
-       cvs -d $(EOS_CVSROOT) update -d 
-
-cvscommit::
-       cvs -d $(EOS_CVSROOT) commit
-
-backup:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-
-backup-all:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-       
-distribute:
-       cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-       
-distribute-all:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-
-eosintroduce:
-       ${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ 
-
-include Config/Target.inc

diff --git a/src/Tools/rec3d/mrc3Dto2D/Makefile b/src/Tools/rec3d/mrc3Dto2D/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..4368038eca27ca1ed09381aefc869404db13f642
--- /dev/null
+++ b/src/Tools/rec3d/mrc3Dto2D/Makefile
@@ -0,0 +1 @@
+/Applications/Eos.app/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/rec3d/mrc3Dto2D/doc/Makefile b/src/Tools/rec3d/mrc3Dto2D/doc/Makefile
index e35804f..869c2ad 120000 (symlink)
--- a/src/Tools/rec3d/mrc3Dto2D/doc/Makefile
+++ b/src/Tools/rec3d/mrc3Dto2D/doc/Makefile
@@ -1 +1 @@
-/home/people/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file
+/Applications/Eos.app/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file

diff --git a/src/Tools/rec3d/mrc3Dto2D/inc/mrc3Dto2D.h b/src/Tools/rec3d/mrc3Dto2D/inc/mrc3Dto2D.h
index ecc9b8d..50c4ac4 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/inc/mrc3Dto2D.h
+++ b/src/Tools/rec3d/mrc3Dto2D/inc/mrc3Dto2D.h
@@ -21,6 +21,15 @@ typedef struct mrc3Dto2DInfo {
     char* Out;
     FILE* fptOut;
     
+    long flagfilenamePrefix;
+    char* filenamePrefix;
+    
+    long flagfilenameSuffix;
+    char* filenameSuffix;
+    
+    long flagfilenameFormat;
+    char* filenameFormat;
+    
     long flagRot1Start;
     float Rot1Start;
     
@@ -57,6 +66,9 @@ typedef struct mrc3Dto2DInfo {
     long flagAreaMode;
     long AreaMode;
     
+    long flagpthreadMax;
+    long pthreadMax;
+    
     long flagconfigFile;
     char* configFile;
     FILE* fptconfigFile;

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/.EosLog b/src/Tools/rec3d/mrc3Dto2D/src/.EosLog
index e457627..a5bf3e9 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/src/.EosLog
+++ b/src/Tools/rec3d/mrc3Dto2D/src/.EosLog
@@ -37,3 +37,21 @@ X86LINUX64/mrc3Dto2D -html
 I386LINUX/mrc3Dto2D -html 
 /home/people/tacyas/Eos/bin/X86LINUX64/mrc3Dto2D -h 
 X86LINUX64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 
+X86MAC64/mrc3Dto2D -html 

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/.co. b/src/Tools/rec3d/mrc3Dto2D/src/.co.
new file mode 100755 (executable)
index 0000000..9a3495a
--- /dev/null
+++ b/src/Tools/rec3d/mrc3Dto2D/src/.co.
@@ -0,0 +1,88 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% mrc3Dto2D ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : mrc3Dto2D
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%mrc3Dto2D ver%I%; Date:%D% %Z%";
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>                  
+#define GLOBAL_DECLARATION
+#include "../inc/config.h"
+
+#define DEBUG
+#include "genUtil.h"
+#include "Matrix3D.h"
+#include "Vector.h"
+#include "mrcImage.h"
+#include "lmrc3Dto2D.h"
+
+
+int
+main(int argc, char* argv[]) 
+{
+       mrc3Dto2DInfo info;
+       lmrc3Dto2DInfo linfo;
+       mrcImage in;
+       mrcImage out;
+
+       init0(&info);
+    argCheck(&info, argc, argv);
+    init1(&info);
+
+       DEBUGPRINT("Program Start\n");
+       mrcFileRead (&in, info.In, "in main", 0);
+       /* Rot1 */
+       linfo.Rot1Start = info.Rot1Start*RADIAN;
+       linfo.Rot1End   = info.Rot1End*RADIAN;
+       linfo.Rot1Delta = info.Rot1Delta*RADIAN;
+       linfo.nRot1     = MAX(1,(int)(fabs((linfo.Rot1End - linfo.Rot1Start)/linfo.Rot1Delta)+0.5)+1);
+       /* Rot2 */
+       linfo.Rot2Start = info.Rot2Start*RADIAN;
+       linfo.Rot2End   = info.Rot2End*RADIAN;
+       linfo.Rot2Delta = info.Rot2Delta*RADIAN;
+       linfo.nRot2     = MAX(1,(int)(fabs((linfo.Rot2End - linfo.Rot2Start)/linfo.Rot2Delta)+0.5)+1);
+       /* Rot3 */
+       linfo.Rot3Start = info.Rot3Start*RADIAN;
+       linfo.Rot3End   = info.Rot3End*RADIAN;
+       linfo.Rot3Delta = info.Rot3Delta*RADIAN;
+       linfo.nRot3     = MAX(1,(int)(fabs((linfo.Rot3End - linfo.Rot3Start)/linfo.Rot3Delta)+0.5)+1);
+       /* EulerAngleMode */
+       linfo.EulerAngleMode[0] = info.EulerMode[0];
+       linfo.EulerAngleMode[1] = info.EulerMode[1];
+       linfo.EulerAngleMode[2] = info.EulerMode[2];
+       linfo.EulerAngleMode[3] = info.EulerMode[3];
+       /* */
+       linfo.InterpolationMode  = info.InterpolationMode; 
+       linfo.AreaMode = info.AreaMode;
+
+       /* filelist*/
+       if(info.flagfilenamePrefix) {
+               linfo.flagFileList = 1;
+               linfo.filenamePrefix = info.filenamePrefix;
+               linfo.filenameSuffix = info.filenameSuffix;
+       } else {
+               linfo.flagFileList = 0;
+       }       
+       lmrcImage3Dto2D(&out, &in, &linfo, info.mode);
+
+       mrcFileWrite(&out, info.Out, "in main", 0);
+       exit(EXIT_SUCCESS);
+}
+
+void
+additionalUsage()
+{
+       fprintf(stderr, "----- Additional Usage -----\n");
+       fprintf(stderr, "----- Attention !!!!   -----\n");
+       fprintf(stderr, "-m 0: \n");
+       fprintf(stderr, "-m 1: Reduced Rotation Angle. If nRot3 = 1 and the axis of Rot2 is perpendicular to the 2D-image plane as z-axis, \n");
+       fprintf(stderr, "      you can reduce the number of projection images.\n");
+}

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/: b/src/Tools/rec3d/mrc3Dto2D/src/:
new file mode 100644 (file)
index 0000000..2ac0991
--- /dev/null
+++ b/src/Tools/rec3d/mrc3Dto2D/src/:
@@ -0,0 +1,104 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% mrc3Dto2D ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : mrc3Dto2D
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%mrc3Dto2D ver%I%; Date:%D% %Z%";
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>                  
+#define GLOBAL_DECLARATION
+#include "../inc/config.h"
+
+#define DEBUG
+#include "genUtil.h"
+#include "Matrix3D.h"
+#include "Vector.h"
+#include "mrcImage.h"
+#include "lmrc3Dto2D.h"
+#include "eosPThread.h"
+
+
+int
+main(int argc, char* argv[]) 
+{
+       mrc3Dto2DInfo info;
+       lmrc3Dto2DInfo linfo;
+       mrcImage in;
+       mrcImage out;
+
+       init0(&info);
+    argCheck(&info, argc, argv);
+    init1(&info);
+
+       DEBUGPRINT("Program Start\n");
+       mrcFileRead (&in, info.In, "in main", 0);
+       /* Rot1 */
+       linfo.Rot1Start = info.Rot1Start*RADIAN;
+       linfo.Rot1End   = info.Rot1End*RADIAN;
+       linfo.Rot1Delta = info.Rot1Delta*RADIAN;
+       linfo.nRot1     = MAX(1,(int)(fabs((linfo.Rot1End - linfo.Rot1Start)/linfo.Rot1Delta)+0.5)+1);
+       /* Rot2 */
+       linfo.Rot2Start = info.Rot2Start*RADIAN;
+       linfo.Rot2End   = info.Rot2End*RADIAN;
+       linfo.Rot2Delta = info.Rot2Delta*RADIAN;
+       linfo.nRot2     = MAX(1,(int)(fabs((linfo.Rot2End - linfo.Rot2Start)/linfo.Rot2Delta)+0.5)+1);
+       /* Rot3 */
+       linfo.Rot3Start = info.Rot3Start*RADIAN;
+       linfo.Rot3End   = info.Rot3End*RADIAN;
+       linfo.Rot3Delta = info.Rot3Delta*RADIAN;
+       linfo.nRot3     = MAX(1,(int)(fabs((linfo.Rot3End - linfo.Rot3Start)/linfo.Rot3Delta)+0.5)+1);
+       /* EulerAngleMode */
+       linfo.EulerAngleMode[0] = info.EulerMode[0];
+       linfo.EulerAngleMode[1] = info.EulerMode[1];
+       linfo.EulerAngleMode[2] = info.EulerMode[2];
+       linfo.EulerAngleMode[3] = info.EulerMode[3];
+       linfo.EulerAngleMode[4] = '\0';
+       /* */
+       linfo.InterpolationMode  = info.InterpolationMode; 
+       linfo.AreaMode = info.AreaMode;
+
+       /* filelist*/
+       if(info.flagfilenamePrefix) {
+               linfo.flagFileList = 1;
+               linfo.filenamePrefix = info.filenamePrefix;
+               linfo.filenameSuffix = info.filenameSuffix;
+               linfo.filenameNumberFormat = info.filenameFormat;
+       } else {
+               linfo.flagFileList = 0;
+       }       
+
+       /* pthread */
+       __eosPThread__    = info.flagpthreadMax;        
+       __eosPThreadNum__ = info.pthreadMax;    
+
+
+       lmrcImage3Dto2D(&out, &in, &linfo, info.mode);
+
+       if(info.flagfilenamePrefix) {
+               DEBUGPRINT("FileLIST OUT: NO ACTION\n");
+       } 
+
+       if(info.flagOut) {
+               DEBUGPRINT("OUT: mrcFileWrite\n");
+               mrcFileWrite(&out, info.Out, "in main", 0);
+       }
+       exit(EXIT_SUCCESS);
+}
+
+void
+additionalUsage()
+{
+       fprintf(stderr, "----- Additional Usage -----\n");
+       fprintf(stderr, "----- Attention !!!!   -----\n");
+       fprintf(stderr, "-m 0: \n");
+       fprintf(stderr, "-m 1: Reduced Rotation Angle. If nRot3 = 1 and the axis of Rot2 is perpendicular to the 2D-image plane as z-axis, \n");
+       fprintf(stderr, "      you can reduce the number of projection images.\n");
+}

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/Makefile b/src/Tools/rec3d/mrc3Dto2D/src/Makefile
index 82ced53..a547c12 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/src/Makefile
+++ b/src/Tools/rec3d/mrc3Dto2D/src/Makefile
@@ -70,19 +70,19 @@ cudagdb: $(OSTYPE)/$(OBJECTNAME).cudagdb
 
 
 $(OSTYPE)/$(OBJECTNAME)::
-       $(RM) -f $(OSTYPE)/Makefile ; \
+       @$(RM) -f $(OSTYPE)/Makefile ; \
        $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
        cd $(OSTYPE); \
        $(MAKE) $(OBJECTNAME)  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
 
 $(OSTYPE)/$(OBJECTNAME).debug::
-       $(RM) -f Makefile ; \
+       @$(RM) -f Makefile ; \
        $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
        cd $(OSTYPE); \
        $(MAKE) $(OBJECTNAME).debug  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
 
 $(OSTYPE)/$(OBJECTNAME).cudagdb::
-       $(RM) -f Makefile ; \
+       @$(RM) -f Makefile ; \
        $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
        cd $(OSTYPE); \
        $(MAKE) $(OBJECTNAME).cudagdb WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/argCheck.c b/src/Tools/rec3d/mrc3Dto2D/src/argCheck.c
index e08f76c..04371a8 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/src/argCheck.c
+++ b/src/Tools/rec3d/mrc3Dto2D/src/argCheck.c
@@ -50,6 +50,23 @@ argCheck(mrc3Dto2DInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("fileList") {
+                    if(i+3<argc) {
+                        info->filenamePrefix = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagfilenamePrefix++;
+                        info->filenameSuffix = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagfilenameSuffix++;
+                        info->filenameFormat = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagfilenameFormat++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("Rot1") {
                     if(i+3<argc) {
                         info->Rot1Start = stringGetNthRealData(argv[i+1], 1, " ,");
@@ -134,6 +151,17 @@ argCheck(mrc3Dto2DInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("pthread") {
+                    if(i+1<argc) {
+                        info->pthreadMax = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagpthreadMax++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("c") {
                     if(i+1<argc) {
                         info->configFile = stringGetNthWord(argv[i+1], 1, " ,");

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/init.c b/src/Tools/rec3d/mrc3Dto2D/src/init.c
index 41abd71..0f1b307 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/src/init.c
+++ b/src/Tools/rec3d/mrc3Dto2D/src/init.c
@@ -14,6 +14,9 @@ init0(mrc3Dto2DInfo* info)
 {
     info->fptIn = NULL;    info->flagIn = 0;
     info->fptOut = NULL;    info->flagOut = 0;
+    info->filenamePrefix = stringGetNthWord("2D", 1, "\0");    info->flagfilenamePrefix = 0;
+    info->filenameSuffix = stringGetNthWord("2d", 1, "\0");    info->flagfilenameSuffix = 0;
+    info->filenameFormat = stringGetNthWord("%s-%05d.%s", 1, "\0");    info->flagfilenameFormat = 0;
     info->Rot1Start = 0.0;    info->flagRot1Start = 0;
     info->Rot1End = 360.0;    info->flagRot1End = 0;
     info->Rot1Delta = 10;    info->flagRot1Delta = 0;
@@ -26,6 +29,7 @@ init0(mrc3Dto2DInfo* info)
     info->EulerMode = stringGetNthWord("ZOYS", 1, "\0");    info->flagEulerMode = 0;
     info->InterpolationMode = 1;    info->flagInterpolationMode = 0;
     info->AreaMode = 0;    info->flagAreaMode = 0;
+    info->pthreadMax = 1;    info->flagpthreadMax = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
 }
@@ -44,15 +48,19 @@ init1(mrc3Dto2DInfo* info)
         info->fptIn = fileOpen(info->In, "r");
     }
     
-    if(!info->flagOut) {
-        stringGetFromFile(s, "Out", stdin, stdout, 0);
-        info->Out = stringGetNthWord(s, 1, " ,\t");
-        info->flagOut++;
-    }
     if(info->flagOut) {
         info->fptOut = fileOpen(info->Out, "w");
     }
     
+    if(info->flagfilenamePrefix) {
+    }
+    
+    if(info->flagfilenameSuffix) {
+    }
+    
+    if(info->flagfilenameFormat) {
+    }
+    
     if(info->flagRot1Start) {
     }
     
@@ -89,6 +97,9 @@ init1(mrc3Dto2DInfo* info)
     if(info->flagAreaMode) {
     }
     
+    if(info->flagpthreadMax) {
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.c b/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.c
index 6ab94f5..2ac0991 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.c
+++ b/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.c
@@ -23,6 +23,7 @@ static char __sccs_id[] = "%Z%mrc3Dto2D ver%I%; Date:%D% %Z%";
 #include "Vector.h"
 #include "mrcImage.h"
 #include "lmrc3Dto2D.h"
+#include "eosPThread.h"
 
 
 int
@@ -59,12 +60,36 @@ main(int argc, char* argv[])
        linfo.EulerAngleMode[1] = info.EulerMode[1];
        linfo.EulerAngleMode[2] = info.EulerMode[2];
        linfo.EulerAngleMode[3] = info.EulerMode[3];
+       linfo.EulerAngleMode[4] = '\0';
        /* */
        linfo.InterpolationMode  = info.InterpolationMode; 
        linfo.AreaMode = info.AreaMode;
+
+       /* filelist*/
+       if(info.flagfilenamePrefix) {
+               linfo.flagFileList = 1;
+               linfo.filenamePrefix = info.filenamePrefix;
+               linfo.filenameSuffix = info.filenameSuffix;
+               linfo.filenameNumberFormat = info.filenameFormat;
+       } else {
+               linfo.flagFileList = 0;
+       }       
+
+       /* pthread */
+       __eosPThread__    = info.flagpthreadMax;        
+       __eosPThreadNum__ = info.pthreadMax;    
+
+
        lmrcImage3Dto2D(&out, &in, &linfo, info.mode);
 
-       mrcFileWrite(&out, info.Out, "in main", 0);
+       if(info.flagfilenamePrefix) {
+               DEBUGPRINT("FileLIST OUT: NO ACTION\n");
+       } 
+
+       if(info.flagOut) {
+               DEBUGPRINT("OUT: mrcFileWrite\n");
+               mrcFileWrite(&out, info.Out, "in main", 0);
+       }
        exit(EXIT_SUCCESS);
 }
 

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.html b/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.html
index 0e13bd0..3711c0e 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.html
+++ b/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.html
@@ -8,14 +8,16 @@
 <PRE>
 Usage: mrc3Dto2D
 Options:
-    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile
-    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile
+    [-i[nput]            In                  (NULL      )] :Essential :Input: mrcImage[3D]
+    [-o[utput]           Out                 (NULL      )] :Optional  :Output: mrcImage[2D]
+    [-fileList           filenamePrefix      (2D        )filenameSuffix      (2d        )filenameFormat      (%s-%05d.%s)] :Optional  :Output: mrcImage[2D] List 
     [-Rot1               Rot1Start           (0.0       )Rot1End             (360.0     )Rot1Delta           (10        )] :Optional  :OutputDataFile
     [-Rot2               Rot2Start           (0.0       )Rot2End             (360.0     )Rot2Delta           (10        )] :Optional  :OutputDataFile
     [-Rot3               Rot3Start           (0.0       )Rot3End             (360.0     )Rot3Delta           (10        )] :Optional  :OutputDataFile
     [-EulerMode          EulerMode           (ZOYS      )] :Optional  :OutputDataFile
     [-InterpolationMode  InterpolationMode   (1         )] :Optional  :OutputDataFile
     [-AreaMode           AreaMode            (0         )] :Optional  :Cubic: 0, Globular: 1 
+    [-pthread            pthreadMax          (1         )] :Optional  :pthread: max
     [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         )] :Optional  :Mode
 ----- Additional Usage -----

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.pane b/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.pane
index 7158d0b..4d743fa 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.pane
+++ b/src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.pane
@@ -7,16 +7,18 @@
         -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOS/bin/mrc3Dto2D
         -H 1  5x1+41+0 'Help' 'help page' $EOS/src/Tools/rec3d/mrc3Dto2D/doc/mrc3Dto2D.doc help
         -Q 1 0 5.25x1+47+0 'Close'
-        -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'InputDataFile' i
-        -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'OutputDataFile' o
-        -I  1 0 0 1 0 1 -1x1+1+4 ' ' '0.0' 'Rot1Start' OutputDataFile
-        -I  1 0 0 1 0 1 -1x1+1+6 ' ' '0.0' 'Rot2Start' OutputDataFile
-        -I  1 0 0 1 0 1 -1x1+1+7 ' ' '0.0' 'Rot3Start' OutputDataFile
-        -s 1 0 1 0 0 -1x1+1+9.000000 0 0 0 0 0 'EulerMode' 'OutputDataFile' EulerMode
-        -i 1 0 1 0 0 -1x1+1+10.500000 0 0 1 0 0 'InterpolationMode' 'OutputDataFile' InterpolationMode
-        -i 1 0 1 0 0 -1x1+1+12.000000 0 0 0 0 0 'AreaMode' 'Cubic: 0, Globular: 1 ' AreaMode
-        -I 1 0 1 0 0 1 -1x1+1+13.500000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+15.000000 0 0 0 0 0 'mode' 'Mode' m
+        -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'Input: mrcImage[3D]' i
+        -O 1 0 1 0 0 1 -1x1+1+3.000000 ' ' 'Out' 'Output: mrcImage[2D]' o
+        -I  1 0 0 1 0 1 -1x1+1+4 ' ' '2D' 'filenamePrefix' Output: mrcImage[2D] List 
+        -I  1 0 0 1 0 1 -1x1+1+6 ' ' '0.0' 'Rot1Start' OutputDataFile
+        -I  1 0 0 1 0 1 -1x1+1+7 ' ' '0.0' 'Rot2Start' OutputDataFile
+        -I  1 0 0 1 0 1 -1x1+1+9 ' ' '0.0' 'Rot3Start' OutputDataFile
+        -s 1 0 1 0 0 -1x1+1+10.500000 0 0 0 0 0 'EulerMode' 'OutputDataFile' EulerMode
+        -i 1 0 1 0 0 -1x1+1+12.000000 0 0 1 0 0 'InterpolationMode' 'OutputDataFile' InterpolationMode
+        -i 1 0 1 0 0 -1x1+1+13.500000 0 0 0 0 0 'AreaMode' 'Cubic: 0, Globular: 1 ' AreaMode
+        -i 1 0 1 0 0 -1x1+1+15.000000 0 0 1 0 0 'pthreadMax' 'pthread: max' pthread
+        -I 1 0 1 0 0 1 -1x1+1+16.500000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+18.000000 0 0 0 0 0 'mode' 'Mode' m
     -E
   -E
 -E

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/test/.EosLog b/src/Tools/rec3d/mrc3Dto2D/src/test/.EosLog
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/test/Makefile b/src/Tools/rec3d/mrc3Dto2D/src/test/Makefile
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/usage.c b/src/Tools/rec3d/mrc3Dto2D/src/usage.c
index 06d5d89..a315651 100755 (executable)
--- a/src/Tools/rec3d/mrc3Dto2D/src/usage.c
+++ b/src/Tools/rec3d/mrc3Dto2D/src/usage.c
@@ -7,14 +7,16 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile\n");
+    fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Essential :Input: mrcImage[3D]\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Optional  :Output: mrcImage[2D]\n");
+    fprintf(stderr, "    [-fileList           filenamePrefix      (2D        )filenameSuffix      (2d        )filenameFormat      (%%s-%%05d.%%s)] :Optional  :Output: mrcImage[2D] List \n");
     fprintf(stderr, "    [-Rot1               Rot1Start           (0.0       )Rot1End             (360.0     )Rot1Delta           (10        )] :Optional  :OutputDataFile\n");
     fprintf(stderr, "    [-Rot2               Rot2Start           (0.0       )Rot2End             (360.0     )Rot2Delta           (10        )] :Optional  :OutputDataFile\n");
     fprintf(stderr, "    [-Rot3               Rot3Start           (0.0       )Rot3End             (360.0     )Rot3Delta           (10        )] :Optional  :OutputDataFile\n");
     fprintf(stderr, "    [-EulerMode          EulerMode           (ZOYS      )] :Optional  :OutputDataFile\n");
     fprintf(stderr, "    [-InterpolationMode  InterpolationMode   (1         )] :Optional  :OutputDataFile\n");
     fprintf(stderr, "    [-AreaMode           AreaMode            (0         )] :Optional  :Cubic: 0, Globular: 1 \n");
+    fprintf(stderr, "    [-pthread            pthreadMax          (1         )] :Optional  :pthread: max\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
     additionalUsage();