Changeset 7176 for trunk/MagicSoft/Mars/mimage

Timestamp:

07/08/05 11:46:47 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MHillasExt.cc (modified) (3 diffs)
• MHillasExt.h (modified) (1 diff)
• MNewImagePar.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mimage/MHillasExt.cc

@@ -64 +64 @@
 
 #include <TArrayF.h>
+#include <TMarker.h>
+#include <TVirtualPad.h>
 
 #include "MGeomPix.h"
@@ -218 +220 @@
     *fLog << all;
     *fLog << GetDescriptor() << endl;
-    *fLog << " - Asymmetry            = " << fAsym    << endl;
+    *fLog << " - Asymmetry      [mm]  = " << fAsym    << endl;
     *fLog << " - 3.Moment Long  [mm]  = " << fM3Long  << endl;
     *fLog << " - 3.Moment Trans [mm]  = " << fM3Trans << endl;
@@ -233 +235 @@
     *fLog << all;
     *fLog << GetDescriptor() << endl;
-    *fLog << " - Asymmetry            = " << fAsym   *geom.GetConvMm2Deg() << endl;
+    *fLog << " - Asymmetry      [deg] = " << fAsym   *geom.GetConvMm2Deg() << endl;
     *fLog << " - 3.Moment Long  [deg] = " << fM3Long *geom.GetConvMm2Deg() << endl;
     *fLog << " - 3.Moment Trans [deg] = " << fM3Trans*geom.GetConvMm2Deg() << endl;
     *fLog << " - Max.Dist       [deg] = " << fMaxDist*geom.GetConvMm2Deg() << endl;
 }
+
+// -------------------------------------------------------------------------
+//
+// Paint the 3rd moment on top of the shower. Therefor "MHillas" is needed.
+// it is searched via gPad->FindObject. If opt is not IsNull an object with
+// the name opt is searched.
+//
+void MHillasExt::Paint(Option_t *opt)
+{
+    const TString name(opt);
+
+    const MHillas *hil = dynamic_cast<const MHillas*>(gPad->FindObject(name.IsNull() ? "MHillas" : name));
+    if (!hil)
+        return;
+
+    TVector2 v(fM3Long, fM3Trans);
+    v  = v.Rotate(hil->GetDelta()+TMath::Pi());
+    v += hil->GetMean();
+
+    TMarker m;
+    m.SetMarkerColor(15);
+    m.SetMarkerStyle(kFullDotLarge);
+    m.PaintMarker(v.X(), v.Y());
+}

trunk/MagicSoft/Mars/mimage/MHillasExt.h

@@ -39 +39 @@
     void Print(const MGeomCam &geom) const;
 
+    void Paint(Option_t *o="");
+
     void Set(const TArrayF &arr);
 

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -228 +228 @@
     *fLog << all;
     *fLog << GetDescriptor() << endl;
-    *fLog << " - Leakage1       [1]   = " << fLeakage1             << endl;
-    *fLog << " - Leakage2       [1]   = " << fLeakage2             << endl;
-    *fLog << " - InnerLeakage1  [1]   = " << fInnerLeakage1        << endl;
-    *fLog << " - InnerLeakage2  [1]   = " << fInnerLeakage2        << endl;
-    *fLog << " - InnerSize      [#]   = " << fInnerSize            << " CerPhot" << endl;
-    *fLog << " - Conc           [1]   = " << fConc                 << " (ratio)" << endl;
-    *fLog << " - Conc1          [1]   = " << fConc1                << " (ratio)" << endl;
-    *fLog << " - Used Pixels    [#]   = " << fNumUsedPixels        << " Pixels" << endl;
-    *fLog << " - Core Pixels    [#]   = " << fNumCorePixels        << " Pixels" << endl;
-    *fLog << " - Used Area     [mm^2] = " << fUsedArea             << endl;
-    *fLog << " - Core Area     [mm^2] = " << fCoreArea             << endl;
+    *fLog << " - Leakage1         [1] = " << fLeakage1      << endl;
+    *fLog << " - Leakage2         [1] = " << fLeakage2      << endl;
+    *fLog << " - InnerLeakage1    [1] = " << fInnerLeakage1 << endl;
+    *fLog << " - InnerLeakage2    [1] = " << fInnerLeakage2 << endl;
+    *fLog << " - InnerSize      [phe] = " << fInnerSize     << endl;
+    *fLog << " - Conc             [1] = " << fConc          << endl;
+    *fLog << " - Conc1            [1] = " << fConc1         << endl;
+    *fLog << " - Num Used Pixels  [#] = " << fNumUsedPixels << endl;
+    *fLog << " - Num Core Pixels  [#] = " << fNumCorePixels << endl;
+    *fLog << " - Used Area     [mm^2] = " << fUsedArea      << endl;
+    *fLog << " - Core Area     [mm^2] = " << fCoreArea      << endl;
 }
 
@@ -250 +250 @@
     *fLog << all;
     *fLog << GetDescriptor() << endl;
-    *fLog << " - Leakage1       [1]   = " << fLeakage1             << endl;
-    *fLog << " - Leakage2       [1]   = " << fLeakage2             << endl;
-    *fLog << " - InnerLeakage1  [1]   = " << fInnerLeakage1        << endl;
-    *fLog << " - InnerLeakage2  [1]   = " << fInnerLeakage2        << endl;
-    *fLog << " - InnerSize      [#]   = " << fInnerSize            << " CerPhot" << endl;
-    *fLog << " - Conc           [1]   = " << fConc                 << " (ratio)" << endl;
-    *fLog << " - Conc1          [1]   = " << fConc1                << " (ratio)" << endl;
-    *fLog << " - Used Pixels    [#]   = " << fNumUsedPixels        << " Pixels" << endl;
-    *fLog << " - Core Pixels    [#]   = " << fNumCorePixels        << " Pixels" << endl;
+    *fLog << " - Leakage1         [1] = " << fLeakage1      << endl;
+    *fLog << " - Leakage2         [1] = " << fLeakage2      << endl;
+    *fLog << " - InnerLeakage1    [1] = " << fInnerLeakage1 << endl;
+    *fLog << " - InnerLeakage2    [1] = " << fInnerLeakage2 << endl;
+    *fLog << " - InnerSize      [phe] = " << fInnerSize     << endl;
+    *fLog << " - Conc             [1] = " << fConc          << endl;
+    *fLog << " - Conc1            [1] = " << fConc1         << endl;
+    *fLog << " - Num Used Pixels  [#] = " << fNumUsedPixels << endl;
+    *fLog << " - Num Core Pixels  [#] = " << fNumCorePixels << endl;
     *fLog << " - Used Area    [deg^2] = " << fUsedArea*geom.GetConvMm2Deg()*geom.GetConvMm2Deg() << endl;
     *fLog << " - Core Area    [deg^2] = " << fCoreArea*geom.GetConvMm2Deg()*geom.GetConvMm2Deg() << endl;