Merge branch 'fix_energy_ringer_selector' into 'master'

fix the bug ringer et configuration and update the references

See merge request !38528

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastCaloHypoToolInc.cxx

@@ -390,12 +390,13 @@ bool TrigEgammaFastCaloHypoToolInc::decide_ringer ( const ITrigEgammaFastCaloHyp
   
   ATH_MSG_DEBUG("Et = "<< et << " Eta = "<<eta << " mu = " << avgmu << "rsize = "<< refRings.size()); 
 
-  auto output = m_selectorTool.calculate( refRings, et, eta, avgmu, propagate_time, preproc_time );
+  // use the energy (in MeV) and eta from emCluster
+  auto output = m_selectorTool.calculate( refRings, emCluster->et(), emCluster->eta(), avgmu, propagate_time, preproc_time );
   rnnOutMon = output;
   ATH_MSG_DEBUG(name()<< " generate as NN output " <<  output );
   
   decide_time.start();
-  bool accept = m_selectorTool.accept(output, et,eta,avgmu);
+  bool accept = m_selectorTool.accept(output, emCluster->et(),emCluster->eta(),avgmu);
   decide_time.stop();
 
   total_time.stop();

Trigger/TrigHypothesis/TrigMultiVarHypo/src/tools/RingerSelectorTool.cxx

@@ -387,7 +387,7 @@ const {
 
   eta = std::fabs(eta);
   if(eta>2.50) eta=2.50;///fix for events out of the ranger
-  //et  = et*1e-3; ///in GeV
+  et  = et*1e-3; ///in GeV
   
   if(m_discriminators.size() > 0){
     for(unsigned i=0; i<m_discriminators.size(); ++i){

Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

@@ -538,6 +538,16 @@ HLT_e17_lhvloose_nod0_L1EM15VH:
     4: 5
 HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+  stepFeatures:
+    0: 2
+    1: 20
+    2: 3
+    3: 2
 HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH:
   eventCount: 0
 HLT_e24_lhmedium_g25_medium_L12EM20VH:
@@ -571,19 +581,19 @@ HLT_e26_etcut_L1EM22VHI:
     2: 7
     3: 7
 HLT_e26_lhloose_L1EM15VH:
-  eventCount: 5
+  eventCount: 4
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
-    4: 5
+    0: 5
+    1: 5
+    2: 5
+    3: 5
+    4: 4
   stepFeatures:
-    0: 6
-    1: 80
-    2: 9
-    3: 6
-    4: 5
+    0: 5
+    1: 63
+    2: 8
+    3: 5
+    4: 4
 HLT_e26_lhloose_L1EM22VHI:
   eventCount: 4
   stepCounts:
@@ -601,16 +611,16 @@ HLT_e26_lhloose_L1EM22VHI:
 HLT_e26_lhmedium_L1EM15VH:
   eventCount: 4
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 5
+    1: 5
+    2: 5
+    3: 5
     4: 4
   stepFeatures:
-    0: 6
-    1: 80
-    2: 9
-    3: 6
+    0: 5
+    1: 63
+    2: 8
+    3: 5
     4: 4
 HLT_e26_lhmedium_L1EM22VHI:
   eventCount: 4
@@ -647,16 +657,16 @@ HLT_e26_lhmedium_mu8noL1_L1EM22VHI:
 HLT_e26_lhtight_L1EM15VH:
   eventCount: 4
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 5
+    1: 5
+    2: 5
+    3: 5
     4: 4
   stepFeatures:
-    0: 6
-    1: 80
-    2: 9
-    3: 6
+    0: 5
+    1: 63
+    2: 8
+    3: 5
     4: 4
 HLT_e26_lhtight_L1EM22VHI:
   eventCount: 4
@@ -779,19 +789,19 @@ HLT_e5_etcut_L1EM3:
     2: 190
     3: 115
 HLT_e5_lhloose_L1EM3:
-  eventCount: 5
+  eventCount: 4
   stepCounts:
     0: 18
     1: 18
     2: 18
     3: 18
-    4: 5
+    4: 4
   stepFeatures:
-    0: 54
-    1: 575
-    2: 88
-    3: 50
-    4: 6
+    0: 55
+    1: 570
+    2: 90
+    3: 51
+    4: 5
 HLT_e5_lhloose_noringer_L1EM3:
   eventCount: 5
   stepCounts:
@@ -815,10 +825,10 @@ HLT_e5_lhmedium_L1EM3:
     3: 18
     4: 4
   stepFeatures:
-    0: 53
-    1: 570
-    2: 86
-    3: 49
+    0: 54
+    1: 565
+    2: 88
+    3: 50
     4: 5
 HLT_e5_lhmedium_noringer_L1EM3:
   eventCount: 4
@@ -843,10 +853,10 @@ HLT_e5_lhtight_L1EM3:
     3: 18
     4: 4
   stepFeatures:
-    0: 51
-    1: 551
-    2: 82
-    3: 47
+    0: 52
+    1: 546
+    2: 84
+    3: 48
     4: 5
 HLT_e5_lhtight_nod0_L1EM3:
   eventCount: 4
@@ -857,10 +867,10 @@ HLT_e5_lhtight_nod0_L1EM3:
     3: 18
     4: 4
   stepFeatures:
-    0: 51
-    1: 551
-    2: 82
-    3: 47
+    0: 52
+    1: 546
+    2: 84
+    3: 48
     4: 5
 HLT_e5_lhtight_noringer_L1EM3:
   eventCount: 4

Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref

@@ -278,6 +278,12 @@ HLT_cscmon_CSCPEB_L1All:
     0: 20
 HLT_e12_lhloose_2mu10_L12MU10:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+  stepFeatures:
+    0: 1
+    1: 14
 HLT_e140_lhloose_L1EM22VHI:
   eventCount: 0
 HLT_e140_lhloose_nod0_L1EM22VHI:
@@ -371,13 +377,13 @@ HLT_e5_etcut_L1EM3:
 HLT_e5_lhloose_L1EM3:
   eventCount: 0
   stepCounts:
-    0: 9
-    1: 8
+    0: 10
+    1: 9
     2: 8
     3: 8
   stepFeatures:
-    0: 18
-    1: 42
+    0: 19
+    1: 56
     2: 21
     3: 14
 HLT_e5_lhloose_noringer_L1EM3:
@@ -395,15 +401,15 @@ HLT_e5_lhloose_noringer_L1EM3:
 HLT_e5_lhmedium_L1EM3:
   eventCount: 0
   stepCounts:
-    0: 9
-    1: 8
+    0: 10
+    1: 9
     2: 8
     3: 8
   stepFeatures:
-    0: 19
-    1: 44
-    2: 21
-    3: 15
+    0: 21
+    1: 60
+    2: 23
+    3: 16
 HLT_e5_lhmedium_noringer_L1EM3:
   eventCount: 0
   stepCounts:
@@ -419,25 +425,25 @@ HLT_e5_lhmedium_noringer_L1EM3:
 HLT_e5_lhtight_L1EM3:
   eventCount: 0
   stepCounts:
-    0: 8
-    1: 7
+    0: 9
+    1: 8
     2: 7
     3: 7
   stepFeatures:
-    0: 16
-    1: 32
+    0: 17
+    1: 46
     2: 18
     3: 12
 HLT_e5_lhtight_nod0_L1EM3:
   eventCount: 0
   stepCounts:
-    0: 8
-    1: 7
+    0: 9
+    1: 8
     2: 7
     3: 7
   stepFeatures:
-    0: 16
-    1: 32
+    0: 17
+    1: 46
     2: 18
     3: 12
 HLT_e5_lhtight_noringer_L1EM3: