Changeset 11197

Timestamp:

06/27/11 15:03:32 (13 years ago)

Author:

tbretz

Message:

Changed the fStatus2 array to support also an 'all diconnected but switched on' state.

File:

• trunk/FACT++/src/fadctrl.cc (modified) (6 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -191 +191 @@
             UpdateEventHeader();
 
-            EventBuilderWrapper::This->debugHead(fSlot*40, fEventHeader);
+            EventBuilderWrapper::This->debugHead(fSlot*7, fEventHeader);
 
             fBuffer.resize(fEventHeader.fPackageLength-sizeof(FAD::EventHeader)/2);
@@ -1052 +1052 @@
             {
             case 0:  str << "1-7:not connected)"; break;
-            case 7:  str << "1-7:connected)";     break;
-            default: str << "1-7:connecting [" << (int)fStatus2[idx] << "])"; break;
+            case 8:  str << "1-7:connected)";     break;
+            default: str << "1-7:connecting [" << (int)(fStatus2[idx]-1) << "])"; break;
             }
 
@@ -1059 +1059 @@
                 str << " [cmd_blocked]";
 
-            if (fStatus2[idx]==7 && IsIgnored(idx))
+            if (fStatus2[idx]==8 && IsIgnored(idx))
                 str << " [data_ignored]";
 
@@ -1135 +1135 @@
             return T::GetCurrentState();
 
-        const bool enable = it->second->IsDisconnected() && fStatus2[slot]==0;
+        const bool enable = it->second->IsDisconnected();
 
         EnableConnection(it->second, enable);
@@ -1234 +1234 @@
 
             if (IsConnecting(idx))
+            {
                 nconnecting2++;
+                stat2[idx]++;
+            }
 
             if (IsConnected(idx))
+            {
+                stat2[idx]++;
                 nconnected2++;
+            }
         }
 
@@ -1300 +1306 @@
 
         for (int i=0; i<40; i++)
-            stat[i] = stat1[i]+stat2[i];
+            stat[i] = stat1[i]|(stat2[i]<<3);
 
         stat[40] = thread;