Bug fixed:

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

diff --git a/Makefile b/Makefile
index 5263654..92c7b0b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@ install: install-src install-Objects install-Tools
 
 rebuild-src:
        echo "rebuild-src"
-       cd src; rm -f Objects/Makefile; cp -f Config/Template/ObjectsHomeTemplate.Dir/Makefile Objects/Makefile
-       cd src; rm -f Tools/Makefile; cp -f Config/Template/ToolsHomeTemplate.Dir/Makefile Tools/Makefile
+       cd src; rm -f Objects/Makefile; cp -f Config/Template/ObjectsHomeTemplate.Dir/Makefile Objects/Makefile; rm -f Objects/Config/Target.inc; cp -f Config/Template/ObjectsHomeTemplate.Dir/Config/Target.inc Objects/Config/Target.inc
+       cd src; rm -f Tools/Makefile; cp -f Config/Template/ToolsHomeTemplate.Dir/Makefile Tools/Makefile; rm -f Tools/Config/Target.inc ; cp -f Config/Template/ToolsHomeTemplate.Dir/Config/Target.inc Tools/Config/Target.inc
 
 rebuild-Objects:
        cd src/Objects;  make clean; make check; make depend; make ; make install

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSpatialFrequencyFilter b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSpatialFrequencyFilter
index 030db6b..97f8e2a 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSpatialFrequencyFilter and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSpatialFrequencyFilter differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
index c2d2f8d..10067af 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a
index 441b839..01930e6 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo
index 9f9755f..0c10496 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a
index 441b839..01930e6 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a
index 65067e1..32d9b88 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo
index 9f9755f..0c10496 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/X86MAC64/mrcImageSpatialFrequencyFilter b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/X86MAC64/mrcImageSpatialFrequencyFilter
index 030db6b..97f8e2a 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/X86MAC64/mrcImageSpatialFrequencyFilter and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/X86MAC64/mrcImageSpatialFrequencyFilter differ

diff --git a/sbin/makegeneral b/sbin/makegeneral
index 5f2c92b..5400036 100755 (executable)
--- a/sbin/makegeneral
+++ b/sbin/makegeneral
@@ -552,7 +552,8 @@ ObjectClassDirModifyFollowingAction()
                                fi
                        done
                        rm -f ${AnotherHome}/src/Config
-                       ln -s ${EOS_HOME}/src/Config ${AnotherHome}/src/Config
+                       #ln -s ${EOS_HOME}/src/Config ${AnotherHome}/src/Config
+                       cp -r ${EOS_HOME}/src/Config ${AnotherHome}/src/Config
                        ObjectClassHome=${AnotherHome}/src/Objects
                        ;;
                *)
@@ -653,9 +654,11 @@ ObjectDirModifyFollowingAction()
 
                        ### src
                        rm -f ./Makefile
-                       ln -s ${ObjectTemplate}/Makefile Makefile
+                       #ln -s ${ObjectTemplate}/Makefile Makefile
+                       cp ${ObjectTemplate}/Makefile Makefile
                        rm -f ./src/Makefile
-                       ln -s ${ObjectTemplate}/src/Makefile ./src/Makefile
+                       #ln -s ${ObjectTemplate}/src/Makefile ./src/Makefile
+                       cp ${ObjectTemplate}/src/Makefile ./src/Makefile
                        touch src/.Depend
                        touch src/.Source       
                        touch src/.CHeader
@@ -663,14 +666,16 @@ ObjectDirModifyFollowingAction()
 
                        ### inc
                        rm -f inc/Makefile
-                       ln -s ${ObjectTemplate}/inc/Makefile inc/Makefile
+                       #ln -s ${ObjectTemplate}/inc/Makefile inc/Makefile
+                       cp ${ObjectTemplate}/inc/Makefile inc/Makefile
 
                        ### doc
                        if [ -h doc/Makefile ]  
                        then
                                rm doc/Makefile
                        fi
-                       ln -s ${ObjectTemplate}/doc/Makefile doc/Makefile
+                       cp ${ObjectTemplate}/doc/Makefile doc/Makefile
+                       #ln -s ${ObjectTemplate}/doc/Makefile doc/Makefile
                        touch doc/.header
                        touch doc/.footer
                        touch doc/.${ObjectName}.html
@@ -726,7 +731,8 @@ ToolClassDirModifyFollowingAction()
                        else
                                rm -f ${AnotherHome}/src/Config 
                        fi
-                       ln -s ${EOS_HOME}/src/Config ${AnotherHome}/src/Config
+                       #ln -s ${EOS_HOME}/src/Config ${AnotherHome}/src/Config
+                       cp -r ${EOS_HOME}/src/Config ${AnotherHome}/src/Config
                        ToolClassHome=${AnotherHome}/src/Tools
                        ;;
                *)
@@ -814,7 +820,8 @@ ToolClassDirModifyFollowingAction()
        fi
 
        rm -f ./Makefile
-       ln -s ${ToolClassTemplate}/Makefile ./Makefile
+       #ln -s ${ToolClassTemplate}/Makefile ./Makefile
+       cp ${ToolClassTemplate}/Makefile ./Makefile
        if [ -f ./.Source ]
        then
                echo "Tools/Makefile : implemented."
@@ -860,7 +867,8 @@ ToolDirModifyFollowingAction()
                All|AllFollowingControlFile|Another|AnotherFollowingControlFile)
                        ### Set Makefile 
                        rm -f ./Makefile 
-                       ln -s ${ToolClassTemplate}/Makefile ./Makefile
+                       #ln -s ${ToolClassTemplate}/Makefile ./Makefile
+                       cp ${ToolClassTemplate}/Makefile ./Makefile
                        if [ -f ./.Source ]
                        then
                                echo "${fullToolDir}/Makefile : implemented."
@@ -919,15 +927,18 @@ ToolDirModifyFollowingAction()
                        fi
                        ### Set Makefile ###
                        rm -f Makefile 
-                       ln -s ${ToolTemplate}/Makefile Makefile
+                       cp  ${ToolTemplate}/Makefile Makefile
+                       #ln -s ${ToolTemplate}/Makefile Makefile
 
                        ### Set src/Makefile, src/.Depend, src/.Source, doc/Makefile  ###
                        rm -f ./src/Makefile
-                       ln -s ${ToolTemplate}/src/Makefile ./src/Makefile
+                       #ln -s ${ToolTemplate}/src/Makefile ./src/Makefile
+                       cp ${ToolTemplate}/src/Makefile ./src/Makefile
                        touch src/.Depend
                        touch src/.Source
                        rm -f doc/Makefile
-                       ln -s ${ToolTemplate}/doc/Makefile ./doc/Makefile
+                       #ln -s ${ToolTemplate}/doc/Makefile ./doc/Makefile
+                       cp ${ToolTemplate}/doc/Makefile ./doc/Makefile
                        ;;
                *)
                        echo "Not supported action in ToolDirModifyFollowingAction: ${Action}"

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c b/src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c
index c6bfd81..95f3283 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c
@@ -76,6 +76,7 @@ lmrcImageSpatialFrequencyFilter(mrcImage* out, mrcImage* in, lmrcImageSpatialFre
                                } else {
                                        if(R==RH) {
                                                W = 0.0;
+                                               flag=0;
                                        } else {
                                                R++;
                                        }
@@ -83,6 +84,7 @@ lmrcImageSpatialFrequencyFilter(mrcImage* out, mrcImage* in, lmrcImageSpatialFre
                        } else {
                                if(R==RL) {
                                        W = 0.0;
+                                       flag=0;
                                } else {
                                        R--;
                                }

diff --git a/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile b/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile
deleted file mode 120000 (symlink)
index 537735e6f10200cd5c886af6775498a31bbc041e..0000000000000000000000000000000000000000
--- a/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-/home/people/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile b/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..4dbb018acae5475bce203b3db2365124accfa24b
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile
@@ -0,0 +1,104 @@
+include ../../../Config/Define.inc
+include ../../Config/Define.inc
+include ../Config/Define.inc
+include Config/Define.inc
+
+all:
+       cd src; make all; cd ..
+
+install:
+       cd src; make install; cd ..
+
+
+putSF:
+       if [ -f private ] ; \
+       then \
+               echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \
+       else \
+               cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \
+       fi
+
+put:
+       cd src; make put; cd ..
+
+clean:
+       cd src; make clean; cd ..
+
+depend:
+       cd src; make depend; cd ..
+
+check:
+       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
+               echo making directory; \
+               mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
+       fi
+       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
+       @$(RM) src/Makefile
+       @echo "New src/Makefile" 
+       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+       @cd src; touch $(OSTYPE)/.Depend; make depend
+
+cvsupdate::
+       cvs -d $(EOS_CVSROOT) update -d 
+
+cvscommit::
+       cvs -d $(EOS_CVSROOT) commit
+
+backup:
+       @cd ../../../..;     \
+       echo $(OBJECTNAME) ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
+       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
+
+backup-all:
+       @cd ../../../..;     \
+       echo $(OBJECTNAME) ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
+       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
+       
+distribute:
+       cd ../../../..;     \
+       echo $(OBJECTNAME) ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
+       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
+       
+distribute-all:
+       @cd ../../../..;     \
+       echo $(OBJECTNAME) ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
+       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
+
+eosintroduce:
+       ${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ 
+
+include Config/Target.inc