Changeset 5560 for trunk/MagicSoft/Mars/mjobs

Timestamp:

12/06/04 12:55:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1658 +1658 @@
     fillcam.SetBit(MFillH::kDoNotDisplay);
     filltme.SetBit(MFillH::kDoNotDisplay);
-/*
-
-     fillpin.SetNameTab("PINDiode");
-     fillbnd.SetNameTab("BlindPix");
-     fillcam.SetNameTab("Charge");
-     filltme.SetNameTab("RelTimes");
-
-     TString drawoption;
-
-    if (fDisplayType == kDataCheckDisplay)
-        drawoption += "datacheck";
-    if (fDisplayType == kFullDisplay)
-        drawoption += "all";
-
-    fillcam.SetDrawOption(drawoption.Data());
-    fillbnd.SetDrawOption(drawoption.Data());
-    fillpin.SetDrawOption(drawoption.Data());
-    filltme.SetDrawOption(drawoption.Data());
-  */
+
     //
     // Set default extractors in case, none has been set...
@@ -1695 +1677 @@
         else
         {
-            *fLog << warn;
+            *fLog << err << GetDescriptor() << "ERROR - ";
             *fLog << "Used Extractor derives from MExtractTimeAndCharge, " << endl;
             *fLog << "but MExtractorCam size " << fExtractorCam.GetSize() << " ";
             *fLog << "mismatch pedcam size " << pedcam.GetSize() << "! " << endl;
+            return kFALSE;
         }
     }
 
+    //
+    // Switch off noise calculation
+    //
+    fExtractor->SetNoiseCalculation(kFALSE);
+    fTimeExtractor->SetNoiseCalculation(kFALSE);
+
+    //
+    // Setup more tasks and tasklist
+    //
     MTaskEnv taskenv("ExtractSignal");
     taskenv.SetDefault(fExtractor);