Changeset 5070

Timestamp:

09/16/04 16:13:16 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHCalibrationChargeBlindPix.cc (modified) (1 diff)
• mhcalib/MHGausEvents.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/09/16: Markus Gaug
+
+   * mhcalib/MHCalibrationChargeBlindPix.cc
+   * mhcalib/MHGausEvents.cc
+     - added call to gROOT->GetListOfFunctions->Remove(f) in destructor
+
 
  2004/09/16: Thomas Bretz

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc

@@ -147 +147 @@
 
   if (fSinglePheFit)
-    delete fSinglePheFit;
-
+    {
+      gROOT->GetListOfFunctions()->Remove(fSinglePheFit);
+      delete fSinglePheFit;
+    }
+  
   if (fFitLegend)
     delete fFitLegend;

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

@@ -163 +163 @@
 // 
 // - fHPowerProbability
-// - fFGausFit 
-// - fFExpFit
 // - fPowerSpectrum     
 // - fGraphEvents
 // - fGraphPowerSpectrum
 // 
+// For the fits, we have to take special care since ROOT 
+// has stored the function pointer in a global list which 
+// lead to removing the object twice. We have to take out 
+// the following functions of the global list of functions 
+// as well:
+// 
+// - fFGausFit 
+// - fFExpFit
+//
 MHGausEvents::~MHGausEvents()
 {
@@ -178 +185 @@
   // delete fits
   if (fFGausFit)
-    delete fFGausFit; 
-
+    {
+      gROOT->GetListOfFunctions()->Remove(fFGausFit);
+      delete fFGausFit; 
+    }
+  
   if (fFExpFit)
-    delete fFExpFit;
+    {
+      gROOT->GetListOfFunctions()->Remove(fFExpFit);
+      delete fFExpFit;
+    }
   
   // delete arrays