Merge remote-tracking branch 'origin/main' into fix/tau-include

miholzbo · Jul 31, 2024 · 4772343 · 4772343
2 parents 75a9260 + 2311a29
commit 4772343
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,28 +19,6 @@ jobs:
         release_type:
           - analysisbase
         release_version:
-          - 24.2.37
-          - 24.2.38
-          - 24.2.39
-          - 24.2.40
-          - 24.2.41
-          - 25.2.0
-          - 25.2.1
-          - 25.2.2
-          - 25.2.3
-          - 25.2.4
-          - 25.2.5
-          - 25.2.6
-          - 25.2.7
-          - 25.2.8
-          - 25.2.9
-          - 25.2.10
-          - 25.2.11
-          - 25.2.12
-          - 25.2.13
-          - 25.2.14
-          - 25.2.15
-          - 25.2.16
           - 25.2.17
           - 25.2.18
           - 25.2.19

diff --git a/Root/MuonEfficiencyCorrector.cxx b/Root/MuonEfficiencyCorrector.cxx
@@ -151,6 +151,9 @@ EL::StatusCode MuonEfficiencyCorrector :: initialize ()
     ANA_MSG_WARNING("Overriding muon efficiency calibration release to " << m_overrideCalibRelease);
     ANA_CHECK( m_muRecoSF_tool.setProperty("CalibrationRelease", m_overrideCalibRelease ));
   }
+  if (m_doLRT) {
+    ANA_CHECK( m_muRecoSF_tool.setProperty("UseLRT", true ));
+  }
   ANA_CHECK(m_muRecoSF_tool.retrieve());
   assert(m_muRecoSF_tool.isInitialized());
 

diff --git a/Root/MuonSelector.cxx b/Root/MuonSelector.cxx
@@ -240,6 +240,9 @@ EL::StatusCode MuonSelector :: initialize ()
   ANA_CHECK( m_muonSelectionTool_handle.setProperty( "MuQuality", m_muonQuality ));
   ANA_CHECK( m_muonSelectionTool_handle.setProperty( "IsRun3Geo", m_isRun3Geo ));
   ANA_CHECK( m_muonSelectionTool_handle.setProperty( "OutputLevel", msg().level() ));
+  if (m_doLRT) {
+    ANA_CHECK( m_muonSelectionTool_handle.setProperty( "UseLRT", true ));
+  }
   ANA_CHECK( m_muonSelectionTool_handle.retrieve());
   ANA_MSG_DEBUG("Retrieved tool: " << m_muonSelectionTool_handle);
 
@@ -802,11 +805,6 @@ int MuonSelector :: passCuts( const xAOD::Muon* muon, const xAOD::Vertex *primar
 
   if ( m_doLRT ) {
     static SG::AuxElement::Decorator< char > passIDcuts("passIDcuts");
-    static SG::AuxElement::Accessor< char > isLRTmuon("isLRT");
-    passIDcuts( *muon ) = m_muonSelectionTool_handle->passedIDCuts( *muon ) ? 1 : 0;
-    if ( isLRTmuon.isAvailable(*muon) && isLRTmuon(*muon) ) { //checks if a muon is LRT
-      acceptMuon = this_quality <= m_muonQuality; //LRT WP do not have the ID cuts applied so use getQuality()
-    }
   }
 
   ANA_MSG_DEBUG( "Doing muon quality" );

diff --git a/xAODAnaHelpers/MuonEfficiencyCorrector.h b/xAODAnaHelpers/MuonEfficiencyCorrector.h
@@ -83,6 +83,9 @@ class MuonEfficiencyCorrector : public xAH::Algorithm
   std::string   m_outputSystNamesTrig = "MuonEfficiencyCorrector_TrigSyst";
   std::string   m_outputSystNamesTTVA = "MuonEfficiencyCorrector_TTVASyst";
 
+  /// @brief Turn on if using LRT muons
+  bool          m_doLRT = false;
+
 private:
   int m_numEvent;         //!
   int m_numObject;        //!