From 256d6033892240a5a6fbdeb325dc6fa0a170502d Mon Sep 17 00:00:00 2001
From: Johannes Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Wed, 12 Sep 2018 13:24:06 +0200
Subject: [PATCH] If it fits it sits
Former-commit-id: 2f9d33b9ff452cfd56b2f2a592d8fc456e97c63e
---
.../MuonMomentumCorrectionsDict.h | 2 +-
.../Root/MuonCalibrationPeriodTool.cxx | 10 +++++-----
.../components/MuonCalibrationAndSmearing_entries.cxx | 3 +++
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/MuonMomentumCorrectionsDict.h b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/MuonMomentumCorrectionsDict.h
index 1029353b1875..ff4b5c6c429e 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/MuonMomentumCorrectionsDict.h
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/MuonMomentumCorrectionsDict.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONMOMENTUMCORRECTIONS_MUONMOMENTUMCORRECTIONSDICT_H
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationPeriodTool.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationPeriodTool.cxx
index 78833a705333..cb49b62f1e62 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationPeriodTool.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationPeriodTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
// EDM include(s):
@@ -20,14 +20,14 @@ namespace CP {
// https://gitlab.cern.ch/atlas/athena/blob/21.2/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYObjDef_xAOD.cxx#L2438
static const unsigned int last_run_16 = 320000;
static const unsigned int last_run_17 = 350000;
+ // Not the appropiate value but okay we can fix it afterwards
static const unsigned int last_run_18 = 500000;
-
+
const xAOD::EventInfo* info = nullptr;
ATH_CHECK(evtStore()->retrieve(info, "EventInfo"));
- // Let's try the FileMetaData
+
unsigned int run = info->runNumber();
- bool isData = info->eventType(xAOD::EventInfo::IS_SIMULATION);
-
+ bool isData = info->eventType(xAOD::EventInfo::IS_SIMULATION);
if ( (isData && run <= last_run_16) || (!isData && run == mc16a_period_number) ) m_activeTool = m_calibTool_1516.operator->();
else if ( (isData && run <= last_run_17) || (!isData && run == mc16d_period_number) ) m_activeTool = m_calibTool_17.operator->();
else if ( (isData && run <= last_run_18) || (!isData && run == mc16e_period_number) ) m_activeTool = m_calibTool_18.operator->();
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx
index 1a287ed49e6d..16a6e64f9b81 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Gaudi/Athena include(s):
#include "GaudiKernel/DeclareFactoryEntries.h"
--
GitLab