Protect JVFCorrName for r20.7 (#948)

UCATLAS · Jul 13, 2017 · efff8a6 · efff8a6
1 parent 043137a
commit efff8a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Root/JetCalibrator.cxx b/Root/JetCalibrator.cxx
@@ -345,7 +345,10 @@ EL::StatusCode JetCalibrator :: initialize ()
   if( m_redoJVT ){
     setToolName(m_JVTUpdateTool_handle);
     ANA_CHECK( m_JVTUpdateTool_handle.setProperty("JVTFileName", PathResolverFindCalibFile("JetMomentTools/JVTlikelihood_20140805.root")));
-    ANA_CHECK( m_JVTUpdateTool_handle.setProperty("JVFCorrName", m_JvtAuxName) )
+
+    if( ! m_JvtAuxName.empty() ){
+      ANA_CHECK( m_JVTUpdateTool_handle.setProperty("JVFCorrName", m_JvtAuxName) )
+    }
     ANA_CHECK( m_JVTUpdateTool_handle.setProperty("OutputLevel", msg().level()));
     ANA_CHECK( m_JVTUpdateTool_handle.retrieve());
     ANA_MSG_DEBUG("Retrieved tool: " << m_JVTUpdateTool_handle);

diff --git a/xAODAnaHelpers/JetCalibrator.h b/xAODAnaHelpers/JetCalibrator.h
@@ -103,8 +103,8 @@ class JetCalibrator : public xAH::Algorithm
   /// @brief Recalculate JVT using the calibrated jet pT
   bool m_redoJVT = false;
 
-  /// @brief Name of Jvt aux decoration.  Was "JvtJvfcorr" in Rel 20.7, is now "JVFCorr" in Rel 21. 
-  std::string m_JvtAuxName = "JVFCorr";
+  /// @brief Name of Jvt aux decoration.  Was "JvtJvfcorr" in Rel 20.7, is now "JVFCorr" in Rel 21. Leave empty to use JetMomentTools default.  This must be left empty for RootCore (r20.7) code! 
+  std::string m_JvtAuxName = "";
   /// @brief Sort the processed container elements by transverse momentum
   bool    m_sort = true;
   /// @brief Apply jet cleaning to parent jet