Changeset 6968

Timestamp:

04/21/05 16:38:03 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (2 diffs)
• mtrigger/MFTriggerPattern.cc (modified) (3 diffs)
• mtrigger/MFTriggerPattern.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/04/21 Thomas Bretz
+
+    * mjobs/MJCalibrateSignal.cc:
+      - fixed usage of MFTriggerPattern
+
+    * mtrigger/MFTriggerPattern.[h,cc]:
+      - allow to set default from outside in case no pattern
+        could be decoded
+
+
 
  2005/04/20 Thomas Bretz

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -498 +498 @@
 
     MFTriggerPattern ftp;
+    ftp.SetDefault(kTRUE);
     //    ftp.RequireCalibration();
     ftp.DenyCalibration();
@@ -581 +582 @@
 
     MFTriggerPattern        fcalib("CalibFilter");
+    fcalib.SetDefault(kFALSE);
     fcalib.RequireCalibration();
 

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.cc

@@ -50 +50 @@
 MFTriggerPattern::MFTriggerPattern(const char *name, const char *title)
     : fPattern(0), fMaskRequiredPrescaled(0), fMaskRequiredUnprescaled(0),
-      fMaskDeniedPrescaled(0), fMaskDeniedUnprescaled(0)
+      fMaskDeniedPrescaled(0), fMaskDeniedUnprescaled(0), fDefault(kTRUE)
 {
     fName  = name  ? name  : "MFTriggerPattern";
@@ -86 +86 @@
 Int_t MFTriggerPattern::Process()
 {
-    fResult = kFALSE;
-
     const Byte_t p = fPattern->GetPrescaled();
     const Byte_t u = fPattern->GetUnprescaled();
+    if (p==0 && u==0)
+    {
+        fResult = fDefault;
+        return kTRUE;
+    }
+
+    fResult = kFALSE;
 
     // Check whether all the bits required are ON
@@ -99 +104 @@
     if ( (p & fMaskDeniedPrescaled) || (u & fMaskDeniedUnprescaled) )
       fResult = kFALSE;
-    
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.h

@@ -23 +23 @@
   Byte_t fMaskDeniedPrescaled;      // Mask for filtering Trigger Pattern denied
   Byte_t fMaskDeniedUnprescaled;    // Mask for filtering Trigger Pattern denied
-  
+
+  Bool_t fDefault;                  // Default which is used if trigger pattern has default value (p==0&&u==0)
   Bool_t fResult;                   //!
   
@@ -49 +50 @@
   void Require(TString patt, Prescale_t prescaled=kUnPrescaled);
   void Deny(TString patt, Prescale_t prescaled=kUnPrescaled);
-  
+
+  void SetDefault(Bool_t b) { fDefault=b; }
+
   // Low level settings. USE THESE ONLY IF YOU ARE AN EXPERT!
   void SetMaskRequired(const Byte_t mask, Prescale_t prescaled=kUnPrescaled);