implemented destructors

diff --git a/PWG0/dNdEta/AliMultiplicityESDSelector.cxx b/PWG0/dNdEta/AliMultiplicityESDSelector.cxx
index 03c678bb622d032c14fd003d9c79471c2f9b198f..b08da1b69d7eea69822be1b69b782ddcb9f75ca2 100644 (file)
--- a/PWG0/dNdEta/AliMultiplicityESDSelector.cxx
+++ b/PWG0/dNdEta/AliMultiplicityESDSelector.cxx
@@ -26,8 +26,6 @@ AliMultiplicityESDSelector::AliMultiplicityESDSelector() :
   //
   // Constructor. Initialization of pointers
   //
   //
   // Constructor. Initialization of pointers
   //

-
-  AliLog::SetClassDebugLevel("AliMultiplicityESDSelector", AliLog::kDebug);

 }
 
 AliMultiplicityESDSelector::~AliMultiplicityESDSelector()
 }
 
 AliMultiplicityESDSelector::~AliMultiplicityESDSelector()


@@ -117,14 +115,10 @@ Bool_t AliMultiplicityESDSelector::Process(Long64_t entry)
     return kTRUE;
 
   // get number of "good" tracks
     return kTRUE;
 
   // get number of "good" tracks

-  TObjArray* list = fEsdTrackCuts->GetAcceptedTracks(fESD);
-  Int_t nGoodTracks = list->GetEntries();
-  delete list;
-  list = 0;
+  Int_t nGoodTracks = fEsdTrackCuts->CountAcceptedTracks(fESD);

 
   fMultiplicity->Fill(nGoodTracks);
 
 
   fMultiplicity->Fill(nGoodTracks);
 

-

   return kTRUE;
 }
 
   return kTRUE;
 }
 

diff --git a/PWG0/dNdEta/AlidNdEtaAnalysisESDSelector.cxx b/PWG0/dNdEta/AlidNdEtaAnalysisESDSelector.cxx
index f9771dda8eaa135b2b2ef707b025e79794f2d700..1e01297b9b57f604a1a17fb0da7b27b02da8ede0 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaAnalysisESDSelector.cxx
+++ b/PWG0/dNdEta/AlidNdEtaAnalysisESDSelector.cxx
@@ -43,6 +43,36 @@ AlidNdEtaAnalysisESDSelector::~AlidNdEtaAnalysisESDSelector()
 
   // histograms are in the output list and deleted when the output
   // list is deleted by the TSelector dtor
 
   // histograms are in the output list and deleted when the output
   // list is deleted by the TSelector dtor

+
+  if (fdNdEtaAnalysis)
+  {
+    delete fdNdEtaAnalysis;
+    fdNdEtaAnalysis = 0;
+  }
+
+  if (fdNdEtaAnalysisMB)
+  {
+    delete fdNdEtaAnalysisMB;
+    fdNdEtaAnalysisMB = 0;
+  }
+
+  if (fdNdEtaAnalysisMBVtx)
+  {
+    delete fdNdEtaAnalysisMBVtx;
+    fdNdEtaAnalysisMBVtx = 0;
+  }
+
+  if (fEsdTrackCuts)
+  {
+    delete fEsdTrackCuts;
+    fEsdTrackCuts = 0;
+  }
+
+  if (fdNdEtaCorrection)
+  {
+    delete fdNdEtaCorrection;
+    fdNdEtaCorrection = 0;
+  }

 }
 
 void AlidNdEtaAnalysisESDSelector::Begin(TTree* tree)
 }
 
 void AlidNdEtaAnalysisESDSelector::Begin(TTree* tree)


@@ -183,7 +213,7 @@ Bool_t AlidNdEtaAnalysisESDSelector::Process(Long64_t entry)
     }
 
     Double_t p[3];
     }
 
     Double_t p[3];

-    esdTrack->GetConstrainedPxPyPz(p); // ### TODO or GetInnerPxPyPy / GetOuterPxPyPy
+    esdTrack->GetConstrainedPxPyPz(p); // ### TODO should be okay because we have a vertex, however GetInnerPxPyPy / GetOuterPxPyPy also exist

     TVector3 vector(p);
 
     Float_t theta = vector.Theta();
     TVector3 vector(p);
 
     Float_t theta = vector.Theta();


@@ -230,9 +260,16 @@ void AlidNdEtaAnalysisESDSelector::SlaveTerminate()
     return;
   }
 
     return;
   }
 

+  // Add the objects to the output list and set them to 0, so that the destructor does not delete them.
+

   fOutput->Add(fdNdEtaAnalysis);
   fOutput->Add(fdNdEtaAnalysis);

+  fdNdEtaAnalysis = 0;
+

   fOutput->Add(fdNdEtaAnalysisMB);
   fOutput->Add(fdNdEtaAnalysisMB);

+  fdNdEtaAnalysisMB = 0;
+

   fOutput->Add(fdNdEtaAnalysisMBVtx);
   fOutput->Add(fdNdEtaAnalysisMBVtx);

+  fdNdEtaAnalysisMBVtx = 0;

 }
 
 void AlidNdEtaAnalysisESDSelector::Terminate()
 }
 
 void AlidNdEtaAnalysisESDSelector::Terminate()

diff --git a/PWG0/dNdEta/AlidNdEtaCorrection.cxx b/PWG0/dNdEta/AlidNdEtaCorrection.cxx
index 0ca7dd51d32ae7aa564b98fbfc951bd37410e289..8509f472835d7c66c8df760903d8ee457a67b3eb 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaCorrection.cxx
+++ b/PWG0/dNdEta/AlidNdEtaCorrection.cxx
@@ -25,6 +25,10 @@ AlidNdEtaCorrection::AlidNdEtaCorrection()
 //____________________________________________________________________
 AlidNdEtaCorrection::AlidNdEtaCorrection(const Char_t* name, const Char_t* title)
   : TNamed(name, title),
 //____________________________________________________________________
 AlidNdEtaCorrection::AlidNdEtaCorrection(const Char_t* name, const Char_t* title)
   : TNamed(name, title),

+  fTrack2ParticleCorrection(0),
+  fVertexRecoCorrection(0),
+  fTriggerCorrection(0),
+  fTriggerBiasCorrection(0),

   fNEvents(0),
   fNTriggeredEvents(0)
 {
   fNEvents(0),
   fNTriggeredEvents(0)
 {


@@ -51,6 +55,36 @@ AlidNdEtaCorrection::AlidNdEtaCorrection(const Char_t* name, const Char_t* title
   fTriggerBiasCorrection       ->SetAxisTitles("#eta", "p_{T} [GeV/c]");
 }
 
   fTriggerBiasCorrection       ->SetAxisTitles("#eta", "p_{T} [GeV/c]");
 }
 

+//____________________________________________________________________
+AlidNdEtaCorrection::~AlidNdEtaCorrection()
+{
+  // destructor
+
+  if (fTrack2ParticleCorrection)
+  {
+    delete fTrack2ParticleCorrection;
+    fTrack2ParticleCorrection = 0;
+  }
+
+  if (fVertexRecoCorrection)
+  {
+    delete fVertexRecoCorrection;
+    fVertexRecoCorrection = 0;
+  }
+
+  if (fTriggerCorrection)
+  {
+    delete fTriggerCorrection;
+    fTriggerCorrection = 0;
+  }
+
+  if (fTriggerBiasCorrection)
+  {
+    delete fTriggerBiasCorrection;
+    fTriggerBiasCorrection = 0;
+  }
+}
+

 //____________________________________________________________________
 void
 AlidNdEtaCorrection::Finish() {
 //____________________________________________________________________
 void
 AlidNdEtaCorrection::Finish() {

diff --git a/PWG0/dNdEta/AlidNdEtaCorrection.h b/PWG0/dNdEta/AlidNdEtaCorrection.h
index bb5a05491c2e72ddbea6d1d82879986ae1f1fbf3..69d6cb03221edc20d59f9588d59b529d40de1866 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaCorrection.h
+++ b/PWG0/dNdEta/AlidNdEtaCorrection.h
@@ -29,6 +29,8 @@ public:
   AlidNdEtaCorrection();
   AlidNdEtaCorrection(const Char_t* name, const Char_t* title);
 
   AlidNdEtaCorrection();
   AlidNdEtaCorrection(const Char_t* name, const Char_t* title);
 

+  ~AlidNdEtaCorrection();
+

   // fVertexRecoCorrection, fTriggerCorrection
   void FillEvent(Float_t vtx, Float_t n)                        {fTriggerCorrection->FillGene(vtx, n);}
   void FillEventWithTrigger(Float_t vtx, Float_t n)             {fVertexRecoCorrection->FillGene(vtx, n); fTriggerCorrection->FillMeas(vtx, n);}
   // fVertexRecoCorrection, fTriggerCorrection
   void FillEvent(Float_t vtx, Float_t n)                        {fTriggerCorrection->FillGene(vtx, n);}
   void FillEventWithTrigger(Float_t vtx, Float_t n)             {fVertexRecoCorrection->FillGene(vtx, n); fTriggerCorrection->FillMeas(vtx, n);}