Merge branch '21.2-UpdateATToFixPhotonError' into '21.2'

AnalysisTop - Removing TightCaloOnly from photon isolation configuration

See merge request atlas/athena!9063

Former-commit-id: c018490f40fc2f24f73f189025f10b15c16a6f35

PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopEgammaCPTools.cxx

@@ -211,8 +211,7 @@ StatusCode EgammaCPTools::setupCalibration() {
   // To retrieve Isolation Eff scale factors
   // N.B. Naming for isolation working points for AsgPhotonEfficiencyCorrectionTool isolation scale factors
   // are different than those for the IsolationCorrectionTool (preceded by FixedCut)
-  std::set<std::string> photon_isolations = {"TightCaloOnly",
-					     "Tight",
+  std::set<std::string> photon_isolations = {"Tight",
 					     "Loose",};
   for (const std::string& isoWP : photon_isolations) {
     std::string photonIsoSFName = "AsgPhotonEfficiencyCorrectionTool_IsoSF" + isoWP;