Changeset 4971 for trunk/MagicSoft/Mars/mreport

Timestamp:

09/13/04 11:43:25 (20 years ago)

Author:

stamerra

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReportTrigger.cc (modified) (7 diffs)
• MReportTrigger.h (modified) (1 diff)

trunk/MagicSoft/Mars/mreport/MReportTrigger.cc

@@ -34 +34 @@
 //  *Input:
 //
-//  The report is divided into 8 sections: 
+//  The report is divided into 9 sections: 
+//  - the name of the Table                 (1 field)
 //  - the cell rates                       (32 fields)
 //  - L1 and L2 table name                 ( 2 fields)
@@ -164 +165 @@
        }
     TString descriptor = str(0, ws);
-    //*fLog  << descriptor <<endl;
     str.Remove(0, ws);
       
@@ -174 +174 @@
         }
       str.Remove(0, len); // Remove Prescal. factors from report string
-      // *fLog << warn << fPrescFactor->fPrescFact[i]<<endl;
-    }
-  str=str.Strip(TString::kLeading);  
-  
-  return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Interprete the Scaler with Live-Deadtime section of the report
+    }
+  str=str.Strip(TString::kLeading);  
+  
+  return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Interprete the Scalers with Live-Deadtime section of the report
 //  Read 4x5 integers separated with a blank
+//  There are 5 scalers,each one with the live and deadtime.
+//  Live and deadtimes have two fields, with the most significant
+//  and less significant bits.
 //
 Bool_t MReportTrigger::InterpreteLiveTime(TString &str)
@@ -255 +257 @@
        }
     
-    TString L1tablename = str(0, wsL1);
+    fL1Tablename = str(0, wsL1);
     str.Remove(0, wsL1);
 
@@ -277 +279 @@
         return kCONTINUE;
       }    
-    TString L2tablename = str(0, wsL2);
+    fL2Tablename = str(0, wsL2);
     str.Remove(0,wsL2);
     str.Strip(TString::kBoth);
@@ -389 +391 @@
     }
 
-    TString tablename = str(0, ws);
+    fTablename = str(0, ws);
     str.Remove(0, ws);
 
@@ -439 +441 @@
     if (!InterpreteIPR(str))
       return kCONTINUE;
-
- 
-
-  //    str.Remove(0,len);
-  //  str.Strip(TString::kBoth);
-
-  //*fLog << warn << " str=" << str << endl;
 
     return str==(TString)"OVER" ? kTRUE : kCONTINUE;

trunk/MagicSoft/Mars/mreport/MReportTrigger.h

@@ -22 +22 @@
   Float_t fL2BeforePrescaler;       // L2 trigger rate before prescaler
   Float_t fL2AfterPrescaler;        // L2 trigger rate after prescaler
+  TString fTablename;               // Name of the trigger table
+  TString fL1Tablename;             // Name of the L1 trigger table
+  TString fL2Tablename;             // Name of the L2 trigger table
   
   MTriggerBit *fBit;                //! container of the L2 prescaler rates