Changeset 13194

Timestamp:

03/23/12 11:21:51 (13 years ago)

Author:

tbretz

Message:

Updated some dim descriptions; suppress unecessary output by default.

File:

• trunk/FACT++/src/fscctrl.cc (modified) (3 diffs)

trunk/FACT++/src/fscctrl.cc

@@ -534 +534 @@
          */
 
-        for (size_t i=0; i<resist.size(); i++)
-            if (resist[i]>800 && resist[i]<2000)
-                cout << setw(2) << i << " - " << setw(4) << (int)resist[i] << ": " << setprecision(1) << fixed << GetTempPT1000(resist[i]) << endl;
-        else
-                cout << setw(2) << i << " - " << setw(4) << (int)resist[i] << ": " << "----" << endl;
+        if (fIsVerbose)
+        {
+            for (size_t i=0; i<resist.size(); i++)
+                if (resist[i]>800 && resist[i]<2000)
+                    Out() << setw(2) << i << " - " << setw(4) << (int)resist[i] << ": " << setprecision(1) << fixed << GetTempPT1000(resist[i]) << endl;
+                else
+                    Out() << setw(2) << i << " - " << setw(4) << (int)resist[i] << ": " << "----" << endl;
+        }
 
         UpdateTemp(time, temperatures);
@@ -660 +663 @@
     }
 
+    
+
 public:
     ConnectionDimFSC(ba::io_service& ioservice, MessageImp &imp) :
@@ -666 +671 @@
                     "|t[s]:FSC uptime"
                     "|T_sens[deg C]:Sensor compartment temperatures"
-                    "|T_crate[deg C]:Temperatures crate 0 (back/front), 1 (back/front), 2 (back/front), 3 (back/front)"
-                    "|T_ps[deg C]:Temperatures power supplies crate 0 (back/front), 1 (back/front), 2 (back/front), 3 (back/front)"
-                    "|T_aux[deg C]:Auxiliary power supply temperatures FTM (top/bottom), FSC (top/bottom)"
+                    "|T_crate[deg C]:Temperatures crate 0 (back/front), 1 (b/f), 2 (b/f), 3 (b/f)"
+                     "|T_ps[deg C]:Temp power supplies crate 0 (back/front), 1, 2, 3"
+                    "|T_aux[deg C]:Auxiliary power supply temperatures FTM (top/bottom), FSC (t/b)"
                     "|T_back[deg C]:FTM backpanel temperatures FTM (top/bottom), FSC (top/bottom)"
-                    "|T_eth[deg C]:Ethernet switches temperatures top (front/back), bottom (front/back)"),
+                    "|T_eth[deg C]:Ethernet switches temperatures top (front/back), bottom (f/b)"),
         fDimHum    ("FSC_CONTROL/HUMIDITY", "F:1;F:4",
                     "|t[s]:FSC uptime"