Changeset 5601 for trunk/MagicSoft/Mars/mjobs

Timestamp:

12/15/04 10:25:49 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -320 +320 @@
     MBadPixelsMerge        merge(&badpix);
 
-    MPedCalcFromLoGain     pedlo1("MPedCalcFromLoGainAB");
+    MPedCalcFromLoGain     pedlo1("MPedCalcMeanFromLoGain");
     pedlo1.SetPedestalUpdate(kTRUE);
     pedlo1.SetPedestalsOut(&pedcamab);
 
-    MPedCalcFromLoGain     pedlo2;
+    MPedCalcFromLoGain     pedlo2("MPedCalcRmsFromLoGain");
     pedlo2.SetPedestalUpdate(kTRUE);
     pedlo2.SetPedestalsIn(&pedcamab);
@@ -336 +336 @@
 
         if (extractor1->InheritsFrom("MExtractTimeAndCharge"))
+        {
             pedlo2.SetExtractor((MExtractTimeAndCharge*)extractor1);
+            extractor1->SetPedestals(&pedcamab);
+        }
     }
 
@@ -345 +348 @@
     taskenv2.SetDefault(extractor2);
     MCalibrateData         calib;
-    if (filetype==3)
+    if (filetype==3) // MC file
     {
         calib.SetCalibrationMode(MCalibrateData::kFfactor);