Merge branch 'ATR20569-mc16a' into '21.0-mc16a'

Bug fix for incorrect BCID from L1Muon Endcap to MuCTPI in MC 21.0-mc16a (ATR-20569)

See merge request !39433

Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx

@@ -621,7 +621,10 @@ void LVL1TGCTrigger::FillSectorLogicData(LVL1MUONIF::Lvl1MuSectorLogicData *slda
   int Zdir= (subsystem==LVL1MUONIF::Lvl1MuCTPIInput::idSideA() ? 1 : -1);
 
   sldata->clear2candidatesInSector();// for temporary
-  sldata->bcid(0);
+
+  const int muctpiBcId_offset = TgcDigit::BC_CURRENT;
+  sldata->bcid(m_bctagInProcess - muctpiBcId_offset);
+
   if ((selectorOut->getNCandidate()) >= 1) {
     sldata->roi(0,((selectorOut->getR(0))<<2)+(selectorOut->getPhi(0)));
     //      ovl --> veto