Changeset 11954 for trunk

Timestamp:

09/02/11 15:30:50 (13 years ago)

Author:

tbretz

Message:

Use enums from namespace BIAS; display channel in ADC histogram

File:

• trunk/FACT++/gui/FactGui.h (modified) (3 diffs)

trunk/FACT++/gui/FactGui.h

@@ -19 +19 @@
 #include "src/HeadersFTM.h"
 #include "src/HeadersFAD.h"
+#include "src/HeadersBIAS.h"
 #include "src/DimNetwork.h"
 #include "src/tools.h"
@@ -1406 +1407 @@
 
         ostringstream str;
-        str << "EventNum = " << fEventData->EventNum;
+        str << "CH = " << fAdcCrate->value() << '|' << fAdcBoard->value() << '|' << fAdcChip->value() << '|' << fAdcChannel->value() << " (" << p << ")";
+        str << "   EventNum = " << fEventData->EventNum;
         str << "   TriggerNum = " << fEventData->TriggerNum;
         str << "   TriggerType = " << fEventData->TriggerType;
@@ -2656 +2658 @@
             if (s.index<1) // No Dim connection
                 SetLedColor(fStatusBiasLed, kLedGray, time);
-            if (s.index==1) // Dim connection / FTM disconnected
+            if (s.index==BIAS::kDisconnected) // Dim connection / FTM disconnected
                 SetLedColor(fStatusBiasLed, kLedRed, time);
-            if (s.index==2 || s.index==3) // Connecting / Initializing
+            if (s.index==BIAS::kConnecting || s.index==BIAS::kInitializing) // Connecting / Initializing
                 SetLedColor(fStatusBiasLed, kLedOrange, time);
-            if (s.index==4) // Connected
+            if (s.index==BIAS::kConnected) // Connected
                 SetLedColor(fStatusBiasLed, kLedYellow, time);
-            if (s.index==5) // Ramping
+            if (s.index==BIAS::kRamping) // Ramping
                 SetLedColor(fStatusBiasLed, kLedWarn, time);
-            if (s.index==6) // Over current
+            if (s.index==BIAS::kOverCurrent) // Over current
                 SetLedColor(fStatusBiasLed, kLedWarnBorder, time);
-            if (s.index==7) // At reference
+            if (s.index==BIAS::kAtReference) // At reference
                 SetLedColor(fStatusBiasLed, kLedGreen, time);
-            if (s.index==8) // ExpertMode
+            if (s.index==BIAS::kExpertMode) // ExpertMode
                 SetLedColor(fStatusBiasLed, kLedWarnTriangleBorder, time);