Changeset 8963 for trunk

Timestamp:

06/16/08 00:48:18 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReportCC.cc (modified) (2 diffs)
• MReportCC.h (modified) (1 diff)
• MReportFileRead.cc (modified) (4 diffs)
• MReportFileRead.h (modified) (1 diff)

trunk/MagicSoft/Mars/mreport/MReportCC.cc

@@ -77 +77 @@
         return kFALSE;
 
-    fRecTime = (MTime*)plist.FindCreateObj("MTime", "MTimeRec");
-    if (!fRecTime)
-        return kFALSE;
-
 
     fTH = (MCameraTH*)plist.FindCreateObj("MCameraTH");
@@ -147 +143 @@
     {
         fRecRep->InterpreteRec(str, ver, *fTH, *fTD, *fRecTemp);
-        fRecRep->Copy(*this);
+        Copy(*fRecRep);
         fRecRep->SetReadyToSave();
     }

trunk/MagicSoft/Mars/mreport/MReportCC.h

@@ -27 +27 @@
 
     MReportRec     *fRecRep;  //! Pipe interpretation to MReportRec if necessary
-    MTime          *fRecTime; //! Time stamp for Receiver part of reports
 
     // Internal

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -68 +68 @@
 
     fIn = new ifstream;
+
     fList = new THashTable(1,1);
     fList->SetOwner();
@@ -89 +90 @@
 MReportHelp *MReportFileRead::GetReportHelp(const TString &str) const
 {
-    return (MReportHelp*)fList->FindObject(str);
+    return static_cast<MReportHelp*>(fList->FindObject(str));
 }
 
@@ -143 +144 @@
 Int_t MReportFileRead::PreProcess(MParList *pList)
 {
-    //MTime *time = (MTime*)pList->FindCreateObj("MTime");
-    //if (!time)
-    //    return kFALSE;
     fNumLine = 0;
 
+    // Add the MReport instances first to the paramter list
+    // so that SetupReading can find them if needed
+    fList->R__FOR_EACH(MReportHelp, AddToList)(*pList);
+
+    // Setup reading
     TIter Next(fList);
     MReportHelp *help=0;
@@ -153 +156 @@
         if (!help->SetupReading(*pList))
             return kFALSE;
-
-    fList->R__FOR_EACH(MReportHelp, AddToList)(*pList);
 
     //

trunk/MagicSoft/Mars/mreport/MReportFileRead.h

@@ -8 +8 @@
 #include "MTime.h"
 #endif
-
-/*// gcc 3.2
-//class ifstream;
-#include <iosfwd>
-*/
 
 class THashTable;