Changeset 6194

Timestamp:

02/02/05 11:45:54 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -491 +491 @@
   MTriggerPatternDecode decode;
   MFTriggerPattern      fcalib;
-  fcalib.DenyCalibration();
+  fcalib.RequireCalibration();
+  fcalib.SetInverted();
   MContinue conttp(&fcalib, "ContTrigPattern");
 
@@ -511 +512 @@
       taskenv1.SetDefault(extractor1);
     }
-  if (fTimeExtractor)
+
+  if (extractor2)
     {
       fTimeExtractor->SetPedestals(&pedcam);
       taskenv2.SetDefault(fTimeExtractor);
     }
-  else
+  else if (!(extractor1->InheritsFrom("MExtractTimeAndCharge")))
     {
       extrsw.SetPedestals(&pedcam);
@@ -538 +540 @@
       photcalc.AddPedestal("Fundamental");
       photcalc.SetPedestalFlag(MCalibrateData::kEvent);
-      photcalc.SetSignalType(MCalibrateData::kPhot);
+      photcalc.SetSignalType(MCalibrateData::kPhe);
     }
 
@@ -582 +584 @@
   if (!extractor1->InheritsFrom("MExtractTimeAndCharge"))
     tlist.AddToList(&taskenv2);
+
   tlist.AddToList(&contcos);
   tlist.AddToList(&fill0);