Changeset 8903 for trunk/MagicSoft

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
 
    * mjobs/MJCalibrateSignal.cc, mjobs/MJStar.cc:
-     - use new option IsNullOut from base class
-
+     - use new option HasNullOut from base class
+
+   * mbase/MClone.cc:
+     - fixed Init (still had a constructor like initializer)
+
+   * mtrigger/MFTriggerPattern.h:
+     - included missing MTripperPattern
+
+   * mtrigger/MFTriggerPattern.cc:
+     - removed default arguments
+     - exchanged ^ by ~ 
+     - fixed a few typos in function names
 
 
@@ -52 +62 @@
      - added a DenyAll member function
      - added Allow member functions including an AllowAll member function
-
 
    * mjobs/MJPedestal.cc:

trunk/MagicSoft/Mars/mbase/MClone.cc

@@ -66 +66 @@
 // constructors.
 //
-void MClone::Init(const char *name, const char *title) : fForceClone(kFALSE)
+void MClone::Init(const char *name, const char *title)
 {
     fName  = name  ? name  : "MClone";
     fTitle = title ? title : "Task to clone a parameter container for later usage";
+
+    fForceClone = kFALSE;
 
     fClone  = NULL;

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -917 +917 @@
     if (fSequence.IsMonteCarlo())
     {
-        if (!fIsMovieMode && !IsNullOut())
+        if (!fIsMovieMode && !HasNullOut())
             tlist.AddToList(&writemc);
         tlist.AddToList(&contmc);
@@ -929 +929 @@
     //  tlist.AddToList(&pcalc, "Drive");
 
-    if (!fIsMovieMode && !IsNullOut())
+    if (!fIsMovieMode && !HasNullOut())
         tlist.AddToList(&write);
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -469 +469 @@
         tlist.AddToList(&filldt,  "CC");
     }
-    if (!IsNullOut())
+    if (!HasNullOut())
         tlist.AddToList(&write);
 

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