Changeset 4710 for trunk/MagicSoft/Mars/mcalib

Timestamp:

08/23/04 14:15:49 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MMcCalibrationCalc.cc (modified) (3 diffs)
• MMcCalibrationCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

@@ -61 +61 @@
 
 #include "MHillas.h"
+#include "MImagePar.h"
 #include "MNewImagePar.h"
 
@@ -139 +140 @@
     {
         *fLog << err << AddSerialNumber("MNewImagePar") << "not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fPar = (MImagePar*)pList->FindObject(AddSerialNumber("MImagePar"));
+    if (!fPar)
+    {
+        *fLog << err << AddSerialNumber("MImagePar") << "not found... aborting." << endl;
         return kFALSE;
     }
@@ -236 +244 @@
     // Exclude events with some saturated pixel
     //
-    if (fNew->GetNumSaturatedPixels()>0)
+    if (fPar->GetNumSatPixelsHG()>0)
         return kTRUE;
 

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.h

@@ -10 +10 @@
 class MGeomCam;
 class MHillas;
+class MImagePar;
 class MNewImagePar;
 class MMcEvt;
@@ -24 +25 @@
     MHillas                   *fHillas;
     MNewImagePar              *fNew;
+    MImagePar                 *fPar;
     MMcEvt                    *fMcEvt;
     MMcFadcHeader             *fHeaderFadc;