Some more mods for SAF filtering
authorlaphecet <laurent.aphecetche@subatech.in2p3.fr>
Tue, 16 Dec 2014 08:59:48 +0000 (09:59 +0100)
committerlaphecet <laurent.aphecetche@subatech.in2p3.fr>
Tue, 16 Dec 2014 08:59:48 +0000 (09:59 +0100)
PWG/muon/AliAnalysisTaskAOD2MuonAOD.h
PWG/muon/CMakeLists.txt
PWG/muon/CpMacroWithFilter.C
PWG/muon/FILTER_AODMUONWITHTRACKLETS_rootlogon.C
PWG/muon/PWGmuonLinkDef.h

index b13b690..fbbaaa8 100644 (file)
@@ -18,7 +18,7 @@ class AliAODBranchReplicator;
 class AliAnalysisTaskAOD2MuonAOD : public AliAnalysisTaskSE
 {
 public:
-  AliAnalysisTaskAOD2MuonAOD(Int_t mcMode=1, Bool_t withSPDTracklets=kFALSE);
+  AliAnalysisTaskAOD2MuonAOD(Int_t mcMode=3, Bool_t withSPDTracklets=kTRUE);
   virtual ~AliAnalysisTaskAOD2MuonAOD();
 
   virtual void UserCreateOutputObjects();
index 9939988..29c1722 100644 (file)
@@ -32,7 +32,8 @@ include_directories(${ROOT_INCLUDE_DIRS}
 # Sources - alphabetical order
 set(SRCS
   AliAnalysisTaskMuMu.cxx 
-  AliHistogramCollection.cxx 
+  AliHistogramCollection.cxx
+  AliAnalysisTaskAOD2MuonAOD.cxx
   AliAnalysisTaskESDMuonFilter.cxx 
   AliAnalysisTaskMuonAODfromGeneral.cxx 
   AliAnalysisTaskFromStandardToMuonAOD.cxx 
index 4de2d3b..b1eb3f0 100644 (file)
@@ -46,7 +46,11 @@ Int_t CpMacroWithFilter(TString from, TString to)
     TString part = from(ix,from.Length()-ix+1);
     TObjArray* tmp = part.Tokenize(".");
     TObjString* ostr = static_cast<TObjString*>(tmp->First());
-    if (!ostr) break;
+    if (!ostr)
+    {
+      std::cerr << "Could not get filter ??? Filename does not look right !!!" << std::endl;
+      return -2;
+    }
     filterName = ostr->String();
     delete tmp;
     ix = filterName.Index("_WITH_");
index 7214765..49d4810 100644 (file)
   gSystem->Load("libCDB");
   gSystem->Load("libSTEER");
   gSystem->Load("libANALYSISalice");
-  
-  //    gSystem->Load("libCORRFW");
-  //    gSystem->Load("libPWGmuon");
-  
-  gROOT->LoadMacro("AliAnalysisNonMuonTrackCuts.cxx+");
-  gROOT->LoadMacro("AliAnalysisNonPrimaryVertices.cxx+");
-  gROOT->LoadMacro("AliAODMuonReplicator.cxx+");
-  gROOT->LoadMacro("AliAnalysisTaskESDMuonFilter.cxx+");
-  gROOT->LoadMacro("AliAnalysisTaskAOD2MuonAOD.cxx+");
+  gSystem->Load("libCORRFW");
+  gSystem->Load("libPWGmuon");
 }
index 3a585a0..237f838 100644 (file)
@@ -5,6 +5,7 @@
 #pragma link off all functions;
 
 #pragma link C++ class AliAODEventInfo+;
+#pragma link C++ class AliAnalysisTaskAOD2MuonAOD+;
 #pragma link C++ class AliAnalysisTaskMuonAODfromGeneral+;
 #pragma link C++ class AliAnalysisTaskFromStandardToMuonAOD+;
 #pragma link C++ class AliAnalysisTaskSingleMu+;