to CUDA static libraries:

	modified:   hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFFT
	modified:   hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
	modified:   hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a
	modified:   hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageShrink.sharedo
	modified:   hostdepend/X86LINUX64/src/Objects/DataExpress/TclTk/src/X86LINUX64/libTclTk.a
	modified:   hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a
	modified:   hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a
	modified:   hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageShrink.sharedo
	modified:   hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64/mrcImageFFT
	modified:   hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageShrink/src/X86LINUX64/mrcImageShrink
	modified:   hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbRotation/src/X86LINUX64/pdbRotation
	new file:   hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbTrans/src/X86LINUX64/pdbTrans
	modified:   src/Config/x86Linux64.inc
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageShrink.c
	modified:   src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
	new file:   src/Tools/mrcImage/mrcImageShrink/src/test/data
	modified:   src/Tools/pdbUtil/pdbRotation/Config/Define.inc
	modified:   src/Tools/pdbUtil/pdbTrans/Config/Define.inc
	new file:   src/Tools/pdbUtil/pdbTrans/src/test/data

diff --git a/bin/wish/Display2/tclIndex b/bin/wish/Display2/tclIndex
index 75a715a..e727737 100644 (file)
--- a/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@ -6,41 +6,38 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
-set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
+set auto_index(roiAreaRotateStart) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(roiAreaRotateMotion) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(roiAreaRotateEnd) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(rectangleRotate) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(rectangleRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
 set auto_index(colormapChange) [list source [file join $dir Display2Colormap.wish]]
-set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
-set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
-set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]]
-set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]]
-set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]]
-set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]]
-set auto_index(mrcImageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(imageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(layerLineInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(projectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(sectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
-set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
 set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]]
+set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
+set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
+set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
+set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
+set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]]
+set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
 set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]]
@@ -49,14 +46,38 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR
 set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
+set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
+set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]]
 set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]]
-set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
-set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
-set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
-set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]]
+set auto_index(mrcImageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(imageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(layerLineInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(projectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(sectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
+set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
+set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
 set auto_index(roiAreaCreateStart) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(roiAreaCreateMotion) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(roiAreaCreateEnd) [list source [file join $dir RoiAreaCreate.wish]]
@@ -74,54 +95,29 @@ set auto_index(roiSplineEnd) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(splineCreate) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(knobShow) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(knobHide) [list source [file join $dir RoiAreaCreate.wish]]
-set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
-set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
-set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]]
+set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
+set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]]
+set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]]
+set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]]
 set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]]
-set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(roiAreaRotateStart) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(roiAreaRotateMotion) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(roiAreaRotateEnd) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(rectangleRotate) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(rectangleRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
-set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
-set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
-set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
 set auto_index(sectionInit) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionRecreateAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionRecreate) [list source [file join $dir SectionUtil.wish]]
@@ -130,5 +126,9 @@ set auto_index(sectionCreate) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
-set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
-set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
+set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
+set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
+set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFFT b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFFT
index 4df86b2..9db0123 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFFT and b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFFT differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
index 31c3e8f..5837892 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a
index 8bacea5..6f46d45 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageShrink.sharedo b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageShrink.sharedo
index 117b17d..b725532 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageShrink.sharedo and b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageShrink.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataExpress/TclTk/src/X86LINUX64/libTclTk.a b/hostdepend/X86LINUX64/src/Objects/DataExpress/TclTk/src/X86LINUX64/libTclTk.a
index c0ae2c9..77eadb3 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataExpress/TclTk/src/X86LINUX64/libTclTk.a and b/hostdepend/X86LINUX64/src/Objects/DataExpress/TclTk/src/X86LINUX64/libTclTk.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a
index 8bacea5..6f46d45 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a
index fb17b4e..2a9e08a 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageShrink.sharedo b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageShrink.sharedo
index 117b17d..b725532 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageShrink.sharedo and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageShrink.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64/mrcImageFFT b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64/mrcImageFFT
index 4df86b2..9db0123 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64/mrcImageFFT and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64/mrcImageFFT differ

diff --git a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageShrink/src/X86LINUX64/mrcImageShrink b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageShrink/src/X86LINUX64/mrcImageShrink
index 2f22058..b732c4e 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageShrink/src/X86LINUX64/mrcImageShrink and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageShrink/src/X86LINUX64/mrcImageShrink differ

diff --git a/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbRotation/src/X86LINUX64/pdbRotation b/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbRotation/src/X86LINUX64/pdbRotation
index 3e9c31f..8be79a0 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbRotation/src/X86LINUX64/pdbRotation and b/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbRotation/src/X86LINUX64/pdbRotation differ

diff --git a/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbTrans/src/X86LINUX64/pdbTrans b/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbTrans/src/X86LINUX64/pdbTrans
new file mode 100755 (executable)
index 0000000..4dcdb7b
Binary files /dev/null and b/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbTrans/src/X86LINUX64/pdbTrans differ

diff --git a/src/Config/x86Linux64.inc b/src/Config/x86Linux64.inc
index fa29709..981f547 100755 (executable)
--- a/src/Config/x86Linux64.inc
+++ b/src/Config/x86Linux64.inc
@@ -253,7 +253,7 @@ NVCCOPTSCUDAGDB = --host-compilation='C++' --use_fast_math -g -G \
 INCCUDA = -I$(EOS_HOME)/util/$(OSTYPE)/cuda/inc -I$(EOS_HOME)/util/$(OSTYPE)/cuda/NVIDIA_CUDA_SDK/inc -I$(EOS_HOME)/util/$(OSTYPE)/cuda/include
 
 #LIBCUDA = -L$(EOS_HOME)/util/$(OSTYPE)/cuda/NVIDIA_CUDA_SDK/common/lib -L$(EOS_HOME)/util/$(OSTYPE)/cuda/NVIDIA_CUDA_SDK/lib -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib -lcudart -lcutil -lcufft
-LIBCUDA = -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -lcudart -lcufft
+LIBCUDA = -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -lcudart_static -lcufft
 
 #HOSTDEPENDENTLIB += $(LIBCUDA)
 

diff --git a/src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log b/src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log
index 03eff65..9ebf653 100755 (executable)
--- a/src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log
+++ b/src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log
@@ -1,4 +1,4 @@
-have_library: checking for main() in -lGL... -------------------- yes
+have_library: checking for main() in -lGL... -------------------- no
 
 "gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic     -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static  -lpthread -lrt -ldl -lcrypt -lm   -lc"
 /home/people/tacyas/Eos/util/X86LINUX64/lib/ruby/1.9.1/mkmf.rb:305: warning: Insecure world writable dir /net/fs08/workFS08 in PATH, mode 040777
@@ -19,150 +19,8 @@ checked program was:
 5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
 /* end */
 
---------------------
-
-have_library: checking for main() in -lGLU... -------------------- yes
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -lglut... -------------------- yes
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -ltcl... -------------------- yes
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -lglut -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -ltcl -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -ltk... -------------------- yes
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -ltcl -lglut -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -ltk -ltcl -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -lBLT... -------------------- yes
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -ltk -ltcl -lglut -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lBLT -ltk -ltcl -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -lasound... -------------------- yes
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -lBLT -ltk -ltcl -lglut -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -lgif... -------------------- yes
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lgif -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -lfftw3f... -------------------- yes
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -lgif -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lfftw3f -lgif -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -lnr... -------------------- yes
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -lfftw3f -lgif -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lnr -lfftw3f -lgif -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -lnl... -------------------- no
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -lnr -lfftw3f -lgif -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lnl -lnr -lfftw3f -lgif -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-/usr/bin/ld: cannot find -lnl
-collect2: ld はステータス 1 で終了しました
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
-"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic    -lnr -lfftw3f -lgif -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lnl -lnr -lfftw3f -lgif -lasound -lBLT -ltk -ltcl -lglut -lGLU -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-/usr/bin/ld: cannot find -lnl
+"gcc -o conftest -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/x86_64-linux -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1/ruby/backward -I/home/people/tacyas/Eos/util/X86LINUX64/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long conftest.c  -L. -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic     -Wl,-R -Wl,/home/people/tacyas/Eos/util/X86LINUX64/lib -L/home/people/tacyas/Eos/util/X86LINUX64/lib -lruby-static -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+/usr/bin/ld: cannot find -lGL
 collect2: ld はステータス 1 で終了しました
 checked program was:
 /* begin */

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageShrink.c b/src/Objects/DataManip/mrcImage/src/lmrcImageShrink.c
index c2e3e4a..ddeac80 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageShrink.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageShrink.c
@@ -34,29 +34,29 @@ lmrcImageShrink(mrcImage* dst, mrcImage* src, mrcImageParaTypeIntegerCoord S, lo
        dst->HeaderLength.z = src->HeaderLength.y*S.z;
        mrcInit(dst, NULL);
 
+       for(z=0; z<dst->HeaderN.z; z++) {
+       for(y=0; y<dst->HeaderN.y; y++) {
        for(x=0; x<dst->HeaderN.x; x++) {
-         for(y=0; y<dst->HeaderN.y; y++) {
-           for(z=0; z<dst->HeaderN.z; z++) {
-             mrcPixelDataSet(dst, x, y, z, 0.0, mrcPixelMag);
-           }
-         }
+               mrcPixelDataSet(dst, x, y, z, 0.0, mrcPixelRePart);
+       }
+       }
        }
-       for(x=0; x<dst->HeaderN.x ; x++) {
-         for(y=0; y<dst->HeaderN.y; y++) {
-           for(z=0; z<dst->HeaderN.z; z++) {
-             sum = 0.0;
-             for(srcx = x*S.x; srcx < (x+1)*S.x; srcx++) { 
+       for(z=0; z<dst->HeaderN.z; z++) {
+       for(y=0; y<dst->HeaderN.y; y++) {
+       for(x=0; x<dst->HeaderN.x; x++) {
+               sum = 0.0;
+               for(srcz = z*S.z; srcz < (z+1)*S.z; srcz++) { 
                for(srcy = y*S.y; srcy < (y+1)*S.y; srcy++) { 
-                 for(srcz = z*S.z; srcz < (z+1)*S.z; srcz++) { 
-                   mrcPixelDataGet(src, (float)srcx, (float)srcy, (float)srcz, &data, mrcPixelMag, mrcPixelHowNearest);
+           for(srcx = x*S.x; srcx < (x+1)*S.x; srcx++) { 
+                   mrcPixelDataGet(src, (float)srcx, (float)srcy, (float)srcz, &data, mrcPixelRePart, mrcPixelHowNearest);
                    sum += data;
-                 }
+               }
                }               
-             }
-             sum = sum/((double)(S.x * S.y * S.z));
-             mrcPixelDataSet(dst, (float)x, (float)y, (float)z, sum, mrcPixelMag);
            }
-         }
+           sum = sum/((double)(S.x * S.y * S.z));
+           mrcPixelDataSet(dst, (float)x, (float)y, (float)z, sum, mrcPixelRePart);
+       }
+       }
        }
 }
 

diff --git a/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc b/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
index 13a9841..246489c 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
+++ b/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
@@ -1,6 +1,4 @@
 OBJECTNAME = mrcImageFFT
-EXTRA_LIB  = -L${CUDA_ROOT}/lib64 -lcudart 
-#EXTRA_LIB  = -L${CUDA_ROOT}/lib64 -lcudart -lcufftw
-#EXTRA_LIB  = 
-EXTRA_CCOPTS =
+EXTRA_LIB  = ${LIBCUDA}
+EXTRA_CCOPTS = -I${CUDA_ROOT}/include
 EXTRA_INC =

diff --git a/src/Tools/mrcImage/mrcImageShrink/src/test/Makefile b/src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
new file mode 100644 (file)
index 0000000..323c2db
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
@@ -0,0 +1,17 @@
+include ../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../../../Config/Define.inc
+include ../../../../../Config/Define.inc
+
+all: help exec
+
+help:
+       @echo "----- Help Message Check -----"
+       @../$(OSTYPE)/$(OBJECTNAME)      -h
+
+exec:
+       @echo "----- Execution Check -----"
+       ../$(OSTYPE)/$(OBJECTNAME) 
+       @echo "----- Calc check -----"          
+
+clean:

diff --git a/src/Tools/mrcImage/mrcImageShrink/src/test/data b/src/Tools/mrcImage/mrcImageShrink/src/test/data
new file mode 120000 (symlink)
index 0000000..b1e4bd2
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageShrink/src/test/data
@@ -0,0 +1 @@
+../../../../../..//data/mrcImageShrink
\ No newline at end of file

diff --git a/src/Tools/pdbUtil/pdbRotation/Config/Define.inc b/src/Tools/pdbUtil/pdbRotation/Config/Define.inc
index f91cda8..8509c97 100755 (executable)
--- a/src/Tools/pdbUtil/pdbRotation/Config/Define.inc
+++ b/src/Tools/pdbUtil/pdbRotation/Config/Define.inc
@@ -1,4 +1,4 @@
 OBJECTNAME = pdbRotation
-EXTRA_LIB  = -L${CUDA_ROOT}/lib64 -lcudart 
+EXTRA_LIB  = ${LIBCUDA}
 EXTRA_CCOPTS = -I${CUDA_ROOT}/include
 EXTRA_INC =

diff --git a/src/Tools/pdbUtil/pdbTrans/Config/Define.inc b/src/Tools/pdbUtil/pdbTrans/Config/Define.inc
index 6381566..2502620 100755 (executable)
--- a/src/Tools/pdbUtil/pdbTrans/Config/Define.inc
+++ b/src/Tools/pdbUtil/pdbTrans/Config/Define.inc
@@ -1 +1,4 @@
 OBJECTNAME = pdbTrans
+EXTRA_LIB  = ${LIBCUDA}
+EXTRA_CCOPTS = -I${CUDA_ROOT}/include
+EXTRA_INC =

diff --git a/src/Tools/pdbUtil/pdbTrans/src/test/121p-trans.pdb b/src/Tools/pdbUtil/pdbTrans/src/test/121p-trans.pdb
deleted file mode 100755 (executable)
index 2cdf422..0000000
--- a/src/Tools/pdbUtil/pdbTrans/src/test/121p-trans.pdb
+++ /dev/null
@@ -1,70 +0,0 @@
-ATOM      1  N   MET     1      -6.176  34.630  -3.655  1.00 14.06   0  121P 104
-                                                                                
-ATOM      2  CA  MET     1      -4.913  33.928  -3.676  1.00 17.27   0  121P 105
-                                                                                
-ATOM      3  C   MET     1      -4.903  32.860  -2.600  1.00 16.41   0  121P 106
-                                                                                
-ATOM      4  O   MET     1      -5.703  32.881  -1.654  1.00 16.12   0  121P 107
-                                                                                
-ATOM      5  CB  MET     1      -3.712  34.869  -3.415  1.00 17.94   0  121P 108
-                                                                                
-ATOM      6  CG  MET     1      -3.594  35.420  -1.990  1.00 19.41   0  121P 109
-                                                                                
-ATOM      7  SD  MET     1      -2.193  36.558  -1.899  1.00 21.82   0  121P 110
-                                                                                
-ATOM      8  CE  MET     1      -3.325  37.886  -1.618  1.00 23.68   0  121P 111
-                                                                                
-ATOM      9  N   THR     2      -3.966  31.934  -2.760  1.00 15.08   0  121P 112
-                                                                                
-ATOM     10  CA  THR     2      -3.759  30.930  -1.751  1.00 16.71   0  121P 113
-                                                                                
-ATOM     11  C   THR     2      -3.312  31.597  -0.441  1.00 16.63   0  121P 114
-                                                                                
-ATOM     12  O   THR     2      -2.423  32.479  -0.406  1.00 17.08   0  121P 115
-                                                                                
-ATOM     13  CB  THR     2      -2.707  29.952  -2.310  1.00 16.63   0  121P 116
-                                                                                
-ATOM     14  OG1 THR     2      -3.298  29.397  -3.486  1.00 20.57   0  121P 117
-                                                                                
-ATOM     15  CG2 THR     2      -2.318  28.861  -1.361  1.00 15.26   0  121P 118
-                                                                                
-ATOM     16  N   GLU     3      -3.956  31.200   0.639  1.00 16.48   0  121P 119
-                                                                                
-ATOM     17  CA  GLU     3      -3.531  31.674   1.938  1.00 19.32   0  121P 120
-                                                                                
-ATOM     18  C   GLU     3      -3.016  30.444   2.698  1.00 18.43   0  121P 121
-                                                                                
-ATOM     19  O   GLU     3      -3.525  29.315   2.498  1.00 18.03   0  121P 122
-                                                                                
-ATOM     20  CB  GLU     3      -4.690  32.302   2.688  1.00 21.18   0  121P 123
-                                                                                
-ATOM     21  CG  GLU     3      -5.329  33.456   1.891  1.00 26.05   0  121P 124
-                                                                                
-ATOM     22  CD  GLU     3      -6.235  34.429   2.654  1.00 28.96   0  121P 125
-                                                                                
-ATOM     23  OE1 GLU     3      -6.498  34.239   3.846  1.00 30.26   0  121P 126
-                                                                                
-ATOM     24  OE2 GLU     3      -6.662  35.416   2.052  1.00 31.23   0  121P 127
-                                                                                
-ATOM     26  CA  TYR     4      -1.465  29.513   4.336  1.00 15.13   0  121P 129
-                                                                                
-ATOM     27  C   TYR     4      -1.582  29.972   5.788  1.00 14.74   0  121P 130
-                                                                                
-ATOM     28  O   TYR     4      -1.028  31.008   6.186  1.00 13.18   0  121P 131
-                                                                                
-ATOM     29  CB  TYR     4      -0.024  29.210   3.979  1.00 14.62   0  121P 132
-                                                                                
-ATOM     30  CG  TYR     4       0.179  28.708   2.556  1.00 14.92   0  121P 133
-                                                                                
-ATOM     31  CD1 TYR     4      -0.082  27.378   2.277  1.00 14.30   0  121P 134
-                                                                                
-ATOM     32  CD2 TYR     4       0.642  29.561   1.563  1.00 15.17   0  121P 135
-                                                                                
-ATOM     33  CE1 TYR     4       0.125  26.904   0.999  1.00 15.20   0  121P 136
-                                                                                
-ATOM     34  CE2 TYR     4       0.851  29.092   0.275  1.00 12.99   0  121P 137
-                                                                                
-ATOM     35  CZ  TYR     4       0.584  27.766   0.021  1.00 14.46   0  121P 138
-                                                                                
-ATOM     36  OH  TYR     4       0.720  27.278  -1.241  1.00 12.37   0  121P 139
-                                                                                

diff --git a/src/Tools/pdbUtil/pdbTrans/src/test/121p-trans.pdb.tst b/src/Tools/pdbUtil/pdbTrans/src/test/121p-trans.pdb.tst
deleted file mode 100644 (file)
index 5eb4bf9..0000000
--- a/src/Tools/pdbUtil/pdbTrans/src/test/121p-trans.pdb.tst
+++ /dev/null
@@ -1,35 +0,0 @@
-ATOM      1  N   MET     1      -6.176  34.630  -3.655  1.00 14.06   0  121P 104
-ATOM      2  CA  MET     1      -4.913  33.928  -3.676  1.00 17.27   0  121P 105
-ATOM      3  C   MET     1      -4.903  32.860  -2.600  1.00 16.41   0  121P 106
-ATOM      4  O   MET     1      -5.703  32.881  -1.654  1.00 16.12   0  121P 107
-ATOM      5  CB  MET     1      -3.712  34.869  -3.415  1.00 17.94   0  121P 108
-ATOM      6  CG  MET     1      -3.594  35.420  -1.990  1.00 19.41   0  121P 109
-ATOM      7  SD  MET     1      -2.193  36.558  -1.899  1.00 21.82   0  121P 110
-ATOM      8  CE  MET     1      -3.325  37.886  -1.618  1.00 23.68   0  121P 111
-ATOM      9  N   THR     2      -3.966  31.934  -2.760  1.00 15.08   0  121P 112
-ATOM     10  CA  THR     2      -3.759  30.930  -1.751  1.00 16.71   0  121P 113
-ATOM     11  C   THR     2      -3.312  31.597  -0.441  1.00 16.63   0  121P 114
-ATOM     12  O   THR     2      -2.423  32.479  -0.406  1.00 17.08   0  121P 115
-ATOM     13  CB  THR     2      -2.707  29.952  -2.310  1.00 16.63   0  121P 116
-ATOM     14  OG1 THR     2      -3.298  29.397  -3.486  1.00 20.57   0  121P 117
-ATOM     15  CG2 THR     2      -2.318  28.861  -1.361  1.00 15.26   0  121P 118
-ATOM     16  N   GLU     3      -3.956  31.200   0.639  1.00 16.48   0  121P 119
-ATOM     17  CA  GLU     3      -3.531  31.674   1.938  1.00 19.32   0  121P 120
-ATOM     18  C   GLU     3      -3.016  30.444   2.698  1.00 18.43   0  121P 121
-ATOM     19  O   GLU     3      -3.525  29.315   2.498  1.00 18.03   0  121P 122
-ATOM     20  CB  GLU     3      -4.690  32.302   2.688  1.00 21.18   0  121P 123
-ATOM     21  CG  GLU     3      -5.329  33.456   1.891  1.00 26.05   0  121P 124
-ATOM     22  CD  GLU     3      -6.235  34.429   2.654  1.00 28.96   0  121P 125
-ATOM     23  OE1 GLU     3      -6.498  34.239   3.846  1.00 30.26   0  121P 126
-ATOM     24  OE2 GLU     3      -6.662  35.416   2.052  1.00 31.23   0  121P 127
-ATOM     26  CA  TYR     4      -1.465  29.513   4.336  1.00 15.13   0  121P 129
-ATOM     27  C   TYR     4      -1.582  29.972   5.788  1.00 14.74   0  121P 130
-ATOM     28  O   TYR     4      -1.028  31.008   6.186  1.00 13.18   0  121P 131
-ATOM     29  CB  TYR     4      -0.024  29.210   3.979  1.00 14.62   0  121P 132
-ATOM     30  CG  TYR     4       0.179  28.708   2.556  1.00 14.92   0  121P 133
-ATOM     31  CD1 TYR     4      -0.082  27.378   2.277  1.00 14.30   0  121P 134
-ATOM     32  CD2 TYR     4       0.642  29.561   1.563  1.00 15.17   0  121P 135
-ATOM     33  CE1 TYR     4       0.125  26.904   0.999  1.00 15.20   0  121P 136
-ATOM     34  CE2 TYR     4       0.851  29.092   0.275  1.00 12.99   0  121P 137
-ATOM     35  CZ  TYR     4       0.584  27.766   0.021  1.00 14.46   0  121P 138
-ATOM     36  OH  TYR     4       0.720  27.278  -1.241  1.00 12.37   0  121P 139

diff --git a/src/Tools/pdbUtil/pdbTrans/src/test/121p.pdb b/src/Tools/pdbUtil/pdbTrans/src/test/121p.pdb
deleted file mode 100755 (executable)
index 949a799..0000000
--- a/src/Tools/pdbUtil/pdbTrans/src/test/121p.pdb
+++ /dev/null
@@ -1,35 +0,0 @@
-ATOM      1  N   MET     1      -7.176  32.630  -6.655  1.00 14.06      121P 104\r
-ATOM      2  CA  MET     1      -5.913  31.928  -6.676  1.00 17.27      121P 105\r
-ATOM      3  C   MET     1      -5.903  30.860  -5.600  1.00 16.41      121P 106\r
-ATOM      4  O   MET     1      -6.703  30.881  -4.654  1.00 16.12      121P 107\r
-ATOM      5  CB  MET     1      -4.712  32.869  -6.415  1.00 17.94      121P 108\r
-ATOM      6  CG  MET     1      -4.594  33.420  -4.990  1.00 19.41      121P 109\r
-ATOM      7  SD  MET     1      -3.193  34.558  -4.899  1.00 21.82      121P 110\r
-ATOM      8  CE  MET     1      -4.325  35.886  -4.618  1.00 23.68      121P 111\r
-ATOM      9  N   THR     2      -4.966  29.934  -5.760  1.00 15.08      121P 112\r
-ATOM     10  CA  THR     2      -4.759  28.930  -4.751  1.00 16.71      121P 113\r
-ATOM     11  C   THR     2      -4.312  29.597  -3.441  1.00 16.63      121P 114\r
-ATOM     12  O   THR     2      -3.423  30.479  -3.406  1.00 17.08      121P 115\r
-ATOM     13  CB  THR     2      -3.707  27.952  -5.310  1.00 16.63      121P 116\r
-ATOM     14  OG1 THR     2      -4.298  27.397  -6.486  1.00 20.57      121P 117\r
-ATOM     15  CG2 THR     2      -3.318  26.861  -4.361  1.00 15.26      121P 118\r
-ATOM     16  N   GLU     3      -4.956  29.200  -2.361  1.00 16.48      121P 119\r
-ATOM     17  CA  GLU     3      -4.531  29.674  -1.062  1.00 19.32      121P 120\r
-ATOM     18  C   GLU     3      -4.016  28.444  -0.302  1.00 18.43      121P 121\r
-ATOM     19  O   GLU     3      -4.525  27.315  -0.502  1.00 18.03      121P 122\r
-ATOM     20  CB  GLU     3      -5.690  30.302  -0.312  1.00 21.18      121P 123\r
-ATOM     21  CG  GLU     3      -6.329  31.456  -1.109  1.00 26.05      121P 124\r
-ATOM     22  CD  GLU     3      -7.235  32.429  -0.346  1.00 28.96      121P 125\r
-ATOM     23  OE1 GLU     3      -7.498  32.239   0.846  1.00 30.26      121P 126\r
-ATOM     24  OE2 GLU     3      -7.662  33.416  -0.948  1.00 31.23      121P 127\r
-ATOM     26  CA  TYR     4      -2.465  27.513   1.336  1.00 15.13      121P 129\r
-ATOM     27  C   TYR     4      -2.582  27.972   2.788  1.00 14.74      121P 130\r
-ATOM     28  O   TYR     4      -2.028  29.008   3.186  1.00 13.18      121P 131\r
-ATOM     29  CB  TYR     4      -1.024  27.210   0.979  1.00 14.62      121P 132\r
-ATOM     30  CG  TYR     4      -0.821  26.708  -0.444  1.00 14.92      121P 133\r
-ATOM     31  CD1 TYR     4      -1.082  25.378  -0.723  1.00 14.30      121P 134\r
-ATOM     32  CD2 TYR     4      -0.358  27.561  -1.437  1.00 15.17      121P 135\r
-ATOM     33  CE1 TYR     4      -0.875  24.904  -2.001  1.00 15.20      121P 136\r
-ATOM     34  CE2 TYR     4      -0.149  27.092  -2.725  1.00 12.99      121P 137\r
-ATOM     35  CZ  TYR     4      -0.416  25.766  -2.979  1.00 14.46      121P 138\r
-ATOM     36  OH  TYR     4      -0.280  25.278  -4.241  1.00 12.37      121P 139\r

diff --git a/src/Tools/pdbUtil/pdbTrans/src/test/Makefile b/src/Tools/pdbUtil/pdbTrans/src/test/Makefile
index 323c2db..6ad9bac 100755 (executable)
--- a/src/Tools/pdbUtil/pdbTrans/src/test/Makefile
+++ b/src/Tools/pdbUtil/pdbTrans/src/test/Makefile
@@ -11,7 +11,12 @@ help:
 
 exec:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME) 
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.pdb -o data/121p-trans.pdb -M data/test.mat
        @echo "----- Calc check -----"          
+       diff data/121p-trans.pdb data/121p-trans.pdb.tst
+       @echo "----- Execution Check -----"
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.pdb -o data/test.pdb -M data/test.mat -cuda 0
+       @echo "----- Calc check -----"          
+       diff data/test.pdb data/121p-trans.pdb.tst
 
 clean:

diff --git a/src/Tools/pdbUtil/pdbTrans/src/test/data b/src/Tools/pdbUtil/pdbTrans/src/test/data
new file mode 120000 (symlink)
index 0000000..d4f2951
--- /dev/null
+++ b/src/Tools/pdbUtil/pdbTrans/src/test/data
@@ -0,0 +1 @@
+../../../../../..//data/pdbTrans
\ No newline at end of file

diff --git a/src/Tools/pdbUtil/pdbTrans/src/test/test.mat b/src/Tools/pdbUtil/pdbTrans/src/test/test.mat
deleted file mode 100755 (executable)
index 17ffa66..0000000
--- a/src/Tools/pdbUtil/pdbTrans/src/test/test.mat
+++ /dev/null
@@ -1,4 +0,0 @@
-1 0 0
-0 1 0
-0 0 1
-1 2 3

diff --git a/src/Tools/pdbUtil/pdbTrans/src/test/test.pdb b/src/Tools/pdbUtil/pdbTrans/src/test/test.pdb
deleted file mode 100755 (executable)
index a9b3aba..0000000
--- a/src/Tools/pdbUtil/pdbTrans/src/test/test.pdb
+++ /dev/null
@@ -1,105 +0,0 @@
-ATOM      1  N   MET     1      -7.176  32.630  -6.655  1.00 14.06      121P 104\r
-ATOM      2  CA  MET     1      -5.913  31.928  -6.676  1.00 17.27      121P 105\r
-ATOM      3  C   MET     1      -5.903  30.860  -5.600  1.00 16.41      121P 106\r
-ATOM      4  O   MET     1      -6.703  30.881  -4.654  1.00 16.12      121P 107\r
-ATOM      5  CB  MET     1      -4.712  32.869  -6.415  1.00 17.94      121P 108\r
-ATOM      6  CG  MET     1      -4.594  33.420  -4.990  1.00 19.41      121P 109\r
-ATOM      7  SD  MET     1      -3.193  34.558  -4.899  1.00 21.82      121P 110\r
-ATOM      8  CE  MET     1      -4.325  35.886  -4.618  1.00 23.68      121P 111\r
-ATOM      9  N   THR     2      -4.966  29.934  -5.760  1.00 15.08      121P 112\r
-ATOM     10  CA  THR     2      -4.759  28.930  -4.751  1.00 16.71      121P 113\r
-ATOM     11  C   THR     2      -4.312  29.597  -3.441  1.00 16.63      121P 114\r
-ATOM     12  O   THR     2      -3.423  30.479  -3.406  1.00 17.08      121P 115\r
-ATOM     13  CB  THR     2      -3.707  27.952  -5.310  1.00 16.63      121P 116\r
-ATOM     14  OG1 THR     2      -4.298  27.397  -6.486  1.00 20.57      121P 117\r
-ATOM     15  CG2 THR     2      -3.318  26.861  -4.361  1.00 15.26      121P 118\r
-ATOM     16  N   GLU     3      -4.956  29.200  -2.361  1.00 16.48      121P 119\r
-ATOM     17  CA  GLU     3      -4.531  29.674  -1.062  1.00 19.32      121P 120\r
-ATOM     18  C   GLU     3      -4.016  28.444  -0.302  1.00 18.43      121P 121\r
-ATOM     19  O   GLU     3      -4.525  27.315  -0.502  1.00 18.03      121P 122\r
-ATOM     20  CB  GLU     3      -5.690  30.302  -0.312  1.00 21.18      121P 123\r
-ATOM     21  CG  GLU     3      -6.329  31.456  -1.109  1.00 26.05      121P 124\r
-ATOM     22  CD  GLU     3      -7.235  32.429  -0.346  1.00 28.96      121P 125\r
-ATOM     23  OE1 GLU     3      -7.498  32.239   0.846  1.00 30.26      121P 126\r
-ATOM     24  OE2 GLU     3      -7.662  33.416  -0.948  1.00 31.23      121P 127\r
-ATOM     26  CA  TYR     4      -2.465  27.513   1.336  1.00 15.13      121P 129\r
-ATOM     27  C   TYR     4      -2.582  27.972   2.788  1.00 14.74      121P 130\r
-ATOM     28  O   TYR     4      -2.028  29.008   3.186  1.00 13.18      121P 131\r
-ATOM     29  CB  TYR     4      -1.024  27.210   0.979  1.00 14.62      121P 132\r
-ATOM     30  CG  TYR     4      -0.821  26.708  -0.444  1.00 14.92      121P 133\r
-ATOM     31  CD1 TYR     4      -1.082  25.378  -0.723  1.00 14.30      121P 134\r
-ATOM     32  CD2 TYR     4      -0.358  27.561  -1.437  1.00 15.17      121P 135\r
-ATOM     33  CE1 TYR     4      -0.875  24.904  -2.001  1.00 15.20      121P 136\r
-ATOM     34  CE2 TYR     4      -0.149  27.092  -2.725  1.00 12.99      121P 137\r
-ATOM     35  CZ  TYR     4      -0.416  25.766  -2.979  1.00 14.46      121P 138\r
-ATOM     36  OH  TYR     4      -0.280  25.278  -4.241  1.00 12.37      121P 139\r
-ATOM      1  N   MET     1      -6.176  34.630  -3.655  1.00 14.06   0  121P 104
-                                                                                
-ATOM      2  CA  MET     1      -4.913  33.928  -3.676  1.00 17.27   0  121P 105
-                                                                                
-ATOM      3  C   MET     1      -4.903  32.860  -2.600  1.00 16.41   0  121P 106
-                                                                                
-ATOM      4  O   MET     1      -5.703  32.881  -1.654  1.00 16.12   0  121P 107
-                                                                                
-ATOM      5  CB  MET     1      -3.712  34.869  -3.415  1.00 17.94   0  121P 108
-                                                                                
-ATOM      6  CG  MET     1      -3.594  35.420  -1.990  1.00 19.41   0  121P 109
-                                                                                
-ATOM      7  SD  MET     1      -2.193  36.558  -1.899  1.00 21.82   0  121P 110
-                                                                                
-ATOM      8  CE  MET     1      -3.325  37.886  -1.618  1.00 23.68   0  121P 111
-                                                                                
-ATOM      9  N   THR     2      -3.966  31.934  -2.760  1.00 15.08   0  121P 112
-                                                                                
-ATOM     10  CA  THR     2      -3.759  30.930  -1.751  1.00 16.71   0  121P 113
-                                                                                
-ATOM     11  C   THR     2      -3.312  31.597  -0.441  1.00 16.63   0  121P 114
-                                                                                
-ATOM     12  O   THR     2      -2.423  32.479  -0.406  1.00 17.08   0  121P 115
-                                                                                
-ATOM     13  CB  THR     2      -2.707  29.952  -2.310  1.00 16.63   0  121P 116
-                                                                                
-ATOM     14  OG1 THR     2      -3.298  29.397  -3.486  1.00 20.57   0  121P 117
-                                                                                
-ATOM     15  CG2 THR     2      -2.318  28.861  -1.361  1.00 15.26   0  121P 118
-                                                                                
-ATOM     16  N   GLU     3      -3.956  31.200   0.639  1.00 16.48   0  121P 119
-                                                                                
-ATOM     17  CA  GLU     3      -3.531  31.674   1.938  1.00 19.32   0  121P 120
-                                                                                
-ATOM     18  C   GLU     3      -3.016  30.444   2.698  1.00 18.43   0  121P 121
-                                                                                
-ATOM     19  O   GLU     3      -3.525  29.315   2.498  1.00 18.03   0  121P 122
-                                                                                
-ATOM     20  CB  GLU     3      -4.690  32.302   2.688  1.00 21.18   0  121P 123
-                                                                                
-ATOM     21  CG  GLU     3      -5.329  33.456   1.891  1.00 26.05   0  121P 124
-                                                                                
-ATOM     22  CD  GLU     3      -6.235  34.429   2.654  1.00 28.96   0  121P 125
-                                                                                
-ATOM     23  OE1 GLU     3      -6.498  34.239   3.846  1.00 30.26   0  121P 126
-                                                                                
-ATOM     24  OE2 GLU     3      -6.662  35.416   2.052  1.00 31.23   0  121P 127
-                                                                                
-ATOM     26  CA  TYR     4      -1.465  29.513   4.336  1.00 15.13   0  121P 129
-                                                                                
-ATOM     27  C   TYR     4      -1.582  29.972   5.788  1.00 14.74   0  121P 130
-                                                                                
-ATOM     28  O   TYR     4      -1.028  31.008   6.186  1.00 13.18   0  121P 131
-                                                                                
-ATOM     29  CB  TYR     4      -0.024  29.210   3.979  1.00 14.62   0  121P 132
-                                                                                
-ATOM     30  CG  TYR     4       0.179  28.708   2.556  1.00 14.92   0  121P 133
-                                                                                
-ATOM     31  CD1 TYR     4      -0.082  27.378   2.277  1.00 14.30   0  121P 134
-                                                                                
-ATOM     32  CD2 TYR     4       0.642  29.561   1.563  1.00 15.17   0  121P 135
-                                                                                
-ATOM     33  CE1 TYR     4       0.125  26.904   0.999  1.00 15.20   0  121P 136
-                                                                                
-ATOM     34  CE2 TYR     4       0.851  29.092   0.275  1.00 12.99   0  121P 137
-                                                                                
-ATOM     35  CZ  TYR     4       0.584  27.766   0.021  1.00 14.46   0  121P 138
-                                                                                
-ATOM     36  OH  TYR     4       0.720  27.278  -1.241  1.00 12.37   0  121P 139
-