Changeset 8903


Ignore:
Timestamp:
May 31, 2008, 12:41:32 PM (11 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8902 r8903  
    3030
    3131   * mjobs/MJCalibrateSignal.cc, mjobs/MJStar.cc:
    32      - use new option IsNullOut from base class
    33 
     32     - use new option HasNullOut from base class
     33
     34   * mbase/MClone.cc:
     35     - fixed Init (still had a constructor like initializer)
     36
     37   * mtrigger/MFTriggerPattern.h:
     38     - included missing MTripperPattern
     39
     40   * mtrigger/MFTriggerPattern.cc:
     41     - removed default arguments
     42     - exchanged ^ by ~
     43     - fixed a few typos in function names
    3444
    3545
     
    5262     - added a DenyAll member function
    5363     - added Allow member functions including an AllowAll member function
    54 
    5564
    5665   * mjobs/MJPedestal.cc:
  • trunk/MagicSoft/Mars/mbase/MClone.cc

    r8899 r8903  
    6666// constructors.
    6767//
    68 void MClone::Init(const char *name, const char *title) : fForceClone(kFALSE)
     68void MClone::Init(const char *name, const char *title)
    6969{
    7070    fName  = name  ? name  : "MClone";
    7171    fTitle = title ? title : "Task to clone a parameter container for later usage";
     72
     73    fForceClone = kFALSE;
    7274
    7375    fClone  = NULL;
  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8902 r8903  
    917917    if (fSequence.IsMonteCarlo())
    918918    {
    919         if (!fIsMovieMode && !IsNullOut())
     919        if (!fIsMovieMode && !HasNullOut())
    920920            tlist.AddToList(&writemc);
    921921        tlist.AddToList(&contmc);
     
    929929    //  tlist.AddToList(&pcalc, "Drive");
    930930
    931     if (!fIsMovieMode && !IsNullOut())
     931    if (!fIsMovieMode && !HasNullOut())
    932932        tlist.AddToList(&write);
    933933
  • trunk/MagicSoft/Mars/mjobs/MJStar.cc

    r8902 r8903  
    469469        tlist.AddToList(&filldt,  "CC");
    470470    }
    471     if (!IsNullOut())
     471    if (!HasNullOut())
    472472        tlist.AddToList(&write);
    473473
  • trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.cc

    r8898 r8903  
    136136// the deny bit at the same time.
    137137//
    138 void MFTriggerPattern::Require(const Byte_t mask, Prescale_t prescaled=kUnPrescaled)
     138void MFTriggerPattern::Require(const Byte_t mask, Prescale_t prescaled)
    139139{
    140140    prescaled==kPrescaled ? (fMaskRequiredPrescaled |=  mask) : (fMaskRequiredUnprescaled |=  mask);
    141     prescaled==kPrescaled ? (fMaskDeniedPrescaled   &= ^mask) : (fMaskDeniedUnprescaled   &= ^mask);
     141    prescaled==kPrescaled ? (fMaskDeniedPrescaled   &= ~mask) : (fMaskDeniedUnprescaled   &= ~mask);
    142142}
    143143
     
    151151// the require bit at the same time.
    152152//
    153 void MFTriggerPatter::Deny(const Byte_t mask, Prescale_t prescaled=kUnPrescaled)
     153void MFTriggerPattern::Deny(const Byte_t mask, Prescale_t prescaled)
    154154{
    155155    prescaled==kPrescaled ? (fMaskDeniedPrescaled   |=  mask) : (fMaskDeniedUnprescaled   |=  mask);
    156     prescaled==kPrescaled ? (fMaskRequiredPrescaled &= ^mask) : (fMaskRequiredUnprescaled &= ^mask);
     156    prescaled==kPrescaled ? (fMaskRequiredPrescaled &= ~mask) : (fMaskRequiredUnprescaled &= ~mask);
    157157}
    158158
     
    164164// default is unprescaled.
    165165//
    166 void MFTriggerPatter::Allow(const Byte_t mask, Prescale_t prescaled=kUnPrescaled)
    167 {
    168     prescaled==kPrescaled ? (fMaskDeniedPrescaled &= ^mask) : (fMaskDeniedUnprescaled &= ^mask);
     166void MFTriggerPattern::Allow(const Byte_t mask, Prescale_t prescaled)
     167{
     168    prescaled==kPrescaled ? (fMaskDeniedPrescaled &= ~mask) : (fMaskDeniedUnprescaled &= ~mask);
    169169}
    170170
  • trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.h

    r8898 r8903  
    44#ifndef MARS_MFilter
    55#include "MFilter.h"
     6#endif
     7
     8#ifndef MARS_MTriggerPatter
     9#include "MTriggerPattern.h"
    610#endif
    711
Note: See TracChangeset for help on using the changeset viewer.