Changeset 3437 for trunk/MagicSoft/Mars

Timestamp:

03/07/04 21:00:11 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrate.cc (modified) (3 diffs)
• MCalibrate.h (modified) (2 diffs)
• MCalibrateData.cc (modified) (4 diffs)
• MCalibrateData.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -85 +85 @@
 // Default constructor. 
 //
-MCalibrate::MCalibrate(CalibrationMode_t calmode,const char *name, const char *title) : fCalibrationMode(calmode)
+MCalibrate::MCalibrate(CalibrationMode_t calmode,const char *name, const char *title) 
+    : fGeomCam(NULL), fCalibrations(NULL), fBadPixels(NULL), fSignals(NULL), 
+      fCerPhotEvt(NULL), fCalibrationMode(calmode)
 {
     fName  = name  ? name  : "MCalibrate";
@@ -111 +113 @@
     {
       *fLog << err << AddSerialNumber("MExtractedSignalCam") << " not found ... aborting" << endl;
+        return kFALSE;
+    }
+
+    fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
+
+    if (!fBadPixels)
+    {
+      *fLog << err << AddSerialNumber("MBadPixelsCam") << " not found ... aborting" << endl;
         return kFALSE;
     }
@@ -217 +227 @@
       if(fCalibrationMode!=kNone)
         {
+
           MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
-          
-
-          //
-          // Will be replaced by a call to MBadPixels
-          //if (!pix.IsChargeValid())
-          //continue;
+          MBadPixelsPix         &bad = (*fBadPixels)[pixidx];
+
+          if (!bad.IsCalibrationResultOK())
+            continue;
           
           switch(fCalibrationMode)

trunk/MagicSoft/Mars/mcalib/MCalibrate.h

@@ -15 +15 @@
 
 class MGeomCam;
+class MBadPixelsCam;
 class MCalibrationChargeCam;
 class MExtractedSignalCam;
@@ -23 +24 @@
 private:
     MGeomCam              *fGeomCam;      // Camera geometry container
-    MCalibrationChargeCam *fCalibrations; // Calibration constants 
+    MCalibrationChargeCam *fCalibrations; // Calibration constants
+    MBadPixelsCam         *fBadPixels;    // Bad Pixels information
     MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts
     MCerPhotEvt           *fCerPhotEvt;   // Cerenkov Photon Event used for calculation

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -69 +69 @@
 #include "MPedPhotPix.h"
 
+#include "MBadPixelsCam.h"
+#include "MBadPixelsPix.h"
+
 #include "MCerPhotEvt.h"
 
@@ -78 +81 @@
 // Default constructor. 
 //
-MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title) : fCalibrationMode(calmode)
+MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title) 
+    : fCam(NULL), fPedestal(NULL), fBadPixels(NULL), fCalibrations(NULL), fSignals(NULL), 
+      fPedPhot(NULL), fCerPhotEvt(NULL), fCalibrationMode(calmode)
 {
     fName  = name  ? name  : "MCalibrateData";
@@ -112 +117 @@
     {
       *fLog << err << AddSerialNumber("MExtractedSignalCam") << " not found ... aborting" << endl;
+        return kFALSE;
+    }
+
+    fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
+
+    if (!fBadPixels)
+    {
+      *fLog << err << AddSerialNumber("MBadPixelsCam") << " not found ... aborting" << endl;
         return kFALSE;
     }
@@ -236 +249 @@
   {
     MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
-          
-    //
-    // Will be replaced by call to MBadPixels
-    //
-    //if (!pix.IsChargeValid())
-    //      return kFALSE;
-          
+    MBadPixelsPix         &bad = (*fBadPixels)[pixidx];
+    
+    if (!bad.IsCalibrationResultOK())
+      return kFALSE;
+    
     hiloconv   = pix.GetConversionHiLo();
     hiloconverr= pix.GetConversionHiLoErr();

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -23 +23 @@
 
 class MGeomCam;
+class MBadPixelsCam;
 class MPedestalCam;
 class MCalibrationChargeCam;
@@ -35 +36 @@
     MGeomCam              *fCam;
     MPedestalCam          *fPedestal;     // Pedestals/slice [ADC counts]
+    MBadPixelsCam         *fBadPixels;    // Bad Pixels information
     MCalibrationChargeCam *fCalibrations; // Calibration constants 
     MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts