git.osdn.net Git - eos/hostdependX86LINUX64.git/log

Rebuild:

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

typechange: src/Tools/Makefile

updated: mrcImageClusterAnalysis for pthread

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

Conflicts:
src/Tools/mrcImage/mrcImageHoughTransform/src/mrcImageHoughTransform.html

Merged:

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

Conflicts:
bin/wish/Display2/tclIndex

Updated: HoughTransform

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

Rebuild and merge:

Rebuild:

New tool: mrcImageHoughTransform, mrcImageHoughTransformInverse, mrcImageToneReversal

Rebuild:

After merge

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

temp

Recompiled: for 32bits to 64bits

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

Delete data:

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

Arranged Page Logic

Create Dir on Front End

Before implementation of createDirModal

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

Modified navbar

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

Conflicts:
bin/wish/Display2/tclIndex

Modified: Makefile for update, All tools have been updated using make update.
modified: Makefile

modified: src/Tools/mrcImage/mrcImageShrink/src/test/Makefile

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

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

Little Modification (without tickets)

Modified routing and rename main-page

mrcImageShrink: test

Add libhdf5

Updated Zephry to AngularJS Implimentation

Bug fixed:
Eos_env
install-eos.sh

recompiled for cuda:

Move test data from src/bin directories to data/.

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

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

To Merge:
modified: bin/wish/Display2/tclIndex
modified: env/install-eos.sh

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

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

Bug fixed:
modified:   Makefile
modified:   sbin/makegeneral
modified:   src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c
typechange: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile

Conflicts:
src/Tools/Makefile
src/Tools/mrcImage/Makefile

install command
env/install-eos.sh

modified: env/Eos_env
modified: env/install-eos.sh

modified: hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a

Bug fixed: for -NoiseWeighted Brestore
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFourierNeighborCorrelation

rebuild: mrcImageWindowing

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

Conflicts:
src/Tools/mrcImage/mrcImageWindowing/src/mrcImageWindowing.html

Add exp/gauss window: lmrcImageWindowing
modified: src/Objects/DataManip/mrcImage/src/lmrcImageWindowing.c

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

recompiled:
modified: hostdepend/X86LINUX64/*
bin/X86LINUX64/CheckCommonLineData

rebuild: for X86MAC64

modified: hostdepend/X86MAC64/*

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

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

Modify: Eos_env: First AID for case of no CUDA.
modified: env/Eos_env

Recompiled:
modified: hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageNullImageCreate
modified: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNullImageCreate/src/X86LINUX64/mrcImageNullImageCreate

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

Bug fixed:
modified: env/Eos_env

Under construction:
modified: env/install-eos.sh

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

Bug fixed:
modified: src/Objects/DataManip/mrcImage/src/mrcImagePrint.c
modified: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c

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

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