Helper class, final tuning for first test

diff --git a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.cxx b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.cxx
index 157670630f3d0e3cd6c44de7de7901d39a546670..c78d2a8cf4005120cc9cf5a2cd03c6d2f359676c 100644 (file)
--- a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.cxx
+++ b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.cxx
@@ -77,6 +77,7 @@ class AliAODv0;
 #include "AliMCEvent.h"
 #include "AliStack.h"
 #include "AliCentrality.h"
+#include "AliPPVsMultUtils.h"
 
 #include "AliCFContainer.h"
 #include "AliMultiplicity.h"
@@ -95,7 +96,7 @@ using std::endl;
 ClassImp(AliAnalysisTaskStrangenessVsMultiplicity)
 
 AliAnalysisTaskStrangenessVsMultiplicity::AliAnalysisTaskStrangenessVsMultiplicity()
-  : AliAnalysisTaskSE(), fListHist(0), fTreeEvent(0), fTreeV0(0), fTreeCascade(0), fPIDResponse(0), fESDtrackCuts(0), 
+  : AliAnalysisTaskSE(), fListHist(0), fTreeEvent(0), fTreeV0(0), fTreeCascade(0), fPIDResponse(0), fESDtrackCuts(0), fPPVsMultUtils(0),
   fkSaveV0Tree      ( kFALSE ),
   fkSaveCascadeTree ( kTRUE  ),
   fkRunVertexers    ( kTRUE  ), 
@@ -111,6 +112,8 @@ AliAnalysisTaskStrangenessVsMultiplicity::AliAnalysisTaskStrangenessVsMultiplici
   fCentrality_V0AEq(0), 
   fCentrality_V0CEq(0), 
   fCentrality_V0MEq(0), 
+  fCustomCentrality_V0M(0),
+  fCustomCentrality_V0MEq(0),
   fRefMultEta5(0),
   fRefMultEta8(0),
   fRunNumber(0),
@@ -215,7 +218,7 @@ AliAnalysisTaskStrangenessVsMultiplicity::AliAnalysisTaskStrangenessVsMultiplici
 }
 
 AliAnalysisTaskStrangenessVsMultiplicity::AliAnalysisTaskStrangenessVsMultiplicity(const char *name) 
-  : AliAnalysisTaskSE(name), fListHist(0), fTreeEvent(0), fTreeV0(0), fTreeCascade(0), fPIDResponse(0), fESDtrackCuts(0), 
+  : AliAnalysisTaskSE(name), fListHist(0), fTreeEvent(0), fTreeV0(0), fTreeCascade(0), fPIDResponse(0), fESDtrackCuts(0), fPPVsMultUtils(0),
   fkSaveV0Tree      ( kFALSE ),
   fkSaveCascadeTree ( kTRUE  ), 
   fkRunVertexers    ( kTRUE  ),
@@ -230,7 +233,9 @@ AliAnalysisTaskStrangenessVsMultiplicity::AliAnalysisTaskStrangenessVsMultiplici
   fCentrality_V0M(0), 
   fCentrality_V0AEq(0), 
   fCentrality_V0CEq(0), 
-  fCentrality_V0MEq(0), 
+  fCentrality_V0MEq(0),
+  fCustomCentrality_V0M(0),
+  fCustomCentrality_V0MEq(0),
   fRefMultEta5(0),
   fRefMultEta8(0),
   fRunNumber(0),
@@ -378,6 +383,10 @@ AliAnalysisTaskStrangenessVsMultiplicity::~AliAnalysisTaskStrangenessVsMultiplic
       delete fTreeCascade;
       fTreeCascade = 0x0;
    }
+    if (fPPVsMultUtils){
+        delete fPPVsMultUtils;
+        fPPVsMultUtils = 0x0;
+    }
 }
 
 //________________________________________________________________________
@@ -410,7 +419,9 @@ void AliAnalysisTaskStrangenessVsMultiplicity::UserCreateOutputObjects()
   fTreeEvent->Branch("fCentrality_V0AEq",&fCentrality_V0AEq,"fCentrality_V0AEq/F");
   fTreeEvent->Branch("fCentrality_V0CEq",&fCentrality_V0CEq,"fCentrality_V0CEq/F");
   fTreeEvent->Branch("fCentrality_V0MEq",&fCentrality_V0MEq,"fCentrality_V0MEq/F");
-  
+  fTreeEvent->Branch("fCustomCentrality_V0M",&fCustomCentrality_V0M,"fCustomCentrality_V0M/F");
+  fTreeEvent->Branch("fCustomCentrality_V0MEq",&fCustomCentrality_V0MEq,"fCustomCentrality_V0MEq/F");
+    
   //Official GetReferenceMultiplicity
   fTreeEvent->Branch("fRefMultEta5",&fRefMultEta5,"fRefMultEta5/I");
   fTreeEvent->Branch("fRefMultEta8",&fRefMultEta8,"fRefMultEta8/I");
@@ -544,6 +555,10 @@ void AliAnalysisTaskStrangenessVsMultiplicity::UserCreateOutputObjects()
   if(! fESDtrackCuts ){
     fESDtrackCuts = new AliESDtrackCuts();
   }
+    //Helper
+    if(! fPPVsMultUtils ){
+        fPPVsMultUtils = new AliPPVsMultUtils();
+    }
 
 //------------------------------------------------
 // V0 Multiplicity Histograms
@@ -776,6 +791,10 @@ void AliAnalysisTaskStrangenessVsMultiplicity::UserExec(Option_t *)
     fCentrality_V0MEq = centrality->GetCentralityPercentile( "V0MEq" ); 
   }
   
+    //Cross-check/debug
+    fCustomCentrality_V0M   = fPPVsMultUtils->GetMultiplicityPercentile(lESDevent,"V0M");
+    fCustomCentrality_V0MEq = fPPVsMultUtils->GetMultiplicityPercentile(lESDevent,"V0MEq");
+    
   //Tracklets vs Clusters Exploratory data
   fEvSel_nTracklets     = lESDevent->GetMultiplicity()->GetNumberOfTracklets();
   fEvSel_nSPDClusters   = lESDevent->GetNumberOfITSClusters(0) + lESDevent->GetNumberOfITSClusters(1);

diff --git a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.h b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.h
index 9bc81c2073081de7bee4e36d4483128dd9119309..661e2c69452b193785fe3416cc0d6b330891779a 100644 (file)
--- a/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.h
+++ b/PWGLF/STRANGENESS/Cascades/AliAnalysisTaskStrangenessVsMultiplicity.h
@@ -35,6 +35,7 @@ class THnSparse;
 class AliESDpid;
 class AliESDtrackCuts;
 class AliAnalysisUtils;
+class AliPPVsMultUtils;
 class AliESDEvent;
 class AliPhysicsSelection;
 class AliCFContainer;
@@ -95,6 +96,7 @@ class AliAnalysisTaskStrangenessVsMultiplicity : public AliAnalysisTaskSE {
 
   AliPIDResponse *fPIDResponse;     // PID response object
   AliESDtrackCuts *fESDtrackCuts;   // ESD track cuts used for primary track definition
+    AliPPVsMultUtils *fPPVsMultUtils; //
 
   //Objects Controlling Task Behaviour 
   Bool_t fkSaveV0Tree;              //if true, save TTree
@@ -118,7 +120,9 @@ class AliAnalysisTaskStrangenessVsMultiplicity : public AliAnalysisTaskSE {
   Float_t fCentrality_V0M;         //! 
   Float_t fCentrality_V0AEq;       //! 
   Float_t fCentrality_V0CEq;       //! 
-  Float_t fCentrality_V0MEq;       //! 
+  Float_t fCentrality_V0MEq;       //!
+  Float_t fCustomCentrality_V0M; //!
+  Float_t fCustomCentrality_V0MEq; //!
   Int_t fRefMultEta5;              //!
   Int_t fRefMultEta8;              //!   
   Int_t fRunNumber;                //!

diff --git a/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.cxx b/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.cxx
index ea961c23a69d1f4186721f846ccf5d3a791349fe..9c610c95cafed66a4ab9eea161cbf25f9b6785e1 100644 (file)
--- a/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.cxx
+++ b/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.cxx
@@ -68,7 +68,7 @@ AliPPVsMultUtils &AliPPVsMultUtils::operator=(const AliPPVsMultUtils &c)
 }
 
 //______________________________________________________________________
-Float_t AliPPVsMultUtils::GetMultiplicityQuantile(AliESDEvent *event, TString lMethod = "V0M")
+Float_t AliPPVsMultUtils::GetMultiplicityPercentile(AliESDEvent *event, TString lMethod = "V0M")
 {
     Int_t lRequestedRunNumber = event->GetRunNumber();
     if( lRequestedRunNumber != fRunNumber ) LoadCalibration( lRequestedRunNumber );

diff --git a/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.h b/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.h
index 22ba4c5ae30731c73b2933aae51dadf891eda9fe..f3b4daa6c041bad5e1676ec96f276596d3194d70 100644 (file)
--- a/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.h
+++ b/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.h
@@ -18,7 +18,7 @@ public:
     AliPPVsMultUtils &operator=(const AliPPVsMultUtils &c);
 
     //Utility functions
-    Float_t GetMultiplicityQuantile(AliESDEvent *event, TString lMethod);
+    Float_t GetMultiplicityPercentile(AliESDEvent *event, TString lMethod);
     Bool_t LoadCalibration(Int_t lLoadThisCalibration);
     
 private: