Changeset 3526 for trunk/MagicSoft/Mars/mimage/MHillasCalc.cc

Timestamp:

03/16/04 18:50:24 (21 years ago)

Author:

blanch

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mimage/MHillasCalc.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mimage/MHillasCalc.cc

@@ -65 +65 @@
 #include "MHillasExt.h"
 #include "MNewImagePar.h"
-
+#include "MConcentration.h"
 #include "MCerPhotEvt.h"
 
@@ -81 +81 @@
 MHillasCalc::MHillasCalc(const char *name, const char *title)
     : fHilName("MHillas"), fHilExtName("MHillasExt"),
-    fImgParName("MNewImagePar"), fFlags(0xff), fErrors(5)
+    fImgParName("MNewImagePar"), fConcName("MConcentration"),
+    fFlags(0xff), fErrors(5)
 {
     fName  = name  ? name  : "MHillasCalc";
@@ -139 +140 @@
     }
 
-    memset(fErrors.GetArray(), 0, sizeof(Char_t)*fErrors.GetSize());
+     // if enabled
+    if (TestFlag(kCalcConc))
+    {
+        fConc = (MConcentration*)pList->FindCreateObj("MConcentration", fConcName);
+        if (!fConc)
+            return kFALSE;
+    }
+
+   memset(fErrors.GetArray(), 0, sizeof(Char_t)*fErrors.GetSize());
 
     return kTRUE;
@@ -171 +180 @@
     if (TestFlag(kCalcNewImagePar))
         fNewImgPar->Calc(*fGeomCam, *fCerPhotEvt, *fHillas);
+
+    if (TestFlag(kCalcConc))
+        fConc->Calc(*fGeomCam, *fCerPhotEvt, *fHillas);
 
     return kTRUE;