Changeset 7035 for trunk


Ignore:
Timestamp:
05/13/05 21:25:26 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7033 r7035  
    8383   * mmuon/MHSingleMuon.cc:
    8484     - slight change to a comment
     85
     86   * callisto.rc:
     87     - added new possible setup
     88
     89   * callisto_Dec04Jan05.rc
     90     - added new possible setup
     91     - use default for MJCalibration.ExtractSignal.LoGainSwitch
     92
     93   * mbadpixels/MBadPixelsCalc.cc:
     94     - exclude unsuitable pixels from mean/rms calculation
     95     - changed the lower bound for the second mean loop from
     96       0.5 to 0.66
     97
     98   * mbadpixels/MBadPixelsCam.cc:
     99     - added case 102 returning the global unsuitable status
     100       of an event
     101
     102   * mhist/MHCamEvent.h:
     103     - added default 0 to SetThreshold
     104
     105   * mjobs/MJCalibrateSignal.cc:
     106     - use new case 102 for unsuitable display
     107     - enable counting (to get the correct display also with
     108       profile option switched on)
     109
     110   * mraw/MRawRunHeader.cc:
     111     - after displaying millions of hex numbers switch back to dec
    85112
    86113

  • trunk/MagicSoft/Mars/NEWS

    r7034 r7035  
    112112       Default: -9.0 +4.5
    113113     + make deviating number of phes unsuitable (see David's findings).
     114
     115   - callisto: fixed the display of unsuitable pixels. The old change
     116     to a real profile in MHCamera broke it.
    114117
    115118   - The weather data is now displayed in star

  • trunk/MagicSoft/Mars/callisto.rc

    r7004 r7035  
    226226#MJCalibration.MCalibColorSet.ExplicitColor: green,blue,uv,ct1
    227227
     228#MJCalibration.MCalibrationChargeCalc.ArrTimeRmsLimit:    3.5
    228229#MJCalibration.MCalibrationChargeCalc.ChargeLimit:        2.5
    229230#MJCalibration.MCalibrationChargeCalc.ChargeErrLimit:     0
    … …  
    234235#MJCalibration.MCalibrationChargeCalc.LambdaErrLimit:     0.2
    235236#MJCalibration.MCalibrationChargeCalc.LambdaCheckLimit:   0.5
    236 #MJCalibration.MCalibrationChargeCalc.PheErrLimit:        3.5
     237#MJCalibration.MCalibrationChargeCalc.PheErrLowerLimit:   9.0
     238#MJCalibration.MCalibrationChargeCalc.PheErrUpperLimit:   5.5
    237239
    238240#MJCalibration.MHCalibrationChargeCam.Debug:        no

  • trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

    r6980 r7035  
    217217# Use this if you want to change the software low-gain switch
    218218# -------------------------------------------------------------------------
    219 MJCalibration.ExtractSignal.LoGainSwitch:     170
     219#MJCalibration.ExtractSignal.LoGainSwitch:     150
    220220
    221221# -------------------------------------------------------------------------
    … …  
    245245#MJCalibration.MCalibColorSet.ExplicitColor: green,blue,uv,ct1
    246246
     247#MJCalibration.MCalibrationChargeCalc.ArrTimeRmsLimit:    3.5
    247248#MJCalibration.MCalibrationChargeCalc.ChargeLimit:        2.5
    248249#MJCalibration.MCalibrationChargeCalc.ChargeErrLimit:     0
    … …  
    253254#MJCalibration.MCalibrationChargeCalc.LambdaErrLimit:     0.2
    254255#MJCalibration.MCalibrationChargeCalc.LambdaCheckLimit:   0.5
    255 #MJCalibration.MCalibrationChargeCalc.PheErrLimit:        3.5
     256#MJCalibration.MCalibrationChargeCalc.PheErrLowerLimit:   9.0
     257#MJCalibration.MCalibrationChargeCalc.PheErrUpperLimit:   5.5
    256258
    257259#MJCalibration.MHCalibrationChargeCam.Debug:        no

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

    r7033 r7035  
    176176    for (Int_t i=0; i<entries; i++)
    177177    {
     178        if ((*fBadPixels)[i].IsUnsuitable())
     179            continue;
     180
    178181        const Double_t rms = (*fPedPhotCam)[i].GetRms();
    179182
    … …  
    204207    for (Int_t i=0; i<entries; i++)
    205208    {
     209        if ((*fBadPixels)[i].IsUnsuitable())
     210            continue;
     211
    206212        const Double_t rms = (*fPedPhotCam)[i].GetRms();
    207213        const Byte_t  aidx = (*fGeomCam)[i].GetAidx();
    208214
    209215        //Calculate the corrected means:
    210         if (rms<=0.5*meanrms[aidx] || rms>=1.5*meanrms[aidx])
     216        if (rms<=meanrms[aidx]/1.5 || rms>=meanrms[aidx]*1.5)
    211217            continue;
    212218
    … …  
    250256    for (Int_t i=0; i<entries; i++)
    251257    {
     258        if ((*fBadPixels)[i].IsUnsuitable())
     259            continue;
     260
    252261        const Double_t rms = (*fPedPhotCam)[i].GetRms();
    253262        const Byte_t  aidx = (*fGeomCam)[i].GetAidx();

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

    r7012 r7035  
    614614// 23: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kHiGainOverFlow      )
    615615// 24: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kLoGainOverFlow      )
     616// 102: MBadPixelsPix::IsUnsuitable()
    616617//
    617618Bool_t MBadPixelsCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
    … …  
    747748      val = 1;
    748749      break;
     750    case 102:
     751      if  (!(*this)[idx].IsUnsuitable())
     752          return kFALSE;
     753      val = 1;
     754      break;
    749755    default:
    750756      return kFALSE;

  • trunk/MagicSoft/Mars/mhist/MHCamEvent.h

    r6977 r7035  
    5050    void PrintOutliers(Float_t s) const;
    5151
    52     void SetThreshold(Float_t f, Char_t direction=kIsLowerBound) { fThreshold = f; fUseThreshold=direction; }
     52    void SetThreshold(Float_t f=0, Char_t direction=kIsLowerBound) { fThreshold = f; fUseThreshold=direction; }
    5353
    5454    ClassDef(MHCamEvent, 1) // Histogram to sum camera events

  • trunk/MagicSoft/Mars/mhist/MHWeather.h

    r7033 r7035  
    1919    TGraph fWindSpeed;       //
    2020    TGraph fSolarRadiation;  //
    21     TGraph fEventRate;       //!
     21    TGraph fEventRate;       //
    2222
    2323    MReportCC  *fReport;     //!

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

    r7028 r7035  
    598598        treat.SetProcessTimes(kFALSE);
    599599
    600     MHCamEvent evt0(0, "PedFLG",     "Fundamental Pedestal from Lo Gain;;P [cnts/sl]");
    601     MHCamEvent evt1(2, "PedRmsFLG",  "RMS from Extractor applied to ped.;;\\sigma_{p} [cnts/sl]");
    602     MHCamEvent evt2(0, "Extra'd",    "Extracted Signal;;S [cnts/sl]");
     600    MHCamEvent evt0(  0, "PedFLG",     "Fundamental Pedestal from Lo Gain;;P [cnts/sl]");
     601    MHCamEvent evt1(  2, "PedRmsFLG",  "RMS from Extractor applied to ped.;;\\sigma_{p} [cnts/sl]");
     602    MHCamEvent evt2(  0, "Extra'd",    "Extracted Signal;;S [cnts/sl]");
    603603    // MHCamEvent evt3(4, "PedPhot",    "Calibrated Pedestal;;P [phe]");
    604     MHCamEvent evt4(5, "PedRMS",     "Calibrated RMS from Extractor applied to ped.;;\\sigma_{p} [phe]");
    605     MHCamEvent evt5(0, "Interp'd",   "Interpolated Signal;;S [phe]");
    606     MHCamEvent evt6(2, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]");
    607     MHCamEvent evt7(6, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
    608     MHCamEvent evt8(0, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
    609     MHCamEvent evt9(7, "PulsePos",  "Pulse Position of cosmics (>15phe);;T"); //Calibration Conv. Factors;;[phe/fadc cnts]
    610     /*
    611      MHCamEventTH evt9(6, "PulsePos",  "Pulse Position of cosmics"); //Calibration Conv. Factors;;[phe/fadc cnts]
    612      evt9.SetNameThreshold("MCerPhotEvt");
    613      evt9.SetThreshold(15);
    614      */
    615 /*
    616     evt0.EnableSqrtVariance();
    617     evt1.EnableSqrtVariance();
    618     evt2.EnableSqrtVariance();
    619     // evt3.EnableVariance();
    620     evt4.EnableSqrtVariance();
    621     evt5.EnableSqrtVariance();
    622     evt7.EnableSqrtVariance();
    623     evt8.EnableSqrtVariance();
    624   */
     604    MHCamEvent evt4(  5, "PedRMS",     "Calibrated RMS from Extractor applied to ped.;;\\sigma_{p} [phe]");
     605    MHCamEvent evt5(  0, "Interp'd",   "Interpolated Signal;;S [phe]");
     606    MHCamEvent evt6(102, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]");
     607    MHCamEvent evt7(  6, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
     608    MHCamEvent evt8(  0, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
     609    MHCamEvent evt9(  7, "PulsePos",   "Pulse Position of cosmics (>15phe);;T"); //Calibration Conv. Factors;;[phe/fadc cnts]
     610    evt6.SetThreshold();
     611
    625612    MFillH fill0(&evt0, "MPedestalFundamental",       "FillPedFLG");
    626613    MFillH fill1(&evt1, "MPedestalFromExtractorRndm", "FillPedRmsFLG");

  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

    r7023 r7035  
    264264        *fLog << setfill('0') << setw(3) << (*fPixAssignment)[i] << " ";
    265265
    266     *fLog << endl;
     266    *fLog << dec << endl;
    267267}
    268268
Note: See TracChangeset for help on using the changeset viewer.