Index: trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc (revision 8354) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc (revision 8355) @@ -83,5 +83,5 @@ using namespace std; -const Float_t MCalibrationRelTimeCalc::fgRelTimeResolutionLimit = 1.0; +const Float_t MCalibrationRelTimeCalc::fgRelTimeResolutionLimit = 0.05; // -------------------------------------------------------------------------- @@ -372,5 +372,5 @@ */ areasum [aidx] /= numareavalid[aidx]; - lowlim [aidx] = 0.; + lowlim [aidx] = 0; upplim [aidx] = areasum [aidx] + fRelTimeResolutionLimit; Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 8354) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 8355) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.53 2007-03-01 18:21:08 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.54 2007-03-03 22:00:25 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -21,5 +21,5 @@ ! Author(s): Thomas Bretz ! -! Copyright: MAGIC Software Development, 2000-2006 +! Copyright: MAGIC Software Development, 2000-2007 ! ! @@ -122,34 +122,4 @@ ///////////////////////////////////////////////////////////////////////////// #include "MHCalibrationChargeCam.h" -#include "MHCalibrationCam.h" - -#include "MLog.h" -#include "MLogManip.h" - -#include "MParList.h" - -#include "MHCalibrationChargePix.h" -#include "MHCalibrationPix.h" - -#include "MCalibrationIntensityCam.h" -#include "MCalibrationChargeCam.h" -#include "MCalibrationChargePix.h" - -#include "MGeomCam.h" -#include "MGeomPix.h" - -#include "MBadPixelsIntensityCam.h" -#include "MBadPixelsCam.h" -#include "MBadPixelsPix.h" - -#include "MRawEvtData.h" -#include "MRawRunHeader.h" -#include "MRawEvtPixelIter.h" - -#include "MExtractedSignalCam.h" -#include "MExtractedSignalPix.h" - -#include "MArrayI.h" -#include "MArrayD.h" #include @@ -159,8 +129,38 @@ #include #include +#include #include #include #include #include + +#include "MLog.h" +#include "MLogManip.h" + +#include "MParList.h" + +#include "MHCalibrationChargePix.h" +#include "MHCalibrationPix.h" + +#include "MCalibrationIntensityCam.h" +#include "MCalibrationChargeCam.h" +#include "MCalibrationChargePix.h" + +#include "MGeomCam.h" +#include "MGeomPix.h" + +#include "MBadPixelsIntensityCam.h" +#include "MBadPixelsCam.h" +#include "MBadPixelsPix.h" + +#include "MRawEvtData.h" +#include "MRawRunHeader.h" +#include "MRawEvtPixelIter.h" + +#include "MExtractedSignalCam.h" +#include "MExtractedSignalPix.h" + +#include "MArrayI.h" +#include "MArrayD.h" ClassImp(MHCalibrationChargeCam); @@ -287,4 +287,6 @@ cam->fLoGainLast = fLoGainLast; cam->fReferenceFile = fReferenceFile; + cam->fInnerRefCharge = fInnerRefCharge; + cam->fOuterRefCharge = fOuterRefCharge; // @@ -388,5 +390,5 @@ if ( fColor == MCalibrationCam::kBLUE) SetBinning(fLoGainNbins, fLoGainFirst, 2.*fLoGainLast - fLoGainFirst); - + InitHiGainArrays(npixels,nareas,nsectors); InitLoGainArrays(npixels,nareas,nsectors); @@ -469,10 +471,10 @@ fAverageHiGainAreas->AddAt(new MHCalibrationChargePix(Form("%sHiGainArea%d",fHistName.Data(),j), Form("%s High Gain Area Idx %d",fHistTitle.Data(),j)),j); - + MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainArea(j); - + pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), fFirst, fLast); - + pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5); @@ -480,5 +482,5 @@ h = pix.GetHAbsTime(); - + h->SetName (Form("H%sHiGainArea%d",fAbsHistName.Data(),j)); h->SetTitle(Form("%s%s%d",fAbsHistTitle.Data(), @@ -502,9 +504,9 @@ pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5); - + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); h = pix.GetHAbsTime(); - + h->SetName (Form("H%sHiGainSector%02d",fAbsHistName.Data(),j)); h->SetTitle(Form("%s%s%02d",fAbsHistTitle.Data(), @@ -559,5 +561,4 @@ pix.SetBinning(fLoGainNbins, fLoGainFirst, fLoGainLast); - pix.SetProbLimit(fProbLimit); @@ -583,10 +584,10 @@ fAverageLoGainAreas->AddAt(new MHCalibrationChargePix(Form("%sLoGainArea%d",fHistName.Data(),j), Form("%s Low Gain Area Idx %d",fHistTitle.Data(),j)),j); - + MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageLoGainArea(j); - + pix.SetBinning(fLoGainNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), fLoGainFirst, fLoGainLast); - + pix.SetBinningAbsTime(logainsamples, -0.5, logainsamples-0.5); @@ -669,5 +670,9 @@ const UInt_t nareas = fGeom->GetNumAreas(); const UInt_t nsectors = fGeom->GetNumSectors(); - const UInt_t lofirst = signal->GetFirstUsedSliceLoGain(); + + const Int_t hifirst = fSignal->GetFirstUsedSliceHiGain(); + const Int_t hilast = fSignal->GetLastUsedSliceHiGain(); + const Int_t lofirst = fSignal->GetFirstUsedSliceLoGain(); + const Int_t lolast = fSignal->GetLastUsedSliceLoGain(); fSumhiarea .Reset(); @@ -759,5 +764,5 @@ continue; - const Float_t timehi = (Float_t)pixel.GetIdxMaxHiGainSample(); + const Float_t timehi = (Float_t)pixel.GetIdxMaxHiGainSample(hifirst, hilast); histhi.FillAbsTime(timehi); @@ -773,5 +778,5 @@ MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(pixid); - const Float_t timelo = (Float_t)pixel.GetIdxMaxLoGainSample(lofirst); + const Float_t timelo = (Float_t)pixel.GetIdxMaxLoGainSample(lofirst, lolast); histlo.FillAbsTime(timelo); @@ -1262,135 +1267,107 @@ if (pix.IsEmpty()) return; - - TVirtualPad *newpad = gPad; - newpad->Divide(1,2); - newpad->cd(1); - - gPad->SetTicks(); - if (!pix.IsEmpty() && !pix.IsOnlyOverflow() && !pix.IsOnlyUnderflow()) - gPad->SetLogy(); - - TH1F *hist = pix.GetHGausHist(); - - TH1F *null = new TH1F("Null",hist->GetTitle(),100, - pix.GetFirst() > 0. ? pix.GetFirst() : 0., - pix.GetLast() > pix.GetFirst() - ? ( pix.GetLast() > 450. - ? ( fColor == MCalibrationCam::kBLUE ? 800. : 450. ) - : pix.GetLast() ) - : pix.GetFirst()*2.); - - null->SetMaximum(1.1*hist->GetMaximum()); - null->SetDirectory(NULL); - null->SetBit(kCanDelete); - null->SetStats(kFALSE); - // - // set the labels bigger - // - TAxis *xaxe = null->GetXaxis(); - TAxis *yaxe = null->GetYaxis(); - xaxe->CenterTitle(); - yaxe->CenterTitle(); - xaxe->SetTitleSize(0.07); - yaxe->SetTitleSize(0.07); - xaxe->SetTitleOffset(0.7); - yaxe->SetTitleOffset(0.55); - xaxe->SetLabelSize(0.06); - yaxe->SetLabelSize(0.06); - xaxe->SetTitle(hist->GetXaxis()->GetTitle()); - yaxe->SetTitle(hist->GetYaxis()->GetTitle()); - - null->Draw(); - hist->Draw("same"); - - gStyle->SetOptFit(); - - TF1 *fit = pix.GetFGausFit(); - - if (fit) - { - switch ( fColor ) - { - case MCalibrationCam::kGREEN: - fit->SetLineColor(kGreen); - break; - case MCalibrationCam::kBLUE: - fit->SetLineColor(kBlue); - break; - case MCalibrationCam::kUV: - fit->SetLineColor(106); - break; - case MCalibrationCam::kCT1: - fit->SetLineColor(006); - break; - default: - fit->SetLineColor(kRed); - } - fit->Draw("same"); - } - - DisplayRefLines(null,refline); - - newpad->cd(2); - gPad->SetTicks(); - - TH1F *null2 = new TH1F("Null2",hist->GetTitle(),100,0.,pix.GetEvents()->GetSize()/pix.GetEventFrequency()); - - null2->SetMinimum(pix.GetMean()-10.*pix.GetSigma()); - null2->SetMaximum(pix.GetMean()+10.*pix.GetSigma()); - null2->SetDirectory(NULL); - null2->SetBit(kCanDelete); - null2->SetStats(kFALSE); - // - // set the labels bigger - // - TAxis *xaxe2 = null2->GetXaxis(); - TAxis *yaxe2 = null2->GetYaxis(); - xaxe2->CenterTitle(); - yaxe2->CenterTitle(); - xaxe2->SetTitleSize(0.07); - yaxe2->SetTitleSize(0.07); - xaxe2->SetTitleOffset(0.7); - yaxe2->SetTitleOffset(0.55); - xaxe2->SetLabelSize(0.06); - yaxe2->SetLabelSize(0.06); - - pix.CreateGraphEvents(); - TGraph *gr = pix.GetGraphEvents(); - if (gr) - { - xaxe2->SetTitle(gr->GetXaxis()->GetTitle()); - yaxe2->SetTitle(gr->GetYaxis()->GetTitle()); - } - - null2->Draw(); - - pix.DrawEvents("same"); - - // newpad->cd(3); - // pix.DrawPowerSpectrum(*newpad,4); - - return; - + + TVirtualPad *pad = gPad; + pad->Divide(1,2, 1e-10, 1e-10); + pad->cd(1); + + gPad->SetBorderMode(0); + gPad->SetTicks(); + if (!pix.IsEmpty() && !pix.IsOnlyOverflow() && !pix.IsOnlyUnderflow()) + gPad->SetLogy(); + + TH1F *hist = pix.GetHGausHist(); + TAxis *xaxe = hist->GetXaxis(); + TAxis *yaxe = hist->GetYaxis(); + xaxe->CenterTitle(); + yaxe->CenterTitle(); + xaxe->SetTitleSize(0.07); + yaxe->SetTitleSize(0.07); + xaxe->SetTitleOffset(0.7); + yaxe->SetTitleOffset(0.55); + xaxe->SetLabelSize(0.06); + yaxe->SetLabelSize(0.06); + xaxe->SetTitle(hist->GetXaxis()->GetTitle()); + yaxe->SetTitle(hist->GetYaxis()->GetTitle()); + xaxe->SetRange(hist->GetMaximumBin()-30, hist->GetMaximumBin()+30); + + gStyle->SetOptFit(); + + hist->Draw(); + + TF1 *fit = pix.GetFGausFit(); + if (fit) + { + switch (fColor) + { + case MCalibrationCam::kGREEN: + fit->SetLineColor(kGreen); + break; + case MCalibrationCam::kBLUE: + fit->SetLineColor(kBlue); + break; + case MCalibrationCam::kUV: + fit->SetLineColor(106); + break; + case MCalibrationCam::kCT1: + fit->SetLineColor(006); + break; + default: + fit->SetLineColor(kRed); + } + fit->Draw("same"); + } + + DisplayRefLines(hist,refline); + + pad->cd(2); + gPad->SetBorderMode(0); + gPad->SetTicks(); + + pix.CreateGraphEvents(); + TGraph *gr = pix.GetGraphEvents(); + if (gr) + { + TH1F *null2 = gr->GetHistogram(); + + null2->SetMinimum(pix.GetMean()-10.*pix.GetSigma()); + null2->SetMaximum(pix.GetMean()+10.*pix.GetSigma()); + null2->SetStats(kFALSE); + + // + // set the labels bigger + // + TAxis *xaxe2 = null2->GetXaxis(); + TAxis *yaxe2 = null2->GetYaxis(); + xaxe2->CenterTitle(); + yaxe2->CenterTitle(); + xaxe2->SetTitleSize(0.07); + yaxe2->SetTitleSize(0.07); + xaxe2->SetTitleOffset(0.7); + yaxe2->SetTitleOffset(0.55); + xaxe2->SetLabelSize(0.06); + yaxe2->SetLabelSize(0.06); + xaxe2->SetRangeUser(0, pix.GetEvents()->GetSize()/pix.GetEventFrequency()); + } + + pix.DrawEvents(); + + // newpad->cd(3); + // pix.DrawPowerSpectrum(*newpad,4); } - void MHCalibrationChargeCam::DisplayRefLines(const TH1F *hist, const Float_t refline) const { - - TGraph *uv10 = new TGraph(2); - uv10->SetPoint(0,refline,0.); - uv10->SetPoint(1,refline,hist->GetMaximum()); - uv10->SetBit(kCanDelete); - uv10->SetLineColor(106); - uv10->SetLineStyle(2); - uv10->SetLineWidth(3); - uv10->Draw("L"); - - TLegend *leg = new TLegend(0.8,0.55,0.99,0.99); - leg->SetBit(kCanDelete); - leg->AddEntry(uv10,"10 Leds UV","l"); - - leg->Draw(); + TLine *line = new TLine(refline, 0, refline, hist->GetMaximum()); + line->SetLineColor(106); + line->SetLineStyle(2); + line->SetLineWidth(3); + line->SetBit(kCanDelete); + line->Draw(); + + TLegend *leg = new TLegend(0.8,0.01,0.99,0.45); + leg->AddEntry(line, "10 Leds UV", "l"); + leg->SetBit(kCanDelete); + leg->Draw(); } @@ -1398,9 +1375,8 @@ { - Bool_t rc = kFALSE; - - if (MHCalibrationCam::ReadEnv(env,prefix,print)) - rc = kTRUE; - + Int_t rc = MHCalibrationCam::ReadEnv(env,prefix,print); + if (rc==kERROR) + return kERROR; + if (IsEnvDefined(env, prefix, "HiGainNbins", print)) { @@ -1408,5 +1384,5 @@ rc = kTRUE; } - + if (IsEnvDefined(env, prefix, "HiGainFirst", print)) { @@ -1414,5 +1390,5 @@ rc = kTRUE; } - + if (IsEnvDefined(env, prefix, "HiGainLast", print)) { @@ -1420,5 +1396,5 @@ rc = kTRUE; } - + if (IsEnvDefined(env, prefix, "LoGainNbins", print)) { @@ -1426,5 +1402,5 @@ rc = kTRUE; } - + if (IsEnvDefined(env, prefix, "LoGainFirst", print)) { @@ -1432,5 +1408,5 @@ rc = kTRUE; } - + if (IsEnvDefined(env, prefix, "LoGainLast", print)) { @@ -1438,5 +1414,5 @@ rc = kTRUE; } - + if (IsEnvDefined(env, prefix, "TimeLowerLimit", print)) { @@ -1444,5 +1420,5 @@ rc = kTRUE; } - + if (IsEnvDefined(env, prefix, "TimeUpperLimit", print)) { @@ -1450,5 +1426,5 @@ rc = kTRUE; } - + if (IsEnvDefined(env, prefix, "ReferenceFile", print)) { @@ -1475,5 +1451,4 @@ } - TEnv refenv(fReferenceFile); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (revision 8354) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (revision 8355) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.32 2007-03-01 23:43:33 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.33 2007-03-03 22:01:13 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -105,4 +105,5 @@ #include +#include #include #include @@ -218,4 +219,6 @@ cam->fLast = fLast; cam->fReferenceFile = fReferenceFile; + cam->fInnerRefTime = fInnerRefTime; + cam->fOuterRefTime = fOuterRefTime; if (!IsAverageing()) @@ -301,8 +304,8 @@ fHiGainArray->AddAt(new MHCalibrationPix(Form("%sHiGainPix%04d",fHistName.Data(),i), Form("%s High Gain Pixel %4d",fHistTitle.Data(),i)),i); - - MHCalibrationPix &pix = (*this)[i]; + + MHCalibrationPix &pix = (*this)[i]; pix.SetBinning(fNbins, fFirst, fLast); - + MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i]; InitHists(pix,bad,i); @@ -322,5 +325,5 @@ fAverageHiGainAreas->AddAt(new MHCalibrationPix(Form("%sHiGainArea%d",fHistName.Data(),j), Form("%s High Gain Area Idx %d",fHistTitle.Data(),j)),j); - + MHCalibrationPix &pix = GetAverageHiGainArea(j); pix.SetBinning(fNbins, fFirst, fLast); @@ -338,5 +341,5 @@ MHCalibrationPix &pix = GetAverageHiGainSector(j); pix.SetBinning(fNbins, fFirst, fLast); - + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); } @@ -469,10 +472,10 @@ for (Int_t i=0; iGetSize(); i++) { - + MHCalibrationPix &hist = (*this)[i]; - + if (hist.IsExcluded()) continue; - + MCalibrationPix &pix = calcam[i]; CalcHists(hist,pix); @@ -481,13 +484,12 @@ if (!IsAverageing()) return kTRUE; - + for (Int_t j=0; jGetSize(); j++) { - MHCalibrationPix &hist = GetAverageHiGainArea(j); MCalibrationPix &pix = calcam.GetAverageArea(j); CalcHists(hist,pix); - } - + } + for (Int_t j=0; jGetSize(); j++) { @@ -496,5 +498,5 @@ CalcHists(hist,pix); } - + return kTRUE; } @@ -570,19 +572,18 @@ option.ToLower(); - TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this); + TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this); pad->SetBorderMode(0); - pad->Divide(1,nareas); + pad->Divide(1,nareas, 1e-10, 1e-10); // // Loop over inner and outer pixels - // - for (Int_t i=0; icd(i+1); - + MHCalibrationPix &hipix = GetAverageHiGainArea(i); DrawDataCheckPixel(hipix,i ? fOuterRefTime : fInnerRefTime); - } + } } @@ -597,60 +598,44 @@ void MHCalibrationPulseTimeCam::DrawDataCheckPixel(MHCalibrationPix &pix, const Float_t refline) { - - gPad->SetTicks(); - - TH1F *hist = pix.GetHGausHist(); - - TH1F *null = new TH1F("Null",hist->GetTitle(),100, - pix.GetFirst() > 0. ? pix.GetFirst() : 0., - pix.GetLast() > pix.GetFirst() - ? pix.GetLast() : pix.GetFirst()*2.); - - null->SetMaximum(1.1*hist->GetMaximum()); - null->SetDirectory(NULL); - null->SetBit(kCanDelete); - null->SetStats(kFALSE); - // - // set the labels bigger - // - TAxis *xaxe = null->GetXaxis(); - TAxis *yaxe = null->GetYaxis(); - xaxe->CenterTitle(); - yaxe->CenterTitle(); - xaxe->SetTitleSize(0.06); - yaxe->SetTitleSize(0.076); - xaxe->SetTitleOffset(0.6); - yaxe->SetTitleOffset(0.65); - xaxe->SetLabelSize(0.06); - yaxe->SetLabelSize(0.06); - xaxe->SetTitle(hist->GetXaxis()->GetTitle()); - yaxe->SetTitle(hist->GetYaxis()->GetTitle()); - - null->Draw(); - hist->Draw("same"); - - DisplayRefLines(null,refline); - - return; - + gPad->SetBorderMode(0); + gPad->SetTicks(); + + TH1F *hist = pix.GetHGausHist(); + + // + // set the labels bigger + // + TAxis *xaxe = hist->GetXaxis(); + TAxis *yaxe = hist->GetYaxis(); + xaxe->CenterTitle(); + yaxe->CenterTitle(); + xaxe->SetTitleSize(0.06); + yaxe->SetTitleSize(0.076); + xaxe->SetTitleOffset(0.6); + yaxe->SetTitleOffset(0.65); + xaxe->SetLabelSize(0.06); + yaxe->SetLabelSize(0.06); + xaxe->SetTitle(hist->GetXaxis()->GetTitle()); + yaxe->SetTitle(hist->GetYaxis()->GetTitle()); + xaxe->SetRange(hist->GetMaximumBin()-30, hist->GetMaximumBin()+30); + + hist->Draw(); + + DisplayRefLines(hist, refline); } void MHCalibrationPulseTimeCam::DisplayRefLines(const TH1F *hist, const Float_t refline) const { - - TGraph *gr = new TGraph(2); - gr->SetPoint(0,refline,0.); - gr->SetPoint(1,refline,hist->GetMaximum()); - gr->SetBit(kCanDelete); - gr->SetLineColor(106); - gr->SetLineStyle(2); - gr->SetLineWidth(3); - gr->Draw("L"); - - TLegend *leg = new TLegend(0.8,0.35,0.99,0.65); - leg->SetBit(kCanDelete); - leg->AddEntry(gr,"Reference","l"); - - leg->Draw(); + TLine *line = new TLine(refline, 0, refline, hist->GetMaximum()); + line->SetLineColor(106); + line->SetLineStyle(2); + line->SetLineWidth(3); + line->SetBit(kCanDelete); + line->Draw(); + + TLegend *leg = new TLegend(0.8,0.35,0.99,0.65); + leg->AddEntry(line, "Reference", "l"); + leg->SetBit(kCanDelete); + leg->Draw(); }