Skip to content
Snippets Groups Projects
Commit e1efd5c6 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'rpc-rob-decoding' into 'master' 

Fix for RPC ROB based decoding

See merge request atlas/athena!37840
parents ab184c5f ee38d660
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.cxx
+ 1
− 2
View file @ e1efd5c6
......@@ -411,7 +411,6 @@ StatusCode Muon::RpcRdoToPrepDataToolCore::decode( const std::vector<uint32_t>&
rdoHashVec.reserve(13*robIdsToBeDecoded.size()); // most ROBs have 13 RDOs, some have less
ATH_CHECK(rpcCabling->giveRDO_fromROB(robIdsToBeDecoded, rdoHashVec) );
std::vector<IdentifierHash> idVect; //vector passed to processPad - if empty, turns off decoding of additional RDOs for ambiguity solving
std::vector<IdentifierHash> idWithDataVect; //vector passed to processPad - filled with IDs of created PrepRawData collections
// start here to process the RDOs
......@@ -445,7 +444,7 @@ StatusCode Muon::RpcRdoToPrepDataToolCore::decode( const std::vector<uint32_t>&
processingetaview,
processingphiview,
nPrepRawData,
idVect,
rdoHashVec,
idWithDataVect,
rpcContext)
);
......
Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+ 6
− 6
View file @ e1efd5c6
......@@ -111,7 +111,7 @@ TrigSignatureMoniMT INFO -- #1747073535 Events
TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 0 12 8 8 8 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_l2io_L12MU6 #2996403520
TrigSignatureMoniMT INFO -- #2996403520 Events 4 4 0 0 0 0 0 3 3 2 2 - - - - - 2
TrigSignatureMoniMT INFO -- #2996403520 Features 0 0 0 0 0 12 26 8 8 - - - - -
TrigSignatureMoniMT INFO -- #2996403520 Features 0 0 0 0 0 12 28 8 8 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_muonqual_L12MU6 #2398136098
TrigSignatureMoniMT INFO -- #2398136098 Events 4 4 0 0 0 0 0 3 2 2 2 - - - - - 2
TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 0 12 8 8 8 - - - - -
......@@ -644,8 +644,8 @@ TrigSignatureMoniMT INFO HLT_mu24_L1MU20 #417425
TrigSignatureMoniMT INFO -- #417425162 Events 8 8 0 0 0 0 0 8 5 4 4 - - - - - 4
TrigSignatureMoniMT INFO -- #417425162 Features 0 0 0 0 0 10 6 5 5 - - - - -
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 #677658909
TrigSignatureMoniMT INFO -- #677658909 Events 8 8 0 0 0 0 0 6 6 5 5 - - - - - 5
TrigSignatureMoniMT INFO -- #677658909 Features 0 0 0 0 0 7 7 6 6 - - - - -
TrigSignatureMoniMT INFO -- #677658909 Events 8 8 0 0 0 0 0 5 5 4 4 - - - - - 4
TrigSignatureMoniMT INFO -- #677658909 Features 0 0 0 0 0 6 6 5 5 - - - - -
TrigSignatureMoniMT INFO HLT_mu24_ivarmedium_L1MU20 #737407430
TrigSignatureMoniMT INFO -- #737407430 Events 8 8 0 0 0 0 0 8 5 4 4 2 - - - - 2
TrigSignatureMoniMT INFO -- #737407430 Features 0 0 0 0 0 10 6 5 5 2 - - - -
......@@ -671,11 +671,11 @@ TrigSignatureMoniMT INFO HLT_mu28_mu8noL1_L1MU20
TrigSignatureMoniMT INFO -- #86648125 Events 8 8 0 0 0 0 0 8 5 4 3 0 0 0 1 1 1
TrigSignatureMoniMT INFO -- #86648125 Features 0 0 0 0 0 10 6 5 3 0 0 0 1 1
TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 #597064890
TrigSignatureMoniMT INFO -- #597064890 Events 8 8 0 0 0 0 0 8 5 3 2 1 - - - - 1
TrigSignatureMoniMT INFO -- #597064890 Events 8 8 0 0 0 0 0 8 5 4 2 1 - - - - 1
TrigSignatureMoniMT INFO -- #597064890 Features 0 0 0 0 0 10 6 4 2 1 - - - -
TrigSignatureMoniMT INFO HLT_mu4_l2io_L1MU4 #1048276860
TrigSignatureMoniMT INFO -- #1048276860 Events 12 12 0 0 0 0 0 11 11 11 11 - - - - - 11
TrigSignatureMoniMT INFO -- #1048276860 Features 0 0 0 0 0 14 46 15 15 - - - - -
TrigSignatureMoniMT INFO -- #1048276860 Events 12 12 0 0 0 0 0 12 12 11 11 - - - - - 11
TrigSignatureMoniMT INFO -- #1048276860 Features 0 0 0 0 0 15 50 15 15 - - - - -
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 #3657158931
TrigSignatureMoniMT INFO -- #3657158931 Events 8 8 0 0 0 0 0 8 5 2 1 - - - - - 1
TrigSignatureMoniMT INFO -- #3657158931 Features 0 0 0 0 0 10 6 2 1 - - - - -
......
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