diff --git a/Event/EventPacker/include/Event/PackedDataBuffer.h b/Event/EventPacker/include/Event/PackedDataBuffer.h
index 1c5311785420a2396377537ae177eae4ff00336f..21c4573849787afd1600d5df95cf0a321fc974ee 100644
--- a/Event/EventPacker/include/Event/PackedDataBuffer.h
+++ b/Event/EventPacker/include/Event/PackedDataBuffer.h
@@ -272,6 +272,8 @@ namespace LHCb::Hlt::PackedData {
bool compress( Compression compression, int level, ByteBuffer::buffer_type& output ) const {
return m_buffer.compress( compression, level, output );
}
+ std::uint32_t key() { return m_key; }
+
/// Reserve size for the buffer
void reserve( std::size_t size ) { m_buffer.reserve( size ); }
/// Function called by serializable objects' save method.
@@ -302,9 +304,16 @@ namespace LHCb::Hlt::PackedData {
m_buffer.write( x, pos );
}
/// Add byte buffer of a packed data buffer to another one
- void addBuffer( PackedDataOutBuffer const& x ) { m_buffer.writeBuffer( x.m_buffer ); }
- /// Add a byte buffer to a packed data buffer
- void addBuffer( ByteBuffer const& x ) { m_buffer.writeBuffer( x ); }
+ void addBuffer( PackedDataOutBuffer const& x ) {
+ // if empty, inherit value from x. If not empty, require to be the same
+ if ( x.m_key != m_key ) {
+ if ( m_key != 0 || m_buffer.size() != 0 || m_buffer.pos() != 0 ) {
+ throw std::runtime_error( "PackedDataInBuffer: merging buffers with distinct keys" );
+ }
+ m_key = x.m_key;
+ }
+ m_buffer.writeBuffer( x.m_buffer );
+ }
/// Save a size integer.
std::pair<std::size_t, std::size_t> saveSize( std::size_t x ) { return save<uint32_t>( x ); }
/// Save a vector of scalars.
@@ -339,7 +348,8 @@ namespace LHCb::Hlt::PackedData {
}
private:
- ByteBuffer m_buffer; ///< Internal byte buffer
+ std::uint32_t m_key = 0u; ///< key used to encode, and thus required, to decode stored strings
+ ByteBuffer m_buffer; ///< Internal byte buffer
};
/** @class PackedDataInBuffer PackedDataBuffer.h
@@ -350,19 +360,10 @@ namespace LHCb::Hlt::PackedData {
*/
class PackedDataInBuffer {
public:
- /// Return whether the end of buffer was reached.
- bool eof() const { return m_buffer.eof(); }
- /// Skip a number of bytes from the buffer.
- void skip( std::size_t n ) { m_buffer.readNull( n ); }
- /// Initialize from an existing byte buffer.
- bool init( ByteBuffer::buffer_view data, bool compressed = false ) {
- return m_buffer.init( data, compressed );
- }
- bool init( const ByteBuffer& buffer, bool compressed = false ) {
- return m_buffer.init( buffer.buffer(), compressed );
- }
+ PackedDataInBuffer( std::uint32_t key = 0 ) : m_key{key} {}
/// Initialize from an existing header and byte buffer.
- void init( const ObjectHeader header, ByteBuffer::buffer_view data ) {
+ PackedDataInBuffer( const ObjectHeader header, ByteBuffer::buffer_view data, std::uint32_t key ) {
+ m_key = key;
m_buffer.clear();
m_buffer.write( header.classID );
m_buffer.write( header.locationID );
@@ -371,6 +372,22 @@ namespace LHCb::Hlt::PackedData {
for ( auto d : data ) m_buffer.write( d );
m_buffer.reset();
}
+ /// init a byte buffer from a subset of another packed data buffer
+ PackedDataInBuffer( PackedDataInBuffer const& x, std::size_t pos, std::size_t size = -1 ) {
+ m_key = x.m_key;
+ m_buffer.assign(
+ x.m_buffer.subspan( pos, size == static_cast<std::size_t>( -1 ) ? x.m_buffer.pos() - pos : size ) );
+ }
+ /// Return whether the end of buffer was reached.
+ bool eof() const { return m_buffer.eof(); }
+ /// Skip a number of bytes from the buffer.
+ void skip( std::size_t n ) { m_buffer.readNull( n ); }
+ /// Initialize from an existing byte buffer.
+ bool init( ByteBuffer::buffer_view data, bool compressed = false ) { return m_buffer.init( data, compressed ); }
+ bool init( const ByteBuffer& buffer, bool compressed = false ) {
+ return m_buffer.init( buffer.buffer(), compressed );
+ }
+ std::uint32_t key() const { return m_key; }
/// Return a reference to the internal buffer.
const ByteBuffer& buffer() const { return m_buffer; }
/// Clear the internal byte buffer.
@@ -419,12 +436,6 @@ namespace LHCb::Hlt::PackedData {
return x;
}
- /// Add a byte buffer of a packed data buffer to another one at a given position
- void addBuffer( PackedDataInBuffer const& x, std::uint32_t p ) {
- return m_buffer.assign( x.m_buffer.subspan( p, x.m_buffer.pos() - p ) );
- }
- /// Add a byte buffer of a packed data buffer to another one at a given position
- void addBuffer( ByteBuffer const& x, std::uint32_t p ) { return m_buffer.assign( x.subspan( p, x.pos() - p ) ); }
/// Load a scalar from a given position and return it.
template <typename T>
T loadAt( std::size_t i ) const {
@@ -469,7 +480,8 @@ namespace LHCb::Hlt::PackedData {
}
private:
- ByteBuffer m_buffer; ///< Internal byte buffer
+ std::uint32_t m_key = 0; ///< key used to encode, and thus required to decode stored strings
+ ByteBuffer m_buffer; ///< Internal byte buffer
};
} // namespace LHCb::Hlt::PackedData
diff --git a/Event/EventPacker/src/component/Buffer1RelationUnpackerBaseAlg.h b/Event/EventPacker/src/component/Buffer1RelationUnpackerBaseAlg.h
index 326154b669f86cd81705b31cacb07783635d98e5..d7b1bb777e9917e7e1707e780eeab3a93eb10386 100644
--- a/Event/EventPacker/src/component/Buffer1RelationUnpackerBaseAlg.h
+++ b/Event/EventPacker/src/component/Buffer1RelationUnpackerBaseAlg.h
@@ -87,8 +87,7 @@ namespace DataPacking::Buffer {
static const Gaudi::StringKey PackedObjectLocations{"PackedObjectLocations"};
- // TODO/FIXME: look up the TCK
- const auto& map = m_annsvc->i2s( 0u, PackedObjectLocations );
+ const auto& map = m_annsvc->i2s( readBuffer.key(), PackedObjectLocations );
for ( auto id : header.linkLocationIDs ) {
auto location = map.find( id );
if ( location != std::end( map ) ) {
diff --git a/Event/EventPacker/src/component/Buffer2RelationUnpackerBaseAlg.h b/Event/EventPacker/src/component/Buffer2RelationUnpackerBaseAlg.h
index 583540032217239e1193801cf933fbb97bdadc27..622535936dda658e46b67c5bc2a9ccd3cb90ef10 100644
--- a/Event/EventPacker/src/component/Buffer2RelationUnpackerBaseAlg.h
+++ b/Event/EventPacker/src/component/Buffer2RelationUnpackerBaseAlg.h
@@ -59,8 +59,8 @@ namespace DataPacking::Buffer {
if ( !buffer.buffer().size() ) return;
- Buffer readBuffer;
- readBuffer.init( buffer.buffer(), false );
+ Buffer readBuffer{buffer}; // TODO: avoid copying just because 'pos' gets updated -- allow a 'shallow' emphemeral
+ // version which allows reading
// Sadly the pack structure expects an object with a valid RegEntry. To be improved
auto prels = RegistryWrapper<PRELATION>( m_rels.fullKey().key() + "_Packed" );
@@ -93,8 +93,7 @@ namespace DataPacking::Buffer {
static const Gaudi::StringKey PackedObjectLocations{"PackedObjectLocations"};
- // FIXME/TODO: look up the TCK
- const auto& map = m_annsvc->i2s( 0u, PackedObjectLocations );
+ const auto& map = m_annsvc->i2s( readBuffer.key(), PackedObjectLocations );
for ( auto id : header.linkLocationIDs ) {
auto location = map.find( id );
if ( location != end( map ) ) {
diff --git a/Event/EventPacker/src/component/BufferPackerBaseAlg.h b/Event/EventPacker/src/component/BufferPackerBaseAlg.h
index 9bf500987a82ec02f25221c08d0d1d47dc80187f..c85b80c6b302728f758f48ecdcb16772d8425dc1 100644
--- a/Event/EventPacker/src/component/BufferPackerBaseAlg.h
+++ b/Event/EventPacker/src/component/BufferPackerBaseAlg.h
@@ -32,6 +32,7 @@
namespace DataPacking::Buffer {
using Producer = LHCb::Algorithm::Producer<LHCb::Hlt::PackedData::PackedDataOutBuffer()>;
+ inline const Gaudi::StringKey PackedObjectLocations{"PackedObjectLocations"};
template <class PACKER>
class Pack final : public Producer {
@@ -71,9 +72,8 @@ namespace DataPacking::Buffer {
// reserve some space for data, this should be tuned
Buffer buffer;
buffer.reserve( pdata->data().size() );
- static const Gaudi::StringKey PackedObjectLocations{"PackedObjectLocations"};
- // TODO/FIXME: require TCK/key!!
- const auto& map = m_annsvc->s2i( 0u, PackedObjectLocations );
+ if ( m_encodingKey == 0 ) ++m_zero_key;
+ const auto& map = m_annsvc->s2i( m_encodingKey, PackedObjectLocations );
auto locationID = map.at( outputLocation() );
buffer.save<uint32_t>( pdata->clID() );
@@ -147,6 +147,8 @@ namespace DataPacking::Buffer {
DataObjectReadHandle<typename PACKER::DataVector> m_data{this, "InputName", PACKER::unpackedLocation()};
+ Gaudi::Property<unsigned int> m_encodingKey{this, "EncodingKey", 0u};
+
Gaudi::Property<unsigned short int> m_packingVersion{
this, "PackingVersion", (unsigned short int)PACKER::PackedDataVector::defaultPackingVersion(),
"Packing version number"};
@@ -159,6 +161,11 @@ namespace DataPacking::Buffer {
mutable Gaudi::Accumulators::StatCounter<> m_nbPackedData{this, "# PackedData"};
mutable Gaudi::Accumulators::MsgCounter<MSG::ERROR> m_unregisterError{
this, "Problem unregistering data in PackerBaseAlg", 10};
+ mutable Gaudi::Accumulators::MsgCounter<MSG::WARNING> m_zero_key{
+ this,
+ "Encoding key is zero -- this implies explicit configuration of decoding will be required.. make sure you know "
+ "how to do this, and will have the required configuration setup",
+ 10};
};
} // namespace DataPacking::Buffer
diff --git a/Event/EventPacker/src/component/BufferRelationPackerBaseAlg.h b/Event/EventPacker/src/component/BufferRelationPackerBaseAlg.h
index 155b76642b4d5e214486f2db2ecee3e3d67cdfda..099afc4cc59c2a425534abfd8328de920980ba06 100644
--- a/Event/EventPacker/src/component/BufferRelationPackerBaseAlg.h
+++ b/Event/EventPacker/src/component/BufferRelationPackerBaseAlg.h
@@ -100,8 +100,9 @@ namespace DataPacking::Buffer {
buffer.reserve( prels->data().size() );
static const Gaudi::StringKey PackedObjectLocations{"PackedObjectLocations"};
- const auto& map = m_annsvc->s2i( m_encodingKey, PackedObjectLocations );
- auto classID = prels->clID();
+ if ( m_encodingKey == 0 ) ++m_zero_key;
+ const auto& map = m_annsvc->s2i( m_encodingKey, PackedObjectLocations );
+ auto classID = prels->clID();
buffer.save<uint32_t>( classID );
buffer.save<int32_t>( map.at( outputLocation() ) );
auto* linkMgr = prels->linkMgr();
@@ -294,7 +295,12 @@ namespace DataPacking::Buffer {
Gaudi::Property<unsigned int> m_encodingKey{this, "EncodingKey", 0u};
- mutable Gaudi::Accumulators::StatCounter<> m_nbPackedData{this, "# PackedData"};
+ mutable Gaudi::Accumulators::StatCounter<> m_nbPackedData{this, "# PackedData"};
+ mutable Gaudi::Accumulators::MsgCounter<MSG::WARNING> m_zero_key{
+ this,
+ "Encoding key is zero -- this implies explicit configuration of decoding will be required.. make sure you know "
+ "how to do this, and will have the required configuration setup",
+ 10};
};
} // namespace DataPacking::Buffer
diff --git a/Event/EventPacker/src/component/BufferUnpackerBaseAlg.h b/Event/EventPacker/src/component/BufferUnpackerBaseAlg.h
index b868677625c2bca845e99c3e25dbbcc8c502b16c..402dc44203440f9bdd785c46475d37dbf32f473f 100644
--- a/Event/EventPacker/src/component/BufferUnpackerBaseAlg.h
+++ b/Event/EventPacker/src/component/BufferUnpackerBaseAlg.h
@@ -80,8 +80,7 @@ namespace DataPacking::Buffer {
auto pdata = RegistryWrapper<typename PACKER::PackedDataVector>( m_data.fullKey().key() + "_Packed" );
LHCb::Hlt::PackedData::ObjectHeader header;
- Buffer readBuffer;
- readBuffer.init( buffer.buffer(), false );
+ Buffer readBuffer{buffer}; // TODO: allow for emphemeral 'view' for reading without copying just to update 'pos'
while ( !readBuffer.eof() ) {
readBuffer.load( header.classID );
@@ -105,8 +104,7 @@ namespace DataPacking::Buffer {
}
}
- // FIXME/TODO: must check TCK!!!
- const auto& map = m_hltANNSvc->i2s( 0u, PackedObjectLocations );
+ const auto& map = m_hltANNSvc->i2s( readBuffer.key(), PackedObjectLocations );
for ( auto id : header.linkLocationIDs ) {
auto location = map.find( id );
if ( location != end( map ) ) {
diff --git a/Event/EventPacker/src/component/ProtoParticleUnpacker.cpp b/Event/EventPacker/src/component/ProtoParticleUnpacker.cpp
index a6166d0b334dc73205a4eddd0789e4b1f7b430e0..dcdda41f288de1ef6b2a88f1165ce2655101ab3e 100644
--- a/Event/EventPacker/src/component/ProtoParticleUnpacker.cpp
+++ b/Event/EventPacker/src/component/ProtoParticleUnpacker.cpp
@@ -71,7 +71,7 @@ namespace DataPacking::Buffer {
<< " to " << m_protos << endmsg;
std::vector<int32_t> linkLocationIDs;
- LHCb::Hlt::PackedData::PackedDataInBuffer readBuffer = buffer;
+ LHCb::Hlt::PackedData::PackedDataInBuffer readBuffer{buffer};
const LHCb::ProtoParticlePacker packer( this );
// Do the actual loading of the objects
@@ -93,9 +93,8 @@ namespace DataPacking::Buffer {
<< "consumed " << nBytesRead << " bytes, "
<< "and " << header.linkLocationIDs.size() << " links were stored!" << endmsg;
}
- // FIXME/TODO: must obtain the TCK here!!!
- const auto& map = m_annsvc->i2s( 0u, PackedObjectLocations );
+ const auto& map = m_annsvc->i2s( readBuffer.key(), PackedObjectLocations );
for ( auto id : header.linkLocationIDs ) {
auto location = map.find( id );
diff --git a/Hlt/HltDAQ/src/component/HltDecReportsDecoder.cpp b/Hlt/HltDAQ/src/component/HltDecReportsDecoder.cpp
index 59b513bf821a2d0cdde213ea2fb2b0fb23e2adcd..b75789935a820b36aabdd53fc235b40e8bdfa56e 100644
--- a/Hlt/HltDAQ/src/component/HltDecReportsDecoder.cpp
+++ b/Hlt/HltDAQ/src/component/HltDecReportsDecoder.cpp
@@ -50,8 +50,16 @@ namespace LHCb::Hlt::DAQ {
int decodeHDR( HDRConverter converter, Range& input, HltDecReports& output, const Table& table ) const;
Gaudi::Property<SourceID> m_sourceID{this, "SourceID", SourceID::Dummy};
+ Gaudi::Property<unsigned> m_forcedKey{this, "ForcedKey", 0,
+ "if non-zero, ignore TCK in decreport, and use this value"};
ServiceHandle<IIndexedANNSvc> m_svc{this, "DecoderMapping", "TCKANNSvc"};
+ mutable Gaudi::Accumulators::MsgCounter<MSG::WARNING> m_overrule_nonzero_key{
+ this, " HltDecReports has a non-zero TCK, but is explicitly overruled for decoding -- make sure that this "
+ "really what you want"};
+ mutable Gaudi::Accumulators::MsgCounter<MSG::WARNING> m_not_overruled_zero_key{
+ this, " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this "
+ "really what you want"};
mutable Gaudi::Accumulators::MsgCounter<MSG::ERROR> m_bad_version{
this, " HltDecReports RawBank version # is larger then the known ones.... cannot decode, use newer software "
"version. "};
@@ -150,7 +158,11 @@ namespace LHCb::Hlt::DAQ {
outputSummary.setTaskID( pop( data ) );
}
// --------------------------------- get configuration --------------------
- const auto& tbl = m_svc->i2s( outputSummary.configuredTCK(), toSelectionID( m_sourceID.value() ) );
+ if ( outputSummary.configuredTCK() != 0 && m_forcedKey != 0 ) ++m_overrule_nonzero_key;
+ if ( outputSummary.configuredTCK() == 0 && m_forcedKey == 0 ) ++m_not_overruled_zero_key;
+
+ const auto& tbl = m_svc->i2s( m_forcedKey == 0 ? outputSummary.configuredTCK() : m_forcedKey.value(),
+ selectionID_for( m_sourceID.value() ) );
// ---------------- loop over decisions in the bank body; insert them into the output container
int err = 0;
diff --git a/Hlt/HltDAQ/src/component/HltPackedBufferDecoder.cpp b/Hlt/HltDAQ/src/component/HltPackedBufferDecoder.cpp
index be7196acc4e295d5fc07209cb8164dce412fe5d7..b708824ffde1cdc51e31d6ce79cabe214a8d7750 100644
--- a/Hlt/HltDAQ/src/component/HltPackedBufferDecoder.cpp
+++ b/Hlt/HltDAQ/src/component/HltPackedBufferDecoder.cpp
@@ -65,9 +65,13 @@ namespace LHCb::Hlt::PackedData {
// TODO: update the DstData rawbank to avoid having to go to the DecRep rawbank to get the number
// needed to decode the DstData bank...
+ auto tck = DAQ::tck( m_sourceID, rawEvent );
+ if ( tck != 0 && m_forcedKey != 0 ) ++m_overrule_nonzero_key;
+ if ( tck == 0 && m_forcedKey == 0 ) ++m_not_overruled_zero_key;
+ auto key = ( m_forcedKey == 0 ? DAQ::tck( m_sourceID, rawEvent ) : m_forcedKey.value() );
// TODO: derive a map from this map (cached by tck) with packed int -> index in output vector which is all that is
// really needed...
- const auto& locationsMap = m_svc->i2s( DAQ::tck( m_sourceID, rawEvent ), m_objectLocationKey );
+ const auto& locationsMap = m_svc->i2s( key, m_objectLocationKey );
ByteBuffer::buffer_type payload;
payload.reserve( rawBank0->size() * rawBanks.size() );
@@ -88,7 +92,7 @@ namespace LHCb::Hlt::PackedData {
}
}
- PackedDataInBuffer buffer;
+ PackedDataInBuffer buffer{key};
// Decompress the payload and load into a one big buffer
switch ( compression( *rawBank0 ) ) {
case Compression::NoCompression: {
@@ -112,7 +116,7 @@ namespace LHCb::Hlt::PackedData {
int read = 0;
while ( !buffer.eof() ) {
- // keep track of where this buffer starts are
+ // keep track of the start of this (sub) buffer
auto pos = buffer.buffer().pos();
LHCb::Hlt::PackedData::ObjectHeader header;
@@ -131,14 +135,16 @@ namespace LHCb::Hlt::PackedData {
// found a requested buffer
// create a new buffer, and copy content of the big buffer
// starting from (current position - pos ) = size of the buffer
- PackedDataInBuffer bufferIn;
- bufferIn.addBuffer( buffer, pos );
+ buffers[b] = PackedDataInBuffer{buffer, pos};
+
+ // verify the key is propagated...
+ assert( buffers[b]->key() == buffer.key() );
+ assert( buffers[b]->key() == key );
if ( msgLevel( MSG::DEBUG ) ) {
- debug() << " buffer number " << b << " with size " << bufferIn.buffer().size() << " to location "
- << outputLocation( b ) << endmsg;
+ debug() << " buffer number " << b << " with size " << buffers[b]->buffer().size() << " and key "
+ << buffers[b]->key() << " to location " << outputLocation( b ) << endmsg;
}
- buffers[b] = std::move( bufferIn );
++read;
}
@@ -161,7 +167,15 @@ namespace LHCb::Hlt::PackedData {
ServiceHandle<IIndexedANNSvc> m_svc{this, "DecoderMapping", "TCKANNSvc"};
Gaudi::Property<DAQ::SourceID> m_sourceID{this, "SourceID", DAQ::SourceID::Dummy};
Gaudi::Property<Gaudi::StringKey> m_objectLocationKey{this, "ObjectLocationMapping", "PackedObjectLocations"};
-
+ Gaudi::Property<unsigned> m_forcedKey{this, "ForcedKey", 0,
+ "if non-zero, ignore TCK in decreport, and use this value"};
+
+ mutable Gaudi::Accumulators::MsgCounter<MSG::WARNING> m_overrule_nonzero_key{
+ this, " HltPackedData has a non-zero TCK, but is explicitly overruled for decoding -- make sure that this "
+ "really what you want"};
+ mutable Gaudi::Accumulators::MsgCounter<MSG::WARNING> m_not_overruled_zero_key{
+ this, " HltPackedData has a zero TCK, and it is not explicitly specified for decoding -- make sure that this "
+ "really what you want"};
mutable Gaudi::Accumulators::MsgCounter<MSG::ERROR> m_bad_version{
this, "HltPackedData raw bank version is not supported."};
diff --git a/Hlt/HltDAQ/src/component/HltPackedBufferWriter.cpp b/Hlt/HltDAQ/src/component/HltPackedBufferWriter.cpp
index a8ee1561ae85b0e80f14f44f12a8cb67dce664d6..f49580ac1d7c5080fef7797a4a050dcb14b135a6 100644
--- a/Hlt/HltDAQ/src/component/HltPackedBufferWriter.cpp
+++ b/Hlt/HltDAQ/src/component/HltPackedBufferWriter.cpp
@@ -48,10 +48,12 @@ namespace LHCb::Hlt::PackedData {
constexpr size_t MAX_PAYLOAD_SIZE{65524};
unsigned int nbuf_uncompressed = 0;
PackedDataOutBuffer bigBuffer;
+ bigBuffer.reserve( MAX_PAYLOAD_SIZE );
for ( const auto& [nbuf, buffer] : range::enumerate( buffers ) ) {
if ( !buffer || buffer->buffer().size() == 0 ) continue;
bigBuffer.addBuffer( *buffer );
+ assert( bigBuffer.key() == buffer->key() );
if ( UNLIKELY( msgLevel( MSG::DEBUG ) ) ) {
debug() << " writing buffer for location " << inputLocation( nbuf ) << " buffer size "
<< buffer->buffer().size() << endmsg;
diff --git a/Hlt/HltDAQ/src/component/HltSelReportsDecoder.cpp b/Hlt/HltDAQ/src/component/HltSelReportsDecoder.cpp
index 59dff92596a8b90f689abfac697a153372b9cedb..f6f33dc1388d7fc14b8feb2a2584dc5c533b0271 100644
--- a/Hlt/HltDAQ/src/component/HltSelReportsDecoder.cpp
+++ b/Hlt/HltDAQ/src/component/HltSelReportsDecoder.cpp
@@ -195,7 +195,7 @@ namespace LHCb::Hlt::DAQ {
auto tck_dummy = tck( m_sourceID, rawEvent );
bool settings = ( tck_dummy == 0 );
GaudiUtils::VectorMap<unsigned int, std::string> const* idmap_dummy = nullptr;
- if ( !settings ) idmap_dummy = &m_svc->i2s( tck_dummy, toSelectionID( m_sourceID.value() ) );
+ if ( !settings ) idmap_dummy = &m_svc->i2s( tck_dummy, selectionID_for( m_sourceID.value() ) );
unsigned int i = hitsSubBank99.seqBegin( 0 );
while ( i < hitsSubBank99.seqEnd( 0 ) ) {
@@ -340,7 +340,7 @@ namespace LHCb::Hlt::DAQ {
// TODO: check consistency of output location and source ID!!!!
auto mytck = tck( m_sourceID, rawEvent );
- const auto& idmap = m_svc->i2s( mytck, toSelectionID( m_sourceID.value() ) );
+ const auto& idmap = m_svc->i2s( mytck, selectionID_for( m_sourceID.value() ) );
const auto& infomap = m_svc->i2s( mytck, Gaudi::StringKey{"InfoID"} );
// put them in local vector until they are finished
diff --git a/Hlt/HltDAQ/src/component/HltSourceID.cpp b/Hlt/HltDAQ/src/component/HltSourceID.cpp
index d2339d4c21a4bcb0adf91f7c89c4534471225f93..e8a71fbc969f2c8a991e32b187565d19d217704d 100644
--- a/Hlt/HltDAQ/src/component/HltSourceID.cpp
+++ b/Hlt/HltDAQ/src/component/HltSourceID.cpp
@@ -38,7 +38,7 @@ namespace LHCb::Hlt::DAQ {
return std::string{i->second};
}
- const Gaudi::StringKey& toSelectionID( SourceID id ) {
+ const Gaudi::StringKey& selectionID_for( SourceID id ) {
switch ( id ) {
case SourceID::Hlt1:
return Hlt1SelectionID;
@@ -47,7 +47,7 @@ namespace LHCb::Hlt::DAQ {
case SourceID::Spruce:
return SpruceSelectionID;
default:
- throw GaudiException( "Unsupport HLT sourceID", "HltDecoderSvc", StatusCode::FAILURE );
+ throw GaudiException( "Unsupported HLT sourceID", __PRETTY_FUNCTION__, StatusCode::FAILURE );
}
}
} // namespace LHCb::Hlt::DAQ
diff --git a/Hlt/HltDAQ/src/component/HltSourceID.h b/Hlt/HltDAQ/src/component/HltSourceID.h
index a47cbd58a5f08acd56c131d5b96bdb81a70ac5b1..05f4f3db3407e53e8a6d351cff83f09656a5a55a 100644
--- a/Hlt/HltDAQ/src/component/HltSourceID.h
+++ b/Hlt/HltDAQ/src/component/HltSourceID.h
@@ -34,6 +34,6 @@ namespace LHCb::Hlt::DAQ {
inline std::ostream& toStream( SourceID id, std::ostream& os ) { return os << std::quoted( toString( id ), '\'' ); }
inline std::ostream& operator<<( std::ostream& s, SourceID e ) { return toStream( e, s ); }
- const Gaudi::StringKey& toSelectionID( SourceID id );
+ const Gaudi::StringKey& selectionID_for( SourceID id );
} // namespace LHCb::Hlt::DAQ
diff --git a/Hlt/HltServices/src/TCKANNSvc.cpp b/Hlt/HltServices/src/TCKANNSvc.cpp
index c794030e1f28e3afc31cf5f41f9941440ab8c31c..3ded5a9e0c19cf11d92c3d1a21f215bb23a7bddf 100644
--- a/Hlt/HltServices/src/TCKANNSvc.cpp
+++ b/Hlt/HltServices/src/TCKANNSvc.cpp
@@ -137,6 +137,7 @@ private:
mutable std::array<LHCb::cxx::SynchronizedValue<std::map<unsigned int, inv_map_t>>, s_majors.size()> m_inv_maps;
// TODO: add properties which allow to overrule TCKs from the backend (eg. because they're not there yet...)
+ // TODO: add backend to read json from git repo
};
DECLARE_COMPONENT( TCKANNSvc )