OSDN > Desarrollador > tacyas > Chamber > Eos > Commit

Eos
Fork

(Original repository, No fork origin)

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revisión	1f1c7b6f8105e6749e357b5b860b7f6893557e75 (tree)
Tiempo	2014-11-22 15:44:46
Autor	Takuo Yasunaga <yasunaga@bio....>
Commiter	Takuo Yasunaga

Log Message

Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base

Conflicts:
bin/wish/Display2/tclIndex

Cambiar Resumen

modified: bin/wish/Display2/tclIndex (diff)
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFFT (diff)
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a (diff)
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a (diff)
modified: hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageShrink.sharedo (diff)
modified: hostdepend/X86LINUX64/src/Objects/DataExpress/TclTk/src/X86LINUX64/libTclTk.a (diff)
modified: hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a (diff)
modified: hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a (diff)
modified: hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageShrink.sharedo (diff)
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64/mrcImageFFT (diff)
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageShrink/src/X86LINUX64/mrcImageShrink (diff)
modified: hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbRotation/src/X86LINUX64/pdbRotation (diff)
add: hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbTrans/src/X86LINUX64/pdbTrans (diff)
modified: src/Config/x86Linux64.inc (diff)
modified: src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log (diff)
modified: src/Objects/DataManip/mrcImage/src/lmrcImageShrink.c (diff)
modified: src/Tools/mrcImage/mrcImageFFT/Config/Define.inc (diff)
modified: src/Tools/pdbUtil/pdbRotation/Config/Define.inc (diff)
modified: src/Tools/pdbUtil/pdbTrans/Config/Define.inc (diff)
modified: src/Tools/pdbUtil/pdbTrans/src/test/Makefile (diff)

Diferencia incremental

--- a/bin/wish/Display2/tclIndex

+++ b/bin/wish/Display2/tclIndex

		@@ -6,41 +6,38 @@
6	6	# element name is the name of a command and the value is
7	7	# a script that loads the command.
8	8
9		-set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
	9	+set auto_index(roiAreaRotateStart) [list source [file join $dir RoiAreaRotate.wish]]
	10	+set auto_index(roiAreaRotateMotion) [list source [file join $dir RoiAreaRotate.wish]]
	11	+set auto_index(roiAreaRotateEnd) [list source [file join $dir RoiAreaRotate.wish]]
	12	+set auto_index(rectangleRotate) [list source [file join $dir RoiAreaRotate.wish]]
	13	+set auto_index(rectangleRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
	14	+set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]]
	15	+set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
	16	+set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]]
	17	+set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
	18	+set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
	19	+set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
	20	+set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
	21	+set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
10	22	set auto_index(colormapChange) [list source [file join $dir Display2Colormap.wish]]
11		-set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
12		-set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
13		-set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
14		-set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
15		-set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
16		-set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
17		-set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]]
18		-set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]]
19		-set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]]
20		-set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]]
21		-set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]]
22		-set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]]
23		-set auto_index(mrcImageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
24		-set auto_index(imageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
25		-set auto_index(layerLineInformationWinCreate) [list source [file join $dir Display2Info.wish]]
26		-set auto_index(projectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
27		-set auto_index(sectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
28		-set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]]
29		-set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]]
30		-set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]]
31		-set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
32		-set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
33		-set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
34		-set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
35		-set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
36		-set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
37		-set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
38		-set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
39		-set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
40		-set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
41		-set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
42		-set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
43	23	set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]]
	24	+set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
	25	+set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
	26	+set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
	27	+set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
	28	+set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]]
	29	+set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
	30	+set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
	31	+set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
	32	+set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
	33	+set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
	34	+set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
	35	+set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
	36	+set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
	37	+set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
	38	+set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
	39	+set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
	40	+set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
44	41	set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]]
45	42	set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]]
46	43	set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]]

		@@ -49,14 +46,45 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR
49	46	set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
50	47	set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
51	48	set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
	49	+<<<<<<< HEAD
	50	+=======
	51	+<<<<<<< HEAD
	52	+set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
	53	+set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
	54	+set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
	55	+set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
	56	+set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
	57	+set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
	58	+set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
	59	+set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]]
	60	+set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]]
	61	+set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]]
	62	+set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]]
	63	+set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]]
	64	+set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]]
	65	+set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]]
	66	+=======
	67	+set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
	68	+>>>>>>> FETCH_HEAD
	69	+>>>>>>> FETCH_HEAD
52	70	set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
53	71	set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
54	72	set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
55	73	set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]]
56		-set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
57		-set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
58		-set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
59		-set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
	74	+set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]]
	75	+set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]]
	76	+set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]]
	77	+set auto_index(mrcImageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
	78	+set auto_index(imageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
	79	+set auto_index(layerLineInformationWinCreate) [list source [file join $dir Display2Info.wish]]
	80	+set auto_index(projectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
	81	+set auto_index(sectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
	82	+set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]]
	83	+set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]]
	84	+set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]]
	85	+set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
	86	+set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
	87	+set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
60	88	set auto_index(roiAreaCreateStart) [list source [file join $dir RoiAreaCreate.wish]]
61	89	set auto_index(roiAreaCreateMotion) [list source [file join $dir RoiAreaCreate.wish]]
62	90	set auto_index(roiAreaCreateEnd) [list source [file join $dir RoiAreaCreate.wish]]

		@@ -74,54 +102,29 @@ set auto_index(roiSplineEnd) [list source [file join $dir RoiAreaCreate.wish]]
74	102	set auto_index(splineCreate) [list source [file join $dir RoiAreaCreate.wish]]
75	103	set auto_index(knobShow) [list source [file join $dir RoiAreaCreate.wish]]
76	104	set auto_index(knobHide) [list source [file join $dir RoiAreaCreate.wish]]
77		-set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
78		-set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
79		-set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]]
	105	+set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
	106	+set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
	107	+set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
	108	+set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
	109	+set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
	110	+set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
	111	+set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
	112	+set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
	113	+set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
	114	+set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]]
	115	+set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]]
	116	+set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]]
80	117	set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]]
81	118	set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]]
82	119	set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]]
83	120	set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]]
84	121	set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]]
85	122	set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]]
86		-set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]]
87		-set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]]
88		-set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]]
89		-set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]]
90		-set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]]
91		-set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]]
92		-set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]]
93		-set auto_index(roiAreaRotateStart) [list source [file join $dir RoiAreaRotate.wish]]
94		-set auto_index(roiAreaRotateMotion) [list source [file join $dir RoiAreaRotate.wish]]
95		-set auto_index(roiAreaRotateEnd) [list source [file join $dir RoiAreaRotate.wish]]
96		-set auto_index(rectangleRotate) [list source [file join $dir RoiAreaRotate.wish]]
97		-set auto_index(rectangleRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
98		-set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]]
99		-set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
100		-set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]]
101		-set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
102		-set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
103		-set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
104		-set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
105		-set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
106		-set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
107		-set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
108		-set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
109		-set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
110		-set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
111		-set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
112		-set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
113		-set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
114		-set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
115		-set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
116		-set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
117		-set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
118		-set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
119		-set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
120		-set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
121		-set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
122		-set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
123		-set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
124		-set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
	123	+set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
	124	+set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
	125	+set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
	126	+set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
	127	+set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
125	128	set auto_index(sectionInit) [list source [file join $dir SectionUtil.wish]]
126	129	set auto_index(sectionRecreateAll) [list source [file join $dir SectionUtil.wish]]
127	130	set auto_index(sectionRecreate) [list source [file join $dir SectionUtil.wish]]

		@@ -130,5 +133,17 @@ set auto_index(sectionCreate) [list source [file join $dir SectionUtil.wish]]
130	133	set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
131	134	set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
132	135	set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
	136	+<<<<<<< HEAD
	137	+set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
	138	+set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
	139	+set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
	140	+set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
	141	+set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
	142	+set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
	143	+=======
133	144	set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
	145	+<<<<<<< HEAD
134	146	set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
	147	+=======
	148	+>>>>>>> FETCH_HEAD
	149	+>>>>>>> FETCH_HEAD

Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFFT and b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFFT differ

Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a differ

Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a differ

Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageShrink.sharedo and b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageShrink.sharedo differ

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

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

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

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

Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64/mrcImageFFT and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64/mrcImageFFT differ

Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageShrink/src/X86LINUX64/mrcImageShrink and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageShrink/src/X86LINUX64/mrcImageShrink differ

Binary files a/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbRotation/src/X86LINUX64/pdbRotation and b/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbRotation/src/X86LINUX64/pdbRotation differ

Binary files /dev/null and b/hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbTrans/src/X86LINUX64/pdbTrans differ

--- a/src/Config/x86Linux64.inc

+++ b/src/Config/x86Linux64.inc

		@@ -253,7 +253,7 @@ NVCCOPTSCUDAGDB = --host-compilation='C++' --use_fast_math -g -G \
253	253	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
254	254
255	255	#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
256		-LIBCUDA = -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -lcudart -lcufft
	256	+LIBCUDA = -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -L$(EOS_HOME)/util/$(OSTYPE)/cuda/lib64 -lcudart_static -lcufft
257	257
258	258	#HOSTDEPENDENTLIB += $(LIBCUDA)
259	259

--- a/src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log

+++ b/src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log

		@@ -20,9 +20,15 @@ checked program was:
20	20	5: int t() { void ((volatile p)()); p = (void (()()))main; return 0; }
21	21	/* end */
22	22
	23	+<<<<<<< HEAD
	24	+"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"
	25	+/usr/bin/ld: cannot find -lGL
	26	+collect2: ld はステータス 1 で終了しました
	27	+=======
23	28	"gcc -o conftest -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1/x86_64-darwin13.2.0 -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1/ruby/backward -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1 -I. -I/Users/tacyas/Eos/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long -pipe conftest.c -L. -L/Users/tacyas/Eos/util/X86MAC64/lib -L/usr/lib -L/Users/tacyas/Eos/lib/X86MAC64 -L/Users/tacyas/Eos/util/X86MAC64/lib -L. -L/usr/local/lib -lruby-static -lGL -lpthread -ldl -lobjc "
24	29	ld: library not found for -lGL
25	30	clang: error: linker command failed with exit code 1 (use -v to see invocation)
	31	+>>>>>>> FETCH_HEAD
26	32	checked program was:
27	33	/* begin */
28	34	1: #include "ruby.h"

--- 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
34	34	dst->HeaderLength.z = src->HeaderLength.y*S.z;
35	35	mrcInit(dst, NULL);
36	36
	37	+ for(z=0; z<dst->HeaderN.z; z++) {
	38	+ for(y=0; y<dst->HeaderN.y; y++) {
37	39	for(x=0; x<dst->HeaderN.x; x++) {
38		- for(y=0; y<dst->HeaderN.y; y++) {
39		- for(z=0; z<dst->HeaderN.z; z++) {
40		- mrcPixelDataSet(dst, x, y, z, 0.0, mrcPixelMag);
41		- }
42		- }
	40	+ mrcPixelDataSet(dst, x, y, z, 0.0, mrcPixelRePart);
	41	+ }
	42	+ }
43	43	}
44		- for(x=0; x<dst->HeaderN.x ; x++) {
45		- for(y=0; y<dst->HeaderN.y; y++) {
46		- for(z=0; z<dst->HeaderN.z; z++) {
47		- sum = 0.0;
48		- for(srcx = xS.x; srcx < (x+1)S.x; srcx++) {
	44	+ for(z=0; z<dst->HeaderN.z; z++) {
	45	+ for(y=0; y<dst->HeaderN.y; y++) {
	46	+ for(x=0; x<dst->HeaderN.x; x++) {
	47	+ sum = 0.0;
	48	+ for(srcz = zS.z; srcz < (z+1)S.z; srcz++) {
49	49	for(srcy = yS.y; srcy < (y+1)S.y; srcy++) {
50		- for(srcz = zS.z; srcz < (z+1)S.z; srcz++) {
51		- mrcPixelDataGet(src, (float)srcx, (float)srcy, (float)srcz, &data, mrcPixelMag, mrcPixelHowNearest);
	50	+ for(srcx = xS.x; srcx < (x+1)S.x; srcx++) {
	51	+ mrcPixelDataGet(src, (float)srcx, (float)srcy, (float)srcz, &data, mrcPixelRePart, mrcPixelHowNearest);
52	52	sum += data;
53		- }
	53	+ }
54	54	}
55		- }
56		- sum = sum/((double)(S.x * S.y * S.z));
57		- mrcPixelDataSet(dst, (float)x, (float)y, (float)z, sum, mrcPixelMag);
58	55	}
59		- }
	56	+ sum = sum/((double)(S.x * S.y * S.z));
	57	+ mrcPixelDataSet(dst, (float)x, (float)y, (float)z, sum, mrcPixelRePart);
	58	+ }
	59	+ }
60	60	}
61	61	}
62	62

--- a/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc

+++ b/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc

		@@ -1,6 +1,4 @@
1	1	OBJECTNAME = mrcImageFFT
2		-EXTRA_LIB = -L${CUDA_ROOT}/lib64 -lcudart
3		-#EXTRA_LIB = -L${CUDA_ROOT}/lib64 -lcudart -lcufftw
4		-#EXTRA_LIB =
5		-EXTRA_CCOPTS =
	2	+EXTRA_LIB = ${LIBCUDA}
	3	+EXTRA_CCOPTS = -I${CUDA_ROOT}/include
6	4	EXTRA_INC =

--- a/src/Tools/pdbUtil/pdbRotation/Config/Define.inc

+++ b/src/Tools/pdbUtil/pdbRotation/Config/Define.inc

		@@ -1,4 +1,4 @@
1	1	OBJECTNAME = pdbRotation
2		-EXTRA_LIB = -L${CUDA_ROOT}/lib64 -lcudart
	2	+EXTRA_LIB = ${LIBCUDA}
3	3	EXTRA_CCOPTS = -I${CUDA_ROOT}/include
4	4	EXTRA_INC =

--- a/src/Tools/pdbUtil/pdbTrans/Config/Define.inc

+++ b/src/Tools/pdbUtil/pdbTrans/Config/Define.inc

		@@ -1 +1,4 @@
1	1	OBJECTNAME = pdbTrans
	2	+EXTRA_LIB = ${LIBCUDA}
	3	+EXTRA_CCOPTS = -I${CUDA_ROOT}/include
	4	+EXTRA_INC =

--- a/src/Tools/pdbUtil/pdbTrans/src/test/Makefile

+++ b/src/Tools/pdbUtil/pdbTrans/src/test/Makefile

		@@ -11,7 +11,12 @@ help:
11	11
12	12	exec:
13	13	@echo "----- Execution Check -----"
14		- ../$(OSTYPE)/$(OBJECTNAME)
	14	+ ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.pdb -o data/121p-trans.pdb -M data/test.mat
15	15	@echo "----- Calc check -----"
	16	+ diff data/121p-trans.pdb data/121p-trans.pdb.tst
	17	+ @echo "----- Execution Check -----"
	18	+ ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.pdb -o data/test.pdb -M data/test.mat -cuda 0
	19	+ @echo "----- Calc check -----"
	20	+ diff data/test.pdb data/121p-trans.pdb.tst
16	21
17	22	clean:

Eos Fork