making combohypo more inclusive by replacing PhotonContainer by EgammaContainer

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDiphotonDPhiHypoTool.cxx

@@ -42,10 +42,10 @@ StatusCode TrigEgammaDiphotonDPhiHypoTool::initialize()
 bool TrigEgammaDiphotonDPhiHypoTool::executeAlg(std::vector<LegDecision> &combination) const {
 
 //retrieve the electrons 
-  std::vector<ElementLink<xAOD::PhotonContainer>> selected_photons;
+  std::vector<ElementLink<xAOD::EgammaContainer>> selected_photons;
   for (auto el: combination){
     auto EL= el.second;    
-    auto photonLink = TrigCompositeUtils::findLink<xAOD::PhotonContainer>( *EL, featureString() ).link;
+    auto photonLink = TrigCompositeUtils::findLink<xAOD::EgammaContainer>( *EL, featureString() ).link;
     selected_photons.push_back(photonLink);
   }
   auto photonLink1=selected_photons[0];

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDiphotonDPhiHypoTool.h

@@ -24,6 +24,7 @@
 #include "xAODTracking/TrackParticleContainer.h"
 #include "xAODTrigEgamma/TrigPhoton.h"
 #include "xAODEgamma/PhotonContainer.h"
+#include "xAODEgamma/EgammaContainer.h"
 
 #include "TrigCompositeUtils/HLTIdentifier.h"
 #include "TrigCompositeUtils/TrigCompositeUtils.h"

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py

@@ -166,7 +166,7 @@ def setupMenu():
         ChainProp(name='HLT_g140_etcut_L1EM22VHI', groups=SinglePhotonGroup),
 
         #ATR-21882
-        ChainProp(name='HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I', l1SeedThresholds=['EM12I'], groups=MultiPhotonGroup),
+        ChainProp(name='HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I', l1SeedThresholds=['EM12'], groups=MultiPhotonGroup),
         ChainProp(name='HLT_2g15_tight_dPhi15_L12EM7', groups=MultiPhotonGroup),
         ChainProp(name='HLT_g300_etcut_L1EM22VHI', groups=SinglePhotonGroup),
     ]