Changeset 1130 for trunk/MagicSoft/Mars/mbase

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (2 diffs)
• MReadTree.cc (modified) (2 diffs)

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;