Ignore:
Timestamp:
05/25/08 11:28:15 (13 years ago)
Author:
tbretz
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8897 r8898  
    432432    // data file will be processed. In any case there are no interleaved
    433433    // calibration events in such data, so this is fine.
     434    // We allow only cosmics triggered events to pass (before prescaling)
    434435    MFTriggerPattern fcalped;
    435436    fcalped.SetInverted();
    436437    fcalped.SetDefault(kTRUE);
    437     //    ftp.RequireCalibration();
    438     fcalped.DenyCalibration();
    439     fcalped.DenyPedestal();
    440     //    ftp.DenyPinDiode();
     438    fcalped.DenyAll();
     439    fcalped.AllowTriggerLvl1();
     440    fcalped.AllowTriggerLvl2();
     441    //fcalped.AllowSumTrigger();
    441442
    442443    // This will skip interleaved events with a cal- or ped-trigger
     
    505506    // without artifially calibration events
    506507    //
     508    // Deny or allow is done before prescaling.
     509    //
    507510    MFTriggerPattern fped;
    508511    fped.SetDefault(kTRUE);
     
    510513    if (!extractor1->HasLoGain())
    511514    {
     515        fped.DenyAll();
    512516        fped.RequirePedestal();
    513         fped.DenyTriggerLvl1();
    514         fped.DenyTriggerLvl2();
    515517    }
    516518
     
    565567    MExtractBlindPixel      bldext;
    566568
     569    // Execute for all events with the calibration trigger. If no
     570    // trigger pattern is available do not execute it
     571    // The selection is done before prescaling.
    567572    MFTriggerPattern        fcalib("CalibFilter");
    568573    fcalib.SetDefault(kFALSE);
     574    fcalib.DenyAll();
    569575    fcalib.RequireCalibration();
    570     //fcalib.DenyPedestal(); // This should never happen!
    571576
    572577    MCalibrationChargeCalc  chcalc;
     
    769774    if (fIsInterlaced)
    770775    {
     776        // The task list is executed for all events with the calibration
     777        // trigger
    771778        tlist2.AddToList(&fcalib);     // MFTriggerPattern
    772779        tlist2.AddToList(&tlist4);
Note: See TracChangeset for help on using the changeset viewer.