Use new functionality of MatchToMC to check daughters PDGs

[u/mrichter/AliRoot.git] / build / MakefileDA

diff --git a/build/MakefileDA b/build/MakefileDA
index e59996d1045895a58fb87de3e759803564268a72..a5e353c258884621f7003914cf6bc9ced7a18f41 100644 (file)
--- a/build/MakefileDA
+++ b/build/MakefileDA
@@ -71,13 +71,13 @@ DAQDADIR=${DAQDALIB_PATH}
 endif
 DAQDALIB=$(DAQDADIR)/libdaqDA.a
 
-ifneq ($(shell amore-config 2>&1 |grep -i usage),)
-AMOREFLAGS = -DALI_AMORE $(shell amore-config --cflags --includes)
+ifneq ($(shell $(AMORE)/amore-config 2>&1 |grep -i usage),)
+AMOREFLAGS = -DALI_AMORE $(shell $(AMORE)/amore-config --cflags --includes)
 CXXFLAGS  += $(AMOREFLAGS)
 CFLAGS    += $(AMOREFLAGS)
 CINTFLAGS += $(AMOREFLAGS)
 DEPINC    += $(AMOREFLAGS)
-AMOREDALIBS+=-static $(shell amore-config --auxlibs) $(shell date-config --rcproxylibs)
+AMOREDALIBS+=-static $(shell $(AMORE)/amore-config --ldflags-da-static) $(shell date-config --rcproxylibs)
 else
 AMOREDALIBS=
 endif
@@ -102,15 +102,15 @@ CXXFLAGS+=$(addprefix -I,$(filter-out %tgt_${ALICE_TARGET},$(filter-out %CVS,$(p
 ALIROOTALIBS+=$($(EXTRADAMODULE)ALIBS)
 endif
 
-DACONTACT=$(sort $(shell grep -i "Contact:" $(DASRC) | cut -d':' -f2))
-DALINKPAGE=$(sort $(subst Link:,,$(shell grep -i "Link:" $(DASRC))))
-DAREFRUN=$(sort $(shell grep -i "Reference Run:" $(DASRC) | cut -d':' -f2))
-DARUNTYPE=$(sort $(shell grep -i "Run Type:" $(DASRC) | cut -d':' -f2))
-DATYPE=$(sort $(shell grep -i "DA Type:" $(DASRC) | cut -d':' -f2))
-DANUMBEROFEVENTS=$(sort $(shell grep -i "Number of events needed:" $(DASRC) | cut -d':' -f2))
-DAINPUTFILES=$(sort $(shell grep -i "Input Files:" $(DASRC) | cut -d':' -f2))
-DAOUTPUTFILES=$(sort $(shell grep -i "Output Files:" $(DASRC) | cut -d':' -f2))
-DATRIGGERTYPE=$(sort $(shell grep -i "Trigger types used:" $(DASRC) | cut -d':' -f2))
+DACONTACT=$(shell grep -i "Contact:" $(DASRC) | sed -e "s/[^:]*:\s*//" | head -n 1)
+DALINKPAGE=$(shell grep -i "Link:" $(DASRC) | sed -e "s/[^:]*:\s*//" | head -n 1)
+DAREFRUN=$(shell grep -i "Reference Run:" $(DASRC) | sed -e "s/[^:]*:\s*//" | head -n 1)
+DARUNTYPE=$(shell grep -i "Run Type:" $(DASRC) | sed -e "s/[^:]*:\s*//" | head -n 1)
+DATYPE=$(shell grep -i "DA Type:" $(DASRC) | sed -e "s/[^:]*:\s*//" | head -n 1)
+DANUMBEROFEVENTS=$(shell grep -i "Number of events needed:" $(DASRC) | sed -e "s/[^:]*:\s*//" | head -n 1)
+DAINPUTFILES=$(shell grep -i "Input Files:" $(DASRC) | sed -e "s/[^:]*:\s*//" | head -n 1)
+DAOUTPUTFILES=$(shell grep -i "Output Files:" $(DASRC) | sed -e "s/[^:]*:\s*//" | head -n 1)
+DATRIGGERTYPE=$(shell grep -i "Trigger types used:" $(DASRC) | sed -e "s/[^:]*:\s*//" | head -n 1)
 
 $(DATARGETNAME): $(DAEXE)
 
@@ -121,8 +121,8 @@ $(DAEXE): $(DAOBJ) $(BINPATH) $(LIBPATH) $(DALIB) $(DAQDALIB) $(EXTRAROOTLIB)
        $(EXTRAROOTLIB) \
        $(ROOTLIBDIR)/libRoot.a \
        $(ROOTLIBDIR)/libfreetype.a $(ROOTLIBDIR)/libpcre.a \
-       $(DAQDALIB) $(MONITORLIBS) $(AMOREDALIBS) \
-       $(SYSLIBS)
+       $(SYSLIBS) \
+       $(DAQDALIB) $(MONITORLIBS) $(AMOREDALIBS)
 
 $(DAOBJ): $(DASRC) $(DAQDADIR) $(DADEP) $(DATARGETDIR)
        @echo "***** Compiling $(DASRC) *****"
@@ -137,14 +137,14 @@ $(DADEP): $(DASRC) $(DAQDADIR) $(DATARGETDIR)
 $(DATARGETDIR):
        $(MUTE)if [ ! -d '$@' ]; then echo "***** Making directory $@ *****"; mkdir -p $@; fi
 
-$(DALIB): $(ALIROOTALIBS)
+$(DALIB): $(ARVERSIONFILE) $(ALIROOTALIBS)
        @echo "***** Linking static library $(DALIB) *****"
        $(MUTE)rm -rf $@
        $(MUTE)rm -rf junk
-       $(MUTE)mkdir junk && cd junk && $(addprefix $(AR) x ../,$(addsuffix &&,$^)) $(AR) r $@ *.o && cd .. && rm -rf junk
+       $(MUTE)mkdir junk && cd junk && $(addprefix $(AR) x ../,$(addsuffix &&,$(filter-out $(ARVERSIONFILE),$^))) $(AR) r $@ *.o && cd .. && rm -rf junk
 
 $(EXTRAROOTLIB): $(LIBPATH) 
-       $(MUTE)$(AR) r $@ `ls ${ROOTSYS}/montecarlo/vmc/src/*.o ${ROOTSYS}/tree/treeplayer/src/*.o ${ROOTSYS}/io/xmlparser/src/*.o`
+       $(MUTE)$(AR) r $@ `ls ${ROOTSYS}/montecarlo/vmc/src/*.o ${ROOTSYS}/tree/treeplayer/src/*.o ${ROOTSYS}/io/xmlparser/src/*.o ${ROOTSYS}/math/minuit2/src/*.o`
 
 $(DATARGETNAME)-clean:
        @echo "***** Cleaning $(DAMODULE)$(SUBDAMODULE)$(DANAME) detector-algorithm *****"
@@ -183,7 +183,7 @@ $(DAMAKEFILE): $(DATARGETDIR)
        @echo "endif" >> $@
        @echo "" >> $@
        @echo "DAQDALIB=""$$""(DAQDADIR)/libdaqDA.a" >> $@
-       @echo "AMOREDALIBS=-static ""$$""(shell amore-config --auxlibs) ""$$""(shell date-config --rcproxylibs)" >> $@
+       @echo "AMOREDALIBS=-static ""$$""(shell ""$$""(AMORE)/amore-config --ldflags-da-static) ""$$""(shell date-config --rcproxylibs)" >> $@
        @echo "MONITORLIBS=""$$""(shell date-config --monitorlibs=noshift)" >> $@
        @echo "" >> $@
        @echo "${DAMODULE}${SUBDAMODULE}${DANAME}da.exe: ${DAMODULE}${SUBDAMODULE}${DANAME}da.o" >> $@
@@ -192,8 +192,8 @@ $(DAMAKEFILE): $(DATARGETDIR)
        @echo "         $(EXTRAROOTLIB) \\" >> $@
        @echo "         ""$$""(ROOTSYS)/lib/libRoot.a \\" >> $@
        @echo "         ""$$""(ROOTSYS)/lib/libfreetype.a ""$$""(ROOTSYS)/lib/libpcre.a \\" >> $@
-       @echo "         ""$$""(DAQDALIB) ""$$""(MONITORLIBS) ""$$""(AMOREDALIBS) \\" >> $@
-       @echo "         $(SYSLIBS)" >> $@
+       @echo "         $(SYSLIBS) \\" >> $@
+       @echo "         ""$$""(DAQDALIB) ""$$""(MONITORLIBS) ""$$""(AMOREDALIBS)" >> $@
        @echo "" >> $@
        @echo "${DAMODULE}${SUBDAMODULE}${DANAME}da.o: ${DAMODULE}${SUBDAMODULE}${DANAME}da.cxx" >> $@
        @echo "         ""$$""(CXX) -c ""$$""(CXXFLAGS) -I""$$""(DAQDADIR) ""$$""< -o ""$$""@" >> $@
@@ -265,6 +265,9 @@ $(DASPECFILE): $(DATARGETDIR)
        @echo "# Do not modify following scripts" >> $@
        @echo "#################################################################" >> $@
        @echo "" >> $@
+       @echo "%define debug_package %{nil}" >> $@
+       @echo "%define __os_install_post %{nil}" >> $@
+       @echo "" >> $@
        @echo "# here is defined the installation root directory" >> $@
        @echo "%define pkgname %{name}-%{version}" >> $@
        @echo "%define destdir %{prefix}" >> $@