Relocation of AliPPVSMultUtils to ANALYSIS

diff --git a/ANALYSIS/ANALYSISaliceLinkDef.h b/ANALYSIS/ANALYSISaliceLinkDef.h
index 3e2e6c676c2ab2f86b492d6cafab8fb839ac6a72..7456dcd703a57cab5bd1c82f30e74fad4d852818 100644 (file)
--- a/ANALYSIS/ANALYSISaliceLinkDef.h
+++ b/ANALYSIS/ANALYSISaliceLinkDef.h
@@ -50,6 +50,7 @@
 
 #pragma link C++ class AliAnalysisUtils+;
 #pragma link C++ class AliAnalysisTaskBadChunkID+;
+#pragma link C++ class AliPPVsMultUtils+;
 
 #ifdef WITHXML
 #pragma link C++ class AliTagAnalysis+;

diff --git a/ANALYSIS/CMakelibANALYSISalice.pkg b/ANALYSIS/CMakelibANALYSISalice.pkg
index 9d0adbed6b5a3401c5bf22ee1f17958eaa27bf43..fea11373c7bc61669305415c9212558fd3692526 100644 (file)
--- a/ANALYSIS/CMakelibANALYSISalice.pkg
+++ b/ANALYSIS/CMakelibANALYSISalice.pkg
@@ -64,6 +64,7 @@ set ( SRCS
     AliAnalysisUtils.cxx
     BadChunkFilter/AliAnalysisTaskBadChunkID.cxx
     AliAODv0KineCuts.cxx
+    AliPPVsMultUtils.cxx
     )
 
 if( ROOTHASALIEN STREQUAL "yes")

diff --git a/PWGLF/CMakelibPWGLFSTRANGENESS.pkg b/PWGLF/CMakelibPWGLFSTRANGENESS.pkg
index 93d8e770ca37c74e8168efea12a2abbfbf32126a..20fc758ffe668210a16c7d2e360a8ef59e57a8c9 100644 (file)
--- a/PWGLF/CMakelibPWGLFSTRANGENESS.pkg
+++ b/PWGLF/CMakelibPWGLFSTRANGENESS.pkg
@@ -67,7 +67,6 @@ set ( SRCS
   STRANGENESS/Hypernuclei/AliAnalysisTaskAntiHe4.cxx
   STRANGENESS/Hypernuclei/AliAnalysisTaskNucleiv2.cxx
   STRANGENESS/Hypernuclei/AliAnalysisTaskNucleiv2SP.cxx
-  STRANGENESS/Cascades/AliPPVsMultUtils.cxx
 )
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )

diff --git a/PWGLF/PWGLFSTRANGENESSLinkDef.h b/PWGLF/PWGLFSTRANGENESSLinkDef.h
index 2f52016cc096650936a648edb4c663a0fa79d3f4..86a8a4b496702e6697ec2c4c4e2a518c0aea4942 100644 (file)
--- a/PWGLF/PWGLFSTRANGENESSLinkDef.h
+++ b/PWGLF/PWGLFSTRANGENESSLinkDef.h
@@ -46,5 +46,4 @@
 #pragma link C++ class AliAnalysisTaskAntiHe4+;
 #pragma link C++ class AliAnalysisTaskNucleiv2+;
 #pragma link C++ class AliAnalysisTaskNucleiv2SP+;
-#pragma link C++ class AliPPVsMultUtils+;
 #endif

diff --git a/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.cxx b/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.cxx
deleted file mode 100644 (file)
index e70c7fe..0000000
--- a/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.cxx
+++ /dev/null
@@ -1,266 +0,0 @@
-/*****************************************************************
- 
- General utility class for doing pp vs multiplicity studies
- 
- --- Functionality being added on demand.
- 
- --- Please report any bugs, comments, suggestions to:
- david.dobrigkeit.chinellato@cern.ch
- 
- *****************************************************************/
-
-#include "AliVEvent.h"
-#include "AliESDEvent.h"
-#include "AliAODEvent.h"
-#include "AliVVertex.h"
-#include "AliLog.h"
-#include "AliAODVertex.h"
-#include "AliVTrack.h"
-#include "AliVEvent.h"
-#include <TMatrixDSym.h>
-#include <TMath.h>
-#include "AliESDUtils.h"
-#include "AliPPVsMultUtils.h"
-#include <TFile.h>
-
-
-ClassImp(AliPPVsMultUtils)
-
-//______________________________________________________________________
-AliPPVsMultUtils::AliPPVsMultUtils():TObject(),
-fRunNumber(0),
-fBoundaryHisto_V0M(0),
-fBoundaryHisto_V0A(0),
-fBoundaryHisto_V0C(0),
-fBoundaryHisto_V0MEq(0),
-fBoundaryHisto_V0AEq(0),
-fBoundaryHisto_V0CEq(0)
-{
-    // Default contructor
-}
-
-
-//_____________________________________________________________________________
-AliPPVsMultUtils::AliPPVsMultUtils(const AliPPVsMultUtils &c) : TObject(c),
-fRunNumber(0),
-fBoundaryHisto_V0M(0),
-fBoundaryHisto_V0A(0),
-fBoundaryHisto_V0C(0),
-fBoundaryHisto_V0MEq(0),
-fBoundaryHisto_V0AEq(0),
-fBoundaryHisto_V0CEq(0)
-{
-    //
-    // copy constructor - untested
-    //
-    ((AliPPVsMultUtils &) c).Copy(*this);
-}
-
-//_____________________________________________________________________________
-AliPPVsMultUtils &AliPPVsMultUtils::operator=(const AliPPVsMultUtils &c)
-{
-    //
-    // Assignment operator - untested
-    //
-    
-    if (this != &c) ((AliPPVsMultUtils &) c).Copy(*this);
-    return *this;
-}
-
-//______________________________________________________________________
-Float_t AliPPVsMultUtils::GetMultiplicityPercentile(AliESDEvent *event, TString lMethod)
-// Function to get multiplicity quantiles in ESDs. All methods would work 
-// with AliVEvent except GetPrimaryVertexSPD which exists in both ESD and AOD 
-// but not in the AliVEvent class; therefore two functions are included. 
-// N.B.: Any change to this method has to be propagated by hand to the function 
-// below! 
-{
-    Int_t lRequestedRunNumber = event->GetRunNumber();
-    if( lRequestedRunNumber != fRunNumber ) LoadCalibration( lRequestedRunNumber );
-    
-    Float_t lreturnval = -1;
-    
-    //Get VZERO Information for multiplicity later
-    AliVVZERO* esdV0 = event->GetVZEROData();
-    if (!esdV0) {
-        AliError("AliVVZERO not available");
-        return -1;
-    }
-    
-    // VZERO PART
-    Float_t  multV0A  = 0;            //  multiplicity from V0 reco side A
-    Float_t  multV0C  = 0;            //  multiplicity from V0 reco side C
-    Float_t  multV0AEq  = 0;          //  multiplicity from V0 reco side A
-    Float_t  multV0CEq  = 0;          //  multiplicity from V0 reco side C
-    Float_t  multV0ACorr  = 0;            //  multiplicity from V0 reco side A
-    Float_t  multV0CCorr  = 0;            //  multiplicity from V0 reco side C
-    
-    //Non-Equalized Signal: copy of multV0ACorr and multV0CCorr from AliCentralitySelectionTask
-    //Getters for uncorrected multiplicity
-    multV0A=esdV0->GetMTotV0A();
-    multV0C=esdV0->GetMTotV0C();
-    const AliESDVertex *lPrimarySPDVtx         = event->GetPrimaryVertexSPD();
-    
-    //Get Z vertex position of SPD vertex (why not Tracking if available?)
-    Float_t zvtx = lPrimarySPDVtx->GetZ();
-    
-    //Acquire Corrected multV0A
-    multV0ACorr = AliESDUtils::GetCorrV0A(multV0A,zvtx);
-    multV0CCorr = AliESDUtils::GetCorrV0C(multV0C,zvtx);
-    
-    // Equalized signals // From AliCentralitySelectionTask // Updated
-    for(Int_t iCh = 32; iCh < 64; ++iCh) {
-        Double_t mult = event->GetVZEROEqMultiplicity(iCh);
-        multV0AEq += mult;
-    }
-    for(Int_t iCh = 0; iCh < 32; ++iCh) {
-        Double_t mult = event->GetVZEROEqMultiplicity(iCh);
-        multV0CEq += mult;
-    }
-    
-    if ( lMethod == "V0M" ) lreturnval =
-        fBoundaryHisto_V0M -> GetBinContent( fBoundaryHisto_V0M->FindBin(multV0ACorr+multV0CCorr) );
-    if ( lMethod == "V0A" ) lreturnval =
-        fBoundaryHisto_V0A -> GetBinContent( fBoundaryHisto_V0A->FindBin(multV0ACorr) );
-    if ( lMethod == "V0C" ) lreturnval =
-        fBoundaryHisto_V0C -> GetBinContent( fBoundaryHisto_V0C->FindBin(multV0CCorr) );
-    //equalized
-    if ( lMethod == "V0MEq" ) lreturnval =
-        fBoundaryHisto_V0MEq -> GetBinContent( fBoundaryHisto_V0MEq->FindBin(multV0AEq+multV0CEq) );
-    if ( lMethod == "V0AEq" ) lreturnval =
-        fBoundaryHisto_V0AEq -> GetBinContent( fBoundaryHisto_V0AEq->FindBin(multV0AEq) );
-    if ( lMethod == "V0CEq" ) lreturnval =
-        fBoundaryHisto_V0CEq -> GetBinContent( fBoundaryHisto_V0CEq->FindBin(multV0CEq) );
-    
-    return lreturnval;
-}
-
-//______________________________________________________________________
-Float_t AliPPVsMultUtils::GetMultiplicityPercentile(AliAODEvent *event, TString lMethod)
-// Carbon-copy version of ESD function (GetPrimaryVertexSPD won't work 
-// in the base class AliVEvent...FIXME) 
-{
-    Int_t lRequestedRunNumber = event->GetRunNumber();
-    if( lRequestedRunNumber != fRunNumber ) LoadCalibration( lRequestedRunNumber );
-    
-    Float_t lreturnval = -1;
-    
-    //Get VZERO Information for multiplicity later
-    AliVVZERO* esdV0 = event->GetVZEROData();
-    if (!esdV0) {
-        AliError("AliVVZERO not available");
-        return -1;
-    }
-    
-    // VZERO PART
-    Float_t  multV0A  = 0;            //  multiplicity from V0 reco side A
-    Float_t  multV0C  = 0;            //  multiplicity from V0 reco side C
-    Float_t  multV0AEq  = 0;          //  multiplicity from V0 reco side A
-    Float_t  multV0CEq  = 0;          //  multiplicity from V0 reco side C
-    Float_t  multV0ACorr  = 0;            //  multiplicity from V0 reco side A
-    Float_t  multV0CCorr  = 0;            //  multiplicity from V0 reco side C
-    
-    //Non-Equalized Signal: copy of multV0ACorr and multV0CCorr from AliCentralitySelectionTask
-    //Getters for uncorrected multiplicity
-    multV0A=esdV0->GetMTotV0A();
-    multV0C=esdV0->GetMTotV0C();
-    const AliAODVertex *lPrimarySPDVtx         = event->GetPrimaryVertexSPD();
-    
-    //Get Z vertex position of SPD vertex (why not Tracking if available?)
-    Float_t zvtx = lPrimarySPDVtx->GetZ();
-    
-    //Acquire Corrected multV0A
-    multV0ACorr = AliESDUtils::GetCorrV0A(multV0A,zvtx);
-    multV0CCorr = AliESDUtils::GetCorrV0C(multV0C,zvtx);
-    
-    // Equalized signals // From AliCentralitySelectionTask // Updated
-    for(Int_t iCh = 32; iCh < 64; ++iCh) {
-        Double_t mult = event->GetVZEROEqMultiplicity(iCh);
-        multV0AEq += mult;
-    }
-    for(Int_t iCh = 0; iCh < 32; ++iCh) {
-        Double_t mult = event->GetVZEROEqMultiplicity(iCh);
-        multV0CEq += mult;
-    }
-    
-    if ( lMethod == "V0M" ) lreturnval =
-        fBoundaryHisto_V0M -> GetBinContent( fBoundaryHisto_V0M->FindBin(multV0ACorr+multV0CCorr) );
-    if ( lMethod == "V0A" ) lreturnval =
-        fBoundaryHisto_V0A -> GetBinContent( fBoundaryHisto_V0A->FindBin(multV0ACorr) );
-    if ( lMethod == "V0C" ) lreturnval =
-        fBoundaryHisto_V0C -> GetBinContent( fBoundaryHisto_V0C->FindBin(multV0CCorr) );
-    //equalized
-    if ( lMethod == "V0MEq" ) lreturnval =
-        fBoundaryHisto_V0MEq -> GetBinContent( fBoundaryHisto_V0MEq->FindBin(multV0AEq+multV0CEq) );
-    if ( lMethod == "V0AEq" ) lreturnval =
-        fBoundaryHisto_V0AEq -> GetBinContent( fBoundaryHisto_V0AEq->FindBin(multV0AEq) );
-    if ( lMethod == "V0CEq" ) lreturnval =
-        fBoundaryHisto_V0CEq -> GetBinContent( fBoundaryHisto_V0CEq->FindBin(multV0CEq) );
-    
-    return lreturnval;
-}
-
-//______________________________________________________________________
-Bool_t AliPPVsMultUtils::LoadCalibration(Int_t lLoadThisCalibration)
-//To be called if starting analysis on a new run
-{
-    //If Histograms exist, de-allocate to prevent memory leakage
-    if( fBoundaryHisto_V0M ) {fBoundaryHisto_V0M->Delete(); fBoundaryHisto_V0M = 0x0; }
-    if( fBoundaryHisto_V0A ) {fBoundaryHisto_V0A->Delete(); fBoundaryHisto_V0A = 0x0; }
-    if( fBoundaryHisto_V0C ) {fBoundaryHisto_V0C->Delete(); fBoundaryHisto_V0C = 0x0; }
-    if( fBoundaryHisto_V0MEq ) {fBoundaryHisto_V0MEq->Delete(); fBoundaryHisto_V0MEq = 0x0; }
-    if( fBoundaryHisto_V0AEq ) {fBoundaryHisto_V0AEq->Delete(); fBoundaryHisto_V0AEq = 0x0; }
-    if( fBoundaryHisto_V0CEq ) {fBoundaryHisto_V0CEq->Delete(); fBoundaryHisto_V0CEq = 0x0; }
-    
-    AliInfo(Form( "Loading calibration file for run %i",lLoadThisCalibration) );
-    TFile *lCalibFile_V0M = 0x0;
-    TFile *lCalibFile_V0A = 0x0;
-    TFile *lCalibFile_V0C = 0x0;
-    TFile *lCalibFile_V0MEq = 0x0;
-    TFile *lCalibFile_V0AEq = 0x0;
-    TFile *lCalibFile_V0CEq = 0x0;
-    
-    //AliInfo("Calling TFile::Open");
-    lCalibFile_V0M = TFile::Open("$ALICE_ROOT/PWGLF/STRANGENESS/Cascades/corrections/calibration_V0M.root");
-    lCalibFile_V0A = TFile::Open("$ALICE_ROOT/PWGLF/STRANGENESS/Cascades/corrections/calibration_V0A.root");
-    lCalibFile_V0C = TFile::Open("$ALICE_ROOT/PWGLF/STRANGENESS/Cascades/corrections/calibration_V0C.root");
-    lCalibFile_V0MEq = TFile::Open("$ALICE_ROOT/PWGLF/STRANGENESS/Cascades/corrections/calibration_V0MEq.root");
-    lCalibFile_V0AEq = TFile::Open("$ALICE_ROOT/PWGLF/STRANGENESS/Cascades/corrections/calibration_V0AEq.root");
-    lCalibFile_V0CEq = TFile::Open("$ALICE_ROOT/PWGLF/STRANGENESS/Cascades/corrections/calibration_V0CEq.root");
-
-    //AliInfo("Casting");
-    //check memory consumption later... 
-    fBoundaryHisto_V0M   = dynamic_cast<TH1F *>(lCalibFile_V0M  -> Get(Form("histocalib%i",lLoadThisCalibration)) );
-    fBoundaryHisto_V0A   = dynamic_cast<TH1F *>(lCalibFile_V0A  -> Get(Form("histocalib%i",lLoadThisCalibration)) );
-    fBoundaryHisto_V0C   = dynamic_cast<TH1F *>(lCalibFile_V0C  -> Get(Form("histocalib%i",lLoadThisCalibration)) );
-    fBoundaryHisto_V0MEq   = dynamic_cast<TH1F *>(lCalibFile_V0MEq  -> Get(Form("histocalib%i",lLoadThisCalibration)) );
-    fBoundaryHisto_V0AEq   = dynamic_cast<TH1F *>(lCalibFile_V0AEq  -> Get(Form("histocalib%i",lLoadThisCalibration)) );
-    fBoundaryHisto_V0CEq   = dynamic_cast<TH1F *>(lCalibFile_V0CEq  -> Get(Form("histocalib%i",lLoadThisCalibration)) );
-    
-    if ( !fBoundaryHisto_V0M   || !fBoundaryHisto_V0A   || !fBoundaryHisto_V0C ||
-        !fBoundaryHisto_V0MEq || !fBoundaryHisto_V0AEq || !fBoundaryHisto_V0CEq ){
-        AliFatal(Form("No calibration for run %i exists at the moment!",lLoadThisCalibration));
-        return kFALSE; //return denial
-    }
-    
-    //Careful with manual cleanup if needed: to be implemented
-    fBoundaryHisto_V0M->SetDirectory(0);
-    fBoundaryHisto_V0A->SetDirectory(0);
-    fBoundaryHisto_V0C->SetDirectory(0);
-    fBoundaryHisto_V0MEq->SetDirectory(0);
-    fBoundaryHisto_V0AEq->SetDirectory(0);
-    fBoundaryHisto_V0CEq->SetDirectory(0);
-    
-    //AliInfo("Closing");
-    
-    if( lCalibFile_V0M ) lCalibFile_V0M->Close();
-    if( lCalibFile_V0A ) lCalibFile_V0A->Close();
-    if( lCalibFile_V0C ) lCalibFile_V0C->Close();
-    if( lCalibFile_V0MEq ) lCalibFile_V0MEq->Close();
-    if( lCalibFile_V0AEq ) lCalibFile_V0AEq->Close();
-    if( lCalibFile_V0CEq ) lCalibFile_V0CEq->Close();
-    
-    fRunNumber = lLoadThisCalibration; //Loaded!
-    AliInfo(Form("Finished loading calibration for run %i",lLoadThisCalibration));
-    return kTRUE;
-}

diff --git a/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.h b/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.h
deleted file mode 100644 (file)
index 4c4a63f..0000000
--- a/PWGLF/STRANGENESS/Cascades/AliPPVsMultUtils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef AliPPVsMultUtils_H
-#define AliPPVsMultUtils_H
-
-#include "TObject.h"
-
-class AliVEvent;
-class AliVVertex;
-class AliESDEvent; 
-class AliAODEvent;
-
-class AliPPVsMultUtils : public TObject {
-    
-public:
-    
-    AliPPVsMultUtils();
-    virtual ~AliPPVsMultUtils(){};
-    
-    //Extra const
-    AliPPVsMultUtils(const AliPPVsMultUtils& pd);
-    AliPPVsMultUtils &operator=(const AliPPVsMultUtils &c);
-
-    //Utility functions
-    //for the base virtual event class: all methods are common
-    Float_t GetMultiplicityPercentile(AliESDEvent *event, TString lMethod = "V0M");
-    Float_t GetMultiplicityPercentile(AliAODEvent *event, TString lMethod = "V0M");
-    Bool_t LoadCalibration(Int_t lLoadThisCalibration);
-    
-private:
-    
-    Int_t fRunNumber; // minimum vertex contributors
-    
-    TH1F *fBoundaryHisto_V0M;
-    TH1F *fBoundaryHisto_V0A;
-    TH1F *fBoundaryHisto_V0C;
-    TH1F *fBoundaryHisto_V0MEq;
-    TH1F *fBoundaryHisto_V0AEq;
-    TH1F *fBoundaryHisto_V0CEq;
-    
-    ClassDef(AliPPVsMultUtils,1) // base helper class
-};
-#endif
-