DiHadronPID patch (Misha Veldhoen <Misha.Veldhoen@cern.ch>)

diff --git a/PWGCF/Correlations/DPhi/DiHadronPID/AliAODEventCutsDiHadronPID.cxx b/PWGCF/Correlations/DPhi/DiHadronPID/AliAODEventCutsDiHadronPID.cxx
index 84f6a0a3035fda7b0282274c00daadce849979a4..6095fec699dc7d9ed36cc42279a27c3a944ea909 100644 (file)
--- a/PWGCF/Correlations/DPhi/DiHadronPID/AliAODEventCutsDiHadronPID.cxx
+++ b/PWGCF/Correlations/DPhi/DiHadronPID/AliAODEventCutsDiHadronPID.cxx
@@ -92,41 +92,6 @@ AliAODEventCutsDiHadronPID::AliAODEventCutsDiHadronPID(const char* name):
 
 }
 
-// -------------------------------------------------------------------------
-AliAODEventCutsDiHadronPID::AliAODEventCutsDiHadronPID(const AliAODEventCutsDiHadronPID &source):
-       TNamed(source),
-       fTrigger(source.fTrigger),
-       fMinCentrality(source.fMinCentrality),
-       fMaxCentrality(source.fMaxCentrality),
-       fCentralityEstimator(source.fCentralityEstimator),
-       fMaxVertexZ(source.fMaxVertexZ),
-       fTestTrigger(source.fTestTrigger),
-       fTestCentrality(source.fTestCentrality),
-       fTestVertexZ(source.fTestVertexZ),
-       fSelectedEventQAHistos(0x0),
-       fAllEventQAHistos(0x0),
-       fHistTrigger(0x0),
-       fHistRefMultiplicity(0x0),
-       fHistCentrality(0x0),
-       fHistVertexZ(0x0)
-
-{
-
-       //
-       // Copy Constructor
-       //
-
-       cout<<"AliAODEventCutsDiHadronPID Copy Constructor Called."<<endl;
-       if (fDebug > 1) {cout << Form("File: %s, Line: %i, Function: %s",__FILE__,__LINE__,__func__) << endl;}
-
-       //if (source.fSelectedEventQAHistos) fSelectedEventQAHistos = (TList*)source.fHistTrigger->Clone();
-       //if (source.fHistTrigger) fHistTrigger = (TH1F*)source.fHistTrigger->Clone();
-       //if (source.fHistRefMultiplicity) fHistRefMultiplicity = (TH1F*)source.fHistRefMultiplicity->Clone();
-       //if (source.fHistCentrality) fHistCentrality = (TH1F*)source.fHistCentrality->Clone();
-       //if (source.fHistVertexZ) fHistVertexZ = (TH1F*)source.fHistVertexZ->Clone();
-
-}
-
 // -------------------------------------------------------------------------
 AliAODEventCutsDiHadronPID::~AliAODEventCutsDiHadronPID() {
 

diff --git a/PWGCF/Correlations/DPhi/DiHadronPID/AliAODEventCutsDiHadronPID.h b/PWGCF/Correlations/DPhi/DiHadronPID/AliAODEventCutsDiHadronPID.h
index 32e833cc55ffeb1606aae971eebdd81f387c1d4c..978e09b1b83e249ab04fca692207fb7cd1bcc11c 100644 (file)
--- a/PWGCF/Correlations/DPhi/DiHadronPID/AliAODEventCutsDiHadronPID.h
+++ b/PWGCF/Correlations/DPhi/DiHadronPID/AliAODEventCutsDiHadronPID.h
@@ -12,13 +12,15 @@ class AliAODEventCutsDiHadronPID : public TNamed
 public:
        AliAODEventCutsDiHadronPID();                                                           // Default Constructor
        AliAODEventCutsDiHadronPID(const char* name);                           // Named Constructor
-       AliAODEventCutsDiHadronPID(const AliAODEventCutsDiHadronPID &source);   // Copy Constructor
        virtual ~AliAODEventCutsDiHadronPID();                                          // Destructor
        virtual Long64_t Merge(TCollection* list);                                      // Merger
 
-       void CreateHistos();                                    // Create QA histograms
+private:
+       AliAODEventCutsDiHadronPID(const AliAODEventCutsDiHadronPID&);
+       AliAODEventCutsDiHadronPID& operator=(const AliAODEventCutsDiHadronPID&);
 
 public:
+       void CreateHistos();                                    // Create QA histograms
        Bool_t IsSelected(AliAODEvent* event);
        void PrintCuts();
 
@@ -80,7 +82,7 @@ public:
        TObject* GetHistAllEvents(const char* name) {return fAllEventQAHistos->FindObject(name);}
 
        // Cannot be made const because GetHistSelectedEvents() isn't safe.
-       Int_t GetNAcceptedEvents() {return ((TH1F*)GetHistSelectedEvents("fHistTriggerSelected"))->GetEntries();}
+       Int_t GetNAcceptedEvents() {return (Int_t)((TH1F*)GetHistSelectedEvents("fHistTriggerSelected"))->GetEntries();}
 
        Int_t GetDebugLevel() const {return fDebug;}
 

diff --git a/PWGCF/Correlations/DPhi/DiHadronPID/AliAODTrackCutsDiHadronPID.cxx b/PWGCF/Correlations/DPhi/DiHadronPID/AliAODTrackCutsDiHadronPID.cxx
index 0fd243c9025ac8de610025f17130eef92c5cd1ca..5e0fb4a2ea01aaa05d45ed5af6be9115938f24a3 100644 (file)
--- a/PWGCF/Correlations/DPhi/DiHadronPID/AliAODTrackCutsDiHadronPID.cxx
+++ b/PWGCF/Correlations/DPhi/DiHadronPID/AliAODTrackCutsDiHadronPID.cxx
@@ -46,6 +46,7 @@ AliAODTrackCutsDiHadronPID::AliAODTrackCutsDiHadronPID():
        fPtDeptDCAxyCutFormula(0x0),
        fDCAzCut(999.),
        fIsMC(kFALSE),
+       fTestPt(kFALSE),
        fTestFilterMask(kFALSE),
        fTestMaxEta(kFALSE),
        fTestMaxRapidity(kFALSE),
@@ -57,6 +58,7 @@ AliAODTrackCutsDiHadronPID::AliAODTrackCutsDiHadronPID():
        fPrimGenMCTrackQAHistos(0x0),
        fSecRecMCTrackQAHistos(0x0),
        fSecGenMCTrackQAHistos(0x0),
+       fNPtBins(0),    
        fNEtaBins(32),
        fNPhiBins(32),
        fDebug(0)
@@ -137,6 +139,7 @@ AliAODTrackCutsDiHadronPID::AliAODTrackCutsDiHadronPID(const char* name):
        fPtDeptDCAxyCutFormula(0x0),
        fDCAzCut(999.),
        fIsMC(kFALSE),
+       fTestPt(kFALSE),        
        fTestFilterMask(kFALSE),
        fTestMaxEta(kFALSE),
        fTestMaxRapidity(kFALSE),
@@ -148,6 +151,7 @@ AliAODTrackCutsDiHadronPID::AliAODTrackCutsDiHadronPID(const char* name):
        fPrimGenMCTrackQAHistos(0x0),
        fSecRecMCTrackQAHistos(0x0),
        fSecGenMCTrackQAHistos(0x0),
+       fNPtBins(0),
        fNEtaBins(32),
        fNPhiBins(32),  
        fDebug(0)

diff --git a/PWGCF/Correlations/DPhi/DiHadronPID/AliAODTrackCutsDiHadronPID.h b/PWGCF/Correlations/DPhi/DiHadronPID/AliAODTrackCutsDiHadronPID.h
index cd1c8dd96fe1d323fe054a1cc26c0dbf26153ec5..8bc7919e4540a059f6a394ac7a25ea2b2237e58e 100644 (file)
--- a/PWGCF/Correlations/DPhi/DiHadronPID/AliAODTrackCutsDiHadronPID.h
+++ b/PWGCF/Correlations/DPhi/DiHadronPID/AliAODTrackCutsDiHadronPID.h
@@ -23,6 +23,10 @@ public:
        virtual ~AliAODTrackCutsDiHadronPID();                  // Destructor
        virtual Long64_t Merge(TCollection* list);              // Merger
 
+private:
+       AliAODTrackCutsDiHadronPID(const AliAODTrackCutsDiHadronPID&);
+       AliAODTrackCutsDiHadronPID& operator=(const AliAODTrackCutsDiHadronPID&);
+
 // -------------------------------------------------------------------------
 //  Interface, methods used to get information about the track cuts, and to
 //  retrieve filled histograms. 

diff --git a/PWGCF/Correlations/DPhi/DiHadronPID/AliAnalysisTaskDiHadronPID.cxx b/PWGCF/Correlations/DPhi/DiHadronPID/AliAnalysisTaskDiHadronPID.cxx
index d480e1e9ca00d30f73d9374869d6c0940d01b5a1..c4fcceee63d1670b5f0a0a217813a9ae6d28a1d1 100644 (file)
--- a/PWGCF/Correlations/DPhi/DiHadronPID/AliAnalysisTaskDiHadronPID.cxx
+++ b/PWGCF/Correlations/DPhi/DiHadronPID/AliAnalysisTaskDiHadronPID.cxx
@@ -220,7 +220,7 @@ void AliAnalysisTaskDiHadronPID::UserCreateOutputObjects() {
        fTOFhistos = new TObjArray(15);
        fTOFhistos->SetName("CorrelationsTOF");
 
-       Int_t nbins[4] = {fNDPhiBins,fNDEtaBins,0.,0.};
+       Int_t nbins[4] = {fNDPhiBins,fNDEtaBins,0,0};
        Double_t min[4] = {-TMath::Pi()/2.,-1.6,0.,0.};
        Double_t max[4] = {3.*TMath::Pi()/2.,1.6,0.,0.};
 
@@ -368,7 +368,7 @@ void AliAnalysisTaskDiHadronPID::UserExec(Option_t*) {
        // TObjArray* fGlobalTracksArray; 
 
        // Give a print out of the pool manager's contents.
-       PrintPoolManagerContents();
+       if (fDebug > 0) PrintPoolManagerContents();
 
        // Mix events if there are enough events in the pool.
        if (poolin->GetCurrentNEvents() >= fMinNEventsForMixing) {

diff --git a/PWGCF/Correlations/DPhi/DiHadronPID/AliAnalysisTaskDiHadronPID.h b/PWGCF/Correlations/DPhi/DiHadronPID/AliAnalysisTaskDiHadronPID.h
index 1f45485c4cbe20b5a622116aebe6c7054ec06a24..39129334dea49e2520a05976bc986caf37e10bb8 100644 (file)
--- a/PWGCF/Correlations/DPhi/DiHadronPID/AliAnalysisTaskDiHadronPID.h
+++ b/PWGCF/Correlations/DPhi/DiHadronPID/AliAnalysisTaskDiHadronPID.h
@@ -16,6 +16,11 @@ public:
        AliAnalysisTaskDiHadronPID(const char* name);
        virtual ~AliAnalysisTaskDiHadronPID();
 
+private:
+       AliAnalysisTaskDiHadronPID(const AliAnalysisTaskDiHadronPID&);
+       AliAnalysisTaskDiHadronPID& operator=(const AliAnalysisTaskDiHadronPID&);
+
+public:
        // Methods from AliAnalysisTaskSE.
        void UserCreateOutputObjects();
        void LocalInit();

diff --git a/PWGCF/Correlations/DPhi/DiHadronPID/AliTrackDiHadronPID.cxx b/PWGCF/Correlations/DPhi/DiHadronPID/AliTrackDiHadronPID.cxx
index 366155ddc7c25869ef8cced9f1701b23aba7b343..9471582e4d7feeae95d14e645407219cff3cfb78 100644 (file)
--- a/PWGCF/Correlations/DPhi/DiHadronPID/AliTrackDiHadronPID.cxx
+++ b/PWGCF/Correlations/DPhi/DiHadronPID/AliTrackDiHadronPID.cxx
@@ -54,6 +54,7 @@ AliTrackDiHadronPID::AliTrackDiHadronPID():
        fIsTOFmismatch(kFALSE),
        fTPCsignal(-999.),
        fTPCmomentum(-999.),
+       fITSClusterMap(0),
        fMCPt(-999.),
        fMCEta(-999.),
        fMCPhi(-999.),
@@ -115,6 +116,7 @@ AliTrackDiHadronPID::AliTrackDiHadronPID(AliAODTrack* track, AliAODTrack* global
        fIsTOFmismatch(kFALSE),
        fTPCsignal(-999.),
        fTPCmomentum(-999.),
+       fITSClusterMap(0),      
        fMCPt(-999.),
        fMCEta(-999.),
        fMCPhi(-999.),

diff --git a/PWGCF/Correlations/DPhi/DiHadronPID/AliTrackDiHadronPID.h b/PWGCF/Correlations/DPhi/DiHadronPID/AliTrackDiHadronPID.h
index e38666b39b06f78302471cf8dad37502335d4e25..eb89adaf8a6fdf44ca1af01a22d3f16a7e499fdc 100644 (file)
--- a/PWGCF/Correlations/DPhi/DiHadronPID/AliTrackDiHadronPID.h
+++ b/PWGCF/Correlations/DPhi/DiHadronPID/AliTrackDiHadronPID.h
@@ -14,7 +14,11 @@ class AliTrackDiHadronPID : public TObject {
 public:
        AliTrackDiHadronPID();
        AliTrackDiHadronPID(AliAODTrack* track, AliAODTrack* globaltrack = 0x0, AliAODMCParticle* mcparticle = 0x0, AliPIDResponse* pidresponse = 0x0);
-       //virtual ~AliTrackDiHadronPID();
+       virtual ~AliTrackDiHadronPID() {}
+
+private:
+       AliTrackDiHadronPID(const AliTrackDiHadronPID&);
+       AliTrackDiHadronPID& operator=(const AliTrackDiHadronPID&);
 
 // Internal copy functions.
 private: