Tuning Strangeness vs multiplicity main task for pass4 data

diff --git a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.cxx b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.cxx
index 095c8e8902b337cbda50984384448f559fdca7e0..a99bf63d4d69f416cc24ebd4aa8778c1959e0c99 100644 (file)
--- a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.cxx
+++ b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.cxx
@@ -101,6 +101,7 @@ fkSaveV0Tree      ( kFALSE ),
 fkSaveCascadeTree ( kTRUE  ),
 fkRunVertexers    ( kTRUE  ),
 fkSkipEventSelection( kFALSE ),
+fkApplyTrackletsVsClustersCut(kTRUE),
 //---> Variables for fTreeEvent
 fAmplitude_V0A   (0),
 fAmplitude_V0C   (0),
@@ -231,6 +232,7 @@ fkSaveV0Tree      ( kFALSE ),
 fkSaveCascadeTree ( kTRUE  ),
 fkRunVertexers    ( kTRUE  ),
 fkSkipEventSelection( kFALSE ),
+fkApplyTrackletsVsClustersCut(kTRUE),
 //---> Variables for fTreeEvent
 fAmplitude_V0A (0),
 fAmplitude_V0C (0),
@@ -697,6 +699,18 @@ void AliAnalysisTaskStrangenessVsMultiplicity::UserExec(Option_t *)
         return;
     }
     
+    //Tracklets vs Clusters cut via AliAnalysisUtils
+    if ( fkApplyTrackletsVsClustersCut && (! fkSkipEventSelection ) ) {
+        if( fUtils->IsSPDClusterVsTrackletBG( lESDevent ) ){
+            PostData(1, fListHist);
+            PostData(2, fTreeEvent);
+            PostData(3, fTreeV0);
+            PostData(4, fTreeCascade);
+            return;
+        }
+    }
+    
+    
     fHistEventCounter->Fill(1.5);
     
     //------------------------------------------------

diff --git a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.h b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.h
index eea7a09e3b17b6f0215c9c43505ce7de3463d03e..686abbfaac20633e2cdc49155fdf837bef438630 100644 (file)
--- a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.h
+++ b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.h
@@ -105,7 +105,8 @@ class AliAnalysisTaskStrangenessVsMultiplicity : public AliAnalysisTaskSE {
 
   //Objects Controlling Task Behaviour: has to be streamed! 
   Bool_t    fkRunVertexers;           // if true, re-run vertexer with loose cuts *** only for CASCADES! *** 
-  Bool_t    fkSkipEventSelection;     // if true, will only perform TRIGGER selection (currently kMB, to change) 
+  Bool_t    fkSkipEventSelection;     // if true, will only perform TRIGGER selection (currently kMB, to change)
+    Bool_t    fkApplyTrackletsVsClustersCut; //if true, applies Tracklet vs clusters cut together with PS
   Double_t  fV0VertexerSels[7];        // Array to store the 7 values for the different selections V0 related
   Double_t  fCascadeVertexerSels[8];   // Array to store the 8 values for the different selections Casc. related
 

diff --git a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicityMC.cxx b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicityMC.cxx
index 757a78fd8bcce862da35bea7a8bc762f5f747a6f..69fef39f36f9e21b53fbe8aec2b8fafc3ae2f26c 100644 (file)
--- a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicityMC.cxx
+++ b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicityMC.cxx
@@ -97,11 +97,12 @@ using std::endl;
 ClassImp(AliAnalysisTaskStrangenessVsMultiplicityMC)
 
 AliAnalysisTaskStrangenessVsMultiplicityMC::AliAnalysisTaskStrangenessVsMultiplicityMC()
-  : AliAnalysisTaskSE(), fListHist(0), fTreeEvent(0), fTreeV0(0), fTreeCascade(0), fPIDResponse(0), fESDtrackCuts(0), fPPVsMultUtils(0),
+  : AliAnalysisTaskSE(), fListHist(0), fTreeEvent(0), fTreeV0(0), fTreeCascade(0), fPIDResponse(0), fESDtrackCuts(0), fPPVsMultUtils(0), fUtils(0),
   fkSaveV0Tree      ( kFALSE ),
   fkSaveCascadeTree ( kTRUE  ),
   fkRunVertexers    ( kTRUE  ),
   fkSkipEventSelection( kFALSE ),
+  fkApplyTrackletsVsClustersCut( kTRUE ),
   //---> Variables for fTreeEvent
   fAmplitude_V0A   (0),   
   fAmplitude_V0C   (0),   
@@ -320,11 +321,12 @@ AliAnalysisTaskStrangenessVsMultiplicityMC::AliAnalysisTaskStrangenessVsMultipli
 }
 
 AliAnalysisTaskStrangenessVsMultiplicityMC::AliAnalysisTaskStrangenessVsMultiplicityMC(const char *name) 
-  : AliAnalysisTaskSE(name), fListHist(0), fTreeEvent(0), fTreeV0(0), fTreeCascade(0), fPIDResponse(0), fESDtrackCuts(0), fPPVsMultUtils(0),  
+  : AliAnalysisTaskSE(name), fListHist(0), fTreeEvent(0), fTreeV0(0), fTreeCascade(0), fPIDResponse(0), fESDtrackCuts(0), fPPVsMultUtils(0), fUtils(0),
   fkSaveV0Tree      ( kFALSE ),
   fkSaveCascadeTree ( kTRUE  ), 
   fkRunVertexers    ( kTRUE  ),
   fkSkipEventSelection( kFALSE ),
+  fkApplyTrackletsVsClustersCut( kTRUE ),
   //---> Variables for fTreeEvent
   fAmplitude_V0A (0),   
   fAmplitude_V0C (0), 
@@ -590,6 +592,10 @@ AliAnalysisTaskStrangenessVsMultiplicityMC::~AliAnalysisTaskStrangenessVsMultipl
         delete fPPVsMultUtils;
         fPPVsMultUtils = 0x0;
     }
+    if (fUtils){
+        delete fUtils;
+        fUtils = 0x0;
+    }
 }
 
 //________________________________________________________________________
@@ -785,9 +791,14 @@ void AliAnalysisTaskStrangenessVsMultiplicityMC::UserCreateOutputObjects()
   if(! fESDtrackCuts ){
     fESDtrackCuts = new AliESDtrackCuts();
   }
+    //Helper
   if(! fPPVsMultUtils ){
     fPPVsMultUtils = new AliPPVsMultUtils();
   }
+    //Analysis Utils
+    if(! fUtils ){
+        fUtils = new AliAnalysisUtils();
+    }
 
 //------------------------------------------------
 // V0 Multiplicity Histograms
@@ -1166,6 +1177,17 @@ void AliAnalysisTaskStrangenessVsMultiplicityMC::UserExec(Option_t *)
     PostData(4, fTreeCascade);
     return;
   }
+    
+    //Tracklets vs Clusters cut via AliAnalysisUtils
+    if ( fkApplyTrackletsVsClustersCut && (! fkSkipEventSelection ) ) {
+        if( fUtils->IsSPDClusterVsTrackletBG( lESDevent ) ){
+            PostData(1, fListHist);
+            PostData(2, fTreeEvent);
+            PostData(3, fTreeV0);
+            PostData(4, fTreeCascade);
+            return;
+        }
+    }
 
   fHistEventCounter->Fill(1.5);
  

diff --git a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicityMC.h b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicityMC.h
index 21d58b703b882ec02dec425deae780e4c1273f92..66fc1dbd687f6be339b9b2c6a163ab455c8d81a1 100644 (file)
--- a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicityMC.h
+++ b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicityMC.h
@@ -98,7 +98,8 @@ class AliAnalysisTaskStrangenessVsMultiplicityMC : public AliAnalysisTaskSE {
   AliPIDResponse *fPIDResponse;     // PID response object
   AliESDtrackCuts *fESDtrackCuts;   // ESD track cuts used for primary track definition
   AliPPVsMultUtils *fPPVsMultUtils; //
-
+  AliAnalysisUtils *fUtils; //
+    
   //Objects Controlling Task Behaviour 
   Bool_t fkSaveV0Tree;              //if true, save TTree
   Bool_t fkSaveCascadeTree;         //if true, save TTree
@@ -106,6 +107,8 @@ class AliAnalysisTaskStrangenessVsMultiplicityMC : public AliAnalysisTaskSE {
   //Objects Controlling Task Behaviour: has to be streamed! 
   Bool_t    fkRunVertexers;           // if true, re-run vertexer with loose cuts *** only for CASCADES! ***
   Bool_t    fkSkipEventSelection;     // if true, will only perform TRIGGER selection (currently kMB, to change)
+    Bool_t    fkApplyTrackletsVsClustersCut; //if true, applies Tracklet vs clusters cut together with PS
+    
   Double_t  fV0VertexerSels[7];        // Array to store the 7 values for the different selections V0 related
   Double_t  fCascadeVertexerSels[8];   // Array to store the 8 values for the different selections Casc. related