New structure of PWG3: PWG3base, PWG3muon, PWG3vertexingHF and PWG3vertexingOld ...

diff --git a/PWG3/Makefile b/PWG3/Makefile
index ad98b9d4fd019679df63f2fa1b5f8a88c77a16fd..8f0e4db6dc170453f106a4e046b319c6bc399e86 100644 (file)
--- a/PWG3/Makefile
+++ b/PWG3/Makefile
@@ -2,7 +2,7 @@
 
 include $(ROOTSYS)/test/Makefile.arch
 
-default-target: libPWG3base.so 
+default-target: libPWG3base.so libPWG3muon libPWG3vertexingHF.so libPWG3vertexingOld.so 
 
 ALICEINC      = -I.
 
@@ -30,17 +30,17 @@ endif
 
 CXXFLAGS     += $(ALICEINC) -g
 
-PACKAGE = PWG3base
+PACKAGE = PWG3
 include lib$(PACKAGE).pkg
 
-DHDR_PWG3base := $(DHDR)
-HDRS_PWG3base := $(HDRS)
-SRCS_PWG3base := $(SRCS) G__$(PACKAGE).cxx
-OBJS_PWG3base := $(SRCS_PWG3base:.cxx=.o)
+DHDR_PWG3 := $(DHDR)
+HDRS_PWG3 := $(HDRS)
+SRCS_PWG3 := $(SRCS) G__$(PACKAGE).cxx
+OBJS_PWG3 := $(SRCS_PWG3:.cxx=.o)
 
 PARFILE       = $(PACKAGE).par
 
-lib$(PACKAGE).so: $(OBJS_PWG3base)
+lib$(PACKAGE).so: $(OBJS_PWG3)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
 ifeq ($(ARCH),macosx)
@@ -54,16 +54,16 @@ endif
 %.o:    %.cxx %.h
        $(CXX) $(CXXFLAGS) -c $< -o $@
 
-G__PWG3base.cxx G__PWG3base.h: $(HDRS_PWG3base) $(DHDR_PWG3base)
+G__PWG3.cxx G__PWG3.h: $(HDRS_PWG3) $(DHDR_PWG3)
        @echo "Generating dictionary ..."
        rootcint -f $@ -c $(ALICEINC) $^
 
 clean:
-       @rm -f $(OBJS_PWG3base)  *.so G__PWG3base.*  $(PARFILE)
+       @rm -f $(OBJS_PWG3)  *.so G__PWG3.*  $(PARFILE)
 
 ### CREATE PAR FILE
 
-$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_PWG3base) $(SRCS_PWG3base) $(DHDR_PWG3base) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF))
+$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_PWG3) $(SRCS_PWG3) $(DHDR_PWG3) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF))
        @echo "Creating archive" $@ ...
        @tar cfzh $@ $(PACKAGE)
        @rm -rf $(PACKAGE)
@@ -96,3 +96,95 @@ test-%.par: %.par
        @rm -rf par-tmp
        @echo "INFO: Testing succeeded (already cleaned up)"
 
+## libPWG3base part
+##include libPWG3base.pkg
+
+DHDR_PWG3base := $(DHDR)
+HDRS_PWG3base := $(HDRS)
+SRCS_PWG3base := $(SRCS) G__PWG3base.cxx
+OBJS_PWG3base := $(SRCS_PWG3base:.cxx=.o)
+
+libPWG3base.so: $(OBJS_PWG3base)
+       @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__PWG3base.cxx G__PWG3base.h: $(HDRS_PWG3base) $(DHDR_PWG3base)
+       @echo "Generating dictionary ..."
+       rootcint -f $@ -c $(ALICEINC) $^
+
+
+## libPWG3muon part
+##include libPWG3muon.pkg
+
+DHDR_PWG3muon := $(DHDR)
+HDRS_PWG3muon := $(HDRS)
+SRCS_PWG3muon := $(SRCS) G__PWG3muon.cxx
+OBJS_PWG3muon := $(SRCS_PWG3muon:.cxx=.o)
+
+libPWG3muon.so: $(OBJS_PWG3muon)
+       @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__PWG3muon.cxx G__PWG3muon.h: $(HDRS_PWG3muon) $(DHDR_PWG3muon)
+       @echo "Generating dictionary ..."
+       rootcint -f $@ -c $(ALICEINC) $^
+
+## libPWG3vertexingHF part
+##include libPWG3vertexingHF.pkg
+
+DHDR_PWG3vertexingHF := $(DHDR)
+HDRS_PWG3vertexingHF := $(HDRS)
+SRCS_PWG3vertexingHF := $(SRCS) G__PWG3vertexingHF.cxx
+OBJS_PWG3vertexingHF := $(SRCS_PWG3vertexingHF:.cxx=.o)
+
+libPWG3vertexingHF.so: $(OBJS_PWG3vertexingHF)
+       @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__PWG3vertexingHF.cxx G__PWG3vertexingHF.h: $(HDRS_PWG3vertexingHF) $(DHDR_PWG3vertexingHF)
+       @echo "Generating dictionary ..."
+       rootcint -f $@ -c $(ALICEINC) $^
+
+## libPWG3vertexingOld part
+##include libPWG3vertexingOld.pkg
+
+DHDR_PWG3vertexingOld := $(DHDR)
+HDRS_PWG3vertexingOld := $(HDRS)
+SRCS_PWG3vertexingOld := $(SRCS) G__PWG3vertexingOld.cxx
+OBJS_PWG3vertexingOld := $(SRCS_PWG3vertexingOld:.cxx=.o)
+
+libPWG3vertexingOld.so: $(OBJS_PWG3vertexingOld)
+       @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__PWG3vertexingOld.cxx G__PWG3vertexingOld.h: $(HDRS_PWG3vertexingOld) $(DHDR_PWG3vertexingOld)
+       @echo "Generating dictionary ..."
+       rootcint -f $@ -c $(ALICEINC) $^

diff --git a/PWG3/PROOF-INF.PWG3/BUILD.sh b/PWG3/PROOF-INF.PWG3/BUILD.sh
new file mode 100755 (executable)
index 0000000..e6311b3
--- /dev/null
+++ b/PWG3/PROOF-INF.PWG3/BUILD.sh
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+make libPWG3base.so
+make libPWG3muon.so
+make libPWG3vertexingHF.so
+make libPWG3vertexingOld.so
\ No newline at end of file

diff --git a/PWG3/PROOF-INF.PWG3/SETUP.C b/PWG3/PROOF-INF.PWG3/SETUP.C
new file mode 100644 (file)
index 0000000..df28eda
--- /dev/null
+++ b/PWG3/PROOF-INF.PWG3/SETUP.C
@@ -0,0 +1,32 @@
+void SETUP()
+{
+    // Load some ROOT libraries
+    CheckLoadLibrary("libTree");
+    CheckLoadLibrary("libGeom");
+    CheckLoadLibrary("libVMC");
+
+    // Load the ESD library
+    CheckLoadLibrary("libANALYSIS");
+    CheckLoadLibrary("libSTEERBase");
+    CheckLoadLibrary("libESD");
+    CheckLoadLibrary("libAOD");
+    CheckLoadLibrary("libANALYSISalice");
+    CheckLoadLibrary("libPWG3");
+
+
+   // Set the include paths
+   gROOT->ProcessLine(".include PWG3");
+
+   // Set our location, so that other packages can find us
+   gSystem->Setenv("PWG3_INCLUDE", "PWG3");
+}
+
+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/PROOF-INF.PWG3base/SETUP.C b/PWG3/PROOF-INF.PWG3base/SETUP.C
index 7bbafc6290f68933fa257bf3470a1f82beca1c6d..405a2daf46f37c5feb78762c7331147acb7a61d4 100644 (file)
--- a/PWG3/PROOF-INF.PWG3base/SETUP.C
+++ b/PWG3/PROOF-INF.PWG3base/SETUP.C
@@ -1,7 +1,6 @@
 void SETUP()
 {
     // Load some ROOT libraries
-    CheckLoadLibrary("libEG");
     CheckLoadLibrary("libTree");
     CheckLoadLibrary("libGeom");
     CheckLoadLibrary("libVMC");
@@ -11,6 +10,7 @@ void SETUP()
     CheckLoadLibrary("libSTEERBase");
     CheckLoadLibrary("libESD");
     CheckLoadLibrary("libAOD");
+    CheckLoadLibrary("libANALYSISalice");
     CheckLoadLibrary("libPWG3base");
 
 

diff --git a/PWG3/PROOF-INF.PWG3muon/BUILD.sh b/PWG3/PROOF-INF.PWG3muon/BUILD.sh
new file mode 100755 (executable)
index 0000000..7335ddf
--- /dev/null
+++ b/PWG3/PROOF-INF.PWG3muon/BUILD.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+make libPWG3muon.so

diff --git a/PWG3/PROOF-INF.PWG3muon/SETUP.C b/PWG3/PROOF-INF.PWG3muon/SETUP.C
new file mode 100644 (file)
index 0000000..9633c92
--- /dev/null
+++ b/PWG3/PROOF-INF.PWG3muon/SETUP.C
@@ -0,0 +1,32 @@
+void SETUP()
+{
+    // Load some ROOT libraries
+    CheckLoadLibrary("libTree");
+    CheckLoadLibrary("libGeom");
+    CheckLoadLibrary("libVMC");
+
+    // Load the ESD library
+    CheckLoadLibrary("libANALYSIS");
+    CheckLoadLibrary("libSTEERBase");
+    CheckLoadLibrary("libESD");
+    CheckLoadLibrary("libAOD");
+    CheckLoadLibrary("libANALYSISalice");
+    CheckLoadLibrary("libPWG3muon");
+
+
+   // Set the include paths
+   gROOT->ProcessLine(".include PWG3muon");
+
+   // Set our location, so that other packages can find us
+   gSystem->Setenv("PWG3muon_INCLUDE", "PWG3muon");
+}
+
+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/PROOF-INF.PWG3vertexingHF/BUILD.sh b/PWG3/PROOF-INF.PWG3vertexingHF/BUILD.sh
new file mode 100755 (executable)
index 0000000..7193d7e
--- /dev/null
+++ b/PWG3/PROOF-INF.PWG3vertexingHF/BUILD.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+make libPWG3vertexingHF.so

diff --git a/PWG3/PROOF-INF.PWG3vertexingHF/SETUP.C b/PWG3/PROOF-INF.PWG3vertexingHF/SETUP.C
new file mode 100644 (file)
index 0000000..b0760f7
--- /dev/null
+++ b/PWG3/PROOF-INF.PWG3vertexingHF/SETUP.C
@@ -0,0 +1,31 @@
+void SETUP()
+{
+    // Load some ROOT libraries
+    CheckLoadLibrary("libTree");
+    CheckLoadLibrary("libGeom");
+    CheckLoadLibrary("libVMC");
+
+    // Load the ESD library
+    CheckLoadLibrary("libANALYSIS");
+    CheckLoadLibrary("libSTEERBase");
+    CheckLoadLibrary("libESD");
+    CheckLoadLibrary("libAOD");
+    CheckLoadLibrary("libANALYSISalice");
+    CheckLoadLibrary("libPWG3vertexingHF");
+
+   // Set the include paths
+   gROOT->ProcessLine(".include PWG3vertexingHF");
+
+   // Set our location, so that other packages can find us
+   gSystem->Setenv("PWG3base_INCLUDE", "PWG3vertexingHF");
+}
+
+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/PROOF-INF.PWG3vertexingOld/BUILD.sh b/PWG3/PROOF-INF.PWG3vertexingOld/BUILD.sh
new file mode 100755 (executable)
index 0000000..f7a1adb
--- /dev/null
+++ b/PWG3/PROOF-INF.PWG3vertexingOld/BUILD.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+make libPWG3vertexingOld.so

diff --git a/PWG3/PROOF-INF.PWG3vertexingOld/SETUP.C b/PWG3/PROOF-INF.PWG3vertexingOld/SETUP.C
new file mode 100644 (file)
index 0000000..0712f39
--- /dev/null
+++ b/PWG3/PROOF-INF.PWG3vertexingOld/SETUP.C
@@ -0,0 +1,31 @@
+void SETUP()
+{
+    // Load some ROOT libraries
+    CheckLoadLibrary("libTree");
+    CheckLoadLibrary("libGeom");
+    CheckLoadLibrary("libVMC");
+
+    // Load the ESD library
+    CheckLoadLibrary("libANALYSIS");
+    CheckLoadLibrary("libSTEERBase");
+    CheckLoadLibrary("libESD");
+    CheckLoadLibrary("libAOD");
+    CheckLoadLibrary("libANALYSISalice");
+    CheckLoadLibrary("libPWG3vertexingOld");
+
+   // Set the include paths
+   gROOT->ProcessLine(".include PWG3vertexingOld");
+
+   // Set our location, so that other packages can find us
+   gSystem->Setenv("PWG3base_INCLUDE", "PWG3vertexingOld");
+}
+
+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/PWG3LinkDef.h b/PWG3/PWG3LinkDef.h
index 6cc45d1b724f9dbabe3483b293ee62cd2645c3a9..d67e595da881ee15a6eb5bd3fb4e652af5d985f7 100644 (file)
--- a/PWG3/PWG3LinkDef.h
+++ b/PWG3/PWG3LinkDef.h
@@ -1,13 +1,10 @@
 #ifdef __CINT__
 
-#pragma link off all glols;
+#pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class AliD0toKpi+;
-#pragma link C++ class AliD0toKpiAnalysis+;
-#pragma link C++ class AliBtoJPSItoEle+;
-#pragma link C++ class AliBtoJPSItoEleAnalysis+;
-
 
 #endif
+
+

diff --git a/PWG3/PWG3baseLinkDef.h b/PWG3/PWG3baseLinkDef.h
index d7a4e8225d8e659180b90bb035f54d9613ffa417..34805fd639ac8ca79b8430de44d2b6c758775c0c 100644 (file)
--- a/PWG3/PWG3baseLinkDef.h
+++ b/PWG3/PWG3baseLinkDef.h
@@ -7,21 +7,6 @@
 #pragma link C++ class AliQuarkoniaAcceptance+; 
 #pragma link C++ class AliQuarkoniaEfficiency+; 
 
-#pragma link C++ class AliAODRecoDecayHF+;
-#pragma link C++ class AliAODRecoDecayHF2Prong+;
-#pragma link C++ class AliAODRecoDecayHF3Prong+;
-#pragma link C++ class AliAODRecoDecayHF4Prong+;
-#pragma link C++ class AliAnalysisVertexingHF+;
-#pragma link C++ class AliAnalysisTaskVertexingHF+;
-#pragma link C++ class AliAnalysisTaskSEVertexingHF+;
-#pragma link C++ class AliAnalysisTaskSESelectHF+;
-
-#pragma link C++ class AliAODDimuon+;
-#pragma link C++ class AliAODEventInfo+;
-#pragma link C++ class AliAnalysisTaskMuonAODfromGeneral+;
-#pragma link C++ class AliAnalysisTaskSingleMu+;
-#pragma link C++ class AliAnalysisTaskLUT+;
-#pragma link C++ class AliAnalysisTaskESDMuonFilter+;
 #endif
 
 

diff --git a/PWG3/PWG3muonLinkDef.h b/PWG3/PWG3muonLinkDef.h
new file mode 100644 (file)
index 0000000..43792f6
--- /dev/null
+++ b/PWG3/PWG3muonLinkDef.h
@@ -0,0 +1,15 @@
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class AliAODDimuon+;
+#pragma link C++ class AliAODEventInfo+;
+#pragma link C++ class AliAnalysisTaskMuonAODfromGeneral+;
+#pragma link C++ class AliAnalysisTaskSingleMu+;
+#pragma link C++ class AliAnalysisTaskLUT+;
+#pragma link C++ class AliAnalysisTaskESDMuonFilter+;
+#endif
+
+

diff --git a/PWG3/PWG3vertexingHFLinkDef.h b/PWG3/PWG3vertexingHFLinkDef.h
new file mode 100644 (file)
index 0000000..31fc92e
--- /dev/null
+++ b/PWG3/PWG3vertexingHFLinkDef.h
@@ -0,0 +1,19 @@
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+
+#pragma link C++ class AliAODRecoDecayHF+;
+#pragma link C++ class AliAODRecoDecayHF2Prong+;
+#pragma link C++ class AliAODRecoDecayHF3Prong+;
+#pragma link C++ class AliAODRecoDecayHF4Prong+;
+#pragma link C++ class AliAnalysisVertexingHF+;
+#pragma link C++ class AliAnalysisTaskVertexingHF+;
+#pragma link C++ class AliAnalysisTaskSEVertexingHF+;
+#pragma link C++ class AliAnalysisTaskSESelectHF+;
+
+#endif
+
+

diff --git a/PWG3/PWG3vertexingOldLinkDef.h b/PWG3/PWG3vertexingOldLinkDef.h
new file mode 100644 (file)
index 0000000..a225fa4
--- /dev/null
+++ b/PWG3/PWG3vertexingOldLinkDef.h
@@ -0,0 +1,15 @@
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+
+#pragma link C++ class AliD0toKpi+;
+#pragma link C++ class AliD0toKpiAnalysis+;
+#pragma link C++ class AliBtoJPSItoEle+;
+#pragma link C++ class AliBtoJPSItoEleAnalysis+;
+
+#endif
+
+

diff --git a/PWG3/AliQuarkoniaAcceptance.cxx b/PWG3/base/AliQuarkoniaAcceptance.cxx
similarity index 100%
rename from PWG3/AliQuarkoniaAcceptance.cxx
rename to PWG3/base/AliQuarkoniaAcceptance.cxx

diff --git a/PWG3/AliQuarkoniaAcceptance.h b/PWG3/base/AliQuarkoniaAcceptance.h
similarity index 100%
rename from PWG3/AliQuarkoniaAcceptance.h
rename to PWG3/base/AliQuarkoniaAcceptance.h

diff --git a/PWG3/AliQuarkoniaEfficiency.cxx b/PWG3/base/AliQuarkoniaEfficiency.cxx
similarity index 100%
rename from PWG3/AliQuarkoniaEfficiency.cxx
rename to PWG3/base/AliQuarkoniaEfficiency.cxx

diff --git a/PWG3/AliQuarkoniaEfficiency.h b/PWG3/base/AliQuarkoniaEfficiency.h
similarity index 100%
rename from PWG3/AliQuarkoniaEfficiency.h
rename to PWG3/base/AliQuarkoniaEfficiency.h

diff --git a/PWG3/QuarkoniaAcceptance.root b/PWG3/base/QuarkoniaAcceptance.root
similarity index 100%
rename from PWG3/QuarkoniaAcceptance.root
rename to PWG3/base/QuarkoniaAcceptance.root

diff --git a/PWG3/QuarkoniaEfficiency.C b/PWG3/base/QuarkoniaEfficiency.C
similarity index 100%
rename from PWG3/QuarkoniaEfficiency.C
rename to PWG3/base/QuarkoniaEfficiency.C

diff --git a/PWG3/QuarkoniaEfficiency.root b/PWG3/base/QuarkoniaEfficiency.root
similarity index 100%
rename from PWG3/QuarkoniaEfficiency.root
rename to PWG3/base/QuarkoniaEfficiency.root

diff --git a/PWG3/libPWG3.pkg b/PWG3/libPWG3.pkg
index 50f64feddedc5850a6628d9a62b2cca57b1fd88e..cd7f16d58d25acfaacf4c455a29ff736877fe4a3 100644 (file)
--- a/PWG3/libPWG3.pkg
+++ b/PWG3/libPWG3.pkg
@@ -1,12 +1,8 @@
-SRCS:=  AliD0toKpi.cxx  AliD0toKpiAnalysis.cxx \
-        AliBtoJPSItoEle.cxx  AliBtoJPSItoEleAnalysis.cxx
+SRCS:=  
+     
+HDRS:= $(SRCS:.cxx=.h)
 
+DHDR:= PWG3LinkDef.h
 
-HDRS:= $(SRCS:.cxx=.h) 
-
-DHDR:=PWG3LinkDef.h
-
-EXPORT:=
-
-EINCLUDE:= 
+EINCLUDE:=  
 

diff --git a/PWG3/libPWG3base.pkg b/PWG3/libPWG3base.pkg
index 7b71e87f86026033187d441742458681bf1b9498..db14669d89e90563dbce7f9f15eb5b1ff8eb1900 100644 (file)
--- a/PWG3/libPWG3base.pkg
+++ b/PWG3/libPWG3base.pkg
@@ -1,18 +1,9 @@
-SRCS:= AliQuarkoniaAcceptance.cxx \
-       AliQuarkoniaEfficiency.cxx \
-       AliAODRecoDecayHF.cxx \
-       AliAODRecoDecayHF2Prong.cxx  AliAODRecoDecayHF3Prong.cxx \
-       AliAODRecoDecayHF4Prong.cxx \
-       AliAnalysisVertexingHF.cxx AliAnalysisTaskVertexingHF.cxx \
-       AliAnalysisTaskSEVertexingHF.cxx \
-       AliAnalysisTaskSESelectHF.cxx \
-       AliAODDimuon.cxx AliAODEventInfo.cxx \
-       AliAnalysisTaskMuonAODfromGeneral.cxx AliAnalysisTaskSingleMu.cxx \
-       AliAnalysisTaskLUT.cxx AliAnalysisTaskESDMuonFilter.cxx
+SRCS:=  base/AliQuarkoniaAcceptance.cxx \
+             base/AliQuarkoniaEfficiency.cxx 
      
 HDRS:= $(SRCS:.cxx=.h)
 
 DHDR:= PWG3baseLinkDef.h
 
-EINCLUDE:= MUON
+EINCLUDE:= 
 

diff --git a/PWG3/libPWG3muon.pkg b/PWG3/libPWG3muon.pkg
new file mode 100644 (file)
index 0000000..a72bad3
--- /dev/null
+++ b/PWG3/libPWG3muon.pkg
@@ -0,0 +1,13 @@
+SRCS:=  muon/AliAnalysisTaskESDMuonFilter.cxx \
+                 muon/AliAnalysisTaskMuonAODfromGeneral.cxx \
+                 muon/AliAnalysisTaskSingleMu.cxx \
+                 muon/AliAnalysisTaskLUT.cxx  \
+                 muon/AliAODDimuon.cxx \
+                 muon/AliAODEventInfo.cxx 
+
+HDRS:= $(SRCS:.cxx=.h)
+
+DHDR:= PWG3muonLinkDef.h
+
+EINCLUDE:= PWG3/base
+

diff --git a/PWG3/libPWG3vertexingHF.pkg b/PWG3/libPWG3vertexingHF.pkg
new file mode 100644 (file)
index 0000000..7a2cf04
--- /dev/null
+++ b/PWG3/libPWG3vertexingHF.pkg
@@ -0,0 +1,13 @@
+SRCS:=   vertexingHF/AliAODRecoDecayHF.cxx \
+       vertexingHF/AliAODRecoDecayHF2Prong.cxx  vertexingHF/AliAODRecoDecayHF3Prong.cxx \
+       vertexingHF/AliAODRecoDecayHF4Prong.cxx \
+       vertexingHF/AliAnalysisVertexingHF.cxx vertexingHF/AliAnalysisTaskVertexingHF.cxx \
+       vertexingHF/AliAnalysisTaskSEVertexingHF.cxx \
+       vertexingHF/AliAnalysisTaskSESelectHF.cxx
+
+HDRS:= $(SRCS:.cxx=.h)
+
+DHDR:= PWG3vertexingHFLinkDef.h
+
+EINCLUDE:=  PWG3/base
+

diff --git a/PWG3/libPWG3vertexingOld.pkg b/PWG3/libPWG3vertexingOld.pkg
new file mode 100644 (file)
index 0000000..6889ff8
--- /dev/null
+++ b/PWG3/libPWG3vertexingOld.pkg
@@ -0,0 +1,9 @@
+SRCS:=   vertexingOld/AliD0toKpi.cxx  vertexingOld/AliD0toKpiAnalysis.cxx \
+       vertexingOld/AliBtoJPSItoEle.cxx  vertexingOld/AliBtoJPSItoEleAnalysis.cxx
+     
+HDRS:= $(SRCS:.cxx=.h)
+
+DHDR:= PWG3vertexingOldLinkDef.h
+
+EINCLUDE:= 
+

diff --git a/PWG3/AliAODDimuon.cxx b/PWG3/muon/AliAODDimuon.cxx
similarity index 100%
rename from PWG3/AliAODDimuon.cxx
rename to PWG3/muon/AliAODDimuon.cxx

diff --git a/PWG3/AliAODDimuon.h b/PWG3/muon/AliAODDimuon.h
similarity index 100%
rename from PWG3/AliAODDimuon.h
rename to PWG3/muon/AliAODDimuon.h

diff --git a/PWG3/AliAODEventInfo.cxx b/PWG3/muon/AliAODEventInfo.cxx
similarity index 100%
rename from PWG3/AliAODEventInfo.cxx
rename to PWG3/muon/AliAODEventInfo.cxx

diff --git a/PWG3/AliAODEventInfo.h b/PWG3/muon/AliAODEventInfo.h
similarity index 100%
rename from PWG3/AliAODEventInfo.h
rename to PWG3/muon/AliAODEventInfo.h

diff --git a/PWG3/AliAnalysisTaskESDMuonFilter.cxx b/PWG3/muon/AliAnalysisTaskESDMuonFilter.cxx
similarity index 100%
rename from PWG3/AliAnalysisTaskESDMuonFilter.cxx
rename to PWG3/muon/AliAnalysisTaskESDMuonFilter.cxx

diff --git a/PWG3/AliAnalysisTaskESDMuonFilter.h b/PWG3/muon/AliAnalysisTaskESDMuonFilter.h
similarity index 100%
rename from PWG3/AliAnalysisTaskESDMuonFilter.h
rename to PWG3/muon/AliAnalysisTaskESDMuonFilter.h

diff --git a/PWG3/AliAnalysisTaskLUT.cxx b/PWG3/muon/AliAnalysisTaskLUT.cxx
similarity index 100%
rename from PWG3/AliAnalysisTaskLUT.cxx
rename to PWG3/muon/AliAnalysisTaskLUT.cxx

diff --git a/PWG3/AliAnalysisTaskLUT.h b/PWG3/muon/AliAnalysisTaskLUT.h
similarity index 100%
rename from PWG3/AliAnalysisTaskLUT.h
rename to PWG3/muon/AliAnalysisTaskLUT.h

diff --git a/PWG3/AliAnalysisTaskMuonAODfromGeneral.cxx b/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx
similarity index 100%
rename from PWG3/AliAnalysisTaskMuonAODfromGeneral.cxx
rename to PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx

diff --git a/PWG3/AliAnalysisTaskMuonAODfromGeneral.h b/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.h
similarity index 100%
rename from PWG3/AliAnalysisTaskMuonAODfromGeneral.h
rename to PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.h

diff --git a/PWG3/AliAnalysisTaskSingleMu.cxx b/PWG3/muon/AliAnalysisTaskSingleMu.cxx
similarity index 100%
rename from PWG3/AliAnalysisTaskSingleMu.cxx
rename to PWG3/muon/AliAnalysisTaskSingleMu.cxx

diff --git a/PWG3/AliAnalysisTaskSingleMu.h b/PWG3/muon/AliAnalysisTaskSingleMu.h
similarity index 100%
rename from PWG3/AliAnalysisTaskSingleMu.h
rename to PWG3/muon/AliAnalysisTaskSingleMu.h

diff --git a/PWG3/AliPWG3TrackExtrapInterface.cxx b/PWG3/muon/AliPWG3TrackExtrapInterface.cxx
similarity index 100%
rename from PWG3/AliPWG3TrackExtrapInterface.cxx
rename to PWG3/muon/AliPWG3TrackExtrapInterface.cxx

diff --git a/PWG3/AliPWG3TrackExtrapInterface.h b/PWG3/muon/AliPWG3TrackExtrapInterface.h
similarity index 100%
rename from PWG3/AliPWG3TrackExtrapInterface.h
rename to PWG3/muon/AliPWG3TrackExtrapInterface.h

diff --git a/PWG3/ReadSpecAOD.C b/PWG3/muon/ReadSpecAOD.C
similarity index 100%
rename from PWG3/ReadSpecAOD.C
rename to PWG3/muon/ReadSpecAOD.C

diff --git a/PWG3/RunAODGeneration.C b/PWG3/muon/RunAODGeneration.C
similarity index 100%
rename from PWG3/RunAODGeneration.C
rename to PWG3/muon/RunAODGeneration.C

diff --git a/PWG3/RunAnalysis.C b/PWG3/muon/RunAnalysis.C
similarity index 100%
rename from PWG3/RunAnalysis.C
rename to PWG3/muon/RunAnalysis.C

diff --git a/PWG3/RunESDMuonFilter.C b/PWG3/muon/RunESDMuonFilter.C
similarity index 100%
rename from PWG3/RunESDMuonFilter.C
rename to PWG3/muon/RunESDMuonFilter.C

diff --git a/PWG3/RunMuonAODfromGeneral.C b/PWG3/muon/RunMuonAODfromGeneral.C
similarity index 100%
rename from PWG3/RunMuonAODfromGeneral.C
rename to PWG3/muon/RunMuonAODfromGeneral.C

diff --git a/PWG3/RunSingleMuonAnalysisFromAOD.C b/PWG3/muon/RunSingleMuonAnalysisFromAOD.C
similarity index 100%
rename from PWG3/RunSingleMuonAnalysisFromAOD.C
rename to PWG3/muon/RunSingleMuonAnalysisFromAOD.C

diff --git a/PWG3/analysisTaskLUTNT.C b/PWG3/muon/analysisTaskLUTNT.C
similarity index 100%
rename from PWG3/analysisTaskLUTNT.C
rename to PWG3/muon/analysisTaskLUTNT.C

diff --git a/PWG3/createLUTNT.jdl b/PWG3/muon/createLUTNT.jdl
similarity index 100%
rename from PWG3/createLUTNT.jdl
rename to PWG3/muon/createLUTNT.jdl

diff --git a/PWG3/rootlutnt.sh b/PWG3/muon/rootlutnt.sh
similarity index 100%
rename from PWG3/rootlutnt.sh
rename to PWG3/muon/rootlutnt.sh

diff --git a/PWG3/runCreateLUTNT.C b/PWG3/muon/runCreateLUTNT.C
similarity index 100%
rename from PWG3/runCreateLUTNT.C
rename to PWG3/muon/runCreateLUTNT.C

diff --git a/PWG3/AliAODRecoDecayHF.cxx b/PWG3/vertexingHF/AliAODRecoDecayHF.cxx
similarity index 100%
rename from PWG3/AliAODRecoDecayHF.cxx
rename to PWG3/vertexingHF/AliAODRecoDecayHF.cxx

diff --git a/PWG3/AliAODRecoDecayHF.h b/PWG3/vertexingHF/AliAODRecoDecayHF.h
similarity index 100%
rename from PWG3/AliAODRecoDecayHF.h
rename to PWG3/vertexingHF/AliAODRecoDecayHF.h

diff --git a/PWG3/AliAODRecoDecayHF2Prong.cxx b/PWG3/vertexingHF/AliAODRecoDecayHF2Prong.cxx
similarity index 100%
rename from PWG3/AliAODRecoDecayHF2Prong.cxx
rename to PWG3/vertexingHF/AliAODRecoDecayHF2Prong.cxx

diff --git a/PWG3/AliAODRecoDecayHF2Prong.h b/PWG3/vertexingHF/AliAODRecoDecayHF2Prong.h
similarity index 100%
rename from PWG3/AliAODRecoDecayHF2Prong.h
rename to PWG3/vertexingHF/AliAODRecoDecayHF2Prong.h

diff --git a/PWG3/AliAODRecoDecayHF3Prong.cxx b/PWG3/vertexingHF/AliAODRecoDecayHF3Prong.cxx
similarity index 100%
rename from PWG3/AliAODRecoDecayHF3Prong.cxx
rename to PWG3/vertexingHF/AliAODRecoDecayHF3Prong.cxx

diff --git a/PWG3/AliAODRecoDecayHF3Prong.h b/PWG3/vertexingHF/AliAODRecoDecayHF3Prong.h
similarity index 100%
rename from PWG3/AliAODRecoDecayHF3Prong.h
rename to PWG3/vertexingHF/AliAODRecoDecayHF3Prong.h

diff --git a/PWG3/AliAODRecoDecayHF4Prong.cxx b/PWG3/vertexingHF/AliAODRecoDecayHF4Prong.cxx
similarity index 100%
rename from PWG3/AliAODRecoDecayHF4Prong.cxx
rename to PWG3/vertexingHF/AliAODRecoDecayHF4Prong.cxx

diff --git a/PWG3/AliAODRecoDecayHF4Prong.h b/PWG3/vertexingHF/AliAODRecoDecayHF4Prong.h
similarity index 100%
rename from PWG3/AliAODRecoDecayHF4Prong.h
rename to PWG3/vertexingHF/AliAODRecoDecayHF4Prong.h

diff --git a/PWG3/AliAnalysisTaskSESelectHF.cxx b/PWG3/vertexingHF/AliAnalysisTaskSESelectHF.cxx
similarity index 100%
rename from PWG3/AliAnalysisTaskSESelectHF.cxx
rename to PWG3/vertexingHF/AliAnalysisTaskSESelectHF.cxx

diff --git a/PWG3/AliAnalysisTaskSESelectHF.h b/PWG3/vertexingHF/AliAnalysisTaskSESelectHF.h
similarity index 100%
rename from PWG3/AliAnalysisTaskSESelectHF.h
rename to PWG3/vertexingHF/AliAnalysisTaskSESelectHF.h

diff --git a/PWG3/AliAnalysisTaskSESelectHFTest.C b/PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C
similarity index 100%
rename from PWG3/AliAnalysisTaskSESelectHFTest.C
rename to PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C

diff --git a/PWG3/AliAnalysisTaskSEVertexingHF.cxx b/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHF.cxx
similarity index 100%
rename from PWG3/AliAnalysisTaskSEVertexingHF.cxx
rename to PWG3/vertexingHF/AliAnalysisTaskSEVertexingHF.cxx

diff --git a/PWG3/AliAnalysisTaskSEVertexingHF.h b/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHF.h
similarity index 100%
rename from PWG3/AliAnalysisTaskSEVertexingHF.h
rename to PWG3/vertexingHF/AliAnalysisTaskSEVertexingHF.h

diff --git a/PWG3/AliAnalysisTaskSEVertexingHFTest.C b/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C
similarity index 100%
rename from PWG3/AliAnalysisTaskSEVertexingHFTest.C
rename to PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C

diff --git a/PWG3/AliAnalysisTaskVertexingHF.cxx b/PWG3/vertexingHF/AliAnalysisTaskVertexingHF.cxx
similarity index 100%
rename from PWG3/AliAnalysisTaskVertexingHF.cxx
rename to PWG3/vertexingHF/AliAnalysisTaskVertexingHF.cxx

diff --git a/PWG3/AliAnalysisTaskVertexingHF.h b/PWG3/vertexingHF/AliAnalysisTaskVertexingHF.h
similarity index 100%
rename from PWG3/AliAnalysisTaskVertexingHF.h
rename to PWG3/vertexingHF/AliAnalysisTaskVertexingHF.h

diff --git a/PWG3/AliAnalysisTaskVertexingHFTest.C b/PWG3/vertexingHF/AliAnalysisTaskVertexingHFTest.C
similarity index 100%
rename from PWG3/AliAnalysisTaskVertexingHFTest.C
rename to PWG3/vertexingHF/AliAnalysisTaskVertexingHFTest.C

diff --git a/PWG3/AliAnalysisVertexingHF.cxx b/PWG3/vertexingHF/AliAnalysisVertexingHF.cxx
similarity index 100%
rename from PWG3/AliAnalysisVertexingHF.cxx
rename to PWG3/vertexingHF/AliAnalysisVertexingHF.cxx

diff --git a/PWG3/AliAnalysisVertexingHF.h b/PWG3/vertexingHF/AliAnalysisVertexingHF.h
similarity index 100%
rename from PWG3/AliAnalysisVertexingHF.h
rename to PWG3/vertexingHF/AliAnalysisVertexingHF.h

diff --git a/PWG3/AliAnalysisVertexingHFTest.C b/PWG3/vertexingHF/AliAnalysisVertexingHFTest.C
similarity index 100%
rename from PWG3/AliAnalysisVertexingHFTest.C
rename to PWG3/vertexingHF/AliAnalysisVertexingHFTest.C

diff --git a/PWG3/ConfigVertexingHF.C b/PWG3/vertexingHF/ConfigVertexingHF.C
similarity index 100%
rename from PWG3/ConfigVertexingHF.C
rename to PWG3/vertexingHF/ConfigVertexingHF.C

diff --git a/PWG3/ReadAODVertexingHF.C b/PWG3/vertexingHF/ReadAODVertexingHF.C
similarity index 100%
rename from PWG3/ReadAODVertexingHF.C
rename to PWG3/vertexingHF/ReadAODVertexingHF.C

diff --git a/PWG3/AliBtoJPSItoEle.cxx b/PWG3/vertexingOld/AliBtoJPSItoEle.cxx
similarity index 100%
rename from PWG3/AliBtoJPSItoEle.cxx
rename to PWG3/vertexingOld/AliBtoJPSItoEle.cxx

diff --git a/PWG3/AliBtoJPSItoEle.h b/PWG3/vertexingOld/AliBtoJPSItoEle.h
similarity index 100%
rename from PWG3/AliBtoJPSItoEle.h
rename to PWG3/vertexingOld/AliBtoJPSItoEle.h

diff --git a/PWG3/AliBtoJPSItoEleAnalysis.cxx b/PWG3/vertexingOld/AliBtoJPSItoEleAnalysis.cxx
similarity index 100%
rename from PWG3/AliBtoJPSItoEleAnalysis.cxx
rename to PWG3/vertexingOld/AliBtoJPSItoEleAnalysis.cxx

diff --git a/PWG3/AliBtoJPSItoEleAnalysis.h b/PWG3/vertexingOld/AliBtoJPSItoEleAnalysis.h
similarity index 100%
rename from PWG3/AliBtoJPSItoEleAnalysis.h
rename to PWG3/vertexingOld/AliBtoJPSItoEleAnalysis.h

diff --git a/PWG3/AliBtoJPSItoEleReco_all.C b/PWG3/vertexingOld/AliBtoJPSItoEleReco_all.C
similarity index 100%
rename from PWG3/AliBtoJPSItoEleReco_all.C
rename to PWG3/vertexingOld/AliBtoJPSItoEleReco_all.C

diff --git a/PWG3/AliD0toKpi.cxx b/PWG3/vertexingOld/AliD0toKpi.cxx
similarity index 100%
rename from PWG3/AliD0toKpi.cxx
rename to PWG3/vertexingOld/AliD0toKpi.cxx

diff --git a/PWG3/AliD0toKpi.h b/PWG3/vertexingOld/AliD0toKpi.h
similarity index 100%
rename from PWG3/AliD0toKpi.h
rename to PWG3/vertexingOld/AliD0toKpi.h

diff --git a/PWG3/AliD0toKpiAnalysis.cxx b/PWG3/vertexingOld/AliD0toKpiAnalysis.cxx
similarity index 100%
rename from PWG3/AliD0toKpiAnalysis.cxx
rename to PWG3/vertexingOld/AliD0toKpiAnalysis.cxx

diff --git a/PWG3/AliD0toKpiAnalysis.h b/PWG3/vertexingOld/AliD0toKpiAnalysis.h
similarity index 100%
rename from PWG3/AliD0toKpiAnalysis.h
rename to PWG3/vertexingOld/AliD0toKpiAnalysis.h

diff --git a/PWG3/AliD0toKpiPlots.C b/PWG3/vertexingOld/AliD0toKpiPlots.C
similarity index 100%
rename from PWG3/AliD0toKpiPlots.C
rename to PWG3/vertexingOld/AliD0toKpiPlots.C

diff --git a/PWG3/AliD0toKpiTest.C b/PWG3/vertexingOld/AliD0toKpiTest.C
similarity index 100%
rename from PWG3/AliD0toKpiTest.C
rename to PWG3/vertexingOld/AliD0toKpiTest.C

diff --git a/PWG3/AliPrimJPSItoEleReco_all.C b/PWG3/vertexingOld/AliPrimJPSItoEleReco_all.C
similarity index 100%
rename from PWG3/AliPrimJPSItoEleReco_all.C
rename to PWG3/vertexingOld/AliPrimJPSItoEleReco_all.C