Small modifications for proper running of FASTJET on the Grid.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 21 May 2009 19:30:45 +0000 (19:30 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 21 May 2009 19:30:45 +0000 (19:30 +0000)
JETAN/JETANLinkDef.h
JETAN/Makefile
JETAN/libJETAN.pkg

index e380b4c74959c413a0934f30d57f2b65bc8bcddb..95f2104a6aae2da7983bf2756f16a71e7df3811f 100644 (file)
@@ -48,7 +48,7 @@
 
 #ifdef WITHFASTJET
 #pragma        link C++ class AliFastJetFinder+;
-#pragma        link C++ class AliFastJetHeader+;
+#pragma        link C++ class AliFastJetHeaderV1+;
 #pragma        link C++ class AliSISConeJetFinder+;
 #pragma        link C++ class AliSISConeJetHeader+;
 #endif
index a13fd6d121887eab7a1373de2de43e732a3fbdc7..baeb0248c47437ee8af718249f01d1b288364f55 100644 (file)
@@ -44,5 +44,5 @@ clean:
 
 G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR)
        @echo "Generating dictionary ..."
-       rootcint -f $@ -c $(ALICEINC) $^
+       rootcint -f $@ -c $(CINTFLAGS) $(ALICEINC) $^
 
index 5e4b37b909204ca4ea1e971ebc3cb37cecd2ee7a..62542201f699cbaab819d53580db8ee77dfdcdd0 100644 (file)
@@ -29,7 +29,7 @@ SRCS =        AliJet.cxx AliJetHeader.cxx \
 
 
 ifneq ($(FASTJET),)
-       SRCS+= AliFastJetFinder.cxx AliFastJetHeader.cxx \
+       SRCS+= AliFastJetFinder.cxx AliFastJetHeaderV1.cxx \
        AliSISConeJetFinder.cxx AliSISConeJetHeader.cxx
 endif
 
@@ -38,7 +38,7 @@ HDRS:= $(SRCS:.cxx=.h)
 DHDR= JETANLinkDef.h
 
 ifneq ($(FASTJET),)
-       EINCLUDE:= $(FASTJET)/include
+       EINCLUDE += $(FASTJET)/include
        CINTFLAGS += -DWITHFASTJET
 endif