Changeset 6457


Ignore:
Timestamp:
02/14/05 14:01:35 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r6456 r6457  
    4646   * mraw/MRawFileRead.[h,cc]:
    4747     - calculate total number of events from all files in PreProcess
     48
     49   * mcalib/MCalibConstCam.cc:
     50     - added case 2 to GetPixelContent
     51
     52   * mjobs/MJCalibrateSignal.cc:
     53     - fixed redirection of stream with interleaved calibration infos
     54     - changed 'Arrival Time' to 'Calibrated Arrival Time'
     55     - display interpolated signal in equivalent photoelectrons to
     56       to get rid of scaling effects which makes it difficult to see
     57       details of the structure of the inner pixels in the histogram.
     58       With this you can immediatly see whether the relative number
     59       of phe in the outer pixels is equiv. to the inner pixels.
     60     - the same for the calibration factor - with the same argument
     61
     62   * mhist/MHCamera.cc:
     63     - changed drawing such, that NaN is not displayed anymore
    4864
    4965
  • trunk/MagicSoft/Mars/mcalib/MCalibConstCam.cc

    r6092 r6457  
    260260      val = (*this)[idx].GetCalibFFactor();
    261261      break;
     262    case 2:
     263      val = (*this)[idx].GetCalibConst()*cam.GetPixRatio(idx);
     264      break;
    262265    default:
    263266      return kFALSE;
  • trunk/MagicSoft/Mars/mhist/MHCamera.cc

    r6276 r6457  
    858858        if (!issame)
    859859        {
    860             if (IsUsed(i) && iscol)
     860            const Bool_t isnan = TMath::IsNaN(fArray[i+1]);
     861            if (!IsUsed(i) || !iscol || isnan)
    861862            {
    862                 if (TMath::IsNaN(fArray[i+1]))
     863                hex.SetFillColor(10);
     864
     865                if (isnan)
    863866                    gLog << warn << "MHCamera::Update: " << GetName() << " <" << GetTitle() << "> - Pixel Index #" << i << " contents is NaN (Not a Number)..." << endl;
    864 
    865                 hex.SetFillColor(GetColor(GetBinContent(i+1), min, max, islog));
    866867            }
    867868            else
    868                 hex.SetFillColor(10);
     869                hex.SetFillColor(GetColor(GetBinContent(i+1), min, max, islog));
    869870        }
    870871
  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r6377 r6457  
    477477
    478478    MFTriggerPattern        fcalib("CalibFilter");
     479    fcalib.RequireCalibration();
     480
    479481    MCalibrationChargeCalc  chcalc;
    480482    MCalibrationRelTimeCalc recalc;
    481483    MCalibCalcFromPast      pacalc;
    482 
    483     fcalib.RequireCalibration();
    484     //    fcalib.SetInverted();
     484    chcalc.SetOutputFile("");
     485    recalc.SetOutputFile("");
    485486
    486487    pinext.SetPedestals(&pedcamab);
     
    508509    filhil.SetBit(MFillH::kDoNotDisplay);
    509510
    510     MCalibrateRelTimes     caltm;
    511     MBadPixelsCalc         bpcal;
    512     MBadPixelsTreat        treat;
     511    MCalibrateRelTimes caltm;
     512    MBadPixelsCalc     bpcal;
     513    MBadPixelsTreat    treat;
    513514
    514515    bpcal.SetNamePedPhotCam("MPedPhotFromExtractor");
     
    519520        treat.SetProcessTimes(kFALSE);
    520521
    521 
    522     MHCamEvent evt0(0, "PedFLG",      "Fundamental Pedestal from Lo Gain;;P [cnts/sl]");
    523     MHCamEvent evt1(2, "PedRmsFLG",   "RMS from Extractor applied to ped.;;\\sigma_{p} [cnts/sl]");
    524     MHCamEvent evt2(0, "Extra'd",     "Extracted Signal;;S [cnts/sl]");
    525     //    MHCamEvent evt3(4, "PedPhot",     "Calibrated Pedestal;;P [phe]");
    526     MHCamEvent evt4(5, "PedRMS",      "Calibrated RMS from Extractor applied to ped.;;\\sigma_{p} [phe]");
    527     MHCamEvent evt5(3, "Interp'd",    "Interpolated Signal;;S [phe]");
    528     MHCamEvent evt6(2, "Unsuitable",  "Fraction of unsuitable events per Pixel;;[1]");
    529     MHCamEvent evt7(0, "Times",       "Arrival Time;;T [fadc sl]");
    530     MHCamEvent evt8(0, "Conv",        "Calibration Conv. Factors;;[phe/fadc cnts]");
     522    MHCamEvent evt0(0, "PedFLG",     "Fundamental Pedestal from Lo Gain;;P [cnts/sl]");
     523    MHCamEvent evt1(2, "PedRmsFLG",  "RMS from Extractor applied to ped.;;\\sigma_{p} [cnts/sl]");
     524    MHCamEvent evt2(0, "Extra'd",    "Extracted Signal;;S [cnts/sl]");
     525    // MHCamEvent evt3(4, "PedPhot",    "Calibrated Pedestal;;P [phe]");
     526    MHCamEvent evt4(5, "PedRMS",     "Calibrated RMS from Extractor applied to ped.;;\\sigma_{p} [phe]");
     527    MHCamEvent evt5(0, "Interp'd",   "Interpolated Signal;;S [phe]");
     528    MHCamEvent evt6(2, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]");
     529    MHCamEvent evt7(0, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
     530    MHCamEvent evt8(2, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
    531531
    532532    evt0.EnableSqrtVariance();
Note: See TracChangeset for help on using the changeset viewer.