Changeset 8897


Ignore:
Timestamp:
05/24/08 15:45:57 (13 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8894 r8897  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2008/05/24 Thomas Bretz
     22
     23   * mjobs/MJCalibrateSignal.cc:
     24     - removed the obsolete fconsmics (what the hell did it do...
     25       it removed the largest events?)
     26     - added a cosmics trigger for calibration events instead
     27
     28
     29
    2030
    2131 2008/05/20 Thomas Bretz
  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8894 r8897  
    494494
    495495    //------------------------------
     496    //
     497    // this is the filter to find pedestal events. For the Siegen FADC
     498    // these are all events which are not calibration events because
     499    // the pedestal is extracted from the lo-gain signal. For MUX
     500    // data this are artifiially triggered events with the pedestal
     501    // trigger flag, and for safty without Lvl1 or Lvl2 flag)
     502    //
     503    // For the time "before" the trigger pattern all events (Siegen FADC)
     504    // can be considered to be pedestal, because this was also the time
     505    // without artifially calibration events
     506    //
    496507    MFTriggerPattern fped;
    497508    fped.SetDefault(kTRUE);
     
    505516
    506517    //------------------------------
    507 
    508     MFCosmics fcosmics;
    509     fcosmics.SetNamePedestalCam("MPedestalFundamental");
    510     MContinue contcos(&fcosmics, "ContTrigEvts");
    511     contcos.SetInverted();
    512 
    513     //MMcPedestalCopy pcopy;
     518    //
     519    // Apply a filter against cosmics (this is to make sure that the
     520    // trigger system was working properly and no empty events survive)
     521    // For every event 5% of the pixel must not be empty. In PostProcess
     522    // an error is raised if more than 50% of the events were skipped.
     523    //
     524    MFCosmics fcosmicscal;
     525    fcosmicscal.SetNamePedestalCam("MPedestalFundamental"); //CORRECT?
     526    fcosmicscal.SetMaxEmptyPixels(0.05);
     527    fcosmicscal.SetMaxAcceptedFraction(0.5);
     528
     529    MContinue contcoscal(&fcosmicscal, "ContCosmicsCal");
     530    contcoscal.SetInverted();
     531
     532    //------------------------------
     533    /*
     534     MFCosmics fcosmicsped; // Def=20% empty pixels
     535     fcosmicsped.SetNamePedestalCam("MPedestalFundamental"); //CORRECT?
     536     MContinue contcosped(&fcosmicsped, "ContCosmicsPed");
     537     contcosped.SetInverted();
     538    */
     539
     540    //------------------------------
     541    //
     542    // Thie signal extractors
     543    //
    514544    MTaskEnv taskenv1("ExtractSignal");
    515545    MTaskEnv taskenv2("ExtractTime");
     
    529559    calib.AddPedestal("FromExtractorRndm");
    530560    calib.SetPedestalFlag(MCalibrateData::kEvent);
     561
    531562    //----------------------------------------------------------
    532563
     
    740771        tlist2.AddToList(&fcalib);     // MFTriggerPattern
    741772        tlist2.AddToList(&tlist4);
     773
     774        tlist4.AddToList(&taskenv3);
     775        tlist4.AddToList(&contcoscal); // MContinue/ContCosmicsCal
    742776        if (IsUsePINDiode())
    743777            tlist4.AddToList(&pinext); // MExtractPINDiode
    744778        if (IsUseBlindPixel())
    745779            tlist4.AddToList(&bldext); // MExtractBlindPixel
    746         tlist4.AddToList(&taskenv3);
    747780        tlist4.AddToList(&pacalc);     // MCalibCalcFromPast
    748781        /*
     
    777810      tlist2.AddToList(&taskenv1);
    778811
    779     // remove all events which definitly don#t have a signal
    780     // using MFCosmics (ContTrigEvts)
    781     tlist2.AddToList(&contcos);     
     812    // remove all events which definitly don't have a signal
     813    // using MFCosmics (ContCosmicsPed)
     814    // tlist2.AddToList(&contcosped);
    782815
    783816    // Extract arrival time (if a dedicated extrator given)
Note: See TracChangeset for help on using the changeset viewer.