Index: trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc =================================================================== --- trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc (revision 7009) @@ -206,12 +206,2 @@ fHistBroad.Draw(); } -/* -TH1 *MHMuonPar::GetHistByName(const TString name) -{ - if (name.Contains("Radius", TString::kIgnoreCase)) - return &fHistRadius; - if (name.Contains("ArcWidth", TString::kIgnoreCase)) - return &fHistArcWidth; - return NULL; -} -*/ Index: trunk/MagicSoft/Mars/mmuon/MHMuonPar.h =================================================================== --- trunk/MagicSoft/Mars/mmuon/MHMuonPar.h (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MHMuonPar.h (revision 7009) @@ -19,9 +19,9 @@ { private: - TH1F fHistRadius; // - TH1F fHistArcWidth; // + TH1F fHistRadius; // Radius + TH1F fHistArcWidth; // ArcWidth - TProfile fHistBroad; // Area of used pixels - TProfile fHistSize; // [ratio] concentration ratio: sum of the two highest pixels / fSize + TProfile fHistBroad; // ArcWidth/Radius Vs Radius + TProfile fHistSize; // MuonSize Vs Radius MMuonSearchPar *fMuonSearchPar; //! @@ -36,6 +36,4 @@ Bool_t Fill(const MParContainer *par, const Stat_t w=1); - //TH1 *GetHistByName(const TString name); - const TH1F& GetHistRadius() const { return fHistRadius; } const TH1F& GetHistArcWidth() const { return fHistArcWidth; } @@ -45,5 +43,5 @@ void Draw(Option_t *opt=""); - ClassDef(MHMuonPar, 1) // Histograms of new image parameters + ClassDef(MHMuonPar, 1) }; Index: trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc =================================================================== --- trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc (revision 7009) @@ -16,4 +16,5 @@ ! ! +! Author(s): Keiichi Mase, 10/2004 ! Author(s): Markus Meyer, 02/2005 ! Author(s): Thomas Bretz, 04/2005 @@ -28,13 +29,47 @@ // MHSingleMuon // -// This class is a histogram class for a displaying muonparameters. -// The folowing histgrams will be plotted: -// - Radius (TH1F) -// - ArcWidth (TH1F) +// This class is a histogram class for displaying the radial (fHistWidth) +// and the azimuthal (fHistPhi) intensity distribution for one muon. +// You can retrieve the histogram (TH1F) using the function GetHistPhi() +// or GetHistWidth(). +// From these histograms the fraction of the ring segment (ArcPhi) and the +// Width of the muon ring (ArcWidth) is calculated. +// +// First, the radius and center of the ring has to be calculted by +// MMuonSearchParCalc +// After that the histograms has to be filled in the following way: +// +// MFillH fillmuon("MHSingleMuon", "", "FillMuon"); +// +// The allowed region to estimate ArcPhi is a certain margin around the +// radius. The default value is 0.2 deg (60mm). If the estimated radius +// of the arc is 1.0 deg, the pixel contents in the radius range from +// 0.8 deg to 1.2 deg are fill in the histogram. +// +// For ArcPhi only bins over a certain threshold are supposed to be part +// of the ring. +// For ArcWidth, the same algorithm is used to determine the fit region +// for a gaussian fit to the radial intensity distribution. The ArcWidth +// is defined as the sigma value of the gaussian fit. +// +// The binning of the histograms can be changed in the following way: +// +// MBinning bins1("BinningMuonWidth"); +// MBinning bins2("BinningArcPhi"); +// bins1.SetEdges(28, 0.3, 1.7); +// bins2.SetEdges(20, -180,180); +// plist.AddToList(&bins1); +// plist.AddToList(&bins2); +// +// The values for the thresholds and the margin are saved in MMuonSetup. +// They can be easily changed in star.rc. +// +// Please have in mind, that changes in this basic parameters will change +// your results!! // // Inputcontainer: // - MGeomCam // - MMuonSearchPar -// - MMuonCalibPar +// // //////////////////////////////////////////////////////////////////////////// @@ -319,5 +354,6 @@ f1.SetParameter(0, fHistWidth.GetMaximumBin()); f1.SetParameter(1, fHistWidth.GetBinCenter(m)); - f1.SetParameter(2, (endfitval-startfitval)/2); +// f1.SetParameter(2, (endfitval-startfitval)/2); + f1.SetParameter(2, 0.1); // options : N do not store the function, do not draw @@ -338,10 +374,10 @@ // -------------------------------------------------------------------------- // -// An impact parameter is calculated by fitting the histogram of photon +// An impact parameter is calculated by fitting the histogram of photon // distribution along the circle with a theoritical model. // (See G. Vacanti et. al., Astroparticle Physics 2, 1994, 1-11. // The function (6) is used here.) // -// By default this calculation is suppressed because this calculation is +// By default this calculation is suppressed because this calculation is // very time consuming. If you want to calculate an impact parameter, // you can call the function of EnableImpactCalc(). Index: trunk/MagicSoft/Mars/mmuon/MHSingleMuon.h =================================================================== --- trunk/MagicSoft/Mars/mmuon/MHSingleMuon.h (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MHSingleMuon.h (revision 7009) @@ -41,5 +41,5 @@ const TH1F &GetHistWidth() const { return fHistWidth; } - ClassDef(MHSingleMuon, 1) // Histograms of new image parameters + ClassDef(MHSingleMuon, 1) }; Index: trunk/MagicSoft/Mars/mmuon/MMuonCalibPar.cc =================================================================== --- trunk/MagicSoft/Mars/mmuon/MMuonCalibPar.cc (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MMuonCalibPar.cc (revision 7009) @@ -61,5 +61,5 @@ void MMuonCalibPar::Reset() { - fArcLength = -1.; +// fArcLength = -1.; fArcPhi = -1.; fArcWidth = -1.; @@ -67,5 +67,5 @@ fChiArcWidth = -1.; fMuonSize = 0.; - fEstImpact = -1.; +// fEstImpact = -1.; fPeakPhi = 0.; } @@ -75,10 +75,10 @@ *fLog << all; *fLog << "Muon Parameters (" << GetName() << ")" << endl; - *fLog << " - Arc Length [deg] = " << fArcLength << endl; +// *fLog << " - Arc Length [deg] = " << fArcLength << endl; *fLog << " - Arc Phi [deg] = " << fArcPhi << endl; *fLog << " - Arc Width [deg] = " << fArcWidth << endl; *fLog << " - Chi Arc Phi [x2/ndf]= " << fChiArcPhi << endl; *fLog << " - Chi Arc Width [x2/ndf]= " << fChiArcWidth << endl; - *fLog << " - Est. I. P. [m] = " << fEstImpact << endl; +// *fLog << " - Est. I. P. [m] = " << fEstImpact << endl; *fLog << " - Size of muon [phe] = " << fMuonSize << endl; *fLog << " - Peak Phi [deg] = " << fPeakPhi << endl; Index: trunk/MagicSoft/Mars/mmuon/MMuonCalibPar.h =================================================================== --- trunk/MagicSoft/Mars/mmuon/MMuonCalibPar.h (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MMuonCalibPar.h (revision 7009) @@ -16,5 +16,5 @@ { private: - Float_t fArcLength; // An arc length of a muon along the arc [deg.] +// Float_t fArcLength; // An arc length of a muon along the arc [deg.] Float_t fArcPhi; // A opening angle of a muon arc [deg.] Float_t fArcWidth; // A width of a muon [deg.] (1 sigma of gaussian fit) @@ -22,5 +22,5 @@ Float_t fChiArcWidth; // A chisquare value of the cosine fit for arc wid Float_t fMuonSize; // A SIZE of muon which is defined as a SIZE around the estimated circle - Float_t fEstImpact; // An estimated impact parameter from the photon distribution along the arc image +// Float_t fEstImpact; // An estimated impact parameter from the photon distribution along the arc image //Bool_t fUseUnmap; // This is a flag to know the Unmapped pixels are used. Refer to the class of MImgCleanStd Float_t fPeakPhi; // The angle which indicates the peak position in the estimated circle @@ -32,5 +32,5 @@ void Reset(); - Float_t GetArcLength() const { return fArcLength; } +// Float_t GetArcLength() const { return fArcLength; } Float_t GetArcPhi() const { return fArcPhi; } Float_t GetArcWidth() const { return fArcWidth; } @@ -38,11 +38,9 @@ Float_t GetChiArcWidth() const { return fChiArcWidth; } Float_t GetMuonSize() const { return fMuonSize; } - Float_t GetEstImpact() const { return fEstImpact; } +// Float_t GetEstImpact() const { return fEstImpact; } //Bool_t IsUseUnmap() const { return fUseUnmap; } Float_t GetPeakPhi() const { return fPeakPhi; } - // TH1F *GetHistPhi() { return fHistPhi; } - // TH1F *GetHistWidth() { return fHistWidth; } - void SetArcLength(Float_t len) { fArcLength = len; } +// void SetArcLength(Float_t len) { fArcLength = len; } void SetArcPhi(Float_t phi) { fArcPhi = phi; } void SetArcWidth(Float_t wid) { fArcWidth = wid; } @@ -50,5 +48,5 @@ void SetChiArcWidth(Float_t chi) { fChiArcWidth = chi; } void SetMuonSize(Float_t size) { fMuonSize = size; } - void SetEstImpact(Float_t impact) { fEstImpact = impact; } +// void SetEstImpact(Float_t impact) { fEstImpact = impact; } //void SetUseUnmap() { fUseUnmap = kTRUE; } void SetPeakPhi(Float_t phi) { fPeakPhi = phi; } Index: trunk/MagicSoft/Mars/mmuon/MMuonSearchPar.cc =================================================================== --- trunk/MagicSoft/Mars/mmuon/MMuonSearchPar.cc (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MMuonSearchPar.cc (revision 7009) @@ -30,35 +30,17 @@ // Storage Container for muon // -// This class is the container for muon parameters. Actually, the calculation -// is done here. Muons are searched by fitting the image with a circle. -// (This function will be called by using the class of MMuonSearchParCalc.) -// This container especially holds the information of the results of the -// search (fit of a image by a circle). +// This class is the container for muon parameters. The calculation +// of Radius and center of the ring is done here. +// Muons are searched by fitting the image with a circle. // // In order to use further information of muons such as the width of arcs, -// the arc length along it, the muons size. Use the infomation stored in -// MMuonCalibPar. The information will be available by using the task of +// the size of the fraction of the ring and the muons size, use the +// infomation stored in +// +// MMuonCalibPar. +// +// The information will be available by using the task of +// // MMuonCalibParCalc. -// -// --- How to search muons --- -// (This information is a little bit technical. You can skip to read if you -// don't need the technical information.) -// -// 1. A temporal center position of a circle is determined by using -// the Hillas parameters. Assumed that the center position will be on the -// line which is perpendicular to the longitudinal image axis and the -// distance from the gravity center of the image to the center position of -// a ring is approximately 1 deg. (corresponding to the Cherenkov angle.). -// Therefore, we will have two candidates of the center positions. -// -// 2. Find the ring radius which gives the minimum RMS between the camera -// images and the estimated circle. -// -// 3. Select one temporal position which gives smaller RMS as a true temporal -// center position. -// -// 4. Changing the center position of a circle on the camera plane from the -// determined temporal center position, find the position which gives the -// minimum RMS of the fit. // // Index: trunk/MagicSoft/Mars/mmuon/MMuonSearchParCalc.cc =================================================================== --- trunk/MagicSoft/Mars/mmuon/MMuonSearchParCalc.cc (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MMuonSearchParCalc.cc (revision 7009) @@ -30,12 +30,6 @@ // Task to calculate the muon parameters // -// This class search for muons and store the information into the container -// of MMuonSearchPar. The actual calculation is done in the class of -// MMuonSearchPar. Please see the manual. -// -// In order to use further information of muons such as the width of arcs, -// the arc length along it, the muons size. Use the infomation stored in -// MMuonCalibPar. The information will be available by using the task of -// MMuonCalibParCalc. +// This class search for muons and store the information into the container +// of MMuonSearchPar. Please see the manual for more information. // // Index: trunk/MagicSoft/Mars/mmuon/MMuonSetup.cc =================================================================== --- trunk/MagicSoft/Mars/mmuon/MMuonSetup.cc (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MMuonSetup.cc (revision 7009) @@ -28,4 +28,8 @@ // // Storage Container for setup parameter for the muon analysis +// +// - margin +// - ThresholdArcWidth +// - ThresholdArcPhi // ///////////////////////////////////////////////////////////////////////////// Index: trunk/MagicSoft/Mars/mmuon/MMuonSetup.h =================================================================== --- trunk/MagicSoft/Mars/mmuon/MMuonSetup.h (revision 7008) +++ trunk/MagicSoft/Mars/mmuon/MMuonSetup.h (revision 7009) @@ -9,7 +9,7 @@ { private: - Float_t fMargin; // [deg] margin to evaluate muons. The defaut value is 60 mm, corresponding to 0.2 deg. This value can be changed by using the function of SetMargin - Float_t fThresholdArcPhi; // [phe] The threshold value to define arc phi - Float_t fThresholdArcWidth; // [phe] The threshold value to define arc width + Float_t fMargin; // [deg] margin to evaluate muons. The defaut value is 0.2 deg (60mm) + Float_t fThresholdArcPhi; // [phe] The threshold value to define ArcPhi + Float_t fThresholdArcWidth; // [phe] The threshold value to define ArcWidth Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);