Changeset 3725 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/13/04 20:03:32 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

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

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -66 +66 @@
 
 #include "MPedestalCam.h"
+#include "MCalibrationCam.h"
 #include "MCalibrationQECam.h"
 #include "MCalibrationChargeCam.h"
@@ -95 +96 @@
 // Default constructor. 
 //
-// Sets fRuns to 0
-//
-MJCalibration::MJCalibration(const char *name, const char *title) : fRuns(0)
-{
-    fName  = name  ? name  : "MJCalibration";
-    fTitle = title ? title : "Tool to create a pedestal file (MPedestalCam)";
+// Sets fRuns to 0, fColor to kNONE
+//
+MJCalibration::MJCalibration(const char *name, const char *title) 
+    : fRuns(0), fColor(MCalibrationCam::kNONE)
+{
+  fName  = name  ? name  : "MJCalibration";
+  fTitle = title ? title : "Tool to create a pedestal file (MPedestalCam)";
+
 }
 
@@ -719 +722 @@
     MExtractSignal2          extract;
     MCalibrationChargeCalc   calcalc;
-    calcalc.SetPulserColor(MCalibrationCam::kCT1);
+
+    // 
+    // As long as there are no DM's, have to colour by hand 
+    //
+    calcalc.SetPulserColor(fColor);
 
     MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -29 +29 @@
   MCalibrationQECam     fQECam;                            // Quantum efficiency, can be set from previous runs
   MBadPixelsCam         fBadPixels;                        // Bad Pixels cam, can be set from previous runs
+
+  MCalibrationCam::PulserColor_t fColor;                   // Colour of the pulsed LEDs
   
   void DrawProjection   ( MHCamera *obj, Int_t fit) const; // Draw projection of pixels values
@@ -53 +55 @@
   void SetBadPixels(const MBadPixelsCam &bad)    { bad.Copy(fBadPixels);   }
   void SetQECam    (const MCalibrationQECam &qe) { qe.Copy(fQECam);        }    
+  void SetColor    (const MCalibrationCam::PulserColor_t color) { fColor = color;   }
   
   Bool_t ReadCalibrationCam();