[MCH] added detection of mis-placed SYNC packet

Author: aferrero2707

Detectors/MUON/MCH/Raw/Decoder/include/MCHRawDecoder/ErrorCodes.h

@@ -31,11 +31,12 @@ enum ErrorCodes {
   ErrorBadClusterSize = 1 << 6,              // 64
   ErrorBadIncompleteWord = 1 << 7,           // 128
   ErrorTruncatedData = 1 << 8,               // 256
-  ErrorBadELinkID = 1 << 9,                  // 512
-  ErrorBadLinkID = 1 << 10,                  // 1024
-  ErrorUnknownLinkID = 1 << 11,              // 2048
-  ErrorBadHBTime = 1 << 12,                  // 4096
-  ErrorNonRecoverableDecodingError = 1 << 13 // 8192
+  ErrorUnexpectedSyncPacket = 1 << 9,        // 512
+  ErrorBadELinkID = 1 << 10,                 // 1024
+  ErrorBadLinkID = 1 << 11,                  // 2048
+  ErrorUnknownLinkID = 1 << 12,              // 4096
+  ErrorBadHBTime = 1 << 13,                  // 8192
+  ErrorNonRecoverableDecodingError = 1 << 14 // 16384
 };
 
 uint32_t getErrorCodesSize();

Detectors/MUON/MCH/Raw/Decoder/src/ErrorCodes.cxx

@@ -20,7 +20,7 @@ namespace raw
 
 uint32_t getErrorCodesSize()
 {
-  return 14;
+  return 15;
 }
 
 void append(const char* msg, std::string& to)
@@ -52,6 +52,9 @@ std::string errorCodeAsString(uint32_t ec)
   if (ec & ErrorBadSyncPacket) {
     append("Bad Sync Packet", msg);
   }
+  if (ec & ErrorUnexpectedSyncPacket) {
+    append("Unexpected Sync", msg);
+  }
   if (ec & ErrorBadHeartBeatPacket) {
     append("Bad HB Packet", msg);
   }

Detectors/MUON/MCH/Raw/Decoder/src/UserLogicElinkDecoder.cxx

@@ -51,6 +51,12 @@ bool UserLogicElinkDecoder<SampleMode>::checkDataHeader()
     return false;
   }
 
+  // we expect at least 3 10-bit words
+  int nof10BitWords = mSampaHeader.nof10BitWords();
+  if (nof10BitWords <= 2) {
+    return false;
+  }
+
   return true;
 }
 
@@ -67,8 +73,12 @@ bool UserLogicElinkDecoder<ChargeSumMode>::checkDataHeader()
     return false;
   }
 
-  // in cluster sum mode the number of 10-bit words must be a multiple of 4
+  // we expect at least 3 10-bit words
   int nof10BitWords = mSampaHeader.nof10BitWords();
+  if (nof10BitWords <= 2) {
+    return false;
+  }
+  // in cluster sum mode the number of 10-bit words must be a multiple of 4
   if ((nof10BitWords % 4) != 0) {
     return false;
   }

Detectors/MUON/MCH/Raw/Decoder/src/UserLogicElinkDecoder.h

@@ -119,10 +119,18 @@ void UserLogicElinkDecoder<CHARGESUM>::append(uint64_t data50, uint8_t error, bo
 
   if (isSync(data50)) {
 #ifdef ULDEBUG
-    debugHeader() << (*this) << fmt::format(" --> SYNC word found {:013x}\n", data50);
+    debugHeader() << (*this) << fmt::format(" --> SYNC word found {:013x}   state={}\n", data50, asString(mState));
 #endif
-    clear();
-    transition(State::WaitingHeader);
+    if (mState != State::WaitingHeader && mState != State::WaitingSync) {
+#ifdef ULDEBUG
+      debugHeader() << (*this) << " SYNC word found while decoding payload --> resetting\n"
+#endif
+      sendError(static_cast<int8_t>(mSampaHeader.chipAddress()), static_cast<uint32_t>(ErrorUnexpectedSyncPacket));
+      reset();
+    } else {
+      clear();
+      transition(State::WaitingHeader);
+    }
     return;
   }
 
@@ -179,7 +187,7 @@ bool UserLogicElinkDecoder<CHARGESUM>::append10(uint10_t data10)
 {
   bool result = false;
 #ifdef ULDEBUG
-  debugHeader() << (*this) << fmt::format(" --> data10 {:d}\n", data10);
+  debugHeader() << (*this) << fmt::format(" --> data10 {:d}  state {}\n", data10, asString(mState));
 #endif
   switch (mState) {
     case State::WaitingHeader:
@@ -276,6 +284,9 @@ std::string UserLogicElinkDecoder<CHARGESUM>::asString(State s) const
     case State::WaitingSample:
       return "WaitingSample";
       break;
+    default:
+      return "Unknown";
+      break;
   };
 }
 

Detectors/MUON/MCH/Raw/Decoder/src/testUserLogicEndpointDecoder.cxx

@@ -367,9 +367,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(SyncInTheMiddleChargeSumModeTwoChannels, V, testTy
     DsElecId{361, 6, 2}, 63, {cl1, cl2},
     DsElecId{361, 6, 2}, 47, {cl3, cl4},
     5);
-  BOOST_CHECK_EQUAL(r,
-                    "S361-J6-DS2-ch-63-ts-345-q-123456-cs-789\n"
-                    "S361-J6-DS2-ch-63-ts-346-q-789012-cs-345\n");
+  std::string r2 = "S361-J6-DS2-ch-63-ts-345-q-123456-cs-789\n";
+  r2 += "S361-J6-DS2-ch-63-ts-346-q-789012-cs-345\n";
+  r2 += fmt::format("S361-J6-DS2-chip-5-error-{}\n", ErrorUnexpectedSyncPacket);
+  BOOST_CHECK_EQUAL(r, r2);
 }
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(TestCruPageOK, V, testTypes)