correct copy and = constructor call to data member pointers

diff --git a/PWG4/PartCorrBase/AliAnaPartCorrBaseClass.cxx b/PWG4/PartCorrBase/AliAnaPartCorrBaseClass.cxx
index 24f9cd8d460370a228c6f38f48a216f5b79e11f5..52eda529c3cc69b730d8152a47b105de02479b10 100755 (executable)
--- a/PWG4/PartCorrBase/AliAnaPartCorrBaseClass.cxx
+++ b/PWG4/PartCorrBase/AliAnaPartCorrBaseClass.cxx
@@ -76,7 +76,8 @@ AliAnaPartCorrBaseClass::AliAnaPartCorrBaseClass(const AliAnaPartCorrBaseClass &
   fAddToHistogramsName(abc.fAddToHistogramsName),
   //fAODCaloClusters(new TClonesArray(*abc.fAODCaloClusters)),
   fAODCaloCells(new AliAODCaloCells(*abc.fAODCaloCells)),
-  fCaloPID(abc.fCaloPID), fFidCut(abc.fFidCut), fIC(abc.fIC),fMCUtils(abc.fMCUtils), fNMS(abc.fNMS),
+  fCaloPID(new AliCaloPID(*abc.fCaloPID)), fFidCut(new AliFiducialCut(*abc.fFidCut)), fIC(new AliIsolationCut(*abc.fIC)),
+  fMCUtils(new AliMCAnalysisUtils(*abc.fMCUtils)), fNMS(new AliNeutralMesonSelection(*abc.fNMS)),
   //fAnaOutContainer(abc.fAnaOutContainer),
   fHistoPtBins(abc.fHistoPtBins),     fHistoPtMax(abc.fHistoPtMax),     fHistoPtMin(abc.fHistoPtMin),
   fHistoPhiBins(abc.fHistoPhiBins),   fHistoPhiMax(abc.fHistoPhiMax),   fHistoPhiMin(abc.fHistoPhiMin),
@@ -85,7 +86,7 @@ AliAnaPartCorrBaseClass::AliAnaPartCorrBaseClass(const AliAnaPartCorrBaseClass &
   fHistoAsymBins(abc.fHistoAsymBins), fHistoAsymMax(abc.fHistoAsymMax), fHistoAsymMin(abc.fHistoAsymMin)
 {
   // cpy ctor
-  
+
 }
 
 //_________________________________________________________________________
@@ -103,22 +104,23 @@ AliAnaPartCorrBaseClass & AliAnaPartCorrBaseClass::operator = (const AliAnaPartC
   fCheckFidCut        = abc.fCheckFidCut ; 
        
   fReader             = abc.fReader ;
-  //fAODCaloClusters   = new TClonesArray(*abc.fAODCaloClusters) ;
-  fAODCaloCells      = new AliAODCaloCells(*abc.fAODCaloCells) ;
+  //delete fAODCaloClusters; fAODCaloClusters   = new TClonesArray(*abc.fAODCaloClusters) ;
+  delete fAODCaloCells ; fAODCaloCells      = new AliAODCaloCells(*abc.fAODCaloCells) ;
   
   fMinPt   = abc.fMinPt;
   fMaxPt   = abc.fMaxPt;
-  fCaloPID = abc.fCaloPID;  
-  fFidCut  = abc.fFidCut;
-  fIC      = abc.fIC;
-  fMCUtils = abc.fMCUtils;
-  fNMS     = abc.fNMS;
+       
+  delete fCaloPID; fCaloPID = new AliCaloPID        (*abc.fCaloPID);
+  delete fFidCut;  fFidCut  = new AliFiducialCut    (*abc.fFidCut);
+  delete fMCUtils; fMCUtils = new AliMCAnalysisUtils(*abc.fMCUtils);
+  delete fIC;      fIC      = new AliIsolationCut   (*abc.fIC);
+  delete fNMS;     fNMS     = new AliNeutralMesonSelection(*abc.fNMS);
        
   //fAnaOutContainer     = abc.fAnaOutContainer;
        
-  fInputAODBranch      = new TClonesArray(*abc.fInputAODBranch) ;
+  delete fInputAODBranch;  fInputAODBranch      = new TClonesArray(*abc.fInputAODBranch) ;
   fInputAODName        = abc.fInputAODName;
-  fOutputAODBranch     = new TClonesArray(*abc.fOutputAODBranch) ;
+  delete fOutputAODBranch; fOutputAODBranch     = new TClonesArray(*abc.fOutputAODBranch) ;
   fNewAOD              = abc.fNewAOD ; 
   fOutputAODName       = abc.fOutputAODName; 
   fOutputAODClassName  = abc.fOutputAODClassName;

diff --git a/PWG4/PartCorrBase/AliAnaPartCorrMaker.cxx b/PWG4/PartCorrBase/AliAnaPartCorrMaker.cxx
index 57913712b2e53e51f871b6754004e9edf368378d..fd95190d761eec6c8d2a35faaac14188be7dfedf 100755 (executable)
--- a/PWG4/PartCorrBase/AliAnaPartCorrMaker.cxx
+++ b/PWG4/PartCorrBase/AliAnaPartCorrMaker.cxx
@@ -63,7 +63,7 @@ AliAnaPartCorrMaker::AliAnaPartCorrMaker(const AliAnaPartCorrMaker & g) :
 TObject(),
 fOutputContainer(g. fOutputContainer), fAnalysisContainer(g.fAnalysisContainer), 
 fMakeHisto(g.fMakeHisto), fMakeAOD(fMakeAOD), fAnaDebug(g. fAnaDebug),
-fReader(g.fReader), fAODBranchList(g.fAODBranchList)
+fReader(new AliCaloTrackReader(*g.fReader)), fAODBranchList(g.fAODBranchList)
 {
   // cpy ctor
        
@@ -77,14 +77,14 @@ AliAnaPartCorrMaker & AliAnaPartCorrMaker::operator = (const AliAnaPartCorrMaker
   if(this == &source)return *this;
   ((TObject *)this)->operator=(source);
   
-  fOutputContainer    = source.fOutputContainer ;
-  fAnalysisContainer  = source.fAnalysisContainer ;
+  delete fOutputContainer;   fOutputContainer    = source.fOutputContainer ;
+  delete fAnalysisContainer; fAnalysisContainer  = source.fAnalysisContainer ;
   fAnaDebug           = source.fAnaDebug;
   fMakeHisto          = source.fMakeHisto;
   fMakeAOD            = source.fMakeAOD;
   
-  fReader             = source.fReader ;
-  fAODBranchList      = source.fAODBranchList;
+  delete fReader ;        fReader             = new AliCaloTrackReader(*source.fReader) ;
+  delete fAODBranchList; fAODBranchList      = source.fAODBranchList;
        
   return *this;
   

diff --git a/PWG4/PartCorrBase/AliCaloPID.cxx b/PWG4/PartCorrBase/AliCaloPID.cxx
index 46915a006f0905874305210053765736d925dd0b..0100897f1177c4685ebb379e87bf438781b35d8f 100755 (executable)
--- a/PWG4/PartCorrBase/AliCaloPID.cxx
+++ b/PWG4/PartCorrBase/AliCaloPID.cxx
@@ -119,11 +119,12 @@ fPHOSElectronWeight(pid.fPHOSElectronWeight),
 fPHOSChargeWeight(pid.fPHOSChargeWeight),
 fPHOSNeutralWeight(pid.fPHOSNeutralWeight),
 fPHOSWeightFormula(pid.fPHOSWeightFormula), 
-fPHOSPhotonWeightFormula(pid.fPHOSPhotonWeightFormula), 
-fPHOSPi0WeightFormula(pid.fPHOSPi0WeightFormula), 
+fPHOSPhotonWeightFormula(new TFormula(*pid.fPHOSPhotonWeightFormula)), 
+fPHOSPi0WeightFormula   (new TFormula(*pid.fPHOSPi0WeightFormula)), 
 fDispCut(pid.fDispCut),fTOFCut(pid.fTOFCut),
 fDebug(pid.fDebug), fRecalculateBayesian(pid.fRecalculateBayesian),
-fParticleFlux(pid.fParticleFlux), fEMCALPIDUtils(pid.fEMCALPIDUtils)
+fParticleFlux(pid.fParticleFlux), 
+fEMCALPIDUtils(new AliEMCALPIDUtils(*pid.fEMCALPIDUtils))
 {
   // cpy ctor
        
@@ -136,21 +137,21 @@ AliCaloPID & AliCaloPID::operator = (const AliCaloPID & pid)
   
   if(&pid == this) return *this;
   
-  fEMCALPhotonWeight = pid. fEMCALPhotonWeight ;
-  fEMCALPi0Weight = pid.fEMCALPi0Weight ;
+  fEMCALPhotonWeight   = pid. fEMCALPhotonWeight ;
+  fEMCALPi0Weight      = pid.fEMCALPi0Weight ;
   fEMCALElectronWeight = pid.fEMCALElectronWeight; 
-  fEMCALChargeWeight = pid.fEMCALChargeWeight;
-  fEMCALNeutralWeight = pid.fEMCALNeutralWeight;
+  fEMCALChargeWeight   = pid.fEMCALChargeWeight;
+  fEMCALNeutralWeight  = pid.fEMCALNeutralWeight;
   
-  fPHOSPhotonWeight = pid.fPHOSPhotonWeight ;
-  fPHOSPi0Weight = pid.fPHOSPi0Weight ;
-  fPHOSElectronWeight = pid.fPHOSElectronWeight; 
-  fPHOSChargeWeight = pid.fPHOSChargeWeight;
-  fPHOSNeutralWeight = pid.fPHOSNeutralWeight;
+  fPHOSPhotonWeight    = pid.fPHOSPhotonWeight ;
+  fPHOSPi0Weight       = pid.fPHOSPi0Weight ;
+  fPHOSElectronWeight  = pid.fPHOSElectronWeight; 
+  fPHOSChargeWeight    = pid.fPHOSChargeWeight;
+  fPHOSNeutralWeight   = pid.fPHOSNeutralWeight;
   
-  fPHOSWeightFormula       = pid.fPHOSWeightFormula; 
-  fPHOSPhotonWeightFormula = pid.fPHOSPhotonWeightFormula; 
-  fPHOSPi0WeightFormula    = pid.fPHOSPi0WeightFormula;
+  fPHOSWeightFormula   = pid.fPHOSWeightFormula; 
+  delete fPHOSPhotonWeightFormula;  fPHOSPhotonWeightFormula = new TFormula(*pid.fPHOSPhotonWeightFormula); 
+  delete fPHOSPi0WeightFormula;     fPHOSPi0WeightFormula    = new TFormula(*pid.fPHOSPi0WeightFormula);
   
   fDispCut  = pid.fDispCut;
   fTOFCut   = pid.fTOFCut;
@@ -158,7 +159,8 @@ AliCaloPID & AliCaloPID::operator = (const AliCaloPID & pid)
   
   fRecalculateBayesian = pid.fRecalculateBayesian;
   fParticleFlux        = pid.fParticleFlux;
-  fEMCALPIDUtils       = pid.fEMCALPIDUtils;
+       
+  delete fEMCALPIDUtils; fEMCALPIDUtils       = new AliEMCALPIDUtils(*pid.fEMCALPIDUtils);
                
   return *this;
   
@@ -168,9 +170,9 @@ AliCaloPID & AliCaloPID::operator = (const AliCaloPID & pid)
 AliCaloPID::~AliCaloPID() {
   //Dtor
   
-  if(fPHOSPhotonWeightFormula) delete  fPHOSPhotonWeightFormula ;
-  if(fPHOSPi0WeightFormula) delete  fPHOSPi0WeightFormula ;
-  if(fEMCALPIDUtils) delete fEMCALPIDUtils ;
+  if(fPHOSPhotonWeightFormula) delete fPHOSPhotonWeightFormula ;
+  if(fPHOSPi0WeightFormula)    delete fPHOSPi0WeightFormula ;
+  if(fEMCALPIDUtils)           delete fEMCALPIDUtils ;
 }