Changeset 2529 for trunk/MagicSoft/Mars/mreport

Timestamp:

11/19/03 00:03:53 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReport.cc (modified) (2 diffs)
• MReport.h (modified) (3 diffs)
• MReportFileRead.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -33 +33 @@
 
 #include "MTime.h"
+#include "MParList.h"
 
 ClassImp(MReport);
@@ -82 +83 @@
     return kTRUE;
 }
+
+MTime *MReport::FindTime(MParList &plist)
+{
+    fTime = NULL;
+
+    TString id(ClassName());
+    if (!id.BeginsWith("MReport"))
+    {
+        *fLog << warn << " WARNING - Class name '" << id << "' ";
+        *fLog << " doesn't begin with 'MReport'... no MTime assigned." << endl;
+        return NULL;
+    }
+
+    id.Remove(0, 7);
+    if (id.IsNull())
+    {
+        *fLog << warn << " WARNING - No postfix existing... no MTime assigned." << endl;
+        return NULL;
+    }
+
+    id.Prepend("MTime");
+
+    fTime = (MTime*)plist.FindCreateObj("MTime", id);
+    return fTime;
+}

trunk/MagicSoft/Mars/mreport/MReport.h

@@ -7 +7 @@
 
 class MTime;
+class MParList;
 
 class MReport : public MParContainer
@@ -14 +15 @@
 
     Byte_t  fState;
-    MTime  *fTime;
+    MTime  *fTime;             //!
 
     ULong_t Hash() const { return fIdentifier.Hash(); }
@@ -39 +40 @@
     void SetTime(MTime *t) { fTime = t; }
 
-    static Bool_t ReadAngle(TString &str, Double_t &ret);
+    MTime *FindTime(MParList &plist);
 
-    ClassDef(MReport, 0) // Base class for control reports
+    ClassDef(MReport, 1) // Base class for control reports
 };
 

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -60 +60 @@
     ULong_t Hash() const { return fReport->GetIdentifier().Hash(); }
     MReport *GetReport() { return fReport; }
-    void SetTime(MTime *t) { fReport->SetTime(t); }
+    //void SetTime(MTime *t) { fReport->SetTime(t); }
     Bool_t Interprete(TString &str)
     {
@@ -69 +69 @@
         return kTRUE;
     }
+    void SetTime(MParList &plist) { fReport->FindTime(plist); }
+    void AddToList(MParList &plist) { plist.AddToList(fReport); }
 };
 
@@ -178 +180 @@
 Int_t MReportFileRead::PreProcess(MParList *pList)
 {
-    MTime *time = (MTime*)pList->FindCreateObj("MTime");
-    if (!time)
-        return kFALSE;
-
-    fList->ForEach(MReportHelp, SetTime)(time);
+    //MTime *time = (MTime*)pList->FindCreateObj("MTime");
+    //if (!time)
+    //    return kFALSE;
+
+    fList->ForEach(MReportHelp, SetTime)(*pList);
+    fList->ForEach(MReportHelp, AddToList)(*pList);
 
     //
@@ -249 +252 @@
     fIn->close();
 
+    if (!GetNumExecutions())
+        return kTRUE;
+
     *fLog << inf << endl;
     *fLog << GetDescriptor() << " statistics:" << endl;