appropriately modified builders for package and PAR library

diff --git a/PWG2/PROOF-INF.PWG2resonances/SETUP.C b/PWG2/PROOF-INF.PWG2resonances/SETUP.C
index b5e79811be287804a3951261c81b979f3cd5f2c1..2432e0264577ab19bba1f7f8f889f1747d1f1dd9 100644 (file)
--- a/PWG2/PROOF-INF.PWG2resonances/SETUP.C
+++ b/PWG2/PROOF-INF.PWG2resonances/SETUP.C
@@ -6,7 +6,7 @@ void SETUP() {
   gROOT->ProcessLine(".include PWG2resonances");
 
   // Set our location, so that other packages can find us
-  gSystem->Setenv("PWG2resonances_INCLUDE", "PWG2resonances");
+  gSystem->Setenv("PWG2resonances_INCLUDE", "PWG2resonances/RESONANCES");
 }
 
 Int_t CheckLoadLibrary(const char* library) {

diff --git a/PWG2/PWG2resonancesLinkDef.h b/PWG2/PWG2resonancesLinkDef.h
index 2519768a61be4b2d46d5505166110465907786a5..1e48291f64b66fadf976302a62b6821400afd276 100644 (file)
--- a/PWG2/PWG2resonancesLinkDef.h
+++ b/PWG2/PWG2resonancesLinkDef.h
@@ -1,29 +1,32 @@
 #ifdef __CINT__
 
-#pragma link off all glols;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ class AliRsnParticle+;
+#pragma link C++ class AliRsnMCInfo+;
 #pragma link C++ class AliRsnDaughter+;
+#pragma link C++ class AliRsnPairParticle+;
 
-#pragma link C++ class AliRsnPID+;
-
-#pragma link C++ class AliRsnDaughterCut+;
-#pragma link C++ class AliRsnDaughterCutPt+;
-#pragma link C++ class AliRsnDaughterCutVt+;
+#pragma link C++ class AliRsnCut+;
+#pragma link C++ class AliRsnVariableExpression+;
+#pragma link C++ class AliRsnExpression+;
+#pragma link C++ class AliRsnCutSet+;
+#pragma link C++ class AliRsnCutMgr+;
 
-#pragma link C++ class AliRsnDaughterCutPair+;
-#pragma link C++ class AliRsnDaughterCutPairPt+;
-#pragma link C++ class AliRsnDaughterCutPairAngle+;
-#pragma link C++ class AliRsnDaughterCutPairArmenteros+;
+#pragma link C++ class AliRsnPID+;
+#pragma link C++ class AliRsnPIDWeightsMgr+;
+#pragma link C++ class AliRsnPIDIndex+;
 
 #pragma link C++ class AliRsnEvent+;
 #pragma link C++ class AliRsnReader+;
-#pragma link C++ class AliRsnReaderTask+;
+#pragma link C++ class AliRsnReaderTaskSE+;
+
+#pragma link C++ class AliRsnPairDef+;
+#pragma link C++ class AliRsnPairSimple+;
 
-#pragma link C++ class AliRsnPair+;
-#pragma link C++ class AliRsnManager+;
-#pragma link C++ class AliRsnAnalysis+;
+#pragma link C++ class AliRsnEventBuffer+;
+#pragma link C++ class AliRsnAnalysisSimple+;
+#pragma link C++ class AliRsnAnalyzerSimple+;
+#pragma link C++ class AliRsnAnalysisSimpleTask+;
 
+//#pragma link C++ class AliRsnPair+;
+//#pragma link C++ class AliRsnBaseAT+;
+//#pragma link C++ class AliRsnAnalysisAT+;
 #endif

diff --git a/PWG2/libPWG2resonances.pkg b/PWG2/libPWG2resonances.pkg
index a4a9f8f0b5bbcfaec7d18a1a782647ba4a612e9e..107d811060ea6ef4332e280f550fea16569f3168 100644 (file)
--- a/PWG2/libPWG2resonances.pkg
+++ b/PWG2/libPWG2resonances.pkg
@@ -1,26 +1,31 @@
-#-*- Mode: Makefile -*-
-
-SRCS= RESONANCES/AliRsnParticle.cxx \
+SRCS= RESONANCES/AliRsnMCInfo.cxx \
       RESONANCES/AliRsnDaughter.cxx \
+      RESONANCES/AliRsnPairParticle.cxx \
+      RESONANCES/AliRsnCut.cxx \
+      RESONANCES/AliRsnExpression.cxx \
+      RESONANCES/AliRsnCutSet.cxx \
+      RESONANCES/AliRsnCutMgr.cxx \
       RESONANCES/AliRsnPID.cxx \
-      RESONANCES/AliRsnDaughterCut.cxx RESONANCES/AliRsnDaughterCutPair.cxx \
+      RESONANCES/AliRsnPIDWeightsMgr.cxx \
+      RESONANCES/AliRsnPIDIndex.cxx \
       RESONANCES/AliRsnEvent.cxx \
       RESONANCES/AliRsnReader.cxx \
-      RESONANCES/AliRsnReaderTask.cxx \
-      RESONANCES/AliRsnPair.cxx \
-      RESONANCES/AliRsnManager.cxx \
-      RESONANCES/AliRsnAnalysis.cxx \
+      RESONANCES/AliRsnReaderTaskSE.cxx \
+      RESONANCES/AliRsnPairDef.cxx \
+      RESONANCES/AliRsnPairSimple.cxx \
+      RESONANCES/AliRsnEventBuffer.cxx \
+      RESONANCES/AliRsnAnalysisSimple.cxx \
+      RESONANCES/AliRsnAnalyzerSimple.cxx \
+      RESONANCES/AliRsnAnalysisSimpleTask.cxx \
+#     RESONANCES/AliRsnPair.cxx \
+#     RESONANCES/AliRsnBaseAT.cxx \
+#     RESONANCES/AliRsnAnalysisAT.cxx \
 
-HDRS= $(SRCS:.cxx=.h) 
+HDRS= $(SRCS:.cxx=.h)
 
 DHDR:=PWG2resonancesLinkDef.h
 
 EXPORT:=
 
-EINCLUDE:= PYTHIA6 
+EINCLUDE:= PYTHIA6
 
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
-                         -lESD -lANALYSIS -lANALYSISalice \
-                         -L$(shell root-config --libdir) -lEG
-endif