Changeset 6608

Timestamp:

02/18/05 17:11:58 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/macros/readCalibration.C (modified) (3 diffs)

trunk/MagicSoft/Mars/macros/readCalibration.C

@@ -96 +96 @@
 
   cout << "Size of QECam: "      << qecam.GetSize() << endl;
-  cout << "Size of BlindCam: "   << blindcam.GetSize() << endl;
   cout << "Size of Chargecam: "  << chargecam.GetSize() << endl;
   cout << "Size of RelTimeCam: "  << relcam.GetSize() << endl;
@@ -108 +107 @@
   {
       MCalibrationRelTimePix &rpix = (MCalibrationRelTimePix&)relcam[i];
-      cout << "Number of outliers in time pixel: " << i << ": " << rpix.GetNumPickup()+rpix.GetNumBlackout() << endl;
+      MBadPixelsPix &bad  = badcam[i];
+      if (!bad.IsUnsuitable())
+        cout << "Number of outliers in time pixel: " << i << ": " << rpix.GetNumPickup()+rpix.GetNumBlackout() << endl;
   } 
 
@@ -121 +122 @@
       MCalibrationChargePix &cpix = (MCalibrationChargePix&)chargecam[i];
       MCalibrationQEPix     &qpix = (MCalibrationQEPix&)    qecam[i];
-      cout << "Conversion Factor: " << cpix.GetMeanConvFADC2Phe() / qpix.GetQECascadesFFactor() << endl;
+      MBadPixelsPix         &bad  = badcam[i];
+      if (!bad.IsUnsuitable())
+        cout << "Conversion Factor: " << cpix.GetMeanConvFADC2Phe() / qpix.GetQECascadesFFactor() << endl;
     }