Changeset 1218 for trunk/MagicSoft/Mars/manalysis

Timestamp:

02/21/02 12:08:03 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

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

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -36 +36 @@
 // fDelta    angle of major axis wrt x-axis
 // fSize     total sum of pixels
-// fMeanx    x of center of ellipse
-// fMeany    y of center of ellipse
+// fMeanX    x of center of ellipse
+// fMeanY    y of center of ellipse
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -89 +89 @@
     fDelta  = 0;
     fSize   = 0;
-    fMeanx  = 0;
-    fMeany  = 0;
+    fMeanX  = 0;
+    fMeanY  = 0;
 
     Clear();
@@ -101 +101 @@
 void MHillas::Print(Option_t *) const
 {
-    Double_t atg = atan2(fMeany, fMeanx)*kRad2Deg;
+    Double_t atg = atan2(fMeanY, fMeanX)*kRad2Deg;
 
     if (atg<0)
@@ -110 +110 @@
     *fLog << " - Length   [mm]  = " << fLength << endl;
     *fLog << " - Width    [mm]  = " << fWidth  << endl;
-    *fLog << " - Meanx    [mm]  = " << fMeanx  << endl;
-    *fLog << " - Meany    [mm]  = " << fMeany  << endl;
+    *fLog << " - Meanx    [mm]  = " << fMeanX  << endl;
+    *fLog << " - Meany    [mm]  = " << fMeanY  << endl;
     *fLog << " - Delta    [deg] = " << fDelta*kRad2Deg << endl;
     *fLog << " - atg(y/x) [deg] = " << atg     << endl;
@@ -125 +125 @@
 {
      fEllipse->SetLineWidth(2);
-     fEllipse->PaintEllipse(fMeanx, fMeany, fLength, fWidth,
+     fEllipse->PaintEllipse(fMeanX, fMeanY, fLength, fWidth,
                             0, 360, fDelta*kRad2Deg+180);
 }
@@ -143 +143 @@
     Clear();
 
-    fEllipse = new TEllipse(fMeanx, fMeany, fLength, fWidth,
+    fEllipse = new TEllipse(fMeanX, fMeanY, fLength, fWidth,
                             0, 360, fDelta*kRad2Deg+180);
 
@@ -155 +155 @@
      fEllipse->SetR2(fWidth);
      fEllipse->SetTheta(fDelta*kRad2Deg+180);
-     fEllipse->SetX1(fMeanx);
-     fEllipse->SetY1(fMeany);
+     fEllipse->SetX1(fMeanX);
+     fEllipse->SetY1(fMeanY);
 
      fEllipse->SetLineWidth(2);
-     fEllipse->PaintEllipse(fMeanx, fMeany, fLength, fWidth,
+     fEllipse->PaintEllipse(fMeanX, fMeanY, fLength, fWidth,
                             0, 360, fDelta*kRad2Deg+180);
 
@@ -216 +216 @@
     // -----------------------------------------------------
     //
-    fMeanx = 0;
-    fMeany = 0;
+    fMeanX = 0;
+    fMeanY = 0;
     fSize  = 0;
 
@@ -236 +236 @@
 
         fSize  += nphot;                             // [counter]
-        fMeanx += nphot * gpix.GetX();               // [mm]
-        fMeany += nphot * gpix.GetY();               // [mm]
+        fMeanX += nphot * gpix.GetX();               // [mm]
+        fMeanY += nphot * gpix.GetY();               // [mm]
 
         npix++;
@@ -248 +248 @@
         return kFALSE;
 
-    fMeanx /= fSize;                                 // [mm]
-    fMeany /= fSize;                                 // [mm]
+    fMeanX /= fSize;                                 // [mm]
+    fMeanY /= fSize;                                 // [mm]
 
     //
@@ -267 +267 @@
 
         const MGeomPix &gpix = geom[pix.GetPixId()];
-        const float dx = gpix.GetX() - fMeanx;       // [mm]
-        const float dy = gpix.GetY() - fMeany;       // [mm]
+        const float dx = gpix.GetX() - fMeanX;       // [mm]
+        const float dy = gpix.GetY() - fMeanY;       // [mm]
 
         const float nphot = pix.GetNumPhotons();     // [#phot]
@@ -311 +311 @@
     fin >> fDelta;
     fin >> fSize;
-    fin >> fMeanx;
-    fin >> fMeany;
-}
-
-// --------------------------------------------------------------------------
-//
+    fin >> fMeanX;
+    fin >> fMeanY;
+}
+
+// --------------------------------------------------------------------------
+/*
 void MHillas::AsciiWrite(ofstream &fout) const
 {
@@ -323 +323 @@
     fout << fDelta  << " ";
     fout << fSize   << " ";
-    fout << fMeanx  << " ";
-    fout << fMeany;
-}
+    fout << fMeanX  << " ";
+    fout << fMeanY;
+}
+*/

trunk/MagicSoft/Mars/manalysis/MHillas.h

@@ -19 +19 @@
     Float_t   fDelta;    // [rad]       angle of major axis with x-axis
     Float_t   fSize;     // [#CerPhot]  sum of content of all pixels (number of Cherenkov photons)
-    Float_t   fMeanx;    // [mm]        x-coordinate of center of ellipse
-    Float_t   fMeany;    // [mm]        y-coordinate of center of ellipse
+    Float_t   fMeanX;    // [mm]        x-coordinate of center of ellipse
+    Float_t   fMeanY;    // [mm]        y-coordinate of center of ellipse
 
     Float_t   fSinDelta; //! [1] sin of Delta (to be used in derived classes)
@@ -53 +53 @@
     Float_t GetDelta() const  { return fDelta; }
     Float_t GetSize() const   { return fSize; }
-    Float_t GetMeanX() const  { return fMeanx; }
-    Float_t GetMeanY() const  { return fMeany; }
+    Float_t GetMeanX() const  { return fMeanX; }
+    Float_t GetMeanY() const  { return fMeanY; }
 
     virtual void AsciiRead(ifstream &fin);
-    virtual void AsciiWrite(ofstream &fout) const;
+    //virtual void AsciiWrite(ofstream &fout) const;
 
     ClassDef(MHillas, 1) // Storage Container for Hillas Parameter

trunk/MagicSoft/Mars/manalysis/MHillasSrc.cc

@@ -101 +101 @@
 //
 // overloaded MParContainer to write MHillasSrc to an ascii file
-//
+/*
 void MHillasSrc::AsciiWrite(ofstream &fout) const
 {
     fout << fAlpha << " " << fDist;
 }
+*/

trunk/MagicSoft/Mars/manalysis/MHillasSrc.h

@@ -37 +37 @@
 
     virtual void AsciiRead(ifstream &fin);
-    virtual void AsciiWrite(ofstream &fout) const;
+    //virtual void AsciiWrite(ofstream &fout) const;
 
     ClassDef(MHillasSrc, 1) // Container to hold source position dependant parameters