Changeset 5900

Timestamp:

01/19/05 12:39:58 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2205/01/19 Abelardo Moralejo
+
+   * mtrigger/MFTriggerPattern.[cc,h]
+     - Changed Bool_t arguments of all setters to new type Prescale_t
+       defined by N. Galante (see below)
 
  2205/01/19 Nicola Galante

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.cc

@@ -103 +103 @@
 }
 
-void MFTriggerPattern::RequireTriggerLvl1(Bool_t prescaled)
+void MFTriggerPattern::RequireTriggerLvl1(Prescale_t prescaled)
 {
     prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl1) : (fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl1);
 }
 
-void MFTriggerPattern::RequireTriggerLvl2(Bool_t prescaled)
+void MFTriggerPattern::RequireTriggerLvl2(Prescale_t prescaled)
 {
     prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kTriggerLvl2) : (fMaskRequiredUnprescaled |= MTriggerPattern::kTriggerLvl2);
 }
 
-void MFTriggerPattern::RequireCalibration(Bool_t prescaled)
+void MFTriggerPattern::RequireCalibration(Prescale_t prescaled)
 {
     prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kCalibration) : (fMaskRequiredUnprescaled |= MTriggerPattern::kCalibration);
 }
 
-void MFTriggerPattern::RequirePedestal(Bool_t prescaled)
+void MFTriggerPattern::RequirePedestal(Prescale_t prescaled)
 {
     prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kPedestal)    : (fMaskRequiredUnprescaled |= MTriggerPattern::kPedestal);
 }
 
-void MFTriggerPattern::RequirePinDiode(Bool_t prescaled)
+void MFTriggerPattern::RequirePinDiode(Prescale_t prescaled)
 {
     prescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kPinDiode)    : (fMaskRequiredUnprescaled |= MTriggerPattern::kPinDiode);
@@ -129 +129 @@
 
 
-void MFTriggerPattern::DenyTriggerLvl1(Bool_t prescaled)
+void MFTriggerPattern::DenyTriggerLvl1(Prescale_t prescaled)
 {
     prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl1) : (fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl1);
 }
 
-void MFTriggerPattern::DenyTriggerLvl2(Bool_t prescaled)
+void MFTriggerPattern::DenyTriggerLvl2(Prescale_t prescaled)
 {
     prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kTriggerLvl2) : (fMaskDeniedUnprescaled |= MTriggerPattern::kTriggerLvl2);
 }
 
-void MFTriggerPattern::DenyCalibration(Bool_t prescaled)
+void MFTriggerPattern::DenyCalibration(Prescale_t prescaled)
 {
     prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kCalibration) : (fMaskDeniedUnprescaled |= MTriggerPattern::kCalibration);
 }
 
-void MFTriggerPattern::DenyPedestal(Bool_t prescaled)
+void MFTriggerPattern::DenyPedestal(Prescale_t prescaled)
 {
     prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPedestal)    : (fMaskDeniedUnprescaled |= MTriggerPattern::kPedestal);
 }
 
-void MFTriggerPattern::DenyPinDiode(Bool_t prescaled)
+void MFTriggerPattern::DenyPinDiode(Prescale_t prescaled)
 {
     prescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPinDiode)    : (fMaskDeniedUnprescaled |= MTriggerPattern::kPinDiode);
@@ -174 +174 @@
 //       0101 1101  -->  4+1=5=0x5 8+4+1=13=0xd --> 0x5d
 //
-void MFTriggerPattern::SetMaskRequired(const Byte_t mask, Bool_t prescaled)
+void MFTriggerPattern::SetMaskRequired(const Byte_t mask, Prescale_t prescaled)
 {
     prescaled ? (fMaskRequiredPrescaled = mask) : (fMaskRequiredUnprescaled = mask);
@@ -199 +199 @@
 //       0101 1101  -->  4+1=5=0x5 8+4+1=13=0xd --> 0x5d
 //
-void MFTriggerPattern::SetMaskDenied(const Byte_t mask, Bool_t prescaled)
+void MFTriggerPattern::SetMaskDenied(const Byte_t mask, Prescale_t prescaled)
 {
     prescaled ? (fMaskDeniedPrescaled  = mask) : (fMaskDeniedUnprescaled  = mask);
@@ -223 +223 @@
 // {LT1,CAL,LT2} but not events with flags {LT1,CAL}.
 //
-void MFTriggerPattern::Require(TString patt, Bool_t prescaled)
+void MFTriggerPattern::Require(TString patt, Prescale_t prescaled)
 {
     if (patt.Contains("LT1", TString::kIgnoreCase))
@@ -262 +262 @@
 // {LT1,CAL,LT2} but not events with flags {LT1,CAL}.
 //
-void MFTriggerPattern::Deny(TString patt, Bool_t prescaled)
+void MFTriggerPattern::Deny(TString patt, Prescale_t prescaled)
 {
     if (patt.Contains("LT1", TString::kIgnoreCase))

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.h

@@ -33 +33 @@
   MFTriggerPattern(MFTriggerPattern &trigpatt);
     
-  void RequireTriggerLvl1(Bool_t prescaled=kUnPrescaled);
-  void RequireTriggerLvl2(Bool_t prescaled=kUnPrescaled);
-  void RequireCalibration(Bool_t prescaled=kUnPrescaled);
-  void RequirePedestal(Bool_t prescaled=kUnPrescaled);
-  void RequirePinDiode(Bool_t prescaled=kUnPrescaled);
+  void RequireTriggerLvl1(Prescale_t prescaled=kUnPrescaled);
+  void RequireTriggerLvl2(Prescale_t prescaled=kUnPrescaled);
+  void RequireCalibration(Prescale_t prescaled=kUnPrescaled);
+  void RequirePedestal(Prescale_t prescaled=kUnPrescaled);
+  void RequirePinDiode(Prescale_t prescaled=kUnPrescaled);
   
-  void DenyTriggerLvl1(Bool_t prescaled=kUnPrescaled);
-  void DenyTriggerLvl2(Bool_t prescaled=kUnPrescaled);
-  void DenyCalibration(Bool_t prescaled=kUnPrescaled);
-  void DenyPedestal(Bool_t prescaled=kUnPrescaled);
-  void DenyPinDiode(Bool_t prescaled=kUnPrescaled);
+  void DenyTriggerLvl1(Prescale_t prescaled=kUnPrescaled);
+  void DenyTriggerLvl2(Prescale_t prescaled=kUnPrescaled);
+  void DenyCalibration(Prescale_t prescaled=kUnPrescaled);
+  void DenyPedestal(Prescale_t prescaled=kUnPrescaled);
+  void DenyPinDiode(Prescale_t prescaled=kUnPrescaled);
   
-  void Require(TString patt, Bool_t prescaled=kUnPrescaled);
-  void Deny(TString patt, Bool_t prescaled=kUnPrescaled);
+  void Require(TString patt, Prescale_t prescaled=kUnPrescaled);
+  void Deny(TString patt, Prescale_t prescaled=kUnPrescaled);
   
   // Low level settings. USE THESE ONLY IF YOU ARE AN EXPERT!
-  void SetMaskRequired(const Byte_t mask, Bool_t prescaled=kUnPrescaled);
-  void SetMaskDenied(const Byte_t mask, Bool_t prescaled=kUnPrescaled);
+  void SetMaskRequired(const Byte_t mask, Prescale_t prescaled=kUnPrescaled);
+  void SetMaskDenied(const Byte_t mask, Prescale_t prescaled=kUnPrescaled);
   
   ClassDef(MFTriggerPattern, 1) // A Filter for the Trigger Pattern