Changeset 5880 for trunk/MagicSoft

Timestamp:

01/18/05 12:40:11 (20 years ago)

Author:

galante

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/01/18 Nicola Galante
+
+   * mtrigger/MFTriggerPattern.cc:
+     - added parentesis to ensure bitwise operators priority
+       with respect to logical operators.
+
 
  2005/01/17 Thomas Bretz

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.cc

@@ -92 +92 @@
 
     // Check whether at least one bit fits our neeeds
-    if (p & fMaskRequiredPrescaled == fMaskRequiredPrescaled)
+    if ( (p & fMaskRequiredPrescaled) == fMaskRequiredPrescaled)
         fResult = kTRUE;
 
-    if (u & fMaskRequiredUnprescaled == fMaskRequiredUnprescaled)
+    if ( (u & fMaskRequiredUnprescaled) == fMaskRequiredUnprescaled)
         fResult = kTRUE;
 
@@ -110 +110 @@
 void MFTriggerPattern::RequireTriggerLvl1(Bool_t prescaled)
 {
-    prescaled ? fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl1 : fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl1;
+    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl1) : (fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl1);
 }
 
 void MFTriggerPattern::RequireTriggerLvl2(Bool_t prescaled)
 {
-    prescaled ? fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl2 : fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl2;
+    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl2) : (fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl2);
 }
 
 void MFTriggerPattern::RequireCalibration(Bool_t prescaled)
 {
-    prescaled ? fMaskRequiredPrescaled |= MTriggerPattern::kCalibration : fMaskRequiredUnprescaled |= MTriggerPattern::kCalibration;
+    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kCalibration) : (fMaskRequiredUnprescaled |= MTriggerPattern::kCalibration);
 }
 
 void MFTriggerPattern::RequirePedestal(Bool_t prescaled)
 {
-    prescaled ? fMaskRequiredPrescaled |= MTriggerPattern::kPedestal    : fMaskRequiredUnprescaled |= MTriggerPattern::kPedestal;
+    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kPedestal)    : (fMaskRequiredUnprescaled |= MTriggerPattern::kPedestal);
 }
 
 void MFTriggerPattern::RequirePinDiode(Bool_t prescaled)
 {
-    prescaled ? fMaskRequiredPrescaled |= MTriggerPattern::kPinDiode    : fMaskRequiredUnprescaled |= MTriggerPattern::kPinDiode;
+    prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kPinDiode)    : (fMaskRequiredUnprescaled |= MTriggerPattern::kPinDiode);
 }
 
@@ -136 +136 @@
 void MFTriggerPattern::DenyTriggerLvl1(Bool_t prescaled)
 {
-    prescaled ? fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl1 : fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl1;
+    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl1) : (fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl1);
 }
 
 void MFTriggerPattern::DenyTriggerLvl2(Bool_t prescaled)
 {
-    prescaled ? fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl2 : fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl2;
+    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl2) : (fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl2);
 }
 
 void MFTriggerPattern::DenyCalibration(Bool_t prescaled)
 {
-    prescaled ? fMaskDeniedPrescaled |= MTriggerPattern::kCalibration : fMaskDeniedUnprescaled |= MTriggerPattern::kCalibration;
+    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kCalibration) : (fMaskDeniedUnprescaled |= MTriggerPattern::kCalibration);
 }
 
 void MFTriggerPattern::DenyPedestal(Bool_t prescaled)
 {
-    prescaled ? fMaskDeniedPrescaled |= MTriggerPattern::kPedestal    : fMaskDeniedUnprescaled |= MTriggerPattern::kPedestal;
+    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPedestal)    : (fMaskDeniedUnprescaled |= MTriggerPattern::kPedestal);
 }
 
 void MFTriggerPattern::DenyPinDiode(Bool_t prescaled)
 {
-    prescaled ? fMaskDeniedPrescaled |= MTriggerPattern::kPinDiode    : fMaskDeniedUnprescaled |= MTriggerPattern::kPinDiode;
+    prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPinDiode)    : (fMaskDeniedUnprescaled |= MTriggerPattern::kPinDiode);
 }
 
@@ -181 +181 @@
 void MFTriggerPattern::SetMaskRequired(const Byte_t mask, Bool_t prescaled)
 {
-    prescaled ? fMaskRequiredPrescaled = mask : fMaskRequiredUnprescaled = mask;
+    prescaled ? (fMaskRequiredPrescaled = mask) : (fMaskRequiredUnprescaled = mask);
 }
 
@@ -206 +206 @@
 void MFTriggerPattern::SetMaskDenied(const Byte_t mask, Bool_t prescaled)
 {
-    prescaled ? fMaskDeniedPrescaled  = mask : fMaskDeniedUnprescaled  = mask;
+    prescaled ? (fMaskDeniedPrescaled  = mask) : (fMaskDeniedUnprescaled  = mask);
 }