fix for memory leak in VZERO (C.Mayer)

sevdokim · Nov 21, 2016 · 1c0c0bb · 1c0c0bb
1 parent 2c80dc7
commit 1c0c0bb
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/VZERO/VZEROsim/AliVZERODigitizer.cxx b/VZERO/VZEROsim/AliVZERODigitizer.cxx
@@ -229,7 +229,6 @@ void AliVZERODigitizer::Digitize(Option_t* /*option*/)
 {   
   // Creates digits from hits
   fNdigits = 0;  
-
   if (fVZERO && !fDigInput) {
     AliLoader *loader = fVZERO->GetLoader();
     if (!loader) {
@@ -251,15 +250,15 @@ void AliVZERODigitizer::Digitize(Option_t* /*option*/)
     }
   }
   else if (fDigInput) {
-      ReadSDigits();
-      DigitizeSDigits();
-      AliRunLoader *currentLoader = AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName());
-      AliLoader *loader = currentLoader->GetLoader("VZEROLoader");
-      if (!loader) { 
-	AliError("Cannot get VZERO Loader via RunDigitizer!");
-	return;
-      }
-      WriteDigits(loader);
+    ReadSDigits();
+    DigitizeSDigits();
+    AliRunLoader *currentLoader = AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName());
+    AliLoader *loader = currentLoader->GetLoader("VZEROLoader");
+    if (!loader) { 
+      AliError("Cannot get VZERO Loader via RunDigitizer!");
+      return;
+    }
+    WriteDigits(loader);
   }
   else {
     AliFatal("Invalid digitization task! Exiting!");
@@ -296,6 +295,9 @@ void AliVZERODigitizer::ResetDigits(Option_t* opt)
 
   fNdigits = 0;
   if (fDigits) fDigits->Clear(opt);
+  // CM
+  delete fDigits;
+  fDigits = NULL;
 }
 
 //____________________________________________________________________________
@@ -603,7 +605,6 @@ void AliVZERODigitizer::ReadSDigits()
       AliError("Failed to get sdigit branch");
       return;
     }
-
     // Set the branch address
     TClonesArray *sdigitsArray = NULL;
     sdigitsBranch->SetAddress(&sdigitsArray);
@@ -638,7 +639,9 @@ void AliVZERODigitizer::ReadSDigits()
 	  }
 	}
       }
+      sdigitsArray->Clear("C"); // CM
     }
+    delete sdigitsArray; // CM
     loader->UnloadSDigits();
   }
 }