For AliAnalysisTaskSingleMu: remove check for IsPileupSPD; possibility to add the...

diff --git a/PWG/muon/AddTaskSingleMuonAnalysis.C b/PWG/muon/AddTaskSingleMuonAnalysis.C
index 2c33bb876abd286ae3e1e953de8f7f37ebe2b6be..8a62ed5f69126c72f400cfc7d0fe768dcce99b0a 100644 (file)
--- a/PWG/muon/AddTaskSingleMuonAnalysis.C
+++ b/PWG/muon/AddTaskSingleMuonAnalysis.C
@@ -12,7 +12,7 @@
 #include "AliAnalysisTaskSingleMu.h"
 #endif
 
-AliAnalysisTaskSingleMu* AddTaskSingleMuonAnalysis(Bool_t isMC = kFALSE)
+AliAnalysisTaskSingleMu* AddTaskSingleMuonAnalysis(Bool_t isMC = kFALSE, TString changeName = "")
 {
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -27,19 +27,21 @@ AliAnalysisTaskSingleMu* AddTaskSingleMuonAnalysis(Bool_t isMC = kFALSE)
   }
 
   // Create container
-  TString currName = "";
   TString outputfile = mgr->GetCommonFileName();
-  if ( ! outputfile.IsNull() ) outputfile += ":PWG3_SingleMu";
-  else outputfile = "SingleMuAnalysis.root";
+  if ( ! outputfile.IsNull() ) outputfile += ":PWG3_SingleMu" + changeName;
+  else outputfile = "SingleMuAnalysis" + changeName + ".root";
 
-  AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("SingleMuOut",TObjArray::Class(),AliAnalysisManager::kOutputContainer,outputfile);
+  TString containerName = "SingleMuOut" + changeName;
+  AliAnalysisDataContainer *coutput1 = mgr->CreateContainer(containerName.Data(),TObjArray::Class(),AliAnalysisManager::kOutputContainer,outputfile);
 
   // Create cuts
-  AliMuonTrackCuts* muonTrackCuts = new AliMuonTrackCuts("TestStandardMuonTrackCuts", "TestStandardMuonTrackCuts");
+  TString cutsName = "StdMuonTrackCuts" + changeName;
+  AliMuonTrackCuts* muonTrackCuts = new AliMuonTrackCuts(cutsName.Data(), cutsName.Data());
   muonTrackCuts->SetIsMC(isMC);
 
   // Create task
-  AliAnalysisTaskSingleMu *singleMuAnalysisTask = new AliAnalysisTaskSingleMu("SingleMuTask", *muonTrackCuts);
+  TString taskName = "SingleMuTask" + changeName;
+  AliAnalysisTaskSingleMu *singleMuAnalysisTask = new AliAnalysisTaskSingleMu(taskName.Data(), *muonTrackCuts);
   if ( isMC ) singleMuAnalysisTask->SetTrigClassPatterns("ANY");
   mgr->AddTask(singleMuAnalysisTask);
 

diff --git a/PWG/muon/AliAnalysisTaskSingleMu.cxx b/PWG/muon/AliAnalysisTaskSingleMu.cxx
index f78185887893cca4b1de83ea44f72eca7843c466..a16b08bce0afd09c46c8e6ada5791439d10cb385 100644 (file)
--- a/PWG/muon/AliAnalysisTaskSingleMu.cxx
+++ b/PWG/muon/AliAnalysisTaskSingleMu.cxx
@@ -203,8 +203,8 @@ void AliAnalysisTaskSingleMu::ProcessEvent(TString physSel, const TObjArray& sel
     ((TH1*)GetMergeableObject(physSel, trigClassName, centrality, "hIpVtx"))->Fill(ipVz);
   }
 
-  Bool_t isPileupFromSPD = ( fAODEvent && ! fAODEvent->GetTracklets() ) ? InputEvent()->IsPileupFromSPD(3, 0.8, 3., 2., 5.) : InputEvent()->IsPileupFromSPDInMultBins(); // Avoid break when reading Muon AODs (tracklet info is not present and IsPileupFromSPDInMultBins crashes
-  if ( isPileupFromSPD ) return;
+  // Bool_t isPileupFromSPD = ( fAODEvent && ! fAODEvent->GetTracklets() ) ? InputEvent()->IsPileupFromSPD(3, 0.8, 3., 2., 5.) : InputEvent()->IsPileupFromSPDInMultBins(); // Avoid break when reading Muon AODs (tracklet info is not present and IsPileupFromSPDInMultBins crashes // UNCOMMENT TO REJECT PILEUP
+  // if ( isPileupFromSPD ) return; // UNCOMMENT TO REJECT PILEUP
   
   Double_t containerInput[kNvars];
   AliVParticle* track = 0x0;

diff --git a/PWG/muon/AliAnalysisTaskSingleMu.h b/PWG/muon/AliAnalysisTaskSingleMu.h
index 42f8ea1dfb4a02c71d699f5c1d60081a169f47a2..4d36974aba074da96f2ad122c450e574ec7277fe 100644 (file)
--- a/PWG/muon/AliAnalysisTaskSingleMu.h
+++ b/PWG/muon/AliAnalysisTaskSingleMu.h
@@ -27,18 +27,13 @@ class AliAnalysisTaskSingleMu : public AliVAnalysisMuon {
 
   void MyUserCreateOutputObjects();
   void ProcessEvent(TString physSel, const TObjArray& selectTrigClasses, TString centrality);
-
- private:
-
-  AliAnalysisTaskSingleMu(const AliAnalysisTaskSingleMu&);
-  AliAnalysisTaskSingleMu& operator=(const AliAnalysisTaskSingleMu&);
-
+  
   enum {
     kIPVz,           ///< Interaction point vertex distribution
     kTrackContainer, ///< CF container for tracks
     kNobjectTypes    ///< Number of objects
   };
-
+  
   enum {
     kThetaAbs23,  ///< Theta abs 2-3 deg
     kThetaAbs310, ///< Theta abs 3-10 deg
@@ -49,7 +44,7 @@ class AliAnalysisTaskSingleMu : public AliVAnalysisMuon {
     kStepReconstructed,  ///< Reconstructed tracks
     kStepGeneratedMC,    ///< Generated tracks (MC)
     kNsteps              ///< Number of steps
-  };  
+  };
   
   enum {
     kHvarPt,         ///< Pt at vertex
@@ -62,6 +57,11 @@ class AliAnalysisTaskSingleMu : public AliVAnalysisMuon {
     kNvars           ///< THnSparse dimensions
   };
 
+ private:
+
+  AliAnalysisTaskSingleMu(const AliAnalysisTaskSingleMu&);
+  AliAnalysisTaskSingleMu& operator=(const AliAnalysisTaskSingleMu&);
+
   TObjArray* fThetaAbsKeys;    ///< Name of theta at absorber end
 
   ClassDef(AliAnalysisTaskSingleMu, 3); // Single muon analysis

diff --git a/PWG/muon/AliMergeableCollection.cxx b/PWG/muon/AliMergeableCollection.cxx
index 31e15217498de07c2737f4fcb36b3062f7a0342a..92bad4d35e35207d8ea1110787f391bcabc4945f 100644 (file)
--- a/PWG/muon/AliMergeableCollection.cxx
+++ b/PWG/muon/AliMergeableCollection.cxx
@@ -447,7 +447,7 @@ AliMergeableCollection::GetObject(const char* identifier,
 }
 
 //_____________________________________________________________________________
-TObject* AliMergeableCollection::GetSum(const char* idPattern)
+TObject* AliMergeableCollection::GetSum(const char* idPattern) const
 {
   /// Sum objects
   /// The pattern must be in the form:

diff --git a/PWG/muon/AliMergeableCollection.h b/PWG/muon/AliMergeableCollection.h
index 04ad57716b9ff466995864a28dfa0c5d6714e55a..56821a7a4e90b37098eb716f0f205fd51edf3f51 100644 (file)
--- a/PWG/muon/AliMergeableCollection.h
+++ b/PWG/muon/AliMergeableCollection.h
@@ -105,7 +105,7 @@ public:
   
   static Bool_t MergeObject(TObject* baseObject, TObject* objToAdd);
   
-  TObject* GetSum(const char* idPattern);
+  TObject* GetSum(const char* idPattern) const;
   
   Bool_t IsEmptyObject(TObject* obj) const;
   

diff --git a/PWG/muon/AliVAnalysisMuon.h b/PWG/muon/AliVAnalysisMuon.h
index f6fdef9e6377e0090a1801b7ab3fce94678878cd..c9064c653816ed02cf6115360c8c31c94c89513a 100644 (file)
--- a/PWG/muon/AliVAnalysisMuon.h
+++ b/PWG/muon/AliVAnalysisMuon.h
@@ -69,6 +69,25 @@ class AliVAnalysisMuon : public AliAnalysisTaskSE {
   
   void SetWeight ( TObject* wgtObj );
   TObject* GetWeight ( const char* wgtName );
+  
+  enum {
+    kPhysSelPass,    ///< Physics selected events
+    kPhysSelReject,  ///< Events non-passing selection
+    kNselections     ///< Number of selections
+  };
+  
+  enum {
+    kCharmMu,       ///< Mu from charm
+    kBeautyMu,      ///< Mu from beauty
+    kQuarkoniumMu,  ///< Mu from resonance
+    kWbosonMu,      ///< Mu from W
+    kDecayMu,       ///< Decay mu
+    kSecondaryMu,   ///< Secondary mu
+    kRecoHadron,    ///< Reconstructed hadron
+    kUnidentified,  ///< Particle that fails matching kine
+    kNtrackSources  ///< Total number of track sources
+  };
+
 
  protected:
   
@@ -101,24 +120,7 @@ class AliVAnalysisMuon : public AliAnalysisTaskSE {
   TObject* GetMergeableObject(TString physSel, TString trigClassName, TString centrality, TString objectName);
   TObject* GetSum(TString physSel, TString trigClassNames, TString centrality, TString objectPattern);
   
-  enum {
-    kPhysSelPass,    ///< Physics selected events
-    kPhysSelReject,  ///< Events non-passing selection
-    kNselections     ///< Number of selections
-  };
-  
-  enum {
-    kCharmMu,       ///< Mu from charm
-    kBeautyMu,      ///< Mu from beauty
-    kQuarkoniumMu,  ///< Mu from resonance
-    kWbosonMu,      ///< Mu from W
-    kDecayMu,       ///< Decay mu
-    kSecondaryMu,   ///< Secondary mu
-    kRecoHadron,    ///< Reconstructed hadron
-    kUnidentified,  ///< Particle that fails matching kine
-    kNtrackSources  ///< Total number of track sources
-  };
-  
+    
   AliMuonEventCuts* fMuonEventCuts; ///< Muon event cuts
   AliMuonTrackCuts* fMuonTrackCuts; ///< Muon track cuts
   AliMuonPairCuts* fMuonPairCuts;   ///< Muon pair track cuts