Changeset 2624 for trunk/MagicSoft/Mars/mimage

Timestamp:

12/08/03 12:08:49 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

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

trunk/MagicSoft/Mars/mimage/MHillas.cc

@@ -127 +127 @@
     *fLog << all;
     *fLog << "Basic Image Parameters (" << GetName() << ")" << endl;
-    *fLog << " - Length      [mm]  = " << fLength << endl;
-    *fLog << " - Width       [mm]  = " << fWidth  << endl;
-    *fLog << " - Delta       [deg] = " << fDelta*kRad2Deg << endl;
-    *fLog << " - Size        [1]   = " << fSize   << " #CherPhot"   << endl;
-    *fLog << " - Meanx       [mm]  = " << fMeanX  << endl;
-    *fLog << " - Meany       [mm]  = " << fMeanY  << endl;
-    *fLog << " - atg(y/x)    [deg] = " << atg     << endl;
+    *fLog << " - Length         [mm]  = " << fLength << endl;
+    *fLog << " - Width          [mm]  = " << fWidth  << endl;
+    *fLog << " - Delta          [deg] = " << fDelta*kRad2Deg << endl;
+    *fLog << " - Size           [1]   = " << fSize   << " #CherPhot"   << endl;
+    *fLog << " - Meanx          [mm]  = " << fMeanX  << endl;
+    *fLog << " - Meany          [mm]  = " << fMeanY  << endl;
+    *fLog << " - atg(y/x)       [deg] = " << atg     << endl;
+}
+
+// --------------------------------------------------------------------------
+//
+// Print the hillas Parameters to *fLog, depending on the geometry in
+// units of deg
+//
+void MHillas::Print(const MGeomCam &geom) const
+{
+    Double_t atg = atan2(fMeanY, fMeanX)*kRad2Deg;
+
+    if (atg<0)
+        atg += 180;
+
+    *fLog << all;
+    *fLog << "Basic Image Parameters (" << GetName() << ")" << endl;
+    *fLog << " - Length         [deg] = " << fLength*geom.GetConvMm2Deg() << endl;
+    *fLog << " - Width          [deg] = " << fWidth *geom.GetConvMm2Deg() << endl;
+    *fLog << " - Delta          [deg] = " << fDelta*kRad2Deg << endl;
+    *fLog << " - Size           [1]   = " << fSize   << " #CherPhot"   << endl;
+    *fLog << " - Meanx          [deg] = " << fMeanX *geom.GetConvMm2Deg() << endl;
+    *fLog << " - Meany          [deg] = " << fMeanY *geom.GetConvMm2Deg() << endl;
+    *fLog << " - atg(y/x)       [deg] = " << atg     << endl;
 }
 

trunk/MagicSoft/Mars/mimage/MHillas.h

@@ -33 +33 @@
     Int_t Calc(const MGeomCam &geom, const MCerPhotEvt &pix);
 
+    void Print(const MGeomCam &geom) const;
     void Print(Option_t *opt=NULL) const;
     void Paint(Option_t *opt=NULL);

trunk/MagicSoft/Mars/mimage/MHillasExt.cc

@@ -100 +100 @@
 // -------------------------------------------------------------------------
 //
+// Print contents of MHillasExt to *fLog.
+//
 void MHillasExt::Print(Option_t *) const
 {
+    *fLog << all;
     *fLog << "Extended Image Parameters (" << GetName() << ")" << endl;
-    *fLog << " - Asymmetry        = " << fAsym    << " mm" << endl;
-    *fLog << " - 3rd Moment Long  = " << fM3Long  << " mm" << endl;
-    *fLog << " - 3rd Moment Trans = " << fM3Trans << " mm" << endl;
+    *fLog << " - Asymmetry            = " << fAsym    << endl;
+    *fLog << " - 3.Moment Long  [mm]  = " << fM3Long  << endl;
+    *fLog << " - 3.Moment Trans [mm]  = " << fM3Trans << endl;
+}
+
+// -------------------------------------------------------------------------
+//
+// Print contents of MHillasExt to *fLog, depending on the geometry in
+// units of deg.
+//
+void MHillasExt::Print(const MGeomCam &geom) const
+{
+    *fLog << all;
+    *fLog << "Extended Image Parameters (" << GetName() << ")" << endl;
+    *fLog << " - Asymmetry            = " << fAsym   *geom.GetConvMm2Deg() << endl;
+    *fLog << " - 3.Moment Long  [deg] = " << fM3Long *geom.GetConvMm2Deg() << endl;
+    *fLog << " - 3.Moment Trans [deg] = " << fM3Trans*geom.GetConvMm2Deg() << endl;
 }
 

trunk/MagicSoft/Mars/mimage/MHillasExt.h

@@ -32 +32 @@
 
     void Print(Option_t *opt=NULL) const;
+    void Print(const MGeomCam &geom) const;
 
     void Set(const TArrayF &arr);

trunk/MagicSoft/Mars/mimage/MHillasSrc.cc

@@ -69 +69 @@
 #include "MLogManip.h"
 
+#include "MGeomCam.h"
 #include "MSrcPosCam.h"
 
@@ -148 +149 @@
 } 
 
+// --------------------------------------------------------------------------
+//
+// Print contents of MHillasSrc to *fLog
+//
 void MHillasSrc::Print(Option_t *) const
 {
     *fLog << all;
     *fLog << "Source dependant Image Parameters (" << GetName() << ")" << endl;
-    *fLog << " - Dist          [mm]  = " << fDist << endl;
-    *fLog << " - Alpha         [deg] = " << fAlpha << endl;
-    *fLog << " - CosDeltaAlpha       = " << fCosDeltaAlpha << endl;
+    *fLog << " - Dist           [mm]  = " << fDist << endl;
+    *fLog << " - Alpha          [deg] = " << fAlpha << endl;
+    *fLog << " - CosDeltaAlpha        = " << fCosDeltaAlpha << endl;
 }
+
+// --------------------------------------------------------------------------
+//
+// Print contents of MHillasSrc to *fLog depending on the geometry in
+// units of deg.
+//
+void MHillasSrc::Print(const MGeomCam &geom) const
+{
+    *fLog << all;
+    *fLog << "Source dependant Image Parameters (" << GetName() << ")" << endl;
+    *fLog << " - Dist           [deg] = " << fDist*geom.GetConvMm2Deg() << endl;
+    *fLog << " - Alpha          [deg] = " << fAlpha << endl;
+    *fLog << " - CosDeltaAlpha        = " << fCosDeltaAlpha << endl;
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mimage/MHillasSrc.h

@@ -30 +30 @@
 
     void Print(Option_t *opt=NULL) const;
+    void Print(const MGeomCam &geom) const;
 
     virtual Bool_t Calc(const MHillas *hillas);

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -154 +154 @@
     *fLog << all;
     *fLog << "New Image Parameters (" << GetName() << ")" << endl;
-    *fLog << " - Leakage1        = " << fLeakage1      << endl;
-    *fLog << " - Leakage2        = " << fLeakage2      << endl;
-    *fLog << " - Conc            = " << fConc          << " (ratio)" << endl;
-    *fLog << " - Conc1           = " << 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 << " - Conc           [1]   = " << fConc          << " (ratio)" << endl;
+    *fLog << " - Conc1          [1]   = " << fConc1         << " (ratio)" << endl;
+    *fLog << " - Used Pixels    [#]   = " << fNumUsedPixels << " Pixels" << endl;
+    *fLog << " - Core Pixels    [#]   = " << fNumCorePixels << " Pixels" << endl;
 }