Changeset 4766 for trunk/MagicSoft/Mars/mfileio

Timestamp:

08/27/04 16:57:55 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MReadReports.cc (modified) (2 diffs)
• MReadReports.h (modified) (2 diffs)
• MReadTree.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mfileio/MReadReports.cc

@@ -113 +113 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return the number of entries in all trees.
+//
+UInt_t MReadReports::GetEntries()
+{
+    UInt_t n=0;
+
+    TIter NextT(fTrees->GetList());
+    MReadTree *tree=0;
+    while ((tree=(MReadTree*)NextT()))
+        n += tree->GetEntries();
+
+    return n;
+}
+
+// --------------------------------------------------------------------------
+//
+// In case of a Master Tree GetFileName() of the MReadMarsFile is returned.
+// If no master is available "<MReadReports>" is returned.
+//
+TString MReadReports::GetFileName() const
+{
+    if (!TestBit(kHasMaster))
+        return "<MReadReports>";
+
+    TIter NextT(fTrees->GetList());
+    MReadTree *tree=0;
+    while ((tree=(MReadTree*)NextT()))
+        if (tree->InheritsFrom("MReadMarsFile"))
+            return tree->GetFileName();
+
+    return "<n/a>";
+
+}
+
 void MReadReports::AddToBranchList(const char *name)
 {
@@ -150 +186 @@
     t->SetTitle(time?time:"");
     if (master)
-        t->SetBit(kHasMaster);
+        SetBit(kHasMaster);
 
     if (!fEnableAutoScheme)

trunk/MagicSoft/Mars/mfileio/MReadReports.h

@@ -30 +30 @@
     Int_t   FindNextTime();
 
-    UInt_t  GetEntries() { return 0; }
-    TString GetFileName() const { return "<MReadReports>"; };
+    UInt_t  GetEntries();
+    TString GetFileName() const;
 
     Int_t   PreProcess(MParList *plist);
@@ -37 +37 @@
     Int_t   PostProcess();
 
-    //Bool_t  Notify();
-
     enum {
-        //MReadTree::kChainWasChanged = BIT(14)
-        kHasMaster = BIT(15)
+        kHasMaster = BIT(14)
     };
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -566 +566 @@
         ResetBit(kChainWasChanged);
     }
-    return fNumEntries;
+    return fNumEntries==TChain::kBigNumber ? 0 : fNumEntries;
 }
 
@@ -616 +616 @@
     //
     fChain->ResetTree();
+    // Maybe this would be enough, but the above might be safer...
+    //if (fChain->GetTreeNumber()==0)
+    //    fChain->ResetTree();
 
     //