Corrected destructor (T,Kuhr)

diff --git a/STEER/AliDigitizer.cxx b/STEER/AliDigitizer.cxx
index 1e531d7e4cb26d4768d82a9dd918b4513003556f..7b60c40c80694f7b609be8641c9c643101bd6ada 100644 (file)
--- a/STEER/AliDigitizer.cxx
+++ b/STEER/AliDigitizer.cxx
@@ -77,7 +77,6 @@ AliDigitizer::AliDigitizer(AliRunDigitizer *manager,
 //_______________________________________________________________________
 AliDigitizer::~AliDigitizer() 
 {
-  delete fManager;
 }
 
 //_______________________________________________________________________

diff --git a/STEER/AliRunDigitizer.cxx b/STEER/AliRunDigitizer.cxx
index 04c550808b48c3744d33b757af73e4a7c2fca645..14e9fc001b1fb19963cc66e91bab3318ec3bde0d 100644 (file)
--- a/STEER/AliRunDigitizer.cxx
+++ b/STEER/AliRunDigitizer.cxx
@@ -220,8 +220,6 @@ void AliRunDigitizer::Copy(TObject&) const
 
 AliRunDigitizer::~AliRunDigitizer() {
 // dtor
-  if (GetListOfTasks()) 
-    GetListOfTasks()->Clear("nodelete");
   delete fInputStreams;
   delete fCombi;
   delete fOutRunLoader;

diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx
index bc0f6c222bafa7b851cd952d256656388a6bdb3b..cebd2dbbfa4332ba65e37b159cce2b5a2c1aeb4e 100644 (file)
--- a/TRD/AliTRDdigitizer.cxx
+++ b/TRD/AliTRDdigitizer.cxx
@@ -213,12 +213,10 @@ AliTRDdigitizer::~AliTRDdigitizer()
     fDigitsManager = 0;
   }
 
-  if (fSDigitsManager) {
-    delete fSDigitsManager;
-    fSDigitsManager = 0;
-  }
+  fSDigitsManager = 0;
 
   if (fSDigitsManagerList) {
+    fSDigitsManagerList->Delete();
     delete fSDigitsManagerList;
     fSDigitsManagerList = 0;
   }
@@ -406,7 +404,7 @@ void AliTRDdigitizer::Exec(Option_t* option)
 
   //Write parameters
   orl->CdGAFile();
-  GetParameter()->Write();
+  if (!gFile->Get("TRDParameter")) GetParameter()->Write();
 
   if (fDebug > 0) {
     printf("<AliTRDdigitizer::Exec> ");
@@ -519,6 +517,7 @@ Bool_t AliTRDdigitizer::InitDetector()
   }
 
   // Create a digits manager
+  delete fDigitsManager;
   fDigitsManager = new AliTRDdigitsManager();
   fDigitsManager->SetSDigits(fSDigits);
   fDigitsManager->CreateArrays();
@@ -526,7 +525,11 @@ Bool_t AliTRDdigitizer::InitDetector()
   fDigitsManager->SetDebug(fDebug);
 
   // The list for the input s-digits manager to be merged
-  fSDigitsManagerList = new TList();
+  if (fSDigitsManagerList) {
+    fSDigitsManagerList->Delete();
+  } else {
+    fSDigitsManagerList = new TList();
+  }
 
   return kTRUE;