Changeset 8903 for trunk/MagicSoft/Mars/mtrigger

Timestamp:

05/31/08 12:41:32 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtrigger

Files:

• MFTriggerPattern.cc (modified) (3 diffs)
• MFTriggerPattern.h (modified) (1 diff)

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.cc

@@ -136 +136 @@
 // the deny bit at the same time.
 //
-void MFTriggerPattern::Require(const Byte_t mask, Prescale_t prescaled=kUnPrescaled)
+void MFTriggerPattern::Require(const Byte_t mask, Prescale_t prescaled)
 {
     prescaled==kPrescaled ? (fMaskRequiredPrescaled |=  mask) : (fMaskRequiredUnprescaled |=  mask);
-    prescaled==kPrescaled ? (fMaskDeniedPrescaled   &= ^mask) : (fMaskDeniedUnprescaled   &= ^mask);
+    prescaled==kPrescaled ? (fMaskDeniedPrescaled   &= ~mask) : (fMaskDeniedUnprescaled   &= ~mask);
 }
 
@@ -151 +151 @@
 // the require bit at the same time.
 //
-void MFTriggerPatter::Deny(const Byte_t mask, Prescale_t prescaled=kUnPrescaled)
+void MFTriggerPattern::Deny(const Byte_t mask, Prescale_t prescaled)
 {
     prescaled==kPrescaled ? (fMaskDeniedPrescaled   |=  mask) : (fMaskDeniedUnprescaled   |=  mask);
-    prescaled==kPrescaled ? (fMaskRequiredPrescaled &= ^mask) : (fMaskRequiredUnprescaled &= ^mask);
+    prescaled==kPrescaled ? (fMaskRequiredPrescaled &= ~mask) : (fMaskRequiredUnprescaled &= ~mask);
 }
 
@@ -164 +164 @@
 // default is unprescaled.
 //
-void MFTriggerPatter::Allow(const Byte_t mask, Prescale_t prescaled=kUnPrescaled)
-{
-    prescaled==kPrescaled ? (fMaskDeniedPrescaled &= ^mask) : (fMaskDeniedUnprescaled &= ^mask);
+void MFTriggerPattern::Allow(const Byte_t mask, Prescale_t prescaled)
+{
+    prescaled==kPrescaled ? (fMaskDeniedPrescaled &= ~mask) : (fMaskDeniedUnprescaled &= ~mask);
 }
 

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.h

@@ -4 +4 @@
 #ifndef MARS_MFilter
 #include "MFilter.h"
+#endif
+
+#ifndef MARS_MTriggerPatter
+#include "MTriggerPattern.h"
 #endif