--- DarthVader/Makefile	2009/08/04 14:01:14	1.47
+++ DarthVader/Makefile	2014/07/29 10:46:39	1.64
@@ -1,6 +1,6 @@
 # DarthVader flight analysis software 
 # SOFTWARE VERSION IS
-VER= v6r01
+VER= v10r12
 #
 include Make.def
 #CERNLIB
@@ -99,11 +99,9 @@
 #all: test mkbindir mklibdir mkverpath ${FOBJS} ${CPPOBJS} ${LIBROOTLIBS} ${LIBCPPLIBS} ${CXXEXELIBS} 
 
 all: 
-	@for dir in `echo ${SUBDIR}`; do  \
-	 (${EBLUE}  "Making all in $${dir}";  ${RESET});\
-	 (cd $${dir} &>/dev/null && ${MAKE} -s all); \
-#	 (cd $${dir} &>/dev/null && ${MAKE} all); \
-	done; make locall 
+	@for dir in `echo ${SUBDIR}`; do (${EBLUE}  "Making all in $${dir}";  ${RESET}); (cd $${dir} &>/dev/null && ${MAKE} -s all); done
+#	@for dir in `echo ${SUBDIR}`; do (${EBLUE}  "Making all in $${dir}";  ${RESET}); (cd $${dir} && ${MAKE} all); done
+	@make -s locall ;
 
 locall: prepare libs exe
 locall: 
@@ -174,7 +172,7 @@
 	@(${EGREEN} "Creating exec file: "${WHITE} "$@"; ${RESET})
 	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRTOP}/${DIRLIB}/$@.o ${OBJS} ${PAM_LIB}/libGLTables.so ${PAM_LIB}/libsgp4.so ${PAM_YODA}/lib/libyoda.so -lThread `root-config --cflags --glibs` `${CERNLIB} mathlib`
 	@(${EGREEN} "Creating libDarthVader.so library: "${WHITE} "libDarthVader_${VER}.so"; ${RESET})
-	@${CXX} ${CXXFLAGS} -Xlinker -soname=libDarthVader_${VER}.so -shared -o ${DIRTOP}/${DIRLIB}/libDarthVader_${VER}.so $(LG2C) ${DIRTOP}/${DIRLIB}/libAcLevel2.so ${DIRTOP}/${DIRLIB}/libCaloLevel0.so ${DIRTOP}/${DIRLIB}/libCaloLevel1.so ${DIRTOP}/${DIRLIB}/libCaloLevel2.so  ${PAM_LIB}/libsgp4.so ${DIRTOP}/${DIRLIB}/libNDLevel2.so ${DIRTOP}/${DIRLIB}/libS4Level2.so ${DIRTOP}/${DIRLIB}/libToFLevel2.so ${DIRTOP}/${DIRLIB}/libTrigLevel2.so ${DIRTOP}/${DIRLIB}/libTrkLevel2.so ${DIRTOP}/${DIRLIB}/libTrkLevel1.so ${DIRTOP}/${DIRLIB}/libTrkLevel0.so ${DIRTOP}/${DIRLIB}/libTrkHough.so  ${DIRTOP}/${DIRLIB}/libTrkCalib.so ${DIRTOP}/${DIRLIB}/libTrkParams.so ${PAM_LIB}/libGLTables.so ${DIRTOP}/${DIRLIB}/libRunInfo.so ${DIRTOP}/${DIRLIB}/libOrbitalInfo.so ${DIRTOP}/${DIRLIB}/libOrientationInfo.so ${DIRTOP}/${DIRLIB}/libInclinationInfo.so `root-config --glibs` `${CERNLIB} mathlib` 
+	@${CXX} ${CXXFLAGS} -Xlinker -soname=libDarthVader_${VER}.so -shared -o ${DIRTOP}/${DIRLIB}/libDarthVader_${VER}.so $(LG2C) ${DIRTOP}/${DIRLIB}/libAcLevel2.so ${DIRTOP}/${DIRLIB}/libCaloLevel0.so ${DIRTOP}/${DIRLIB}/libCaloLevel1.so ${DIRTOP}/${DIRLIB}/libCaloLevel2.so  ${PAM_LIB}/libsgp4.so ${DIRTOP}/${DIRLIB}/libNDLevel2.so ${DIRTOP}/${DIRLIB}/libS4Level2.so ${DIRTOP}/${DIRLIB}/libToFLevel2.so ${DIRTOP}/${DIRLIB}/libTrigLevel2.so ${DIRTOP}/${DIRLIB}/libTrkLevel2.so ${DIRTOP}/${DIRLIB}/libTrkLevel1.so ${DIRTOP}/${DIRLIB}/libTrkLevel0.so ${DIRTOP}/${DIRLIB}/libTrkHough.so  ${DIRTOP}/${DIRLIB}/libTrkCalib.so ${DIRTOP}/${DIRLIB}/libTrkParams.so ${PAM_LIB}/libGLTables.so ${DIRTOP}/${DIRLIB}/libRunInfo.so ${DIRTOP}/${DIRLIB}/libOrbitalInfo.so ${DIRTOP}/${DIRLIB}/libOrientationInfo.so ${DIRTOP}/${DIRLIB}/libInclinationInfo.so ${DIRTOP}/${DIRLIB}/libExtTrkingAlg.so ${DIRTOP}/${DIRLIB}/libExtTrack.so  `root-config --glibs` `${CERNLIB} mathlib` 
 
 #	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRTOP}/${DIRLIB}/$@.o ${OBJS} ${PAM_YODA}/lib/libyoda.so ${PAM_YODA}/lib/libutils.so -lThread `root-config --cflags --glibs` `cernlib mathlib`
 
@@ -291,7 +289,7 @@
 	@${test_and_cp}
 
 mkverpath:
-	@echo '#include <TSystem.h>' >  ${DIRTOP}/${DIRSRC}/DarthVaderVerl2.cpp; echo ' char *DarthVaderInfo(bool print){ if ( print ) printf("\nPAMELA Level2 flight package version: ${VER}\n\nCompiled on '${TODAY}' with: '${GCCVER}'\n\nOn: '${UNAMEA}'\n\n"); return("${VER}"); }' >>  ${DIRTOP}/${DIRSRC}/DarthVaderVerl2.cpp
+	@echo '#include <TSystem.h>' >  ${DIRTOP}/${DIRSRC}/DarthVaderVerl2.cpp; echo 'const char *DarthVaderInfo(bool print){ if ( print ) printf("\nPAMELA Level2 flight package version: ${VER}\n\nCompiled on '${TODAY}' with: '${GCCVER}'\n\nOn: '${UNAMEA}'\n\n"); return("${VER}"); }' >>  ${DIRTOP}/${DIRSRC}/DarthVaderVerl2.cpp
 	@sleep 0.8
 
 
@@ -369,7 +367,13 @@
 ${EYELLOW} " Copying directory: "${WHITE} ${ORIGIN}/$${i##/*/} ;\
 ${EYELLOW} "          to: "${WHITE} ${PAM_CALIB} ; ${RESET}; \
 cp -rf ${ORIGIN}/$${i##/*/} ${PAM_CALIB}; \
-done
+done; \
+${EYELLOW} " Extracting mask directories into: "${WHITE} ${PAM_CALIB}/trk-param ; ${RESET}; \
+cd  ${PAM_CALIB}/trk-param/ ;\
+tar jxf mask_param.tar.bz2; \
+rm -rf mask_param.tar.bz2; \
+cd - &>/dev/null; \
+${EYELLOW} " done "; ${RESET}
 endef
 
 define 	test_and_mk