--- DarthVader/TrackerLevel2/Makefile	2006/11/08 09:36:59	1.11
+++ DarthVader/TrackerLevel2/Makefile	2007/08/31 15:00:47	1.30
@@ -1,6 +1,6 @@
 # Tracker flight analysis software 
 # SOFTWARE VERSION
-VER= v2r00
+VER= v4r00
 DEBUG=0
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some usefull definition for colorize the echo 
@@ -33,13 +33,13 @@
 # F77
 F77=g77
 #F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash 
-F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash
+F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash -fPIC
 # C++
 CXX=g++
 #CXXFLAGS=-Wall -O -fPIC -pthread -g -D'DEBUG=${DEBUG}' 
 #CXXFLAGS=-Wall -O -fPIC -pthread -g -D'DEBUG=0'
 #CXXFLAGS=-Wall -O -fPIC -pthread -fpermissive
-CXXFLAGS=-Wall -O -fPIC -pthread
+CXXFLAGS=-Wall -O4 -fPIC -pthread
 # ROOTCINT
 ROOTCINT=rootcint
 # Here the variables definig the local directories
@@ -71,7 +71,8 @@
 	${DIRSRC}/F77/readB.f \
 	${DIRSRC}/F77/interB.f \
 	${DIRSRC}/F77/track.f \
-	${DIRSRC}/F77/grkuta.f 
+	${DIRSRC}/F77/grkuta.f \
+	${DIRSRC}/F77/bdll.f      # ***PP***
 
 FOBJS=$(FSRCS:${DIRSRC}/F77/%.f=${DIRLIB}/%.o) 
 #-------------------------------------------------
@@ -79,26 +80,48 @@
 COBJS=$(CSRCS:${DIRSRC}%.cpp=${DIRLIB}/%.o)
 #-------------------------------------------------
 # librerie utilizzabili da root (ci deve essere anche il ***LinkDef.h )
-LIBROOTSRCS=	${DIRSRC}/TrkLevel2.cpp  \
-				${DIRSRC}/TrkLevel1.cpp
+LIBROOTSRCS=${DIRSRC}/TrkParams.cpp \
+	${DIRSRC}/TrkLevel2.cpp  \
+	${DIRSRC}/TrkLevel1.cpp \
+	${DIRSRC}/TrkLevel0.cpp \
+	${DIRSRC}/TrkHough.cpp \
+	${DIRSRC}/TrkCalib.cpp 
+
 #LIBROOTSRCS=	
 LIBROOTLIBS=$(LIBROOTSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so)
-LIBROOTOBJS=${DIRLIB}/readB.o ${DIRLIB}/interB.o ${DIRLIB}/track.o ${DIRLIB}/grkuta.o ${DIRLIB}/functionspfa.o ${DIRLIB}/readallparam.o ${DIRLIB}/functions.o ${DIRLIB}/mini.o ${DIRLIB}/tricircle.o
-LIBROOTCLIBS=libTrkLevel2 libTrkLevel1
+LIBROOTOBJS=${DIRLIB}/readB.o \
+	${DIRLIB}/interB.o \
+	${DIRLIB}/track.o \
+	${DIRLIB}/grkuta.o \
+	${DIRLIB}/bdll.o \
+	${DIRLIB}/functionspfa.o \
+	${DIRLIB}/readallparam.o \
+	${DIRLIB}/functions.o  \
+	${DIRLIB}/mini.o  \
+	${DIRLIB}/tricircle.o  \
+	${DIRLIB}/analysisflight.o  \
+	${DIRLIB}/analysissubroutines.o  \
+	${DIRLIB}/fillpedsig.o  \
+	${DIRLIB}/cncomp.o  \
+	${DIRLIB}/filladc.o  \
+	${DIRLIB}/reductionflight.o
+LIBROOTCLIBS= libTrkParams libTrkLevel2 libTrkLevel1 libTrkLevel0 libTrkHough libTrkCalib 
+
 #LIBROOTCLIBS= 
 FULLROOTCLIBS=$(LIBROOTCLIBS:%=${DIRLIB}/%_${VER}.so)
 #-------------------------------------------------
 # librerie C++ NON utilizzabili da root
 #LIBCPPSRCS=  ${DIRSRC}/TrkLevel2.cpp \
 #		${DIRSRC}/TrkLevel0.cpp	
-LIBCPPSRCS=${DIRSRC}/TrkLevel0.cpp \
-	   ${DIRSRC}/TrkStruct.cpp \
+LIBCPPSRCS=${DIRSRC}/TrkStruct.cpp \
 	   ${DIRSRC}/TrkProcess.cpp \
 	   ${DIRSRC}/TrkVerl2.cpp \
-	   ${DIRSRC}/TrkCore.cpp  
+	   ${DIRSRC}/TrkCore.cpp \
+#	   ${DIRSRC}/TrkLevel0.cpp
+ 
 LIBCPPLIBS=$(LIBCPPSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so)
 #LIBCPPCLIBS=libTrkLevel2 libTrkLevel0 
-LIBCPPCLIBS=libTrkLevel0 libTrkStruct libTrkProcess libTrkCore libTrkVerl2
+LIBCPPCLIBS= libTrkStruct libTrkProcess libTrkCore libTrkVerl2 #libTrkLevel0
 FULLCPPCLIBS=$(LIBCPPCLIBS:%=${DIRLIB}/%_${VER}.so)
 #-------------------------------------------------
 # librerie F77 NON utilizzabili da root
@@ -127,6 +150,9 @@
 	${DIRINC}/TrkLevel2.h \
 	${DIRINC}/TrkLevel1.h \
 	${DIRINC}/TrkLevel0.h \
+	${DIRINC}/TrkHough.h \
+	${DIRINC}/TrkCalib.h \
+	${DIRINC}/TrkParams.h \
 	${DIRINC}/TrkStruct.h \
 	${DIRINC}/TrkProcess.h \
 	${DIRINC}/TrkCore.h \
@@ -182,7 +208,7 @@
 #
 #	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
+	@${ROOTCINT} -f ${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp -c -I${DIRINC} -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 
 #
@@ -219,7 +245,7 @@
 	@(${EVIOLET} "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * *")
 	@(${EGREEN} "Creating exec file: "${WHITE} "$@"; ${RESET})
 #	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRLIB}/$@.o -I${DIRTOP}/${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_YODA}/include/utils/ ${PAM_YODA}/lib/libyoda.so ${PAM_YODA}/lib/libutils.so ${FOBJS} ${COBJS} ${FULLLIBS} ${OTHERLIBS} -lThread `root-config --cflags --glibs` `cernlib mathlib` /usr/lib/libg2c.so.0;
-	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRLIB}/$@.o -I${DIRTOP}/${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ ${PAM_YODA}/lib/libyoda.so ${FOBJS} ${COBJS} ${FULLLIBS} ${OTHERLIBS} -lThread -lg2c `root-config --cflags --glibs` `cernlib mathlib`;
+	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRLIB}/$@.o -I${DIRTOP}/${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ ${PAM_YODA}/lib/libyoda.so ${FOBJS} ${COBJS} ${FULLLIBS} ${OTHERLIBS} -lThread -lg2c `root-config --cflags --glibs` `cernlib_noshift mathlib`;
 
 
 # A small target to check environmental variables