Merge branch '21.2-UFO-sys-fix' into '21.2'

Don't setup JetUncertaintiesTool for UFO jets

See merge request atlas/athena!37982

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

@@ -445,10 +445,12 @@ namespace top {
     // jets) are applied
     bool JERisMC = true;
 
-    m_jetUncertaintiesToolLargeR
-      = setupJetUncertaintiesTool("JetUncertaintiesToolLargeR",
-                                  jetCalibrationNameLargeR, MC_type, JERisMC,
-                                  configDir + "/R10_" + largeRJESJMS_config + ".config", nullptr, "", calibArea);
+    if(m_config->largeRJESJMSConfig() != "UFOSDMass"){
+      m_jetUncertaintiesToolLargeR
+	= setupJetUncertaintiesTool("JetUncertaintiesToolLargeR",
+				    jetCalibrationNameLargeR, MC_type, JERisMC,
+				    configDir + "/R10_" + largeRJESJMS_config + ".config", nullptr, "", calibArea);
+    }
 
     return StatusCode::SUCCESS;
   }

PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx

@@ -92,8 +92,10 @@ namespace top {
     if (m_config->useLargeRJets()) {
       top::check(m_jetCalibrationToolLargeR.retrieve(),
                  "Failed to retrieve JetCalibrationToolLargeR");
-      top::check(m_jetUncertaintiesToolLargeR.retrieve(),
-                 "Failed to retrieve JetUncertaintiesToolLargeR");
+      if(m_config->largeRJESJMSConfig() != "UFOSDMass"){
+	top::check(m_jetUncertaintiesToolLargeR.retrieve(),
+		   "Failed to retrieve JetUncertaintiesToolLargeR");
+      }
     }
 
     if (m_config->getDerivationStream() == "PHYS") {