Changeset 6457 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/14/05 14:01:35 (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

@@ -477 +477 @@
 
     MFTriggerPattern        fcalib("CalibFilter");
+    fcalib.RequireCalibration();
+
     MCalibrationChargeCalc  chcalc;
     MCalibrationRelTimeCalc recalc;
     MCalibCalcFromPast      pacalc;
-
-    fcalib.RequireCalibration();
-    //    fcalib.SetInverted();
+    chcalc.SetOutputFile("");
+    recalc.SetOutputFile("");
 
     pinext.SetPedestals(&pedcamab);
@@ -508 +509 @@
     filhil.SetBit(MFillH::kDoNotDisplay);
 
-    MCalibrateRelTimes     caltm;
-    MBadPixelsCalc         bpcal;
-    MBadPixelsTreat        treat;
+    MCalibrateRelTimes caltm;
+    MBadPixelsCalc     bpcal;
+    MBadPixelsTreat    treat;
 
     bpcal.SetNamePedPhotCam("MPedPhotFromExtractor");
@@ -519 +520 @@
         treat.SetProcessTimes(kFALSE);
 
-
-    MHCamEvent evt0(0, "PedFLG",      "Fundamental Pedestal from Lo Gain;;P [cnts/sl]");
-    MHCamEvent evt1(2, "PedRmsFLG",   "RMS from Extractor applied to ped.;;\\sigma_{p} [cnts/sl]");
-    MHCamEvent evt2(0, "Extra'd",     "Extracted Signal;;S [cnts/sl]");
-    //    MHCamEvent evt3(4, "PedPhot",     "Calibrated Pedestal;;P [phe]");
-    MHCamEvent evt4(5, "PedRMS",      "Calibrated RMS from Extractor applied to ped.;;\\sigma_{p} [phe]");
-    MHCamEvent evt5(3, "Interp'd",    "Interpolated Signal;;S [phe]");
-    MHCamEvent evt6(2, "Unsuitable",  "Fraction of unsuitable events per Pixel;;[1]");
-    MHCamEvent evt7(0, "Times",       "Arrival Time;;T [fadc sl]");
-    MHCamEvent evt8(0, "Conv",        "Calibration Conv. Factors;;[phe/fadc cnts]");
+    MHCamEvent evt0(0, "PedFLG",     "Fundamental Pedestal from Lo Gain;;P [cnts/sl]");
+    MHCamEvent evt1(2, "PedRmsFLG",  "RMS from Extractor applied to ped.;;\\sigma_{p} [cnts/sl]");
+    MHCamEvent evt2(0, "Extra'd",    "Extracted Signal;;S [cnts/sl]");
+    // MHCamEvent evt3(4, "PedPhot",    "Calibrated Pedestal;;P [phe]");
+    MHCamEvent evt4(5, "PedRMS",     "Calibrated RMS from Extractor applied to ped.;;\\sigma_{p} [phe]");
+    MHCamEvent evt5(0, "Interp'd",   "Interpolated Signal;;S [phe]");
+    MHCamEvent evt6(2, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]");
+    MHCamEvent evt7(0, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
+    MHCamEvent evt8(2, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
 
     evt0.EnableSqrtVariance();