Changeset 1524 for trunk/MagicSoft/Mars/manalysis

Timestamp:

09/16/02 10:10:17 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• AnalysisLinkDef.h (modified) (1 diff)
• MEnergyEst.h (modified) (2 diffs)
• MHillas.cc (modified) (3 diffs)
• MHillas.h (modified) (2 diffs)
• MHillasExt.cc (modified) (4 diffs)
• MHillasExt.h (modified) (1 diff)
• MHillasSrc.cc (modified) (2 diffs)
• MHillasSrc.h (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -36 +36 @@
 #pragma link C++ class MEnergyEst+;
 #pragma link C++ class MEnergyEstimate+;
+#pragma link C++ class MEnergyEstParam+;
+
+#pragma link C++ class MMatrixLoop+;
 
 #pragma link C++ class MPedCalcPedRun+;

trunk/MagicSoft/Mars/manalysis/MEnergyEst.h

@@ -10 +10 @@
 private:
     Double_t fEnergy; // [GeV] Estimated Energy
+    Double_t fImpact; // [cm]  Estimated Impact
 
 public:
@@ -15 +16 @@
 
     void SetEnergy(Double_t e) { fEnergy = e; }
+    void SetImpact(Double_t i) { fImpact = i; }
     Double_t GetEnergy() const { return fEnergy; }
+    Double_t GetImpact() const { return fImpact; }
 
-    ClassDef(MEnergyEst, 1) // Storage Container for the estimated Energy
+    void Print(Option_t *o="") const;
+
+    ClassDef(MEnergyEst, 0) // Storage Container for the estimated Energy
 };
 

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -55 +55 @@
 #include <fstream.h>
 
+#include <TArrayF.h>
 #include <TEllipse.h>
 
@@ -78 +79 @@
 
     Reset();
-    // FIXME: (intelligent) initialization of values missing
 
     fEllipse = new TEllipse;
@@ -380 +380 @@
 // --------------------------------------------------------------------------
 //
+// This function is ment for special usage, please never try to set
+// values via this function
+//
+void MHillas::Set(const TArrayF &arr)
+{
+    if (arr.GetSize() != 8)
+        return;
+
+    fLength = arr.At(0);  // [mm]        major axis of ellipse
+    fWidth  = arr.At(1);  // [mm]        minor axis of ellipse
+    fDelta  = arr.At(2);  // [rad]       angle of major axis with x-axis
+    fSize   = arr.At(3);  // [#CerPhot]  sum of content of all pixels (number of Cherenkov photons)
+    fMeanX  = arr.At(4);  // [mm]        x-coordinate of center of ellipse
+    fMeanY  = arr.At(5);  // [mm]        y-coordinate of center of ellipse
+
+    fNumUsedPixels = (Short_t)arr.At(6); // Number of pixels which survived the image cleaning
+    fNumCorePixels = (Short_t)arr.At(7); // number of core pixels
+}
+
+
+// --------------------------------------------------------------------------
+//
 /*
 void MHillas::AsciiRead(ifstream &fin)

trunk/MagicSoft/Mars/manalysis/MHillas.h

@@ -6 +6 @@
 #endif
 
+class TArrayF;
 class TEllipse;
 
@@ -62 +63 @@
     Int_t GetNumCorePixels() const { return fNumCorePixels; }
 
+    virtual void Set(const TArrayF &arr);
+
     //virtual void AsciiRead(ifstream &fin);
     //virtual void AsciiWrite(ofstream &fout) const;

trunk/MagicSoft/Mars/manalysis/MHillasExt.cc

@@ -37 +37 @@
 // fM3Long   third moment along major axis
 // fM3Trans  third moment along minor axis
-// fLeakage1 ratio : (photons in most outer ring of pixels) over fSize
-// fLeakage2 ratio : (photons in the 2 outer rings of pixels) over fSize
 //
 // WARNING: Before you can use fAsym, fM3Long and fM3Trans you must
@@ -45 +43 @@
 ////////////////////////////////////////////////////////////////////////////
 /*
+ // fLeakage1 ratio : (photons in most outer ring of pixels) over fSize
+ // fLeakage2 ratio : (photons in the 2 outer rings of pixels) over fSize
+ //
  // fAsymna   d/(d na) of ( sum(x*q^na)/sum(q^na), sum(y*q^na)/sum(q^na) )
  //           projected onto the major axis
@@ -52 +53 @@
 
 #include <fstream.h>
+#include <TArrayF.h>
 
 #include "MGeomPix.h"
@@ -238 +240 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// This function is ment for special usage, please never try to set
+// values via this function
+//
+void MHillasExt::Set(const TArrayF &arr)
+{
+    if (arr.GetSize() != 13)
+        return;
+
+    fConc    = arr.At(8);  // [ratio] concentration ratio: sum of the two highest pixels / fSize
+    fConc1   = arr.At(9);  // [ratio] concentration ratio: sum of the highest pixel / fSize
+    fAsym    = arr.At(10); // [mm]    fDist minus dist: center of ellipse, highest pixel
+    fM3Long  = arr.At(11); // [mm]    3rd moment (e-weighted) along major axis
+    fM3Trans = arr.At(12); // [mm]    3rd moment (e-weighted) along minor axis
+
+    TArrayF n(arr);
+    n.Set(8);
+    MHillas::Set(n);
+}
+
 /*
 // -------------------------------------------------------------------------

trunk/MagicSoft/Mars/manalysis/MHillasExt.h

@@ -34 +34 @@
     void Print(Option_t *opt=NULL) const;
 
+    void Set(const TArrayF &arr);
+
     //void AsciiRead(ifstream &fin);
     //void AsciiWrite(ofstream &fout) const;

trunk/MagicSoft/Mars/manalysis/MHillasSrc.cc

@@ -54 +54 @@
 
 #include <fstream.h>
+#include <TArrayF.h>
 
 #include "MLog.h"
@@ -141 +142 @@
     *fLog << " - CosDeltaAlpha       = " << fCosDeltaAlpha << endl;
 }
+// --------------------------------------------------------------------------
+//
+// This function is ment for special usage, please never try to set
+// values via this function
+//
+void MHillasSrc::Set(const TArrayF &arr)
+{
+    if (arr.GetSize() != 4)
+        return;
+
+    fAlpha = arr.At(0);         // [deg]  angle of major axis with vector to src
+    fDist  = arr.At(1);         // [mm]   distance between src and center of ellipse
+    fHeadTail  = arr.At(2);     // [mm]
+    fCosDeltaAlpha = arr.At(3); // [1]    cosine of angle between d and a
+}
 
 // -----------------------------------------------------------------------

trunk/MagicSoft/Mars/manalysis/MHillasSrc.h

@@ -42 +42 @@
     virtual Bool_t Calc(const MHillas *hillas);
 
+    void Set(const TArrayF &arr);
+
     //virtual void AsciiRead(ifstream &fin);
     //virtual void AsciiWrite(ofstream &fout) const;

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -36 +36 @@
            MEnergyEst.cc \
            MEnergyEstimate.cc \
+           MEnergyEstParam.cc \
            MSrcPosCam.cc \
            MCameraSmooth.cc \
            MHadroness.cc \
+           MMatrixLoop.cc \
            MCompProbCalc.cc \
            MMultiDimDistCalc.cc \