Changeset 4112 for experimental/components/DataComparator/DataComparator.cpp

Timestamp:

06/04/07 12:12:38 (6 years ago)

Author:

jgaeddert

Message:

changing DataComparator component to comply with control port changes in r4106

Files:

• experimental/components/DataComparator/DataComparator.cpp (modified) (3 diffs)

experimental/components/DataComparator/DataComparator.cpp

@@ -27 +27 @@
 #include "DataComparator.h"
 
-#define LOGGING
+#undef LOGGING
 
 #ifdef LOGGING
@@ -168 +168 @@
 #endif
 
-    unsigned int i, N, num_errors;
+    unsigned int i, N, num_errors, num_total_errors(0);
     unsigned int packet_id(0), prev_packet_id(0);
     signed int packet_index_diff(0);
@@ -199 +199 @@
         DEBUG(7, DataComparator, "received " << M << " control samples")
 
-        if ( N != packet_length )
-        {
+        // Release input buffers
+        dataIn_0->bufferEmptied();
+        dataIn_1->bufferEmptied();
+
+        if ( N != packet_length ) {
             DEBUG(1, DataComparator, "WARNING: data packet sizes do not match")
         }
-        if ( M != control_data_length )
-        {
+
+        if ( M != 1 ) {
             DEBUG(1, DataComparator, "WARNING: control packet sizes do not match")
         }
+        packet_id = (*control_bits_in)[0];
+        DEBUG(5, DataComparator, "packet id : " << packet_id);
+
+        if ( first_packet )
+            first_packet = false;
         else
         {
-            // compare control data
-            if ( true )
-            {
-                packet_id = 0;
-               // std::cout << "DataComparator: control: ";
-                /*
-                for (i=0; i<M; i++)
-                    std::cout << " " << (int) (*control_bits_in)[i];
-                std::cout << std::endl;
-                */
-
-                // control data represent a 5-bit packet ID, viz
-                //   packet_id = [b4 b3 b2 b1 b0]
-                // repeated 3 timesl; take best of 3 bits
-
-                packet_id |= ( (
-                    (*control_bits_in)[0] +
-                    (*control_bits_in)[5] +
-                    (*control_bits_in)[10]
-                ) >= 2 ) ? 0x0001 : 0x0000;
-                packet_id <<= 1;
-
-                packet_id |= ( (
-                    (*control_bits_in)[1] +
-                    (*control_bits_in)[6] +
-                    (*control_bits_in)[11]
-                ) >= 2 ) ? 0x0001 : 0x0000;
-                packet_id <<= 1;
-
-                packet_id |= ( (
-                    (*control_bits_in)[2] +
-                    (*control_bits_in)[7] +
-                    (*control_bits_in)[12]
-                ) >= 2 ) ? 0x0001 : 0x0000;
-                packet_id <<= 1;
-
-                packet_id |= ( (
-                    (*control_bits_in)[3] +
-                    (*control_bits_in)[8] +
-                    (*control_bits_in)[13]
-                ) >= 2 ) ? 0x0001 : 0x0000;
-                packet_id <<= 1;
-
-                packet_id |= ( (
-                    (*control_bits_in)[4] +
-                    (*control_bits_in)[9] +
-                    (*control_bits_in)[14]
-                ) > 2 ) ? 0x0001 : 0x0000;
-
-                DEBUG(5, DataComparator, "packet id : " << packet_id);
-
-                if ( first_packet )
-                    first_packet = false;
-                else
-                {
-                    // determine if packets have been dropped
-                    if ( packet_id == 0 )
-                        packet_index_diff = 31 - prev_packet_id;
-                    else
-                        packet_index_diff = packet_id - prev_packet_id - 1;
-
-                    while (packet_index_diff<0)
-                        packet_index_diff += 31;
-
-                    num_dropped_packets += (unsigned int) packet_index_diff;
-                }
-
-                num_received_packets++;
-                prev_packet_id = packet_id;
+            // determine if packets have been dropped
+            if ( packet_id == 0 )
+                packet_index_diff = 127 - prev_packet_id;
+            else
+                packet_index_diff = packet_id - prev_packet_id - 1;
+
+            while (packet_index_diff<0)
+                packet_index_diff += 127;
+
+            num_dropped_packets += (unsigned int) packet_index_diff;
+        }
+
+        num_received_packets++;
+        prev_packet_id = packet_id;
                 
-            }
-            num_errors = 0;
-
-            // compare data values
-            for (i=0; i<N; i++)
-                num_errors += ( (signed char) (*data_bits_in)[i]==packet_tmp[i])
-                    ? 0 : 1;
-
-            DEBUG(2, DataComparator, "data errors : " << num_errors << " / " << N)
-
-            if ( (num_received_packets+num_dropped_packets) >= num_packets_to_observe )
-            {
-                DEBUG(1, DataComparator, "------------------ dropped packets : " << num_dropped_packets << " / " << num_received_packets + num_dropped_packets)
-                num_received_packets = 0;
-                num_dropped_packets = 0;
-            }
-#ifdef LOGGING
-            if ( log_size_counter < LOG_SIZE_MAX )
-            {
-                packet_log << packet_id << " " << num_errors << std::endl;
-                log_size_counter++;
-            }
-#endif
-        }
-        dataIn_0->bufferEmptied();
-        dataIn_1->bufferEmptied();
+        num_errors = 0;
+
+        // compare data values
+        for (i=0; i<N; i++) {
+            if ( (signed char) (*data_bits_in)[i] != packet_tmp[i] )
+                num_errors += 1;
+        }
+
+        DEBUG(2, DataComparator, "data errors [" << packet_id << "] : " << num_errors << " / " << N)
+
+        if ( (num_received_packets+num_dropped_packets) >= num_packets_to_observe ) {
+            DEBUG(1, DataComparator, "------------------ dropped packets : " << num_dropped_packets << " / " << num_received_packets + num_dropped_packets)
+            num_total_errors += num_errors;
+            DEBUG(1, DataComparator, "------------------      error rate : " << float(num_total_errors)/float(num_received_packets) << " %")
+            num_received_packets = 0;
+            num_dropped_packets = 0;
+            num_total_errors = 0;
+        }
+
+#ifdef LOGGING
+        if ( log_size_counter < LOG_SIZE_MAX )
+        {
+            packet_log << packet_id << " " << num_errors << std::endl;
+            log_size_counter++;
+        }
+#endif
     }
 #ifdef LOGGING