Changeset 4157

Timestamp:

05/24/04 18:46:02 (21 years ago)

Author:

stamerra

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mpisa

Files:

• Changelog_pisa (modified) (1 diff)
• Makefile (modified) (1 diff)
• PisaLinkDef.h (modified) (1 diff)
• classes/MReportTrigger.cc (added)
• classes/MReportTrigger.h (added)
• classes/MTriggerBit.cc (added)
• classes/MTriggerBit.h (added)
• classes/MTriggerCell.cc (added)
• classes/MTriggerCell.h (added)
• classes/MTriggerIPR.h (modified) (2 diffs)
• classes/MTriggerLiveTime.cc (added)
• classes/MTriggerLiveTime.h (added)
• classes/MTriggerPrescFact.cc (added)
• classes/MTriggerPrescFact.h (added)

trunk/MagicSoft/Mars/mtemp/mpisa/Changelog_pisa

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/05/24: Antonio Stamerra
+
+   * mpisa/classes/MTriggerCell.[h.cc]
+     - added new class container for the cell rates from report files (.rep)
+
+   * mpisa/classes/MTriggerBit.[h.cc]
+     - added new class container for the L2 bits rates from report files (.rep)
+
+   * mpisa/classes/MTriggerPrescFact.[h.cc]
+     - added new class container for the prescaling factors from 
+        report files (.rep)
+
+   * mpisa/classes/MTriggerReport.[h.cc]
+     - added copy of the mreport/MReportTrigger class to modify to new
+        report file format and to use the trigger class containers
+
+
  2004/05/21: Antonio Stamerra
 

trunk/MagicSoft/Mars/mtemp/mpisa/Makefile

@@ -38 +38 @@
 
 SRCFILES = \
-        ./classes/MTriggerIPR.cc
+        ./classes/MTriggerIPR.cc \
+        ./classes/MTriggerCell.cc \
+        ./classes/MTriggerBit.cc \
+        ./classes/MTriggerPrescFact.cc \
+        ./classes/MTriggerLiveTime.cc
 
 ############################################################

trunk/MagicSoft/Mars/mtemp/mpisa/PisaLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MTriggerIPR+;
+#pragma link C++ class MTriggerCell+;
+#pragma link C++ class MTriggerBit+;
+#pragma link C++ class MTriggerPrescFact+;
+#pragma link C++ class MTriggerLiveTime+;
 
 #endif

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

@@ -15 +15 @@
 class MTriggerIPR : public MParContainer, public MCamEvent
 {
-    friend class MReportCamera;
+    friend class MReportTrigger;
 private:
     Byte_t  fStatus;        // Monitor of the L2T status
 
-    TArrayL fIPR;            // Array of the measured IPR
+    TArrayL fIPR;            // [Hz] IPR (Individual Pixel Rates)
+    
+    Int_t gsNTrigPix=397;  // number of trigger pixels
 
 public:
-    MTriggerIPR() : fIPR(397)
+    MTriggerIPR() : fIPR(gsNTrigPix)
     {
         fName  = "MTriggerIPR";
@@ -32 +34 @@
     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
     {
-        val = fIPR[idx];
-        return val>0;
+      if (idx > gsNTrigPix)
+        return kFALSE;
+
+      val = fIPR[idx];
+      return val>0;
     }
 
-    Double_t operator[](const UInt_t idx) { return fIPR[idx]; }
+    Double_t operator[](const UInt_t idx) 
+      {
+        if (idx > gsNTrigPix)
+          return kFALSE;
+
+        return fIPR[idx]; 
+      } 
 
     void DrawPixelContent(Int_t num) const