Changeset 4185 for trunk/MagicSoft/Mars

Timestamp:

05/25/04 19:28:46 (21 years ago)

Author:

stamerra

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mpisa

Files:

• Changelog_pisa (modified) (1 diff)
• classes/MReportTrigger.cc (modified) (8 diffs)
• classes/MReportTrigger.h (modified) (2 diffs)
• classes/mtrigger (added)
• classes/mtrigger/MTriggerBit.cc (added)
• classes/mtrigger/MTriggerBit.h (added)
• classes/mtrigger/MTriggerCell.cc (added)
• classes/mtrigger/MTriggerCell.h (added)
• classes/mtrigger/MTriggerIPR.cc (added)
• classes/mtrigger/MTriggerIPR.h (added)
• classes/mtrigger/MTriggerLiveTime.cc (added)
• classes/mtrigger/MTriggerLiveTime.h (added)
• classes/mtrigger/MTriggerPrescFact.cc (added)
• classes/mtrigger/MTriggerPrescFact.h (added)
• classes/mtrigger/Makefile (added)
• classes/mtrigger/TriggerCint.cc (added)
• classes/mtrigger/TriggerCint.h (added)
• classes/mtrigger/TriggerIncl.h (added)
• classes/mtrigger/TriggerLinkDef.h (added)

trunk/MagicSoft/Mars/mtemp/mpisa/Changelog_pisa

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/05/24: Antonio Stamerra
+
+   * mpisa/classes/MTriggerLiveTime.[h.cc]
+     - added new class container for the Live-Deadtime from report files (.rep)
+        
+   * mpisa/classes/mtrigger
+     - added new directory for the MTrigger* classes. These
+        classes have been moved there. 
+     - Various modifications have been made on these classes.
+        The MReportTrigger now fills these containers.
+
  2004/05/24: Antonio Stamerra
 

trunk/MagicSoft/Mars/mtemp/mpisa/classes/MReportTrigger.cc

@@ -34 +34 @@
 #include "MReportTrigger.h"
 
+#include "MParList.h"
+
 #include "MLogManip.h"
 #include "MTriggerIPR.h"
+#include "MTriggerCell.h"
+#include "MTriggerBit.h"
+#include "MTriggerPrescFact.h"
+#include "MTriggerLiveTime.h"
 
 ClassImp(MReportTrigger);
@@ -45 +51 @@
 // Default construtor. Initialize identifier to "TRIGGER-REPORT"
 //
-MReportTrigger::MReportTrigger() : MReport("TRIGGER-REPORT"), fPrescalerRates(19)
+MReportTrigger::MReportTrigger() : MReport("TRIGGER-REPORT")
 {
     fName  = "MReportTrigger";
@@ -76 +82 @@
   if (!fPrescFactor)
     return kFALSE;
+
+  fLiveTime = (MTriggerLiveTime*)plist.FindCreateObj("MTriggerLiveTime");
+  if (!fLiveTime)
+    return kFALSE;
   
   return MReport::SetupReading(plist);
@@ -83 +93 @@
 //
 // Interprete the Cell rates part of the report
-//
-Int_t MReportTrigger::InterpreteCell(TString &str)
-{
+//  Read 32 floats separated with a blank
+//
+Bool_t MReportTrigger::InterpreteCell(TString &str)
+{
+  Int_t len, n, i=0;
+  Int_t gsNCells=32;
+
+  const char *pos = str.Data();
+  const char *end = str.Data() + gsNCells;
+
+  while (pos < end)
+    {
+      n = sscanf(pos, " %f %n", &fCell->fCellRate[i++], &len);
+      if (n!=1)
+        {
+          *fLog << warn << "WARNING - Cell Scaler Value #" << i << " missing." << endl;
+          return kCONTINUE;
+        }
+      pos += len;
+    }
 
   return kTRUE;
@@ -94 +121 @@
 // Interprete the Bit rates part of the report
 //
-Int_t MReportTrigger::InterpreteBit(TString &str)
+Bool_t MReportTrigger::InterpreteBit(TString &str)
 {
 
@@ -104 +131 @@
 // Interprete the IPR part of the report
 //
-Int_t MReportTrigger::InterpreteIPR(TString &str)
+Bool_t MReportTrigger::InterpreteIPR(TString &str)
 {
 
@@ -114 +141 @@
 // Interprete the Prescaling factors part of the report
 //
-Int_t MReportTrigger::InterpretePrescFact(TString &str)
+Bool_t MReportTrigger::InterpretePrescFact(TString &str)
 {
 
@@ -215 +242 @@
 
                            */
-    str.Remove(0, pos-str.Data());
+
+    Int_t len=1;
+    str.Remove(0,len);
     str.Strip(TString::kBoth);
 

trunk/MagicSoft/Mars/mtemp/mpisa/classes/MReportTrigger.h

@@ -13 +13 @@
 class MTriggerCell;
 class MTriggerBit;
+class MTriggerPrescFact;
+class MTriggerLiveTime;
 
 class MReportTrigger : public MReport
@@ -27 +29 @@
   MTriggerCell *fCell;      // container of the L1 cell trigger rates
   MTriggerPrescFact *fPrescFactor;   //container of the L2 prescaling factors
+  MTriggerLiveTime *fLiveTime; //container of the scaler live-deadtime 
   
   Bool_t SetupReading(MParList &plist);
-  Bool_t CheckVersion(TString &str) const;
 
   Bool_t InterpreteIPR(TString &str);