...and the "infrastructure" for the dielectron updates/additions

diff --git a/PWG3/Makefile b/PWG3/Makefile
index b42fbe6a6fe3951f2fa9d662407d0b109f3d8fe6..f423471050ebc5363b88e506b380d6710cdd2c25 100644 (file)
--- a/PWG3/Makefile
+++ b/PWG3/Makefile
@@ -2,7 +2,7 @@
 
 include $(ROOTSYS)/test/Makefile.arch
 
-default-target: libPWG3base.so libPWG3muon.so libPWG3muondep.so libPWG3vertexingHF.so libPWG3hfe.so 
+default-target: libPWG3base.so libPWG3muon.so libPWG3muondep.so libPWG3vertexingHF.so libPWG3hfe.so libPWG3dielectron.so
 
 ALICEINC      = -I.
 
@@ -216,3 +216,25 @@ G__PWG3hfe.cxx G__PWG3hfe.h: $(HDRS_PWG3hfe) $(DHDR_PWG3hfe)
        @echo "Generating dictionary ..."
        rootcint -f $@ -c $(ALICEINC) $^
 
+## libPWG3dielectron part
+##include libPWG3dielectron.pkg
+       
+DHDR_PWG3dielectron := $(DHDR)
+HDRS_PWG3dielectron := $(HDRS)
+SRCS_PWG3dielectron := $(SRCS) G__PWG3dielectron.cxx
+OBJS_PWG3dielectron := $(SRCS_PWG3dielectron:.cxx=.o)
+
+libPWG3dielectron.so: $(OBJS_PWG3dielectron)
+       @echo "Linking" $@ ...
+       @/bin/rm -f $@
+ifeq ($(ARCH),macosx)
+       @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
+else
+       @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
+endif
+       @chmod a+x $@
+       @echo "done"
+                       
+G__PWG3dielectron.cxx G__PWG3dielectron.h: $(HDRS_PWG3dielectron) $(DHDR_PWG3dielectron)
+       @echo "Generating dictionary ..."
+       rootcint -f $@ -c $(ALICEINC) $^

diff --git a/PWG3/PROOF-INF.PWG3dielectron/BUILD.sh b/PWG3/PROOF-INF.PWG3dielectron/BUILD.sh
index becb7e5c1a0e32f193889fa443da4e982a276d06..3cf5a23c80231c7af4496c9e9446b52518e8b220 100755 (executable)
--- a/PWG3/PROOF-INF.PWG3dielectron/BUILD.sh
+++ b/PWG3/PROOF-INF.PWG3dielectron/BUILD.sh
@@ -1,3 +1,3 @@
 #! /bin/bash
 
-make
+make libPWG3dielectron.so

diff --git a/PWG3/PROOF-INF.PWG3dielectron/SETUP.C b/PWG3/PROOF-INF.PWG3dielectron/SETUP.C
index e6041bacc5b107fc1a4a6c07e4ed476aaaea2b5c..ba124f6ac9bf3185e695c47cc0a59273e504c421 100644 (file)
--- a/PWG3/PROOF-INF.PWG3dielectron/SETUP.C
+++ b/PWG3/PROOF-INF.PWG3dielectron/SETUP.C
@@ -1,9 +1,39 @@
+
+
+
+void SETUP()
 {
-  gSystem->Load("libDielectron.so");
-  // Set the include paths
-  gROOT->ProcessLine(".include Dielectron");
+  // Load some ROOT libraries
+  CheckLoadLibrary("libTree");
+  CheckLoadLibrary("libGeom");
+  CheckLoadLibrary("libVMC");
+  CheckLoadLibrary("libMinuit");
+  CheckLoadLibrary("libRooFit");
+  
+  // Load the AliROOT library
+  CheckLoadLibrary("libANALYSIS");
+  CheckLoadLibrary("libSTEERBase");
+  CheckLoadLibrary("libESD");
+  CheckLoadLibrary("libCDB");
+  CheckLoadLibrary("libAOD");
+  CheckLoadLibrary("libCORRFW");
+  CheckLoadLibrary("libANALYSISalice");
+  CheckLoadLibrary("libPWG3dielectron");
   
+  // Set the include paths
+  gROOT->ProcessLine(".include PWG3dielectron");
+    
   // Set our location, so that other packages can find us
-  gSystem->Setenv("Dielectron_INCLUDE", "Dielectron");
+  gSystem->Setenv("PWG3dielectron_INCLUDE", "PWG3dielectron");
+}
+
+
+Int_t CheckLoadLibrary(const char* library)
+{
+  // checks if a library is already loaded, if not loads the library
+  
+  if (strlen(gSystem->GetLibraries(Form("%s.so", library), "", kFALSE)) > 0)
+    return 1;
   
+  return gSystem->Load(library);
 }

diff --git a/PWG3/PWG3dielectronLinkDef.h b/PWG3/PWG3dielectronLinkDef.h
index 27662d0064d071b3897d2e1cc541a1c8b3433624..93d4dcb8c4c78cf8e3433fb680a1be5a4800a4f1 100644 (file)
--- a/PWG3/PWG3dielectronLinkDef.h
+++ b/PWG3/PWG3dielectronLinkDef.h
@@ -19,4 +19,9 @@
 #pragma link C++ class AliAnalysisTaskMultiDielectron+;
 #pragma link C++ class AliDielectronVarCuts+;
 #pragma link C++ class AliDielectronPairLegCuts+;
+#pragma link C++ class AliDielectronSignalBase+;
+#pragma link C++ class AliDielectronSignalFunc+;
+#pragma link C++ class AliDielectronSignalExt+;
+#pragma link C++ class AliDielectronSpectrum+;
+#pragma link C++ class AliDielectronDebugTree+;
 #endif

diff --git a/PWG3/libPWG3dielectron.pkg b/PWG3/libPWG3dielectron.pkg
index 4e4aeb58f911e95c8a8646d9e8bd91fbe285fec4..1f3e28b2808e3853bf23f9af0ae08bcebdf91ba5 100644 (file)
--- a/PWG3/libPWG3dielectron.pkg
+++ b/PWG3/libPWG3dielectron.pkg
@@ -12,7 +12,12 @@ SRCS= dielectron/AliDielectron.cxx \
       dielectron/AliAnalysisTaskDielectronEfficiency.cxx \
       dielectron/AliAnalysisTaskMultiDielectron.cxx \
       dielectron/AliDielectronVarCuts.cxx \
-      dielectron/AliDielectronPairLegCuts.cxx
+      dielectron/AliDielectronPairLegCuts.cxx \
+      dielectron/AliDielectronSignalBase.cxx \
+      dielectron/AliDielectronSignalFunc.cxx \
+      dielectron/AliDielectronSignalExt.cxx \
+      dielectron/AliDielectronSpectrum.cxx \
+      dielectron/AliDielectronDebugTree.cxx 
 
 HDRS= $(SRCS:.cxx=.h)