Tweaks to destructors and getting code working with plugin

diff --git a/PWGLF/totEt/AliAnalysisEt.cxx b/PWGLF/totEt/AliAnalysisEt.cxx
index 3cf6428b5b9a7a9c1313031df269bd0f3dff2370..9626d2d7ac0e6873e63b39049f37d495f3d16988 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEt.cxx
+++ b/PWGLF/totEt/AliAnalysisEt.cxx
@@ -163,11 +163,18 @@ AliAnalysisEt::~AliAnalysisEt()
     fEventSummaryTree->Clear();
     delete fEventSummaryTree;
   }
+  if(fAcceptedTree)
+  {
+    fAcceptedTree->Clear();
+    delete fAcceptedTree;
+  }
   delete fHistEt; //Et spectrum
   delete fHistNeutralMult; //Neutral multiplicity
   delete fHistPhivsPtPos; //phi vs pT plot for positive tracks
-  delete fHistPhivsPtNeg; //phi vs pT plot for negative tracks
+  delete fHistPhivsPtNeg; //phi vs pT Moplot for negative tracks
   //delete fCentrality;//this code does not actually own AliCentrality so we don't have to worry about deleting it...  we just borrow it...
+  delete fCutFlow;
+  delete fSelector;
 }
 
 void AliAnalysisEt::FillOutputList(TList *list)

diff --git a/PWGLF/totEt/AliAnalysisEtMonteCarlo.cxx b/PWGLF/totEt/AliAnalysisEtMonteCarlo.cxx
index d4d1a855c4e2e45876381af32a7f9004c40b19b5..b796e7fe17892a2ff7b803bfb6f5cae1d23d1adf 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtMonteCarlo.cxx
+++ b/PWGLF/totEt/AliAnalysisEtMonteCarlo.cxx
@@ -222,6 +222,11 @@ AliAnalysisEtMonteCarlo::AliAnalysisEtMonteCarlo():AliAnalysisEt()
 // dtor
 AliAnalysisEtMonteCarlo::~AliAnalysisEtMonteCarlo()
 {   //Destructor
+
+  if(fPrimaryTree){
+    fPrimaryTree->Clear();
+    delete fPrimaryTree;
+  }
     delete fHistDecayVertexNonRemovedCharged; // Decay vertex for non-removed charged particles
     delete fHistDecayVertexRemovedCharged; // Decay vertex for non-removed charged particles
     delete fHistDecayVertexNonRemovedNeutral; // Decay vertex for non-removed charged particles

diff --git a/PWGLF/totEt/AliAnalysisEtMonteCarloPhos.cxx b/PWGLF/totEt/AliAnalysisEtMonteCarloPhos.cxx
index 89c1eecb9d7491785c6cfee20cff3ab4fe199a3e..126cf262c9aab72cac401606220bb269434443e4 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtMonteCarloPhos.cxx
+++ b/PWGLF/totEt/AliAnalysisEtMonteCarloPhos.cxx
@@ -32,6 +32,10 @@ AliAnalysisEtMonteCarloPhos::AliAnalysisEtMonteCarloPhos():AliAnalysisEtMonteCar
 
 AliAnalysisEtMonteCarloPhos::~AliAnalysisEtMonteCarloPhos()
 {
+  delete fBadMapM2;
+  delete fBadMapM3;
+  delete fBadMapM4;
+  delete fGeoUtils;
 }
 
 

diff --git a/PWGLF/totEt/AliAnalysisEtReconstructed.cxx b/PWGLF/totEt/AliAnalysisEtReconstructed.cxx
index 5272533b1a613452693d7c4120dc190b45a1cef8..21b6124d3d377de1f564966c11a9e6ff53151747 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtReconstructed.cxx
+++ b/PWGLF/totEt/AliAnalysisEtReconstructed.cxx
@@ -71,6 +71,10 @@ AliAnalysisEtReconstructed::~AliAnalysisEtReconstructed()
     delete fHistMuonEnergyDeposit; /** Energy deposited in calorimeter by muons */
 
     delete fHistRemovedEnergy; // removed energy
+    delete fClusterPosition;
+    delete fHistChargedEnergyRemoved;
+    delete fHistNeutralEnergyRemoved;
+    delete fHistGammaEnergyAdded;
 
 }
 

diff --git a/PWGLF/totEt/AliAnalysisEtReconstructedPhos.cxx b/PWGLF/totEt/AliAnalysisEtReconstructedPhos.cxx
index 0abe592aa8523fa599a933cb51ca0f430b027146..b694102702f174e128624bad85d7c58b8e5c1c8d 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtReconstructedPhos.cxx
+++ b/PWGLF/totEt/AliAnalysisEtReconstructedPhos.cxx
@@ -69,6 +69,7 @@ AliAnalysisEtReconstructedPhos::AliAnalysisEtReconstructedPhos() :
     fSecondaryContributionCorrectionParameters[0] = 0.075;
     fSecondaryContributionCorrectionParameters[1] = 0.150187;
     fSecondaryContributionCorrectionParameters[2] = 0.00329361;
+
 }
 
 AliAnalysisEtReconstructedPhos::~AliAnalysisEtReconstructedPhos()
@@ -79,7 +80,6 @@ void AliAnalysisEtReconstructedPhos::Init()
 { // Init
     AliAnalysisEtReconstructed::Init();
 
-    fSelector = new AliAnalysisEtSelectorPhos(fCuts);
     
     fDetectorRadius = fCuts->GetGeometryPhosDetectorRadius();
     fSingleCellEnergyCut = fCuts->GetReconstructedPhosSingleCellEnergyCut();
@@ -144,3 +144,9 @@ Double_t AliAnalysisEtReconstructedPhos::GetSecondaryContribution(Int_t clusterM
 
 
 
+
+void AliAnalysisEtReconstructedPhos::CreateHistograms()
+{ // add some extra histograms & objects to the ones from base class
+  AliAnalysisEtReconstructed::CreateHistograms();
+  fSelector = new AliAnalysisEtSelectorPhos(fCuts);
+}

diff --git a/PWGLF/totEt/AliAnalysisEtReconstructedPhos.h b/PWGLF/totEt/AliAnalysisEtReconstructedPhos.h
index a7f32eec1581201ed3641c1043efb33958e22aba..0d4b5114ba59a0aa42dfeeb57d56ba4270c4deaa 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtReconstructedPhos.h
+++ b/PWGLF/totEt/AliAnalysisEtReconstructedPhos.h
@@ -22,6 +22,8 @@ public:
 
     virtual void Init();
 
+    void CreateHistograms();
+
     virtual Double_t GetChargedContribution(Int_t clusterMultiplicity);
 
     virtual Double_t GetNeutralContribution(Int_t clusterMultiplicity);
@@ -34,7 +36,7 @@ public:
     {
         fChargedContributionCorrectionParameters[0] = par[0];
         fChargedContributionCorrectionParameters[1] = par[1];
-       fChargedContributionCorrectionParameters[1] = par[2];
+       fChargedContributionCorrectionParameters[2] = par[2];
     }
     void SetNeutralContributionParameters(Double_t par[3])
     {

diff --git a/PWGLF/totEt/AliAnalysisTaskTransverseEnergy.h b/PWGLF/totEt/AliAnalysisTaskTransverseEnergy.h
index 4902417a0528c4053ab00a3527392bc77b808146..12f0092811088155c2bbbeb1cc76342eea22d82d 100644 (file)
--- a/PWGLF/totEt/AliAnalysisTaskTransverseEnergy.h
+++ b/PWGLF/totEt/AliAnalysisTaskTransverseEnergy.h
@@ -24,7 +24,7 @@ public:
     /** Constructor */
     AliAnalysisTaskTransverseEnergy(const char* name, Bool_t isMc);
 
-    /** Destructro */
+    /** Destructor */
     virtual ~AliAnalysisTaskTransverseEnergy();
 
     AliESDtrackCuts* GetTPCITSTrackCuts(){return (AliESDtrackCuts*) fOutputList->FindObject("fEsdTrackCuts");}