Update packages:TrigEgammaEmulationTool TrigEgammaMatchingTool…

Update packages:TrigEgammaEmulationTool TrigEgammaMatchingTool TrigEgammaMonitoring from upstream/21.0 to upstream/master via pseudo-merge

Following in ATR-19005.

The result of the test_physics_pp_v7_primaries_build.sh are available in /afs/cern.ch/user/f/fernando/public/ATR-19005/pseudomerge_fernando_31_Dec_TrigEgammaEmulationTool_to_master/.

There are arrors unrelated to these packages.

TrigEgammaAnalysisTools pseudomerge fialed. So not included in this merge

Most of the conflicts resolved in favor of 21.0-TrigMC. Except those related to changes in interfaces or in messaging, that were updated in master and not in 21.0-TrigMC. Many conflicts resolved on many files. If doubts, please opend discussion or follow up in ATR-19005.

Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEFCaloSelectorTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************
@@ -88,8 +88,10 @@ bool TrigEgammaEFCaloSelectorTool::emulation(const xAOD::IParticleContainer *con
       if (el->caloCluster()->et()*1.e-3 < etthr) continue;
       //ATH_MSG_INFO("Original LHValue: " << el->likelihoodValue("LHCaloValue"));
       //calo cuts for photon and electron using the same asgTool
-      if (!ApplyCaloPid(el, info.pidname, avgmu)) continue;
-      ATH_MSG_DEBUG("Apply Pid " << info.pidname);
+      if(info.applyEFCaloPid){
+        if (!ApplyCaloPid(el, info.pidname, avgmu)) continue;
+        ATH_MSG_DEBUG("Apply Pid " << info.pidname);
+      }
       ATH_MSG_DEBUG("Apply Et cut " << etthr << " cluster Et " << el->caloCluster()->et()*1.e-3);
       bitAccept.set(bit-1,true); //at least one electron
     }