Changeset 5903 for trunk/MagicSoft/Mars

Timestamp:

01/19/05 14:44:48 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mtrigger/MFTriggerPattern.cc (modified) (5 diffs)
• mtrigger/MFTriggerPattern.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -36 +36 @@
    * mjobs/MJPedestal.cc:
      - aligned screen output to 80col rule
+
+   * mtrigger/MFTriggerPattern.[h,cc]:
+     - assigned correct integers to enum
+     - made sure that the enum is correctly handled in all function by
+       applying a r-value to the condition
 
 

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.cc

@@ -92 +92 @@
 
     // Check whether all the bits required are ON
-    if ( ((p & fMaskRequiredPrescaled) == fMaskRequiredPrescaled)
-         && ((u & fMaskRequiredUnprescaled) == fMaskRequiredUnprescaled))
+    if ( ((p & fMaskRequiredPrescaled)   == fMaskRequiredPrescaled) &&
+         ((u & fMaskRequiredUnprescaled) == fMaskRequiredUnprescaled))
       fResult = kTRUE;
 
@@ -105 +105 @@
 void MFTriggerPattern::RequireTriggerLvl1(Prescale_t prescaled)
 {
-    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl1) : (fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl1);
+    prescaled==kPrescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl1) : (fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl1);
 }
 
 void MFTriggerPattern::RequireTriggerLvl2(Prescale_t prescaled)
 {
-    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl2) : (fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl2);
+    prescaled==kPrescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl2) : (fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl2);
 }
 
 void MFTriggerPattern::RequireCalibration(Prescale_t prescaled)
 {
-    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kCalibration) : (fMaskRequiredUnprescaled |= MTriggerPattern::kCalibration);
+    prescaled==kPrescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kCalibration) : (fMaskRequiredUnprescaled |= MTriggerPattern::kCalibration);
 }
 
 void MFTriggerPattern::RequirePedestal(Prescale_t prescaled)
 {
-    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kPedestal)    : (fMaskRequiredUnprescaled |= MTriggerPattern::kPedestal);
+    prescaled==kPrescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kPedestal)    : (fMaskRequiredUnprescaled |= MTriggerPattern::kPedestal);
 }
 
 void MFTriggerPattern::RequirePinDiode(Prescale_t prescaled)
 {
-    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kPinDiode)    : (fMaskRequiredUnprescaled |= MTriggerPattern::kPinDiode);
+    prescaled==kPrescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kPinDiode)    : (fMaskRequiredUnprescaled |= MTriggerPattern::kPinDiode);
 }
 
@@ -131 +131 @@
 void MFTriggerPattern::DenyTriggerLvl1(Prescale_t prescaled)
 {
-    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl1) : (fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl1);
+    prescaled==kPrescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl1) : (fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl1);
 }
 
 void MFTriggerPattern::DenyTriggerLvl2(Prescale_t prescaled)
 {
-    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl2) : (fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl2);
+    prescaled==kPrescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl2) : (fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl2);
 }
 
 void MFTriggerPattern::DenyCalibration(Prescale_t prescaled)
 {
-    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kCalibration) : (fMaskDeniedUnprescaled |= MTriggerPattern::kCalibration);
+    prescaled==kPrescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kCalibration) : (fMaskDeniedUnprescaled |= MTriggerPattern::kCalibration);
 }
 
 void MFTriggerPattern::DenyPedestal(Prescale_t prescaled)
 {
-    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPedestal)    : (fMaskDeniedUnprescaled |= MTriggerPattern::kPedestal);
+    prescaled==kPrescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPedestal)    : (fMaskDeniedUnprescaled |= MTriggerPattern::kPedestal);
 }
 
 void MFTriggerPattern::DenyPinDiode(Prescale_t prescaled)
 {
-    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPinDiode)    : (fMaskDeniedUnprescaled |= MTriggerPattern::kPinDiode);
+    prescaled==kPrescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPinDiode)    : (fMaskDeniedUnprescaled |= MTriggerPattern::kPinDiode);
 }
 
@@ -176 +176 @@
 void MFTriggerPattern::SetMaskRequired(const Byte_t mask, Prescale_t prescaled)
 {
-    prescaled ? (fMaskRequiredPrescaled = mask) : (fMaskRequiredUnprescaled = mask);
+    prescaled==kPrescaled ? (fMaskRequiredPrescaled = mask) : (fMaskRequiredUnprescaled = mask);
 }
 
@@ -201 +201 @@
 void MFTriggerPattern::SetMaskDenied(const Byte_t mask, Prescale_t prescaled)
 {
-    prescaled ? (fMaskDeniedPrescaled  = mask) : (fMaskDeniedUnprescaled  = mask);
+    prescaled==kPrescaled ? (fMaskDeniedPrescaled  = mask) : (fMaskDeniedUnprescaled  = mask);
 }
 

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.h

@@ -10 +10 @@
 class MFTriggerPattern : public MFilter
 {
- private:
+public:
+    enum Prescale_t {
+        kUnPrescaled,
+        kPrescaled
+    };
+
+private:
   MTriggerPattern *fPattern;        //!
   
@@ -25 +31 @@
   Bool_t IsExpressionTrue() const;
   
- public:
-  enum Prescale_t {
-    kUnPrescaled = kFALSE, 
-    kPrescaled   = kTRUE };
-
+public:
   MFTriggerPattern(const char *name=NULL, const char *title=NULL);
   MFTriggerPattern(MFTriggerPattern &trigpatt);