Changeset 5803 for trunk/MagicSoft


Ignore:
Timestamp:
01/11/05 16:46:58 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5802 r5803  
    2020
    2121                                                 -*-*- END OF LINE -*-*-
     22 2005/01/11 Thomas Bretz
     23
     24   * callisto.cc, callisto.rc:
     25     - changed such, that all three kinds of pedestals are calcualted
     26       (usefull for studies)
     27
     28   * manalysis/MMatrixLoop.[h,cc]:
     29     - derived from MRead
     30     - implemented some basic functions from MRead
     31
     32   * mfilter/MFCosmics.[h,cc]:
     33     - allow setting of name of MPedestalCam
     34
     35   * mhbase/MBinning.[h,cc]:
     36     - added SetEdges taking MParList as input
     37
     38   * mhflux/MHAlpha.cc:
     39     - use new function from MBinning
     40
     41   * mjobs/MJCalibrateSignal.[h,cc]:
     42     - changed to calculate all three kinds of pedestals
     43     - added filters for trigger pattern and illuminated events
     44
     45   * mjobs/MJPedestal.cc:
     46     - give different names to tabs with different pedestals
     47
     48   * mjobs/MJStar.cc:
     49     - on request changed used pedestal from "FromExtractor" to
     50       "FromExtractorRndm"
     51
     52   * mtrigger/MTriggerPattern.h:
     53     - added Reset function
     54
     55   * mtrigger/MTriggerPatternDecode.[h,cc]:
     56     - added using file format version number
     57
     58
     59
    2260 2005/01/11 Markus Gaug
    2361
    … …  
    3472     - added pointer to MRawEvtHeader to deny cosmics events in case
    3573       of 'interlaced' flag is set. No changes for 'normal' calibration
     74
    3675
    3776
    … …  
    93132
    94133
     134
    95135 2005/01/10 Thomas Bretz
    96136

  • trunk/MagicSoft/Mars/callisto.cc

    r5760 r5803  
    439439            return 1;
    440440        }
    441         /*
     441
    442442        //
    443443        // Calculate pedestal and pedestal resolution
    … …  
    472472            return 1;
    473473        }
    474         */
     474
    475475        //
    476476        // Extract signal and calibrate it
    … …  
    487487
    488488        // Where to search for calibration files
    489         if (!job4.ProcessFile(job1.GetPedestalCam(), job2.GetPedestalCam()/*, job3.GetPedestalCam()*/))
     489        if (!job4.ProcessFile(job1.GetPedestalCam(), job2.GetPedestalCam(), job3.GetPedestalCam()))
    490490            return -1;
    491491

  • trunk/MagicSoft/Mars/callisto.rc

    r5760 r5803  
    5959MJPedetslaC2.ExtractSignal.WeightsFile:      msignal/calibration_weights_UV.dat
    6060MJPedetslaY2.ExtractSignal.WeightsFile:      msignal/calibration_weights_UV.dat
     61MJPedetslaY3.ExtractSignal.WeightsFile:      msignal/calibration_weights_UV.dat
    6162MJCalibration.ExtractSignal.WeightsFile:     msignal/calibration_weights_UV.dat
    6263MJCalibrateSignal.ExtractSignal.WeightsFile: msignal/cosmics_weights.dat
    … …  
    200201#MJPedestalY1.PathOut:        .
    201202#MJPedestalY2.PathOut:        .
     203#MJPedestalY3.PathOut:        .
    202204#MJPedestalY1.PathData:      /data/MAGIC/Period016/
    203205#MJPedestalY2.PathData:      /data/MAGIC/Period016/
     206#MJPedestalY3.PathData:      /data/MAGIC/Period016/
    204207#MJCalibrateSignal.PathData: /data/MAGIC/Period016/
    205208#MJCalibrateSignal.PathIn:   .
    … …  
    210213#MJPedestalY1.UseData: Yes
    211214#MJPedestalY2.UseData: Yes
     215#MJPedestalY3.UseData: Yes
    212216MJPedestalY1.MaxEvents: 500
    213217MJPedestalY2.MaxEvents: 500
     218MJPedestalY3.MaxEvents: 500
    214219
    215220#MJPedestalY.ExtractPedestal: MPedCalcFromLoGain
    … …  
    244249# Setup level for determining of bad pixels
    245250# -------------------------------------------------------------------------
    246 #MJCalibrateSignal.MBadPixelsCalc.PedestalLevel:      3.0
     251MJCalibrateSignal.MBadPixelsCalc.PedestalLevel:         3.0
     252MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0
    247253#MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors:    2
    248254#MJCalibrateSignal.MBadPixelsTreat.UseInterpolation:   yes

  • trunk/MagicSoft/Mars/manalysis/MMatrixLoop.cc

    r2421 r5803  
    5454// --------------------------------------------------------------------------
    5555//
     56// Return the number of events (rows) in the matrix
     57//
     58UInt_t MMatrixLoop::GetEntries()
     59{
     60    return fMatrix ? fMatrix->GetNumRows() : 0;
     61}
     62
     63// --------------------------------------------------------------------------
     64//
     65// Return name of MHMatrix, <n/a> if not available
     66//
     67TString MMatrixLoop::GetFileName() const
     68{
     69    return fMatrix ? fMatrix->GetName() : "<n/a>";
     70}
     71
     72// --------------------------------------------------------------------------
     73//
    5674Int_t MMatrixLoop::PreProcess(MParList *plist)
    5775{

  • trunk/MagicSoft/Mars/manalysis/MMatrixLoop.h

    r2419 r5803  
    22#define MARS_MMatrixLoop
    33
    4 #ifndef MARS_MTask
    5 #include "MTask.h"
     4#ifndef MARS_MRead
     5#include "MRead.h"
    66#endif
    7 
    87
    98class MHMatrix;
    109
    11 class MMatrixLoop : public MTask
     10class MMatrixLoop : public MRead
    1211{
    1312private:
     13    // MMatrixLoop
    1414    static const TString gsDefName;
    1515    static const TString gsDefTitle;
    1616
    17 protected:
    1817    MHMatrix *fMatrix;
    1918    Int_t     fNumRow;    //! Number of dimensions of histogram
    2019
     20    // MRead
     21    UInt_t  GetEntries();
     22    TString GetFileName() const;
     23    Bool_t  Rewind() { fNumRow=0; return kTRUE; }
     24
     25    virtual Int_t AddFile(const char *fname, Int_t entries=-1) { return 0; }
     26    Int_t AddFiles(MDirIter &dir) { return 0; }
     27
     28    // MTask
     29    Int_t PreProcess(MParList *plist);
     30    Int_t Process();
     31
    2132public:
    2233    MMatrixLoop(MHMatrix *mat, const char *name=NULL, const char *title=NULL);
    23 
    24     Int_t PreProcess(MParList *plist);
    25     Int_t Process();
    2634
    2735    ClassDef(MMatrixLoop, 0) // Task 'reading' events from a MHMatrix

  • trunk/MagicSoft/Mars/mfilter/MFCosmics.cc

    r3822 r5803  
    6161
    6262using namespace std;
     63
     64const TString MFCosmics::fgNamePedestalCam = "MPedestalCam";
     65
    6366// --------------------------------------------------------------------------
    6467//
    … …  
    6669//
    6770MFCosmics::MFCosmics(const char *name, const char *title)
    68     : fPedestals(NULL), fSignals(NULL),
    69       fRawEvt(NULL), fMaxEmptyPixels(0.2)
     71    : fPedestals(NULL), fSignals(NULL), fRawEvt(NULL),
     72    fNamePedestalCam(fgNamePedestalCam), fMaxEmptyPixels(0.2)
    7073{
    7174    fName  = name  ? name  : "MFCosmics";
    … …  
    8992    }
    9093
    91     fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam");
     94    fPedestals = (MPedestalCam*)pList->FindObject(fNamePedestalCam, "MPedestalCam");
    9295    if (!fPedestals)
    9396    {
    94         *fLog << err << "MPedestalCam not found... aborting." << endl;
     97        *fLog << err << fNamePedestalCam << " [MPedestalCam] not found... aborting." << endl;
    9598        return kFALSE;
    9699    }

  • trunk/MagicSoft/Mars/mfilter/MFCosmics.h

    r3262 r5803  
    1414{
    1515private:
     16    static const TString fgNamePedestalCam;
     17
    1618    MPedestalCam        *fPedestals; // Pedestals of all pixels in the camera
    1719    MExtractedSignalCam *fSignals;   // Calibration events of all pixels in the camera
    1820
    1921    MRawEvtData         *fRawEvt;    // raw event data (time slices)
     22
     23    TString fNamePedestalCam;
    2024
    2125    Int_t   fCut[2];
    … …  
    4044    Float_t GetMaxEmptyPixels() const          { return fMaxEmptyPixels; }
    4145
     46    void SetNamePedestalCam(const char *name) { fNamePedestalCam = name; }
     47
    4248    ClassDef(MFCosmics, 0)   // Filter to perform a cosmics rejection
    4349};

  • trunk/MagicSoft/Mars/mhbase/MBinning.cc

    r4966 r5803  
    4848#include "MLogManip.h"
    4949
     50#include "MParList.h"
     51
    5052#include "MH.h"
    5153
    … …  
    8587
    8688    SetEdges(nbins, lo, hi, opt);
     89}
     90
     91// --------------------------------------------------------------------------
     92//
     93// Search in the parameter list for the binning with name "name". If found,
     94// set the edges and title accordingly. Default is name of object.
     95// return kTRUE if object found, kFALSE otherwise.
     96//
     97Bool_t MBinning::SetEdges(const MParList &list, const char *name)
     98{
     99    MBinning *bins = (MBinning*)list.FindObject(name ? name : fName.Data(), "MBinning");
     100    if (!bins)
     101        return kFALSE;
     102
     103    SetEdges(*bins);
     104    return kTRUE;
    87105}
    88106

  • trunk/MagicSoft/Mars/mhbase/MBinning.h

    r5692 r5803  
    1212class TH1;
    1313class TAxis;
     14
     15class MParList;
    1416
    1517class MBinning : public MParContainer
    … …  
    5254    }
    5355
     56    Bool_t SetEdges(const MParList &list, const char *name=0);
    5457    void SetEdges(const TAxis &axe);
    55     void SetEdges(const MBinning &bins) { SetEdges(bins.fEdges); fType = bins.fType; }
     58    void SetEdges(const MBinning &bins) { SetEdges(bins.fEdges); fType = bins.fType; fTitle = bins.fTitle; }
    5659    void SetEdges(const TH1 &h, const Char_t axis='x');
    5760    void SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up);

  • trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

    r5776 r5803  
    306306    if (!fOffData)
    307307    {
    308         MBinning *bins = (MBinning*)pl->FindObject("BinningTheta", "MBinning");
    309         if (fPointPos && bins)
    310             binst.SetEdges(*bins);
    311308        if (!fPointPos)
    312309            binst.SetEdges(1, 0, 60);
    313 
    314         bins = (MBinning*)pl->FindObject("BinningEnergyEst", "MBinning");
    315         if ((fEnergy||fHillas) && bins)
    316             binse.SetEdges(*bins);
     310        else
     311            binst.SetEdges(*pl, "BinningTheta");
     312
    317313        if (!fEnergy && !fHillas)
    318314            binse.SetEdges(1, 10, 100000);
    319 
    320         bins = (MBinning*)pl->FindObject("BinningAlpha", "MBinning");
    321         if (bins)
    322             binsa.SetEdges(*bins);
     315        else
     316            binse.SetEdges(*pl, "BinningEnergyEst");
     317
     318        binsa.SetEdges(*pl, "BinningAlpha");
    323319    }
    324320

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r5760 r5803  
    6464#include "MReadMarsFile.h"
    6565#include "MRawFileRead.h"
     66#include "MContinue.h"
     67#include "MTriggerPatternDecode.h"
     68#include "MFTriggerPattern.h"
    6669#include "MGeomApply.h"
    6770#include "MMcPedestalCopy.h"
    … …  
    6972#include "MPedCalcFromLoGain.h"
    7073#include "MExtractor.h"
     74#include "MFCosmics.h"
    7175#include "MTaskEnv.h"
    7276#include "MCalibrateData.h"
    … …  
    180184}
    181185
    182 Bool_t MJCalibrateSignal::ProcessFile(MPedestalCam &pedcamab, MPedestalCam &pedcam2/*, MPedestalCam &pedcam*/)
     186Bool_t MJCalibrateSignal::ProcessFile(MPedestalCam &pedcamab, MPedestalCam &pedcam2, MPedestalCam &pedcam)
    183187{
    184188    if (!fSequence.IsValid())
    … …  
    324328    // Make sure that pedcamab has the correct name
    325329    pedcamab.SetName("MPedestalFundamental");
    326     //pedcam.SetName("MPedestalFromExtractorRndm");
     330    pedcam.SetName("MPedestalFromExtractorRndm");
    327331    pedcam2.SetName("MPedestalFromExtractor");
    328     //plist.AddToList(&pedcam);
     332    plist.AddToList(&pedcam);
    329333    plist.AddToList(&pedcam2);
    330334    plist.AddToList(&pedcamab);
    331335
     336    // Check for interleaved events
     337    MTriggerPatternDecode decode;
     338
     339    MFTriggerPattern ftp;
     340    ftp.DenyCalibration();
     341    ftp.DenyPedestal();
     342    ftp.DenyPinDiode();
     343
     344    MContinue conttp(&ftp, "ContTrigPattern");
     345    // --> tlist2
     346
     347    // Do signal and pedestal calculation
    332348    MPedCalcFromLoGain     pedlo1("MPedCalcFundamental");
    333349    pedlo1.SetPedestalUpdate(kTRUE);
    334350    pedlo1.SetNamePedestalCamOut("MPedestalFundamental");
    335     /*
    336      MPedCalcFromLoGain     pedlo2("MPedCalcWithExtractorRndm");
    337      pedlo2.SetPedestalUpdate(kTRUE);
    338      pedlo2.SetRandomCalculation(kTRUE);
    339      pedlo2.SetNamePedestalCamIn("MPedestalFundamental");
    340      pedlo2.SetNamePedestalCamOut("MPedestalFromExtractorRndm");
    341      */
     351
     352    MPedCalcFromLoGain     pedlo2("MPedCalcWithExtractorRndm");
     353    pedlo2.SetPedestalUpdate(kTRUE);
     354    pedlo2.SetRandomCalculation(kTRUE);
     355    pedlo2.SetNamePedestalCamIn("MPedestalFundamental");
     356    pedlo2.SetNamePedestalCamOut("MPedestalFromExtractorRndm");
    342357
    343358    MPedCalcFromLoGain     pedlo3("MPedCalcWithExtractor");
    … …  
    352367        const Float_t win = extractor1->GetNumHiGainSamples();
    353368        pedlo1.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
    354         //pedlo2.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
     369        pedlo2.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
    355370        pedlo3.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
    356371
    357372        if (extractor1->InheritsFrom("MExtractTimeAndCharge"))
    358373        {
    359             //pedlo2.SetExtractor((MExtractTimeAndCharge*)extractor1);
     374            pedlo2.SetExtractor((MExtractTimeAndCharge*)extractor1);
    360375            pedlo3.SetExtractor((MExtractTimeAndCharge*)extractor1);
    361376            extractor1->SetPedestals(&pedcamab);
    … …  
    363378    }
    364379
    365     MMcPedestalCopy        pcopy;
     380    MFCosmics fcosmics;
     381    fcosmics.SetNamePedestalCam("MPedestalFundamental");
     382    MContinue contcos(&fcosmics, "ContTrigEvts");
     383    contcos.SetInverted();
     384
     385    MMcPedestalCopy pcopy;
    366386    MTaskEnv taskenv1("ExtractSignal");
    367387    MTaskEnv taskenv2("ExtractTime");
    … …  
    376396        calib.AddPedestal("MPedestalCam", "MPedPhotFundamental");
    377397        calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractor");
    378         //calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm");
     398        calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm");
    379399    }
    380400    else
    … …  
    382402        calib.AddPedestal("Fundamental");
    383403        calib.AddPedestal("FromExtractor");
    384         //calib.AddPedestal("FromExtractorRndm");
     404        calib.AddPedestal("FromExtractorRndm");
    385405        calib.SetPedestalFlag(MCalibrateData::kEvent);
    386406    }
    … …  
    393413    treat.AddNamePedPhotCam("MPedPhotFundamental");
    394414    treat.AddNamePedPhotCam("MPedPhotFromExtractor");
    395     //treat.AddNamePedPhotCam("MPedPhotFromExtractorRndm");
     415    treat.AddNamePedPhotCam("MPedPhotFromExtractorRndm");
    396416
    397417
    … …  
    438458    write.AddContainer("MPedPhotFundamental",       "Events");
    439459    write.AddContainer("MPedPhotFromExtractor",     "Events");
    440     //write.AddContainer("MPedPhotFromExtractorRndm", "Events");
     460    write.AddContainer("MPedPhotFromExtractorRndm", "Events");
    441461    write.AddContainer("MTime",                     "Events",     kFALSE);
    442462    write.AddContainer("MRawEvtHeader",             "Events");
    … …  
    468488    // Now setup tasklist for events
    469489    MTaskList tlist2;
     490    tlist2.AddToList(&decode);
     491    tlist2.AddToList(&conttp);
    470492    tlist2.AddToList(&apply);
    471493    tlist2.AddToList(&merge);
    … …  
    475497    {
    476498        tlist2.AddToList(&pedlo1);
    477         //tlist2.AddToList(&pedlo2);
     499        tlist2.AddToList(&pedlo2);
    478500        tlist2.AddToList(&pedlo3);
    479501    }
    … …  
    484506    if (extractor2)
    485507        tlist2.AddToList(&taskenv2);
     508    tlist2.AddToList(&contcos);
    486509    tlist2.AddToList(&fill2);
    487510    tlist2.AddToList(&calib);

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

    r5760 r5803  
    3434    MJCalibrateSignal(const char *name=NULL, const char *title=NULL);
    3535
    36     Bool_t ProcessFile(MPedestalCam &camab, MPedestalCam &cam2/*, MPedestalCam &cam2*/);
     36    Bool_t ProcessFile(MPedestalCam &camab, MPedestalCam &cam1, MPedestalCam &cam2);
    3737
    3838    ClassDef(MJCalibrateSignal, 0) // Tool to create a pedestal file (MPedestalCam)

  • trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

    r5760 r5803  
    537537      {
    538538           
    539         TCanvas &c3 = fDisplay->AddTab("PedExtrd");
    540         c3.Divide(2,3);
    541        
    542         disp0.CamDraw(c3, 1, 2, 1);
    543         disp1.CamDraw(c3, 2, 2, 6);
    544        
    545         TCanvas &c13 = fDisplay->AddTab("PedDiff");
    546         c13.Divide(2,3);
    547        
    548         disp9.CamDraw(c13, 1, 2, 5);
    549         disp10.CamDraw(c13, 2, 2, 5);
    550         return;
     539          TCanvas &c3 = fDisplay->AddTab(fExtractionType==kWithExtractor?"PedExtrd":"PedRndm");
     540          c3.Divide(2,3);
     541
     542          disp0.CamDraw(c3, 1, 2, 1);
     543          disp1.CamDraw(c3, 2, 2, 6);
     544
     545          TCanvas &c13 = fDisplay->AddTab(fExtractionType==kWithExtractor?"PedDiff":"DiffRndm");
     546          c13.Divide(2,3);
     547
     548          disp9.CamDraw(c13, 1, 2, 5);
     549          disp10.CamDraw(c13, 2, 2, 5);
     550          return;
    551551      }
    552552}

  • trunk/MagicSoft/Mars/mjobs/MJStar.cc

    r5760 r5803  
    186186    //MBadPixelsMerge        merge(&badpix);
    187187    MImgCleanStd           clean;
    188     clean.SetNamePedPhotCam("MPedPhotFromExtractor");
     188    clean.SetNamePedPhotCam("MPedPhotFromExtractorRndm");
    189189
    190190    MHillasCalc            hcalc;

  • trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.h

    r5725 r5803  
    2727
    2828public:
    29     MTriggerPattern(const char *name, const char *title);
     29    MTriggerPattern(const char *name=0, const char *title=0);
     30
     31    void Reset() { fPrescaled=0; fUnprescaled=0; }
    3032
    3133    Byte_t GetPrescaled() const   { return fPrescaled; }

  • trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc

    r5725 r5803  
    1717!
    1818!   Author(s): Nicola Galante  12/2004 <mailto:nicola.galante@pi.infn.it>
    19 !   Author(s): Nicola Galante 12/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
     19!   Author(s): Thomas Bretz 12/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
    2020!
    2121!   Copyright: MAGIC Software Development, 2004
    … …  
    4343#include "MParList.h"
    4444#include "MRawEvtHeader.h"
     45#include "MRawRunHeader.h"
    4546#include "MTriggerPattern.h"
    4647
    … …  
    5455//
    5556MTriggerPatternDecode::MTriggerPatternDecode(const char *name, const char *title)
     57    : fRunHeader(0), fEvtHeader(0), fPattern(0)
    5658{
    5759    fName  = name  ? name  : "MTriggerPatternDecode";
    … …  
    6365Int_t MTriggerPatternDecode::PreProcess(MParList *pList)
    6466{
     67    fRunHeader = (MRawRunHeader*)pList->FindCreateObj("MRawRunHeader");
     68    if (!fRunHeader)
     69    {
     70        *fLog << err << "MRawRunHeader not found... abort." << endl;
     71        return kFALSE;
     72    }
     73
    6574    fEvtHeader = (MRawEvtHeader *)pList->FindObject("MRawEvtHeader");
    6675    if (!fEvtHeader)
    … …  
    8493Int_t MTriggerPatternDecode::Process()
    8594{
     95    if (fRunHeader->GetFormatVersion()<5)
     96        return kTRUE;
     97
    8698    UInt_t pattern = ~fEvtHeader->GetTriggerID();
    8799

  • trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.h

    r5725 r5803  
    22#define MARS_MTriggerPatternDecode
    33
    4 /////////////////////////////////////////////////////////////////////////////
    5 //                                                                         //
    6 // MTriggerPatternDecode
    7 //
    8 // auth. N.Galante
    9 // created 17.11.04                                                       //
    10 //                                                                         //
    11 /////////////////////////////////////////////////////////////////////////////
    12 
    13 #ifndef MARS_MFilter
    14 #include "MFilter.h"
     4#ifndef MARS_MTask
     5#include "MTask.h"
    156#endif
    167
    178class MParList;
    189class MRawEvtHeader;
     10class MRawRunHeader;
    1911class MTriggerPattern;
    2012
    21 class MTriggerPatternDecode : public MFilter
     13class MTriggerPatternDecode : public MTask
    2214{
    2315private:
    24 //  enum pattern {PLT1=1, PCAL=2, PLT2=4, PPED=8, PPIND=16,
    25 //              ULT1=256, UCAL=512, ULT2=1024, UPED=2048, UPIND=4096};
     16    MRawRunHeader   *fRunHeader;
     17    MRawEvtHeader   *fEvtHeader;
     18    MTriggerPattern *fPattern;
    2619
    27    MRawEvtHeader   *fEvtHeader;
    28    MTriggerPattern *fPattern;
    29 
    30 //  UInt_t fMaskAllowed;   // Mask for filtering Trigger Pattern allowed
    31 //  UInt_t fMaskDenied;    // Mask for filtering Trigger Pattern denied
    32 //  UInt_t fPattern;       // Trigger Pattern stored into event
    33 //  UInt_t fMachArch;     
    34 
    35 //  Bool_t fBitInv;        // Flag to invert bits of Pattern (1=yes,0=no)
    36                          // default 1=yes
    37   //Bool_t fPrescaled;     // Flag to set if using prescaled (=1) or
    38                          // unprescaled (=0) pattern. Default 1
    39 //  Bool_t fResult;
    40 
    41   Int_t PreProcess(MParList *pList);
    42   Int_t Process();
     20    Int_t PreProcess(MParList *pList);
     21    Int_t Process();
    4322
    4423public:
     24    MTriggerPatternDecode(const char *name=0, const char *title=0);
    4525
    46   MTriggerPatternDecode(const char *name, const char *title);
    47   MTriggerPatternDecode(MTriggerPatternDecode &trigpatt);
    48 
    49 //  Bool_t IsExpressionTrue() const;
    50 
    51 //  void AllowPresTrigger(TString patt);
    52 //  void DenyPresTrigger(TString patt);
    53 //  void AllowUnpresTrigger(TString patt);
    54 //  void DenyUnpresTrigger(TString patt);
    55 //
    56 ////  UInt_t GetMaskAllowed() const { return fMaskAllowed; };
    57 //  UInt_t GetMaskDenied() const { return fMaskDenied; };
    58   //Bool_t GetPrescaled() const { return fPrescaled; };
    59 //  Bool_t GetBitInv() const { return fBitInv; }
    60 
    61 //  void SetBitInv(const Bool_t inv) { fBitInv = inv; }
    62   //void SetPrescaled() { fPrescaled = kTRUE; };
    63   //void SetUnprescaled() { fPrescaled = kFALSE; };
    64 
    65   // Low level settings. USE THESE ONLY IF YOU ARE AN EXPERT!
    66 //  void SetMaskAllowed(const UInt_t mask) { fMaskAllowed = mask; }
    67 //  void SetMaskDenied(const UInt_t mask) { fMaskDenied = mask; }
    68 
    69   ClassDef(MTriggerPatternDecode, 1) // Task to decode the Trigger Pattern
     26    ClassDef(MTriggerPatternDecode, 1) // Task to decode the Trigger Pattern
    7027};
    7128
Note: See TracChangeset for help on using the changeset viewer.