Changeset 2026 for trunk/MagicSoft/Mars/mimage/MNewImagePar.h

Timestamp:

04/28/03 15:39:40 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mimage/MNewImagePar.h (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/MNewImagePar.h

@@ -2 +2 @@
 #define MARS_MNewImagePar
 
-#ifndef MARS_MHillas
-#include "MHillas.h"
+#ifndef MARS_MParContainer
+#include "MParContainer.h"
 #endif
 
-class MSrcPosCam;
+class MHillas;
+class MGeomCam;
+class MCerPhotEvt;
 
 class MNewImagePar : public MParContainer
 {
 private:
-    Float_t fLeakage1;   // (photons in most outer ring of pixels) over fSize
-    Float_t fLeakage2;   // (photons in the 2 outer rings of pixels) over fSize
+    Float_t fLeakage1;      // (photons in most outer ring of pixels) over fSize
+    Float_t fLeakage2;      // (photons in the 2 outer rings of pixels) over fSize
+
+    Float_t fConc;          // [ratio] concentration ratio: sum of the two highest pixels / fSize
+    Float_t fConc1;         // [ratio] concentration ratio: sum of the highest pixel / fSize
+
+    Short_t fNumUsedPixels; // Number of pixels which survived the image cleaning
+    Short_t fNumCorePixels; // number of core pixels
 
 public:
     MNewImagePar(const char *name=NULL, const char *title=NULL);
 
-    //    void SetSrcPos(MSrcPosCam *pos) { fSrcPos = pos; }
-    //    const MSrcPosCam *GetSrcPos() const   { return fSrcPos; }
-
     void Reset();
 
-    Float_t GetLeakage1()        const { return fLeakage1; }
-    Float_t GetLeakage2()        const { return fLeakage2; }
+    Float_t GetLeakage1() const    { return fLeakage1; }
+    Float_t GetLeakage2() const    { return fLeakage2; }
+
+    Float_t GetConc() const        { return fConc; }
+    Float_t GetConc1() const       { return fConc1; }
+
+    Int_t GetNumUsedPixels() const { return fNumUsedPixels; }
+    Int_t GetNumCorePixels() const { return fNumCorePixels; }
 
     void Print(Option_t *opt=NULL) const;
 
-    virtual Bool_t Calc(const MGeomCam &geom, const MCerPhotEvt &evt,
-                        const MHillas *hillas);
-
-    //virtual void AsciiRead(ifstream &fin);
-    //virtual void AsciiWrite(ofstream &fout) const;
+    void Calc(const MGeomCam &geom, const MCerPhotEvt &evt,
+              const MHillas &hillas);
 
     ClassDef(MNewImagePar, 1) // Container to hold new image parameters