Changeset 5035

Timestamp:

09/15/04 16:55:52 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -70 +70 @@
 #include "MReadMarsFile.h"
 #include "MGeomApply.h"
+#include "MMcPedestalCopy.h"
 #include "MPointingPosCalc.h"
 #include "MPedCalcFromLoGain.h"
@@ -235 +236 @@
         return kFALSE;
 
-    badpix.Print();
-
     *fLog << all;
     if (extractor1)
@@ -293 +292 @@
     MBadPixelsMerge        merge(&badpix);
     MPedCalcFromLoGain     pedlo;
+    MMcPedestalCopy        pcopy;
     //MExtractSlidingWindow  extsignal;
     MTaskEnv taskenv1("ExtractSignal");
@@ -300 +300 @@
     taskenv2.SetDefault(extractor2);
     MCalibrateData         calib;
+    if (ismc)
+        calib.SetCalibrationMode(MCalibrateData::kFfactor);
     MCalibrateRelTimes     caltm;
     MBadPixelsCalc         bpcal;
@@ -369 +371 @@
     tlist2.AddToList(&apply);
     tlist2.AddToList(&merge);
-    tlist2.AddToList(&pedlo);
+    tlist2.AddToList(ismc ? (MTask*)&pcopy : (MTask*)&pedlo);
     tlist2.AddToList(&fill0);
     if (extractor1)