Changeset 842

Timestamp:

06/12/01 13:01:20 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCT1ReadAscii.h (modified) (1 diff)
• MCerPhotCalc.cc (modified) (1 diff)
• MHillas.cc (modified) (4 diffs)
• MHillas.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.h

@@ -13 +13 @@
 {
 private:
-    TString       fFileName;    // the file name of the string
     ifstream     *fIn;          // the inputfile
     MCerPhotEvt  *fNphot;       // the data container for all data.

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -113 +113 @@
     }
 
+    fCerPhotEvt->SetHasChanged();
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -36 +36 @@
 
 #include <math.h>
+#include <fstream.h>
 
 #include <TEllipse.h>
@@ -51 +52 @@
 // Default constructor.
 //
-MHillas::MHillas(const char *name, const char *title) :
-    fAlpha(0), fTheta(0), fWidth(0), fLength(0), fSize(0), fDist(0), fEllipse(NULL)
+MHillas::MHillas(const char *name, const char *title) : fEllipse(NULL)
 {
     *fName  = name  ? name  : "MHillas";
     *fTitle = title ? title : "Storage container for Hillas parameter of one event";
 
+    Reset();
     // FIXME: Initialization of values missing
 }
@@ -66 +67 @@
 MHillas::~MHillas()
 {
+    Clear();
+}
+
+void MHillas::Reset()
+{
+    fAlpha  = 0;
+    fTheta  = 0;
+    fWidth  = 0;
+    fLength = 0;
+    fSize   = 0;
+    fDist   = 0;
+
     Clear();
 }
@@ -271 +284 @@
     if (xmean<0) fTheta += kPI;                      // [rad]
 
+    SetHasChanged();
+
     return kTRUE;
 }
+
+void MHillas::AsciiRead(ifstream &fin)
+{
+    fin >> fAlpha;
+    fin >> fTheta;
+    fin >> fWidth;
+    fin >> fLength;
+    fin >> fSize;
+    fin >> fDist;
+}
+
+void MHillas::AsciiWrite(ofstream &fout) const
+{
+    fout << fAlpha << " ";
+    fout << fTheta << " ";
+    fout << fWidth << " ";
+    fout << fLength << " ";
+    fout << fSize << " ";
+    fout << fDist << endl;
+}

trunk/MagicSoft/Mars/manalysis/MHillas.h

@@ -27 +27 @@
     ~MHillas();
 
+    void Reset();
+
     Bool_t Calc(MGeomCam &geom, MCerPhotEvt &pix);
 
@@ -42 +44 @@
     Float_t GetTheta() const  { return fTheta; }
 
+    void AsciiRead(ifstream &fin);
+    void AsciiWrite(ofstream &fout) const;
+
     ClassDef(MHillas, 1) // Storage Container for Hillas Parameter
 };