--- DarthVader/TrackerLevel2/Makefile	2006/11/21 14:19:44	1.15
+++ DarthVader/TrackerLevel2/Makefile	2009/01/12 05:06:54	1.40
@@ -1,6 +1,6 @@
 # Tracker flight analysis software 
 # SOFTWARE VERSION
-VER= v2r01
+VER= v6r00
 DEBUG=0
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some usefull definition for colorize the echo 
@@ -24,22 +24,31 @@
 # Here the variables used to override the standard make flags
 # C
 CC=gcc
-#CFLAGS=-Wall -O -fPIC -pthread -g
-CFLAGS=-Wall -O -fPIC -pthread
+#CFLAGS=-Wall -O -fPIC -pthread -g ${PAM_BIT} 
+#CFLAGS=-Wall -O -fPIC -pthread ${PAM_BIT} 
+CFLAGS=-Wall -O3 -funroll-loops -fPIC -pthread ${PAM_BIT} 
+#CFLAGS=-Wall -fPIC -pthread ${PAM_BIT} 
 # 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 -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash -fPIC
+#F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash  ${PAM_BIT} 
+#F77FLAGS=  -malign-double -Wall -funroll-loops -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash -fPIC ${PAM_BIT} 
+#F77FLAGS=  -malign-double -Wall -funroll-loops -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash -fPIC ${PAM_BIT} 
+F77FLAGS=  -O2 -malign-double -Wall -funroll-loops -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash -fPIC ${PAM_BIT} 
+#F77FLAGS=  -malign-double -Wall -funroll-loops -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash -fPIC ${PAM_BIT} 
+#F77FLAGS=   -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash -fPIC ${PAM_BIT} 
+#F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash -fPIC ${PAM_BIT} 
 # 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 -O -fPIC -pthread -g -D'DEBUG=${DEBUG}' ${PAM_BIT} 
+#CXXFLAGS=-Wall -O -fPIC -pthread -g -D'DEBUG=0' ${PAM_BIT} 
+#CXXFLAGS=-Wall -O -fPIC -pthread -fpermissive ${PAM_BIT} 
+#CXXFLAGS=-Wall -O4 -fPIC -pthread ${PAM_BIT} 
+CXXFLAGS=-Wall -O3 -funroll-loops -fPIC -pthread ${PAM_BIT} 
+#CXXFLAGS=-Wall -fPIC -pthread ${PAM_BIT} 
 # ROOTCINT
 ROOTCINT=rootcint
 # Here the variables definig the local directories
@@ -71,7 +80,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,13 +89,32 @@
 COBJS=$(CSRCS:${DIRSRC}%.cpp=${DIRLIB}/%.o)
 #-------------------------------------------------
 # librerie utilizzabili da root (ci deve essere anche il ***LinkDef.h )
-LIBROOTSRCS=	${DIRSRC}/TrkLevel2.cpp  \
-		${DIRSRC}/TrkLevel1.cpp \
-		${DIRSRC}/TrkHough.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 libTrkHough
+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)
@@ -93,14 +122,15 @@
 # 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
@@ -118,7 +148,7 @@
 CXXEXEOBJS=$(CXXEXESRCS:${DIRSRC}%.cpp=${DIRLIB}%.o)
 CXXEXELIBS:=TrackerLevel2
 
-OTHERLIBS=${PAM_LIB}/libGLTables.so ${DIRLIB}/libRunInfo.so
+OTHERLIBS=${PAM_LIB}/libGLTables.so ${DIRLIB}/libRunInfo.so 
 SUBDIR=../RunInfo 
 SUBINC=$(shell for dir in `echo ${SUBDIR}`; do echo -I$${dir}/inc; done)
 
@@ -130,6 +160,8 @@
 	${DIRINC}/TrkLevel1.h \
 	${DIRINC}/TrkLevel0.h \
 	${DIRINC}/TrkHough.h \
+	${DIRINC}/TrkCalib.h \
+	${DIRINC}/TrkParams.h \
 	${DIRINC}/TrkStruct.h \
 	${DIRINC}/TrkProcess.h \
 	${DIRINC}/TrkCore.h \
@@ -185,7 +217,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 
 #