OSDN Git Service
Takuo Yasunaga [Wed, 1 Oct 2014 11:53:17 +0000 (20:53 +0900)]
Add -thres for mrcImageAutoRotationAverage
modified: mrcImageAutoRotationAverage
Add lmrcImageAverageOverThreshold
modified: src/Objects/DataManip/mrcImage/src/lmrcImageAverage.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageAverage.h
Takuo Yasunaga [Wed, 1 Oct 2014 11:09:10 +0000 (20:09 +0900)]
Create a new tool of mrcImageAutoRotationAverage:
new file: mrcImageAutoRotationAverage
modified: src/Objects/DataManip/mrcImage/src/lmrcImageCorrelation.h
Input/Output separation of struct
Takuo Yasunaga [Mon, 29 Sep 2014 10:35:58 +0000 (19:35 +0900)]
Modifiy mrcImage3DPad: Filament/Sphere/Elliposiod/Rectangle
modified: include/lmrcImage3DPad.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.h
modified: src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c
Modify genUtil.h
Takuo Yasunaga [Sat, 13 Sep 2014 06:13:18 +0000 (15:13 +0900)]
name change eosPointTracker
Takuo Yasunaga [Sat, 13 Sep 2014 06:06:43 +0000 (15:06 +0900)]
Function Added
new file: eosPointProjector
Completed
modified: marker2Dto3DEstimator
Not yet completed
modified: src/Objects/General/eosPoint/inc/eosPoint.h
new file: src/Objects/General/eosPoint/src/eosPointProject.c
modified: src/Objects/General/eosPoint/src/eosPointRead.c
modified: src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c
Takuo Yasunaga [Fri, 12 Sep 2014 11:49:37 +0000 (13:49 +0200)]
Bug fixed: ctrl2init0
modified: sbin/awk/ctrl2init0.awk
kinoshita-eos [Fri, 12 Sep 2014 06:41:34 +0000 (15:41 +0900)]
Bug Fixed: ID 34305: git-fetch-tag in Makefile
modified: Makefile
kinoshita-eos [Fri, 12 Sep 2014 06:06:21 +0000 (15:06 +0900)]
Bug Fixed: help message of option -Shape
modified: src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.c
kinoshita-eos [Thu, 11 Sep 2014 09:25:49 +0000 (18:25 +0900)]
Modify: ID 34305: git-tag-fetch
modified: Makefile
kinoshita-eos [Thu, 11 Sep 2014 06:47:07 +0000 (15:47 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
kinoshita-eos [Thu, 11 Sep 2014 06:43:20 +0000 (15:43 +0900)]
Modify: ID 34304: Initialize of Option -N
modified: src/Tools/mrcImage/mrcImageSiemensStar/src/init.c
Takuo Yasunaga [Wed, 10 Sep 2014 09:24:34 +0000 (11:24 +0200)]
Bug-fixed:
lmrcImageCTFCompensation
-flagWin : Sine window
modified: src/Objects/DataManip/mrcImage/src/lmrcImageCTFCompensation.c
Takuo Yasunaga [Wed, 10 Sep 2014 09:14:32 +0000 (11:14 +0200)]
Usage Bugfixed: +8 -> 8
modified: src/Tools/mrcImage/mrcFFTInfo/src/mrcFFTInfo.c
Takuo Yasunaga [Wed, 10 Sep 2014 08:54:47 +0000 (10:54 +0200)]
mrcFFTInfo: Function Added
with nDivision and angle: mode 7
with SD : +32
with Log : +64
modified: include/mrcImage.h
modified: src/Objects/DataManip/mrcImage/src/lmrcFFTInfo.c
modified: src/Tools/mrcImage/mrcFFTInfo/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcFFTInfo/src/mrcFFTInfo.c
Takuo Yasunaga [Thu, 4 Sep 2014 07:11:20 +0000 (16:11 +0900)]
Ticke: #34276
modified: src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile
typechange: src/Tools/mrcImage/mrcImageSiemensStar/Makefile
modified: src/Tools/mrcImage/mrcImageSiemensStar/doc/Makefile
modified: src/Tools/mrcImage/mrcImageSiemensStar/inc/mrcImageSiemensStar.h
modified: src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.c
modified: src/Tools/mrcImage/mrcImageSiemensStar/src/test/Makefile
Not yet:
new file: env/install-eos.sh
modified: hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/.Depend
modified: hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/Makefile
kinoshita-eos [Thu, 21 Aug 2014 06:57:38 +0000 (15:57 +0900)]
Add: 34213
make git-tag(-XXX) in Makefile.
modified: Makefile
kinoshita-eos [Tue, 19 Aug 2014 06:45:02 +0000 (15:45 +0900)]
Ticket 34171
Add message at make git-push in Makefile.
kinoshita-eos [Mon, 11 Aug 2014 07:58:45 +0000 (16:58 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
kinoshita-eos [Mon, 11 Aug 2014 07:52:08 +0000 (16:52 +0900)]
Add: 34169
Makefile
make git-add -v for optional, data, tutorial, others
Takuo Yasunaga [Mon, 11 Aug 2014 02:37:19 +0000 (11:37 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Mon, 11 Aug 2014 02:34:40 +0000 (11:34 +0900)]
Window Functions were added.
src/Objects/DataManip/mrcImage/src/lmrcImageWindowing.c
src/Objects/DataManip/mrcImage/src/lmrcImageWindowing.h
modified: src/Tools/mrcImage/mrcImageWindowing/Config/OptionControlFile
Teppei Kinoshita [Mon, 11 Aug 2014 02:22:54 +0000 (11:22 +0900)]
Bug fixed:34157
modified: Makefile
for miss of merge.
Teppei Kinoshita [Mon, 11 Aug 2014 01:32:53 +0000 (10:32 +0900)]
Bug fixed:
modified: Makefile
For the case of not working remote rm, when init.
Takuo Yasunaga [Sun, 10 Aug 2014 10:32:08 +0000 (19:32 +0900)]
lmrcImageMasking: Tools to Objects
modified: mrcImageMasking
modified: include/lmrcImageMasking.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMasking.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMasking.h
modified: src/Tools/mrcImage/mrcImageMasking/src/mrcImageMasking.c
Takuo Yasunaga [Sat, 9 Aug 2014 22:51:53 +0000 (07:51 +0900)]
Bug fixed:
modified: Makefile
When GITUSER was not defined, we could not clone GITs.
Takuo Yasunaga [Sat, 9 Aug 2014 20:53:07 +0000 (05:53 +0900)]
Bug fixed:
mrcImageShapePCA
When -C was not defined, wrong processing.
himetani [Thu, 7 Aug 2014 06:57:38 +0000 (15:57 +0900)]
Add Zephyr
Takuo Yasunaga [Wed, 6 Aug 2014 06:51:13 +0000 (15:51 +0900)]
Bug fixed:
EOS_GIT_USER -> EOS_GITUSER
Takuo Yasunaga [Tue, 5 Aug 2014 02:23:13 +0000 (11:23 +0900)]
Add gnuplot as util/bin
At present, we are trying to get utilities by wget/curl.
Takuo Yasunaga [Tue, 5 Aug 2014 01:17:25 +0000 (10:17 +0900)]
Modifiyed mrcImagePixelDataGet: -om (output mode)
modified: mrcImagePixelDataGet
modified: src/Tools/mrcImage/mrcImagePixelDataGet/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.c
Takuo Yasunaga [Mon, 4 Aug 2014 19:43:48 +0000 (04:43 +0900)]
Add new filters for mrcImageSmoothing
Edge and Line Weights Smoothing
Contrast sensitve weights smoothing
Gradient inverse weighted smoothing
modified: mrcImageSmoothing
modified: src/Objects/DataManip/mrcImage/src/lmrcImageSmoothing.c
modified: src/Tools/mrcImage/mrcImageSmoothing/src/test/Makefile
Add new utils:
cmake
gdb
boost
Takuo Yasunaga [Sat, 2 Aug 2014 09:22:54 +0000 (18:22 +0900)]
Update for X86LINUX64ICC
modified: hostdepend/X86LINUX64ICC/*
Takuo Yasunaga [Fri, 1 Aug 2014 21:06:17 +0000 (06:06 +0900)]
Add a new command:
new file: mrcImageStack
Takuo Yasunaga [Fri, 1 Aug 2014 18:41:22 +0000 (03:41 +0900)]
Merged Version for X86LINUX64
modified: env/Eos_env
modified: hostdepend/X86LINUX64/*
new file: hostdepend/X86LINUX64ICC/*
Takuo Yasunaga [Thu, 31 Jul 2014 18:27:55 +0000 (03:27 +0900)]
Bug fixed:
Change lmrcImageDevidedByReal to lmrcImageDividedByReal.
modified: src/Objects/DataManip/transform/src/lmrc2Dto3D.c
modified: src/Tools/mrcImage/mrcImage3DSymmetryFind/src/mrcImage3DSymmetryFind.c
modified: src/Tools/mrcImage/mrcImageCorrelation/src/mrcImageCorrelation.c
modified: src/Tools/mrcImage/mrcImageUnbentROI/src/mrcImageUnbentROI.c
Filename Changed
deleted: src/Objects/DataManip/mrcImage/src/1
deleted: src/Objects/DataManip/mrcImage/src/lmrcImagePrevitt.c
Takuo Yasunaga [Thu, 31 Jul 2014 18:16:17 +0000 (03:16 +0900)]
Add new functions
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageEdgeEnhancement
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageSmoothing
modified: include/lmrcImageEdgeEnhancement.h
Add Negative Laplacian
modified: src/Objects/DataManip/mrcImage/src/lmrcImageEdgeEnhancement.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageEdgeEnhancement.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageNegativeLaplacian.c
Add Weighted Mean Filter
modified: src/Objects/DataManip/mrcImage/src/lmrcImageSmoothing.c
Takuo Yasunaga [Tue, 29 Jul 2014 13:58:42 +0000 (22:58 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
bin/wish/Display2/tclIndex
src/Tools/mrcImage/Makefile
Takuo Yasunaga [Sun, 27 Jul 2014 23:05:46 +0000 (08:05 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so
lib/tclIndex
Takuo Yasunaga [Sun, 27 Jul 2014 22:48:24 +0000 (07:48 +0900)]
Bug fixed: mrc2map
modified: src/Objects/DataManip/mapFile/src/mapFileRead.c
modified: src/Tools/mrcImage/mrc2dsn6/src/mrc2dsn6.c
modified: src/Tools/mrcImage/mrc2map/src/mrc2map.c
modified: src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile
Eos [Sun, 27 Jul 2014 11:15:49 +0000 (20:15 +0900)]
Rebuild for Tools:
Eos [Sun, 27 Jul 2014 09:15:57 +0000 (18:15 +0900)]
lmrcImageFFT: for CUDA
Bug fixed: fo cufftw
modified: bin/wish/Display2/tclIndex
modified: env/Eos_env
modified: lib/tclIndex
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c
modified: src/Tools/Config/Define.inc
typechange: src/Tools/Makefile
typechange: src/Tools/mrcImage/Makefile
modified: src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
modified: src/Tools/mrcImage/mrcImageFFT/doc/Makefile
modified: src/Tools/mrcImage/mrcImageFFT/src/mrcImageFFT.c
Takuo Yasunaga [Sat, 12 Jul 2014 13:38:00 +0000 (22:38 +0900)]
Change ln to cp
typechange: src/Tools/Makefile
Takuo Yasunaga [Sat, 12 Jul 2014 13:35:06 +0000 (22:35 +0900)]
Add a new funciton and fixed bugs : mrcImageEdgeEnhancement
modified: include/lmrcImageEdgeEnhancement.h
new file: src/Objects/DataManip/mrcImage/src/lmrcImageDifferential.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageEdgeEnhancement.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageEdgeEnhancement.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImagePrevitt.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageRoberts.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageSobel.c
modified: src/Tools/Config/Define.inc
Takuo Yasunaga [Wed, 9 Jul 2014 23:40:31 +0000 (08:40 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Wed, 9 Jul 2014 23:40:08 +0000 (08:40 +0900)]
modified: .gitignore
Takuo Yasunaga [Wed, 9 Jul 2014 23:22:39 +0000 (08:22 +0900)]
Modified:
Makefile for CUDA/nvcc
Modified:
modified: .gitignore
modified: bin/wish/Display2/tclIndex
rebuild:
modified: hostdepend/X86LINUX64/bin/X86LINUX64/*
modified: hostdepend/X86LINUX64/lib/X86LINUX64/*
Takuo Yasunaga [Mon, 7 Jul 2014 10:29:01 +0000 (19:29 +0900)]
mrcImageGetPixels for CUDA/No Cuda
modified: include/mrcImage.h
new file: include/mrcImageGetPixelsCUDA.h
modified: src/Config/x86Mac64.inc
modified: src/Objects/DataManip/mrcImage/inc/mrcImage.h
new file: src/Objects/DataManip/mrcImage/src/mrcImageGetPixels.c
new file: src/Objects/DataManip/mrcImage/src/mrcImageGetPixelsCUDA.cu
new file: src/Objects/DataManip/mrcImage/src/mrcImageGetPixelsCUDA.h
modified: src/Tools/Config/Define.inc
mrcImagePixelDataGet for CUDA:
modified: src/Tools/mrcImage/mrcImagePixelDataGet/*
Takuo Yasunaga [Tue, 1 Jul 2014 02:57:36 +0000 (11:57 +0900)]
Bug fixed:
modified: mrcImageInfo
modified: src/Objects/DataManip/mrcImage/src/mrcImageInfo.c
Takuo Yasunaga [Sat, 28 Jun 2014 04:39:24 +0000 (13:39 +0900)]
A new command : for floating. Previously, we have used mrcImagePad for floating
new file: bin/mrcImageFloating
new file: src/Objects/DataManip/mrcImage/src/lmrcImageFloating.c
new file: src/Objects/DataManip/mrcImage/src/lmrcImageFloating.h
new file: src/Tools/mrcImage/mrcImageFloating/*
Takuo Yasunaga [Wed, 25 Jun 2014 21:48:15 +0000 (06:48 +0900)]
Bug fixed for Color Images:
modified: src/Objects/DataManip/bmpFile/src/bmpFileRead.c
modified: src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
modified: src/Tools/filter/bmp2mrc/src/test/Makefile
Takuo Yasunaga [Wed, 25 Jun 2014 20:48:27 +0000 (05:48 +0900)]
Add a new function:
BMP File Format:
new file: bin/bmp2mrc
new file: bin/bmpFileInfo
new file: include/bmpFile.h
new file: src/Objects/DataManip/bmpFile/*
new file: src/Objects/DataManip/bmpFile/inc/bmpFile.h
new file: src/Objects/DataManip/bmpFile/src/bmpFileInfo.c
new file: src/Objects/DataManip/bmpFile/src/bmpFileRead.c
new file: src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
new file: src/Tools/bmpFile/
new file: src/Tools/bmpFile/bmpFileInfo/*
new file: src/Tools/filter/bmp2mrc/*
Modify Makefile to see gcc commands
modified: src/Config/Template/ObjectsTemplate.Dir/src/ARCH/Makefile
modified: src/Config/x86Mac64.inc
modified: src/Objects/DataManip/Makefile
Install ruby1.9.1
new file: hostdepend/X86MAC64/util/X86MAC64/lib/ruby/1.9.1/*
new file: hostdepend/X86MAC64/util/X86MAC64/share/ri/1.9.1/*
Takuo Yasunaga [Sun, 22 Jun 2014 23:17:06 +0000 (08:17 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Sun, 22 Jun 2014 23:12:21 +0000 (08:12 +0900)]
Rebuild for X86LINUX:
modified: hostdepend/X86LINUX64/bin/X86LINUX64/*
Takuo Yasunaga [Sun, 22 Jun 2014 22:28:47 +0000 (07:28 +0900)]
Bug fixed:
Takuo Yasunaga [Sun, 22 Jun 2014 22:15:25 +0000 (07:15 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Sun, 22 Jun 2014 22:11:32 +0000 (07:11 +0900)]
Bug fixed:
Conflicts:
src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
src/Objects/DataExpress/gifFile/doc/gifFile.html
src/Objects/DataExpress/openGL/doc/openGL.html
src/Objects/DataExpress/psFile/doc/psFile.html
src/Objects/DataManip/ctfInfo/doc/ctfInfo.html
src/Objects/DataManip/llData/doc/llData.html
src/Objects/DataManip/transform/doc/transform.html
src/Objects/General/Matrix3D/doc/Matrix3D.html
src/Objects/General/Vector/doc/Vector.html
src/Tools/DCDFile/dcdAtomChangeDistanceFromAtom/src/dcdAtomChangeDistanceFromAtom.html
src/Tools/DCDFile/dcdAtomDistanceDistribution/src/dcdAtomDistanceDistribution.html
src/Tools/DCDFile/dcdFilePrint/src/dcdFilePrint.html
src/Tools/DCDFile/dcdInfo/src/dcdInfo.html
src/Tools/DCDFile/dcdSelectAtoms/src/dcdSelectAtoms.html
src/Tools/DCDFile/dcdSerectAtom/src/dcdSerectAtom.html
src/Tools/DCDFile/dcdTimeSeriesBehavior/src/dcdTimeSeriesBehavior.html
src/Tools/Integration/Display2/src/Display2.html
src/Tools/Integration/StereoDisplay/src/StereoDisplay.html
src/Tools/database/homology2PG/src/homology2PG.html
src/Tools/database/pgJournalSelect/src/pgJournalSelect.html
src/Tools/database/pgSelect/src/pgSelect.html
src/Tools/mrcImage/mrc2hdf/src/ALPHA
src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX
src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX5
src/Tools/mrcImage/mrc2hdf/src/ALPHAOSF1
src/Tools/mrcImage/mrc2hdf/src/HP
src/Tools/mrcImage/mrc2hdf/src/I386LINUX
src/Tools/mrcImage/mrc2hdf/src/SGI
src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
src/Tools/mrcImage/mrcImageSphereCheck/src/mrcImageSphereCheck.html
src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html
src/Tools/mrcImage/mrcImageSuperResolution/src/mrcImageSuperResolution.html
src/Tools/mrcImage/mrcImageVolumeCalc/src/mrcImageVolumeCalc.html
src/Tools/mrcImage/mrcImageWindowing/src/mrcImageWindowing.html
src/Tools/mrcImage/mrcSinogramFETsmoothParameterMatching/src/mrcSinogramFETsmoothParameterMatching.html
src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html
src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html
src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html
src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html
src/Tools/pdbUtil/pdbMove/src/pdbMove.html
src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html
src/Tools/pdbUtil/pdbRhoFit/src/pdbRhoFit.html
src/Tools/pdbUtil/pdbRhoFitTm/src/pdbRhoFitTm.html
src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html
src/Tools/pdbUtil/pdbTrans/src/pdbTrans.html
src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
src/Tools/rec3d/commonLinesSearchByVoting/src/commonLinesSearchByVoting.html
Takuo Yasunaga [Sun, 22 Jun 2014 15:06:06 +0000 (00:06 +0900)]
rebuild: for X86LINUX64/X86LINUX64ICC
modified: hostdepend/X86LINUX64/bin/X86LINUX64/*
modified: hostdepend/X86LINUX64ICC/bin/X86LINUX64ICC/*
Takuo Yasunaga [Sun, 22 Jun 2014 15:03:48 +0000 (00:03 +0900)]
Create a new command for edge enhancement before edge detection
new file: mrcImageEdgeEnhancement
modified: lmrcImageEdgeEnhancement.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageEdgeEnhancement.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageEdgeEnhancement.h
new file: src/Objects/DataManip/mrcImage/src/lmrcImagePrevitt.c
new file: src/Objects/DataManip/mrcImage/src/lmrcImageRoberts.c
new file: src/Objects/DataManip/mrcImage/src/lmrcImageSobel.c
modified: src/Tools/Config/Define.inc
modified: src/Tools/mrcImage/mrcImageEdgeEnhancement/*
Takuo Yasunaga [Sat, 21 Jun 2014 11:32:18 +0000 (20:32 +0900)]
CUDA_OPTS:
modified: env/Eos_env
modified: src/Config/x86Linux64.inc
modified: src/Config/x86Linux64icc.inc
modified: src/Config/x86Mac64.inc
Takuo Yasunaga [Sat, 21 Jun 2014 09:18:51 +0000 (18:18 +0900)]
Create a new command:
new file: bin/mrcImageDividedByFile
new file: hostdepend/X86MAC64/bin/X86MAC64/mrcImageDividedByFile
Bug fixed: Devided -> Divided : Spell-missing
modified: include/mrcImage.h
modified: src/Objects/DataManip/mrcImage/inc/mrcImage.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageAverage.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMontageCreate.c
modified: src/Objects/DataManip/mrcImage/src/mrcImageOperation.c
modified: src/Tools/Config/Define.inc
new file: src/Tools/mrcImage/mrcImageDividedByFile/*
Takuo Yasunaga [Sat, 21 Jun 2014 07:11:26 +0000 (16:11 +0900)]
Create A new tool:
new file: bin/mrcImageLogicalOperation
new file: hostdepend/X86MAC64/bin/X86MAC64/mrcImageLogicalOperation
new file: lmrcImageLogic.h
new file: lmrcImageLogicalOperation.c
modified: src/Tools/Config/Define.inc
new file: src/Tools/mrcImage/mrcImageLogicalOperation/*
Config/Define.inc
Takuo Yasunaga [Sat, 21 Jun 2014 04:06:21 +0000 (13:06 +0900)]
Create New Tools:
new file: mrcImageBottomHatTransform
new file: mrcImageTopHatTransform
new file: include/lmrcImageEdgeEnhancement.h
new file: src/Objects/DataManip/mrcImage/src/lmrcImageBottomHatTransform.c
new file: src/Objects/DataManip/mrcImage/src/lmrcImageTopHatTransform.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMorphology.h
modified: src/Tools/Config/Define.inc
modified: src/Tools/Makefile
Under construction
modified: include/lmrcImageMorphology.h
new file: src/Tools/mrcImage/mrcImageEdgeEnhancement/*
Takuo Yasunaga [Fri, 20 Jun 2014 22:39:23 +0000 (07:39 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Fri, 20 Jun 2014 22:37:54 +0000 (07:37 +0900)]
Under construction.
modified: hostdepend/X86MAC64/src/Tools/rec3d/marker2Dto3DEstimator/src/X86MAC64/marker2Dto3DEstimator
modified: src/Tools/rec3d/marker2Dto3DEstimator/Config/OptionControlFile
modified: src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c
Takuo Yasunaga [Sun, 15 Jun 2014 18:50:00 +0000 (03:50 +0900)]
rebuild
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
src/Tools/Config/Define.inc
src/Tools/Integration/Display2/src/Display2.html
src/Tools/mrcImage/mrc2hdf/src/ALPHA
src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX
src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX5
src/Tools/mrcImage/mrc2hdf/src/ALPHAOSF1
src/Tools/mrcImage/mrc2hdf/src/HP
src/Tools/mrcImage/mrc2hdf/src/I386LINUX
src/Tools/mrcImage/mrc2hdf/src/SGI
src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html
new file: bin/mrcImageAsProbability
new file: bin/mrcImageDeconvolution
new file: hostdepend/I386LINUX/bin/I386LINUX/StereoDisplay
modified: hostdepend/I386LINUX/lib/I386LINUX/*
modified: hostdepend/X86LINUX64/bin/X86LINUX64/*
Takuo Yasunaga [Sun, 15 Jun 2014 16:34:19 +0000 (01:34 +0900)]
Rebuild
modified: hostdepend/I386LINUX/bin/I386LINUX/*
Takuo Yasunaga [Sun, 15 Jun 2014 16:26:57 +0000 (01:26 +0900)]
Modify Eos_env for no CUDA
modified: env/Eos_env
Rebuild
modified: hostdepend/I386LINUX/bin/I386LINUX/*
modified: hostdepend/I386LINUX/lib/I386LINUX/*
modified: hostdepend/I386LINUX/lib/I386LINUX/shared/*
modified: hostdepend/I386LINUX/src/Objects/*
copied: hostdepend/I386LINUX/lib/I386LINUX/*
Modify the belows for no CUDA
modified: src/Config/i386Linux.inc
modified: src/Objects/DataManip/mrcImage/src/lmrcImageAddValue.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c
modified: src/Objects/DataManip/pdbFile/src/pdbTrans.c
modified: src/Objects/General/eosCuda/src/eosCuda.cu
modified: src/Tools/Config/Define.inc
typechange: src/Tools/Makefile
modified: src/Tools/mrcImage/mrcImageAddValue/Config/Define.inc
modified: src/Tools/mrcImage/mrcImageAddValue/src/mrcImageAddValue.c
typechange: src/Tools/pdbUtil/Makefile
modified: src/Tools/pdbUtil/pdbTrans/*
Takuo Yasunaga [Sun, 15 Jun 2014 07:10:07 +0000 (16:10 +0900)]
Bug fixed:
modified: Makefile
Add rebuild-src to modify src/Objects/Makefile and src/Tools/Makefile
new file: bin/marker2Dto3DEstimator
Rebuild:
modified: hostdepend/I386LINUX/bin/I386LINUX/*
modified: hostdepend/I386LINUX/*
Takuo Yasunaga [Wed, 11 Jun 2014 04:33:47 +0000 (13:33 +0900)]
New tools
new file: bin/mrcImageAsProbability
new file: bin/mrcImageDeconvolution
new file: bin/marker2Dto3DEstimator
Takuo Yasunaga [Wed, 4 Jun 2014 10:16:48 +0000 (19:16 +0900)]
Bug fixed:
modified: src/Objects/DataManip/transform/src/lmrc2Dto3D.c
Takuo Yasunaga [Sun, 1 Jun 2014 06:42:05 +0000 (15:42 +0900)]
lmrc2Dto3d: Weighted Back-projection
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Sun, 1 Jun 2014 06:38:42 +0000 (15:38 +0900)]
Add weighted Back-projection lmrc2Dto3D: -m 2
modified: src/Objects/DataManip/transform/src/lmrc2Dto3D.c
modified: src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c
modified: src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.c
Eos [Sat, 31 May 2014 22:29:14 +0000 (07:29 +0900)]
Bug fixed: git-clone
modified: Makefile
Takuo Yasunaga [Fri, 30 May 2014 02:59:29 +0000 (11:59 +0900)]
Bug fixed:
modified: src/Tools/rec3d/mrcImageInverseRadonTransform/src/mrcImageInverseRadonTransform.c
Under construction:
modified: src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c
Takuo Yasunaga [Tue, 27 May 2014 09:04:44 +0000 (18:04 +0900)]
modified: env/Eos_env
for $CUDA_ROOT/lib
Takuo Yasunaga [Tue, 27 May 2014 07:54:39 +0000 (16:54 +0900)]
modified: env/Eos_env
for OS-X 10.9 and 10.8 System Call Change
Takuo Yasunaga [Mon, 26 May 2014 18:38:46 +0000 (03:38 +0900)]
Bug fixed:
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImagePad
modified: hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageFFT.sharedo
modified: hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageTriming.sharedo
new file: hostdepend/X86MAC64/util/X86MAC64/cuda
modified: src/Objects/DataManip/mrcImage/src/lmrcImageTriming.c
Takuo Yasunaga [Mon, 26 May 2014 17:46:56 +0000 (02:46 +0900)]
modified: env/Eos_env
modify util/HOSTDIR/bin
modified: include/Matrix3D.h
modified: include/eosPoint.h
modified: include/genUtil.h
modified: include/lmrcImageMasking.h
modified: src/Objects/General/Matrix3D/inc/Matrix3D.h
modified: src/Objects/General/Memory/inc/Memory.h
modified: src/Objects/General/Memory/src/memoryAllocate.c
modified: src/Objects/General/Memory/src/memoryByteSwap.c
new file: src/Objects/General/eosFunc/*
Add a new object of eosFunc: Sync/Rect
modified: src/Objects/General/eosPoint/*
Add eosPoint for maker
new file: bin/eosPointRotation
new file: src/Tools/rec3d/marker2Dto3DEstimator/*
Not yet completed
Takuo Yasunaga [Fri, 23 May 2014 22:41:19 +0000 (07:41 +0900)]
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMasking.h
modified: src/Tools/mrcImage/mrcImageMasking/src/mrcImageMasking.c
Takuo Yasunaga [Fri, 23 May 2014 22:26:34 +0000 (07:26 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
bin/wish/Display2/tclIndex
modified: env/Eos_env
modified: hostdepend/X86MAC64/*
modified: src/Config/x86Mac64.inc
Takuo Yasunaga [Fri, 23 May 2014 21:59:50 +0000 (06:59 +0900)]
new file: Integration/Averaging2D/*
new file: include/eosFunc.h
modified: include/lmrc2Dto3D.h
modified: include/lmrcImageRhoFiltering.h
Add RhoFiltering Mode
modified: src/Objects/DataManip/mrcImage/src/lmrcImageRhoFiltering.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageRhoFiltering.h
modified: src/Objects/DataManip/transform/src/lmrc2Dto3D.c
modified: src/Objects/DataManip/transform/src/lmrc2Dto3D.h
Add New Objects, eosFunc : sinc, rect
new file: src/Objects/General/eosFunc/*
modified: src/Tools/Config/Define.inc
typechange: src/Tools/Makefile
Add RhoFiltering
modified: src/Tools/rec3d/mrc2Dto3D/Config/OptionControlFile
typechange: src/Tools/rec3d/mrc2Dto3D/Makefile
modified: src/Tools/rec3d/mrc2Dto3D/inc/mrc2Dto3D.h
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
OSDN Git Service
