Changeset 2532

Timestamp:

11/19/03 18:47:36 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mfileio/MReadTree.cc (modified) (1 diff)
• mreport/MReport.cc (modified) (4 diffs)
• mreport/MReport.h (modified) (2 diffs)
• mreport/MReportFileRead.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -909 +909 @@
 }
 
-TString MReadTree::GetTreeName() const
-{
-    return fChain->GetName();
-}
-
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -84 +84 @@
 }
 
-MTime *MReport::FindTime(MParList &plist)
+Bool_t MReport::SetupReading(MParList &plist)
 {
     fTime = NULL;
@@ -93 +93 @@
         *fLog << warn << " WARNING - Class name '" << id << "' ";
         *fLog << " doesn't begin with 'MReport'... no MTime assigned." << endl;
-        return NULL;
+        return kFALSE;
     }
 
@@ -100 +100 @@
     {
         *fLog << warn << " WARNING - No postfix existing... no MTime assigned." << endl;
-        return NULL;
+        return kFALSE;
     }
 
@@ -106 +106 @@
 
     fTime = (MTime*)plist.FindCreateObj("MTime", id);
-    return fTime;
+    if (!fTime)
+        return kFALSE;
+
+    return kTRUE;
 }

trunk/MagicSoft/Mars/mreport/MReport.h

@@ -23 +23 @@
     MReport(const char *id) : fIdentifier(id), fState(0xff), fTime(0) { }
 
+    virtual Bool_t SetupReading(MParList &plist);
     virtual Bool_t InterpreteBody(TString &str);
+
     Bool_t Interprete(TString &str);
     Bool_t CheckIdentifier(TString &str) const
@@ -38 +40 @@
     const TString &GetIdentifier() const { return fIdentifier; }
 
-    void SetTime(MTime *t) { fTime = t; }
-
-    MTime *FindTime(MParList &plist);
-
     ClassDef(MReport, 1) // Base class for control reports
 };

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -69 +69 @@
         return kTRUE;
     }
-    void SetTime(MParList &plist) { fReport->FindTime(plist); }
+    Bool_t SetupReading(MParList &plist) { return fReport->SetupReading(plist); }
     void AddToList(MParList &plist) { plist.AddToList(fReport); }
 };
@@ -184 +184 @@
     //    return kFALSE;
 
-    fList->ForEach(MReportHelp, SetTime)(*pList);
+    TIter Next(fList);
+    MReportHelp *help=0;
+    while ((help=(MReportHelp*)Next()))
+        if (!help->SetupReading(*pList))
+            return kFALSE;
+
     fList->ForEach(MReportHelp, AddToList)(*pList);