Changeset 4197

Timestamp:

05/26/04 18:14:41 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (3 diffs)
• mjobs/MJCalibration.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
 
  2004/05/26: Markus Gaug
+
+   * mjobs/MJCalibration.[h,cc]
+     - set MCalibrationChargeBlindPix and MCalibrationChargePINDiode as 
+       data members and store them in the output of WriteResult()
 
    * mjobs/MGCamDisplays.[h,cc]

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -986 +986 @@
   }
 
-  MCalibrationChargePINDiode pindiode;
-  MCalibrationChargeBlindPix blindpix;
-
   plist.AddToList(&pedcam);
   plist.AddToList(&fBadPixels);
   plist.AddToList(&fQECam);
   plist.AddToList(&fCalibrationCam);
+  plist.AddToList(&fCalibrationBlindPix);
+  plist.AddToList(&fCalibrationPINDiode);
   plist.AddToList(&fRelTimeCam);
-  if (IsUsePINDiode())
-    plist.AddToList(&pindiode);
-  if (IsUseBlindPixel())
-    plist.AddToList(&blindpix);
 
   MGeomApply               apply;
@@ -1204 +1199 @@
 // - MStatusDisplay
 // - MCalibrationChargeCam
+// - MCalibrationChargeBlindPix
 // - MCalibrationQECam
 // - MBadPixelsCam
@@ -1227 +1223 @@
     {
         *fLog << err << "Unable to write MCalibrationChargeCam to " << oname << endl;
+        return kFALSE;
+    }
+
+    if (fCalibrationBlindPix.Write()<=0)
+    {
+        *fLog << err << "Unable to write MCalibrationChargeBlindPix to " << oname << endl;
+        return kFALSE;
+    }
+
+    if (fCalibrationPINDiode.Write()<=0)
+    {
+        *fLog << err << "Unable to write MCalibrationChargePINDiode to " << oname << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -4 +4 @@
 #ifndef MARS_MCalibrationChargeCam
 #include "MCalibrationChargeCam.h"
+#endif
+#ifndef MARS_MCalibrationChargeBlindPix
+#include "MCalibrationChargeBlindPix.h"
+#endif
+#ifndef MARS_MCalibrationChargePINDiode
+#include "MCalibrationChargePINDiode.h"
 #endif
 #ifndef MARS_MCalibrationRelTimeCam
@@ -32 +38 @@
   MExtractTime   *fTimeExtractor;                          // Arrival Time extractor
   
-  MBadPixelsCam          fBadPixels;                       // Bad Pixels cam, can be set from previous runs
-  MCalibrationChargeCam  fCalibrationCam;                  // Calibration conversion factors FADC2Phe
-  MCalibrationQECam      fQECam;                           // Quantum efficiency, can be set from previous runs
-  MCalibrationRelTimeCam fRelTimeCam;                      // Calibration constants rel. times
+  MBadPixelsCam              fBadPixels;                   // Bad Pixels cam, can be set from previous runs
+  MCalibrationChargeCam      fCalibrationCam;              // Calibration conversion factors FADC2Phe
+  MCalibrationChargeBlindPix fCalibrationBlindPix;         // Calibration from Blind Pixel
+  MCalibrationChargePINDiode fCalibrationPINDiode;         // Calibration from PIN Diode
+  MCalibrationQECam          fQECam;                       // Quantum efficiency, can be set from previous runs
+  MCalibrationRelTimeCam     fRelTimeCam;                  // Calibration constants rel. times
 
   MCalibrationCam::PulserColor_t fColor;                   // Colour of the pulsed LEDs