Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 3566) +++ /trunk/MagicSoft/Mars/Changelog (revision 3567) @@ -76,4 +76,9 @@ - removed flag kHiGainFitted, kLoGainFitted, since they are available from MBadPixelsPix + + * macros/calibration.C + * macros/calibrate_data.C + - a few flags from MCalibrationChargeCam::GetPixelContent were wrong, + corrected them Index: /trunk/MagicSoft/Mars/macros/calibrate_data.C =================================================================== --- /trunk/MagicSoft/Mars/macros/calibrate_data.C (revision 3566) +++ /trunk/MagicSoft/Mars/macros/calibrate_data.C (revision 3567) @@ -79,5 +79,5 @@ // for excluding pixels from the beginning: // - // badcam1.AsciiRead("badpixels.dat"); + // badcam.AsciiRead("badpixels.dat"); plist1.AddToList(&pedcam); @@ -258,37 +258,35 @@ MHCamera disp4 (geomcam, "Cal;RSigma", "Reduced Sigmas"); MHCamera disp5 (geomcam, "Cal;RSigma/Charge", "Reduced Sigma per Charge"); - MHCamera disp6 (geomcam, "Cal;FFactorPh", "Nr. of Photo-electrons (F-Factor Method)"); + MHCamera disp6 (geomcam, "Cal;FFactorPhe", "Nr. of Photo-electrons (F-Factor Method)"); MHCamera disp7 (geomcam, "Cal;FFactorConv", "Conversion Factor to photons (F-Factor Method)"); MHCamera disp8 (geomcam, "Cal;FFactorFFactor", "Total F-Factor (F-Factor Method)"); - MHCamera disp9 (geomcam, "Cal;BlindPixPh", "Photon flux inside plexiglass (Blind Pixel Method)"); - MHCamera disp10 (geomcam, "Cal;BlindPixConv", "Conversion Factor to photons (Blind Pixel Method)"); - MHCamera disp11 (geomcam, "Cal;BlindPixFFactor","Total F-Factor (Blind Pixel Method)"); - MHCamera disp12 (geomcam, "Cal;PINDiodePh", "Photon flux outside plexiglass (PIN Diode Method)"); - MHCamera disp13 (geomcam, "Cal;PINDiodeConv", "Conversion Factor tp photons (PIN Diode Method)"); - MHCamera disp14 (geomcam, "Cal;PINDiodeFFactor","Total F-Factor (PIN Diode Method)"); - MHCamera disp15 (geomcam, "Cal;Excluded", "Pixels previously excluded"); - MHCamera disp16 (geomcam, "Cal;NotFitted", "Pixels that could not be fitted"); - MHCamera disp17 (geomcam, "Cal;NotFitValid", "Pixels with not valid fit results"); - MHCamera disp18 (geomcam, "Cal;HiGainOscillating", "Oscillating Pixels HI Gain"); - MHCamera disp19 (geomcam, "Cal;LoGainOscillating", "Oscillating Pixels LO Gain"); - MHCamera disp20 (geomcam, "Cal;HiGainPickup", "Number Pickup events Hi Gain"); - MHCamera disp21 (geomcam, "Cal;LoGainPickup", "Number Pickup events Lo Gain"); - MHCamera disp22 (geomcam, "Cal;Saturation", "Pixels with saturated Hi Gain"); - MHCamera disp23 (geomcam, "Cal;FFactorValid", "Pixels with valid F-Factor calibration"); - MHCamera disp24 (geomcam, "Cal;BlindPixelValid", "Pixels with valid BlindPixel calibration"); - MHCamera disp25 (geomcam, "Cal;PINdiodeFFactorValid", "Pixels with valid PINDiode calibration"); - - MHCamera disp26 (geomcam, "Cal;Ped", "Pedestals"); - MHCamera disp27 (geomcam, "Cal;PedRms", "Pedestal RMS"); - - MHCamera disp28 (geomcam, "time;Time", "Rel. Arrival Times"); - MHCamera disp29 (geomcam, "time;SigmaTime", "Sigma of Rel. Arrival Times"); - MHCamera disp30 (geomcam, "time;TimeProb", "Probability of Time Fit"); - MHCamera disp31 (geomcam, "time;NotFitValid", "Pixels with not valid fit results"); - MHCamera disp32 (geomcam, "time;Oscillating", "Oscillating Pixels"); - - MHCamera disp33 (geomcam, "Cal;AbsTimeMean", "Abs. Arrival Times"); - MHCamera disp34 (geomcam, "Cal;AbsTimeRms", "RMS of Arrival Times"); - + MHCamera disp9 (geomcam, "Cal;BlindPixConv", "Conversion Factor to photons (Blind Pixel Method)"); + MHCamera disp10 (geomcam, "Cal;BlindPixFFactor","Total F-Factor (Blind Pixel Method)"); + MHCamera disp11 (geomcam, "Cal;PINDiodeConv", "Conversion Factor tp photons (PIN Diode Method)"); + MHCamera disp12 (geomcam, "Cal;PINDiodeFFactor","Total F-Factor (PIN Diode Method)"); + MHCamera disp13 (geomcam, "Cal;Excluded", "Pixels previously excluded"); + MHCamera disp14 (geomcam, "Cal;NotFitted", "Pixels that could not be fitted"); + MHCamera disp15 (geomcam, "Cal;NotFitValid", "Pixels with not valid fit results"); + MHCamera disp16 (geomcam, "Cal;HiGainOscillating", "Oscillating Pixels HI Gain"); + MHCamera disp17 (geomcam, "Cal;LoGainOscillating", "Oscillating Pixels LO Gain"); + MHCamera disp18 (geomcam, "Cal;HiGainPickup", "Number Pickup events Hi Gain"); + MHCamera disp19 (geomcam, "Cal;LoGainPickup", "Number Pickup events Lo Gain"); + MHCamera disp20 (geomcam, "Cal;Saturation", "Pixels with saturated Hi Gain"); + MHCamera disp21 (geomcam, "Cal;FFactorValid", "Pixels with valid F-Factor calibration"); + MHCamera disp22 (geomcam, "Cal;BlindPixelValid", "Pixels with valid BlindPixel calibration"); + MHCamera disp23 (geomcam, "Cal;PINdiodeFFactorValid", "Pixels with valid PINDiode calibration"); + + MHCamera disp24 (geomcam, "Cal;Ped", "Pedestals"); + MHCamera disp25 (geomcam, "Cal;PedRms", "Pedestal RMS"); + + MHCamera disp26 (geomcam, "time;Time", "Rel. Arrival Times"); + MHCamera disp27 (geomcam, "time;SigmaTime", "Sigma of Rel. Arrival Times"); + MHCamera disp28 (geomcam, "time;TimeProb", "Probability of Time Fit"); + MHCamera disp29 (geomcam, "time;NotFitValid", "Pixels with not valid fit results"); + MHCamera disp30 (geomcam, "time;Oscillating", "Oscillating Pixels"); + + MHCamera disp31 (geomcam, "Cal;AbsTimeMean", "Abs. Arrival Times"); + MHCamera disp32 (geomcam, "Cal;AbsTimeRms", "RMS of Arrival Times"); + // Fitted charge means and sigmas disp1.SetCamContent(calcam, 0); @@ -296,8 +294,8 @@ disp2.SetCamContent(calcam, 2); disp2.SetCamError( calcam, 3); - + // Fit probabilities disp3.SetCamContent(calcam, 4); - + // Reduced Sigmas and reduced sigmas per charge disp4.SetCamContent(calcam, 5); @@ -305,5 +303,5 @@ disp5.SetCamContent(calcam, 7); disp5.SetCamError( calcam, 8); - + // F-Factor Method disp6.SetCamContent(calcam, 9); @@ -313,78 +311,73 @@ disp8.SetCamContent(calcam, 13); disp8.SetCamError( calcam, 14); - - /// Blind Pixel Method - disp9.SetCamContent(calcam, 15); - disp9.SetCamError( calcam, 16); - disp10.SetCamContent(calcam,17); - disp10.SetCamError( calcam,18); - disp11.SetCamContent(calcam,19); - disp11.SetCamError( calcam,20); - + + // Blind Pixel Method + disp9.SetCamContent(calcam, 16); + disp9.SetCamError( calcam, 17); + disp10.SetCamContent(calcam,18); + disp10.SetCamError( calcam,19); + // PIN Diode Method - disp12.SetCamContent(calcam,21); - disp12.SetCamError( calcam,22); - disp13.SetCamContent(calcam,23); - disp13.SetCamError( calcam,24); - disp14.SetCamContent(calcam,25); - disp14.SetCamError( calcam,26); - + disp11.SetCamContent(calcam,21); + disp11.SetCamError( calcam,22); + disp12.SetCamContent(calcam,23); + disp12.SetCamError( calcam,24); + // Pixels with defects - disp15.SetCamContent(calcam,27); - disp16.SetCamContent(calcam,28); - disp17.SetCamContent(badcam,9); - disp18.SetCamContent(badcam,16); - disp19.SetCamContent(badcam,15); + disp13.SetCamContent(calcam,26); + disp14.SetCamContent(badcam,7); + disp15.SetCamContent(badcam,9); + disp16.SetCamContent(badcam,16); + disp17.SetCamContent(badcam,15); + disp18.SetCamContent(calcam,27); + disp19.SetCamContent(calcam,28); + + // Lo Gain calibration disp20.SetCamContent(calcam,29); - disp21.SetCamContent(calcam,30); - - // Lo Gain calibration - disp22.SetCamContent(calcam,31); - + // Valid flags - disp23.SetCamContent(calcam,32); - disp24.SetCamContent(calcam,33); - disp25.SetCamContent(calcam,34); - + disp21.SetCamContent(calcam,15); + disp22.SetCamContent(calcam,20); + disp23.SetCamContent(calcam,25); + // Pedestals - disp26.SetCamContent(calcam,35); - disp26.SetCamError( calcam,36); - disp27.SetCamContent(calcam,37); - disp27.SetCamError( calcam,38); - - + disp24.SetCamContent(calcam,30); + disp24.SetCamError( calcam,31); + disp25.SetCamContent(calcam,32); + disp25.SetCamError( calcam,33); + // Relative Times - disp28.SetCamContent(histtime,0); - disp28.SetCamError( histtime,1); - disp29.SetCamContent(histtime,2); - disp29.SetCamError( histtime,3); - disp30.SetCamContent(histtime,4); - disp31.SetCamContent(histtime,5); - disp32.SetCamContent(histtime,6); - + disp26.SetCamContent(histtime,0); + disp26.SetCamError( histtime,1); + disp27.SetCamContent(histtime,2); + disp27.SetCamError( histtime,3); + disp28.SetCamContent(histtime,4); + disp29.SetCamContent(histtime,5); + disp30.SetCamContent(histtime,6); + // Absolute Times - disp33.SetCamContent(calcam,39); - disp33.SetCamError( calcam,40); - disp34.SetCamContent(calcam,41); - + disp31.SetCamContent(calcam,34); + disp31.SetCamError( calcam,35); + disp32.SetCamContent(calcam,35); + disp1.SetYTitle("Charge [FADC units]"); disp2.SetYTitle("\\sigma_{Charge} [FADC units]"); disp3.SetYTitle("P_{Charge} [1]"); - + disp4.SetYTitle("\\sqrt{\\sigma^{2}_{Charge} - RMS^{2}_{Ped}} [FADC Counts]"); disp5.SetYTitle("Reduced Sigma / Mean Charge [1]"); - + disp6.SetYTitle("Nr. Photo-electrons [1]"); disp7.SetYTitle("Conversion Factor [Ph/FADC Count]"); disp8.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1] "); - - disp9.SetYTitle("Photon flux [ph/mm^2]"); - disp10.SetYTitle("Conversion Factor [Phot/FADC Count]"); - disp11.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]"); - - disp12.SetYTitle("Photon flux [ph/mm^2]"); - disp13.SetYTitle("Conversion Factor [Phot/FADC Count]"); - disp14.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]"); - + + disp9.SetYTitle("Conversion Factor [Phot/FADC Count]"); + disp10.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]"); + + disp11.SetYTitle("Conversion Factor [Phot/FADC Count]"); + disp12.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]"); + + disp13.SetYTitle("[1]"); + disp14.SetYTitle("[1]"); disp15.SetYTitle("[1]"); disp16.SetYTitle("[1]"); @@ -396,20 +389,18 @@ disp22.SetYTitle("[1]"); disp23.SetYTitle("[1]"); - disp24.SetYTitle("[1]"); - disp25.SetYTitle("[1]"); - - disp26.SetYTitle("Ped [FADC Counts ]"); - disp27.SetYTitle("RMS_{Ped} [FADC Counts ]"); - - disp28.SetYTitle("Time Offset [ns]"); - disp29.SetYTitle("Timing resolution [ns]"); - disp30.SetYTitle("P_{Time} [1]"); - - disp31.SetYTitle("[1]"); - disp32.SetYTitle("[1]"); - - disp33.SetYTitle("Mean Abs. Time [FADC slice]"); - disp34.SetYTitle("RMS Abs. Time [FADC slices]"); - + + disp24.SetYTitle("Ped [FADC Counts ]"); + disp25.SetYTitle("RMS_{Ped} [FADC Counts ]"); + + disp26.SetYTitle("Time Offset [ns]"); + disp27.SetYTitle("Timing resolution [ns]"); + disp28.SetYTitle("P_{Time} [1]"); + + disp29.SetYTitle("[1]"); + disp30.SetYTitle("[1]"); + + disp31.SetYTitle("Mean Abs. Time [FADC slice]"); + disp32.SetYTitle("RMS Abs. Time [FADC slices]"); + gStyle->SetOptStat(1111); gStyle->SetOptFit(); @@ -445,17 +436,15 @@ // Blind Pixel Method TCanvas &c5 = display->AddTab("BlindPix"); - c5.Divide(3, 3); - - CamDraw(c5, disp9,calcam,1, 3 , 9); - CamDraw(c5, disp10,calcam,2, 3 , 2); - CamDraw(c5, disp11,calcam,3, 3 , 2); + c5.Divide(2,3); + + CamDraw(c5, disp9, calcam,1, 2 , 2); + CamDraw(c5, disp10,calcam,2, 2 , 2); // PIN Diode Method TCanvas &c6 = display->AddTab("PINDiode"); - c6.Divide(3,3); - - CamDraw(c6, disp12,calcam,1, 3 , 9); - CamDraw(c6, disp13,calcam,2, 3 , 2); - CamDraw(c6, disp14,calcam,3, 3 , 2); + c6.Divide(2,3); + + CamDraw(c6, disp11,calcam,1, 2 , 2); + CamDraw(c6, disp12,calcam,2, 2 , 2); // Defects @@ -463,8 +452,8 @@ c7.Divide(4,2); - CamDraw(c7, disp15,calcam,1,4, 0); - CamDraw(c7, disp16,calcam,2,4, 0); - CamDraw(c7, disp20,calcam,3,4, 0); - CamDraw(c7, disp21,calcam,4,4, 0); + CamDraw(c7, disp13,calcam,1,4, 0); + CamDraw(c7, disp14,calcam,2,4, 0); + CamDraw(c7, disp18,calcam,3,4, 0); + CamDraw(c7, disp19,calcam,4,4, 0); // BadCam @@ -472,7 +461,7 @@ c8.Divide(3,2); - CamDraw(c8, disp17,badcam,1,3, 0); - CamDraw(c8, disp18,badcam,2,3, 0); - CamDraw(c8, disp19,badcam,3,3, 0); + CamDraw(c8, disp15,badcam,1,3, 0); + CamDraw(c8, disp16,badcam,2,3, 0); + CamDraw(c8, disp17,badcam,3,3, 0); @@ -481,8 +470,8 @@ c9.Divide(4,2); - CamDraw(c9, disp22,calcam,1,4,0); - CamDraw(c9, disp23,calcam,2,4,0); - CamDraw(c9, disp24,calcam,3,4,0); - CamDraw(c9, disp25,calcam,4,4,0); + CamDraw(c9, disp20,calcam,1,4,0); + CamDraw(c9, disp21,calcam,2,4,0); + CamDraw(c9, disp22,calcam,3,4,0); + CamDraw(c9, disp23,calcam,4,4,0); @@ -491,6 +480,6 @@ c10.Divide(2,3); - CamDraw(c10,disp26,calcam,1,2,1); - CamDraw(c10,disp27,calcam,2,2,2); + CamDraw(c10,disp24,calcam,1,2,1); + CamDraw(c10,disp25,calcam,2,2,2); // Rel. Times @@ -498,7 +487,7 @@ c11.Divide(3,3); - CamDraw(c11,disp28,calcam,1,3,2); - CamDraw(c11,disp29,calcam,2,3,2); - CamDraw(c11,disp30,calcam,3,3,4); + CamDraw(c11,disp26,calcam,1,3,2); + CamDraw(c11,disp27,calcam,2,3,2); + CamDraw(c11,disp38,calcam,3,3,4); // Time Defects @@ -506,6 +495,6 @@ c12.Divide(2,2); - CamDraw(c12, disp31,calcam,1,2, 0); - CamDraw(c12, disp32,calcam,2,2, 0); + CamDraw(c12, disp29,calcam,1,2, 0); + CamDraw(c12, disp30,calcam,2,2, 0); // Abs. Times @@ -513,6 +502,6 @@ c13.Divide(2,3); - CamDraw(c13,disp33,calcam,1,2,2); - CamDraw(c13,disp34,calcam,2,2,2); + CamDraw(c13,disp31,calcam,1,2,2); + CamDraw(c13,disp32,calcam,2,2,2); /************************************************************************/