Changeset 4382

Timestamp:

07/14/04 19:49:43 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHGausEvents.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -45 +45 @@
     - fixed a bug causing a segmentation violation in the destructor 
       (array dimension was not respected correctly)
+
+  * mcalib/MHGausEvents.cc
+    - removed an inconsistency in the naming of fHPowerProbability which 
+      can cause a memory leak (I hope, this was the cause of some of the 
+      leaks we had, but I'm not sure).
+    - removed the setting of fPixId to -1 in the Clear()
 
 

trunk/MagicSoft/Mars/mcalib/MHGausEvents.cc

@@ -179 +179 @@
 
   // delete histograms
-  if (fHPowerProbability)
-    delete fHPowerProbability;
+//  if (fHPowerProbability)
+//      if (gROOT->FindObject(fHPowerProbability->GetName()))
+//        delete fHPowerProbability;
   
   // delete fits
@@ -226 +227 @@
   
   fCurrentSize       = 0;
-  fPixId             = -1;
 
   if (fHPowerProbability)
     {
-      delete fHPowerProbability;
-      fHPowerProbability = NULL;
+        if (gROOT->FindObject(fHPowerProbability->GetName()))
+            delete fHPowerProbability;
+        fHPowerProbability = NULL;
     }
   
@@ -324 +325 @@
 {
 
-  Float_t *xaxis = new Float_t[n];
+  Float_t *xaxis = new Float_t[n];  fHPowerProbability->SetDirectory(NULL);
 
   if (fEventFrequency)
@@ -342 +343 @@
 // Create the fourier spectrum using the class MFFT.
 // The result is projected into a histogram and fitted by an exponential
-// 
+//   fHPowerProbability->SetDirectory(NULL);
 void MHGausEvents::CreateFourierSpectrum()
 {
@@ -386 +387 @@
   fPowerSpectrum     = fourier.PowerSpectrumDensity(&fEvents);
   fHPowerProbability = ProjectArray(*fPowerSpectrum, fPowerProbabilityBins,
-                                    Form("%s%s","PowerProbability",GetName()),
+                                    Form("%s%s","PowerProbability",GetName()),
                                     "Probability of Power occurrance");
   fHPowerProbability->SetXTitle("P(f)");
@@ -392 +393 @@
   fHPowerProbability->GetYaxis()->CenterTitle();
   fHPowerProbability->SetDirectory(NULL);
+  fHPowerProbability->SetBit(kCanDelete);  
   //
   // First guesses for the fit (should be as close to reality as possible,