OSDN Git Service

eos/base.git
11 years agoModeify compile options for -Wall
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

11 years agoRecompiling ctfDisplay and Display2
Takuo Yasunaga [Fri, 5 Jul 2013 18:15:10 +0000 (03:15 +0900)]
Recompiling ctfDisplay and Display2

11 years ago modified: bin/wish/Display2/tclIndex
Takuo Yasunaga [Wed, 26 Jun 2013 05:26:37 +0000 (14:26 +0900)]
modified:   bin/wish/Display2/tclIndex
modified:   hostdepend/X86LINUX64/bin/X86LINUX64/*

11 years ago modified: src/Tools/mrcImage/mrcImageAutoRotationCorrelation3D/
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);

11 years agoMerge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
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

11 years agomake rebuild for X86LINUX64
Takuo Yasunaga [Sat, 15 Jun 2013 07:03:32 +0000 (16:03 +0900)]
make rebuild for X86LINUX64
modified:   .gitignore
modified:   bin/wish/Display2/tclIndex

11 years agoMerge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
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

11 years agoFor consistency
Takuo Yasunaga [Sat, 15 Jun 2013 00:22:16 +0000 (09:22 +0900)]
For consistency

11 years ago deleted: hostdepend/X86LINUX64/src/Objects/DataExpress/openGL/src/X86LINUX64...
Takuo Yasunaga [Sat, 15 Jun 2013 00:17:03 +0000 (09:17 +0900)]
deleted:    hostdepend/X86LINUX64/src/Objects/DataExpress/openGL/src/X86LINUX64/lmolviePDBRead.c

11 years ago modified: env/Eos_env
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

11 years agoBug fixed : mrc2Dto3D
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

11 years ago modified: src/Config/Template/ToolsTemplate.Dir/src/Makefile
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

11 years agocompilineg : eosPoint and eosList
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

11 years agoDelete wrong files
Takuo Yasunaga [Sun, 5 May 2013 02:05:13 +0000 (11:05 +0900)]
Delete wrong files

11 years ago 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

11 years agoDevelope a new tool: mrcImageBilateralFilter
Takuo Yasunaga [Mon, 29 Apr 2013 07:57:36 +0000 (16:57 +0900)]
Develope a new tool: mrcImageBilateralFilter
                     lmrcImageBilateralFilter()
in lmrcImageBilateralFilter.c
   lmrcImageBilateralFilter.h

11 years agoAdd mrcImageConvolution
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

11 years agoModified Eos/Makefile
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

11 years agoupdate pdbMove. Add -toOrigin -originTo -GCtoOrigin
Takuo Yasunaga [Sun, 24 Mar 2013 19:44:40 +0000 (04:44 +0900)]
update pdbMove. Add -toOrigin -originTo -GCtoOrigin

11 years agoChange util directories
Takuo Yasunaga [Sun, 24 Mar 2013 12:12:44 +0000 (21:12 +0900)]
Change util directories

11 years agoUpdate pdbPCA, -oU -oM -oPDB
Takuo Yasunaga [Sun, 24 Mar 2013 01:26:08 +0000 (10:26 +0900)]
Update pdbPCA, -oU -oM -oPDB

11 years agomrcInfoSet has been updated and renewed to set FixedValues as default values.
Takuo Yasunaga [Wed, 6 Mar 2013 23:49:25 +0000 (08:49 +0900)]
mrcInfoSet has been updated and renewed to set FixedValues as default values.

11 years agoAdd mrcImageToPointsSet and Add a function of rmsd calculcation using mrcImageSubtrac...
Takuo Yasunaga [Wed, 6 Feb 2013 23:03:11 +0000 (08:03 +0900)]
Add mrcImageToPointsSet and Add a function of rmsd calculcation using mrcImageSubtraction and mrcImageNormalizedSubtraction. Modify mrcImageInit.

11 years agomodify Makefiles to move hostdependent files to EOS_HOME/hostdepend
Takuo Yasunaga [Sun, 3 Feb 2013 00:09:18 +0000 (09:09 +0900)]
modify Makefiles to move hostdependent files to EOS_HOME/hostdepend

11 years agoseparate host-dependent binaries.
Takuo Yasunaga [Wed, 30 Jan 2013 19:32:46 +0000 (04:32 +0900)]
separate host-dependent binaries.