Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 3184) +++ /trunk/MagicSoft/Mars/Changelog (revision 3185) @@ -4,5 +4,5 @@ -*-*- END OF LINE -*-*- - 2004/02/14: Thomas Bretz + 2004/02/16: Thomas Bretz * manalysis/AnalysisLinkDef.h: @@ -72,5 +72,5 @@ 2004/02/16: Markus Gaug - * mcalib/Makefile, mcalib/CalibLinkDef.h: + * mcalib/Makefile, mcalib/CalibLinkDef.h, macros/calibration.C: - added MHCalibrationRelTimePix Index: /trunk/MagicSoft/Mars/macros/calibration.C =================================================================== --- /trunk/MagicSoft/Mars/macros/calibration.C (revision 3184) +++ /trunk/MagicSoft/Mars/macros/calibration.C (revision 3185) @@ -65,4 +65,9 @@ MGeomApply geomapl; MExtractSignal sigcalc; + + + MExtractPINDiode pidcalc; + MExtractedSignalPINDiode pindiode; + // MHCalibrationChargePINDiode pinhist; // // Set the extraction range higher: @@ -77,10 +82,13 @@ // MFillH fill("MHPedestalCam", "MExtractedSignalCam"); + // MFillH fillp("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode"); tlist.AddToList(&read); tlist.AddToList(&geomapl); tlist.AddToList(&sigcalc); + tlist.AddToList(&pidcalc); tlist.AddToList(&pedcalc); tlist.AddToList(&fill); + // tlist.AddToList(&fillp); MGeomCamMagic geomcam; @@ -90,4 +98,6 @@ plist.AddToList(&pedcam); plist.AddToList(&hpedcam); + plist.AddToList(&pindiode); + // plist.AddToList(&pinhist); // @@ -109,5 +119,6 @@ // Look at one specific pixel, after all the histogram manipulations: // - // hpedcam[17].DrawClone("fourierevents"); + hpedcam[9].DrawClone("fourier"); + MHCamera dispped0 (geomcam, "Ped;Pedestal", "Mean per Slice"); @@ -215,6 +226,7 @@ plist2.AddToList(&tlist2); - MExtractedSignalCam sigcam; - MCalibrationCam calcam; + MExtractedSignalCam sigcam; + MCalibrationCam calcam; + MHCalibrationRelTimeCam timecam; // // Get the previously created MPedestalCam into the new Parameter List @@ -224,5 +236,5 @@ plist2.AddToList(&sigcam); plist2.AddToList(&calcam); - + plist2.AddToList(&timecam); // // Get the MAGIC geometry @@ -242,7 +254,8 @@ // MExtractSignal2 sigcalc2; - MArrivalTimeCalc timecalc; + MArrivalTimeCalc2 timecalc; MCalibrationCalc calcalc; - + + MFillH filltime("MHCalibrationRelTimeCam", "MArrivalTime"); // // Set the range (other than default) @@ -291,5 +304,5 @@ // MCalibrationBlindPix *bp = calcam.GetBlindPixel(); - // bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPoisson5); + bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPoisson5); // @@ -303,11 +316,16 @@ tlist2.AddToList(&sigcalc2); // + // In case, you want to skip the cosmics rejection, + // uncomment the next line + // + tlist2.AddToList(&cont); + // // In case, you want to skip the somewhat lengthy calculation - // of the arrival times using a spline, uncomment the next line - // - // tlist2.AddToList(&timecalc); - tlist2.AddToList(&cont); + // of the arrival times using a spline, uncomment the next two lines + // + tlist2.AddToList(&timecalc); + tlist2.AddToList(&filltime); + // tlist2.AddToList(&calcalc); - // // Create and setup the eventloop @@ -357,15 +375,15 @@ MHCamera disp19 (geomcam, "Cal;Saturation", "Pixels with saturated Hi Gain"); - - MHCamera disp20 (geomcam, "cal;Ped", "Pedestals"); - MHCamera disp21 (geomcam, "cal;PedRms", "Pedestal RMS"); - - MHCamera disp22 (geomcam, "cal;Time", "Rel. Arrival Times"); - MHCamera disp23 (geomcam, "cal;SigmaTime", "Sigma of Rel. Arrival Times"); - MHCamera disp24 (geomcam, "cal;TimeProb", "Probability of Time Fit"); - - MHCamera disp25 (geomcam, "cal;AbsTimeMean", "Abs. Arrival Times"); - MHCamera disp26 (geomcam, "cal;AbsTimeRms", "RMS of Arrival Times"); - + MHCamera disp20 (geomcam, "Cal;Ped", "Pedestals"); + MHCamera disp21 (geomcam, "Cal;PedRms", "Pedestal RMS"); + + MHCamera disp22 (geomcam, "time;Time", "Rel. Arrival Times"); + MHCamera disp23 (geomcam, "time;SigmaTime", "Sigma of Rel. Arrival Times"); + MHCamera disp24 (geomcam, "time;TimeProb", "Probability of Time Fit"); + MHCamera disp25 (geomcam, "time;NotFitValid", "Pixels with not valid fit results"); + MHCamera disp26 (geomcam, "time;Oscillating", "Oscillating Pixels"); + + MHCamera disp27 (geomcam, "Cal;AbsTimeMean", "Abs. Arrival Times"); + MHCamera disp28 (geomcam, "Cal;AbsTimeRms", "RMS of Arrival Times"); // Fitted charge means and sigmas @@ -426,15 +444,17 @@ // Relative Times - disp20.SetCamContent(calcam,39); - disp20.SetCamError( calcam,40); - disp21.SetCamContent(calcam,41); - disp21.SetCamError( calcam,42); - disp22.SetCamContent(calcam,43); + disp22.SetCamContent(timecam,0); + disp22.SetCamError( timecam,1); + disp23.SetCamContent(timecam,2); + disp23.SetCamError( timecam,3); + disp24.SetCamContent(timecam,4); + disp25.SetCamContent(timecam,5); + disp26.SetCamContent(timecam,6); // Absolute Times - disp23.SetCamContent(calcam,44); - disp23.SetCamError( calcam,45); - disp24.SetCamContent(calcam,46); - disp24.SetCamError( calcam,47); + disp27.SetCamContent(calcam,39); + disp27.SetCamError( calcam,40); + disp28.SetCamContent(calcam,41); + disp28.SetCamError( calcam,42); @@ -462,15 +482,18 @@ disp17.SetYTitle("[1]"); disp18.SetYTitle("[1]"); - - disp19.SetYTitle("Ped [FADC Counts ]"); - disp20.SetYTitle("RMS_{Ped} [FADC Counts ]"); - - disp21.SetYTitle("Rel. Arr. Time [ns]"); - disp22.SetYTitle("\\sigma_{Time} [ns]"); - disp23.SetYTitle("P_{Time} [1]"); - - disp24.SetYTitle("Mean Abs. Time [FADC slice]"); - disp25.SetYTitle("RMS Abs. Time [FADC slices]"); - + disp19.SetYTitle("[1]"); + + disp20.SetYTitle("Ped [FADC Counts ]"); + disp21.SetYTitle("RMS_{Ped} [FADC Counts ]"); + + disp22.SetYTitle("Time Offset [ns]"); + disp23.SetYTitle("Timing resolution [ns]"); + disp24.SetYTitle("P_{Time} [1]"); + + disp25.SetYTitle("[1]"); + disp26.SetYTitle("[1]"); + + disp27.SetYTitle("Mean Abs. Time [FADC slice]"); + disp28.SetYTitle("RMS Abs. Time [FADC slices]"); gStyle->SetOptStat(1111); @@ -503,5 +526,5 @@ CamDraw(c4, disp6,calcam,1, 2 , 2); CamDraw(c4, disp7,calcam,2, 2 , 2); - // CamDraw(c4, disp8,calcam,3, 3 , 2); + CamDraw(c4, disp8,calcam,3, 3 , 2); // Blind Pixel Method @@ -541,6 +564,6 @@ c9.Divide(2,3); - CamDraw(c9,disp20,calcam,1,3,1); - CamDraw(c9,disp21,calcam,2,3,2); + CamDraw(c9,disp20,calcam,1,2,1); + CamDraw(c9,disp21,calcam,2,2,2); @@ -553,11 +576,17 @@ CamDraw(c10,disp24,calcam,3,3,4); + // Time Defects + TCanvas &c11 = display->AddTab("Time Def."); + c11.Divide(2,2); + + CamDraw(c11, disp25,calcam,1,2, 0); + CamDraw(c11, disp26,calcam,2,2, 0); // Abs. Times - TCanvas &c11 = display->AddTab("Abs. Times"); - c11.Divide(2,3); - - CamDraw(c11,disp25,calcam,1,2,2); - CamDraw(c11,disp26,calcam,2,2,2); + TCanvas &c12 = display->AddTab("Abs. Times"); + c12.Divide(2,3); + + CamDraw(c12,disp27,calcam,1,2,2); + CamDraw(c12,disp28,calcam,2,2,2); }