Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 3563) +++ trunk/MagicSoft/Mars/Changelog (revision 3564) @@ -37,4 +37,5 @@ - fixed GetPixelContent flags - introduced RadialProfile for some displays + - removed some not so important displays * manalysis/MGeomApply.cc Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 3563) +++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 3564) @@ -36,4 +36,5 @@ #include #include +#include #include "MLog.h" @@ -79,148 +80,210 @@ } -void MJCalibration::DrawProjection(MHCamera *obj1, Int_t fit) const -{ - TH1D *obj2 = (TH1D*)obj1->Projection(obj1->GetName()); - obj2->SetDirectory(0); - obj2->Draw(); - obj2->SetBit(kCanDelete); - - if (obj1->GetGeomCam().InheritsFrom("MGeomCamMagic")) - { - TArrayI s0(3); - s0[0] = 6; - s0[1] = 1; - s0[2] = 2; - - TArrayI s1(3); - s1[0] = 3; - s1[1] = 4; - s1[2] = 5; - - TArrayI inner(1); - inner[0] = 0; - - TArrayI outer(1); - outer[0] = 1; - - // Just to get the right (maximum) binning - TH1D *half[4]; - half[0] = obj1->ProjectionS(s0, inner, "Sector 6-1-2 Inner"); - half[1] = obj1->ProjectionS(s1, inner, "Sector 3-4-5 Inner"); - half[2] = obj1->ProjectionS(s0, outer, "Sector 6-1-2 Outer"); - half[3] = obj1->ProjectionS(s1, outer, "Sector 3-4-5 Outer"); - - for (int i=0; i<4; i++) +void MJCalibration::DrawProjection(MHCamera *obj, Int_t fit) const +{ + + TH1D *obj2 = (TH1D*)obj->Projection(obj->GetName()); + obj2->SetDirectory(0); + obj2->Draw(); + obj2->SetBit(kCanDelete); + + if (obj->GetGeomCam().InheritsFrom("MGeomCamMagic")) + { + TArrayI s0(3); + s0[0] = 6; + s0[1] = 1; + s0[2] = 2; + + TArrayI s1(3); + s1[0] = 3; + s1[1] = 4; + s1[2] = 5; + + TArrayI inner(1); + inner[0] = 0; + + TArrayI outer(1); + outer[0] = 1; + + // Just to get the right (maximum) binning + TH1D *half[4]; + half[0] = obj->ProjectionS(s0, inner, "Sector 6-1-2 Inner"); + half[1] = obj->ProjectionS(s1, inner, "Sector 3-4-5 Inner"); + half[2] = obj->ProjectionS(s0, outer, "Sector 6-1-2 Outer"); + half[3] = obj->ProjectionS(s1, outer, "Sector 3-4-5 Outer"); + + for (int i=0; i<4; i++) { - half[i]->SetLineColor(kRed+i); - half[i]->SetDirectory(0); - half[i]->SetBit(kCanDelete); - half[i]->Draw("same"); + half[i]->SetLineColor(kRed+i); + half[i]->SetDirectory(0); + half[i]->SetBit(kCanDelete); + half[i]->Draw("same"); } } - - const Double_t min = obj2->GetBinCenter(obj2->GetXaxis()->GetFirst()); - const Double_t max = obj2->GetBinCenter(obj2->GetXaxis()->GetLast()); - const Double_t integ = obj2->Integral("width")/2.5; - const Double_t mean = obj2->GetMean(); - const Double_t rms = obj2->GetRMS(); - const Double_t width = max-min; - - const TString dgausformula = "([0]-[3])/[2]*exp(-0.5*(x-[1])*(x-[1])/[2]/[2])" - "+[3]/[5]*exp(-0.5*(x-[4])*(x-[4])/[5]/[5])"; - - const TString tgausformula = "([0]-[3]-[6])/[2]*exp(-0.5*(x-[1])*(x-[1])/[2]/[2])" - "+[3]/[5]*exp(-0.5*(x-[4])*(x-[4])/[5]/[5])" - "+[6]/[8]*exp(-0.5*(x-[7])*(x-[7])/[8]/[8])"; - TF1 *f=0; - switch (fit) + + const Double_t min = obj2->GetBinCenter(obj2->GetXaxis()->GetFirst()); + const Double_t max = obj2->GetBinCenter(obj2->GetXaxis()->GetLast()); + const Double_t integ = obj2->Integral("width")/2.5; + const Double_t mean = obj2->GetMean(); + const Double_t rms = obj2->GetRMS(); + const Double_t width = max-min; + + const TString dgausformula = "([0]-[3])/[2]*exp(-0.5*(x-[1])*(x-[1])/[2]/[2])" + "+[3]/[5]*exp(-0.5*(x-[4])*(x-[4])/[5]/[5])"; + + const TString tgausformula = "([0]-[3]-[6])/[2]*exp(-0.5*(x-[1])*(x-[1])/[2]/[2])" + "+[3]/[5]*exp(-0.5*(x-[4])*(x-[4])/[5]/[5])" + "+[6]/[8]*exp(-0.5*(x-[7])*(x-[7])/[8]/[8])"; + TF1 *f=0; + switch (fit) { case 1: - f = new TF1("sgaus", "gaus(0)", min, max); - f->SetLineColor(kYellow); - f->SetBit(kCanDelete); - f->SetParNames("Area", "#mu", "#sigma"); - f->SetParameters(integ/rms, mean, rms); - f->SetParLimits(0, 0, integ); - f->SetParLimits(1, min, max); - f->SetParLimits(2, 0, width/1.5); - - obj2->Fit(f, "QLR"); - break; - + f = new TF1("sgaus", "gaus(0)", min, max); + f->SetLineColor(kYellow); + f->SetBit(kCanDelete); + f->SetParNames("Area", "#mu", "#sigma"); + f->SetParameters(integ/rms, mean, rms); + f->SetParLimits(0, 0, integ); + f->SetParLimits(1, min, max); + f->SetParLimits(2, 0, width/1.5); + + obj2->Fit(f, "QLR"); + break; + case 2: - f = new TF1("dgaus",dgausformula.Data(),min,max); - f->SetLineColor(kYellow); - f->SetBit(kCanDelete); - f->SetParNames("A_{tot}", "#mu1", "#sigma1", "A2", "#mu2", "#sigma2"); - f->SetParameters(integ,(min+mean)/2.,width/4., - integ/width/2.,(max+mean)/2.,width/4.); - // The left-sided Gauss - f->SetParLimits(0,integ-1.5 , integ+1.5); - f->SetParLimits(1,min+(width/10.), mean); - f->SetParLimits(2,0 , width/2.); - // The right-sided Gauss - f->SetParLimits(3,0 , integ); - f->SetParLimits(4,mean, max-(width/10.)); - f->SetParLimits(5,0 , width/2.); - obj2->Fit(f,"QLRM"); - break; - + f = new TF1("dgaus",dgausformula.Data(),min,max); + f->SetLineColor(kYellow); + f->SetBit(kCanDelete); + f->SetParNames("A_{tot}", "#mu1", "#sigma1", "A2", "#mu2", "#sigma2"); + f->SetParameters(integ,(min+mean)/2.,width/4., + integ/width/2.,(max+mean)/2.,width/4.); + // The left-sided Gauss + f->SetParLimits(0,integ-1.5 , integ+1.5); + f->SetParLimits(1,min+(width/10.), mean); + f->SetParLimits(2,0 , width/2.); + // The right-sided Gauss + f->SetParLimits(3,0 , integ); + f->SetParLimits(4,mean, max-(width/10.)); + f->SetParLimits(5,0 , width/2.); + obj2->Fit(f,"QLRM"); + break; + case 3: - f = new TF1("tgaus",tgausformula.Data(),min,max); - f->SetLineColor(kYellow); - f->SetBit(kCanDelete); - f->SetParNames("A_{tot}","#mu_{1}","#sigma_{1}", - "A_{2}","#mu_{2}","#sigma_{2}", - "A_{3}","#mu_{3}","#sigma_{3}"); - f->SetParameters(integ,(min+mean)/2,width/4., - integ/width/3.,(max+mean)/2.,width/4., - integ/width/3.,mean,width/2.); - // The left-sided Gauss - f->SetParLimits(0,integ-1.5,integ+1.5); - f->SetParLimits(1,min+(width/10.),mean); - f->SetParLimits(2,width/15.,width/2.); - // The right-sided Gauss - f->SetParLimits(3,0.,integ); - f->SetParLimits(4,mean,max-(width/10.)); - f->SetParLimits(5,width/15.,width/2.); - // The Gauss describing the outliers - f->SetParLimits(6,0.,integ); - f->SetParLimits(7,min,max); - f->SetParLimits(8,width/4.,width/1.5); - obj2->Fit(f,"QLRM"); - break; - + f = new TF1("tgaus",tgausformula.Data(),min,max); + f->SetLineColor(kYellow); + f->SetBit(kCanDelete); + f->SetParNames("A_{tot}","#mu_{1}","#sigma_{1}", + "A_{2}","#mu_{2}","#sigma_{2}", + "A_{3}","#mu_{3}","#sigma_{3}"); + f->SetParameters(integ,(min+mean)/2,width/4., + integ/width/3.,(max+mean)/2.,width/4., + integ/width/3.,mean,width/2.); + // The left-sided Gauss + f->SetParLimits(0,integ-1.5,integ+1.5); + f->SetParLimits(1,min+(width/10.),mean); + f->SetParLimits(2,width/15.,width/2.); + // The right-sided Gauss + f->SetParLimits(3,0.,integ); + f->SetParLimits(4,mean,max-(width/10.)); + f->SetParLimits(5,width/15.,width/2.); + // The Gauss describing the outliers + f->SetParLimits(6,0.,integ); + f->SetParLimits(7,min,max); + f->SetParLimits(8,width/4.,width/1.5); + obj2->Fit(f,"QLRM"); + break; + case 4: - obj2->Fit("pol0", "Q"); - obj2->GetFunction("pol0")->SetLineColor(kYellow); - break; - + obj2->Fit("pol0", "Q"); + obj2->GetFunction("pol0")->SetLineColor(kYellow); + break; + case 9: - break; - + break; + default: - obj2->Fit("gaus", "Q"); - obj2->GetFunction("gaus")->SetLineColor(kYellow); - break; - } -} - -void MJCalibration::CamDraw(TCanvas &c, const Int_t x, const Int_t y, const MHCamera &cam1, const Int_t fit) + obj2->Fit("gaus", "Q"); + obj2->GetFunction("gaus")->SetLineColor(kYellow); + break; + } +} + +void MJCalibration::DrawRadialProfile(MHCamera *obj) const +{ + + TProfile *obj2 = (TProfile*)obj->RadialProfile(obj->GetName()); + obj2->SetDirectory(0); + obj2->Draw(); + obj2->SetBit(kCanDelete); + + if (obj->GetGeomCam().InheritsFrom("MGeomCamMagic")) + { + + TArrayI s0(6); + s0[0] = 1; + s0[1] = 2; + s0[2] = 3; + s0[3] = 4; + s0[4] = 5; + s0[5] = 6; + + TArrayI inner(1); + inner[0] = 0; + + TArrayI outer(1); + outer[0] = 1; + + // Just to get the right (maximum) binning + TProfile *half[2]; + half[0] = obj->RadialProfileS(s0, inner,Form("%s%s",obj->GetName(),"Inner")); + half[1] = obj->RadialProfileS(s0, outer,Form("%s%s",obj->GetName(),"Outer")); + + for (Int_t i=0; i<2; i++) + { + Double_t min = obj->GetGeomCam().GetMinRadius(i); + Double_t max = obj->GetGeomCam().GetMaxRadius(i); + + half[i]->SetLineColor(kRed+i); + half[i]->SetDirectory(0); + half[i]->SetBit(kCanDelete); + half[i]->Draw("same"); + half[i]->Fit("pol1","Q","",min,max); + half[i]->GetFunction("pol1")->SetLineColor(kRed+i); + half[i]->GetFunction("pol1")->SetLineWidth(1); + } + } +} + + +void MJCalibration::CamDraw(TCanvas &c, const Int_t x, const Int_t y, const MHCamera &cam1, + const Int_t fit, const Int_t rad) { c.cd(x); gPad->SetBorderMode(0); + gPad->SetTicks(); MHCamera *obj1=(MHCamera*)cam1.DrawCopy("hist"); - obj1->AddNotify(&fCalibrationCam); + obj1->SetDirectory(NULL); c.cd(x+y); gPad->SetBorderMode(0); + obj1->SetPrettyPalette(); + obj1->AddNotify(&fCalibrationCam); obj1->Draw(); + + if (rad) + { + c.cd(x+2*y); + gPad->SetBorderMode(0); + gPad->SetTicks(); + DrawRadialProfile(obj1); + } + if (!fit) return; - c.cd(x+2*y); + c.cd(rad ? x+3*y : x+2*y); gPad->SetBorderMode(0); + gPad->SetTicks(); DrawProjection(obj1, fit); } @@ -249,21 +312,20 @@ MHCamera disp1 (geomcam, "Cal;Charge", "Fitted Mean Charges"); MHCamera disp2 (geomcam, "Cal;SigmaCharge", "Sigma of Fitted Charges"); - MHCamera disp3 (geomcam, "Cal;FitProb", "Probability of Fit"); - MHCamera disp4 (geomcam, "Cal;RSigma", "Reduced Sigmas"); - MHCamera disp5 (geomcam, "Cal;RSigma/Charge", "Reduced Sigma per Charge"); - MHCamera disp6 (geomcam, "Cal;FFactorPhe", "Nr. of Phe's (F-Factor Method)"); - MHCamera disp7 (geomcam, "Cal;FFactorConv", "Conversion Factor (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 (Blind Pixel Method)"); - MHCamera disp11(geomcam, "Cal;BlindPixFFactor","Total F-Factor (Blind Pixel Method)"); - MHCamera disp12(geomcam, "Cal;PINDiodePh", "Photons flux outside plexiglass (PIN Diode Method)"); - MHCamera disp13(geomcam, "Cal;PINDiodeConv", "Conversion Factor (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;Oscillation", "Oscillating Pixels"); - MHCamera disp19(geomcam, "Cal;Saturation", "Pixels with saturated Hi Gain"); + MHCamera disp3 (geomcam, "Cal;RSigma", "Reduced Sigmas"); + MHCamera disp4 (geomcam, "Cal;RSigma/Charge", "Reduced Sigma per Charge"); + MHCamera disp5 (geomcam, "Cal;FFactorPhe", "Nr. of Phe's (F-Factor Method)"); + MHCamera disp6 (geomcam, "Cal;FFactorConv", "Conversion Factor (F-Factor Method)"); + MHCamera disp7 (geomcam, "Cal;BlindPixConv", "Conversion Factor (Blind Pixel Method)"); + MHCamera disp8 (geomcam, "Cal;PINDiodeConv", "Conversion Factor (PIN Diode Method)"); + MHCamera disp9 (geomcam, "Cal;FFactorValid", "Pixels with valid F-Factor calibration"); + MHCamera disp10(geomcam, "Cal;BlindPixelValid","Pixels with valid BlindPixel calibration"); + MHCamera disp11(geomcam, "Cal;PINdiodeValid", "Pixels with valid PINDiode calibration"); + MHCamera disp12(geomcam, "Cal;Excluded", "Pixels previously excluded"); + MHCamera disp13(geomcam, "Cal;Saturation", "Pixels with saturated Hi Gain"); + MHCamera disp14(geomcam, "Cal;HiGainPickup", "Number Pickup events Hi Gain"); + MHCamera disp15(geomcam, "Cal;LoGainPickup", "Number Pickup events Lo Gain"); + MHCamera disp16(geomcam, "Bad;UnSuitable", "Pixels not suited for further analysis"); + MHCamera disp17(geomcam, "Bad;UnReliable", "Pixels not reliable for further analysis"); + MHCamera disp18(geomcam, "Bad;Oscillation", "Oscillating Pixels"); // Fitted charge means and sigmas @@ -272,65 +334,55 @@ disp2.SetCamContent(fCalibrationCam, 2); disp2.SetCamError( fCalibrationCam, 3); - // Fit probabilities - disp3.SetCamContent(fCalibrationCam, 4); // Reduced Sigmas and reduced sigmas per charge - disp4.SetCamContent(fCalibrationCam, 5); - disp4.SetCamError( fCalibrationCam, 6); - disp5.SetCamContent(fCalibrationCam, 7); - disp5.SetCamError( fCalibrationCam, 8); - - // F-Factor Method - disp6.SetCamContent(fCalibrationCam, 9); - disp6.SetCamError( fCalibrationCam, 10); - disp7.SetCamContent(fCalibrationCam, 11); - disp7.SetCamError( fCalibrationCam, 12); - disp8.SetCamContent(fCalibrationCam, 13); - disp8.SetCamError( fCalibrationCam, 14); - - /// Blind Pixel Method - disp9.SetCamContent(fCalibrationCam, 15); - disp9.SetCamError( fCalibrationCam, 16); - disp10.SetCamContent(fCalibrationCam,17); - disp10.SetCamError( fCalibrationCam,18); - disp11.SetCamContent(fCalibrationCam,19); - disp11.SetCamError( fCalibrationCam,20); - - // PIN Diode Method - disp12.SetCamContent(fCalibrationCam,21); - disp12.SetCamError( fCalibrationCam,22); - disp13.SetCamContent(fCalibrationCam,23); - disp13.SetCamError( fCalibrationCam,24); - disp14.SetCamContent(fCalibrationCam,25); - disp14.SetCamError( fCalibrationCam,26); + disp3.SetCamContent(fCalibrationCam, 5); + disp3.SetCamError( fCalibrationCam, 6); + disp4.SetCamContent(fCalibrationCam, 7); + disp4.SetCamError( fCalibrationCam, 8); + + // Conversion Factors, Methods + disp5.SetCamContent(fCalibrationCam, 9); + disp5.SetCamError( fCalibrationCam, 10); + disp6.SetCamContent(fCalibrationCam, 11); + disp6.SetCamError( fCalibrationCam, 12); + disp7.SetCamContent(fCalibrationCam, 13); + disp7.SetCamError( fCalibrationCam, 14); + disp8.SetCamContent(fCalibrationCam, 16); + disp8.SetCamError( fCalibrationCam, 17); + + // Valid flags + disp9.SetCamContent (fCalibrationCam, 15); + disp10.SetCamContent(fCalibrationCam, 20); + disp11.SetCamContent(fCalibrationCam, 25); + + // Pixels behavior + disp12.SetCamContent(fCalibrationCam, 26); + disp13.SetCamContent(fCalibrationCam, 29); + disp14.SetCamContent(fCalibrationCam, 27); + disp15.SetCamContent(fCalibrationCam, 28); // Pixels with defects - disp15.SetCamContent(fCalibrationCam,27); - disp16.SetCamContent(fCalibrationCam,28); - disp17.SetCamContent(fBadPixels , 9); - disp18.SetCamContent(fBadPixels , 8); - - // Lo Gain calibration - disp19.SetCamContent(fCalibrationCam,31); + disp16.SetCamContent(fBadPixels, 1); + disp17.SetCamContent(fBadPixels, 3); + disp18.SetCamContent(fBadPixels, 8); disp1.SetYTitle("Q [FADC units]"); disp2.SetYTitle("\\sigma_{Q} [FADC units]"); - disp3.SetYTitle("P_{Q} [1]"); - - disp4.SetYTitle("\\sqrt{\\sigma^{2}_{Q} - RMS^{2}_{Ped}} [FADC Counts]"); - disp5.SetYTitle("Red.Sigma/ [1]"); - - disp6.SetYTitle("PhE [#]"); - disp7.SetYTitle("Conv.Factor [PhE/FADC units]"); - disp8.SetYTitle("\\sqrt{N_{PhE}}*\\sigma_{Q}/\\mu_{Q} [1]"); - - disp9.SetYTitle("Phot.flux [ph/mm^{2}]"); - disp10.SetYTitle("Conv.Factor [Phot/FADC Count]"); - disp11.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Q}/\\mu_{Q} [1]"); - - disp12.SetYTitle("Phot.flux [ph/mm^{2}]"); - disp13.SetYTitle("Conv.Factor [Phot/FADC Count]"); - disp14.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Q}/\\mu_{Q} [1]"); - + + disp3.SetYTitle("\\sqrt{\\sigma^{2}_{Q} - RMS^{2}_{Ped}} [FADC Counts]"); + disp4.SetYTitle("Red.Sigma/ [1]"); + + disp5.SetYTitle("PhE [#]"); + disp6.SetYTitle("Conv.Factor [PhE/FADC units]"); + + disp7.SetYTitle("Conv.Factor [Phot/FADC Count]"); + disp8.SetYTitle("Conv.Factor [Phot/FADC Count]"); + + disp9.SetYTitle("[1]"); + disp10.SetYTitle("[1]"); + disp11.SetYTitle("[1]"); + disp12.SetYTitle("[1]"); + disp13.SetYTitle("[1]"); + disp14.SetYTitle("[1]"); disp15.SetYTitle("[1]"); disp16.SetYTitle("[1]"); @@ -343,60 +395,50 @@ // Charges TCanvas &c1 = fDisplay->AddTab("Fit.Charge"); - c1.Divide(2, 3); - - CamDraw(c1, 1, 2, disp1, 2); - CamDraw(c1, 2, 2, disp2, 2); - - // Fit Probability - TCanvas &c2 = fDisplay->AddTab("Fit.Prob"); - c2.Divide(1,3); - - CamDraw(c2, 1, 1, disp3, 4); + c1.Divide(2, 4); + + CamDraw(c1, 1, 2, disp1, 2, 1); + CamDraw(c1, 2, 2, disp2, 2, 1); // Reduced Sigmas TCanvas &c3 = fDisplay->AddTab("Red.Sigma"); - c3.Divide(2,3); - - CamDraw(c3, 1, 2, disp4, 2); - CamDraw(c3, 2, 2, disp5, 2); - - // F-Factor Method - TCanvas &c4 = fDisplay->AddTab("F-Factor"); - c4.Divide(3,3); - - CamDraw(c4, 1, 3, disp6, 2); - CamDraw(c4, 2, 3, disp7, 2); - CamDraw(c4, 3, 3, disp8, 2); - - // Blind Pixel Method - TCanvas &c5 = fDisplay->AddTab("BlindPix"); - c5.Divide(3, 3); - - CamDraw(c5, 1, 3, disp9, 9); - CamDraw(c5, 2, 3, disp10, 2); - CamDraw(c5, 3, 3, disp11, 2); - - // PIN Diode Method - TCanvas &c6 = fDisplay->AddTab("PINDiode"); - c6.Divide(3,3); - - CamDraw(c6, 1, 3, disp12, 9); - CamDraw(c6, 2, 3, disp13, 2); - CamDraw(c6, 3, 3, disp14, 2); + c3.Divide(2,4); + + CamDraw(c3, 1, 2, disp3, 2, 1); + CamDraw(c3, 2, 2, disp4, 2, 1); + + // Methods + TCanvas &c4 = fDisplay->AddTab("Methods"); + c4.Divide(4,4); + + CamDraw(c4, 1, 4, disp5, 2, 1); + CamDraw(c4, 2, 4, disp6, 2, 1); + CamDraw(c4, 3, 4, disp7, 2, 1); + CamDraw(c4, 4, 4, disp8, 2, 1); + + // Validity + TCanvas &c5 = fDisplay->AddTab("Validity"); + c5.Divide(3,2); + + CamDraw(c5, 1, 3, disp9 , 0); + CamDraw(c5, 2, 3, disp10, 0); + CamDraw(c5, 3, 3, disp11, 0); + + // Other info + TCanvas &c6 = fDisplay->AddTab("Behavior"); + c6.Divide(4,2); + + CamDraw(c6, 1, 4, disp12, 0); + CamDraw(c6, 2, 4, disp13, 0); + CamDraw(c6, 3, 4, disp14, 0); + CamDraw(c6, 4, 4, disp15, 0); // Defects TCanvas &c7 = fDisplay->AddTab("Defects"); - c7.Divide(4,2); - - CamDraw(c7, 1, 4, disp15, 0); - CamDraw(c7, 2, 4, disp16, 0); - CamDraw(c7, 3, 4, disp17, 0); - CamDraw(c7, 4, 4, disp18, 0); - - // Lo Gain Calibration - TCanvas &c8 = fDisplay->AddTab("LowGain"); - c8.Divide(1,3); - - CamDraw(c8, 1, 1, disp19, 0); + c7.Divide(3,2); + + CamDraw(c7, 1, 3, disp16, 0); + CamDraw(c7, 2, 3, disp17, 0); + CamDraw(c7, 3, 3, disp18, 0); + } @@ -530,4 +572,5 @@ plist.AddToList(&pedcam); plist.AddToList(&fCalibrationCam); + plist.AddToList(&fBadPixels); plist.AddToList(&pindiode); plist.AddToList(&blindpix); Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.h =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 3563) +++ trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 3564) @@ -26,6 +26,8 @@ MBadPixelsCam fBadPixels; - void DrawProjection(MHCamera *obj1, Int_t fit) const; - void CamDraw(TCanvas &c, const Int_t x, const Int_t y, const MHCamera &cam1, const Int_t fit); + void DrawProjection ( MHCamera *obj, Int_t fit) const; + void DrawRadialProfile( MHCamera *obj) const; + void CamDraw(TCanvas &c, const Int_t x, const Int_t y, const MHCamera &cam1, + const Int_t fit, const Int_t rad=0); void DisplayResult(MParList &plist);