Changeset 5809 for trunk/MagicSoft

Timestamp:

01/12/05 13:59:54 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MEvtLoop.h (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -54 +54 @@
     MStatusDisplay *GetDisplay() { return fDisplay; }
     void SetDisplay(MStatusDisplay *d);
-    void SetPrivateDisplay(Bool_t b=kTRUE) { b ? SetBit(kPrivateDisplay) : ResetBit(kPrivateDisplay); }
+    void SetPrivateDisplay(Bool_t b=kTRUE) { b ? SetBit(kPrivateDisplay) : ResetBit(kPrivateDisplay); } // Prevent status display from being cascaded in PreProcess
 
     void SetOwner(Bool_t enable=kTRUE);

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -419 +419 @@
     MHCamEvent evt1(2, "PedRmsFLG",   "Pedestal RMS from Lo Gain;;\\sigma_{p} [fadc/sl]");
     MHCamEvent evt2(0, "Extra'd",     "Extracted Signal;;S [fadc/sl]");
-    MHCamEvent evt3(0, "PedPhot",     "Calibrated Pedestal;;P [\\gamma]");
-    MHCamEvent evt4(1, "PedRMS",      "Calibrated Pedestal RMS;;\\sigma_{p} [\\gamma]");
+    MHCamEvent evt3(4, "PedPhot",     "Calibrated Pedestal;;P [\\gamma]");
+    MHCamEvent evt4(5, "PedRMS",      "Calibrated Pedestal RMS;;\\sigma_{p} [\\gamma]");
     MHCamEvent evt5(0, "Interp'd",    "Interpolated Signal;;S [\\gamma]");
     MHCamEvent evt6(2, "Unsuitable",  "Unsuitable event ratio;;%");
@@ -510 +510 @@
     tlist2.AddToList(&calib);
     tlist2.AddToList(&caltm);
-    tlist2.AddToList(&fill3);
     tlist2.AddToList(&bpcal);
     tlist2.AddToList(&treat);
+    tlist2.AddToList(&fill6);
+    tlist2.AddToList(&fill3);
     tlist2.AddToList(&fill4);
     tlist2.AddToList(&fill5);
-    tlist2.AddToList(&fill6);
     tlist2.AddToList(&fill7);