diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.cxx
index 590eb72231c0dba6435e2c5a3020249692a7ffab..6565fe5e13385e11865a0341bde2e89cabad6819 100755
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.cxx
@@ -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)
);
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 499e4f42655e15f5b3634d89a33c7be68d0ae1de..919cfc6341500652c7a1528cfd136e97a40ed999 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -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 - - - - -
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 41575a56f98e39bac5ad93a20f02ff9fdd6cb517..ae0282f4a81f034c08dc2aaea694ef744af42661 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -86,8 +86,8 @@ TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 #5572
TrigSignatureMoniMT INFO -- #557204938 Events 20 20 0 0 0 0 0 0 0 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_L12MU4 #2999632714
-TrigSignatureMoniMT INFO -- #2999632714 Events 20 20 0 0 0 0 0 1 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2999632714 Features 0 0 0 0 0 4 0 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #2999632714 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2999632714 Features 0 0 0 0 0 4 4 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 #1730084172
TrigSignatureMoniMT INFO -- #1730084172 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #1730084172 Features 0 0 0 0 0 4 2 0 0 - - - - -
@@ -98,14 +98,14 @@ TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12M
TrigSignatureMoniMT INFO -- #4008168535 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #4008168535 Features 0 0 0 0 0 4 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935
-TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 0 0 0 0 0 1 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 0 4 0 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 0 4 4 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871
TrigSignatureMoniMT INFO -- #1316992871 Events 20 20 0 0 0 0 0 0 0 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_Dr_L12MU4 #3304584056
-TrigSignatureMoniMT INFO -- #3304584056 Events 20 20 0 0 0 0 0 1 0 - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3304584056 Features 0 0 0 0 0 4 0 - - - - - - -
+TrigSignatureMoniMT INFO -- #3304584056 Events 20 20 0 0 0 0 0 1 1 - - - - - - - 1
+TrigSignatureMoniMT INFO -- #3304584056 Features 0 0 0 0 0 4 4 - - - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 #1747073535
TrigSignatureMoniMT INFO -- #1747073535 Events 20 20 0 0 0 0 0 0 0 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 0 0 0 0 0 - - - - -
@@ -590,8 +590,8 @@ TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU4
TrigSignatureMoniMT INFO -- #782182242 Events 20 20 0 0 0 0 0 0 - - - - - - - - 0
TrigSignatureMoniMT INFO -- #782182242 Features 0 0 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu10_L1MU10 #209090273
-TrigSignatureMoniMT INFO -- #209090273 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #209090273 Features 0 0 0 0 0 1 1 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #209090273 Events 20 20 0 0 0 0 0 2 2 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #209090273 Features 0 0 0 0 0 2 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu10_ivarmedium_mu10_10invm70_L12MU10 #2386882549
TrigSignatureMoniMT INFO -- #2386882549 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - - 0
TrigSignatureMoniMT INFO -- #2386882549 Features 0 0 0 0 0 0 0 0 0 0 - - - -
@@ -620,8 +620,8 @@ TrigSignatureMoniMT INFO HLT_mu11_mu6_bUpsimumu_
TrigSignatureMoniMT INFO -- #1171632195 Events 20 20 0 0 0 0 0 0 0 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #1171632195 Features 0 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu14_L1MU10 #1696906927
-TrigSignatureMoniMT INFO -- #1696906927 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1696906927 Features 0 0 0 0 0 1 1 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #1696906927 Events 20 20 0 0 0 0 0 2 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1696906927 Features 0 0 0 0 0 2 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu20_2mu4noL1_L1MU20 #1029128679
TrigSignatureMoniMT INFO -- #1029128679 Events 20 20 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO -- #1029128679 Features 0 0 0 0 0 1 1 0 0 0 0 0 0 0
@@ -674,8 +674,8 @@ TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1M
TrigSignatureMoniMT INFO -- #597064890 Events 20 20 0 0 0 0 0 1 1 0 0 0 - - - - 0
TrigSignatureMoniMT INFO -- #597064890 Features 0 0 0 0 0 1 1 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu4_l2io_L1MU4 #1048276860
-TrigSignatureMoniMT INFO -- #1048276860 Events 20 20 0 0 0 0 0 2 1 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1048276860 Features 0 0 0 0 0 3 1 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #1048276860 Events 20 20 0 0 0 0 0 4 3 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1048276860 Features 0 0 0 0 0 5 4 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 #3657158931
TrigSignatureMoniMT INFO -- #3657158931 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #3657158931 Features 0 0 0 0 0 1 1 0 0 - - - - -
@@ -689,29 +689,29 @@ TrigSignatureMoniMT INFO HLT_mu60_L1MU20 #287183
TrigSignatureMoniMT INFO -- #2871837722 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #2871837722 Features 0 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
-TrigSignatureMoniMT INFO -- #2560542253 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 0 1 1 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #2560542253 Events 20 20 0 0 0 0 0 2 2 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 0 2 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 #934918532
-TrigSignatureMoniMT INFO -- #934918532 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #934918532 Features 0 0 0 0 0 1 1 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #934918532 Events 20 20 0 0 0 0 0 2 2 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #934918532 Features 0 0 0 0 0 2 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062
-TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 0 0 0 0 0 1 1 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 0 1 1 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 0 0 0 0 0 2 2 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 0 2 2 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu6_j45_nojcalib_L1J20 #2114129685
TrigSignatureMoniMT INFO -- #2114129685 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - - - 0
TrigSignatureMoniMT INFO -- #2114129685 Features 0 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032
-TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 0 0 0 0 0 1 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 0 1 0 0 - - - - - -
+TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 0 0 0 0 0 2 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 0 2 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713982776
-TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 0 0 0 0 0 1 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1713982776 Features 0 0 0 0 0 2 0 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1713982776 Features 0 0 0 0 0 2 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
-TrigSignatureMoniMT INFO -- #451489897 Events 20 20 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 0 1 1 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Events 20 20 0 0 0 0 0 2 2 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 0 2 2 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu6_xe30_mht_L1XE10 #3192713675
-TrigSignatureMoniMT INFO -- #3192713675 Events 20 20 0 0 0 0 0 1 1 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #3192713675 Features 0 0 0 0 0 1 1 0 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #3192713675 Events 20 20 0 0 0 0 0 2 2 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3192713675 Features 0 0 0 0 0 2 2 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu80_L1MU20 #387900377
TrigSignatureMoniMT INFO -- #387900377 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #387900377 Features 0 0 0 0 0 1 1 0 0 - - - - -
@@ -719,8 +719,8 @@ TrigSignatureMoniMT INFO HLT_mu80_msonly_3layers
TrigSignatureMoniMT INFO -- #761101109 Events 20 20 0 0 0 0 0 1 0 0 - - - - - - 0
TrigSignatureMoniMT INFO -- #761101109 Features 0 0 0 0 0 1 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_mu8_L1MU6 #1467711434
-TrigSignatureMoniMT INFO -- #1467711434 Events 20 20 0 0 0 0 0 1 1 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1467711434 Features 0 0 0 0 0 1 1 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #1467711434 Events 20 20 0 0 0 0 0 2 2 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1467711434 Features 0 0 0 0 0 2 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1All #2979253164
TrigSignatureMoniMT INFO -- #2979253164 Events 20 20 - - - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #2979253164 Features - - - - - - - - - - - - - -