OSDN Git Service
Takuo Yasunaga [Tue, 30 Dec 2014 04:32:32 +0000 (13:32 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
bin/wish/Display2/tclIndex
Takuo Yasunaga [Tue, 30 Dec 2014 04:29:35 +0000 (13:29 +0900)]
Updated: HoughTransform
Takuo Yasunaga [Tue, 30 Dec 2014 01:20:41 +0000 (10:20 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
bin/wish/Display2/tclIndex
src/Tools/Integration/Display2/src/Display2.html
src/Tools/Makefile
Takuo Yasunaga [Mon, 29 Dec 2014 05:03:23 +0000 (14:03 +0900)]
Rebuild and merge:
Takuo Yasunaga [Mon, 22 Dec 2014 09:30:34 +0000 (18:30 +0900)]
Rebuild:
Takuo Yasunaga [Sun, 21 Dec 2014 17:31:08 +0000 (02:31 +0900)]
New tool: mrcImageHoughTransform, mrcImageHoughTransformInverse, mrcImageToneReversal
Rebuild:
himatani_cafe [Tue, 9 Dec 2014 15:56:27 +0000 (00:56 +0900)]
After merge
himatani_cafe [Tue, 9 Dec 2014 15:48:38 +0000 (00:48 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
himatani_cafe [Tue, 9 Dec 2014 15:42:36 +0000 (00:42 +0900)]
temp
Takuo Yasunaga [Sun, 30 Nov 2014 23:09:44 +0000 (08:09 +0900)]
Recompiled: for 32bits to 64bits
Takuo Yasunaga [Sun, 30 Nov 2014 10:37:35 +0000 (19:37 +0900)]
Conflicts:
bin/wish/Display2/tclIndex
src/Tools/Config/Define.inc
src/Tools/Integration/Display2/src/Display2.html
src/Tools/Makefile
src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html
Merge
modified: .gitignore
modified: Makefile
Takuo Yasunaga [Sun, 30 Nov 2014 07:45:20 +0000 (16:45 +0900)]
Delete data:
Takuo Yasunaga [Sun, 30 Nov 2014 05:09:16 +0000 (14:09 +0900)]
32bits to 64bts
modified: hostdepend/X86LINUX64/bin/X86LINUX64/
modified: src/Objects/DataManip/mrcImage/src/mrcImageInit.c
modified: src/Objects/DataManip/mrcImage/src/mrcImageRead.c
modified: src/Tools/Config/Define.inc
Ruby related:
new file: hostdepend/X86LINUX64/util/X86LINUX64/bin/bundle
modified: hostdepend/X86LINUX64/util/X86LINUX64/bin/gem
modified: src/Objects/DataManip/mrcImage/src/mrcImageInit.c
modified: src/Objects/DataManip/mrcImage/src/mrcImageRead.c
modified: src/Tools/Config/Define.inc
himatani_cafe [Sun, 30 Nov 2014 00:12:50 +0000 (09:12 +0900)]
Arranged Page Logic
himatani_cafe [Sat, 29 Nov 2014 22:28:34 +0000 (07:28 +0900)]
Create Dir on Front End
himatani_cafe [Wed, 26 Nov 2014 10:09:18 +0000 (19:09 +0900)]
Before implementation of createDirModal
Takuo Yasunaga [Tue, 25 Nov 2014 20:12:33 +0000 (05:12 +0900)]
Remove tclIndex
modified: .gitignore
modified: bin/wish/Display2/tclIndex
Change
modified: src/Tools/Config/Define.inc
typechange: src/Tools/Makefile
typechange: src/Tools/mrcImage/mrcImageInfo/doc/Makefile
modified: src/Tools/mrcImage/mrcImageInfo/src/argCheck.c
himatani_cafe [Sat, 22 Nov 2014 14:22:56 +0000 (23:22 +0900)]
Modified navbar
Takuo Yasunaga [Sat, 22 Nov 2014 06:44:46 +0000 (15:44 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
bin/wish/Display2/tclIndex
Takuo Yasunaga [Sat, 22 Nov 2014 06:30:40 +0000 (15:30 +0900)]
Modified: Makefile for update, All tools have been updated using make update.
modified: Makefile
Takuo Yasunaga [Fri, 21 Nov 2014 23:10:28 +0000 (08:10 +0900)]
modified: src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
Takuo Yasunaga [Fri, 21 Nov 2014 23:06:05 +0000 (08:06 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
bin/wish/Display2/tclIndex
src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log
src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
Takuo Yasunaga [Fri, 21 Nov 2014 21:50:17 +0000 (06:50 +0900)]
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
himatani_cafe [Fri, 21 Nov 2014 03:37:51 +0000 (12:37 +0900)]
Little Modification (without tickets)
himatani_cafe [Fri, 21 Nov 2014 01:44:12 +0000 (10:44 +0900)]
Modified routing and rename main-page
Takuo Yasunaga [Thu, 20 Nov 2014 22:32:43 +0000 (07:32 +0900)]
mrcImageShrink: test
Add libhdf5
himatani_cafe [Sat, 8 Nov 2014 08:52:16 +0000 (17:52 +0900)]
Updated Zephry to AngularJS Implimentation
Takuo Yasunaga [Mon, 3 Nov 2014 19:39:28 +0000 (04:39 +0900)]
Bug fixed:
Eos_env
install-eos.sh
Takuo Yasunaga [Mon, 3 Nov 2014 03:08:27 +0000 (12:08 +0900)]
recompiled for cuda:
Takuo Yasunaga [Mon, 3 Nov 2014 00:10:59 +0000 (09:10 +0900)]
Move test data from src/bin directories to data/.
Takuo Yasunaga [Sat, 1 Nov 2014 07:40:20 +0000 (16:40 +0900)]
Rebuld:
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageAutoCorrelationWithWindowing
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageCTFCompensationForTiltImage
copied: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNormalizedSubtraction/src/X86LINUX64/mrcImageNormalizedSubtraction -> hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageNormalizedSubtraction
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageSpatialFrequencyFilter
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libArray.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libTclTk.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libctfInfo.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libgifFile.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libllData.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libpdbFile.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libtransform.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageSpatialFrequencyFilter.sharedo
modified: hostdepend/X86LINUX64/src/Objects/DataExpress/TclTk/src/X86LINUX64/libTclTk.a
modified: hostdepend/X86LINUX64/src/Objects/DataExpress/gifFile/src/X86LINUX64/libgifFile.a
modified: hostdepend/X86LINUX64/src/Objects/DataManip/ctfInfo/src/X86LINUX64/libctfInfo.a
modified: hostdepend/X86LINUX64/src/Objects/DataManip/llData/src/X86LINUX64/libllData.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/lmrcImageSpatialFrequencyFilter.sharedo
modified: hostdepend/X86LINUX64/src/Objects/DataManip/pdbFile/src/X86LINUX64/libpdbFile.a
modified: hostdepend/X86LINUX64/src/Objects/DataManip/transform/src/X86LINUX64/libtransform.a
modified: hostdepend/X86LINUX64/src/Objects/General/Array/src/X86LINUX64/libArray.a
new file: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageAutoCorrelationWithWindowing/src/X86LINUX64/mrcImageAutoCorrelationWithWindowing
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/X86LINUX64/mrcImageCTFCompensationForTiltImage
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNormalizedSubtraction/src/X86LINUX64/mrcImageNormalizedSubtraction
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/X86LINUX64/mrcImageSpatialFrequencyFilter
modified: src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
modified: src/Tools/Integration/Display2/src/Display2.html
modified: src/Tools/mrcImage/mrcImageAutoCorrelationWithWindowing/src/mrcImageAutoCorrelationWithWindowing.html
modified: src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
typechange: src/Tools/mrcImage/mrcImageNormalizedSubtraction/Makefile
modified: src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html
Takuo Yasunaga [Sat, 1 Nov 2014 01:08:07 +0000 (10:08 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
bin/wish/Display2/tclIndex
env/install-eos.sh
modified: Makefile
modified: bin/wish/Display2/tclIndex
modified: env/Eos_env
modified: env/install-eos.sh
deleted: examples
deleted: hostdepend/X86LINUX64/util/X86LINUX64/share/ri/1.9.1/system/REXML/Parsers/XPathParser/Predicate-i.ri
deleted: hostdepend/X86LINUX64/util/X86LINUX64/share/ri/1.9.1/system/REXML/Parsers/XPathParser/predicate-i.ri
Takuo Yasunaga [Sat, 1 Nov 2014 00:57:36 +0000 (09:57 +0900)]
To Merge:
modified: bin/wish/Display2/tclIndex
modified: env/install-eos.sh
Takuo Yasunaga [Sat, 1 Nov 2014 00:42:15 +0000 (09:42 +0900)]
Modified dotSourceInMakefileCreate:
modified: sbin/dotSourceInMakefileCreate
modified: src/Config/Template/Makefile
modified: src/Makefile
modified: src/Objects/.Source.org
Recompiled:
deleted: hostdepend/X86LINUX64/util/X86LINUX64/share/ri/1.9.1/system/REXML/Parsers/XPathParser/Predicate-i.ri
deleted: hostdepend/X86LINUX64/util/X86LINUX64/share/ri/1.9.1/system/REXML/Parsers/XPathParser/predicate-i.ri
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageCTFCompensationForTiltImage
modified: hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/X86MAC64/mrcImageCTFCompensationForTiltImage
modified: src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
modified: src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/mrcImageCTFCompensationForTiltImage.c
pione-dir: deleted
deleted: pione
kinoshita-eos [Mon, 27 Oct 2014 08:42:46 +0000 (17:42 +0900)]
Bug fixed: No.34544: -o help meesage in mrcImageSpatialFrequencyFilter
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageSpatialFrequencyFilter
modified: src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/Config/OptionControlFile
typechange: src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/doc/Makefile
modified: src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.html
modified: src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/usage.c
Takuo Yasunaga [Mon, 27 Oct 2014 07:05:23 +0000 (16:05 +0900)]
Bug fixed:
modified: Makefile
modified: sbin/makegeneral
modified: src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c
typechange: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile
Takuo Yasunaga [Sun, 26 Oct 2014 00:34:11 +0000 (09:34 +0900)]
Conflicts:
src/Tools/Makefile
src/Tools/mrcImage/Makefile
Takuo Yasunaga [Sun, 26 Oct 2014 00:22:36 +0000 (09:22 +0900)]
install command
env/install-eos.sh
Takuo Yasunaga [Sun, 26 Oct 2014 00:21:48 +0000 (09:21 +0900)]
modified: env/Eos_env
modified: env/install-eos.sh
Takuo Yasunaga [Sat, 25 Oct 2014 06:57:41 +0000 (15:57 +0900)]
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
Takuo Yasunaga [Wed, 22 Oct 2014 03:19:02 +0000 (12:19 +0900)]
Bug fixed: for -NoiseWeighted Brestore
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFourierNeighborCorrelation
Takuo Yasunaga [Sun, 19 Oct 2014 15:23:57 +0000 (00:23 +0900)]
rebuild: mrcImageWindowing
Takuo Yasunaga [Sun, 19 Oct 2014 15:01:31 +0000 (00:01 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
src/Tools/mrcImage/mrcImageWindowing/src/mrcImageWindowing.html
Takuo Yasunaga [Sun, 19 Oct 2014 14:58:39 +0000 (23:58 +0900)]
Add exp/gauss window: lmrcImageWindowing
modified: src/Objects/DataManip/mrcImage/src/lmrcImageWindowing.c
Takuo Yasunaga [Sun, 19 Oct 2014 14:18:48 +0000 (23:18 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
src/Tools/Integration/Display2/src/Display2.html
src/Tools/mrcImage/mrcImageAutoCorrelationWithWindowing/src/mrcImageAutoCorrelationWithWindowing.html
src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html
src/Tools/mrcImage/mrcImageWindowing/src/mrcImageWindowing.html
Takuo Yasunaga [Sun, 19 Oct 2014 13:21:10 +0000 (22:21 +0900)]
recompiled:
modified: hostdepend/X86LINUX64/*
bin/X86LINUX64/CheckCommonLineData
Takuo Yasunaga [Sun, 19 Oct 2014 09:04:25 +0000 (18:04 +0900)]
rebuild: for X86MAC64
modified: hostdepend/X86MAC64/*
Takuo Yasunaga [Sun, 19 Oct 2014 06:50:15 +0000 (15:50 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Sun, 19 Oct 2014 06:43:55 +0000 (15:43 +0900)]
Modified tools: mrcImageFourierNeighborCorrelation / mrcImageFourierShellCorrelation
Weighted Noise for mrcImageSpatialFrequencyFilter (Smoothing considering FSC)
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFourierNeighborCorrelation.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFourierNeighborCorrelation.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFourierShellCorrelation.c
modified: src/Tools/Config/Define.inc
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Config/OptionControlFile
typechange: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/inc/mrcImageFourierNeighborCorrelation.h
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/test/Makefile
for testing:
modified: src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/test/Makefile
Modified Tools: mrcInfo %ld -> %d
modified: src/Objects/DataManip/mrcImage/src/mrcImagePrint.c
Under construction:
modified: env/Eos_env
modified: env/install-eos.sh
modified: src/Objects/DataManip/mrcImage/src/lmrcImageWindowing.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageWindowing.h
kinoshita-eos [Fri, 17 Oct 2014 07:33:18 +0000 (16:33 +0900)]
Modify: Eos_env: First AID for case of no CUDA.
modified: env/Eos_env
Takuo Yasunaga [Wed, 15 Oct 2014 20:46:19 +0000 (05:46 +0900)]
Recompiled:
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageNullImageCreate
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNullImageCreate/src/X86LINUX64/mrcImageNullImageCreate
Takuo Yasunaga [Wed, 15 Oct 2014 19:46:43 +0000 (04:46 +0900)]
Modified: mrcImageNullImageCreate
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageNullImageCreate
modified: src/Tools/Config/Define.inc
typechange: src/Tools/mrcImage/Makefile
modified: src/Tools/mrcImage/mrcImageNullImageCreate/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.c
Takuo Yasunaga [Wed, 15 Oct 2014 18:39:17 +0000 (03:39 +0900)]
Bug fixed:
modified: env/Eos_env
Under construction:
modified: env/install-eos.sh
Takuo Yasunaga [Tue, 14 Oct 2014 10:50:51 +0000 (19:50 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
src/Objects/DataManip/mrcImage/src/mrcImagePrint.c
Recompiled:
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.html
Takuo Yasunaga [Tue, 14 Oct 2014 10:47:57 +0000 (19:47 +0900)]
Bug fixed:
modified: src/Objects/DataManip/mrcImage/src/mrcImagePrint.c
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c
Takuo Yasunaga [Tue, 14 Oct 2014 09:58:00 +0000 (18:58 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Conflicts:
src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.html
modified: Integration/FSC/Makefile
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFourierNeighborCorrelation
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcInfo
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFourierNeighborCorrelation.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFourierNeighborCorrelation.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMultiplying.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMultiplying.h
new file: src/Objects/DataManip/mrcImage/src/lmrcImageNoiseCreate.c
new file: src/Objects/DataManip/mrcImage/src/lmrcImageNoiseCreate.h
modified: src/Objects/DataManip/mrcImage/src/mrcImagePrint.c
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c
modified: src/Tools/mrcImage/mrcImageMultiplyingbyFile/src/mrcImageMultiplyingbyFile.c
modified: src/Tools/mrcImage/mrcImageNoiseCreate/src/mrcImageNoiseCreate.c
Takuo Yasunaga [Tue, 14 Oct 2014 00:12:38 +0000 (09:12 +0900)]
recompiled:
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFourierNeighborCorrelation
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageMultiplyingbyFile
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageNoiseCreate
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/X86LINUX64/mrcImageFourierNeighborCorrelation
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageMultiplyingbyFile/src/X86LINUX64/mrcImageMultiplyingbyFile
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNoiseCreate/src/X86LINUX64/mrcImageNoiseCreate
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.html
Takuo Yasunaga [Mon, 13 Oct 2014 08:58:23 +0000 (17:58 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
Takuo Yasunaga [Mon, 13 Oct 2014 08:47:44 +0000 (17:47 +0900)]
Modified Tools:
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageFourierNeighborCorrelation
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageMultiplyingbyFile
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageNoiseCreate
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFourierNeighborCorrelation.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFourierNeighborCorrelation.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMultiplying.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMultiplying.h
new file: src/Objects/DataManip/mrcImage/src/lmrcImageNoiseCreate.c
new file: src/Objects/DataManip/mrcImage/src/lmrcImageNoiseCreate.h
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c
modified: src/Tools/mrcImage/mrcImageMultiplyingbyFile/src/mrcImageMultiplyingbyFile.c
modified: src/Tools/mrcImage/mrcImageNoiseCreate/src/mrcImageNoiseCreate.c
Takuo Yasunaga [Mon, 13 Oct 2014 01:43:43 +0000 (10:43 +0900)]
Recompiled:
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFourierShellCorrelation
new file: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageSpatialFrequencyFilter
Takuo Yasunaga [Mon, 13 Oct 2014 00:38:14 +0000 (09:38 +0900)]
Bug fixed: mrcImageSpatialFrequencyFilter
Takuo Yasunaga [Mon, 13 Oct 2014 00:17:39 +0000 (09:17 +0900)]
Create a new tool: mrcImageSpatialFrequencyFilter
new file: bin/mrcImageSpatialFrequencyFilter
Modified tools: mrcImageFourierNeighborCorrelation, mrcImageFourierShellCorrelation
modified: include/lmrcImageFourierNeighborCorrelation.h
modified: include/lmrcImageFourierShellCorrelation.h
new file: include/lmrcImageSpatialFrequencyFilter.h
Takuo Yasunaga [Sun, 12 Oct 2014 06:58:02 +0000 (15:58 +0900)]
Rebuild: for X86LINUX64
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageMultiCTFCompensation
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libctfInfo.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a
modified: hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageMultiCTFCompensation.sharedo
copied: hostdepend/X86LINUX64/lib/X86LINUX64/libctfInfo.a -> hostdepend/X86LINUX64/src/Objects/DataManip/ctfInfo/src/X86LINUX64/libctfInfo.a
modified: hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a
modified: hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a
new file: hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageFourierNeighborCorrelation.c
modified: hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageMultiCTFCompensation.sharedo
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/X86LINUX64/mrcImageMultiCTFCompensation
Takuo Yasunaga [Sun, 12 Oct 2014 06:42:34 +0000 (15:42 +0900)]
Modified Tools: mrcImageMultiCTFCompensation
modified: src/Objects/DataManip/ctfInfo/inc/ctfInfo.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMultiCTFCompensation.c
modified: src/Tools/mrcImage/mrcImageMultiCTFCompensation/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.c
Takuo Yasunaga [Sun, 12 Oct 2014 03:59:23 +0000 (12:59 +0900)]
Modified for X86LINUX65:
new file: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFourierNeighborCorrelation
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFourierShellCorrelation
Takuo Yasunaga [Sun, 12 Oct 2014 03:26:44 +0000 (12:26 +0900)]
New Tools:
new file: bin/mrcImageFourierNeighborCorrelation
Modified Toos:
modified file: bin/mrcImageFourierShellCorrelation
Incomplete, under construction:
new file: bin/dmInfo
Takuo Yasunaga [Sat, 4 Oct 2014 18:01:01 +0000 (03:01 +0900)]
modified: bin/wish/Display2/tclIndex
modified: hostdepend/X86MAC64/bin/X86MAC64/*
modified: hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
modified: hostdepend/X86MAC64/lib/X86MAC64/*
Takuo Yasunaga [Sat, 4 Oct 2014 13:24:00 +0000 (22:24 +0900)]
Bug fixed: Axis
modified: mrcImageHighPassFilter
modified: src/Objects/DataManip/mrcImage/src/lmrcImageHighPassFilter.c
Takuo Yasunaga [Sat, 4 Oct 2014 00:21:17 +0000 (09:21 +0900)]
modified: Integration/FSC/Makefile
modified: bin/wish/Display2/tclIndex
modified: hostdepend/X86LINUX64/bin/X86LINUX64/*
modified: hostdepend/X86LINUX64/lib/X86LINUX64/*
Takuo Yasunaga [Fri, 3 Oct 2014 03:56:09 +0000 (12:56 +0900)]
Modified mrcImageNormalizing: Add AssumeAsGaussian
modified: mrcImageNormalizing
modified: include/lmrcImageNormalizing.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageNormalizing.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageNormalizing.h
Takuo Yasunaga [Thu, 2 Oct 2014 00:35:24 +0000 (09:35 +0900)]
Add Integeration/FSC
new file: Integration/FSC/Makefile
Takuo Yasunaga [Wed, 1 Oct 2014 13:12:32 +0000 (22:12 +0900)]
Modified: Add usage related to -M
modified: src/Objects/DataManip/bmpFile/inc/bmpFile.h
modified: src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
Takuo Yasunaga [Wed, 1 Oct 2014 13:06:16 +0000 (22:06 +0900)]
Modified: bmp2mrc supported Y/R/G/B to mono of mrcImage, respecitively.
modified: src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
modified: src/Tools/filter/bmp2mrc/src/bmp2mrc.c
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