RichRawBankDecoder - Use private instances of decoding derived condition helpers

Rich/RichFutureDAQ/src/component/RichRawBankDecoder.cpp

@@ -129,8 +129,8 @@ namespace Rich::Future {
                                                                            LHCb::RawEventLocation::Default} )},
                         // conditions input
                         KeyValue{"DeRichSystem", DeRichLocations::RichSystem},
-                        KeyValue{"Tel40CableMapping", Tel40CableMapping::DefaultConditionKey},
-                        KeyValue{"PDMDBDecodeMapping", PDMDBDecodeMapping::DefaultConditionKey}},
+                        KeyValue{"Tel40CableMapping", name + "-" + Tel40CableMapping::DefaultConditionKey},
+                        KeyValue{"PDMDBDecodeMapping", name + "-" + PDMDBDecodeMapping::DefaultConditionKey}},
                        // output data
                        {KeyValue{"DecodedDataLocation", DecodedDataLocation::Default}} ) {}
 
@@ -411,8 +411,8 @@ void RawBankDecoder::decodeToSmartIDs_MaPMT1( const LHCb::RawBank& bank,
 
         // check MSB for this word
         const auto isNZS = isBitOn<NDataBits - 1>( *dataW );
-        daq_verbo( "  -> NZS=", isNZS, " iW=", iW, " gW=", iW + ( dataW - bankStart ), //
-                   " ", boost::format( "%02X" ) % (int)( *dataW ),                     //
+        daq_verbo( "  -> NZS=", isNZS, " iW=", iW, " gW=", ( dataW - bankStart ), //
+                   " ", boost::format( "%02X" ) % (int)( *dataW ),                //
                    "(", std::bitset<NDataBits>( *dataW ), ")", endmsg );
 
         if ( LIKELY( !isNZS ) ) {