OSDN Git Service
Takuo Yasunaga [Sun, 18 May 2014 12:13:45 +0000 (21:13 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Sun, 18 May 2014 12:04:15 +0000 (21:04 +0900)]
modified: hostdepend/X86MAC64/*
modified: include/lmrc2Dto3D.h
modified: src/Config/x86Mac64.inc
modified: src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log
modified: src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
modified: src/Objects/General/eosCuda/src/eosCuda.cu
modified: src/*/*/*/src/Makefile
Takuo Yasunaga [Tue, 13 May 2014 05:14:43 +0000 (14:14 +0900)]
modified: src/Tools/rec3d/mrcImageOrientationSearch/src/mrcImageOrientationSearch.c
Takuo Yasunaga [Mon, 12 May 2014 21:38:26 +0000 (06:38 +0900)]
modified: mrcImageTfunction
modified: src/Objects/DataManip/mrcImage/src/lmrcImageTfunction.c
Takuo Yasunaga [Mon, 12 May 2014 00:43:40 +0000 (09:43 +0900)]
Conflicts:
Makefile
Takuo Yasunaga [Sun, 11 May 2014 22:36:46 +0000 (07:36 +0900)]
modified: hostdepend/X86MAC64/bin/X86MAC64/tiff2mrc
modified: hostdepend/X86MAC64/src/Tools/filter/tiff2mrc/src/X86MAC64/tiff2mrc
modified: src/Config/x86Mac64.inc
deleted: src/Objects/General/eosCuda/src/eosCuda.c
Takuo Yasunaga [Sun, 11 May 2014 22:22:59 +0000 (07:22 +0900)]
new file: Integration/Tomography/Makefile.recent
modified: Makefile
modified: hostdepend/X86MAC64/bin/X86MAC64/mrc2tiff
modified: hostdepend/X86MAC64/bin/X86MAC64/mrc2gif
modified: hostdepend/X86MAC64/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/mrc2Dto3D
added: libtiff, libgif
added: cuda
modified: include/eosPThread.h
modified: src/Config/x86Mac64.inc
modified: src/Objects/General/eosPThread/src/eosPThreadInit.c
modified: src/Objects/General/eosPThread/src/eosPThreadMutex.c
modified: src/Tools/rec3d/mrc2Dto3D/Config/Define.inc
new file: util/srcX86MAC64
Takuo Yasunaga [Sun, 11 May 2014 14:03:33 +0000 (23:03 +0900)]
Bug fixed:
modified: Makefile
bug fixed: mrcImageClusterAnalysis
bug fixed: pdbChargeFit
Takuo Yasunaga [Thu, 1 May 2014 04:59:37 +0000 (13:59 +0900)]
values.h
modified: src/Tools/mrcImage/mrcImageClusterAnalysis/src/mrcImageClusterAnalysis.c
Takuo Yasunaga [Thu, 1 May 2014 03:07:22 +0000 (12:07 +0900)]
Remake for make rebuild
modified: src/Tools/mrcImage/mrcImageInfo/src/Makefile
Takuo Yasunaga [Wed, 30 Apr 2014 18:11:07 +0000 (03:11 +0900)]
values.h
mrcImageOrientationSearchBySimultaneousMinimization
mrcImageClusterAnalysis
Takuo Yasunaga [Wed, 30 Apr 2014 10:35:28 +0000 (19:35 +0900)]
Bug fixed: Compile error on OS-X : mrcImageClusterAnalysis
modified: src/Objects/General/Cluster/src/clusterLogRead.c
Takuo Yasunaga [Tue, 29 Apr 2014 20:01:33 +0000 (05:01 +0900)]
Add others2
modified: Makefile
Change a tool install method, i.e., When we cannot rebuild some tools, we do not install them.
modified: src/Config/Template/ToolsTemplate.Dir/src/Makefile
Chnage eosCuda.c to eosCuda.cu
deleted: hostdepend/X86LINUX64ICC/src/Objects/General/eosCuda/src/X86LINUX64ICC/eosCuda.c
Takuo Yasunaga [Tue, 29 Apr 2014 08:42:26 +0000 (17:42 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Mon, 28 Apr 2014 23:31:28 +0000 (08:31 +0900)]
deleted: "\177"
deleted: "\177\177"
Takuo Yasunaga [Mon, 28 Apr 2014 23:26:26 +0000 (08:26 +0900)]
>> Change Makefile for rebuilding
modified: src/Makefile
modified: src/Tools/Config/Define.inc
typechange: src/Tools/Makefile
>> Change mrcImageFFT
modified: src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c
Takuo Yasunaga [Fri, 25 Apr 2014 18:49:01 +0000 (03:49 +0900)]
modified: include/genUtil.h
modified: include/lmrcImageAddValue.h
modified: include/pdbFile.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageAddValue.c
modified: src/Objects/DataManip/pdbFile/src/pdbTrans.c
modified: src/Objects/DataManip/pdbFile/src/pdbTransCuda.cu
modified: src/Objects/General/genUtil/inc/genUtil.h
Takuo Yasunaga [Wed, 23 Apr 2014 13:43:12 +0000 (22:43 +0900)]
Install Cuda
new file: hostdepend/X86LINUX64/util/X86LINUX64/cuda
Install ICC
new file: hostdepend/X86LINUX64ICC/include/*.h
modified: hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libEosObjects.a
Modify eosCuda
modified: include/eosCuda.h
modified: src/Objects/General/eosCuda/Config/Define.inc
modified: src/Objects/General/eosCuda/inc/eosCuda.h
new file: src/Objects/General/eosCuda/src/eosCuda.cu
Modify Configuration Files for ICC and CUDA
modified: include/pdbFile.h
modified: src/Config/DefineObject.inc
modified: src/Config/Template/ObjectsTemplate.Dir/src/ARCH/Makefile
modified: src/Config/x86Linux64icc.inc
modified: src/Objects/DataManip/Config/Define.inc
modified: src/Tools/Config/Define.inc
Examples for CUDA Applications:
modified: src/Tools/mrcImage/mrcImageAddValue/*
modified: src/Tools/pdbUtil/pdbRotation/*
modified: src/Objects/DataManip/pdbFile/src/pdbTrans.c
new file: src/Objects/DataManip/pdbFile/src/pdbTransCuda.cu
Takuo Yasunaga [Fri, 18 Apr 2014 19:54:28 +0000 (04:54 +0900)]
We expanded a format of OptionControlFile and added the attribultes of option types
Ex. inFile ->> inFile::mrcImage or inFile::ASCII
new file: sbin/awk/ctrl2Function.awk
modified: sbin/awk/ctrl2argCheck.awk
modified: sbin/awk/ctrl2configFileRead.awk
modified: sbin/awk/ctrl2configFileUsage.awk
modified: sbin/awk/ctrl2controlFile.awk
modified: sbin/awk/ctrl2header.awk
modified: sbin/awk/ctrl2init0.awk
modified: sbin/awk/ctrl2init1.awk
modified: sbin/awk/ctrl2khorospane.awk
modified: sbin/awk/ctrl2usage.awk
modified: sbin/awk/ctrlShow.awk
modified: sbin/ctrl2argCheck
modified: sbin/ctrl2configFileRead
modified: sbin/ctrl2header
modified: sbin/ctrl2init
modified: sbin/ctrl2usage
modified: sbin/ctrl2util
Modifiid Tools by new OptionControlFile
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageInfo
modified: hostdepend/X86LINUX64/bin/X86LINUX64/llExtract
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageROI
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcInfo
Takuo Yasunaga [Mon, 24 Mar 2014 23:07:35 +0000 (08:07 +0900)]
modified: mrcSinogramFETcalcSDforNormalize
Takuo Yasunaga [Mon, 24 Mar 2014 22:17:21 +0000 (07:17 +0900)]
deleted: some files
Takuo Yasunaga [Mon, 24 Mar 2014 22:12:00 +0000 (07:12 +0900)]
modified: mrcMeanYlinePos
Takuo Yasunaga [Mon, 24 Mar 2014 21:39:29 +0000 (06:39 +0900)]
deleted: Some files
Takuo Yasunaga [Mon, 24 Mar 2014 21:36:25 +0000 (06:36 +0900)]
modified: mrcImage1dShiftByCorrelation
Takuo Yasunaga [Mon, 24 Mar 2014 21:03:42 +0000 (06:03 +0900)]
deleted: some files
Takuo Yasunaga [Mon, 24 Mar 2014 20:54:23 +0000 (05:54 +0900)]
modified: src/Objects/DataManip/emData/src/emDataRead.c
modified: src/Tools/filter/emData2mrc/src/emData2mrc
Takuo Yasunaga [Sun, 23 Mar 2014 20:19:08 +0000 (05:19 +0900)]
mv: src/Tools/Test/angleMatchTest_k -> src/Tools/utils
mv: src/Tools/Test/angleMatchTest_k/src/util.c -> src/Tools/utils
Takuo Yasunaga [Sun, 23 Mar 2014 20:10:16 +0000 (05:10 +0900)]
modified: angleMatchTest_k
modified: anglediffchk
Takuo Yasunaga [Sun, 23 Mar 2014 00:55:11 +0000 (09:55 +0900)]
modified: mrc2fld
modified: llDataResolutionCheck.c
Takuo Yasunaga [Sun, 23 Mar 2014 00:33:59 +0000 (09:33 +0900)]
Ticket
modified: mrcImageCoreImageCalc
modified: pdbChargeFit
Takuo Yasunaga [Thu, 20 Mar 2014 22:19:30 +0000 (07:19 +0900)]
modified: mrcImageMultiCTFDetermination
Takuo Yasunaga [Thu, 20 Mar 2014 13:02:54 +0000 (22:02 +0900)]
modified: ctfMultiFunction
Takuo Yasunaga [Thu, 20 Mar 2014 12:54:23 +0000 (21:54 +0900)]
modified: src/Tools/mrcImage/mrcImageFOMCalc/src/mrcImageFOMCalc.c
deleted: src/Tools/mrcImage/mrcImageAverage/src/.mrcImageAverage.c.swp
Takuo Yasunaga [Thu, 20 Mar 2014 12:30:25 +0000 (21:30 +0900)]
modified: pdbListRMSDCalc.c
Takuo Yasunaga [Thu, 20 Mar 2014 11:34:39 +0000 (20:34 +0900)]
modified: mrcImageFractalFourierShellCorrelation.c
modified: pdbListRMSDCalc.c
Takuo Yasunaga [Fri, 7 Mar 2014 01:54:57 +0000 (10:54 +0900)]
Bug fixed: Spell miss
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageAutoFilamentExtract
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/X86LINUX64/mrcImageAutoFilamentExtract
modified: src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/mrcImageAutoFilamentExtract.c
Takuo Yasunaga [Fri, 7 Mar 2014 00:43:03 +0000 (09:43 +0900)]
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageAutoFilamentExtract
modified: hostdepend/X86LINUX64/bin/X86LINUX64/pdbShapeFit
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/X86LINUX64/mrcImageAutoFilamentExtract
modified: hostdepend/X86LINUX64/src/Tools/pdbUtil/pdbShapeFit/src/X86LINUX64/pdbShapeFit
modified: src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/mrcImageAutoFilamentExtract.c
modified: src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.c
Takuo Yasunaga [Thu, 6 Mar 2014 10:26:57 +0000 (19:26 +0900)]
Fixed: ticket #33385
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFTest
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFTest/src/X86LINUX64/Makefile
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFTest/src/X86LINUX64/mrcImageFTest
modified: src/Tools/mrcImage/mrcImageFTest/src/mrcImageFTest.c
Takuo Yasunaga [Thu, 27 Feb 2014 20:00:25 +0000 (05:00 +0900)]
modified: Makefile
modified: bin/wish/ctfDisplay/ctfDisplay.wish
recompiled for X86MAC64: hostdepend/X86MAC64/bin/X86MAC64/*
recompiled for X86MAC64: hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSummationCalculate.sharedo
eos [Thu, 20 Feb 2014 18:39:59 +0000 (03:39 +0900)]
Rebuild for new versions of OS
Takuo Yasunaga [Wed, 19 Feb 2014 15:06:31 +0000 (00:06 +0900)]
Bug fixed:
mrcImageHighlighting
Takuo Yasunaga [Tue, 18 Feb 2014 21:11:09 +0000 (06:11 +0900)]
Bug fixed:#
matrix3DInverse
vectorImageNearestNeighborMethod
Takuo Yasunaga [Fri, 14 Feb 2014 03:19:59 +0000 (12:19 +0900)]
DensityMode:Bug fixed
modified: src/Objects/DataManip/pdbFile/src/lpdbSurface.c
modified: src/Objects/DataManip/pdbFile/src/lpdbSurface.h
modified: src/Tools/pdbUtil/pdbSurface/Config/OptionControlFile
Takuo Yasunaga [Tue, 11 Feb 2014 19:35:44 +0000 (04:35 +0900)]
modified: Makefile
new file: bin/X86LINUX64ICC
new file: bin/mrcImagePanoramaCreate
modified: hostdepend/X86LINUX64/bin/X86LINUX64/*
modified: hostdepend/X86LINUX64/lib/X86LINUX64/*
modified: hostdepend/X86LINUX64/util/X86LINUX64/lib/libgif.la
modified: hostdepend/X86LINUX64/util/X86LINUX64/lib/libjpeg.a
modified: hostdepend/X86LINUX64/util/X86LINUX64/lib/libtiff.a
new file: hostdepend/X86LINUX64ICC/bin/X86LINUX64ICC/*
new file: hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/*
modified: include/lmrcImageROI2D.h
modified: sbin/MachineIndependent
modified: src/Makefile
modified: src/Tools/mrcImage/mrcImageROIs/inc/mrcImageROIs.h
modified: util/X86LINUX64ICC
Takuo Yasunaga [Sat, 11 Jan 2014 04:59:10 +0000 (13:59 +0900)]
For showing step by step
modified: Makefile
For >2GB: int -> size_t
modified: src/Objects/DataManip/mrcImage/inc/mrcImage.h
modified: src/Objects/DataManip/mrcImage/src/mrcImageWrite.c
A new tool to detect Object orientations.
new file: src/Tools/mrcImage/mrcImageShapeOrientation/*
Takuo Yasunaga [Wed, 18 Dec 2013 18:28:14 +0000 (03:28 +0900)]
modified: hostdepend/X86LINUX64ICC/*
modified: include/eosPThread.h
modified: src/Tools/*/*/src/Makefile
Takuo Yasunaga [Tue, 26 Nov 2013 04:07:13 +0000 (13:07 +0900)]
Makefile Modification for GPGPU
modified: src/Config/Template/ToolsTemplate.Dir/src/ARCH/Makefile
modified: src/Config/Template/ToolsTemplate.Dir/src/Makefile
Makefile modifiction for GPGPU
modified: src/Config/x86Linux64.inc
pthread bug fix
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageRhoFiltering.c
modified: src/Objects/DataManip/transform/src/lmrc2Dto3D.c
modified: src/Objects/DataManip/transform/src/lmrc2Dto3D.h
modified: src/Objects/General/eosPThread/doc/eosPThread.html
modified: src/Objects/General/eosPThread/inc/eosPThread.h
modified: src/Objects/General/eosPThread/src/eosPThreadMutex.c
modified: src/Tools/rec3d/mrc2Dto3D/ Config/OptionControlFile
Crystal.h modified
modified: src/Objects/General/Crystal/inc/Crystal.h
Takuo Yasunaga [Tue, 29 Oct 2013 16:28:35 +0000 (01:28 +0900)]
new file: bin/mrc2mrc
mrcfile transform
modified: env/Eos_env
for CUDA
new file: eosCuda
new file: include/eosCuda.h
for CUDA
modified: hostdepend/X86LINUX64/*/X86LINUX64/*
new file: hostdepend/X86LINUX64ICC/*/X86LINUX64ICC
for icc
modified: include/Matrix3D.h
modified: include/mrcImage.h
for mrc2mrc
Takuo Yasunaga [Sat, 20 Jul 2013 21:32:31 +0000 (06:32 +0900)]
Modeify compile options for -Wall
modified: src/Config/x86Linux64.inc
Create a new object : eosCuda for CUDA setting
new file: src/Objects/General/eosCuda/
new file: src/Objects/General/eosCuda/inc/eosCuda.h
new file: src/Objects/General/eosCuda/src/eosCuda.c
Add Shepp and Logan models into mrcImageModelCreate
modified: src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.h
Add usage
modified: src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.c
Modefy arrayPCA
modified: src/Objects/General/Array/src/arrayPCA.c
Takuo Yasunaga [Fri, 5 Jul 2013 18:15:10 +0000 (03:15 +0900)]
Recompiling ctfDisplay and Display2
Takuo Yasunaga [Wed, 26 Jun 2013 05:26:37 +0000 (14:26 +0900)]
modified: bin/wish/Display2/tclIndex
modified: hostdepend/X86LINUX64/bin/X86LINUX64/*
Takuo Yasunaga [Tue, 25 Jun 2013 21:58:27 +0000 (06:58 +0900)]
modified: src/Tools/mrcImage/mrcImageAutoRotationCorrelation3D/
Add the function of range restriction
related: modified: src/Objects/DataManip/mrcImage/inc/mrcImage.h
related: modified: src/Objects/DataManip/mrcImage/src/mrcImageInfo.c
modified: src/Objects/DataManip/mrcImage/src/lmrcSinogramFET.h
modified: src/Objects/DataManip/mrcImage/src/lmrcSinogramFETPCA.c
related: previous modification for arrayPCA(add average argument);
Takuo Yasunaga [Mon, 24 Jun 2013 00:48:28 +0000 (09:48 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
.gitignore
src/Objects/*/*/doc/*.html
modified: .gitignore
modified: bin/wish/ctfDisplay/ctfDisplay.wish
modified: hostdepend/I386LINUX/*
modified: hostdepend/X86LINUX64/*
modified: hostdepend/X86MAC64/*
modified: include/mrcImage.h
modified: lib/pdbFile.rb
modified: sbin/makegeneral
modified: src/Config/Template/ToolsTemplate.Dir/src/Makefile
deleted: */.../.EosLog
deleted: */.../*.html.orig
modified: src/Tools/*/*/src/Makefile
Takuo Yasunaga [Sat, 15 Jun 2013 07:03:32 +0000 (16:03 +0900)]
make rebuild for X86LINUX64
modified: .gitignore
modified: bin/wish/Display2/tclIndex
Takuo Yasunaga [Fri, 14 Jun 2013 22:00:31 +0000 (07:00 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
sbin/dotSourceInMakefileCreate
src/Makefile
src/Objects/DataExpress/Contour/doc/Contour.html
src/Objects/DataExpress/alsa/doc/alsa.html
src/Objects/DataExpress/avsFile/doc/avsFile.html
src/Objects/DataExpress/gifFile/doc/gifFile.html
src/Objects/General/.Source
src/Tools/Config/Define.inc
src/Tools/Integration/ctfDisplay/Makefile
src/Tools/Makefile
src/Tools/mrcImage/.Source
src/Tools/mrcImage/Makefile
src/Tools/mrcImage/mrcImage3DPad/src/.EosLog
src/Tools/rec3d/.Source
Takuo Yasunaga [Fri, 14 Jun 2013 19:58:31 +0000 (04:58 +0900)]
new file: bin/mrcImageRandomParticlesImageCreate
new file: bin/pointsSetToPDB
modified: bin/wish/Display2/tclIndex
modified: bin/wish/ctfDisplay/ctfDisplay.wish
modified: hostdepend/I386LINUX/bin/I386LINUX/*
modified: hostdepend/I386LINUX/lib/I386LINUX/*
Takuo Yasunaga [Fri, 14 Jun 2013 18:50:44 +0000 (03:50 +0900)]
modified: env/Eos_env
modified: mrcImage3DPad
add: gsl as a free numerical analysis
modified: sbin/dotSourceInMakefileCreate
modified: src/Makefile
typechange: src/Tools/Makefile
modified: src/Tools/*/*/src/Makefile
Takuo Yasunaga [Fri, 14 Jun 2013 18:05:46 +0000 (03:05 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Sat, 15 Jun 2013 05:30:46 +0000 (14:30 +0900)]
Rebuild for X68MAC
Takuo Yasunaga [Sat, 15 Jun 2013 00:26:12 +0000 (09:26 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
src/Tools/mrcImage/mrcImage3DPad/src/.EosLog
Takuo Yasunaga [Sat, 15 Jun 2013 00:22:16 +0000 (09:22 +0900)]
For consistency
Takuo Yasunaga [Sat, 15 Jun 2013 00:17:03 +0000 (09:17 +0900)]
deleted: hostdepend/X86LINUX64/src/Objects/DataExpress/openGL/src/X86LINUX64/lmolviePDBRead.c
Takuo Yasunaga [Fri, 14 Jun 2013 21:05:26 +0000 (06:05 +0900)]
modified: src/Tools/mrcImage/mrcImage3DPad/src/.EosLog
Takuo Yasunaga [Fri, 14 Jun 2013 17:31:56 +0000 (02:31 +0900)]
Delete needless files
Eos-user [Fri, 14 Jun 2013 17:26:59 +0000 (02:26 +0900)]
make rebuild for I386LINUX
Eos-user [Fri, 14 Jun 2013 10:19:49 +0000 (19:19 +0900)]
new file: mrcImageRandomParticlesImageCreate
modified: bin/wish/ctfDisplay/ctfDisplay.wish
modified: hostdepend/I386LINUX/bin/I386LINUX/*
modified: hostdepend/I386LINUX/src/*/*/*/src/I386LINUX/*
modified: src/Tools/Config/Define.inc
typechange: src/Tools/Integration/Makefile
Eos-user [Tue, 11 Jun 2013 17:13:26 +0000 (02:13 +0900)]
modified: hostdepend/I386LINUX/bin/I386LINUX/*
new file: hostdepend/I386LINUX/lib/I386LINUX/*
new file: hostdepend/I386LINUX/src/Objects/*
modified: hostdepend/I386LINUX/src/Tools/*
new file: hostdepend/I386LINUX/util/I386LINUX/lib/*
modified: src/Config/i386Linux.inc
Eos-user [Tue, 11 Jun 2013 09:27:06 +0000 (18:27 +0900)]
new file: bin/pointsSetToPDB
new file: hostdepend/I386LINUX/bin/I386LINUX/*
new file: hostdepend/I386LINUX/lib/*
modified: hostdepend/I386LINUX/src/Objects/*/I386LINUX/.Source
modified: hostdepend/I386LINUX/src/Tools/*/I386LINUX/.Source
new file: hostdepend/I386LINUX/util/I386LINUX/lib/libglut.so.3
modified: sbin/dotSourceInMakefileCreate
modified: src/Makefile
Takuo Yasunaga [Mon, 3 Jun 2013 19:25:39 +0000 (04:25 +0900)]
modified: .gitignore
Takuo Yasunaga [Fri, 31 May 2013 16:36:54 +0000 (01:36 +0900)]
Change src/Makefile
Takuo Yasunaga [Wed, 29 May 2013 21:29:36 +0000 (06:29 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base into HEAD
Conflicts:
src/Objects/DataManip/transform/doc/transform.html
src/Objects/DataManip/transform/src/lmrc2Dto3D.c
src/Objects/DataManip/transform/src/lmrc3Dto2D.c
src/Objects/General/eosPThread/Makefile
src/Tools/rec3d/mrc2Dto3D/src/.EosLog
src/Tools/rec3d/mrc2Dto3D/src/test/Makefile
src/Tools/rec3d/mrc3Dto2D/src/.EosLog
src/Tools/rec3d/mrc3Dto2D/src/Makefile
Takuo Yasunaga [Wed, 29 May 2013 20:52:21 +0000 (05:52 +0900)]
Bug fixed : mrc2Dto3D
Apply eosPThread to mrc2Dto3D
thread-possible code separation related fftw
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageRhoFiltering.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageRhoFiltering.h
modified: src/Objects/DataManip/mrcImage/src/mrcImageOperation.c
modified: src/Objects/DataManip/mrcImage/src/mrcImageSectionGet.c
modified: src/Objects/DataManip/transform/src/lmrc2Dto3D.c
modified: src/Objects/DataManip/transform/src/lmrc2Dto3D.h
modified: src/Objects/DataManip/transform/src/lmrc3Dto2D.c
modified: src/Tools/rec3d/mrc2Dto3D/Config/OptionControlFile
modified: src/Tools/rec3d/mrc2Dto3D/src/Makefile
modified: src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.c
modified: src/Tools/rec3d/mrc2Dto3D/src/test/Makefile
Takuo Yasunaga [Sun, 12 May 2013 22:31:12 +0000 (07:31 +0900)]
deleted: src/Tools/rec3d/mrc3Dto2D/src/.co.
deleted: src/Tools/rec3d/mrc3Dto2D/src/:
Takuo Yasunaga [Sun, 12 May 2013 22:28:12 +0000 (07:28 +0900)]
modified: src/Config/Template/ToolsTemplate.Dir/src/Makefile
modified: src/Objects/DataManip/mrcImage/src/mrcImageGet.c
modified: src/Objects/DataManip/transform/src/lmrc3Dto2D.c
Takuo Yasunaga [Sun, 12 May 2013 19:16:15 +0000 (04:16 +0900)]
Create eosPThread for parallel computing
new file: include/eosPThread.h
new file: src/Objects/General/eosPThread/inc/eosPThread.h
new file: src/Objects/General/eosPThread/src/eosPThreadCreate.c
new file: src/Objects/General/eosPThread/src/eosPThreadInit.c
new file: src/Objects/General/eosPThread/src/eosPThreadJoin.c
new file: src/Objects/General/eosPThread/src/eosPThreadMutex.c
Apply eosPThread to mrc3Dto2D
modified: include/lmrc3Dto2D.h
modified: src/Objects/DataManip/transform/src/lmrc3Dto2D.c
modified: src/Objects/DataManip/transform/src/lmrc3Dto2D.h
modified: src/Tools/rec3d/mrc3Dto2D/Config/OptionControlFile
modified: src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.c
Modified
modified: src/Objects/DataManip/mrcImage/src/mrcImageWrite.c
** Append mode -> Write mode
modified: src/Objects/DataManip/transform/src/lFETOrientationSearchByFeatureAlignmentInitSet.c
** Apply arrayPCA version up
Takuo Yasunaga [Sat, 25 May 2013 13:18:13 +0000 (22:18 +0900)]
Apply eosPThread to mrc2Dto3D, -pthread
Modify lmrcImageRhoFiltering
Modify x86Mac64.inc
Modify lmrcImageFFT for odd size images
Modify lmrcImageOperation(lmrcImageAdd) for speed up.
Takuo Yasunaga [Sun, 12 May 2013 19:16:15 +0000 (04:16 +0900)]
Create eosPThread for parallel computing
new file: include/eosPThread.h
new file: src/Objects/General/eosPThread/inc/eosPThread.h
new file: src/Objects/General/eosPThread/src/eosPThreadCreate.c
new file: src/Objects/General/eosPThread/src/eosPThreadInit.c
new file: src/Objects/General/eosPThread/src/eosPThreadJoin.c
new file: src/Objects/General/eosPThread/src/eosPThreadMutex.c
Apply eosPThread to mrc3Dto2D
modified: include/lmrc3Dto2D.h
modified: src/Objects/DataManip/transform/src/lmrc3Dto2D.c
modified: src/Objects/DataManip/transform/src/lmrc3Dto2D.h
modified: src/Tools/rec3d/mrc3Dto2D/Config/OptionControlFile
modified: src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.c
Modified
modified: src/Objects/DataManip/mrcImage/src/mrcImageWrite.c
** Append mode -> Write mode
modified: src/Objects/DataManip/transform/src/lFETOrientationSearchByFeatureAlignmentInitSet.c
** Apply arrayPCA version up
Takuo Yasunaga [Sun, 12 May 2013 07:01:29 +0000 (16:01 +0900)]
compilineg : eosPoint and eosList
new file: include/eosList.h
modified: include/eosPoint.h
modified: src/Objects/DataManip/transform/src/lmrc3Dto2D.c
Takuo Yasunaga [Wed, 8 May 2013 08:40:19 +0000 (17:40 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Tue, 7 May 2013 20:01:07 +0000 (05:01 +0900)]
// Modify git command
modified: Makefile
// Create a new command for fitting between two 2D/3D objects using PCA
new file: mrcImageShapePCAFit
new file: src/Objects/DataManip/mrcImage/src/lmrcImageShapePCA.c
new file: src/Objects/DataManip/mrcImage/src/lmrcImageShapePCA.h
modified: src/Tools/mrcImage/mrcImageShapePCA/src/mrcImageShapePCA.c
// Modify Array for PCA. Add average information of each xi
modified: src/Objects/General/Array/inc/Array.h
modified: src/Objects/General/Array/src/arrayPCA.c
modified: src/Objects/General/Array/src/larray2mrc.c
// Modify Matrix3D for PCA. Add matrix3DfromArray
modified: src/Objects/General/Matrix3D/inc/Matrix3D.h
modified: src/Objects/General/Matrix3D/src/matrix3DEulerAngleGet.c
modified: src/Objects/General/Matrix3D/src/matrix3DUtil.c
// Modify pdbPCA for changing arrayPCA
modified: src/Tools/pdbUtil/pdbPCA/src/pdbPCA.c
// Bebuilding
modified: hostdepend/X86MAC64/...
Takuo Yasunaga [Sun, 5 May 2013 03:43:13 +0000 (12:43 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Sun, 5 May 2013 03:42:09 +0000 (12:42 +0900)]
modified: .gitignore
modified: Makefile
new file: examples
Takuo Yasunaga [Sun, 5 May 2013 02:58:20 +0000 (11:58 +0900)]
Merge branch 'master' of git://git.sourceforge.jp/gitroot/eos/base
Conflicts:
util/X86MAC64
Takuo Yasunaga [Sun, 5 May 2013 02:55:44 +0000 (11:55 +0900)]
new file: .gitignore
new file: doc
new file: objects
new file: pione
Takuo Yasunaga [Sun, 5 May 2013 02:20:45 +0000 (11:20 +0900)]
Add util/XXXX , doc , objects as links
Takuo Yasunaga [Sun, 5 May 2013 02:05:13 +0000 (11:05 +0900)]
Delete wrong files
Takuo Yasunaga [Sun, 5 May 2013 01:24:28 +0000 (10:24 +0900)]
modified: sbin/modifyutil
Takuo Yasunaga [Sun, 5 May 2013 01:20:45 +0000 (10:20 +0900)]
Add hostdepend/X86MAC64
Takuo Yasunaga [Sat, 4 May 2013 00:04:35 +0000 (09:04 +0900)]
modified: Makefile
Takuo Yasunaga [Fri, 3 May 2013 20:42:19 +0000 (05:42 +0900)]
modified: Makefile
modified: mrcImageNoiseReductionByRelaxation
modified: src/Tools/Config/Define.inc
Takuo Yasunaga [Mon, 29 Apr 2013 19:16:04 +0000 (04:16 +0900)]
Modified: Makefile
Add --tags for git-push
Takuo Yasunaga [Mon, 29 Apr 2013 07:57:36 +0000 (16:57 +0900)]
Develope a new tool: mrcImageBilateralFilter
lmrcImageBilateralFilter()
in lmrcImageBilateralFilter.c
lmrcImageBilateralFilter.h
Takuo Yasunaga [Wed, 3 Apr 2013 22:51:58 +0000 (07:51 +0900)]
Add mrcImageConvolution
Modify array2mrc
modified: Makefile
new file: bin/mrcImageConvolution
modified: env/Eos_env
new file: hostdepend/X86LINUX64/src/Objects/General/Array/src/X86LINUX64/larray2mrc.c
modified: include/Array.h
new file: include/larray2mrc.h
modified: include/lmrcImageMorphology.h
modified: include/mrcImage.h
new file: src/Objects/General/Array/src/larray2mrc.c
modified: src/Tools/filter/array2mrc/src/array2mrc.c
Takuo Yasunaga [Sun, 31 Mar 2013 09:41:02 +0000 (18:41 +0900)]
Modified Eos/Makefile
modified: Makefile
Add new tools for mathematical morphology
new file: mrcImageClosing
new file: mrcImageDilation
new file: mrcImageErosion
new file: mrcImageOpening
Add new object methods
new file: lmrcImageDilation.c
new file: lmrcImageErosion.c
new file: lmrcImageMorphology.c
new file: lmrcImageOpening.c
new file: lmrcImageDilation.c
new file: lmrcImageErosion.c
new file: lmrcImageMorphology.c
new file: lmrcImageOpening.c
new file: lmrcImageMorphology.h
Add Lee-sigma filter in mrcImageSmoothing
modified: mrcImageSmoothing
Add examples of Makefile in the directory of Integration/
new file: Integration/CTF/Makefile-CTF
new file: Integration/Compare/MakefileCompare
new file: Integration/MultiCTF/Makefile.ForFukunaga
new file: Integration/MultiCTF/Makefile.ForFukunaga2
new file: Integration/RandomConical/Makefile.RandomConical
new file: Integration/RandomConical/Makefile.To.RandomConical
new file: Integration/SingleParticle/Makefile-fromKanae
new file: Integration/Tomography/Makefile.Tomo
new file: Integration/Tomography/Makefile.Tomo2
new file: Integration/Tomography/Makefile.Tomo2-TakazakiVersion
new file: Integration/Tomography/Makefile.Tomo2-TakazakiVersion2
new file: Integration/Tomography/Makefile.fromMingyue20090502
new file: Integration/Tomography/Makefile.fromMingyue20090519
new file: Integration/Tomography/Makefile.fromMingyue2009059
new file: Integration/Tomography/Makefile.fromMingyue20110507
Takuo Yasunaga [Fri, 29 Mar 2013 11:44:08 +0000 (20:44 +0900)]
modified: Makefile
Takuo Yasunaga [Fri, 29 Mar 2013 10:03:54 +0000 (19:03 +0900)]
Modified Eos/Makefile
Takuo Yasunaga [Fri, 29 Mar 2013 03:46:30 +0000 (12:46 +0900)]
Eos_env
Takuo Yasunaga [Sun, 24 Mar 2013 19:44:40 +0000 (04:44 +0900)]
update pdbMove. Add -toOrigin -originTo -GCtoOrigin
Takuo Yasunaga [Sun, 24 Mar 2013 12:12:44 +0000 (21:12 +0900)]
Change util directories
Takuo Yasunaga [Sun, 24 Mar 2013 01:26:08 +0000 (10:26 +0900)]
Update pdbPCA, -oU -oM -oPDB