Comment out copy ctors and assignment opetators from classes source code, not needed.
authorgconesab <gconesab@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 29 Jun 2010 04:07:15 +0000 (04:07 +0000)
committergconesab <gconesab@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 29 Jun 2010 04:07:15 +0000 (04:07 +0000)
AliAnaPhoton: Pass all primary contributors to set the MC identification tag
AliAnaPartCorrBase: Do not initialize the reader and caloutils pointers, done elsewhere
AliCalorimeterUtils: Several changes related to the initizalization of the bad channels arrays.

48 files changed:
PWG4/PartCorrBase/AliAnaPartCorrBaseClass.cxx
PWG4/PartCorrBase/AliAnaPartCorrBaseClass.h
PWG4/PartCorrBase/AliAnaPartCorrMaker.cxx
PWG4/PartCorrBase/AliAnaPartCorrMaker.h
PWG4/PartCorrBase/AliCaloTrackAODReader.cxx
PWG4/PartCorrBase/AliCaloTrackAODReader.h
PWG4/PartCorrBase/AliCaloTrackESDReader.cxx
PWG4/PartCorrBase/AliCaloTrackESDReader.h
PWG4/PartCorrBase/AliCaloTrackMCReader.cxx
PWG4/PartCorrBase/AliCaloTrackMCReader.h
PWG4/PartCorrBase/AliCaloTrackReader.cxx
PWG4/PartCorrBase/AliCaloTrackReader.h
PWG4/PartCorrBase/AliCalorimeterUtils.cxx
PWG4/PartCorrBase/AliCalorimeterUtils.h
PWG4/PartCorrBase/AliFiducialCut.cxx
PWG4/PartCorrBase/AliFiducialCut.h
PWG4/PartCorrBase/AliIsolationCut.cxx
PWG4/PartCorrBase/AliIsolationCut.h
PWG4/PartCorrBase/AliMCAnalysisUtils.cxx
PWG4/PartCorrBase/AliMCAnalysisUtils.h
PWG4/PartCorrBase/AliNeutralMesonSelection.cxx
PWG4/PartCorrBase/AliNeutralMesonSelection.h
PWG4/PartCorrDep/AliAnaCalorimeterQA.cxx
PWG4/PartCorrDep/AliAnaCalorimeterQA.h
PWG4/PartCorrDep/AliAnaChargedParticles.cxx
PWG4/PartCorrDep/AliAnaChargedParticles.h
PWG4/PartCorrDep/AliAnaElectron.cxx
PWG4/PartCorrDep/AliAnaElectron.h
PWG4/PartCorrDep/AliAnaExample.cxx
PWG4/PartCorrDep/AliAnaExample.h
PWG4/PartCorrDep/AliAnaOmegaToPi0Gamma.cxx
PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx
PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.h
PWG4/PartCorrDep/AliAnaParticleIsolation.cxx
PWG4/PartCorrDep/AliAnaParticleIsolation.h
PWG4/PartCorrDep/AliAnaParticleJetFinderCorrelation.cxx
PWG4/PartCorrDep/AliAnaParticleJetFinderCorrelation.h
PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx
PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.h
PWG4/PartCorrDep/AliAnaParticlePartonCorrelation.cxx
PWG4/PartCorrDep/AliAnaParticlePartonCorrelation.h
PWG4/PartCorrDep/AliAnaPhoton.cxx
PWG4/PartCorrDep/AliAnaPhoton.h
PWG4/PartCorrDep/AliAnaPi0.cxx
PWG4/PartCorrDep/AliAnaPi0.h
PWG4/PartCorrDep/AliAnaPi0EbE.cxx
PWG4/PartCorrDep/AliAnaPi0EbE.h
PWG4/macros/QA/AddTaskCalorimeterQA.C

index 7ade083..855edf2 100755 (executable)
@@ -51,20 +51,20 @@ ClassImp(AliAnaPartCorrBaseClass)
     fAODObjArrayName(""), fAddToHistogramsName(""),
     fAODCaloCells(0x0),//fAODCaloClusters(0x0),  
     fCaloPID(0x0), fFidCut(0x0), fIC(0x0),fMCUtils(0x0), fNMS(0x0),
-       fCaloUtils(0x0),
-       //fAnaOutContainer(0x0),
+    fCaloUtils(0x0),
+    //fAnaOutContainer(0x0),
     fHistoPtBins(0),   fHistoPtMax(0.),   fHistoPtMin(0.),
     fHistoPhiBins(0),  fHistoPhiMax(0.),  fHistoPhiMin(0.),
     fHistoEtaBins(0),  fHistoEtaMax(0.),  fHistoEtaMin(0.),
     fHistoMassBins(0), fHistoMassMax(0.), fHistoMassMin(0.),
-       fHistoAsymBins(0), fHistoAsymMax(0.), fHistoAsymMin(0.)
+    fHistoAsymBins(0), fHistoAsymMax(0.), fHistoAsymMin(0.)
 {
   //Default Ctor
     
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //___________________________________________________________
 AliAnaPartCorrBaseClass::AliAnaPartCorrBaseClass(const AliAnaPartCorrBaseClass & abc) :   
   TObject(), fDataMC(abc.fDataMC), fDebug(abc.fDebug),
@@ -91,7 +91,8 @@ AliAnaPartCorrBaseClass::AliAnaPartCorrBaseClass(const AliAnaPartCorrBaseClass &
   // cpy ctor
 
 }
-
+*/
+  /*
 //_________________________________________________________________________
 AliAnaPartCorrBaseClass & AliAnaPartCorrBaseClass::operator = (const AliAnaPartCorrBaseClass & abc)
 {
@@ -138,7 +139,7 @@ AliAnaPartCorrBaseClass & AliAnaPartCorrBaseClass::operator = (const AliAnaPartC
   return *this;
   
 }
-
+  */
 //____________________________________________________________________________
 AliAnaPartCorrBaseClass::~AliAnaPartCorrBaseClass() 
 {
@@ -484,8 +485,8 @@ void AliAnaPartCorrBaseClass::InitParameters()
   fMinPt = 0.1  ; //Min pt in particle analysis
   fMaxPt = 300. ; //Max pt in particle analysis
 
-  fReader    = new AliCaloTrackReader();
-  fCaloUtils = new AliCalorimeterUtils();
+  //fReader    = new AliCaloTrackReader(); //Initialized in maker
+  //fCaloUtils = new AliCalorimeterUtils();//Initialized in maker
   fCaloPID   = new AliCaloPID();
   fFidCut    = new AliFiducialCut();
   fIC        = new AliIsolationCut();
index fba6b00..78ffec0 100755 (executable)
@@ -36,14 +36,16 @@ class AliPHOSGeoUtils;
 
 class AliAnaPartCorrBaseClass : public TObject {
        
-public: 
-       
+ public:   
   AliAnaPartCorrBaseClass() ; // default ctor
+  virtual ~AliAnaPartCorrBaseClass() ; //virtual dtor
+  
+ private:
   AliAnaPartCorrBaseClass(const AliAnaPartCorrBaseClass & g) ; // cpy ctor
   AliAnaPartCorrBaseClass & operator = (const AliAnaPartCorrBaseClass & g) ;//cpy assignment
-  virtual ~AliAnaPartCorrBaseClass() ; //virtual dtor
   
-//     virtual void AddAODCaloCluster(AliAODCaloCluster calo) ;
+ public:
+  //   virtual void AddAODCaloCluster(AliAODCaloCluster calo) ;
   virtual void AddAODParticle(AliAODPWG4Particle part) ;
   
 //     virtual void ConnectAODCaloClusters();
index e5929ff..1d20f52 100755 (executable)
@@ -46,18 +46,13 @@ AliAnaPartCorrMaker::AliAnaPartCorrMaker() :
 TObject(),
 fOutputContainer(new TList ), fAnalysisContainer(new TList ),
 fMakeHisto(kFALSE), fMakeAOD(kFALSE), fMakeMixing(kFALSE), fAnaDebug(0), 
-fReader(0x0), fCaloUtils(0x0), fAODBranchList(new TList ), 
-fhNEvents(0x0)
+fReader(new AliCaloTrackReader()), fCaloUtils(new AliCalorimeterUtils()), 
+fAODBranchList(new TList ), fhNEvents(0x0)
 {
   //Default Ctor
   if(fAnaDebug > 1 ) printf("*** Analysis Maker  Constructor *** \n");
   
   //Initialize parameters, pointers and histograms
-  if(!fReader)
-    fReader    = new AliCaloTrackReader();
-  if(!fCaloUtils)
-    fCaloUtils = new AliCalorimeterUtils();
-       
   InitParameters();
 }
 
@@ -67,8 +62,8 @@ TObject(),
 fOutputContainer(new TList()), fAnalysisContainer(new TList()), 
 fMakeHisto(maker.fMakeHisto), fMakeAOD(maker.fMakeAOD), fMakeMixing(maker.fMakeMixing), 
 fAnaDebug(maker.fAnaDebug),
-fReader(new AliCaloTrackReader(*maker.fReader)), 
-fCaloUtils(new AliCalorimeterUtils(*maker.fCaloUtils)),
+fReader(),//new AliCaloTrackReader(*maker.fReader)), 
+fCaloUtils(),//(new AliCalorimeterUtils(*maker.fCaloUtils)),
 fAODBranchList(new TList()), 
 fhNEvents(maker.fhNEvents)
 {
index feb9cfe..f267899 100755 (executable)
@@ -27,10 +27,9 @@ class AliCalorimeterUtils ;
 class AliAnaPartCorrMaker : public TObject {
 
  public: 
-  
   AliAnaPartCorrMaker() ; // default ctor
-  AliAnaPartCorrMaker(const AliAnaPartCorrMaker & maker) ; // cpy ctor
   virtual ~AliAnaPartCorrMaker() ; //virtual dtor
+  AliAnaPartCorrMaker(const AliAnaPartCorrMaker & maker) ; // cpy ctor
 
  private:
   AliAnaPartCorrMaker & operator = (const AliAnaPartCorrMaker & ) ;//cpy assignment
index 9347e4a..606b354 100755 (executable)
@@ -55,14 +55,14 @@ AliCaloTrackAODReader::AliCaloTrackAODReader() :
   fTrackStatus|=AliESDtrack::kITSrefit;
 
 }
-
+/*
 //____________________________________________________________________________
 AliCaloTrackAODReader::AliCaloTrackAODReader(const AliCaloTrackAODReader & aodr) :   
   AliCaloTrackReader(aodr), fWriteOutputStdAOD(aodr.fWriteOutputStdAOD)
 {
   // cpy ctor
 }
-
+*/
 //_________________________________________________________________________
 //AliCaloTrackAODReader & AliCaloTrackAODReader::operator = (const AliCaloTrackAODReader & source)
 //{
index fb154a7..0fc8a0c 100755 (executable)
@@ -24,7 +24,7 @@ class AliCaloTrackAODReader : public AliCaloTrackReader {
 public: 
        
   AliCaloTrackAODReader() ; // ctor
-  AliCaloTrackAODReader(const AliCaloTrackAODReader & g)  ; // cpy ctor
+  //AliCaloTrackAODReader(const AliCaloTrackAODReader & g)  ; // cpy ctor
   //AliCaloTrackAODReader & operator = (const AliCaloTrackAODReader & g) ;//cpy assignment
   virtual ~AliCaloTrackAODReader() {;} //virtual dtor
   
index fb975ea..af91fa1 100755 (executable)
@@ -48,25 +48,28 @@ ClassImp(AliCaloTrackESDReader)
 AliCaloTrackESDReader::AliCaloTrackESDReader() : 
 AliCaloTrackReader()
 {
-       //Default Ctor
-       
-       //Initialize parameters
-       fDataType=kESD;
-       fReadStack          = kTRUE;
-       fReadAODMCParticles = kFALSE;
-       //We want tracks fitted in the detectors:
-       fTrackStatus=AliESDtrack::kTPCrefit;
-    fTrackStatus|=AliESDtrack::kITSrefit;
-
+  //Default Ctor
+  
+  //Initialize parameters
+  fDataType=kESD;
+  fReadStack          = kTRUE;
+  fReadAODMCParticles = kFALSE;
+  //We want tracks fitted in the detectors:
+  fTrackStatus=AliESDtrack::kTPCrefit;
+  fTrackStatus|=AliESDtrack::kITSrefit;
+  //This reader creates the AOD objects (Tracks-clusters), so it owns them 
+  //fAODCTS  ->SetOwner(kTRUE);
+  //fAODEMCAL->SetOwner(kTRUE);
+  //fAODPHOS ->SetOwner(kTRUE);
 }
-
+/*
 //____________________________________________________________________________
 AliCaloTrackESDReader::AliCaloTrackESDReader(const AliCaloTrackESDReader & g) :   
   AliCaloTrackReader(g)
 {
   // cpy ctor
 }
-
+*/
 //_________________________________________________________________________
 //AliCaloTrackESDReader & AliCaloTrackESDReader::operator = (const AliCaloTrackESDReader & source)
 //{
@@ -93,9 +96,13 @@ void AliCaloTrackESDReader::FillInputCTS() {
   Double_t bfield = ((AliESDEvent*)fInputEvent)->GetMagneticField();
 
   Double_t      timezero        = 0;   //TO BE FIXED
+  //List of output tracks 
+  TClonesArray &tracks = *(fOutputEvent->GetTracks());
 
   //To be replaced by call to AliEMCALGeoUtils when the class becomes available
   Double_t radius = 441.0; //[cm] EMCAL radius +13cm
+
   if(fDebug > 1) printf("AliCaloTrackESDReader::FillInputCTS() - org entries %d\n", nTracks);
   for (Int_t itrack =  0; itrack <  nTracks; itrack++) {////////////// track loop
     AliESDtrack * track = (AliESDtrack*) ((AliESDEvent*)fInputEvent)->GetTrack(itrack) ; // retrieve track from esd
@@ -122,7 +129,8 @@ void AliCaloTrackESDReader::FillInputCTS() {
                if (impactXY<3) {
                  // track inside the beam pipe
                  //Put new aod object in file in AOD tracks array
-                 AliAODTrack *aodTrack = new((*(fOutputEvent->GetTracks()))[naod++]) 
+                 AliAODTrack *aodTrack = new(tracks[naod++]) 
+                   //AliAODTrack *aodTrack = new((*(fOutputEvent->GetTracks()))[naod++]) 
                    AliAODTrack(track->GetID(), track->GetLabel(), p, kTRUE, pos, kFALSE,covTr, (Short_t)track->GetSign(), track->GetITSClusterMap(), 
                                pid,
                                0x0,//primary,
index 66cf3be..6bd2935 100755 (executable)
@@ -27,7 +27,7 @@ class AliCaloTrackESDReader : public AliCaloTrackReader {
   public: 
   
   AliCaloTrackESDReader() ; // ctor
-  AliCaloTrackESDReader(const AliCaloTrackESDReader & g) ; // cpy ctor
+  //AliCaloTrackESDReader(const AliCaloTrackESDReader & g) ; // cpy ctor
   //AliCaloTrackESDReader & operator = (const AliCaloTrackESDReader & g) ;//cpy assignment
   virtual ~AliCaloTrackESDReader() {;} //virtual dtor
   
index 58be9ee..23d726a 100755 (executable)
@@ -61,7 +61,7 @@ AliCaloTrackMCReader::AliCaloTrackMCReader() :
   fReadAODMCParticles = kFALSE;
   
 }
-
+/*
 //____________________________________________________________________________
 AliCaloTrackMCReader::AliCaloTrackMCReader(const AliCaloTrackMCReader & g) :   
   AliCaloTrackReader(g), fDecayPi0(g.fDecayPi0), 
@@ -74,7 +74,7 @@ AliCaloTrackMCReader::AliCaloTrackMCReader(const AliCaloTrackMCReader & g) :
 {
   // cpy ctor
 }
-
+*/
 //_________________________________________________________________________
 //AliCaloTrackMCReader & AliCaloTrackMCReader::operator = (const AliCaloTrackMCReader & source)
 //{
index e62ada8..4a418b5 100755 (executable)
@@ -30,12 +30,10 @@ class AliVEvent   ;
 class AliCaloTrackMCReader : public AliCaloTrackReader {
   
  public: 
-  
   AliCaloTrackMCReader() ; // ctor
-  AliCaloTrackMCReader(const AliCaloTrackMCReader & g) ; // cpy ctor
   virtual ~AliCaloTrackMCReader() ;//virtual dtor
-
- private :     
+ private :
+  AliCaloTrackMCReader(const AliCaloTrackMCReader & g) ; // cpy ctor   
   AliCaloTrackMCReader & operator = (const AliCaloTrackMCReader & g) ;//cpy assignment
 
 public:
index 4ea9a64..e861cfc 100755 (executable)
@@ -63,7 +63,7 @@ ClassImp(AliCaloTrackReader)
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //____________________________________________________________________________
 AliCaloTrackReader::AliCaloTrackReader(const AliCaloTrackReader & reader) :   
   TObject(reader), fEventNumber(reader.fEventNumber), fCurrentFileName(reader.fCurrentFileName), 
@@ -97,7 +97,7 @@ AliCaloTrackReader::AliCaloTrackReader(const AliCaloTrackReader & reader) :
 {
   // cpy ctor  
 }
-
+*/
 //_________________________________________________________________________
 //AliCaloTrackReader & AliCaloTrackReader::operator = (const AliCaloTrackReader & source)
 //{
index ff39e2f..aa5aa5f 100755 (executable)
@@ -34,12 +34,10 @@ class AliAODMCHeader;
 class AliCaloTrackReader : public TObject {
 
 public: 
-  
   AliCaloTrackReader() ; // ctor
-  AliCaloTrackReader(const AliCaloTrackReader & g) ; // cpy ctor
   virtual ~AliCaloTrackReader() ;//virtual dtor
-
 private:
+  AliCaloTrackReader(const AliCaloTrackReader & g) ; // cpy ctor
   AliCaloTrackReader & operator = (const AliCaloTrackReader & g) ;//cpy assignment
 
 public:
index d3adaeb..c8adfbb 100755 (executable)
@@ -47,17 +47,17 @@ ClassImp(AliCalorimeterUtils)
     fEMCALGeo(0x0), fPHOSGeo(0x0), 
     fEMCALGeoMatrixSet(kFALSE), fPHOSGeoMatrixSet(kFALSE), 
     fRemoveBadChannels(kFALSE),
-    fEMCALBadChannelMap(new TObjArray()),fPHOSBadChannelMap(new TObjArray()), 
+    fEMCALBadChannelMap(0x0),fPHOSBadChannelMap(0x0), 
     fNCellsFromEMCALBorder(0), fNCellsFromPHOSBorder(0), 
     fNoEMCALBorderAtEta0(kFALSE),fRecalibration(kFALSE),
-    fEMCALRecalibrationFactors(new TObjArray()), fPHOSRecalibrationFactors(new TObjArray())
+    fEMCALRecalibrationFactors(), fPHOSRecalibrationFactors()
 {
   //Ctor
   
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //____________________________________________________________________________
 AliCalorimeterUtils::AliCalorimeterUtils(const AliCalorimeterUtils & calo) :   
   TObject(calo), fDebug(calo.fDebug),
@@ -78,7 +78,7 @@ AliCalorimeterUtils::AliCalorimeterUtils(const AliCalorimeterUtils & calo) :
 {
   // cpy ctor  
 }
-
+*/
 
 //_________________________________
 AliCalorimeterUtils::~AliCalorimeterUtils() {
@@ -97,12 +97,12 @@ AliCalorimeterUtils::~AliCalorimeterUtils() {
   }
        
   if(fEMCALRecalibrationFactors) { 
-         fEMCALRecalibrationFactors->Clear();
-         delete  fEMCALRecalibrationFactors;
+    fEMCALRecalibrationFactors->Clear();
+    delete  fEMCALRecalibrationFactors;
   }
   if(fPHOSRecalibrationFactors) { 
-         fPHOSRecalibrationFactors->Clear();
-         delete  fPHOSRecalibrationFactors;
+    fPHOSRecalibrationFactors->Clear();
+    delete  fPHOSRecalibrationFactors;
   }
        
 }
@@ -290,8 +290,8 @@ Bool_t AliCalorimeterUtils::ClusterContainsBadChannel(TString calorimeter,UShort
        
        if (!fRemoveBadChannels) return kFALSE;
        
-       if(calorimeter == "EMCAL" && !fEMCALBadChannelMap->GetEntries()) return kFALSE;
-       if(calorimeter == "PHOS"  && !fPHOSBadChannelMap ->GetEntries()) return kFALSE;
+       if(calorimeter == "EMCAL" && !fEMCALBadChannelMap) return kFALSE;
+       if(calorimeter == "PHOS"  && !fPHOSBadChannelMap)  return kFALSE;
 
        Int_t icol = -1;
        Int_t irow = -1;
@@ -516,13 +516,19 @@ void AliCalorimeterUtils::InitEMCALBadChannelStatusMap(){
   //In order to avoid rewriting the same histograms
   Bool_t oldStatus = TH1::AddDirectoryStatus();
   TH1::AddDirectory(kFALSE);
-  
-  //for (int i = 0; i < 12; i++) fEMCALBadChannelMap->Add(new TH2I(Form("EMCALBadChannelMap_SM%d_%s",i,fTaskName.Data()),Form("EMCALBadChannelMap_SM%d",i),  48, 0, 48, 24, 0, 24));
-  for (int i = 0; i < 12; i++) fEMCALBadChannelMap->Add(new TH2I(Form("EMCALBadChannelMap_SM%d",i),Form("EMCALBadChannelMap_SM%d",i),  48, 0, 48, 24, 0, 24));
+
+  fEMCALBadChannelMap = new TObjArray(12);
+  //TH2F * hTemp = new  TH2I("EMCALBadChannelMap","EMCAL SuperModule bad channel map", 48, 0, 48, 24, 0, 24);
+  for (int i = 0; i < 12; i++) {
+    fEMCALBadChannelMap->Add(new TH2I(Form("EMCALBadChannelMap_Mod%d",i),Form("EMCALBadChannelMap_Mod%d",i), 48, 0, 48, 24, 0, 24));
+    //fEMCALBadChannelMap->Add((TH2I*)hTemp->Clone(Form("EMCALBadChannelMap_Mod%d",i)));
+  }
+
+  //delete hTemp;
 
   fEMCALBadChannelMap->SetOwner(kTRUE);
   fEMCALBadChannelMap->Compress();
-  
+
   //In order to avoid rewriting the same histograms
   TH1::AddDirectory(oldStatus);                
 }
@@ -534,8 +540,8 @@ void AliCalorimeterUtils::InitPHOSBadChannelStatusMap(){
   //In order to avoid rewriting the same histograms
   Bool_t oldStatus = TH1::AddDirectoryStatus();
   TH1::AddDirectory(kFALSE);
-       
-  //for (int i = 0; i < 5; i++)fPHOSBadChannelMap->Add(new TH2I(Form("PHOSBadChannelMap_Mod%d_%s",i,fTaskName.Data()),Form("PHOSBadChannelMap_Mod%d",i), 56, 0, 56, 64, 0, 64));
+
+  fPHOSBadChannelMap = new TObjArray(5);       
   for (int i = 0; i < 5; i++)fPHOSBadChannelMap->Add(new TH2I(Form("PHOSBadChannelMap_Mod%d",i),Form("PHOSBadChannelMap_Mod%d",i), 56, 0, 56, 64, 0, 64));
 
   fPHOSBadChannelMap->SetOwner(kTRUE);
@@ -552,7 +558,8 @@ void AliCalorimeterUtils::InitEMCALRecalibrationFactors(){
        //In order to avoid rewriting the same histograms
        Bool_t oldStatus = TH1::AddDirectoryStatus();
        TH1::AddDirectory(kFALSE);
-       
+
+       fEMCALRecalibrationFactors = new TObjArray(12);
        for (int i = 0; i < 12; i++) fEMCALRecalibrationFactors->Add(new TH2F(Form("EMCALRecalFactors_SM%d",i),Form("EMCALRecalFactors_SM%d",i),  48, 0, 48, 24, 0, 24));
        //Init the histograms with 1
        for (Int_t sm = 0; sm < 12; sm++) {
@@ -576,6 +583,8 @@ void AliCalorimeterUtils::InitPHOSRecalibrationFactors(){
        //In order to avoid rewriting the same histograms
        Bool_t oldStatus = TH1::AddDirectoryStatus();
        TH1::AddDirectory(kFALSE);
+
+       fPHOSRecalibrationFactors = new TObjArray(5);
        for (int i = 0; i < 5; i++)fPHOSRecalibrationFactors->Add(new TH2F(Form("PHOSRecalFactors_Mod%d",i),Form("PHOSRecalFactors_Mod%d",i), 56, 0, 56, 64, 0, 64));
        //Init the histograms with 1
        for (Int_t m = 0; m < 5; m++) {
index 1616bef..36c1aa4 100755 (executable)
@@ -31,16 +31,14 @@ class AliESDCaloCells;
 
 class AliCalorimeterUtils : public TObject {
 
-public: 
-  
+ public:   
   AliCalorimeterUtils() ; // ctor
-  AliCalorimeterUtils(const AliCalorimeterUtils & g) ; // cpy ctor
   virtual ~AliCalorimeterUtils() ;//virtual dtor
-
-private:
+ private:
+  AliCalorimeterUtils(const AliCalorimeterUtils & g) ; // cpy ctor
   AliCalorimeterUtils & operator = (const AliCalorimeterUtils & g) ;//cpy assignment
 
-public:
+ public:
   
   virtual void InitParameters();
   virtual void Print(const Option_t * opt) const;
@@ -125,18 +123,20 @@ public:
   void InitPHOSRecalibrationFactors () ;
        
   Float_t GetEMCALChannelRecalibrationFactor(Int_t iSM , Int_t iCol, Int_t iRow) const { 
-         if(fEMCALRecalibrationFactors->GetEntriesFast()>0) return (Float_t) ((TH2F*)fEMCALRecalibrationFactors->At(iSM))->GetBinContent(iCol,iRow); 
-         else return 1;}
-       
+    if(fEMCALRecalibrationFactors) return (Float_t) ((TH2F*)fEMCALRecalibrationFactors->At(iSM))->GetBinContent(iCol,iRow); 
+    else return 1;}
+  
   Float_t GetPHOSChannelRecalibrationFactor (Int_t imod, Int_t iCol, Int_t iRow) const { 
-         if(fPHOSRecalibrationFactors->GetEntriesFast()>0)return (Float_t) ((TH2F*)fPHOSRecalibrationFactors->At(imod))->GetBinContent(iCol,iRow); 
-         else return 1;}
-       
+    if(fPHOSRecalibrationFactors)return (Float_t) ((TH2F*)fPHOSRecalibrationFactors->At(imod))->GetBinContent(iCol,iRow); 
+    else return 1;}
+  
   void SetEMCALChannelRecalibrationFactor(Int_t iSM , Int_t iCol, Int_t iRow, Double_t c = 1) { 
-         ((TH2F*)fEMCALRecalibrationFactors->At(iSM))->SetBinContent(iCol,iRow,c);}
+    if(!fEMCALRecalibrationFactors) InitEMCALRecalibrationFactors();
+    ((TH2F*)fEMCALRecalibrationFactors->At(iSM))->SetBinContent(iCol,iRow,c);}
        
   void SetPHOSChannelRecalibrationFactor (Int_t imod, Int_t iCol, Int_t iRow, Double_t c = 1) {
-         ((TH2F*)fPHOSRecalibrationFactors->At(imod))->SetBinContent(iCol,iRow,c);}
+    if(!fPHOSRecalibrationFactors)  InitPHOSRecalibrationFactors();
+    ((TH2F*)fPHOSRecalibrationFactors->At(imod))->SetBinContent(iCol,iRow,c);}
     
   void SetEMCALChannelRecalibrationFactors(Int_t iSM , TH2F* h) {fEMCALRecalibrationFactors->AddAt(h,iSM);}
   void SetPHOSChannelRecalibrationFactors(Int_t imod , TH2F* h) {fPHOSRecalibrationFactors ->AddAt(h,imod);}
index eb09070..c535738 100755 (executable)
@@ -51,7 +51,7 @@ AliFiducialCut::AliFiducialCut() :
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //____________________________________________________________________________
 AliFiducialCut::AliFiducialCut(const AliFiducialCut & g) :   
   TObject(g), 
@@ -101,7 +101,7 @@ AliFiducialCut & AliFiducialCut::operator = (const AliFiducialCut & source)
   return *this;
 
 }
-
+*/
 //_________________________________
 AliFiducialCut::~AliFiducialCut() {
   //Dtor
index 4f898b7..3fa52fd 100755 (executable)
@@ -25,12 +25,15 @@ class TLorentzVector ;
 
 class AliFiducialCut : public TObject {
 
-public: 
-
+ public: 
   AliFiducialCut() ; // ctor
+  virtual ~AliFiducialCut() ;//virtual dtor
+
+ private:
   AliFiducialCut(const AliFiducialCut & g) ; // cpy ctor
   AliFiducialCut & operator = (const AliFiducialCut & g) ;//cpy assignment
-  virtual ~AliFiducialCut() ;//virtual dtor
+  
+ public:
 
   void InitParameters();
   
index bbe845e..e436d03 100755 (executable)
@@ -51,7 +51,7 @@ ClassImp(AliIsolationCut)
   InitParameters();
 
 }
-
+/*
 //____________________________________________________________________________
 AliIsolationCut::AliIsolationCut(const AliIsolationCut & g) : 
   TObject(g),
@@ -79,7 +79,7 @@ AliIsolationCut & AliIsolationCut::operator = (const AliIsolationCut & source)
   return *this;
   
 }
-
+*/
 //____________________________________________________________________________
 TString AliIsolationCut::GetICParametersList()
 {
index 97f36fc..9125211 100755 (executable)
@@ -25,12 +25,14 @@ class AliCaloTrackReader ;
 class AliIsolationCut : public TObject {
   
  public: 
-  
   AliIsolationCut() ; // default ctor
+  virtual ~AliIsolationCut() {;} //virtual dtalr
+ private:
   AliIsolationCut(const AliIsolationCut & g) ; // cpy ctor
   AliIsolationCut & operator = (const AliIsolationCut & g) ;//cpy assignment
-  virtual ~AliIsolationCut() {;} //virtual dtalr
-  
+
+ public: 
   enum type {kPtThresIC, kSumPtIC, kPtFracIC, kSumPtFracIC};
   
   Float_t    GetConeSize()        const {return fConeSize ; }
index 0546c2b..aa2058d 100755 (executable)
@@ -47,7 +47,7 @@
 {
   //Ctor
 }
-
+/*
 //____________________________________________________________________________
 AliMCAnalysisUtils::AliMCAnalysisUtils(const AliMCAnalysisUtils & mcutils) :   
   TObject(mcutils), fCurrentEvent(mcutils.fCurrentEvent), fDebug(mcutils.fDebug),
@@ -56,6 +56,7 @@ AliMCAnalysisUtils::AliMCAnalysisUtils(const AliMCAnalysisUtils & mcutils) :
   // cpy ctor
   
 }
+*/
 
 //_________________________________________________________________________
 //AliMCAnalysisUtils & AliMCAnalysisUtils::operator = (const AliMCAnalysisUtils & mcutils)
index 70bbfa7..a634ff1 100755 (executable)
@@ -24,16 +24,14 @@ class AliStack ;
 
 class AliMCAnalysisUtils : public TObject {
        
-public: 
-       
-       AliMCAnalysisUtils() ; // ctor
-       AliMCAnalysisUtils(const AliMCAnalysisUtils & mcu) ; // cpy ctor
-       virtual ~AliMCAnalysisUtils() ;//virtual dtor
-
-private:
-       AliMCAnalysisUtils & operator = (const AliMCAnalysisUtils & ) ;//cpy assignment
+ public: 
+  AliMCAnalysisUtils() ; // ctor
+  virtual ~AliMCAnalysisUtils() ;//virtual dtor
+ private:
+  AliMCAnalysisUtils & operator = (const AliMCAnalysisUtils & ) ;//cpy assignment
+  AliMCAnalysisUtils(const AliMCAnalysisUtils & mcu) ; // cpy ctor
 
-public:
+ public:
        //"Mostly" photon parent types on line 1,
        //                                                  
        //then "mostly" electron parent types on line 2, (e.g. electrons can
index 584b476..039576b 100755 (executable)
@@ -56,7 +56,7 @@ ClassImp(AliNeutralMesonSelection)
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //____________________________________________________________________________
 AliNeutralMesonSelection::AliNeutralMesonSelection(const AliNeutralMesonSelection & g) :   
   TObject(), fM(g.fM),
@@ -106,7 +106,7 @@ AliNeutralMesonSelection & AliNeutralMesonSelection::operator = (const AliNeutra
   return *this;
   
 }
-
+*/
 //____________________________________________________________________________
 AliNeutralMesonSelection::~AliNeutralMesonSelection() 
 {
index fbb8b43..598f1b5 100755 (executable)
@@ -24,12 +24,14 @@ class TH2F ;
 class AliNeutralMesonSelection : public TObject {
   
  public: 
-  
   AliNeutralMesonSelection() ; // default ctor
+  virtual ~AliNeutralMesonSelection() ; //virtual dtor  
+ private:
   AliNeutralMesonSelection(const AliNeutralMesonSelection & g) ; // cpy ctor
   AliNeutralMesonSelection & operator = (const AliNeutralMesonSelection & g) ;//cpy assignment
-  virtual ~AliNeutralMesonSelection() ; //virtual dtor
   
+ public:
+
   TList * GetCreateOutputObjects();
   
   Double_t GetAngleMaxParam(Int_t i) const {return fAngleMaxParam.At(i) ; }
index 16eaad3..3601be9 100755 (executable)
@@ -72,14 +72,14 @@ ClassImp(AliAnaCalorimeterQA)
     fHistoXBins(100),          fHistoXMax(1000),           fHistoXMin(-1000),
     fHistoYBins(100),          fHistoYMax(1000),           fHistoYMin(-1000),
     fHistoZBins(100),          fHistoZMax(1000),           fHistoZMin(-1000),
-       fHistoSSBins(40),          fHistoSSMax(10),            fHistoSSMin(0),
+    fHistoSSBins(40),          fHistoSSMax(10),            fHistoSSMin(0),
     fhE(0),fhPt(0),fhPhi(0),fhEta(0),   fhEtaPhiE(0),
     fhECharged(0),fhPtCharged(0),fhPhiCharged(0),fhEtaCharged(0), fhEtaPhiECharged(0), 
     //fhEChargedNoOut(0),fhPtChargedNoOut(0),fhPhiChargedNoOut(0),fhEtaChargedNoOut(0), fhEtaPhiChargedNoOut(0), 
     fhDeltaE(0), fhDeltaPt(0),fhDeltaPhi(0),fhDeltaEta(0), fhRatioE(0), fhRatioPt(0),fhRatioPhi(0),fhRatioEta(0),
     fh2E(0),fh2Pt(0),fh2Phi(0),fh2Eta(0),
-       fhLambda(0), fhDispersion(0), 
-       fhIM(0), fhIMCellCut(0),fhAsym(0), 
+    fhLambda(0), fhDispersion(0), 
+    fhIM(0), fhIMCellCut(0),fhAsym(0), 
     fhNCellsPerCluster(0),fhNCellsPerClusterMIP(0), fhNCellsPerClusterMIPCharged(0), fhNClusters(0), 
     fhClusterTimeEnergy(0),fhCellTimeSpreadRespectToCellMax(0),fhCellIdCellLargeTimeSpread(0),
     fhRNCells(0),fhXNCells(0),fhYNCells(0),fhZNCells(0),
@@ -88,7 +88,7 @@ ClassImp(AliAnaCalorimeterQA)
     fhDeltaCellClusterRNCells(0),fhDeltaCellClusterXNCells(0),fhDeltaCellClusterYNCells(0),fhDeltaCellClusterZNCells(0),
     fhDeltaCellClusterRE(0),     fhDeltaCellClusterXE(0),     fhDeltaCellClusterYE(0),     fhDeltaCellClusterZE(0),
     fhNCells(0), fhAmplitude(0), fhAmpId(0), fhEtaPhiAmp(0), 
-       fhTime(0), fhTimeId(0), fhTimeAmp(0), //fhT0Time(0), fhT0TimeId(0), fhT0TimeAmp(0), 
+    fhTime(0), fhTimeId(0), fhTimeAmp(0), //fhT0Time(0), fhT0TimeId(0), fhT0TimeAmp(0), 
     fhCaloCorrNClusters(0), fhCaloCorrEClusters(0), fhCaloCorrNCells(0), fhCaloCorrECells(0),
     fhEMod(0), fhNClustersMod(0), fhNCellsPerClusterMod(0), fhNCellsMod(0),  
     fhGridCellsMod(0), fhGridCellsEMod(0), fhGridCellsTimeMod(0), 
@@ -122,7 +122,7 @@ ClassImp(AliAnaCalorimeterQA)
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //____________________________________________________________________________
 AliAnaCalorimeterQA::AliAnaCalorimeterQA(const AliAnaCalorimeterQA & qa) :   
   AliAnaPartCorrBaseClass(qa), fCalorimeter(qa.fCalorimeter), fStyleMacro(qa.fStyleMacro), 
@@ -202,7 +202,7 @@ AliAnaCalorimeterQA::AliAnaCalorimeterQA(const AliAnaCalorimeterQA & qa) :
   // cpy ctor
   
 }
-
+*/
 //________________________________________________________________________________________________________________________________________________
 //AliAnaCalorimeterQA::~AliAnaCalorimeterQA() {
        // dtor
@@ -320,25 +320,25 @@ TList *  AliAnaCalorimeterQA::GetCreateOutputObjects()
        outputContainer->Add(fhEtaPhiECharged); 
 
 
-//     fhEChargedNoOut  = new TH1F ("hEChargedNoOut","E reconstructed clusters, matched with track, no output track params", nptbins,ptmin,ptmax);                                                      \
-//     fhEChargedNoOut->SetXTitle("E (GeV)");                                                                                                                                                           \
-//     outputContainer->Add(fhEChargedNoOut);                                                                                                                                                           \
-//                                                                                                                                                                                                      \
-//     fhPtChargedNoOut  = new TH1F ("hPtChargedNoOut","p_{T} reconstructed clusters, matched with track, no output track params", nptbins,ptmin,ptmax);                                                \
-//     fhPtChargedNoOut->SetXTitle("p_{T} (GeV/c)");                                                                                                                                                    \
-//     outputContainer->Add(fhPtChargedNoOut);                                                                                                                                                          \
-//                                                                                                                                                                                                      \
-//     fhPhiChargedNoOut  = new TH1F ("hPhiChargedNoOut","#phi reconstructed clusters, matched with track, no output track params",nphibins,phimin,phimax);                                             \
-//     fhPhiChargedNoOut->SetXTitle("#phi (rad)");                                                                                                                                                      \
-//     outputContainer->Add(fhPhiChargedNoOut);                                                                                                                                                         \
-//                                                                                                                                                                                                      \
-//     fhEtaChargedNoOut  = new TH1F ("hEtaChargedNoOut","#eta reconstructed clusters, matched with track, no output track params",netabins,etamin,etamax);                                             \
-//     fhEtaChargedNoOut->SetXTitle("#eta ");                                                                                                                                                           \
-//     outputContainer->Add(fhEtaChargedNoOut);                                                                                                                                                         \
-//                                                                                                                                                                                                      \
-//     fhEtaPhiChargedNoOut  = new TH2F ("hEtaPhiChargedNoOut","#eta vs #phi, reconstructed clusters, matched with track, no output track params",netabins,etamin,etamax,nphibins,phimin,phimax);       \
-//     fhEtaPhiChargedNoOut->SetXTitle("#eta ");                                                                                                                                                        \
-//     fhEtaPhiChargedNoOut->SetYTitle("#phi ");                                                                                                                                                        \
+//     fhEChargedNoOut  = new TH1F ("hEChargedNoOut","E reconstructed clusters, matched with track, no output track params", nptbins,ptmin,ptmax);                                     
+//     fhEChargedNoOut->SetXTitle("E (GeV)");                                                                                                                                          
+//     outputContainer->Add(fhEChargedNoOut);                                                                                                                                         
+//                                                                                                                                                                     
+//     fhPtChargedNoOut  = new TH1F ("hPtChargedNoOut","p_{T} reconstructed clusters, matched with track, no output track params", nptbins,ptmin,ptmax);                               
+//     fhPtChargedNoOut->SetXTitle("p_{T} (GeV/c)");                                                                                                                               
+//     outputContainer->Add(fhPtChargedNoOut);                                                                                                                                       
+//                                                                                                                                                                             
+//     fhPhiChargedNoOut  = new TH1F ("hPhiChargedNoOut","#phi reconstructed clusters, matched with track, no output track params",nphibins,phimin,phimax);                    
+//     fhPhiChargedNoOut->SetXTitle("#phi (rad)");                                                                                                                               
+//     outputContainer->Add(fhPhiChargedNoOut);                                                                                                                        
+//                                                                                                                                                                       
+//     fhEtaChargedNoOut  = new TH1F ("hEtaChargedNoOut","#eta reconstructed clusters, matched with track, no output track params",netabins,etamin,etamax);               
+//     fhEtaChargedNoOut->SetXTitle("#eta ");                                                                                                                           
+//     outputContainer->Add(fhEtaChargedNoOut);                                                                                                                             
+//                                                                                                                                                                           
+//     fhEtaPhiChargedNoOut  = new TH2F ("hEtaPhiChargedNoOut","#eta vs #phi, reconstructed clusters, matched with track, no output track params",netabins,etamin,etamax,nphibins,phimin,phimax); 
+//     fhEtaPhiChargedNoOut->SetXTitle("#eta ");                                                                                                    
+//     fhEtaPhiChargedNoOut->SetYTitle("#phi ");                                                                                                                       
 //     outputContainer->Add(fhEtaPhiChargedNoOut);     
 
        fh1pOverE = new TH2F("h1pOverE","TRACK matches p/E",nptbins,ptmin,ptmax, nPoverEbins,pOverEmin,pOverEmax);
index 6a92da3..769f437 100755 (executable)
@@ -24,15 +24,13 @@ class AliAODCaloCluster;
 class AliAnaCalorimeterQA : public AliAnaPartCorrBaseClass {
   
  public: 
-  
-  AliAnaCalorimeterQA() ; // default ctor
-  AliAnaCalorimeterQA(const AliAnaCalorimeterQA & g) ; // cpy ctor
-       
-private:
+  AliAnaCalorimeterQA() ; // default ctor      
+  virtual ~AliAnaCalorimeterQA() {;} //virtual dtor
+ private:
   AliAnaCalorimeterQA & operator = (const AliAnaCalorimeterQA & g) ;//cpy assignment
-       
+  AliAnaCalorimeterQA(const AliAnaCalorimeterQA & g) ; // cpy ctor
+  
 public:
-  virtual ~AliAnaCalorimeterQA() {;} //virtual dtor
   
   void ClusterHistograms(const TLorentzVector mom, const Double_t tof, Float_t *pos, Float_t * showerShape, 
                                                 const Int_t nCaloCellsPerCluster, const Int_t nModule,
index ab47b9a..324bc7e 100755 (executable)
@@ -55,6 +55,7 @@ ClassImp(AliAnaChargedParticles)
   InitParameters();
 }
 
+/*
 //____________________________________________________________________________
 AliAnaChargedParticles::AliAnaChargedParticles(const AliAnaChargedParticles & ch) :   
   AliAnaPartCorrBaseClass(ch), fPdg(ch.fPdg),  fhPt(ch.fhPt),  fhPhi(ch.fhPhi),fhEta(ch.fhEta), 
@@ -91,6 +92,7 @@ AliAnaChargedParticles & AliAnaChargedParticles::operator = (const AliAnaCharged
   return *this;
   
 }
+*/
 
 //________________________________________________________________________
 TList *  AliAnaChargedParticles::GetCreateOutputObjects()
index 5251baf..a0e61a9 100755 (executable)
@@ -22,12 +22,14 @@ class TH2F;
 class AliAnaChargedParticles : public AliAnaPartCorrBaseClass {
   
  public: 
-  
   AliAnaChargedParticles() ; // default ctor
+  virtual ~AliAnaChargedParticles() {;} //virtual dtor
+ private:  
   AliAnaChargedParticles(const AliAnaChargedParticles & g) ; // cpy ctor
   AliAnaChargedParticles & operator = (const AliAnaChargedParticles & g) ;//cpy assignment
-  virtual ~AliAnaChargedParticles() {;} //virtual dtor
-  
+
+ public:
+
   TList * GetCreateOutputObjects();
   
   void Init();
index 9d1e312..6c198da 100755 (executable)
@@ -107,7 +107,7 @@ AliAnaElectron::AliAnaElectron()
   InitParameters();\r
 \r
 }\r
-\r
+/*\r
 //____________________________________________________________________________\r
 AliAnaElectron::AliAnaElectron(const AliAnaElectron & g) \r
   : AliAnaPartCorrBaseClass(g),fCalorimeter(g.fCalorimeter),\r
@@ -295,6 +295,7 @@ AliAnaElectron & AliAnaElectron::operator = (const AliAnaElectron & g)
   return *this;\r
   \r
 }\r
+*/\r
 \r
 //____________________________________________________________________________\r
 AliAnaElectron::~AliAnaElectron() \r
index 8a87d0d..0cdebef 100755 (executable)
@@ -29,12 +29,14 @@ class TList ;
 \r
 class AliAnaElectron : public AliAnaPartCorrBaseClass {\r
 \r
-public: \r
-\r
+ public: \r
   AliAnaElectron() ; // default ctor\r
+  virtual ~AliAnaElectron() ; //virtual dtor\r
+ private:\r
   AliAnaElectron(const AliAnaElectron & g) ; // cpy ctor\r
   AliAnaElectron & operator = (const AliAnaElectron & g) ;//cpy assignment\r
-  virtual ~AliAnaElectron() ; //virtual dtor\r
+  \r
+ public:\r
 \r
   TList *  GetCreateOutputObjects();\r
 \r
index f25e5f2..56068bb 100755 (executable)
@@ -59,7 +59,7 @@ ClassImp(AliAnaExample)
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //____________________________________________________________________________
 AliAnaExample::AliAnaExample(const AliAnaExample & ex) :   
   AliAnaPartCorrBaseClass(ex), fPdg(ex.fPdg), fDetector(ex.fDetector), fhPt(ex.fhPt),  fhPhi(ex.fhPhi),fhEta(ex.fhEta), 
@@ -91,7 +91,7 @@ AliAnaExample & AliAnaExample::operator = (const AliAnaExample & ex)
   return *this;
 
 }
-
+*/
 // //____________________________________________________________________________
 // AliAnaExample::~AliAnaExample() 
 // {
index 34ee7c8..6d9797c 100755 (executable)
@@ -23,12 +23,15 @@ class TH1F;
  
 class AliAnaExample : public AliAnaPartCorrBaseClass {
   
- public: 
-  
+ public:   
   AliAnaExample() ; // default ctor
+  virtual ~AliAnaExample() {;} //virtual dtor
+  
+ private :
   AliAnaExample(const AliAnaExample & g) ; // cpy ctor
   AliAnaExample & operator = (const AliAnaExample & g) ;//cpy assignment
-  virtual ~AliAnaExample() {;} //virtual dtor
+  
+ public:
   
   TList * GetCreateOutputObjects();
   
index 4a9941b..8d309a6 100644 (file)
@@ -59,7 +59,7 @@ fhOmegaPriPt(0)
  //Default Ctor\r
  InitParameters();\r
 }\r
-\r
+/*\r
 //______________________________________________________________________________\r
 AliAnaOmegaToPi0Gamma::AliAnaOmegaToPi0Gamma(const AliAnaOmegaToPi0Gamma & ex) : AliAnaPartCorrBaseClass(ex),\r
 fInputAODPi0(new TClonesArray (*ex.fInputAODPi0)),\r
@@ -85,6 +85,7 @@ fhOmegaPriPt(ex.fhOmegaPriPt)
  // cpy ctor\r
  //Do not need it\r
 }\r
+*/\r
 /*\r
 //______________________________________________________________________________\r
 AliAnaOmegaToPi0Gamma & AliAnaOmegaToPi0Gamma::operator = (const AliAnaOmegaToPi0Gamma & ex)\r
index 6572da1..a27e443 100755 (executable)
@@ -74,7 +74,7 @@ ClassImp(AliAnaParticleHadronCorrelation)
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //____________________________________________________________________________
 AliAnaParticleHadronCorrelation::AliAnaParticleHadronCorrelation(const AliAnaParticleHadronCorrelation & g):   
   AliAnaPartCorrBaseClass(g),
@@ -165,7 +165,7 @@ AliAnaParticleHadronCorrelation & AliAnaParticleHadronCorrelation::operator = (c
   return *this;
 
 }
-
+*/
 //________________________________________________________________________
 TList *  AliAnaParticleHadronCorrelation::GetCreateOutputObjects()
 {  
index 0c1545d..999d800 100755 (executable)
@@ -23,12 +23,14 @@ class AliAODPWG4ParticleCorrelation ;
 class AliAnaParticleHadronCorrelation : public AliAnaPartCorrBaseClass {
   
  public: 
-  
   AliAnaParticleHadronCorrelation() ; // default ctor
+  virtual ~AliAnaParticleHadronCorrelation() {;} //virtual dtor
+ private:  
   AliAnaParticleHadronCorrelation(const AliAnaParticleHadronCorrelation & ph) ; // cpy ctor
   AliAnaParticleHadronCorrelation & operator = (const AliAnaParticleHadronCorrelation & ph) ;//cpy assignment
-  virtual ~AliAnaParticleHadronCorrelation() {;} //virtual dtor
-  
+
+ public:
+
   TList * GetCreateOutputObjects();
   
   Double_t GetDeltaPhiMaxCut() const {return fDeltaPhiMaxCut ; }
index 5aa4ffb..d20ad4b 100755 (executable)
@@ -113,7 +113,7 @@ ClassImp(AliAnaParticleIsolation)
 
 
 }
-
+/*
 //____________________________________________________________________________
 AliAnaParticleIsolation::AliAnaParticleIsolation(const AliAnaParticleIsolation & g) : 
   AliAnaPartCorrBaseClass(g), fCalorimeter(g.fCalorimeter),
@@ -272,6 +272,7 @@ AliAnaParticleIsolation & AliAnaParticleIsolation::operator = (const AliAnaParti
   return *this;
   
 }
+*/
 
 //____________________________________________________________________________
 AliAnaParticleIsolation::~AliAnaParticleIsolation() 
index 558c2d4..d481e22 100755 (executable)
@@ -26,13 +26,16 @@ class AliAODPWG4ParticleCorrelation ;
 
 class AliAnaParticleIsolation : public AliAnaPartCorrBaseClass {
 
-public: 
-       
+ public:   
   AliAnaParticleIsolation() ; // default ctor
+  virtual ~AliAnaParticleIsolation() ; //virtual dtor
+
+ private:
   AliAnaParticleIsolation(const AliAnaParticleIsolation & g) ; // cpy ctor
   AliAnaParticleIsolation & operator = (const AliAnaParticleIsolation & g) ;//cpy assignment
-  virtual ~AliAnaParticleIsolation() ; //virtual dtor
-  
+
+ public:
+
   Bool_t CheckInvMass(const Int_t icalo,const AliAODPWG4Particle * ph) const ;
   
   TList *  GetCreateOutputObjects();
index 178b2fe..ac1c368 100755 (executable)
@@ -51,7 +51,7 @@ ClassImp(AliAnaParticleJetFinderCorrelation)
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //____________________________________________________________________________
 AliAnaParticleJetFinderCorrelation::AliAnaParticleJetFinderCorrelation(const AliAnaParticleJetFinderCorrelation & pjf) :   
   AliAnaPartCorrBaseClass(pjf),  
@@ -102,7 +102,7 @@ AliAnaParticleJetFinderCorrelation & AliAnaParticleJetFinderCorrelation::operato
   return *this;
   
 }
-
+*/
 //____________________________________________________________________________
 //AliAnaParticleJetFinderCorrelation::~AliAnaParticleJetFinderCorrelation() 
 //{
index 963d33d..4c2eb78 100755 (executable)
@@ -21,13 +21,15 @@ class TH2F;
 
 class AliAnaParticleJetFinderCorrelation : public AliAnaPartCorrBaseClass {
        
- public: 
-  
+ public:   
   AliAnaParticleJetFinderCorrelation() ; // default ctor
+  virtual ~AliAnaParticleJetFinderCorrelation() {;} //virtual dtor
+ private:
   AliAnaParticleJetFinderCorrelation(const AliAnaParticleJetFinderCorrelation & g) ; // cpy ctor
   AliAnaParticleJetFinderCorrelation & operator = (const AliAnaParticleJetFinderCorrelation & g) ;//cpy assignment
-  virtual ~AliAnaParticleJetFinderCorrelation() {;} //virtual dtor
-  
+
+ public:
+
   TList * GetCreateOutputObjects();
   
   Bool_t OnlyIsolated() const {return fSelectIsolated ; }
index fbac757..599522b 100755 (executable)
@@ -17,7 +17,7 @@
 //_________________________________________________________________________
 // Class that contains the algorithm for the reconstruction of jet, cone around leading particle
 // The seed is a backward particle (direct photon)
-// 1)Take the trigger particle stored in AliAODPWG4ParticleCorrelation,
+// 1) Take the trigger particle stored in AliAODPWG4ParticleCorrelation,
 // 2) Search for the highest pt leading particle opposite to the photon within a phi, pt window
 // 3) Take all particles around leading in a cone R with pt larger than threshold and construct the jet
 //
@@ -70,8 +70,8 @@ ClassImp(AliAnaParticleJetLeadingConeCorrelation)
     fhNeutralLeadingPt(0),fhNeutralLeadingPhi(0),fhNeutralLeadingEta(0),
     fhNeutralLeadingDeltaPt(0),fhNeutralLeadingDeltaPhi(0),fhNeutralLeadingDeltaEta(0),
     fhNeutralLeadingRatioPt(0),fhChargedLeadingXi(0), fhNeutralLeadingXi(0),
-       fhChargedLeadingDeltaPhiRatioPt30(0), fhNeutralLeadingDeltaPhiRatioPt30(0),
-       fhChargedLeadingDeltaPhiRatioPt50(0), fhNeutralLeadingDeltaPhiRatioPt50(0),
+    fhChargedLeadingDeltaPhiRatioPt30(0), fhNeutralLeadingDeltaPhiRatioPt30(0),
+    fhChargedLeadingDeltaPhiRatioPt50(0), fhNeutralLeadingDeltaPhiRatioPt50(0),
     //Jet
     fhJetPt(0),fhJetRatioPt(0),fhJetDeltaPhi(0), fhJetDeltaEta(0),
     fhJetLeadingRatioPt(0),fhJetLeadingDeltaPhi(0),fhJetLeadingDeltaEta(0),
@@ -141,7 +141,7 @@ ClassImp(AliAnaParticleJetLeadingConeCorrelation)
   InitParameters();
 
 }
-
+/*
 //____________________________________________________________________________
 AliAnaParticleJetLeadingConeCorrelation::AliAnaParticleJetLeadingConeCorrelation(const AliAnaParticleJetLeadingConeCorrelation & jetlc) :   
   AliAnaPartCorrBaseClass(jetlc), fJetsOnlyInCTS(jetlc.fJetsOnlyInCTS), fPbPb(jetlc.fPbPb), 
@@ -350,7 +350,7 @@ AliAnaParticleJetLeadingConeCorrelation & AliAnaParticleJetLeadingConeCorrelatio
   return *this;
 
 }
-
+*/
 //____________________________________________________________________________
 AliAnaParticleJetLeadingConeCorrelation::~AliAnaParticleJetLeadingConeCorrelation() 
 {
index f5547a3..33f8db5 100755 (executable)
@@ -7,7 +7,7 @@
 //_________________________________________________________________________
 // Class that contains the algorithm for the reconstruction of jet, cone around leading particle
 // The seed is a backward particle (direct photon)
-// 1)Take the a trigger particle found stored in AliAODPWG4ParticleCorrelation,
+// 1) Take the a trigger particle found stored in AliAODPWG4ParticleCorrelation,
 // 2) Search for the highest pt leading particle opposite to the trigger within a phi, pt window
 // 3) Take all particles around leading in a cone R with pt larger than threshold and construct the jet
 //
@@ -30,12 +30,14 @@ class AliNeutralMesonSelection;
 class AliAnaParticleJetLeadingConeCorrelation : public AliAnaPartCorrBaseClass {
 
 public: 
-  
   AliAnaParticleJetLeadingConeCorrelation() ; // default ctor
+  virtual ~AliAnaParticleJetLeadingConeCorrelation() ; //virtual dtor
+ private:
   AliAnaParticleJetLeadingConeCorrelation(const AliAnaParticleJetLeadingConeCorrelation & g) ; // cpy ctor
   AliAnaParticleJetLeadingConeCorrelation & operator = (const AliAnaParticleJetLeadingConeCorrelation & g) ;//cpy assignment
-  virtual ~AliAnaParticleJetLeadingConeCorrelation() ; //virtual dtor
-  
+
+ public:
+
   TList * GetCreateOutputObjects();
 
   void InitParameters();
index 669427f..a806579 100755 (executable)
@@ -47,7 +47,7 @@
   //Initialize parameters
   InitParameters();
 }
-
+/*
 //____________________________________________________________________________
 AliAnaParticlePartonCorrelation::AliAnaParticlePartonCorrelation(const AliAnaParticlePartonCorrelation & g) :   
   AliAnaPartCorrBaseClass(g),   
@@ -80,7 +80,7 @@ AliAnaParticlePartonCorrelation & AliAnaParticlePartonCorrelation::operator = (c
   return *this;
 
 }
-
+*/
 
 //________________________________________________________________________
 TList *  AliAnaParticlePartonCorrelation::GetCreateOutputObjects()
index 57e1a5e..098c6d8 100755 (executable)
@@ -17,13 +17,15 @@ class TH2F ;
 
 class AliAnaParticlePartonCorrelation : public AliAnaPartCorrBaseClass {
        
-  public: 
-       
-       AliAnaParticlePartonCorrelation() ; // default ctor
-       AliAnaParticlePartonCorrelation(const AliAnaParticlePartonCorrelation & g) ; // cpy ctor
-       AliAnaParticlePartonCorrelation & operator = (const AliAnaParticlePartonCorrelation & g) ;//cpy assignment
-       virtual ~AliAnaParticlePartonCorrelation() {;} //virtual dtor
-              
+ public:
+  AliAnaParticlePartonCorrelation() ; // default ctor
+  virtual ~AliAnaParticlePartonCorrelation() {;} //virtual dtor              
+ private:
+  AliAnaParticlePartonCorrelation(const AliAnaParticlePartonCorrelation & g) ; // cpy ctor
+  AliAnaParticlePartonCorrelation & operator = (const AliAnaParticlePartonCorrelation & g) ;//cpy assignment
+
+ public:
+
        TList * GetCreateOutputObjects();
        
        void InitParameters();
index 30d46fe..e172e95 100755 (executable)
@@ -67,7 +67,7 @@ ClassImp(AliAnaPhoton)
   InitParameters();
 
 }
-
+/*
 //____________________________________________________________________________
 AliAnaPhoton::AliAnaPhoton(const AliAnaPhoton & g) : 
   AliAnaPartCorrBaseClass(g), fCalorimeter(g.fCalorimeter),
@@ -154,7 +154,7 @@ AliAnaPhoton & AliAnaPhoton::operator = (const AliAnaPhoton & g)
   return *this;
   
 }
-
+*/
 //____________________________________________________________________________
 AliAnaPhoton::~AliAnaPhoton() 
 {
@@ -563,7 +563,7 @@ void  AliAnaPhoton::MakeAnalysisFillAOD()
     //Check origin of the candidates
     if(IsDataMC()){
                
-      aodph.SetTag(GetMCAnalysisUtils()->CheckOrigin(calo->GetLabel(0),GetReader(), aodph.GetInputFileIndex()));
+      aodph.SetTag(GetMCAnalysisUtils()->CheckOrigin(calo->GetLabels(),calo->GetNLabel(),GetReader(), aodph.GetInputFileIndex()));
       if(GetDebug() > 0) printf("AliAnaPhoton::MakeAnalysisFillAOD() - Origin of candidate, bit map %d\n",aodph.GetTag());
     }//Work with stack also   
     
index 91280ac..69f5a82 100755 (executable)
@@ -29,13 +29,15 @@ class TList ;
 
 class AliAnaPhoton : public AliAnaPartCorrBaseClass {
 
-public: 
-
+ public: 
   AliAnaPhoton() ; // default ctor
+  virtual ~AliAnaPhoton() ; //virtual dtor
+ private:
   AliAnaPhoton(const AliAnaPhoton & g) ; // cpy ctor
   AliAnaPhoton & operator = (const AliAnaPhoton & g) ;//cpy assignment
-  virtual ~AliAnaPhoton() ; //virtual dtor
-  
+
+ public:
+
   TList *  GetCreateOutputObjects();
 
   void Init();
index c65bb2e..71cbdec 100755 (executable)
@@ -64,7 +64,7 @@ fhPrimOpeningAngle(0x0),fhPrimCosOpeningAngle(0x0)
  InitParameters();
  
 }
-
+/*
 //________________________________________________________________________________________________________________________________________________
 AliAnaPi0::AliAnaPi0(const AliAnaPi0 & ex) : AliAnaPartCorrBaseClass(ex),  
 fNCentrBin(ex.fNCentrBin),fNZvertBin(ex.fNZvertBin),fNrpBin(ex.fNrpBin),
@@ -80,6 +80,7 @@ fhPrimOpeningAngle(ex.fhPrimOpeningAngle),fhPrimCosOpeningAngle(ex.fhPrimCosOpen
   // cpy ctor
   //Do not need it
 }
+*/
 //
 ////________________________________________________________________________________________________________________________________________________
 //AliAnaPi0 & AliAnaPi0::operator = (const AliAnaPi0 & ex)
index 98c7999..f0187cb 100755 (executable)
@@ -24,16 +24,15 @@ class AliESDEvent ;
 
 class AliAnaPi0 : public AliAnaPartCorrBaseClass {
   
-public:   
+ public:   
   AliAnaPi0() ; // default ctor
-  AliAnaPi0(const char *name) ; // default ctor
-  AliAnaPi0(const AliAnaPi0 & g) ; // cpy ctor
   virtual ~AliAnaPi0() ;//virtual dtor
-
-private:
+ private:
+  AliAnaPi0(const AliAnaPi0 & g) ; // cpy ctor
   AliAnaPi0 & operator = (const AliAnaPi0 & api0) ;//cpy assignment
   
-public:
+ public:
+
   TList * GetCreateOutputObjects(); 
   
   void Print(const Option_t * opt) const;
index 388f1dc..e4ea015 100755 (executable)
@@ -63,7 +63,7 @@ fhPtMCPi0(0),fhPhiMCPi0(0),fhEtaMCPi0(0)
   InitParameters();
   
 }
-
+/*
 //____________________________________________________________________________
 AliAnaPi0EbE::AliAnaPi0EbE(const AliAnaPi0EbE & p) : 
 AliAnaPartCorrBaseClass(p),  fAnaType(p.fAnaType), fCalorimeter(p.fCalorimeter),
@@ -100,7 +100,7 @@ AliAnaPi0EbE & AliAnaPi0EbE::operator = (const AliAnaPi0EbE & p)
   return *this;
   
 }
-
+*/
 //____________________________________________________________________________
 AliAnaPi0EbE::~AliAnaPi0EbE() 
 {
index 09b486f..18b4622 100755 (executable)
@@ -26,12 +26,14 @@ class TList ;
 class AliAnaPi0EbE : public AliAnaPartCorrBaseClass {
 
  public: 
-  
   AliAnaPi0EbE() ; // default ctor
+  virtual ~AliAnaPi0EbE() ; //virtual dtor
+ private:
   AliAnaPi0EbE(const AliAnaPi0EbE & g) ; // cpy ctor
   AliAnaPi0EbE & operator = (const AliAnaPi0EbE & g) ;//cpy assignment
-  virtual ~AliAnaPi0EbE() ; //virtual dtor
-  
+
+ public:  
+
   enum anaTypes {kIMCalo, kSSCalo, kIMCaloTracks};
   
   TList *  GetCreateOutputObjects();
index 106ba79..eead6d5 100644 (file)
@@ -170,7 +170,7 @@ AliAnalysisTaskParticleCorrelation *AddTaskCalorimeterQA(TString data, Bool_t kP
   maker->SetCaloUtils(cu); //pointer to calorimeter utils
   maker->AddAnalysis(emcalQA,0);
   maker->AddAnalysis(phosQA,1);
-  maker->SetAnaDebug(0)  ; // 0 to at least print the event number
+  maker->SetAnaDebug(-1)  ; // 0 to at least print the event number
   maker->SwitchOnHistogramsMaker()  ;
   maker->SwitchOffAODsMaker()  ;
   if(kPrintSettings) maker->Print("");