Changeset 3144 for trunk

Timestamp:

02/13/04 18:02:54 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MReadReports.cc (modified) (3 diffs)
• mfileio/MReadTree.cc (modified) (1 diff)
• mhbase/MFillH.cc (modified) (3 diffs)
• mhbase/MFillH.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -92 +92 @@
      mjobs/MJPedestal.cc:
      - fixed usage of AddNotify
+
+   * mfileio/MReadReports.cc:
+     - use a different way to determin whether the tree is a valid tree,
+       skip invalid trees
+       
+   * mfileio/MReadTree.cc:
+     - added another sanity check at the beginning of PreProcess
+     
+   * mhbase/MFillH.[h,cc]:
+     - added bit kCanSkip which skips MFillH in case the necessary container
+       wasn't found.
+     - cd into the corresponding canvas before filling the MH
 
 

trunk/MagicSoft/Mars/mfileio/MReadReports.cc

@@ -198 +198 @@
     while ((tree=(MReadTree*)NextT()))
     {
-        if (((TChain*)tree->fChain)->GetListOfFiles()->GetEntries()==0)
+        if (!((TChain*)tree->fChain)->GetFile())
         {
-            *fLog << warn << "No files for Tree " << tree->GetName() << "... skipped." << endl;
+            *fLog << warn << "No files or no tree '" << tree->GetName() << "'... skipped." << endl;
+            fTrees->RemoveFromList(tree);
             continue;
         }
@@ -240 +241 @@
     }
 
+    if (i==0)
+    {
+        *fLog << err << "Files do not contain any valid tree... abort." << endl;
+        return kFALSE;
+    }
+
     fPosEntry.Set(i);
 
@@ -338 +345 @@
         }
 
+        *fLog << dbg << "Removing chain " << chain->GetName() << " from list." << endl;
+
         delete *GetTime(chain);
         delete  GetTime(chain);

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -597 +597 @@
 
     //
+    // check for files and for the tree!
+    //
+    if (!fChain->GetFile())
+    {
+        *fLog << err << GetDescriptor() << ": No file or no tree with name " << fChain->GetName() << " in file." << endl;
+        return kFALSE;
+    }
+
+    //
     // get number of events in this tree
     //
     if (!GetEntries())
     {
-        *fLog << warn << GetDescriptor() << ": No entries found in file(s)" << endl;
+        *fLog << err << GetDescriptor() << ": No entries found in file(s)" << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -395 +395 @@
 
         if (!fWeight)
-          {
-            *fLog << err << fWeightName << " [MWeight] not found... aborting." << endl;
-            return kFALSE;
-          }
+        {
+            *fLog << err << fWeightName << " [MWeight] not found... aborting." << endl;
+            return kFALSE;
+        }
     }
 
@@ -474 +474 @@
         return DrawToDisplay();
 
+    if (TestBit(kCanSkip))
+    {
+        *fLog << warn << fParContainerName << " [MParContainer] not found... skipped." << endl;
+        return kSKIP;
+    }
+
     *fLog << err << fParContainerName << " [MParContainer] not found... aborting." << endl;
     return kFALSE;
@@ -501 +507 @@
      */
 
-    return fH->Fill(fParContainer, fWeight?fWeight->GetWeight():1);
+    TVirtualPad *save = gPad;
+    if (fCanvas)
+        fCanvas->cd();
+
+    Bool_t rc = fH->Fill(fParContainer, fWeight?fWeight->GetWeight():1);
+
+    if (save && fCanvas)
+        save->cd();
+
+    return rc;
 } 
 

trunk/MagicSoft/Mars/mhbase/MFillH.h

@@ -18 +18 @@
 public:
     enum {
-        kDoNotDisplay = BIT(17)
+        kDoNotDisplay = BIT(17),
+        kCanSkip      = BIT(18)
     };