Changeset 4578 for trunk/MagicSoft/Mars/mimage

Timestamp:

08/11/04 13:42:50 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MHillasCalc.cc (modified) (5 diffs)
• MHillasCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mimage/MHillasCalc.cc

@@ -80 +80 @@
 //
 MHillasCalc::MHillasCalc(const char *name, const char *title)
-    : fHilName("MHillas"), fHilExtName("MHillasExt"),
-    fImgParName("MNewImagePar"), fConcName("MConcentration"),
+    : fNameHillas("MHillas"), fNameHillasExt("MHillasExt"),
+    fNameNewImgPar("MNewImagePar"), fNameConc("MConcentration"),
     fFlags(0xff), fErrors(5)
 {
@@ -115 +115 @@
     // depend on whether MHillas is an in- or output container
     if (TestFlag(kCalcHillas))
-        fHillas = (MHillas*)pList->FindCreateObj("MHillas", AddSerialNumber(fHilName));
+        fHillas = (MHillas*)pList->FindCreateObj("MHillas", AddSerialNumber(fNameHillas));
     else
     {
-        fHillas = (MHillas*)pList->FindObject(AddSerialNumber(fHilName), "MHillas");
-        *fLog << err << fHilName << " [MHillas] not found... aborting." << endl;
+        fHillas = (MHillas*)pList->FindObject(AddSerialNumber(fNameHillas), "MHillas");
+        *fLog << err << fNameHillas << " [MHillas] not found... aborting." << endl;
     }
     if (!fHillas)
@@ -127 +127 @@
     if (TestFlag(kCalcHillasExt))
     {
-        fHillasExt = (MHillasExt*)pList->FindCreateObj("MHillasExt", AddSerialNumber(fHilExtName));
+        fHillasExt = (MHillasExt*)pList->FindCreateObj("MHillasExt", AddSerialNumber(fNameHillasExt));
         if (!fHillasExt)
             return kFALSE;
@@ -135 +135 @@
     if (TestFlag(kCalcNewImagePar))
     {
-        fNewImgPar = (MNewImagePar*)pList->FindCreateObj("MNewImagePar", AddSerialNumber(fImgParName));
+        fNewImgPar = (MNewImagePar*)pList->FindCreateObj("MNewImagePar", AddSerialNumber(fNameNewImgPar));
         if (!fNewImgPar)
             return kFALSE;
@@ -143 +143 @@
     if (TestFlag(kCalcConc))
     {
-        fConc = (MConcentration*)pList->FindCreateObj("MConcentration", fConcName);
+        fConc = (MConcentration*)pList->FindCreateObj("MConcentration", fNameConc);
         if (!fConc)
             return kFALSE;
     }
 
-   memset(fErrors.GetArray(), 0, sizeof(Char_t)*fErrors.GetSize());
+    memset(fErrors.GetArray(), 0, sizeof(Char_t)*fErrors.GetSize());
 
     return kTRUE;

trunk/MagicSoft/Mars/mimage/MHillasCalc.h

@@ -29 +29 @@
     const MCerPhotEvt *fCerPhotEvt; //! Cerenkov Photon Event used for calculation
 
-    MHillas      *fHillas;          //! output container to store result
-    MHillasExt   *fHillasExt;       //! output container to store result
-    MNewImagePar *fNewImgPar;       //! output container to store result
-    MConcentration *fConc;          //! output container to store result
+    MHillas           *fHillas;     //! output container to store result
+    MHillasExt        *fHillasExt;  //! output container to store result
+    MNewImagePar      *fNewImgPar;  //! output container to store result
+    MConcentration    *fConc;       //! output container to store result
 
-    TString      fHilName;          // name of the 'MHillas' container
-    TString      fHilExtName;       // name of the 'MHillasExt' container
-    TString      fImgParName;       // name of the 'MNewImagePar' container
-    TString      fConcName;         // name of the 'MConcentration' container
+    TString            fNameHillas;    // name of the 'MHillas' container
+    TString            fNameHillasExt; // name of the 'MHillasExt' container
+    TString            fNameNewImgPar; // name of the 'MNewImagePar' container
+    TString            fNameConc;      // name of the 'MConcentration' container
 
-    Int_t        fFlags;            // Flags defining the behaviour of MHillasCalc
+    Int_t              fFlags;      // Flags defining the behaviour of MHillasCalc
 
-    TArrayL      fErrors;           //! Error counter. Do we have to change to Double?
+    TArrayL            fErrors;     //! Error counter. Do we have to change to Double?
 
-    void PrintSkipped(int i, const char *str) const;
+    void  PrintSkipped(int i, const char *str) const;
 
     Int_t PreProcess(MParList *pList);
@@ -60 +60 @@
     MHillasCalc(const char *name=NULL, const char *title=NULL);
 
-    void SetNameHillas(const char *name)    { fHilName = name;    }
-    void SetNameHillasExt(const char *name) { fHilExtName = name; }
-    void SetNameNewImgPar(const char *name) { fImgParName = name; }
-    void SetNameConc(const char *name) { fConcName = name; }
+    void   SetNameHillas(const char *name)    { fNameHillas = name;    }
+    void   SetNameHillasExt(const char *name) { fNameHillasExt = name; }
+    void   SetNameNewImgPar(const char *name) { fNameNewImgPar = name; }
+    void   SetNameConc(const char *name)      { fNameConc = name;      }
 
-    void SetFlags(Int_t f) { fFlags  =  f; }
-    void Enable(Int_t f)   { fFlags |=  f; }
-    void Disable(Int_t f)  { fFlags &= ~f; }
+    void   SetFlags(Int_t f) { fFlags  =  f; }
+    void   Enable(Int_t f)   { fFlags |=  f; }
+    void   Disable(Int_t f)  { fFlags &= ~f; }
     Bool_t TestFlag(CalcCont_t i) const { return fFlags&i; }