--- DarthVader/CalorimeterLevel2/Makefile	2007/01/22 09:25:30	1.17
+++ DarthVader/CalorimeterLevel2/Makefile	2010/04/19 14:17:17	1.46
@@ -1,44 +1,19 @@
 # Calorimeter flight analysis software 
 # SOFTWARE VERSION
-VER= v4r04
-# An almost general purpouse Makefile for PAMELA repository
-# Let's start with some usefull definition for colorize the echo 
-RED='\E[1;31;40m'
-GREEN='\E[1;32;40m'
-YELLOW='\E[1;33;40m'
-BLUE='\E[1;34;40m'
-WHITE='\E[1;37;40m'
-VIOLET='\E[1;35;40m'
-CYAN='\E[1;36;40m'
-# Here the echo definition to use them
-EVIOLET=echo -e ${VIOLET}
-ECYAN=echo -e ${CYAN}
-ERED=echo -e ${RED}
-EGREEN=echo -e ${GREEN}
-EYELLOW=echo -e ${YELLOW}
-EBLUE=echo -e ${BLUE}
-EWHITE=echo -e ${WHITE}
-# Reset the terminal
-RESET=tput sgr0
-# Here the variables used to override the standard make flags
-# C
-CC=gcc
-#CFLAGS=-Wall -O -fPIC -pthread -g
-CFLAGS=-Wall -O4 -fPIC -pthread
-# Enviroment:
-GCCVER=`gcc --version | head -1`
-UNAMEA=`uname -a`
-TODAY=`date`
-# F77
-F77=g77
-#F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash
-F77FLAGS=  -Wall -Wno-globals -fPIC -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash
-# C++
-CXX=g++
-#CXXFLAGS=-Wall -O -fPIC -pthread -g
-CXXFLAGS=-Wall -O4 -fPIC -pthread
-# ROOTCINT
-ROOTCINT=rootcint
+VER= v6r01
+#
+include ../Make.def
+#
+ifeq ($(GCC4),0)
+	EXTRAOPT=-Wno-globals -fvxt
+else
+	EXTRAOPT=
+endif
+#F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash ${PAM_BIT} 
+#F77FLAGS= -fforce-addr -funroll-all-loops -ffinite-math-only -Wall -funroll-loops -Wno-globals -fPIC -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT} 
+F77FLAGS= -O1 -fforce-addr -funroll-all-loops -ffinite-math-only -Wall -funroll-loops -fPIC $(EXTRAOPT) -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT} 
+#F77FLAGS= -g -fforce-addr -funroll-all-loops -ffinite-math-only -Wall -funroll-loops -Wno-globals -fPIC -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT} 
+#F77FLAGS= -Wall -Wno-globals -fPIC -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT} 
 # Here the variables definig the local directories
 DIRTOP=${shell pwd}
 DIRLIB=../lib/${ARCH}
@@ -61,8 +36,10 @@
       ${DIRSRC}/nshower.for \
       ${DIRSRC}/nointer.for \
       ${DIRSRC}/elio.for \
+      ${DIRSRC}/nuclei.for \
       ${DIRSRC}/cluster.for \
       ${DIRSRC}/cluster2.for \
+      ${DIRSRC}/cluster4.for \
       ${DIRSRC}/laterale.for \
       ${DIRSRC}/baric.for \
       ${DIRSRC}/selftrig.for \
@@ -79,20 +56,21 @@
 COBJS=$(CSRCS:${DIRSRC}%.c=${DIRLIB}%.o)
 
 # -- CPP - ROOT libraries --
-LIBROOTSRCS=${DIRSRC}/CaloLevel1.cpp \
+LIBROOTSRCS=${DIRSRC}/CaloLevel0.cpp \
+	    ${DIRSRC}/CaloLevel1.cpp \
 	    ${DIRSRC}/CaloLevel2.cpp
 
 LIBROOTLIBS=$(LIBROOTSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so)
-LIBROOTOBJS=${DIRLIB}/millim.o 
-LIBROOTCLIBS=libCaloLevel2 libCaloLevel1
+#LIBROOTOBJS=${DIRLIB}/millim.o 
+LIBROOTOBJS=${FOBJS} ${COBJS}
+LIBROOTCLIBS=libCaloLevel2 libCaloLevel1 libCaloLevel0
 FULLROOTCLIBS=$(LIBROOTCLIBS:%=${DIRLIB}/%_${VER}.so)
 
 # -- CPP - NON-ROOT libraries --
-LIBCPPSRCS=${DIRSRC}/CaloProcessing.cpp \
-	   ${DIRSRC}/CaloCore.cpp \
+LIBCPPSRCS=${DIRSRC}/CaloCore.cpp \
 	   ${DIRSRC}/CaloVerl2.cpp
 LIBCPPLIBS=$(LIBCPPSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so)
-LIBCPPCLIBS=libCaloProcessing libCaloCore libCaloVerl2
+LIBCPPCLIBS=libCaloCore libCaloVerl2
 FULLLIBCPPLIBS=$(LIBCPPCLIBS:%=${DIRLIB}/%_${VER}.so)
 
 # -- CPP - Executables --
@@ -113,7 +91,7 @@
 # Other objects to install
 EXESRCS=${DIRBIN}/CalorimeterLevel2
 
-INCSRCS=${DIRINC}/CaloLevel1.h ${DIRINC}/CaloLevel2.h ${DIRINC}/CaloStruct.h ${DIRINC}/CaloProcessing.h ${DIRINC}/CaloCore.h
+INCSRCS=${DIRINC}/CaloLevel0.h ${DIRINC}/CaloLevel1.h ${DIRINC}/CaloLevel2.h ${DIRINC}/CaloStruct.h ${DIRINC}/CaloCore.h ${DIRINC}/INTEST.TXT
 
 MACROSSRCS=
 
@@ -138,8 +116,8 @@
 #all: test mkbindir mklibdir mkverpath ${FOBJS} ${CPPOBJS} ${LIBROOTLIBS} ${LIBCPPLIBS} ${CXXEXELIBS} 
 all: prepare libs
 all: 
-	@echo -e ${GREEN} ""
-	@(${EGREEN} " Finished, now you can install the package \n  (use: make install or make upgrade or make forceinstall) "; ${RESET})
+#	@echo -e ${GREEN} ""
+#	@(${EGREEN} " Finished, now you can install the package \n  (use: make install or make upgrade or make forceinstall) "; ${RESET})
 	@echo -e ${GREEN} ""
 	@${RESET}
 
@@ -150,58 +128,8 @@
 exe: prepare ${CXXEXELIBS} 
 
 libs: prepare ${LIBROOTLIBS} ${LIBCPPLIBS}
-
-# Here some general rules to produce objects in our local dir
-${DIRLIB}/%.o: ${DIRSRC}/%.cpp
-	@(${EGREEN} "Creating CPP object file: "${WHITE} "`basename $@`"; ${RESET})
-	@${CXX} ${CXXFLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.cpp -I${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ `root-config --cflags`
-
-${DIRLIB}/%.o: ${DIRSRC}/%.c
-	@(${EGREEN} "Creating C object file: "${WHITE} "`basename $@`"; ${RESET})
-	@${CXX} ${CXXFLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.c -I${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ `root-config --cflags`
-
-${DIRLIB}/%.o: ${DIRSRC}/%.for
-	@(${EGREEN} "Creating F77 object file: "${WHITE} "`basename $@`"; ${RESET})
-	@${F77} ${F77FLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.for -I${DIRINC} 
-
-${LIBROOTLIBS}: ${LIBROOTSRCS} ${FOBJS}
-	@(${EGREEN} "ROOTCINT - creating file: "${WHITE} "`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp"; ${RESET})
-#
-#	Create *Dict.cpp and *Dict.h
-#
-	@${ROOTCINT} -f ${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp -c -I${ROOTINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ ${DIRINC}/`basename $(@F) _${VER}.so | sed s/lib//`.h ${DIRINC}/`basename $(@F) _${VER}.so | sed s/lib//`LinkDef.h
-#
-#	create .o 
 #
-	@(${EGREEN} "Compiling CPP file: "${WHITE} "`basename $(@F) _${VER}.so | sed s/lib//`.cpp"; ${RESET})
-	@${CXX} ${CXXFLAGS} -c ${DIRTOP}/${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`.cpp  -o ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`.o -I${DIRTOP}/${DIRINC} -I${DIRTOP} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ -I${NROOTINC}; 
-	@(${EGREEN} "Compiling CPP file: "${WHITE} "`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp"; ${RESET})
-	@${CXX} ${CXXFLAGS} -c ${DIRTOP}/${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp -o ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.o -I${DIRTOP}/${DIRINC} -I${DIRTOP} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ -I${NROOTINC}; 
-#
-#	create .so
-#
-	@(${EGREEN} "Creating shared library: "${WHITE} "`basename $@`"; ${RESET})
-	@${CXX} ${CXXFLAGS} -Xlinker -soname=$(@F) -shared -o $@ -lg2c -I${DIRTOP}/${DIRINC} -I${DIRTOP} -I${PAM_YODA}/include/yoda/ ${SUBINC} -I${PAM_INC}/ ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`.o ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.o ${LIBROOTOBJS} 1>/dev/null
-	@ln -sf  ${DIRTOP}/${DIRLIB}/$(@F) ${DIRTOP}/${DIRLIB}/$(patsubst %_${VER}.so,%.so,$(@F))
-
-${LIBCPPLIBS}: ${LIBSRCS} ${COBJS} ${FOBJS}
-#
-#	create .o 
-#
-	@(${EGREEN} "Compiling CPP file: "${WHITE} "`basename $(@F) _${VER}.so | sed s/lib//`.cpp"; ${RESET})
-	@${CXX} ${CXXFLAGS} -c ${DIRTOP}/${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`.cpp -o ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`.o -I${DIRTOP}/${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ -I${NROOTINC}; 
-#
-#	create .so
-#
-	@(${EGREEN} "Creating shared library: "${WHITE} "`basename $@`"; ${RESET})
-	@${CXX} ${CXXFLAGS} -Xlinker -soname=$(@F) -shared -o $@ -lg2c -I${DIRTOP}/${DIRINC} -I${DIRTOP} ${SUBINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`.o ${FOBJS} ${COBJS} 1>/dev/null
-	@ln -sf  ${DIRTOP}/${DIRLIB}/$(@F) ${DIRTOP}/${DIRLIB}/$(patsubst %_${VER}.so,%.so,$(@F))
-
-${CXXEXELIBS}: ${CPPOBJS} ${COBJS} ${CXXEXEOBJS}
-	@(${EGREEN} "Creating exec file: "${WHITE} "$@"; ${RESET})
-#	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRLIB}/$@.o ${FULLROOTCLIBS} ${FULLLIBCPPLIBS} ${CPPOBJS} ${FOBJS} ${TRKOBJS} ${PAM_YODA}/lib/libyoda.so -I${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ -lThread `root-config --cflags --glibs` `cernlib mathlib`
-	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRLIB}/$@.o ${FULLROOTCLIBS} ${FULLLIBCPPLIBS} ${TRKOBJS} ${CPPOBJS} ${COBJS} ${FOBJS} ${PAM_YODA}/lib/libyoda.so -lThread `root-config --cflags --glibs` `cernlib mathlib`
-
+include ../Make.dect
 # A small target to check environmental variables
 %_env:
 	@${test_env}
@@ -279,7 +207,7 @@
 	@${test_and_cp}
 
 mkverpath:
-	@echo '#include <TSystem.h>' >  ${DIRTOP}/${DIRSRC}/CaloVerl2.cpp; echo ' char *CaloInfo(bool print){ if ( print ) printf("\nCalorimeter Level2 flight package version: ${VER}\n\nCompiled on '${TODAY}' with: '${GCCVER}'\n\nOn: '${UNAMEA}'\n\n"); return("${VER}"); }' >>  ${DIRTOP}/${DIRSRC}/CaloVerl2.cpp
+	@echo '#include <TSystem.h>' >  ${DIRTOP}/${DIRSRC}/CaloVerl2.cpp; echo 'const char *CaloInfo(bool print){ if ( print ) printf("\nCalorimeter Level2 flight package version: ${VER}\n\nCompiled on '${TODAY}' with: '${GCCVER}'\n\nOn: '${UNAMEA}'\n\n"); return("${VER}"); }' >>  ${DIRTOP}/${DIRSRC}/CaloVerl2.cpp
 	@sleep 0.8