diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/CMakeLists.txt b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/CMakeLists.txt
index 69c54480a94333619898c3359290c413588e7ec5..500c5cc419660677b4f0eda32c37b97b34f4fe4b 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/CMakeLists.txt
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/CMakeLists.txt
@@ -63,3 +63,7 @@ atlas_add_executable( graph_to_function
# Install files from the package:
atlas_install_joboptions( share/*.py )
+
+# This will allow us to put files into data/ to test new calibration files
+# Uncomment this line after putting test files into data/, then run "make" again to install.
+# atlas_install_data( data/*.root )
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackBiasingTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackBiasingTool.h
index 83c86dcdb7183764b681bc7642aef2fa950dd3b4..4029de8f6052faa78055ce4752ea5be14ad54186 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackBiasingTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackBiasingTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_IINDETTRACKBIASINGTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_IINDETTRACKBIASINGTOOL_H
#include "AsgTools/IAsgTool.h"
#include "PATInterfaces/CorrectionCode.h"
@@ -49,3 +50,5 @@ namespace InDet {
}; // class IInDetTrackBiasingTool
} // namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackSmearingTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackSmearingTool.h
index ca3f273c599a4e9bc7f1edc154142fe44730a312..446e8dcc24bc7da66f866fc3252739f59c50ff10 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackSmearingTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackSmearingTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_IINDETTRACKSMEARINGTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_IINDETTRACKSMEARINGTOOL_H
// Framework include(s):
#include "AsgTools/IAsgTool.h"
@@ -58,3 +59,5 @@ namespace InDet {
};/// class IInDetTrackSmearingTool
} /// namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackTruthFilterTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackTruthFilterTool.h
index 4e97f786fd6a92921f0481e5a324e73915c345bc..1604f311c024b0f0e4c22ae6812ff37c88a1bc8f 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackTruthFilterTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackTruthFilterTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_IINDETTRACKTRUTHFILTERTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_IINDETTRACKTRUTHFILTERTOOL_H
#include "AsgTools/IAsgTool.h"
#include "PATInterfaces/ISystematicsTool.h"
@@ -50,3 +51,5 @@ namespace InDet {
}; // class IInDetTrackTruthFilterTool
} // namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackTruthOriginTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackTruthOriginTool.h
index 1261a47df48557152a9674f0e16b7fba2eacf68b..9f781d2b9e0ca32b5c88757bbca852587cd41cce 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackTruthOriginTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IInDetTrackTruthOriginTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_IINDETTRACKTRUTHORIGINTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_IINDETTRACKTRUTHORIGINTOOL_H
#include "AsgTools/IAsgTool.h"
#include "xAODTracking/TrackParticle.h"
@@ -34,3 +35,5 @@ namespace InDet {
}; // class IInDetTrackTruthOriginTool
} // namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IJetTrackFilterTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IJetTrackFilterTool.h
index 19991504c0e000729a5d358d19dadd3f85f4661f..5e4b74ae3d0346f504c93cdc1a79662139b84aa2 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IJetTrackFilterTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/IJetTrackFilterTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_IJETTRACKFILTERTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_IJETTRACKFILTERTOOL_H
#include "AsgTools/IAsgTool.h"
#include "PATInterfaces/ISystematicsTool.h"
@@ -47,3 +48,5 @@ namespace InDet {
}; // class IJetTrackFilterTool
} // namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackBiasingTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackBiasingTool.h
index b2eabb416b18d56a443b7687d36d9748e35d734d..52e80bf1cb0e23e0fec9a0db0b614b1a5d0c163d 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackBiasingTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackBiasingTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_INDETTRACKBIASINGTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_INDETTRACKBIASINGTOOL_H
#include "InDetTrackSystematicsTools/IInDetTrackBiasingTool.h"
#include "AsgTools/AsgTool.h"
@@ -94,3 +95,5 @@ namespace InDet {
}; // class InDetTrackBiasingTool
} // namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSmearingTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSmearingTool.h
index e57445c05edb41abbbd6a18864a8cc9f56dc7a93..4631c6123ba03f484ee5c5d6a33bd425ad806a0b 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSmearingTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSmearingTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_INDETTRACKSMEARINGTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_INDETTRACKSMEARINGTOOL_H
// Framework include(s):
#include "AsgTools/AsgTool.h"
@@ -92,3 +93,5 @@ namespace InDet {
}; /// class InDetTrackSmearingTool
} /// namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSystematics.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSystematics.h
index 75a70de53bdf1fe125e89bff2424d6a3afe9ef2b..5f5566d395955bac407bedb37cb9e7a047b0adff 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSystematics.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSystematics.h
@@ -3,7 +3,9 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_INDETTRACKSYSTEMATICS_H
+#define INDETTRACKSYSTEMATICSTOOLS_INDETTRACKSYSTEMATICS_H
+
#include "PATInterfaces/SystematicVariation.h"
#include <unordered_map>
@@ -73,3 +75,4 @@ namespace InDet {
}
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSystematicsTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSystematicsTool.h
index b3ff001dc598ce93b5eafd13cf852f4a40276329..8c34f8f347aa0ebd278d3ca29ce416202a4211a3 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSystematicsTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackSystematicsTool.h
@@ -3,7 +3,9 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_INDETTRACKSYSTEMATICSTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_INDETTRACKSYSTEMATICSTOOL_H
+
#include <string>
#include <map>
#include <memory>
@@ -80,3 +82,5 @@ StatusCode InDet::InDetTrackSystematicsTool::initObject(T*& obj, std::string roo
F->Close();
return StatusCode::SUCCESS;
}
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthFilterTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthFilterTool.h
index 159d732936d70780664df987c2a6bd39322ae9ca..717817e06b07166bc068a3a5406de54bce8a15b9 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthFilterTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthFilterTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_INDETTRACKTRUTHFILTERTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_INDETTRACKTRUTHFILTERTOOL_H
#include "InDetTrackSystematicsTools/IInDetTrackTruthFilterTool.h"
#include "AsgTools/AsgTool.h"
@@ -51,7 +52,8 @@ namespace InDet {
// right now this returns a bool; if we want to implement the ASG selection tool interface then this will need to change to a TAccept
virtual bool accept(const xAOD::TrackParticle* track) const override;
virtual bool selectTrack(const xAOD::TrackParticle* track) const override
- __attribute__ ((deprecated("Use accept(track) instead to conform with AsgSelectionTool interface")));
+ __attribute__ ((deprecated("Use accept(track) instead to conform with AsgSelectionTool interface")))
+ {return accept(track);}
/// returns: whether the tool is affected by the systematic
virtual bool isAffectedBySystematic( const CP::SystematicVariation& ) const;
@@ -104,3 +106,5 @@ namespace InDet {
}; // class InDetTrackTruthFilterTool
} // namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthOriginDefs.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthOriginDefs.h
index 796027395b1175870c8f0210ad56a97a53dfedbd..a106b2c8a4338ee620425078748d08d5deb6f169 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthOriginDefs.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthOriginDefs.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_INDETTRACKTRUTHORIGINDEFS_H
+#define INDETTRACKSYSTEMATICSTOOLS_INDETTRACKTRUTHORIGINDEFS_H
/**
Definition of track truth origin types
@@ -121,3 +122,4 @@ namespace InDet {
} // namespace InDet
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthOriginTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthOriginTool.h
index af6c8267c106144081d4c60a90510ac0f899a472..094c611660603846819d5a558886136c37e3d24e 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthOriginTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/InDetTrackTruthOriginTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_INDETTRACKTRUTHORIGINTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_INDETTRACKTRUTHORIGINTOOL_H
#include "IInDetTrackTruthOriginTool.h"
#include "AsgTools/AsgTool.h"
@@ -53,3 +54,5 @@ private:
}; // class InDetTrackTruthOriginTool
} // namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/JetTrackFilterTool.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/JetTrackFilterTool.h
index 78e541b8199c704119c801206dbe982b2eb943ca..c4be7d2a93dae0b8a726d723d1ce6b7dafcd4eb0 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/JetTrackFilterTool.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/InDetTrackSystematicsTools/JetTrackFilterTool.h
@@ -3,7 +3,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_JETTRACKFILTERTOOL_H
+#define INDETTRACKSYSTEMATICSTOOLS_JETTRACKFILTERTOOL_H
#include "InDetTrackSystematicsTools/IJetTrackFilterTool.h"
#include "AsgTools/AsgTool.h"
@@ -77,3 +78,5 @@ namespace InDet {
}; // class JetTrackFilterTool
} // namespace InDet
+
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackBiasingTool.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackBiasingTool.cxx
index 09d40694262cbd82a88c0c0206e8104d260dc8e0..c8b9f574a0e4376c47351e2b78386ccf43d95fe2 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackBiasingTool.cxx
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackBiasingTool.cxx
@@ -139,49 +139,29 @@ namespace InDet {
}
if (runNumber >= 286282 && runNumber <= 287931) {
ATH_MSG_INFO( "Calibrating for 2015 HI and 5 TeV pp runs (286282 to 287931)." );
- ATH_MSG_INFO( "Note: no d0 and z0 maps are implemented." );
- rootfileName = "5TeVHI2015_sagittaBias_pTmethod.root";
+ ATH_MSG_ERROR( "The 5 TeV and heavy ion runs do not have biasing maps for release 21. "
+ "Contact the tracking CP group to discuss the derivation of these maps." );
m_biasD0Histogram = nullptr;
m_biasZ0Histogram = nullptr;
- ATH_CHECK ( initObject<TH2>(m_biasQoverPsagittaHistogram, rootfileName, "h_deltaSagittaMap") );
- rootfileName = "5TeVHI2015_sagittaBias_pTmethod_statUncertainty.root";
+ m_biasQoverPsagittaHistogram = nullptr;
m_biasD0HistError = nullptr;
m_biasZ0HistError = nullptr;
- ATH_CHECK ( initObject<TH2>(m_biasQoverPsagittaHistError, rootfileName, "h_deltaSagittaMap_statErr") );
- } else if (runNumber < 297730) {
- ATH_MSG_INFO( "Calibrating for 2015 runs after 287931 and before 297730." );
- rootfileName = "correctionmaps_HighGran_IBLon_NoGRL_INDET_2015_datareproAll25ns_correctedEp.root";
- ATH_CHECK ( initObject<TH2>(m_biasD0Histogram, rootfileName, "d0CorrectionVsEtaPhi") );
- ATH_CHECK ( initObject<TH2>(m_biasZ0Histogram, rootfileName, "z0CorrectionVsEtaPhi") );
- ATH_CHECK ( initObject<TH2>(m_biasQoverPsagittaHistogram, rootfileName, "LambdaCorrectionVsEtaPhi_reweightedToEP") );
- m_biasD0HistError = m_biasZ0HistError = m_biasQoverPsagittaHistError = nullptr;
- } else if (runNumber <= 300908) {
- ATH_MSG_INFO( "Calibrating for 2016 runs before IBL temperature change (297730 to 300908)." ); // pre-TSI: 297730 - 300908
- rootfileName = "CorrectionsResult_PreTSI.root";
- ATH_CHECK ( initObject<TH2>(m_biasD0Histogram, rootfileName, "d0/theNominal_d0") );
- ATH_CHECK ( initObject<TH2>(m_biasZ0Histogram, rootfileName, "z0/theNominal_z0") );
- ATH_CHECK ( initObject<TH2>(m_biasQoverPsagittaHistogram, rootfileName, "sagitta/theNominal_sagitta") );
- rootfileName = "UncertaintiesResult_PreTSI.root";
- ATH_CHECK ( initObject<TH2>(m_biasD0HistError, rootfileName, "d0/theUncertainty_d0") );
- ATH_CHECK ( initObject<TH2>(m_biasZ0HistError, rootfileName, "z0/theUncertainty_z0") );
- ATH_CHECK ( initObject<TH2>(m_biasQoverPsagittaHistError, rootfileName, "sagitta/theUncertainty_sagitta") );
- } else if (runNumber <= 304178) { // pre d0 fix: 301912 - 304178
- ATH_MSG_INFO( "Calibrating for 2016 runs after IBL temperature change, before d0 fix (301912 to 304178)." );
- rootfileName = "CorrectionsResult_Pred0fix.root";
- ATH_CHECK ( initObject<TH2>(m_biasD0Histogram, rootfileName, "d0/theNominal_d0") );
- ATH_CHECK ( initObject<TH2>(m_biasZ0Histogram, rootfileName, "z0/theNominal_z0") );
- ATH_CHECK ( initObject<TH2>(m_biasQoverPsagittaHistogram, rootfileName, "sagitta/theNominal_sagitta") );
- rootfileName = "UncertaintiesResult_Pred0fix.root";
- ATH_CHECK ( initObject<TH2>(m_biasD0HistError, rootfileName, "d0/theUncertainty_d0") );
- ATH_CHECK ( initObject<TH2>(m_biasZ0HistError, rootfileName, "z0/theUncertainty_z0") );
- ATH_CHECK ( initObject<TH2>(m_biasQoverPsagittaHistError, rootfileName, "sagitta/theUncertainty_sagitta") );
- } else if (runNumber <= 311481) { // post d0 fix: 304198 - 311481
- ATH_MSG_INFO( "Calibrating for 2016 runs after IBL temperature change, after d0 fix (304198 to 311481)." );
- rootfileName = "CorrectionsResult_Postd0fix.root";
+ m_biasQoverPsagittaHistError = nullptr;
+ return StatusCode::FAILURE;
+ } else if (runNumber <= 311481) {
+ if (runNumber < 297730) {
+ ATH_MSG_INFO( "Calibrating for 2015 runs (before 297730)." );
+ rootfileName = "data15_13TeV_all_CorrectionResult.root";
+ } else if (runNumber <= 300908) {
+ ATH_MSG_INFO( "Calibrating for 2016 runs before IBL temperature change (297730 to 300908)." ); // pre-TSI: 297730 - 300908
+ rootfileName = "data16_13TeV_preTS1_CorrectionResult.root";
+ } else { // post TS1: 301912 - 311481
+ ATH_MSG_INFO( "Calibrating for 2016 runs after IBL temperature change (301912 to 311481)." );
+ rootfileName = "data16_13TeV_postTS1_CorrectionResult.root";
+ }
ATH_CHECK ( initObject<TH2>(m_biasD0Histogram, rootfileName, "d0/theNominal_d0") );
ATH_CHECK ( initObject<TH2>(m_biasZ0Histogram, rootfileName, "z0/theNominal_z0") );
ATH_CHECK ( initObject<TH2>(m_biasQoverPsagittaHistogram, rootfileName, "sagitta/theNominal_sagitta") );
- rootfileName = "UncertaintiesResult_Postd0fix.root";
ATH_CHECK ( initObject<TH2>(m_biasD0HistError, rootfileName, "d0/theUncertainty_d0") );
ATH_CHECK ( initObject<TH2>(m_biasZ0HistError, rootfileName, "z0/theUncertainty_z0") );
ATH_CHECK ( initObject<TH2>(m_biasQoverPsagittaHistError, rootfileName, "sagitta/theUncertainty_sagitta") );
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackSmearingTool.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackSmearingTool.cxx
index bba9ccb554f50a10cdb9e19736896d133a627ac6..ef0a36b2d5b73638caf1f7a53fad38f0515461f0 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackSmearingTool.cxx
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackSmearingTool.cxx
@@ -66,7 +66,7 @@ namespace InDet {
ATH_CHECK( initObject<TH1>(m_smearD0Dead, "res_diff_d0_vs_pt.hist.root", "res_pt_d0_0") );
ATH_CHECK( initObject<TH1>(m_smearZ0Dead, "res_diff_z0_vs_pt.hist.root", "res_pt_z0_0") );
- string rootfile = "trackIPAlign_testCmb.root";
+ string rootfile = "trackIPAlign_r21.root";
ATH_CHECK( initObject<TH2>(m_smearD0, rootfile, "quad_diff/d0quaddiff_comb_Pt_Eta" ) );
ATH_CHECK( initObject<TH2>(m_smearZ0, rootfile, "quad_diff/z0quaddiff_comb_Pt_Eta" ) );
ATH_CHECK( initObject<TH2>(m_smearD0_sys_up, rootfile, "quad_diff/d0quaddiff_comb_Pt_Eta_sys_up" ) );
@@ -165,7 +165,6 @@ namespace InDet {
}
CP::CorrectionCode InDetTrackSmearingTool::applyCorrection( xAOD::TrackParticle& track ) {
- // this process could likely be optimized by simply looking through all possible systematics here and dealing with them one-by-one, instead of looking up whether each systematic is in the set.
float sigmaD0 = GetSmearD0Sigma( track );
float sigmaZ0 = GetSmearZ0Sigma( track );
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackSystematicsTool.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackSystematicsTool.cxx
index 8debc01a6d4aa2519a81a67eed617c6181a93fc1..bdc6662db7c4df2bf2c9a40b388d027bfed19185 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackSystematicsTool.cxx
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackSystematicsTool.cxx
@@ -112,14 +112,14 @@ namespace InDet {
{
// now the files are stored in the calibration area
string filenameWithPath = PathResolverFindCalibFile
- ("InDetTrackSystematicsTools/CalibData_20.7_2017-v10/" + filename);
+ ("InDetTrackSystematicsTools/CalibData_21.2_2017-v11/" + filename);
TFile* file = TFile::Open(filenameWithPath.data(), "READ");
if (file != nullptr) return file;
ATH_MSG_WARNING( "Could not find file " << filename << " in the calibration database." );
ATH_MSG_WARNING( "Will now look in InDetTrackSystematicsTools/data/ ." );
ATH_MSG_WARNING( "You should not see this message unless you are a dev testing a new file." );
#ifdef XAOD_STANDALONE
- filenameWithPath = PathResolverFindCalibFile("$ROOTCOREBIN/data/InDetTrackSystematicsTools/" + filename);
+ filenameWithPath = PathResolverFindCalibFile("InDetTrackSystematicsTools/" + filename);
#else
filenameWithPath = PathResolverFindDataFile("InDetTrackSystematicsTools/data/" + filename);
#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackTruthFilterTool.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackTruthFilterTool.cxx
index 1a7620d2ce048efa7555e2c1b099856000b8d848..150901046b3825b222dc024549e3f8f55d991697 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackTruthFilterTool.cxx
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackTruthFilterTool.cxx
@@ -212,10 +212,6 @@ namespace InDet {
return true;
}
- bool InDetTrackTruthFilterTool::selectTrack(const xAOD::TrackParticle* track) const {
- return accept(track);
- }
-
StatusCode InDetTrackTruthFilterTool::initTrkEffSystHistogram(float scale, TH2 *&histogram, string rootFileName, string histogramName) const {
ATH_CHECK( initObject<TH2>(histogram, rootFileName, histogramName) );
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/data/README b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/data/README
index 3499e981926b37adff32b604db2daec2b3ec7e74..9bc4d201934fb9f65dc2b1006b544c34942e3210 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/data/README
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/data/README
@@ -1 +1 @@
-This folder can be used by developers to place local calibration files for testing before requesting them to be put in the calibration database (at /afs/cern.ch/atlas/www/GROUPS/DATABASE/GroupData/InDetTrackSystematicsTools/) . If a file cannot be found in the calibration DB, then the tools will look in this folder. Do not add files in this directory into svn - the point of the calibration DB is to keep large data files out of the svn repository.
\ No newline at end of file
+This folder can be used by developers to place local calibration files for testing before requesting them to be put in the calibration database (at /afs/cern.ch/atlas/www/GROUPS/DATABASE/GroupData/InDetTrackSystematicsTools/) . If a file cannot be found in the calibration DB, then the tools will look in this folder. Do not add files in this directory into svn/git - the point of the calibration DB is to keep large data files out of the svn repository.
\ No newline at end of file
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/InDetTrackSmearingToolTester.h b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/InDetTrackSmearingToolTester.h
index 3f87b5f7ce782cbe93644ea793b911b7df7d8028..c430c23b07db45eea1379666aa33a6a3b2714568 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/InDetTrackSmearingToolTester.h
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/InDetTrackSmearingToolTester.h
@@ -3,7 +3,9 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#pragma once
+#ifndef INDETTRACKSYSTEMATICSTOOLS_INDETTRACKSMEARINGTOOLTESTER_H
+#define INDETTRACKSYSTEMATICSTOOLS_INDETTRACKSMEARINGTOOLTESTER_H
+
// Gaudi/Athena include(s):
#include "AthenaBaseComps/AthHistogramAlgorithm.h"
#include "AsgTools/ToolHandle.h"
@@ -42,3 +44,4 @@ namespace InDet {
} // namespace InDet
+#endif
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/util/InDetTrackSystsToolTester.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/util/InDetTrackSystsToolTester.cxx
index 68a1b27d0d7cc003b69e7ff7bcca2bdc53b5b0e4..acd44687ba41c37ddcdf9180fd666a62a0f512e5 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/util/InDetTrackSystsToolTester.cxx
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/util/InDetTrackSystsToolTester.cxx
@@ -105,9 +105,9 @@ int main( int argc, char* argv[] ) {
InDet::InDetTrackBiasingTool biasingTool( "InDetTrackBiasingTool" );
/// comment / uncomment these lines to test
- CHECK( biasingTool.setProperty( "isData", true ) ); // override to test, since ROOTCORE_TEST_FILE is simluation
- uint32_t testRunNumber = 287000;
- CHECK( biasingTool.setProperty( "runNumber", testRunNumber ) ); // this line is only for testing that other files are properly accessible
+ // CHECK( biasingTool.setProperty( "isData", true ) ); // override to test, since ROOTCORE_TEST_FILE is simluation
+ // uint32_t testRunNumber = 287000;
+ // CHECK( biasingTool.setProperty( "runNumber", testRunNumber ) ); // this line is only for testing that other files are properly accessible
InDet::InDetTrackTruthFilterTool filterTool( "InDetTrackFilterTool" );
auto originTool = make_unique<InDet::InDetTrackTruthOriginTool> ( "InDetTrackTruthOriginTool" );
@@ -116,7 +116,7 @@ int main( int argc, char* argv[] ) {
CHECK( filterTool.setProperty("trackOriginTool", trackTruthOriginToolHandle) );
InDet::JetTrackFilterTool jetFilterTool( "JetTrackFilterTool" );
-
+
// Not a realistic set of systematics - we just want to make sure they can all be applied without breaking the tools
CP::SystematicSet systSet = {
// CP::SystematicVariation("TRK_RES_D0_MEAS"),