Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 4839) +++ /trunk/MagicSoft/Mars/Changelog (revision 4840) @@ -23,4 +23,16 @@ * manalysis/MCameraData.[h,cc], mimage/MImgCleanStd.[h,cc]: - implemeted cleaning in absolute number of photons + + * mhbase/MBinning.[h,cc]: + - added const-qualifier to Apply + + * mhist/MHAlpha.cc: + - let TLatex use NDC coordinates + + * mimage/MHHillasSrc.cc: + - cosmetics + + * mreport/MReportDrive.[h,cc]: + - added Print member function Index: /trunk/MagicSoft/Mars/NEWS =================================================================== --- /trunk/MagicSoft/Mars/NEWS (revision 4839) +++ /trunk/MagicSoft/Mars/NEWS (revision 4840) @@ -23,4 +23,11 @@ The index corresponds to the order of the islands in size. + - added a cleaning which takes signal height _and_ arrival time into + account: probability cleaning (for more details see MImgCleanStd) + + - added a cleaning which takes takes the absolute number of photons + times the area ratio as cleaning level + (for more details see MImgCleanStd) + - Changed calculation of image parameters such, that it can be done for all used pixels or the pixels with a defined island index only @@ -31,7 +38,4 @@ - event display in executable changed to support also calibrated files (done with MJCalibrateSignal) - - - added a cleaning which takes signal height _and_ arrival time into - account: probability cleaning (for more details see MImgCleanStd) - added program doing the calibration and the signal extraction Index: /trunk/MagicSoft/Mars/mhbase/MBinning.cc =================================================================== --- /trunk/MagicSoft/Mars/mhbase/MBinning.cc (revision 4839) +++ /trunk/MagicSoft/Mars/mhbase/MBinning.cc (revision 4840) @@ -183,5 +183,5 @@ // histograms use MH::SetBinning directly) // -void MBinning::Apply(TH1 &h) +void MBinning::Apply(TH1 &h) const { if (h.InheritsFrom("TH2") || h.InheritsFrom("TH3")) Index: /trunk/MagicSoft/Mars/mhbase/MBinning.h =================================================================== --- /trunk/MagicSoft/Mars/mhbase/MBinning.h (revision 4839) +++ /trunk/MagicSoft/Mars/mhbase/MBinning.h (revision 4840) @@ -80,5 +80,5 @@ Bool_t IsUserArray() const { return fType==kIsUserArray; } - void Apply(TH1 &); + void Apply(TH1 &) const; ClassDef(MBinning, 1) //Container to store the binning of a histogram Index: /trunk/MagicSoft/Mars/mhist/MHAlpha.cc =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHAlpha.cc (revision 4839) +++ /trunk/MagicSoft/Mars/mhist/MHAlpha.cc (revision 4840) @@ -283,8 +283,9 @@ if (paint) { - TLatex text; - text.PaintLatex(3, fHist.GetMaximum()*1.11, 0, 0.04, - Form("\\sigma_{Li/Ma}=%.1f (\\alpha<%.1f\\circ) \\omega=%.1f\\circ E=%d (\\chi_{b}^{2}/N=%.1f \\chi_{s}^{2}/N=%.1f)", - sig, fSigInt, sigmagaus, (int)(s-b), chisq1, chisq2)); + TLatex text(0.13, 0.94, Form("\\sigma_{Li/Ma}=%.1f (\\alpha<%.1f\\circ) \\omega=%.1f\\circ E=%d (\\chi_{b}^{2}/N=%.1f \\chi_{s}^{2}/N=%.1f)", + sig, fSigInt, sigmagaus, (int)(s-b), chisq1, chisq2)); + text.SetBit(TLatex::kTextNDC); + text.SetTextSize(0.04); + text.Paint(); } // ------------------------------------ Index: /trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc =================================================================== --- /trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc (revision 4839) +++ /trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc (revision 4840) @@ -70,9 +70,9 @@ // connect all the histogram with the container fHist // - fAlpha = new TH1F("Alpha", "Alpha of Ellipse", 181, -90, 90); - fDist = new TH1F("Dist", "Dist of Ellipse", 100, 0, 445); - fCosDA = new TH1F("CosDA", "cos(Delta,Alpha) of Ellipse", 101, -1, 1); - fDCA = new TH1F("DCA", "Distance of closest aproach", 101, -500, 500); - fDCADelta = new TH1F("DCADelta", "Angle between shower and x-axis", 101, 0, 360); + fAlpha = new TH1F("Alpha", "Alpha of Ellipse", 181, -90, 90); + fDist = new TH1F("Dist", "Dist of Ellipse", 100, 0, 445); + fCosDA = new TH1F("CosDA", "cos(Delta,Alpha) of Ellipse", 101, -1, 1); + fDCA = new TH1F("DCA", "Distance of closest aproach", 101, -500, 500); + fDCADelta = new TH1F("DCADelta", "Angle between shower and x-axis", 101, 0, 360); fAlpha->SetDirectory(NULL); Index: /trunk/MagicSoft/Mars/mreport/MReportDrive.cc =================================================================== --- /trunk/MagicSoft/Mars/mreport/MReportDrive.cc (revision 4839) +++ /trunk/MagicSoft/Mars/mreport/MReportDrive.cc (revision 4840) @@ -125,6 +125,9 @@ // -------------------------------------------------------------------------- // +// GetAbsError [deg] +// // Returns the absolute deviation from the nominal position calculated // from the system error. +// // Double_t MReportDrive::GetAbsError() const @@ -154,2 +157,8 @@ return acos(d)*TMath::RadToDeg(); } + +void MReportDrive::Print(Option_t *o) const +{ + *fLog << GetDescriptor() << ": Mjd=" << fMjd << " Ra=" << fRa << " Dec=" << fDec; + *fLog << " dZd=" << fErrorZd << " dAz=" << fErrorAz << " D=" << GetAbsError() << endl; +} Index: /trunk/MagicSoft/Mars/mreport/MReportDrive.h =================================================================== --- /trunk/MagicSoft/Mars/mreport/MReportDrive.h (revision 4839) +++ /trunk/MagicSoft/Mars/mreport/MReportDrive.h (revision 4840) @@ -20,6 +20,6 @@ Double_t fCurrentAz; // [deg] current azimuth - Double_t fErrorZd; // [?] system error in the zenith angle axis - Double_t fErrorAz; // [?] sistem error in the azimuth angle axis + Double_t fErrorZd; // [deg] system error in the zenith angle axis + Double_t fErrorAz; // [deg] sistem error in the azimuth angle axis Int_t InterpreteBody(TString &str, Int_t ver); @@ -44,4 +44,6 @@ Double_t GetAbsError() const; + void Print(Option_t *o="") const; + ClassDef(MReportDrive, 1) // Class for DRIVE-REPORT information };