Using default task names. Cleaning the task in the destructor if it was posted

diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx
index 653ee3b..66a1bd0 100644 (file)
--- a/EMCAL/AliEMCALDigitizer.cxx
+++ b/EMCAL/AliEMCALDigitizer.cxx
@@ -139,7 +139,7 @@ AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd):
 {
   // ctor
   fManager = rd ; 
-  SetName(fManager->GetInputFolderName(0)) ;
+  //  SetName(fManager->GetInputFolderName(0)) ;
   // take title as name of stream 0
   SetTitle(dynamic_cast<AliStream*>(fManager->GetInputStream(0))->GetFileName(0));
   InitParameters() ; 
@@ -151,6 +151,8 @@ AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd):
   AliEMCALDigitizer::~AliEMCALDigitizer()
 {
   // dtor
+  AliEMCALGetter * gime =AliEMCALGetter::Instance(GetTitle(),fEventFolderName);
+  gime->EmcalLoader()->CleanDigitizer();
   delete [] fInputFileNames ; 
   delete [] fEventNames ; 
 

diff --git a/EMCAL/AliEMCALSDigitizer.cxx b/EMCAL/AliEMCALSDigitizer.cxx
index ea2decf..2eada31 100644 (file)
--- a/EMCAL/AliEMCALSDigitizer.cxx
+++ b/EMCAL/AliEMCALSDigitizer.cxx
@@ -98,6 +98,14 @@ AliEMCALSDigitizer::AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) : TTask(sd
 
 
 //____________________________________________________________________________ 
+AliEMCALSDigitizer::~AliEMCALSDigitizer() {
+  // dtor
+  AliEMCALGetter * gime = 
+    AliEMCALGetter::Instance(GetTitle(), fEventFolderName.Data());  
+  gime->EmcalLoader()->CleanSDigitizer();
+}
+
+//____________________________________________________________________________ 
 void AliEMCALSDigitizer::Init(){
   // Initialization: open root-file, allocate arrays for hits and sdigits,
   // attach task SDigitizer to the list of EMCAL tasks

diff --git a/EMCAL/AliEMCALSDigitizer.h b/EMCAL/AliEMCALSDigitizer.h
index 8c08390..c45b71e 100644 (file)
--- a/EMCAL/AliEMCALSDigitizer.h
+++ b/EMCAL/AliEMCALSDigitizer.h
@@ -29,7 +29,7 @@ public:
   AliEMCALSDigitizer() ;          // ctor
   AliEMCALSDigitizer(const char * alirunFileName, const char * eventFolderName = AliConfig::fgkDefaultEventFolderName) ; 
   AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) ;
-  virtual ~AliEMCALSDigitizer() {;} // dtor
+  virtual ~AliEMCALSDigitizer(); // dtor
 
   Float_t       Calibrate(Int_t amp)const {return (amp - fA)/fB ; }
   Int_t         Digitize(Float_t Energy)const { return (Int_t ) ( fA + Energy*fB); }

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index 8b8acf5..67f9af1 100644 (file)
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -133,7 +133,7 @@ AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd):
 {
   // ctor
   fManager = rd ; 
-  SetName(fManager->GetInputFolderName(0)) ;
+  //  SetName(fManager->GetInputFolderName(0)) ;
   // take title as name of stream 0
   SetTitle(dynamic_cast<AliStream*>(fManager->GetInputStream(0))->GetFileName(0));
   InitParameters() ; 
@@ -145,6 +145,8 @@ AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd):
   AliPHOSDigitizer::~AliPHOSDigitizer()
 {
   // dtor
+  AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(),fEventFolderName);
+  gime->PhosLoader()->CleanDigitizer();
   delete [] fInputFileNames ; 
   delete [] fEventNames ; 
  

diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx
index 0f9641b..c762b20 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.cxx
+++ b/PHOS/AliPHOSSDigitizer.cxx
@@ -103,6 +103,13 @@ AliPHOSSDigitizer::AliPHOSSDigitizer(const AliPHOSSDigitizer & sd)
 
 
 //____________________________________________________________________________ 
+AliPHOSSDigitizer::~AliPHOSSDigitizer() {
+  //dtor
+  AliPHOSGetter * gime =
+    AliPHOSGetter::Instance(GetTitle(),fEventFolderName.Data());  
+  gime->PhosLoader()->CleanSDigitizer();
+}
+//____________________________________________________________________________ 
 void AliPHOSSDigitizer::Init()
 {
   // Uses the getter to access the required files

diff --git a/PHOS/AliPHOSSDigitizer.h b/PHOS/AliPHOSSDigitizer.h
index 48bfcd3..d74aaa9 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.h
+++ b/PHOS/AliPHOSSDigitizer.h
@@ -28,7 +28,7 @@ public:
   AliPHOSSDigitizer() ;          // ctor
   AliPHOSSDigitizer(const char * alirunFileName, const char * eventFolderName = AliConfig::fgkDefaultEventFolderName) ; 
   AliPHOSSDigitizer(const AliPHOSSDigitizer & sd) ; // cpy ctor
-  virtual ~AliPHOSSDigitizer() {;} // dtor
+  virtual ~AliPHOSSDigitizer(); // dtor
 
   Float_t        Calibrate(Int_t amp)const {return (amp - fA)/fB ; }
   Int_t          Digitize(Float_t Energy)const { return (Int_t ) ( fA + Energy*fB); }

diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx
index e1e8f23..54f076e 100644 (file)
--- a/TOF/AliTOFSDigitizer.cxx
+++ b/TOF/AliTOFSDigitizer.cxx
@@ -59,7 +59,7 @@
 ClassImp(AliTOFSDigitizer)
 
 //____________________________________________________________________________ 
-  AliTOFSDigitizer::AliTOFSDigitizer():TTask("AliTOFSDigitizer","") 
+  AliTOFSDigitizer::AliTOFSDigitizer():TTask("TOFSDigitizer","") 
 {
   // ctor
 
@@ -74,7 +74,7 @@ ClassImp(AliTOFSDigitizer)
 }
 
 //____________________________________________________________________________ 
-AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_t nEvents):TTask("AliTOFSDigitizer","")
+AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_t nEvents):TTask("TOFSDigitizer","")
 {
   ftail    = 0;
   fSelectedSector=-1; // by default we sdigitize all sectors
@@ -129,6 +129,7 @@ AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_
 AliTOFSDigitizer::~AliTOFSDigitizer()
 {
   // dtor
+  fTOFLoader->CleanSDigitizer();
 }
 
 //____________________________________________________________________________