Changeset 8396


Ignore:
Timestamp:
04/11/07 14:43:07 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8395 r8396  
    2222
    2323   * mjobs/MJCalibrateSignal.cc:
    24      - renamed tab "Conv" to "ConvUpd"
    25      - renamed task "FillConv" to "FillConvUpd"
    26      - moved filling of pedestal histograms before processing
    27        of calibration events
    2824     - added a lot of comments
    29      - only fill calibration constants if ReadyToSave flag is set
    3025     - added some code for future use
    3126
  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8395 r8396  
    612612    MHCamEvent evt6(102, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]");
    613613    // MHCamEvent evt7(  6, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
    614     MHCamEvent evt8(  0, "ConvUpd",    "Calibration Conv. Factors;;[phe/cnts]");
     614    MHCamEvent evt8(  0, "Conv",       "Calibration Conv. Factors;;[phe/cnts]");
    615615    MHCamEvent evt9(  7, "PulsePos",   "Pulse Position of cosmics (>50phe);;T");
    616616    MHCamEvent evtR(  4, "HiLoCal",    "Hi-/Lo-Gain ratio;;Ratio");
     
    629629    MFillH fill6(&evt6, "MBadPixelsCam",                 "FillUnsuitable");
    630630    // MFillH fill7(&evt7, "MSignalCam",                    "FillTimes");
    631     MFillH fill8(&evt8, "MCalibrationIntensityConstCam", "FillConvUpd");
     631    MFillH fill8(&evt8, "MCalibrationIntensityConstCam", "FillConv");
    632632    MFillH fill9(&evt9, "MSignalCam",                    "FillPulse");
    633633    MFillH fillR(&evtR, "MExtractedSignalCam",           "FillHiLoCal");
     
    725725    tlist3.SetFilter(&fcalib);
    726726
    727     MFDataPhrase filcalco("MCalibrationIntensityConstCam.IsReadyToSave>0.5", "CalibConstFilter");
     727    //MFDataPhrase filcalco("MCalibrationIntensityConstCam.IsReadyToSave>0.5", "CalibConstFilter");
    728728    if (fIsInterlaced)
    729729    {
     
    736736        tlist3.AddToList(&taskenv3);
    737737        tlist3.AddToList(&pacalc);     // MCalibCalcFromPast
    738 
    739         tlist3.AddToList(&filcalco);   // CalibConstFilter (IsReadyToSave)
    740         fill8.SetFilter(&filcalco);
    741         tlist3.AddToList(&fill8);      // FillConvUpd
     738        /*
     739         tlist3.AddToList(&filcalco);   // CalibConstFilter (IsReadyToSave)
     740         fill8.SetFilter(&filcalco);
     741         tlist3.AddToList(&fill8);      // FillConvUpd
     742         */
    742743
    743744        tlist3.AddToList(&filcam);     // FillChargeCam
     
    776777    */
    777778    tlist2.AddToList(&fill2);
     779    tlist2.AddToList(&fill8);        // FillConv
    778780    tlist2.AddToList(&calib);        // MCalibrateData
    779781    if (extractor2 || extractor1->InheritsFrom("MExtractTimeAndCharge"))
Note: See TracChangeset for help on using the changeset viewer.