Changeset 2556 for trunk/MagicSoft/Mars/mreport

Timestamp:

11/22/03 15:31:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReportCamera.h (modified) (3 diffs)
• MReportFileRead.cc (modified) (4 diffs)
• MReportFileRead.h (modified) (1 diff)
• MReportTrigger.cc (modified) (6 diffs)
• MReportTrigger.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mreport/MReportCamera.h

@@ -10 +10 @@
 class MCameraHV;
 class MCameraLV;
+class MCameraAUX;
 class MCameraCalibration;
 
@@ -20 +21 @@
     MCameraCooling     *fCooling;
     MCameraLids        *fLids;
+    MCameraAUX         *fAUX;
     MCameraHV          *fHV;
     MCameraLV          *fLV;
@@ -27 +29 @@
     Bool_t CheckTag(TString &str, const char *tag) const;
 
+    Bool_t InterpreteCamera(TString &str);
     Bool_t InterpreteDC(TString &str);
     Bool_t InterpreteHV(TString &str);

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -32 +32 @@
 #include <fstream>
 
+#include <TClass.h>
 #include <TRegexp.h>
 #include <THashTable.h>
@@ -55 +56 @@
 
 public:
-    MReportHelp(MReport *rep) : fReport(rep), fNumReports(0) { }
+    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; }
@@ -113 +161 @@
 }
 
-Bool_t MReportFileRead::AddToList(MReport *rep) const
-{
+Bool_t MReportFileRead::AddToList(const char *name) const
+{
+    MReportHelp *help = new MReportHelp(name, fLog);
+
+    MReport *rep = NULL;
+    if (!(rep=help->GetReport()))
+        return kFALSE;
+
     if (GetReport(rep->GetIdentifier()))
     {
@@ -120 +174 @@
         *fLog << rep->GetIdentifier() << "' already added to the list... ";
         *fLog << "ignored." << endl;
-        return kFALSE;
-    }
-
-    fList->Add(new MReportHelp(rep));
+        delete help;
+        return kFALSE;
+    }
+
+    fList->Add(help);
     return kTRUE;
 }

trunk/MagicSoft/Mars/mreport/MReportFileRead.h

@@ -40 +40 @@
     ~MReportFileRead();
 
-    Bool_t AddToList(MReport *rep) const;
+    Bool_t AddToList(const char *name) const;
 
     ClassDef(MReportFileRead, 0)        // Task to read the raw data binary file

trunk/MagicSoft/Mars/mreport/MReportTrigger.cc

@@ -36 +36 @@
 using namespace std;
 
-MReportTrigger::MReportTrigger() : MReport("TRIGGER-REPORT")
+MReportTrigger::MReportTrigger() : MReport("TRIGGER-REPORT"), fPrescalerRates(19)//, fRates(11)
 {
     fName = "MReportTrigger";
@@ -44 +44 @@
 {
     str = str.Strip(TString::kLeading);
-    Int_t pos = str.First(' ');
-    if (pos<=0)
+
+    const Int_t ws = str.First(' ');
+    if (ws<=0)
     {
         *fLog << err << "ERROR - Cannot determin name of trigger table." << endl;
@@ -51 +52 @@
     }
 
-    TString tablename = str(0, pos);
-    str.Remove(0, pos);
+    TString tablename = str(0, ws);
+    str.Remove(0, ws);
 
     Int_t len, n;
 
-    pos = 0;
+    const char *pos = str.Data();
     for (int i=0; i<19; i++)
     {
-        n = sscanf(str.Data()+pos, " %f %n", &fScalerRate[i], &len);
+        n = sscanf(pos, " %f %n", &fPrescalerRates[i], &len);
         if (n!=1)
         {
@@ -67 +68 @@
         pos += len;
     }
-    n = sscanf(str.Data()+pos, " %f %f %n", &fL1TriggerRate,
-               &fL2TriggerRate, &len);
+    n = sscanf(pos, " %f %f %n", &fL2BeforePrescaler, &fL2AfterPrescaler, &len);
     if (n!=2)
     {
@@ -77 +77 @@
     for (int i=0; i<11; i++)
     {
-        n = sscanf(str.Data()+pos, " %f %n", &fRates[i], &len);
+        Float_t dummy;
+        n = sscanf(pos, " %f %n", &dummy/*fRates[i]*/, &len);
         if (n!=1)
         {
@@ -85 +86 @@
         pos += len;
     }
-    str.Remove(0, pos);
+    str.Remove(0, pos-str.Data());
     str.Strip(TString::kBoth);
-
-    *fLog << "T" << flush;
 
     return str==(TString)"OVER";

trunk/MagicSoft/Mars/mreport/MReportTrigger.h

@@ -6 +6 @@
 #endif
 
+#ifndef ROOT_TArrayF
+#include <TArrayF.h>
+#endif
+
 class MReportTrigger : public MReport
 {
 private:
-    Float_t fScalerRate[19];
-    Float_t fL1TriggerRate;
-    Float_t fL2TriggerRate;
-    Float_t fRates[13];
+    Float_t fL2BeforePrescaler; // L2 trigger rate before prescaler
+    Float_t fL2AfterPrescaler;  // L2 trigger rate before prescaler
+
+    TArrayF fPrescalerRates;    //[Hz] L2 prescaler rates
+    //TArrayF fRates;           //[Hz] curently undefined
 
 public:
@@ -19 +24 @@
     Bool_t InterpreteBody(TString &str);
 
-    ClassDef(MReportTrigger, 0) // Base class for control reports
+    ClassDef(MReportTrigger, 1) // Base class for control reports
 };