Changeset 7134 for trunk/MagicSoft/Mars/mmuon

Timestamp:

06/03/05 20:15:28 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmuon

Files:

• MMuonCalibPar.cc (modified) (2 diffs)
• MMuonSearchPar.cc (modified) (4 diffs)
• MMuonSearchPar.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mmuon/MMuonCalibPar.cc

@@ -52 +52 @@
 {
     fName  = name  ? name  : "MMuonCalibPar";
-    fTitle = title ? title : "Muon calibration parameters";
+    fTitle = title ? title : "Parameters to calculate Muon calibration";
 
     Reset();
@@ -76 +76 @@
     *fLog << "Muon Parameters (" << GetName() << ")"       << 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 << " - 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 << " - Size of muon  [phe]   = " << fMuonSize    << endl;
-    *fLog << " - Peak Phi      [deg]   = " << fPeakPhi     << endl;
+    *fLog << " - Size of muon [phe]   = " << fMuonSize    << endl;
+    *fLog << " - Peak Phi     [deg]   = " << fPeakPhi     << endl;
 }
 

trunk/MagicSoft/Mars/mmuon/MMuonSearchPar.cc

@@ -54 +54 @@
 
 #include <TMinuit.h>
+#include <TEllipse.h>
 
 #include "MLog.h"
@@ -77 +78 @@
 {
     fName  = name  ? name  : "MMuonSearchPar";
-    fTitle = title ? title : "Muon search parameters";
+    fTitle = title ? title : "Parameters to find Muons";
 }
 
@@ -261 +262 @@
     *fLog << all;
     *fLog << "Muon Parameters (" << GetName() << ")" << endl;
-    *fLog << " - Est. Radius   [mm]  = " << fRadius  << endl;
-    *fLog << " - Deviation     [mm]  = " << fDeviation  << endl;
-    *fLog << " - Center Pos. X [mm]  = " << fCenterX << endl;
-    *fLog << " - Center Pos. Y [mm]  = " << fCenterY << endl;
+    *fLog << " - Est. Radius     [mm] = " << fRadius  << endl;
+    *fLog << " - Deviation       [mm] = " << fDeviation  << endl;
+    *fLog << " - Center Pos. X   [mm] = " << fCenterX << endl;
+    *fLog << " - Center Pos. Y   [mm] = " << fCenterY << endl;
 }
 
@@ -271 +272 @@
     *fLog << all;
     *fLog << "Muon Parameters (" << GetName() << ")" << endl;
-    *fLog << " - Est. Radius   [deg] = " << fRadius*geom.GetConvMm2Deg()   << endl;
-    *fLog << " - Deviation     [deg] = " << fDeviation*geom.GetConvMm2Deg()   << endl;
-    *fLog << " - Center Pos. X [deg] = " << fCenterX*geom.GetConvMm2Deg()  << endl;
-    *fLog << " - Center Pos. Y [deg] = " << fCenterY*geom.GetConvMm2Deg()  << endl;
-}
+    *fLog << " - Est. Radius    [deg] = " << fRadius*geom.GetConvMm2Deg()   << endl;
+    *fLog << " - Deviation      [deg] = " << fDeviation*geom.GetConvMm2Deg()   << endl;
+    *fLog << " - Center Pos. X  [deg] = " << fCenterX*geom.GetConvMm2Deg()  << endl;
+    *fLog << " - Center Pos. Y  [deg] = " << fCenterY*geom.GetConvMm2Deg()  << endl;
+}
+
+// --------------------------------------------------------------------------
+//
+// Paint the ellipse corresponding to the parameters
+//
+void MMuonSearchPar::Paint(Option_t *opt)
+{
+    if (fRadius<180 || fRadius>400 || fDeviation>45)
+        return;
+
+    TEllipse e1(fCenterX, fCenterY, fRadius-fDeviation, fRadius-fDeviation);
+    TEllipse e2(fCenterX, fCenterY, fRadius+fDeviation, fRadius+fDeviation);
+    e1.SetLineWidth(1);
+    e2.SetLineWidth(1);
+    e1.SetLineColor(kYellow);
+    e2.SetLineColor(kYellow);
+    e1.Paint();
+    e2.Paint();
+}

trunk/MagicSoft/Mars/mmuon/MMuonSearchPar.h

@@ -32 +32 @@
     MMuonSearchPar(const char *name=NULL, const char *title=NULL);
 
+    // MParContainer
     void Reset();
 
+    // Getter
     Float_t GetRadius()    const { return fRadius; }
     Float_t GetDeviation() const { return fDeviation; }
@@ -39 +41 @@
     Float_t GetCenterY()   const { return fCenterY; }
 
+    // MMuonSearchPar
     void   CalcMinimumDeviation(const MGeomCam &geom, const MSignalCam &evt,
                                 Double_t &x, Double_t &y, Double_t &sigma, Double_t &rad);
@@ -45 +48 @@
                 const MHillas &hillas);
 
+    // TObject
+    void   Paint(Option_t *opt="");
     void   Print(Option_t *opt=NULL) const;
     void   Print(const MGeomCam &geom, Option_t *opt=NULL) const;