Skip to content
Snippets Groups Projects
Commit 5f131672 authored by Daniel Charles Craik's avatar Daniel Charles Craik Committed by Elena Dall'Occo
Browse files

Extend HltLumiSummary decoding to Run 3 format

parent 8537cc15
No related branches found
No related tags found
1 merge request!3816Add pyconf wrapper for HltLumiSummaryDecoder
Hide whitespace changes
Inline Side-by-side
Event/LumiEvent/include/Event/LumiCounters.h
+ 8
− 0
View file @ 5f131672
......@@ -47,6 +47,8 @@ namespace LHCb {
PV3D = 11, // number of 3D vertices
PU = 13, // number of PU vertices
Vertex = 14, // number of vertices accepted in IR
GEC = 15, // whether the GEC has passed
SciFiClusters = 16, // number of SciFi clusters
Method = 20, // method: 0 or missing is random method
Random = 21, // random method: 0 or missing is L0 method
PoissonPUMult = 50, // number of times PU hits over threshold
......@@ -112,6 +114,10 @@ namespace LHCb {
return s << "PU";
case LHCb::LumiCounters::Vertex:
return s << "Vertex";
case LHCb::LumiCounters::GEC:
return s << "GEC";
case LHCb::LumiCounters::SciFiClusters:
return s << "SciFiClusters";
case LHCb::LumiCounters::Method:
return s << "Method";
case LHCb::LumiCounters::Random:
......@@ -181,6 +187,8 @@ LHCb::LumiCounters::s_counterKeyTypMap() {
{"PV3D", PV3D},
{"PU", PU},
{"Vertex", Vertex},
{"GEC", GEC},
{"SciFiClusters", SciFiClusters},
{"Method", Method},
{"Random", Random},
{"PoissonPUMult", PoissonPUMult},
......
Event/LumiEvent/include/Event/LumiSummaryOffsets_V1.h
+ 19
− 43
View file @ 5f131672
......@@ -20,56 +20,32 @@ namespace LHCb {
// by dividing the largest offset by 8*sizeof(unsigned), i.e. 32, and rounding up.
// Fields must be contained within a single element of the array, e.g. an
// offset of 24 would allow for a maximum size of 8.
/// ODIN info
ODINStart = 0,
t0LowSize = 32,
t0LowOffset = ODINStart + 0, // event time offset low 32 bits
t0HighSize = 32,
t0HighOffset = ODINStart + t0LowSize, // event time offset high 32 bits
bcidLowSize = 32,
bcidLowOffset = ODINStart + t0LowSize + t0HighSize, // re-mapped bcid low 32 bits
bcidHighSize = 14,
bcidHighOffset = ODINStart + t0LowSize + t0HighSize + bcidLowSize, // re-mapped bcid high 14 bits
bxTypeSize = 2,
bxTypeOffset = ODINStart + t0LowSize + t0HighSize + bcidLowSize + bcidHighSize, // bunch crossing type
ODINEnd = ODINStart + t0LowSize + t0HighSize + bcidLowSize + bcidHighSize + bxTypeSize,
/// Global Event Cut
GecStart = ODINEnd,
GecSize = 1,
GecStart = 0,
GecSize = 1,
GecOffset = GecStart,
GecEnd = GecStart + GecSize,
GecEnd = GecStart + GecSize,
/// Velo counters
VeloCountersStart = GecEnd,
VeloTracksSize = 15,
VeloTracksOffset = VeloCountersStart + 0, // number of Velo tracks
VeloVerticesSize = 6,
VeloCountersStart = GecEnd,
VeloTracksSize = 12,
VeloTracksOffset = VeloCountersStart + 0, // number of Velo tracks
VeloVerticesSize = 5,
VeloVerticesOffset = VeloCountersStart + VeloTracksSize, // number of Velo vertices
VeloCountersEnd = VeloCountersStart + VeloTracksSize + VeloVerticesSize,
VeloCountersEnd = VeloCountersStart + VeloTracksSize + VeloVerticesSize,
/// RICH counters
RichCountersStart = VeloCountersEnd,
RichCountersEnd = RichCountersStart + 0,
RichCountersEnd = RichCountersStart + 0,
/// SciFi counters
SciFiCountersStart = RichCountersEnd,
SciFiClustersSize = 15,
SciFiCountersStart = RichCountersEnd,
SciFiClustersSize = 14, // end of word 0
SciFiClustersOffset = SciFiCountersStart + 0, // number of SciFi Clusters
SciFiCountersEnd = SciFiCountersStart + SciFiClustersSize,
SciFiCountersEnd = SciFiCountersStart + SciFiClustersSize,
/// CALO counters
CaloCountersStart = SciFiCountersEnd,
CaloCountersEnd = CaloCountersStart + 0,
/// Muon counters
MuonCountersStart = CaloCountersEnd,
M2R2Size = 11,
M2R2Offset = MuonCountersStart, // M2R2 hits
M2R3Size = 11,
M2R3Offset = MuonCountersStart + M2R2Size, // M2R3 hits
M3R2Size = 11,
M3R2Offset = MuonCountersStart + M2R2Size + M2R3Size, // M3R2 hits
M3R3Size = 10,
M3R3Offset = MuonCountersStart + M2R2Size + M2R3Size + M3R2Size, // M3R3 hits
MuonCountersEnd = MuonCountersStart + M2R2Size + M2R3Size + M3R2Size + M3R3Size,
/// the largest offset rounded up to the next multiple of 32
TotalSize = ( ( MuonCountersEnd - 1 ) / 32 + 1 ) * 32
}; // enum CounterOffsets
} // namespace V1
} // namespace LumiSummaryOffsets
} // namespace LHCb
CaloCountersEnd = CaloCountersStart + 0,
///
TotalSize = ((CaloCountersEnd-1)/32 + 1)*32 // the largest offset rounded up to the next multiple of 32
};
} // namespace V1
} // namespace LumiSummaryOffsets
} // namespace Allen
Event/LumiEvent/src/HltLumiSummaryDecoder.cpp
+ 63
− 16
View file @ 5f131672
......@@ -10,6 +10,8 @@
\*****************************************************************************/
#include "Event/HltLumiSummary.h"
#include "Event/LumiCounters.h"
#include "Event/LumiSummaryOffsets_V1.h"
#include "Event/RawBank.h"
#include "Event/RawEvent.h"
......@@ -40,6 +42,20 @@ namespace LHCb {
RawEventLocation::Trigger, RawEventLocation::Default )},
KeyValue{"OutputContainerName", HltLumiSummaryLocation::Default} ) {}
unsigned getField( unsigned offset, unsigned size, const unsigned* target ) const {
// Separate offset into a word part and bit part
unsigned word = offset / (8 * sizeof(unsigned));
unsigned bitoffset = offset % (8 * sizeof(unsigned));
// Check size and offset line up with word boundaries
if (bitoffset + size > (8 * sizeof(unsigned))) {
return 0;
}
unsigned mask = ((1 << size) - 1);
return ((target[word] >> bitoffset) & mask);
}
HltLumiSummary operator()( const RawEvent& event ) const override {
HltLumiSummary hltLumiSummary;
......@@ -48,23 +64,54 @@ namespace LHCb {
// Now copy the information from all banks (normally there should only be one)
auto size_buffer = m_totDataSize.buffer();
for ( const auto& ibank : event.banks( RawBank::HltLumiSummary ) ) {
// get the raw data
for ( const unsigned w : ibank->range<unsigned int>() ) {
// decode the info
int iKey = ( w >> 16 );
int iVal = ( w & 0xFFFF );
if ( msgLevel( MSG::VERBOSE ) ) { verbose() << format( " %8x %11d %11d %11d ", w, w, iKey, iVal ) << endmsg; }
// add this counter
hltLumiSummary.addInfo( iKey, iVal );
if ( ibank->version() == 0 ) {
// legacy Run 1+2 LumiSummary structure
// get the raw data
for ( const unsigned w : ibank->range<unsigned int>() ) {
// decode the info
int iKey = ( w >> 16 );
int iVal = ( w & 0xFFFF );
if ( msgLevel( MSG::VERBOSE ) ) { verbose() << format( " %8x %11d %11d %11d ", w, w, iKey, iVal ) << endmsg; }
// add this counter
hltLumiSummary.addInfo( iKey, iVal );
}
// keep statistics
int totDataSize = ibank->size() / sizeof( unsigned int );
size_buffer += totDataSize;
if ( msgLevel( MSG::DEBUG ) ) {
debug() << "Bank size: " << format( "%4d ", ibank->size() ) << "Total Data bank size " << totDataSize
<< endmsg;
}
}
// keep statistics
int totDataSize = ibank->size() / sizeof( unsigned int );
size_buffer += totDataSize;
if ( msgLevel( MSG::DEBUG ) ) {
debug() << "Bank size: " << format( "%4d ", ibank->size() ) << "Total Data bank size " << totDataSize
<< endmsg;
else if ( ibank->version() == 1 ) {
// initial Run 3 version
// TODO version not currently finalised
if ( ibank->size() != LHCb::LumiSummaryOffsets::V1::TotalSize ) {
warning() << "Bank size incorrect for HltLumiSummary V1: expected " << format( "%4d", LHCb::LumiSummaryOffsets::V1::TotalSize ) << ", found " << format( "%4d", ibank->size() ) << endmsg;
}
else {
hltLumiSummary.addInfo( LHCb::LumiCounters::GEC,
getField(LHCb::LumiSummaryOffsets::V1::GecOffset,
LHCb::LumiSummaryOffsets::V1::GecSize,
ibank->data()));
hltLumiSummary.addInfo( LHCb::LumiCounters::Velo,
getField(LHCb::LumiSummaryOffsets::V1::VeloTracksOffset,
LHCb::LumiSummaryOffsets::V1::VeloTracksSize,
ibank->data()));
hltLumiSummary.addInfo( LHCb::LumiCounters::Vertex,
getField(LHCb::LumiSummaryOffsets::V1::VeloVerticesOffset,
LHCb::LumiSummaryOffsets::V1::VeloVerticesSize,
ibank->data()));
hltLumiSummary.addInfo( LHCb::LumiCounters::SciFiClusters,
getField(LHCb::LumiSummaryOffsets::V1::SciFiClustersOffset,
LHCb::LumiSummaryOffsets::V1::SciFiClustersSize,
ibank->data()));
}
}
else {
warning() << "Unknown HltLumiSummary version: " << format( "%4d", ibank->version()) << endmsg;
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment