Changeset 1237 for trunk/MagicSoft

Timestamp:

03/08/02 15:35:50 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MHillasSrc.cc (modified) (3 diffs)
• manalysis/MHillasSrc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/03/07: Thomas Bretz
+
+   * manalysis/MHillasSrc.[h,cc]:
+     - added fHeadTail
+     - changed version number to 2.
+
+
 
  2002/03/07: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MHillasSrc.cc

@@ -69 +69 @@
     const Double_t sy = my - fSrcPos->GetY();      // [mm]
 
-    const Double_t tand = tan(hillas->GetDelta()); // [1]
+    const Double_t sd = sin(hillas->GetDelta());   // [1]
+    const Double_t cd = cos(hillas->GetDelta());   // [1]
 
-    fDist   = sqrt(sx*sx + sy*sy);                 // [mm]
-    fAlpha  = atan2(sy - tand*sx, sx + tand*sy);   // [rad]
-    fAlpha *= kRad2Deg;                            // [deg]
 
-    fHillas = hillas;
+    fHeadTail = cd*sx + sd*sy;                     // [mm]
+    fDist     = sqrt(sx*sx + sy*sy);               // [mm]
+    fAlpha    = atan2(cd*sy - sd*sx, fHeadTail);   // [rad]
+    fAlpha   *= kRad2Deg;                          // [deg]
+
+    fHillas   = hillas;
 
     SetReadyToSave();
@@ -84 +87 @@
     *fLog << all;
     *fLog << "Source dependant Image Parameters (" << GetName() << ")" << endl;
-    *fLog << " - Dist  = " << fDist  << " mm"  << endl;
-    *fLog << " - Alpha = " << fAlpha << " deg" << endl;
+    *fLog << " - Dist     = " << fDist     << " mm"  << endl;
+    *fLog << " - Alpha    = " << fAlpha    << " deg" << endl;
+    *fLog << " - HeadTail = " << fHeadTail << " mm"  << endl;
 }
 
@@ -96 +100 @@
     fin >> fAlpha;
     fin >> fDist;
+    fin >> fHeadTail;
 }
 

trunk/MagicSoft/Mars/manalysis/MHillasSrc.h

@@ -14 +14 @@
     const MSrcPosCam *fSrcPos; //! Source position in the camere
 
-    Float_t fAlpha;  // [deg]  angle of major axis with vector to src
-    Float_t fDist;   // [mm]   distance from src to center of ellipse
+    Float_t fAlpha;    // [deg]  angle of major axis with vector to src
+    Float_t fDist;     // [mm]   distance from src to center of ellipse
+    Float_t fHeadTail; // [mm]
 
 public:
@@ -23 +24 @@
     const MSrcPosCam *GetSrcPos() const   { return fSrcPos; }
 
-    Float_t GetLength() const  { return fHillas->GetLength(); }
-    Float_t GetWidth()  const  { return fHillas->GetWidth(); }
-    Float_t GetDelta()  const  { return fHillas->GetDelta(); }
-    Float_t GetSize()   const  { return fHillas->GetSize(); }
-    Float_t GetMeanX()  const  { return fHillas->GetMeanX(); }
-    Float_t GetMeanY()  const  { return fHillas->GetMeanY(); }
-    Float_t GetAlpha()  const  { return fAlpha; }
-    Float_t GetDist()   const  { return fDist; }
+    Float_t GetLength()   const  { return fHillas->GetLength(); }
+    Float_t GetWidth()    const  { return fHillas->GetWidth(); }
+    Float_t GetDelta()    const  { return fHillas->GetDelta(); }
+    Float_t GetSize()     const  { return fHillas->GetSize(); }
+    Float_t GetMeanX()    const  { return fHillas->GetMeanX(); }
+    Float_t GetMeanY()    const  { return fHillas->GetMeanY(); }
+    Float_t GetAlpha()    const  { return fAlpha; }
+    Float_t GetDist()     const  { return fDist; }
+    Float_t GetHeadTail() const  { return fHeadTail; }
 
     void Print(Option_t *opt=NULL) const;
@@ -39 +41 @@
     //virtual void AsciiWrite(ofstream &fout) const;
 
-    ClassDef(MHillasSrc, 1) // Container to hold source position dependant parameters
+    ClassDef(MHillasSrc, 2) // Container to hold source position dependant parameters
 };
 
+/*
+ Version 1: fAlpha, fDist
+ Version 2: fAlpha, fDist, fSign
+ */
+
 #endif