Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 7593) +++ /trunk/MagicSoft/Mars/Changelog (revision 7594) @@ -18,4 +18,34 @@ -*-*- END OF LINE -*-*- + 2006/03/13 Thomas Bretz + + * ganymed.rc: + - changed smearing to half of our PSF 0.06 + - added new examples for setting the starguider calibration + + * ganymed_onoff.rc + - changed smearing to half of our PSF 0.06 + - switched the new feature for a random source position on + - added new examples for setting the starguider calibration + + * ganymed_wobble.rc: + - changed smearing to half of our PSF 0.06 + - added new examples for setting the starguider calibration + - added example how to control the phi plot + + * mhflux/MHPhi.[h,cc]: + - many improvements to the algorithm, it now takes also inhomgeneities + into account + - restructured the display, display more histograms + - increased class version to 2 + + * mjobs/MJCut.cc: + - enabled acceleration for first and second loop + + * mpointing/MPointingDevCalc.[h,cc]: + - allowed to set the starguider offset calibration from the resource file + + + 2006/03/13 Markus Meyer Index: /trunk/MagicSoft/Mars/NEWS =================================================================== --- /trunk/MagicSoft/Mars/NEWS (revision 7593) +++ /trunk/MagicSoft/Mars/NEWS (revision 7594) @@ -31,6 +31,20 @@ - ganymed: now stops in requested source isn't found in catalog file + - ganymed: Many improvements to the phi-plot in wobble mode: + + with a template the ideal background is displayed + + a possible camera inhomogeneity is taken into account + + the anti theta cut is better supported + + the phi cut is automatically calculated from the theta cut + See the examples in ganymed_wobble.rc for more details. + - ganymed: fixed plot for E^2*dN/dE. The spectrum was multiplied with two times the bin-width instead of the absolute energy + + - ganymed: New cuts for on/off and wobble mode + + - ganymed: The smearing of the False Source plot has been increased to 0.06 + + - ganymed: The starguider calibration can now be changed from the resource file. + See the examples in ganymed*.rc for more details. - ganymed: added a new option for on-/off-observations @@ -39,4 +53,11 @@ position in the camera is calculated from the on-data and randomly applied with this distrbution to the off-data. + + - ganymed: by skipping some obsolete calles in the eventloop the first + and second loop could be accelerated by ~20% + + - ganymed: The default in ganymed_onoff.rc is now to determin the source + position in the off-data randomly according to its distribution in the + on-data. Index: /trunk/MagicSoft/Mars/mhflux/MHPhi.cc =================================================================== --- /trunk/MagicSoft/Mars/mhflux/MHPhi.cc (revision 7593) +++ /trunk/MagicSoft/Mars/mhflux/MHPhi.cc (revision 7594) @@ -33,4 +33,18 @@ // http://www.astro.uni-wuerzburg.de/results/ringmethod/ // +// Class Version 2: +// + TH1D fHPhi; // Phi plot of the signal w.r.t. source +// + TH1D fHPhiOff; // Phi plot of the signal w.r.t. source+180deg +// + TH1D fHTemplate; // Template how the background should look in the ideal case +// +// + TH1D fHInhom; // Phi plot off the signal w.r.t. source (out of the ring with the signal) +// + TH1D fHInhomOff; // Phi plot off the signal w.r.t. source+180deg (out of the ring with the signal) +// +// + Int_t fNumBinsSignal; // Number of bins for signal region +// + Float_t fThetaCut; // Theta cut +// + Float_t fDistSrc; // Nominal distance of source from center in wobble +// +// + Bool_t fUseAntiPhiCut; // Whether to use a anti-phi cut or not +// //////////////////////////////////////////////////////////////////////////// #include "MHPhi.h" @@ -63,5 +77,7 @@ // MHPhi::MHPhi(const char *name, const char *title) -: fHillas(0), fSrcPos(0), fDisp(0)//, fOnOffMode(kTRUE), fIsOffLoop(kFALSE) + : fHillas(0), fSrcPos(0), fDisp(0), + fNumBinsSignal(2), fThetaCut(0.23), fDistSrc(0.4), + fUseAntiPhiCut(kTRUE) { fName = name ? name : "MHPhi"; @@ -70,6 +86,5 @@ // Init Graphs fHPhi.SetNameTitle("Phi", "\\Delta\\Phi-Distribution"); - - fHPhi.SetXTitle("\\Delta\\Phi [\\circ]"); + fHPhi.SetXTitle("\\Delta\\Phi' [\\circ]"); fHPhi.SetYTitle("Counts"); @@ -79,50 +94,36 @@ fHPhi.SetBit(TH1::kNoStats); fHPhi.SetMarkerStyle(kFullDotMedium); - - fHPhi.GetYaxis()->SetTitleOffset(1.2); - - /* - fNameParameter = "Disp"; - - fHist.SetNameTitle("Phi", "\\Delta\\Phi-Distribution"); - fHist.SetZTitle("\\Delta\\Phi [\\circ]"); - fHist.SetDirectory(NULL); - - // Main histogram - fHistTime.SetName("Phi"); - fHistTime.SetXTitle("\\Delta\\Phi [\\circ]"); - fHistTime.SetDirectory(NULL); - - MBinning binsa, binse, binst; - //binsa.SetEdges(75, 0, 1.5); - //binsa.SetEdges(arr); - binse.SetEdgesLog(15, 10, 100000); - binst.SetEdgesASin(67, -0.005, 0.665); - //binsa.Apply(fHistTime); - - MH::SetBinning(&fHist, &binst, &binse, &binsa); - */ -} - -/* -Double_t MHPhi::GetVal() const -{ - const Dopuble_t disp = static_cast(fParameter)->GetVal(); - - const TVector2 pos = fHillas->GetMean()*fConvMm2Deg + fHillas->GetNormAxis()*disp; - const TVector2 src = fSrcPos->GetXY()*fConvMm2Deg; - - // Calculate radial distance. - const Double_t d = pos.Mod() - src.Mod(); - - if (d<-fThetaCut*0.913 || d>fThetaCut) - return kTRUE; - - const Double_t delta = src.DeltaPhi(pos)*TMath::RadToDeg(); - const Double_t absd = TMath::Abs(delta) - - return fHistOff ? absd : 180-absd; -} -*/ + fHPhi.SetLineColor(kBlue); + fHPhi.SetMarkerColor(kBlue); + fHPhi.GetYaxis()->SetTitleOffset(1.3); + + fHPhiOff.SetMinimum(0); + fHPhiOff.SetDirectory(0); + fHPhiOff.Sumw2(); + fHPhiOff.SetBit(TH1::kNoStats); + fHPhiOff.SetLineColor(kRed); + fHPhiOff.SetMarkerColor(kRed); + + fHTemplate.SetMinimum(0); + fHTemplate.SetDirectory(0); + fHTemplate.SetBit(TH1::kNoStats); + fHTemplate.SetLineColor(kGreen); + + fHInhom.SetNameTitle("Inhomogeneity", "\\Delta\\Phi-Distribution"); + fHInhom.SetXTitle("\\Delta\\Phi' [\\circ]"); + fHInhom.SetYTitle("Counts"); + fHInhom.Sumw2(); + fHInhom.SetMinimum(0); + fHInhom.SetDirectory(0); + fHInhom.SetBit(TH1::kNoStats); + fHInhom.GetYaxis()->SetTitleOffset(1.3); + + fHInhomOff.Sumw2(); + fHInhomOff.SetMinimum(0); + fHInhomOff.SetDirectory(0); + fHInhomOff.SetBit(TH1::kNoStats); + fHInhomOff.SetLineColor(kRed); + fHInhomOff.SetMarkerColor(kRed); +} // -------------------------------------------------------------------------- @@ -161,8 +162,9 @@ fConvMm2Deg = geom->GetConvMm2Deg(); - fNumBinsSignal = 2; - fThetaCut = 0.21/1.2; - fDistSrc = 0.4; - //fIsOffLoop = !fIsOffLoop; + MParameterD *cut = (MParameterD*)plist->FindObject("ThetaSquaredCut", "MParameterD"); + if (!cut) + *fLog << warn << "ThetaSquareCut [MParameterD] not found... using default theta<" << fThetaCut << "." << endl; + else + fThetaCut = TMath::Sqrt(cut->GetVal()); const Double_t w = TMath::ATan(fThetaCut/fDistSrc); @@ -170,21 +172,10 @@ const Int_t n = TMath::Nint(TMath::Ceil(180/sz)); - MBinning(n, 0, n*sz).Apply(fHPhi); - /* - - // Get Histogram binnings - MBinning binst, binse; - binst.SetEdges(fHist, 'x'); - binse.SetEdges(fHist, 'y'); - - MBinning binsa(n, 0, n*sz); - - // Apply binning - binsa.Apply(fHistTime); - MH::SetBinning(&fHist, &binst, &binse, &binsa); - - // Remark: Binnings might be overwritten in MHAlpha::SetupFill - return MHAlpha::SetupFill(pl); - */ + MBinning(n+3, 0, (n+3)*sz).Apply(fHPhi); + MBinning(n+3, 0, (n+3)*sz).Apply(fHPhiOff); + MBinning(n+3, 0, (n+3)*sz).Apply(fHTemplate); + MBinning(n+3, 0, (n+3)*sz).Apply(fHInhom); + MBinning(n+3, 0, (n+3)*sz).Apply(fHInhomOff); + return kTRUE; } @@ -197,19 +188,79 @@ Bool_t MHPhi::Fill(const MParContainer *par, const Stat_t weight) { + // Here we calculate an upper phi cut to take a + // possible anti-theta cut into account + const Double_t ulim = fUseAntiPhiCut ? 180-fHPhi.GetBinLowEdge(fNumBinsSignal+1)*1.1 : 180; + + // Calculate the shower origin and the source position in units of deg const TVector2 pos = fHillas->GetMean()*fConvMm2Deg + fHillas->GetNormAxis()*fDisp->GetVal(); const TVector2 src = fSrcPos->GetXY()*fConvMm2Deg; - // Calculate radial distance. + // Calculate radial distance between shower origin and source const Double_t d = pos.Mod() - src.Mod(); - if (d<-fThetaCut*0.913 || d>fThetaCut) + // define an upper and lower cut for the radial distance between both + const Double_t dR = fThetaCut; + const Double_t dr = fThetaCut*0.913; + + // calculate the phi-angle of the shower origin w.r.t. the source position + const Double_t delta = src.DeltaPhi(pos)*TMath::RadToDeg(); + + // Define the radii of the upper and lower ring border + const Double_t R = src.Mod()+dR; + const Double_t r = src.Mod()-dr; + + // Calculate a scale to scale all source positions to the + // nominal distance to center + const Double_t scale = src.Mod()/fDistSrc; + + // Fill a phi-histograms with all events outside the ring + // Take the upper phi cut into account + if ((d<-dr || d>dR)/*TMath::Abs(d)>fThetaCut*1.2*/ && TMath::Abs(delta)dR) return kTRUE; - const Double_t delta = src.DeltaPhi(pos)*TMath::RadToDeg(); - - fHPhi.Fill(TMath::Abs(delta), weight); - - // const Double_t absd = TMath::Abs(delta) - // fHPhi.Fill(fHistOff ? absd : 180-absd, weight); + // Fill the histograms for on and off with the scaled phi + // only if we are below the upper phi cut + if (TMath::Abs(delta)SetBorderMode(0); - AppendPad("combine"); + AppendPad("update"); + + pad->Divide(2,2); + + // -------------------------- + + pad->cd(1); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); fHPhi.Draw(); - - AppendPad(opt); -} - -void MHPhi::Paint(Option_t *o) -{ - //TString opt(o); - //opt.ToLower(); - - // if (opt=="combine" && fHistOff) - // { - // fHPhi.Add(fHist, fHistOff); - // return; - // } - - const Bool_t wobble = TString(o).Contains("anticut", TString::kIgnoreCase); - - const Double_t cut = fHPhi.GetBinLowEdge(fNumBinsSignal+1); - - const Int_t maxbin = wobble ? fHPhi.GetXaxis()->FindFixBin(180-cut)-1 : fHPhi.GetNbinsX(); - const Double_t cut2 = wobble ? fHPhi.GetBinLowEdge(maxbin+1) : 180; - - const Double_t sig = fHPhi.Integral(1, fNumBinsSignal); - const Double_t bg = fHPhi.Integral(1+fNumBinsSignal, maxbin); - - const Double_t f = cut/(cut2-cut); - - const Double_t S0 = MMath::SignificanceLiMaSigned(sig, bg*f); - const Double_t S = MMath::SignificanceLiMaSigned(sig, bg, f); - - const TString fmt = Form("\\sigma_{L/M}=%.1f (\\sigma_{0}=%.1f) \\Delta\\Phi_{on}<%.1f\\circ \\Delta\\Phi_{off}<%.1f\\circ E=%.0f B=%.0f f=%.2f", - S, S0, cut, cut2, sig-bg*f, bg*f, f); + fHPhiOff.Draw("same"); + + TH1D *h1 = new TH1D(fHTemplate); + h1->SetName("Template"); + h1->SetBit(kCanDelete); + h1->SetDirectory(0); + h1->Draw("same"); + + // -------------------------- + + pad->cd(2); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + + fHInhom.Draw(); + fHInhomOff.Draw("same"); + + TH1D *h2 = new TH1D(fHTemplate); + h2->SetName("Template"); + h2->SetBit(kCanDelete); + h2->SetDirectory(0); + h2->Draw("same"); + + // -------------------------- + + pad->cd(3); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + + fHPhi.Draw(); + TH1D *h4 = new TH1D(fHInhom); + h4->SetName("Inhomogeneity"); + h4->SetBit(kCanDelete); + h4->SetDirectory(0); + h4->Draw("same"); + + h1->Draw("same"); + + // -------------------------- + + pad->cd(4); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + + TH1D *h3 = new TH1D(fHPhi); + h3->SetName("Result"); + h3->SetBit(kCanDelete); + h3->SetDirectory(0); + h3->Draw(); + + h1->Draw("same"); + + // -------------------------- + + pad->cd(); + AppendPad("result"); +} + +void MHPhi::PaintUpdate() const +{ + TVirtualPad *pad1 = gPad->GetPad(1); + TVirtualPad *pad2 = gPad->GetPad(2); + TVirtualPad *pad3 = gPad->GetPad(3); + TVirtualPad *pad4 = gPad->GetPad(4); + + Double_t sig2 = 0; + Double_t bg2 = 0; + Double_t f2 = 1; + TH1D *htemp = pad1 ? dynamic_cast(pad1->FindObject("Template")) : NULL; + if (htemp) + { + fHTemplate.Copy(*htemp); + htemp->SetName("Template"); + htemp->SetDirectory(0); + + Double_t sc1 = 1; + Double_t sc2 = 1; + + TH1D *res = pad4 ? dynamic_cast(pad4->FindObject("Result")) : NULL; + if (res) + { + fHPhi.Copy(*res); + + // Scale inhomogeneity to match the phi-plot in the off-region + sc1 = res->Integral(fNumBinsSignal+1, 9999)/fHInhom.Integral(fNumBinsSignal+1, 9999); + // Scale inhomogeneity to match the phi-plot in the off-region + sc2 = fHInhom.Integral()/htemp->Integral(); + + res->Add(&fHInhom, -sc1); + res->Add(htemp, sc1*sc2); + res->SetName("Result"); + res->SetDirectory(0); + + htemp->Scale(res->Integral(fNumBinsSignal+1, 9999)/htemp->Integral(fNumBinsSignal+1, 9999)); + + sig2 = res->Integral(1, fNumBinsSignal); + bg2 = fHPhi.Integral(fNumBinsSignal+1, 9999); + f2 = htemp->Integral(1, fNumBinsSignal)/htemp->Integral(fNumBinsSignal+1, 9999); + } + + TH1D *hinhom = pad3 ? dynamic_cast(pad3->FindObject("Inhomogeneity")) : NULL; + if (hinhom) + { + fHInhom.Copy(*hinhom); + hinhom->SetName("Inhomogeneity"); + hinhom->SetDirectory(0); + hinhom->Scale(sc1); + } + } + + htemp = pad2 ? dynamic_cast(pad2->FindObject("Template")) : NULL; + if (htemp) + { + fHTemplate.Copy(*htemp); + htemp->Scale(fHInhom.Integral()/htemp->Integral()); + htemp->SetName("Template"); + htemp->SetDirectory(0); + } +} + +void MHPhi::PaintText(const TH1D &res) const +{ + const Double_t cut = res.GetBinLowEdge(fNumBinsSignal+1); + + const Double_t sig = res.Integral(1, fNumBinsSignal); + const Double_t bg = res.Integral(fNumBinsSignal+1, 9999); + + const Double_t f = fHTemplate.Integral(1, fNumBinsSignal)/fHTemplate.Integral(fNumBinsSignal+1, 9999); + + const Double_t S0 = MMath::SignificanceLiMaSigned(sig, bg*f); + const Double_t S = MMath::SignificanceLiMaSigned(sig, bg, f); + + const TString fmt = Form("\\sigma_{L/M}=%.1f (\\sigma_{0}=%.1f) \\Delta\\Phi_{on}<%.1f\\circ E=%.0f B=%.0f f=%.2f", + S, S0, cut, sig-bg*f, bg*f, f); const Double_t b = bg *f/fNumBinsSignal; const Double_t e = TMath::Sqrt(bg)*f/fNumBinsSignal; - TLatex text(0.27, 0.94, fmt); + TLatex text(0.275, 0.95, fmt); text.SetBit(TLatex::kTextNDC); - text.SetTextSize(0.035); + text.SetTextSize(0.042); text.Paint(); @@ -274,7 +435,13 @@ line.SetLineColor(14); line.PaintLine(cut, gPad->GetUymin(), cut, gPad->GetUymax()); - if (maxbinGetUymin(), cut2, gPad->GetUymax()); - line.SetLineColor(kBlue); + + // Here we calculate an upper phi cut to take a + // possible anti-theta cut into account + const Double_t ulim = fUseAntiPhiCut ? 180-fHPhi.GetBinLowEdge(fNumBinsSignal+1)*1.1 : 180; + line.SetLineStyle(kDotted); + line.PaintLine(ulim, gPad->GetUymin(), ulim, gPad->GetUymax()); + + line.SetLineStyle(kSolid); + line.SetLineColor(kBlack); line.PaintLine(0, b, cut, b); line.PaintLine(cut/2, b-e, cut/2, b+e); @@ -283,6 +450,44 @@ TMarker m; - m.SetMarkerColor(kBlue); m.SetMarkerStyle(kFullDotMedium); m.PaintMarker(cut/2, b); } + +void MHPhi::PaintResult() const +{ + TVirtualPad *pad = gPad; + + pad->cd(1); + PaintText(fHPhi); + + pad->cd(4); + TH1D *res = gPad ? dynamic_cast(gPad->FindObject("Result")) : NULL; + if (res) + PaintText(*res); +} + +void MHPhi::Paint(Option_t *o) +{ + TString opt(o); + if (opt=="update") + PaintUpdate(); + if (opt=="result") + PaintResult(); +} + +Int_t MHPhi::ReadEnv(const TEnv &env, TString prefix, Bool_t print) +{ + Bool_t rc = kFALSE; + if (IsEnvDefined(env, prefix, "NumBinsSignal", print)) + { + SetNumBinsSignal(GetEnvValue(env, prefix, "NumBinsSignal", (Int_t)fNumBinsSignal)); + rc = kTRUE; + } + if (IsEnvDefined(env, prefix, "UseAntiPhiCut", print)) + { + SetUseAntiPhiCut(GetEnvValue(env, prefix, "UseAntiPhiCut", (Int_t)fUseAntiPhiCut)); + rc = kTRUE; + } + + return rc; +} Index: /trunk/MagicSoft/Mars/mhflux/MHPhi.h =================================================================== --- /trunk/MagicSoft/Mars/mhflux/MHPhi.h (revision 7593) +++ /trunk/MagicSoft/Mars/mhflux/MHPhi.h (revision 7594) @@ -16,29 +16,47 @@ { private: - TH1D fHPhi; + TH1D fHPhi; // Phi plot of the signal w.r.t. source + TH1D fHPhiOff; // Phi plot of the signal w.r.t. source+180deg + TH1D fHTemplate; // Template how the background should look in the ideal case - MHillas *fHillas; //! - MSrcPosCam *fSrcPos; //! - MParameterD *fDisp; //! + TH1D fHInhom; // Phi plot off the signal w.r.t. source (out of the ring with the signal) + TH1D fHInhomOff; // Phi plot off the signal w.r.t. source+180deg (out of the ring with the signal) - Double_t fConvMm2Deg; //! + MHillas *fHillas; //! Pointer to input container "MHillas" + MSrcPosCam *fSrcPos; //! Pointer to input container "MSrcPosCam" + MParameterD *fDisp; //! Pointer to input container "Disp" - Int_t fNumBinsSignal; - Float_t fThetaCut; - Float_t fDistSrc; - //Bool_t fOnOffMode; + Double_t fConvMm2Deg; //! Conversion factor from camera geometry - //Bool_t fIsOffLoop; //! + Int_t fNumBinsSignal; // Number of bins for signal region + Float_t fThetaCut; // Theta cut + Float_t fDistSrc; // Nominal distance of source from center in wobble + + Bool_t fUseAntiPhiCut; // Whether to use a anti-phi cut or not + + // Paint + void PaintUpdate() const; + void PaintResult() const; + void PaintText(const TH1D &res) const; + + // MH + Bool_t SetupFill(const MParList *plist); + Bool_t Fill(const MParContainer *par, const Stat_t w=1); public: MHPhi(const char *name=NULL, const char *title=NULL); - Bool_t SetupFill(const MParList *plist); - Bool_t Fill(const MParContainer *par, const Stat_t w=1); + // Setter + void SetNumBinsSignal(UInt_t n) { fNumBinsSignal=TMath::Max(n, 1U); } + void SetUseAntiPhiCut(Bool_t b=kTRUE) { fUseAntiPhiCut=b; } + // TObject void Draw(Option_t *opt=""); void Paint(Option_t *opt=""); - ClassDef(MHPhi, 1) // Histogram to display information about rate + // MParContainer + Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print); + + ClassDef(MHPhi, 2) // Histogram for ring-method }; Index: /trunk/MagicSoft/Mars/mjobs/MJCut.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCut.cc (revision 7593) +++ /trunk/MagicSoft/Mars/mjobs/MJCut.cc (revision 7594) @@ -737,5 +737,5 @@ // by setting it here it is distributed to all consecutive tasks - //tlist.SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime); + tlist.SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime); par.SetVal(0); @@ -907,5 +907,5 @@ // by setting it here it is distributed to all consecutive tasks - //tlist.SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime); + tlist.SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime); par.SetVal(1); Index: /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc (revision 7593) +++ /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc (revision 7594) @@ -192,5 +192,5 @@ // Linear starguider calibration taken from April/May data // For calibration add MDriveReport::GetErrorZd/Az ! - fDeviation->SetDevXY(-7.0, 16); + fDeviation->SetDevXY(fDx, fDy); //devzd -= 2.686/60; // 1arcmin ~ 5mm //devaz -= 2.840/60; @@ -278,4 +278,14 @@ rc = kTRUE; } + if (IsEnvDefined(env, prefix, "Dx", print)) + { + fDx = GetEnvValue(env, prefix, "Dx", fDx); + rc = kTRUE; + } + if (IsEnvDefined(env, prefix, "Dy", print)) + { + fDy = GetEnvValue(env, prefix, "Dy", fDy); + rc = kTRUE; + } return rc; Index: /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.h (revision 7593) +++ /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.h (revision 7594) @@ -33,4 +33,7 @@ Float_t fMaxAbsDev; // [arcmin] Maximum considered absolute deviation + Float_t fDx; // Starguider calibration dx + Float_t fDy; // Starguider calibration dy + // MPointingDevCalc Int_t ProcessStarguiderReport(); @@ -47,5 +50,5 @@ public: MPointingDevCalc() : fReport(0), fDeviation(0), fSkip(5), fNumMinStars(8), - fNsbLevel(3), fNsbMin(30), fNsbMax(60), fMaxAbsDev(15) + fNsbLevel(3), fNsbMin(30), fNsbMax(60), fMaxAbsDev(15), fDx(-7), fDy(16) { fName = "MPointingDevCalc"; @@ -60,4 +63,6 @@ void SetNsbMax(Float_t nsb) { fNsbMax=nsb; } void SetMaxAbsDev(Float_t max) { fMaxAbsDev=max; } + void SetDx(Float_t dx) { fDx=dx; } + void SetDy(Float_t dy) { fDy=dy; } ClassDef(MPointingDevCalc, 0) //Task calculating the pointing deviation