Added AliTender::AddSupply(AliTenderSupply *supply). Fixed destructor.

diff --git a/ANALYSIS/Tender/AliTender.cxx b/ANALYSIS/Tender/AliTender.cxx
index 5d7e22e79e2475b31e7a2fec5734c81089c6d2d4..373c2a29cc370822ec1f98d681efe69de73b6326 100644 (file)
--- a/ANALYSIS/Tender/AliTender.cxx
+++ b/ANALYSIS/Tender/AliTender.cxx
@@ -67,8 +67,20 @@ AliTender::AliTender(const char* name):
 AliTender::~AliTender()
 {
 // Destructor
+  if (fSupplies) {
+    fSupplies->Delete();
+    delete fSupplies;
+  }
 }
 
+//______________________________________________________________________________
+void AliTender::AddSupply(AliTenderSupply *supply)
+{
+// Addition of supplies.
+  if (!fSupplies) fSupplies = new TObjArray();
+  fSupplies->Add(supply);
+}
+   
 //______________________________________________________________________________
 void AliTender::ConnectInputData(Option_t* /*option*/)
 {

diff --git a/ANALYSIS/Tender/AliTender.h b/ANALYSIS/Tender/AliTender.h
index d0b2b4a78ef67f2228d92bfbd9f766e0053d7bc3..032fc96b75edbb9f98a24315484cbf7b43cab9a4 100644 (file)
--- a/ANALYSIS/Tender/AliTender.h
+++ b/ANALYSIS/Tender/AliTender.h
@@ -20,6 +20,7 @@
 class AliCDBManager;
 class AliESDEvent;
 class AliESDInputHandler;
+class AliTenderSupply;
 
 class AliTender : public AliAnalysisTask {
 
@@ -42,7 +43,7 @@ public:
   AliTender(const char *name);
   virtual ~AliTender();
 
-  // Getters
+  void                      AddSupply(AliTenderSupply *supply);
   Int_t                     GetRun() const {return fRun;}
   AliCDBManager            *GetCDBManager() const {return fCDB;}
   AliESDInputHandler       *GetESDhandler() const {return fESDhandler;}

diff --git a/ANALYSIS/Tender/AliTenderSupply.cxx b/ANALYSIS/Tender/AliTenderSupply.cxx
index 7df26de63fb80e096f32b7dcce5e5aaa91da5a51..0bf87a3ff9e2406fe48efd36f33f76363b4a8902 100644 (file)
--- a/ANALYSIS/Tender/AliTenderSupply.cxx
+++ b/ANALYSIS/Tender/AliTenderSupply.cxx
@@ -29,7 +29,7 @@ AliTenderSupply::AliTenderSupply()
 }
 
 //______________________________________________________________________________
-AliTenderSupply::AliTenderSupply(const char* name, AliTender *tender)
+AliTenderSupply::AliTenderSupply(const char* name, const AliTender *tender)
                 :TNamed(name, "ESD analysis tender car"),
                  fTender(tender)
 {

diff --git a/ANALYSIS/Tender/AliTenderSupply.h b/ANALYSIS/Tender/AliTenderSupply.h
index 242ede30d37e012e9e044ec4e5ce988e74928032..f7dbd671b75bb45c3b43e7eb02cd9ebc8aa31992 100644 (file)
--- a/ANALYSIS/Tender/AliTenderSupply.h
+++ b/ANALYSIS/Tender/AliTenderSupply.h
@@ -19,11 +19,11 @@ class AliTender;
 class AliTenderSupply : public TNamed {
 
 private:
-  AliTender                *fTender;         // Tender car
+  const AliTender          *fTender;         // Tender car
   
 public:  
   AliTenderSupply();
-  AliTenderSupply(const char *name, AliTender *tender);
+  AliTenderSupply(const char *name, const AliTender *tender);
   AliTenderSupply(const AliTenderSupply &other);
   virtual ~AliTenderSupply();
   AliTenderSupply& operator=(const AliTenderSupply &other);