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

Timestamp:

04/27/07 11:05:11 (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

@@ -69 +69 @@
 
 #include "MCalibConstCam.h"
-#include "MCalibrationIntensityChargeCam.h"
 
 #include "MHCalibrationChargeCam.h"
@@ -125 +124 @@
 //
 MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
-    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE), fIsMovieMode(kFALSE)
+    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kTRUE), fIsMovieMode(kFALSE)
 {
     fName  = name  ? name  : "MJCalibrateSignal";
@@ -250 +249 @@
 
     // Read File
-    MCalibrationIntensityChargeCam      ichcam;
-
     MHCalibrationChargeCam      hchacam;
     MHCalibrationChargeBlindCam hbndcam;
@@ -276 +273 @@
     if (fIsInterlaced)
     {
-        interlacedcont.Add(&ichcam);
         interlacedcont.Add(&hchacam);
         if (IsUseBlindPixel())
@@ -531 +527 @@
 
     MCalibrationChargeCalc  chcalc;
+    chcalc.SetContinousCalibration();
     chcalc.SetExtractor(extractor3);
 
@@ -546 +543 @@
 
     //
-    // Intensity Calibration histogramming
+    // Calibration histogramming
     //
     MFillH filpin(&hpndiod, "MExtractedSignalPINDiode",   "FillPINDiode");
@@ -695 +692 @@
     tlist3.SetFilter(&fcalib);
 
-    //MFDataPhrase filcalco("MCalibrationIntensityConstCam.IsReadyToSave>0.5", "CalibConstFilter");
+    //MFDataPhrase filcalco("MCalibrationConstCam.IsReadyToSave>0.5", "CalibConstFilter");
     if (fIsInterlaced)
     {