diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx
index 55fc86417b115a99f5c634bcecf0e44c7130f4a8..6bf6246d71330d8ad4419acf86f55288848abeb1 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx
@@ -43,9 +43,10 @@ StatusCode TrigEgammaPrecisionCaloHypoAlgMT::execute( const EventContext& contex
// loop over previous decisions
size_t counter=0;
for ( auto previousDecision: *previousDecisionsHandle ) {
- //get RoI
- auto roiELInfo = findLink<TrigRoiDescriptorCollection>( previousDecision, initialRoIString() );
-
+
+ //get updated RoI
+ auto roiELInfo = findLink<TrigRoiDescriptorCollection>( previousDecision, roiString() );
+
ATH_CHECK( roiELInfo.isValid() );
const TrigRoiDescriptor* roi = *(roiELInfo.link);
@@ -70,7 +71,6 @@ StatusCode TrigEgammaPrecisionCaloHypoAlgMT::execute( const EventContext& contex
auto d = newDecisionIn( decisions, name() );
d->setObjectLink( featureString(), el );
TrigCompositeUtils::linkToPrevious( d, decisionInput().key(), counter );
- d->setObjectLink( roiString(), roiELInfo.link );
toolInput.emplace_back( d, roi, clusterHandle.cptr()->at(cl), previousDecision );
validclusters++;
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx
index 9dbb604bce4556c243291e954cc5bf4929d428ff..3f5bb5c462b81bdbd7e2fec2b21fd4c2eeadbd22 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx
@@ -52,9 +52,10 @@ StatusCode TrigEgammaPrecisionElectronHypoAlgMT::execute( const EventContext& co
// loop over previous decisions
size_t counter=0;
for ( auto previousDecision: *previousDecisionsHandle ) {
- //get RoI
- auto roiELInfo = findLink<TrigRoiDescriptorCollection>( previousDecision, initialRoIString() );
-
+
+ //get updated RoI
+ auto roiELInfo = findLink<TrigRoiDescriptorCollection>( previousDecision, roiString() );
+
ATH_CHECK( roiELInfo.isValid() );
const TrigRoiDescriptor* roi = *(roiELInfo.link);
const auto viewEL = previousDecision->objectLink<ViewContainer>( viewString() );
@@ -77,7 +78,6 @@ StatusCode TrigEgammaPrecisionElectronHypoAlgMT::execute( const EventContext& co
auto d = newDecisionIn( decisions, name() );
d->setObjectLink( "feature", ph );
TrigCompositeUtils::linkToPrevious( d, decisionInput().key(), counter );
- d->setObjectLink( roiString(), roiELInfo.link );
toolInput.emplace_back( d, roi, electronHandle.cptr()->at(cl), previousDecision );
validelectrons++;
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx
index 6d59b33f34d26405d000e79ec5bac50a7f776865..82ff5a1128462361e69b0f1a4de56ffd1c139ccf 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx
@@ -52,9 +52,10 @@ StatusCode TrigEgammaPrecisionPhotonHypoAlgMT::execute( const EventContext& cont
// loop over previous decisions
size_t counter=0;
for ( auto previousDecision: *previousDecisionsHandle ) {
- //get RoI
- auto roiELInfo = findLink<TrigRoiDescriptorCollection>( previousDecision, initialRoIString() );
-
+
+ //get updated RoI
+ auto roiELInfo = findLink<TrigRoiDescriptorCollection>( previousDecision, roiString() );
+
ATH_CHECK( roiELInfo.isValid() );
const TrigRoiDescriptor* roi = *(roiELInfo.link);
@@ -79,7 +80,6 @@ StatusCode TrigEgammaPrecisionPhotonHypoAlgMT::execute( const EventContext& cont
auto d = newDecisionIn( decisions, name() );
d->setObjectLink( "feature", ph );
TrigCompositeUtils::linkToPrevious( d, decisionInput().key(), counter );
- d->setObjectLink( roiString(), roiELInfo.link );
toolInput.emplace_back( d, roi, photonHandle.cptr()->at(cl), previousDecision );
validphotons++;
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index c8d782b99bf8d1c3f7d20f1e541bc7578ca00af9..e3e4dc9de66236498510be555420cae3cfabb0f2 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -71,7 +71,7 @@ HLT_2g10_loose_mu20_L1MU20:
stepFeatures:
0: 3
1: 3
- 2: 5
+ 2: 4
HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I:
eventCount: 0
HLT_2g20_tight_L12EM15VH:
@@ -585,7 +585,7 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10:
stepFeatures:
0: 4
1: 5
- 2: 6
+ 2: 4
3: 4
4: 4
5: 4
@@ -603,7 +603,7 @@ HLT_e17_lhvloose_nod0_L1EM15VH:
stepFeatures:
0: 6
1: 7
- 2: 7
+ 2: 5
3: 5
4: 5
HLT_e17_lhvloose_nod0_L1EM15VHI:
@@ -617,7 +617,7 @@ HLT_e17_lhvloose_nod0_L1EM15VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 4
HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
@@ -649,7 +649,7 @@ HLT_e24_lhvloose_L1EM20VH:
stepFeatures:
0: 6
1: 7
- 2: 7
+ 2: 5
3: 5
4: 5
HLT_e26_etcut_L1EM22VHI:
@@ -675,7 +675,7 @@ HLT_e26_lhloose_L1EM15VH:
stepFeatures:
0: 6
1: 7
- 2: 7
+ 2: 5
3: 5
4: 5
HLT_e26_lhloose_L1EM22VHI:
@@ -689,7 +689,7 @@ HLT_e26_lhloose_L1EM22VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 4
HLT_e26_lhmedium_L1EM15VH:
@@ -703,7 +703,7 @@ HLT_e26_lhmedium_L1EM15VH:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 4
HLT_e26_lhmedium_L1EM22VHI:
@@ -717,7 +717,7 @@ HLT_e26_lhmedium_L1EM22VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 4
HLT_e26_lhmedium_mu8noL1_L1EM22VHI:
@@ -733,7 +733,7 @@ HLT_e26_lhmedium_mu8noL1_L1EM22VHI:
stepFeatures:
0: 10
1: 10
- 2: 10
+ 2: 8
3: 8
4: 8
5: 4
@@ -749,7 +749,7 @@ HLT_e26_lhtight_L1EM15VH:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 4
HLT_e26_lhtight_L1EM22VHI:
@@ -763,7 +763,7 @@ HLT_e26_lhtight_L1EM22VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 4
HLT_e26_lhtight_gsf_L1EM22VHI:
@@ -777,7 +777,7 @@ HLT_e26_lhtight_gsf_L1EM22VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 4
HLT_e26_lhtight_ivarloose_L1EM22VHI:
@@ -791,7 +791,7 @@ HLT_e26_lhtight_ivarloose_L1EM22VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 3
HLT_e26_lhtight_ivarmedium_L1EM22VHI:
@@ -805,7 +805,7 @@ HLT_e26_lhtight_ivarmedium_L1EM22VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 3
HLT_e26_lhtight_ivartight_L1EM22VHI:
@@ -819,7 +819,7 @@ HLT_e26_lhtight_ivartight_L1EM22VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 3
HLT_e26_lhtight_nod0_L1EM22VHI:
@@ -833,7 +833,7 @@ HLT_e26_lhtight_nod0_L1EM22VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 4
HLT_e26_lhtight_nod0_L1EM24VHI:
@@ -847,7 +847,7 @@ HLT_e26_lhtight_nod0_L1EM24VHI:
stepFeatures:
0: 5
1: 6
- 2: 6
+ 2: 4
3: 4
4: 4
HLT_e300_etcut_L1EM22VHI:
@@ -897,8 +897,8 @@ HLT_e5_lhloose_L1EM3:
stepFeatures:
0: 60
1: 145
- 2: 78
- 3: 44
+ 2: 81
+ 3: 46
4: 7
HLT_e5_lhloose_noringer_L1EM3:
eventCount: 6
@@ -911,7 +911,7 @@ HLT_e5_lhloose_noringer_L1EM3:
stepFeatures:
0: 56
1: 128
- 2: 88
+ 2: 84
3: 46
4: 7
HLT_e5_lhmedium_L1EM3:
@@ -926,7 +926,7 @@ HLT_e5_lhmedium_L1EM3:
0: 58
1: 131
2: 76
- 3: 42
+ 3: 44
4: 5
HLT_e5_lhmedium_noringer_L1EM3:
eventCount: 4
@@ -954,7 +954,7 @@ HLT_e5_lhtight_L1EM3:
0: 57
1: 128
2: 74
- 3: 41
+ 3: 43
4: 5
HLT_e5_lhtight_nod0_L1EM3:
eventCount: 4
@@ -968,7 +968,7 @@ HLT_e5_lhtight_nod0_L1EM3:
0: 57
1: 128
2: 74
- 3: 41
+ 3: 43
4: 5
HLT_e5_lhtight_noringer_L1EM3:
eventCount: 4
@@ -981,7 +981,7 @@ HLT_e5_lhtight_noringer_L1EM3:
stepFeatures:
0: 45
1: 92
- 2: 60
+ 2: 61
3: 36
4: 5
HLT_e5_lhtight_noringer_nod0_L1EM3:
@@ -995,7 +995,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3:
stepFeatures:
0: 45
1: 92
- 2: 60
+ 2: 61
3: 36
4: 5
HLT_e60_lhmedium_L1EM22VHI:
@@ -1009,7 +1009,7 @@ HLT_e60_lhmedium_L1EM22VHI:
stepFeatures:
0: 2
1: 2
- 2: 4
+ 2: 2
3: 2
4: 2
HLT_e60_lhmedium_nod0_L1EM22VHI:
@@ -1023,7 +1023,7 @@ HLT_e60_lhmedium_nod0_L1EM22VHI:
stepFeatures:
0: 2
1: 2
- 2: 4
+ 2: 2
3: 2
4: 2
HLT_e7_etcut_L1EM3:
@@ -1053,7 +1053,7 @@ HLT_e7_lhmedium_mu24_L1MU20:
stepFeatures:
0: 18
1: 17
- 2: 17
+ 2: 15
3: 14
4: 4
5: 4
@@ -1085,7 +1085,7 @@ HLT_g12_loose_LArPEB_L1EM10VH:
stepFeatures:
0: 11
1: 11
- 2: 24
+ 2: 22
3: 6
4: 6
HLT_g140_etcut_L1EM22VHI:
@@ -1104,7 +1104,7 @@ HLT_g20_loose_L1EM15VH:
stepFeatures:
0: 9
1: 9
- 2: 17
+ 2: 15
3: 6
HLT_g20_loose_L1EM15VHI:
eventCount: 5
@@ -1116,7 +1116,7 @@ HLT_g20_loose_L1EM15VHI:
stepFeatures:
0: 6
1: 6
- 2: 11
+ 2: 9
3: 5
HLT_g20_loose_LArPEB_L1EM15:
eventCount: 6
@@ -1129,7 +1129,7 @@ HLT_g20_loose_LArPEB_L1EM15:
stepFeatures:
0: 9
1: 9
- 2: 17
+ 2: 15
3: 6
4: 6
HLT_g20_medium_L1EM15VH:
@@ -1142,7 +1142,7 @@ HLT_g20_medium_L1EM15VH:
stepFeatures:
0: 8
1: 8
- 2: 15
+ 2: 14
3: 6
HLT_g20_medium_L1EM15VHI:
eventCount: 5
@@ -1154,7 +1154,7 @@ HLT_g20_medium_L1EM15VHI:
stepFeatures:
0: 6
1: 6
- 2: 11
+ 2: 9
3: 5
HLT_g20_tight_L1EM15VH:
eventCount: 5
@@ -1166,7 +1166,7 @@ HLT_g20_tight_L1EM15VH:
stepFeatures:
0: 8
1: 8
- 2: 15
+ 2: 14
3: 5
HLT_g20_tight_L1EM15VHI:
eventCount: 5
@@ -1178,7 +1178,7 @@ HLT_g20_tight_L1EM15VHI:
stepFeatures:
0: 6
1: 6
- 2: 11
+ 2: 9
3: 5
HLT_g20_tight_icaloloose_L1EM15VH:
eventCount: 5
@@ -1190,7 +1190,7 @@ HLT_g20_tight_icaloloose_L1EM15VH:
stepFeatures:
0: 8
1: 8
- 2: 15
+ 2: 14
3: 5
HLT_g20_tight_icaloloose_L1EM15VHI:
eventCount: 5
@@ -1202,7 +1202,7 @@ HLT_g20_tight_icaloloose_L1EM15VHI:
stepFeatures:
0: 6
1: 6
- 2: 11
+ 2: 9
3: 5
HLT_g20_tight_icalomedium_L1EM15VH:
eventCount: 5
@@ -1214,7 +1214,7 @@ HLT_g20_tight_icalomedium_L1EM15VH:
stepFeatures:
0: 8
1: 8
- 2: 15
+ 2: 14
3: 5
HLT_g20_tight_icalomedium_L1EM15VHI:
eventCount: 5
@@ -1226,7 +1226,7 @@ HLT_g20_tight_icalomedium_L1EM15VHI:
stepFeatures:
0: 6
1: 6
- 2: 11
+ 2: 9
3: 5
HLT_g20_tight_icalotight_L1EM15VH:
eventCount: 0
@@ -1237,7 +1237,7 @@ HLT_g20_tight_icalotight_L1EM15VH:
stepFeatures:
0: 8
1: 8
- 2: 15
+ 2: 14
HLT_g20_tight_icalotight_L1EM15VHI:
eventCount: 0
stepCounts:
@@ -1247,7 +1247,7 @@ HLT_g20_tight_icalotight_L1EM15VHI:
stepFeatures:
0: 6
1: 6
- 2: 11
+ 2: 9
HLT_g22_tight_L1EM15VH:
eventCount: 5
stepCounts:
@@ -1258,7 +1258,7 @@ HLT_g22_tight_L1EM15VH:
stepFeatures:
0: 7
1: 7
- 2: 12
+ 2: 11
3: 5
HLT_g25_etcut_L1EM20VH:
eventCount: 7
@@ -1280,7 +1280,7 @@ HLT_g25_loose_L1EM20VH:
stepFeatures:
0: 9
1: 9
- 2: 17
+ 2: 15
3: 7
HLT_g25_medium_L1EM20VH:
eventCount: 6
@@ -1292,7 +1292,7 @@ HLT_g25_medium_L1EM20VH:
stepFeatures:
0: 7
1: 7
- 2: 12
+ 2: 11
3: 6
HLT_g25_medium_mu24_ivarmedium_L1MU20:
eventCount: 0
@@ -1308,7 +1308,7 @@ HLT_g25_medium_mu24_ivarmedium_L1MU20:
stepFeatures:
0: 4
1: 4
- 2: 6
+ 2: 4
3: 4
4: 4
5: 2
@@ -1324,7 +1324,7 @@ HLT_g25_tight_L1EM20VH:
stepFeatures:
0: 7
1: 7
- 2: 12
+ 2: 11
3: 5
HLT_g300_etcut_L1EM22VHI:
eventCount: 0
@@ -1342,7 +1342,7 @@ HLT_g35_loose_mu18_L1EM24VHI:
stepFeatures:
0: 4
1: 4
- 2: 6
+ 2: 4
3: 4
4: 4
5: 2
@@ -1359,7 +1359,7 @@ HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI:
stepFeatures:
0: 10
1: 10
- 2: 13
+ 2: 11
HLT_g3_loose_LArPEB_L1EM3:
eventCount: 9
stepCounts:
@@ -1385,7 +1385,7 @@ HLT_g40_loose_LArPEB_L1EM20VHI:
stepFeatures:
0: 5
1: 5
- 2: 10
+ 2: 8
3: 5
4: 5
HLT_g5_etcut_L1EM3:
@@ -1408,7 +1408,7 @@ HLT_g5_loose_L1EM3:
stepFeatures:
0: 56
1: 56
- 2: 103
+ 2: 101
3: 14
HLT_g5_medium_L1EM3:
eventCount: 9
@@ -1420,7 +1420,7 @@ HLT_g5_medium_L1EM3:
stepFeatures:
0: 48
1: 48
- 2: 81
+ 2: 83
3: 12
HLT_g5_tight_L1EM3:
eventCount: 8
@@ -1432,7 +1432,7 @@ HLT_g5_tight_L1EM3:
stepFeatures:
0: 45
1: 45
- 2: 73
+ 2: 76
3: 8
HLT_g60_loose_LArPEB_L1EM20VHI:
eventCount: 3
@@ -1445,7 +1445,7 @@ HLT_g60_loose_LArPEB_L1EM20VHI:
stepFeatures:
0: 3
1: 3
- 2: 7
+ 2: 5
3: 3
4: 3
HLT_g80_loose_LArPEB_L1EM20VHI:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index f55a38a8f6e371abf458eda87e21727c9b4a5484..9a40f028533276f508d408a4693959ffae12c4a1 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -429,7 +429,7 @@ HLT_e5_lhloose_L1EM3:
0: 19
1: 22
2: 13
- 3: 9
+ 3: 10
HLT_e5_lhloose_noringer_L1EM3:
eventCount: 0
stepCounts:
@@ -440,7 +440,7 @@ HLT_e5_lhloose_noringer_L1EM3:
stepFeatures:
0: 15
1: 22
- 2: 23
+ 2: 22
3: 12
HLT_e5_lhmedium_L1EM3:
eventCount: 0
@@ -452,8 +452,8 @@ HLT_e5_lhmedium_L1EM3:
stepFeatures:
0: 21
1: 24
- 2: 15
- 3: 11
+ 2: 16
+ 3: 12
HLT_e5_lhmedium_noringer_L1EM3:
eventCount: 0
stepCounts:
@@ -476,8 +476,8 @@ HLT_e5_lhtight_L1EM3:
stepFeatures:
0: 17
1: 17
- 2: 10
- 3: 7
+ 2: 11
+ 3: 8
HLT_e5_lhtight_nod0_L1EM3:
eventCount: 0
stepCounts:
@@ -488,8 +488,8 @@ HLT_e5_lhtight_nod0_L1EM3:
stepFeatures:
0: 17
1: 17
- 2: 10
- 3: 7
+ 2: 11
+ 3: 8
HLT_e5_lhtight_noringer_L1EM3:
eventCount: 0
stepCounts:
@@ -652,7 +652,7 @@ HLT_g5_loose_L1EM3:
stepFeatures:
0: 15
1: 15
- 2: 28
+ 2: 27
3: 3
HLT_g5_medium_L1EM3:
eventCount: 3