Changeset 2800 for trunk/MagicSoft/Mars/mreport

Timestamp:

01/14/04 10:13:02 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

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

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -42 +42 @@
 #include <fstream>
 
-#include <TClass.h>
 #include <TRegexp.h>
 #include <THashTable.h>
@@ -49 +48 @@
 #include "MLogManip.h"
 
-#include "MReport.h"
 #include "MParList.h"
+#include "MReportHelp.h"
 
 ClassImp(MReportFileRead);
@@ -58 +57 @@
 const TString MReportFileRead::gsReportHeader ="[CC Report File]";
 const TString MReportFileRead::gsVersionPrefix="Arehucas Version Number";
-
-class MReportHelp : public TObject
-{
-private:
-    MReport *fReport;
-    ULong_t  fNumReports;
-
-public:
-    MReportHelp(const char *name, MLog *fLog) : fReport(NULL), fNumReports(0)
-    {
-        TClass *cls = gROOT->GetClass(name);
-        Int_t rc = 0;
-        if (!cls)
-            rc =1;
-        else
-        {
-            if (!cls->Property())
-                rc = 5;
-            if (!cls->Size())
-                rc = 4;
-            if (!cls->IsLoaded())
-                rc = 3;
-            if (!cls->HasDefaultConstructor())
-                rc = 2;
-        }
-
-        if (rc)
-        {
-            *fLog << err << dbginf << "Cannot create new instance of class '" << name << "': ";
-            switch (rc)
-            {
-            case 1:
-                *fLog << "gROOT->GetClass() returned NULL." << endl;
-                return;
-            case 2:
-                *fLog << "no default constructor." << endl;
-                return;
-            case 3:
-                *fLog << "not loaded." << endl;
-                return;
-            case 4:
-                *fLog << "zero size." << endl;
-                return;
-            case 5:
-                *fLog << "no property." << endl;
-                return;
-            }
-        }
-
-        //
-        // create the parameter container of the the given class type
-        //
-        fReport = (MReport*)cls->New();
-    }
-    ~MReportHelp() { if (fReport) delete fReport; }
-
-    const char *GetName() const { return fReport->GetIdentifier(); }
-    ULong_t GetNumReports() const { return fNumReports; }
-    ULong_t Hash() const { return fReport->GetIdentifier().Hash(); }
-    MReport *GetReport() { return fReport; }
-    //void SetTime(MTime *t) { fReport->SetTime(t); }
-    Int_t Interprete(TString &str, const MTime &start, const MTime &stop)
-    {
-        const Int_t rc = fReport->Interprete(str, start, stop);
-
-        if (rc==kFALSE)
-            return kFALSE;
-
-        fNumReports++;
-        return rc;
-    }
-    Bool_t SetupReading(MParList &plist) { return fReport->SetupReading(plist); }
-    void AddToList(MParList &plist) { plist.AddToList(fReport); }
-};
 
 // --------------------------------------------------------------------------
@@ -183 +108 @@
     MReportHelp *help = new MReportHelp(name, fLog);
 
-    MReport *rep = NULL;
-    if (!(rep=help->GetReport()))
-        return kFALSE;
-
-    if (GetReport(rep->GetIdentifier()))
+    if (!help->GetReport())
+        return kFALSE;
+
+    if (GetReport(help->GetName()))
     {
         *fLog << warn << "WARNING - Report with Identifier '";
-        *fLog << rep->GetIdentifier() << "' already added to the list... ";
+        *fLog << help->GetName() << "' already added to the list... ";
         *fLog << "ignored." << endl;
         delete help;

trunk/MagicSoft/Mars/mreport/Makefile

@@ -33 +33 @@
            MReportRun.cc \
            MReportDAQ.cc \
+           MReportHelp.cc \
            MReportDrive.cc \
            MReportCamera.cc \
@@ -49 +50 @@
 include ../Makefile.rules
 
-clean:  rmcint rmobjs rmcore rmlib
+#clean: rmcint rmobjs rmcore rmlib
 
 mrproper:       clean rmbak

trunk/MagicSoft/Mars/mreport/ReportLinkDef.h

@@ -15 +15 @@
 #pragma link C++ class MReportCurrents+;
 
+#pragma link C++ class MReportHelp+;
 #pragma link C++ class MReportFileRead+;