Changeset 3226 for trunk/MagicSoft/Mars

Timestamp:

02/18/04 15:36:57 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MReadReports.cc (modified) (1 diff)
• mgui/MCamEvent.cc (modified) (1 diff)
• mhbase/MFillH.cc (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -15 +15 @@
    * manalysis/MPedestalCam.h
      - Changed order of derivements - seems to be VERY important!
+
+   * mfileio/MReadReports.cc:
+     - skip trees with no entries
+
+   * mgui/MCamEvent.cc:
+     - added a comment
+
+   * mhbase/MFillH.cc:
+     - in case SetupFill returns kFALSE and kCanSkip is set
+       Skip task
+
+   * mraw/MRawFileRead.cc:
+     - don't print warning in case of none executions
 
 

trunk/MagicSoft/Mars/mfileio/MReadReports.cc

@@ -205 +205 @@
         }
 
+        if (tree->GetEntries()==0)
+        {
+            *fLog << warn << "No events in tree '" << tree->GetName() << "'... skipped." << endl;
+            fTrees->RemoveFromList(tree);
+            continue;
+        }
+
         TString tn(tree->GetTitle());
         if (tn.IsNull())

trunk/MagicSoft/Mars/mgui/MCamEvent.cc

@@ -31 +31 @@
 // If GetPixelContent returns kFALSE, it must not touch 'val'.
 //
+// You can derive a class in addition to TObject from MCamEvent, too.
+//
+// MCamEvent MUST be after TObject:
+//  ALLOWED:   class MyClass : public TObject, public MCamEvent
+//  FORBIDDEN: class MyClass : public MCamEvent, public TObject
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MCamEvent.h"

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -449 +449 @@
     if (!fH->SetupFill(pList))
     {
-        *fLog << err << "ERROR - Calling SetupFill for ";
-        *fLog << fH->GetDescriptor() << "... aborting." << endl;
-        return kFALSE;
+        *fLog << (TestBit(kCanSkip) ? warn : err);
+        *fLog << (TestBit(kCanSkip) ? "WARNING" : "ERROR");
+        *fLog << " Calling SetupFill for " << fH->GetDescriptor() << "...";
+        *fLog << (TestBit(kCanSkip) ? "skipped." : "aborting.");
+
+        return TestBit(kCanSkip) ? kSKIP : kFALSE;
     }
 

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -199 +199 @@
     // Sanity check for the number of events
     //
-    if (fRawRunHeader->GetNumEvents() == GetNumExecutions()-1)
+    if (fRawRunHeader->GetNumEvents()==GetNumExecutions()-1 || GetNumExecutions()==0)
         return kTRUE;
 
-    *fLog << warn << "Warning - number of read events (" << GetNumExecutions()-1;
+    *fLog << warn << dec;
+    *fLog << "Warning - number of read events (" << GetNumExecutions()-1;
     *fLog << ") doesn't match number in run header (";
     *fLog << fRawRunHeader->GetNumEvents() << ")." << endl;