Changeset 1130 for trunk/MagicSoft

Timestamp:

12/19/01 14:13:31 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MMcPedestalNSBAdd.cc (modified) (2 diffs)
• mbase/MEvtLoop.cc (modified) (2 diffs)
• mbase/MReadTree.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
      - fix bug of Pedestal and Pedestal fluctuaions correspondence.
 
+ 2001/12/19: Thomas Bretz
+ 
+   * mbase/MEvtLoop.cc:
+     - added #ifdef directive to make it work on older root also
+     
+   * mbase/MReadTree.cc:
+     - added #ifdef directive to get rid of the memory leak in prior
+       root 3.02/* versions
+
+
+     
  2001/12/18: Thomas Bretz
  

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc

@@ -180 +180 @@
     pedestals->InitSize(num);
 
-    MGeomPix &pixgeom0 = (*geometry)[0];
-    const Float_t size0   = pixgeom0.GetR()*pixgeom0.GetR();
+    const Float_t size0 = (*geometry)[0].GetR()*(*geometry)[0].GetR();
 
     for (int i=0; i<num; i++)
@@ -188 +187 @@
         MGeomPix     &pixgeom = (*geometry)[i];
 
-        const Float_t pedrms = pix.GetSigma();
-        const Float_t size   = pixgeom.GetR()*pixgeom.GetR()/size0;
+        const Float_t pedrms  = pix.GetSigma();
+        const Float_t size    = pixgeom.GetR()*pixgeom.GetR()/size0;
 
-        pix.SetSigma(sqrt(pedrms*pedrms+fDnsbPixel*fadc->GetAmplitud()*fadc->GetAmplitud()*size));
+        const Float_t ampl    = fadc->GetAmplitud();
+
+        pix.SetSigma(sqrt(pedrms*pedrms + fDnsbPixel*ampl*ampl*size));
     }
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -190 +190 @@
             {
                 fProgress->SetPosition(++dummy);
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)
+                gSystem->ProcessEvents();
+#else
                 gClient->ProcessEventsFor(fProgress);
+#endif
             }
         else
@@ -200 +204 @@
             {
                 fProgress->SetPosition(maxcnt - dummy);
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)
+                gSystem->ProcessEvents();
+#else
                 gClient->ProcessEventsFor(fProgress);
+#endif
             }
         else

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -565 +565 @@
 //  If the end of the file is reached the Eventloop is stopped.
 //
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)
+#include "../mraw/MRawEvtData.h"
+#endif
 Bool_t MReadTree::Process()
 {
@@ -573 +576 @@
     if (fNumEntry >= fNumEntries)
         return kFALSE;
+
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)
+    //
+    // This fixes 99.9% of a memory leak using a root version prior
+    // to 3.02/??
+    //
+    TChainElement *element=NULL;
+    TIter Next(fChain->GetStatus());
+    while ((element=(TChainElement*)Next()))
+    {
+        MParContainer **c = (MParContainer**)element->GetBaddress();
+        if (!c) continue;
+        if ((*c)->InheritsFrom(MRawEvtData::Class()))
+            ((MRawEvtData*)(*c))->DeletePixels(kFALSE);
+
+    }
+#endif
 
     Bool_t rc = fChain->GetEntry(fNumEntry++) != 0;