Changeset 8414 for trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

Timestamp:

04/18/07 14:34:45 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -68 +68 @@
 #include "MCalibrationRelTimeCalc.h"
 
+#include "MCalibConstCam.h"
 #include "MCalibrationIntensityChargeCam.h"
 #include "MCalibrationIntensityBlindCam.h"
 #include "MCalibrationIntensityRelTimeCam.h"
 #include "MCalibrationIntensityQECam.h"
-#include "MCalibrationIntensityConstCam.h"
 #include "MBadPixelsIntensityCam.h"
 
@@ -261 +261 @@
     MCalibrationIntensityBlindCam       iblcam;
     MCalibrationIntensityRelTimeCam     itmcam;
-    MCalibrationIntensityConstCam       icncam;
     MBadPixelsIntensityCam              ibdcam;
 
@@ -293 +292 @@
         interlacedcont.Add(&itmcam);
         interlacedcont.Add(&ibdcam);
-        interlacedcont.Add(&icncam);
         interlacedcont.Add(&hchacam);
         if (IsUseBlindPixel())
@@ -357 +355 @@
 
     // This is necessary for the case in which it is not in the files
+    MCalibConstCam constcam;
+
     MBadPixelsCam badcam;
-    icncam.SetBadPixels(&badpix);
+    constcam.SetBadPixels(&badpix);
 
     // Setup Parlist
@@ -364 +364 @@
     plist.AddToList(this); // take care of fDisplay!
     plist.AddToList(&badcam);
+    plist.AddToList(&constcam);
     //plist.AddToList(&hilcam);
     plist.AddToList(&calibcont);       // Using AddToList(TObjArray *)
@@ -628 +629 @@
     MFillH fill6(&evt6, "MBadPixelsCam",                 "FillUnsuitable");
     // MFillH fill7(&evt7, "MSignalCam",                    "FillTimes");
-    MFillH fill8(&evt8, "MCalibrationIntensityConstCam", "FillConv");
+    MFillH fill8(&evt8, "MCalibConstCam",                "FillConv");
     MFillH fill9(&evt9, "MSignalCam",                    "FillPulse");
     MFillH fillR(&evtR, "MExtractedSignalCam",           "FillHiLoCal");
@@ -800 +801 @@
      tlist2.AddToList(&fillC);
 
-     tlist2.AddToList(&fillP);
+     //tlist2.AddToList(&fillP);
      */