diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index f26f7beab959df653de0e9843790f9620c82cdb7..12c245e32090dbd6d0ca53d29b607a306ffde78c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -61,9 +61,10 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
FEI3BarrelHitDuplication2016 = [ False, False, False, False],
FEI3BarrelSmallHitToT2016 = [ -1, -1, -1, -1],
FEI3BarrelTimingSimTune2016 = [ -1, 2015, 2015, 2015],
- BarrelCrossTalk2016 = [ 0.30, 0.06, 0.06, 0.06],
+ BarrelCrossTalk2016 = [ 0.30, 0.12, 0.12, 0.12],
BarrelNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8, 5e-8],
BarrelDisableProbability2016 = [ 9e-3, 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltage2016 = [ 80.0, 350.0, 200.0, 150.0],
BarrelFluence2016 = [0.80e14,1.61e14,0.71e14,0.48e14],
BarrelFluenceMap2016 = ["PixelDigitization/maps_IBL_PL_80V_fl0_8e14.root",
@@ -78,6 +79,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalk2016 = [ 0.06, 0.06, 0.06],
EndcapNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8],
EndcapDisableProbability2016 = [ 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0],
DBMToTThreshold2016 = [ -1, -1, -1],
DBMCrossTalk2016 = [ 0.06, 0.06, 0.06],
DBMNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8],
@@ -100,9 +102,10 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
FEI3BarrelHitDuplication2017 = [ False, False, False, False],
FEI3BarrelSmallHitToT2017 = [ -1, -1, -1, -1],
FEI3BarrelTimingSimTune2017 = [ -1, 2018, 2018, 2018],
- BarrelCrossTalk2017 = [ 0.30, 0.06, 0.06, 0.06],
+ BarrelCrossTalk2017 = [ 0.30, 0.12, 0.12, 0.12],
BarrelNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8, 5e-8],
BarrelDisableProbability2017 = [ 9e-3, 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltage2017 = [ 350.0, 350.0, 200.0, 150.0],
BarrelFluence2017 = [3.18e14,3.42e14,1.50e14,1.01e14],
BarrelFluenceMap2017 = ["PixelDigitization/maps_IBL_PL_350V_fl3_18e14.root",
@@ -117,6 +120,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalk2017 = [ 0.06, 0.06, 0.06],
EndcapNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8],
EndcapDisableProbability2017 = [ 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0],
DBMToTThreshold2017 = [ -1, -1, -1],
DBMCrossTalk2017 = [ 0.06, 0.06, 0.06],
DBMNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8],
@@ -134,9 +138,10 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
FEI3BarrelHitDuplication2018 = [ False, False, False, False],
FEI3BarrelSmallHitToT2018 = [ -1, -1, -1, -1],
FEI3BarrelTimingSimTune2018 = [ -1, 2018, 2018, 2018],
- BarrelCrossTalk2018 = [ 0.30, 0.06, 0.06, 0.06],
+ BarrelCrossTalk2018 = [ 0.30, 0.12, 0.12, 0.12],
BarrelNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8, 5e-8],
BarrelDisableProbability2018 = [ 9e-3, 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltage2018 = [ 400.0, 400.0, 250.0, 250.0],
BarrelFluence2018 = [5.50e14,5.19e14,2.28e14,1.53e14],
BarrelFluenceMap2018 = ["PixelDigitization/maps_IBL_PL_400V_fl5_5e14.root",
@@ -151,6 +156,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalk2018 = [ 0.06, 0.06, 0.06],
EndcapNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8],
EndcapDisableProbability2018 = [ 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0],
DBMToTThreshold2018 = [ -1, -1, -1],
DBMCrossTalk2018 = [ 0.06, 0.06, 0.06],
DBMNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8],
@@ -170,9 +176,10 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
BarrelCrossTalkRUN1 = [ 0.06, 0.06, 0.06],
BarrelNoiseOccupancyRUN1 = [ 5e-8, 5e-8, 5e-8],
BarrelDisableProbabilityRUN1 = [ 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltageRUN1 = [ 150.0, 150.0, 150.0],
BarrelFluenceRUN1 = [1.01e14,0.44e14,0.30e14],
- BarrelFluenceMapRUN1 = ["PixelDigitization/maps_PIX_250V_fl1_01e14.root",
+ BarrelFluenceMapRUN1 = ["PixelDigitization/maps_PIX_150V_fl1_01e14.root",
"PixelDigitization/maps_PIX_150V_fl0_44e14.root",
"PixelDigitization/maps_PIX_150V_fl0_3e14.root"],
EndcapToTThresholdRUN1 = [ 3, 3, 3],
@@ -183,6 +190,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalkRUN1 = [ 0.06, 0.06, 0.06],
EndcapNoiseOccupancyRUN1 = [ 5e-8, 5e-8, 5e-8],
EndcapDisableProbabilityRUN1 = [ 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0],
BLayerNoiseShapeRUN1 = [0.0, 0.0, 0.0, 0.0, 0.2204, 0.5311, 0.7493, 0.8954, 0.9980, 1.0],
PixelNoiseShapeRUN1 = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.2418, 0.4397, 0.5858, 0.6949, 0.7737, 0.8414, 0.8959, 0.9414, 0.9828, 1.0],
)
@@ -193,6 +201,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
BarrelCrossTalkITK = [ 0.06, 0.06, 0.06, 0.06, 0.06],
BarrelNoiseOccupancyITK = [ 5e-8, 5e-8, 5e-8, 5e-8, 5e-8],
BarrelDisableProbabilityITK = [ 9e-3, 9e-3, 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltageITK = [ 150.0, 150.0, 150.0, 150.0, 150.0],
BarrelFluenceITK = [0.0e14,0.0e14,0.0e14,0.0e14,0.0e14],
BarrelFluenceMapITK = ["PixelDigitization/maps_IBL_PL_80V_fl0e14.root",
@@ -204,10 +213,25 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalkITK = [ 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06],
EndcapNoiseOccupancyITK = [ 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8],
EndcapDisableProbabilityITK = [ 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
InnermostNoiseShapeITK = [0.0, 1.0],
NextInnermostNoiseShapeITK = [0.0, 1.0],
PixelNoiseShapeITK = [0.0, 1.0]
)
+ else:
+ # for data, make sure no Lorentz angle correction
+ CondArgs.update(
+ BarrelLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0],
+ BarrelLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0],
+ BarrelLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0],
+ BarrelLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0],
+ BarrelLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
+ )
# Charge calibration parameters
CondArgs.update(
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
index db1962721e3ff97aad9fbb85b89adfb705091b3e..7024b858a1a6bd0a29b07e0465a0dfb83280c57a 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
@@ -174,6 +174,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
// mapping files for radiation damage simulation
std::vector<std::string> mapsPath_list;
+
int currentRunNumber = ctx.eventID().run_number();
if (currentRunNumber<222222) {
writeCdo -> setBarrelToTThreshold(m_BarrelToTThresholdRUN1);
@@ -184,6 +185,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalkRUN1);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancyRUN1);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbabilityRUN1);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorrRUN1);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltageRUN1);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThresholdRUN1);
@@ -194,6 +196,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalkRUN1);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancyRUN1);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbabilityRUN1);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorrRUN1);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltageRUN1);
// This is ad-hoc solution.
@@ -221,6 +224,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalk2016);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancy2016);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbability2016);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorr2016);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltage2016);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThreshold2016);
@@ -231,6 +235,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalk2016);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancy2016);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbability2016);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorr2016);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltage2016);
writeCdo -> setDBMToTThreshold(m_DBMToTThreshold2016);
@@ -274,12 +279,14 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalkITK);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancyITK);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbabilityITK);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorrITK);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltageITK);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThresholdITK);
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalkITK);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancyITK);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbabilityITK);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorrITK);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltageITK);
// This is ad-hoc solution.
@@ -309,6 +316,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalk2016);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancy2016);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbability2016);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorr2016);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltage2016);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThreshold2016);
@@ -319,6 +327,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalk2016);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancy2016);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbability2016);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorr2016);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltage2016);
writeCdo -> setDBMToTThreshold(m_DBMToTThreshold2016);
@@ -357,6 +366,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalk2017);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancy2017);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbability2017);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorr2017);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltage2017);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThreshold2017);
@@ -367,6 +377,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalk2017);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancy2017);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbability2017);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorr2017);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltage2017);
writeCdo -> setDBMToTThreshold(m_DBMToTThreshold2017);
@@ -405,6 +416,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalk2018);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancy2018);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbability2018);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorr2018);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltage2018);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThreshold2018);
@@ -415,6 +427,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalk2018);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancy2018);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbability2018);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorr2018);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltage2018);
writeCdo -> setDBMToTThreshold(m_DBMToTThreshold2018);
@@ -453,7 +466,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
for (unsigned int i=0; i<mapsPath_list.size(); i++) {
ATH_MSG_INFO("Using maps located in: "<<mapsPath_list.at(i) << " for layer No." << i);
- std::unique_ptr<TFile> mapsFile(new TFile((mapsPath_list.at(i)).c_str())); //this is the ramo potential.
+ TFile* mapsFile = new TFile((mapsPath_list.at(i)).c_str()); //this is the ramo potential.
//Setup ramo weighting field map
TH3F* ramoPotentialMap_hold = 0;
@@ -465,15 +478,10 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
}
ramoPotentialMap.push_back(ramoPotentialMap_hold);
- std::unique_ptr<TH2F> lorentzMap_e_hold((TH2F*)mapsFile->Get("lorentz_map_e"));
- std::unique_ptr<TH2F> lorentzMap_h_hold((TH2F*)mapsFile->Get("lorentz_map_h"));
- std::unique_ptr<TH2F> distanceMap_h_hold((TH2F*)mapsFile->Get("edistance"));
- std::unique_ptr<TH2F> distanceMap_e_hold((TH2F*)mapsFile->Get("hdistance"));
-
- lorentzMap_e.push_back(lorentzMap_e_hold.get());
- lorentzMap_h.push_back(lorentzMap_h_hold.get());
- distanceMap_e.push_back(distanceMap_e_hold.get());
- distanceMap_h.push_back(distanceMap_h_hold.get());
+ lorentzMap_e.push_back((TH2F*)mapsFile->Get("lorentz_map_e"));
+ lorentzMap_h.push_back((TH2F*)mapsFile->Get("lorentz_map_h"));
+ distanceMap_e.push_back((TH2F*)mapsFile->Get("edistance"));
+ distanceMap_h.push_back((TH2F*)mapsFile->Get("hdistance"));
}
writeCdo -> setLorentzMap_e(lorentzMap_e);
writeCdo -> setLorentzMap_h(lorentzMap_h);
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
index 458eb01203751236cf324404dc2997b48c893e1b..9dca7e04393b4fea74b45628437d2c5aec8216b0 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
@@ -186,7 +186,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
{this, "FEI3BarrelTimingSimTune2016", {-1,2015,2015,2015}, "FEI3 timing tuning set of barrel pixel layers in 2015/2016"};
Gaudi::Property<std::vector<double>> m_BarrelCrossTalk2016
- {this, "BarrelCrossTalk2016", {0.30,0.06,0.06,0.06}, "Cross-talk fraction of barrel pixel layers in 2015/2016"};
+ {this, "BarrelCrossTalk2016", {0.30,0.12,0.12,0.12}, "Cross-talk fraction of barrel pixel layers in 2015/2016"};
Gaudi::Property<std::vector<double>> m_BarrelNoiseOccupancy2016
{this, "BarrelNoiseOccupancy2016", {5e-8,5e-8,5e-8,5e-8}, "Noise occupancy of barrel pixel layers in 2015/2016"};
@@ -194,6 +194,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbability2016
{this, "BarrelDisableProbability2016", {9e-3,9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in 2015/2016"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorr2016
+ {this, "BarrelLorentzAngleCorr2016", {1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in 2015/2016"};
+
// So far, Gaudi::Property does not support 2D vector.
// Gaudi::Property<std::vector<std::vector<float>>> m_BarrelNoiseShape2016
// {this, "BarrelNoiseShape", {{0.0,1.0},{0.0,1.0},{0.0,1.0},{0.0,1.0}}, "Noise shape of barrel pixel layers"};
@@ -236,6 +239,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbability2016
{this, "EndcapDisableProbability2016", {9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in 2015/2016"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorr2016
+ {this, "EndcapLorentzAngleCorr2016", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in 2015/2016"};
+
// DBM RUN2 2015/2016
Gaudi::Property<std::vector<int>> m_DBMToTThreshold2016
{this, "DBMToTThreshold2016", {-1,-1,-1}, "ToT thresholds for DBM layers in 2015/2016"};
@@ -283,7 +289,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
{this, "FEI3BarrelTimingSimTune2017", {-1,2018,2018,2018}, "FEI3 timing tuning set of barrel pixel layers in 2017"};
Gaudi::Property<std::vector<double>> m_BarrelCrossTalk2017
- {this, "BarrelCrossTalk2017", {0.30,0.06,0.06,0.06}, "Cross-talk fraction of barrel pixel layers in 2017"};
+ {this, "BarrelCrossTalk2017", {0.30,0.12,0.12,0.12}, "Cross-talk fraction of barrel pixel layers in 2017"};
Gaudi::Property<std::vector<double>> m_BarrelNoiseOccupancy2017
{this, "BarrelNoiseOccupancy2017", {5e-8,5e-8,5e-8,5e-8}, "Noise occupancy of barrel pixel layers in 2017"};
@@ -291,6 +297,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbability2017
{this, "BarrelDisableProbability2017", {9e-3,9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in 2017"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorr2017
+ {this, "BarrelLorentzAngleCorr2017", {1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in 2017"};
+
// This is ad-hoc solution.
Gaudi::Property<std::vector<float>> m_IBLNoiseShape2017
{this, "IBLNoiseShape2017", {0.0,1.0}, "Noise shape for IBL in 2017"};
@@ -329,6 +338,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbability2017
{this, "EndcapDisableProbability2017", {9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in 2017"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorr2017
+ {this, "EndcapLorentzAngleCorr2017", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in 2017"};
+
// DBM RUN2 2017
Gaudi::Property<std::vector<int>> m_DBMToTThreshold2017
{this, "DBMToTThreshold2017", {-1,-1,-1}, "ToT thresholds for DBM layers in 2017"};
@@ -376,7 +388,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
{this, "FEI3BarrelTimingSimTune2018", {-1,2018,2018,2018}, "FEI3 timing tuning set of barrel pixel layers in 2018"};
Gaudi::Property<std::vector<double>> m_BarrelCrossTalk2018
- {this, "BarrelCrossTalk2018", {0.30,0.06,0.06,0.06}, "Cross-talk fraction of barrel pixel layers in 2018"};
+ {this, "BarrelCrossTalk2018", {0.30,0.12,0.12,0.12}, "Cross-talk fraction of barrel pixel layers in 2018"};
Gaudi::Property<std::vector<double>> m_BarrelNoiseOccupancy2018
{this, "BarrelNoiseOccupancy2018", {5e-8,5e-8,5e-8,5e-8}, "Noise occupancy of barrel pixel layers in 2018"};
@@ -384,6 +396,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbability2018
{this, "BarrelDisableProbability2018", {9e-3,9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in 2018"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorr2018
+ {this, "BarrelLorentzAngleCorr2018", {1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in 2018"};
+
// This is ad-hoc solution.
Gaudi::Property<std::vector<float>> m_IBLNoiseShape2018
{this, "IBLNoiseShape2018", {0.0,1.0}, "Noise shape for IBL in 2018"};
@@ -422,6 +437,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbability2018
{this, "EndcapDisableProbability2018", {9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in 2018"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorr2018
+ {this, "EndcapLorentzAngleCorr2018", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in 2018"};
+
// DBM RUN2 2018
Gaudi::Property<std::vector<int>> m_DBMToTThreshold2018
{this, "DBMToTThreshold2018", {-1,-1,-1}, "ToT thresholds for DBM layers in 2018"};
@@ -450,7 +468,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
{this, "BarrelFluenceRUN1", {1.01e14, 0.44e14, 0.30e14}, "Barrel fluence for radiation damage in RUN1"};
Gaudi::Property<std::vector<std::string>> m_BarrelFluenceMapRUN1
- {this, "BarrelFluenceMapRUN1", {"PixelDigitization/maps_PIX_250V_fl1_01e14.root", // this needs to be updated
+ {this, "BarrelFluenceMapRUN1", {"PixelDigitization/maps_PIX_150V_fl1_01e14.root", // this needs to be updated
"PixelDigitization/maps_PIX_150V_fl0_44e14.root",
"PixelDigitization/maps_PIX_150V_fl0_3e14.root"},
"Barrel fluence map for radiation damage in RUN1"};
@@ -476,6 +494,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbabilityRUN1
{this, "BarrelDisableProbabilityRUN1", {9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in RUN1"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorrRUN1
+ {this, "BarrelLorentzAngleCorrRUN1", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in RUN1"};
+
// This is ad-hoc solution.
Gaudi::Property<std::vector<float>> m_BLayerNoiseShapeRUN1
{this, "BLayerNoiseShapeRUN1", {0.0,1.0}, "Noise shape for b-layer in RUN1"};
@@ -511,6 +532,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbabilityRUN1
{this, "EndcapDisableProbabilityRUN1", {9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in RUN1"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorrRUN1
+ {this, "EndcapLorentzAngleCorrRUN1", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in RUN1"};
+
//====================================================================================
// Barrel ITK
Gaudi::Property<std::vector<int>> m_BarrelToTThresholdITK
@@ -539,6 +563,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbabilityITK
{this, "BarrelDisableProbabilityITK", {9e-3,9e-3,9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in ITK"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorrITK
+ {this, "BarrelLorentzAngleCorrITK", {1.0,1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in ITK"};
+
// This is ad-hoc solution.
Gaudi::Property<std::vector<float>> m_InnermostNoiseShapeITK
{this, "InnermostNoiseShapeITK", {0.0,1.0}, "Noise shape for IBL in ITK"};
@@ -565,6 +592,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbabilityITK
{this, "EndcapDisableProbabilityITK", {9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in ITK"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorrITK
+ {this, "EndcapLorentzAngleCorrITK", {1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in ITK"};
+
//====================================================================================
// The following parameters are default values which will be overwritten by the one
// from the conditions DB. Otherwise the DB is not retrieved nor available, these
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
index be5a24afc8a43c6c923beb43104c8d61b6e69426..e1efb342b00c5038223ed7eb4917f80083297610 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
+++ b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
@@ -139,6 +139,11 @@ class PixelModuleData {
float getDefaultQ2TotE() const;
float getDefaultQ2TotC() const;
+ // Lorentz angle correction
+ void setBarrelLorentzAngleCorr(std::vector<double> BarrelLorentzAngleCorr);
+ void setEndcapLorentzAngleCorr(std::vector<double> EndcapLorentzAngleCorr);
+ double getLorentzAngleCorr(int bec, int layer) const;
+
// DCS parameters
void setDefaultBiasVoltage(float biasVoltage);
float getDefaultBiasVoltage() const;
@@ -283,6 +288,9 @@ class PixelModuleData {
float m_paramE;
float m_paramC;
+ std::vector<double> m_BarrelLorentzAngleCorr;
+ std::vector<double> m_EndcapLorentzAngleCorr;
+
float m_biasVoltage;
float m_temperature;
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
index 558bca2c312d1b7e1b3d39068040964fdbc1c16c..16da803924fcd45e2b570b9451e491b4fdcceaea 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
@@ -280,6 +280,16 @@ float PixelModuleData::getDefaultQ2TotA() const { return m_paramA; }
float PixelModuleData::getDefaultQ2TotE() const { return m_paramE; }
float PixelModuleData::getDefaultQ2TotC() const { return m_paramC; }
+// Lorentz angle correction
+void PixelModuleData::setBarrelLorentzAngleCorr(std::vector<double> BarrelLorentzAngleCorr) { m_BarrelLorentzAngleCorr = BarrelLorentzAngleCorr; }
+void PixelModuleData::setEndcapLorentzAngleCorr(std::vector<double> EndcapLorentzAngleCorr) { m_EndcapLorentzAngleCorr = EndcapLorentzAngleCorr; }
+double PixelModuleData::getLorentzAngleCorr(int bec, int layer) const {
+ double LAcorr = 1.0;
+ if (std::abs(bec)==0 && layer<(int)m_BarrelLorentzAngleCorr.size()) { LAcorr=m_BarrelLorentzAngleCorr.at(layer); }
+ if (std::abs(bec)==2 && layer<(int)m_EndcapLorentzAngleCorr.size()) { LAcorr=m_EndcapLorentzAngleCorr.at(layer); }
+ return LAcorr;
+}
+
// DCS parameters
void PixelModuleData::setDefaultBiasVoltage(float biasVoltage) { m_biasVoltage=biasVoltage; }
float PixelModuleData::getDefaultBiasVoltage() const { return m_biasVoltage; }
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
index 5ad66b6dd64164b5f52799e58857298fc6dfa683..e3fd0bba45b25ade8889a769fa240a45fee052a6 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
@@ -25,6 +25,7 @@ StatusCode PixelSiLorentzAngleCondAlg::initialize() {
ATH_CHECK(m_condSvc.retrieve());
+ ATH_CHECK(m_moduleDataKey.initialize());
ATH_CHECK(m_readKeyTemp.initialize());
ATH_CHECK(m_readKeyHV.initialize());
ATH_CHECK(m_writeKey.initialize());
@@ -56,6 +57,8 @@ PixelSiLorentzAngleCondAlg::execute(const EventContext& ctx) const {
return StatusCode::SUCCESS;
}
+ SG::ReadCondHandle<PixelModuleData>moduleData(m_moduleDataKey, ctx);
+
// Read Cond Handle (temperature)
SG::ReadCondHandle<PixelDCSTempData> readHandleTemp(m_readKeyTemp, ctx);
const PixelDCSTempData* readCdoTemp(*readHandleTemp);
@@ -137,6 +140,13 @@ PixelSiLorentzAngleCondAlg::execute(const EventContext& ctx) const {
}
const InDetDD::PixelModuleDesign* p_design = dynamic_cast<const InDetDD::PixelModuleDesign*>(&element->design());
+
+ const PixelID* pixelId = static_cast<const PixelID *>(element->getIdHelper());
+ int barrel_ec = pixelId->barrel_ec(element->identify());
+ int layerIndex = pixelId->layer_disk(element->identify());
+
+ double LACorr = moduleData->getLorentzAngleCorr(barrel_ec,layerIndex);
+
if (not p_design){
ATH_MSG_FATAL("Dynamic cast to PixelModuleDesign* failed in PixelSiLorentzAngleCondAlg::execute");
return StatusCode::FAILURE;
@@ -157,25 +167,25 @@ PixelSiLorentzAngleCondAlg::execute(const EventContext& ctx) const {
// The hit depth axis is pointing from the readout side to the backside if m_design->readoutSide() < 0
// The hit depth axis is pointing from the backside to the readout side if m_design->readoutSide() > 0
double tanLorentzAnglePhi = forceLorentzToZero*element->design().readoutSide()*mobility*element->hitDepthDirection()*element->hitPhiDirection()*(element->normal().cross(magneticField)).dot(element->phiAxis());
- writeCdo->setTanLorentzAngle(elementHash, m_correctionFactor*tanLorentzAnglePhi);
+ writeCdo->setTanLorentzAngle(elementHash, LACorr*tanLorentzAnglePhi);
// This gives the effective correction in the reconstruction frame hence the extra hitPhiDirection()
// as the angle above is in the hit frame.
double lorentzCorrectionPhi = -0.5*element->hitPhiDirection()*tanLorentzAnglePhi*depletionDepth;
- writeCdo->setLorentzShift(elementHash, m_correctionFactor*lorentzCorrectionPhi);
+ writeCdo->setLorentzShift(elementHash, LACorr*lorentzCorrectionPhi);
// The Lorentz eta shift very small and so can be ignored, but we include it for completeness.
double tanLorentzAngleEta = forceLorentzToZero*element->design().readoutSide()*mobility*element->hitDepthDirection()*element->hitEtaDirection()*(element->normal().cross(magneticField)).dot(element->etaAxis());
- writeCdo->setTanLorentzAngleEta(elementHash, m_correctionFactor*tanLorentzAngleEta);
+ writeCdo->setTanLorentzAngleEta(elementHash, LACorr*tanLorentzAngleEta);
double lorentzCorrectionEta = -0.5*element->hitPhiDirection()*tanLorentzAngleEta*depletionDepth;
- writeCdo->setLorentzShiftEta(elementHash, m_correctionFactor*lorentzCorrectionEta);
+ writeCdo->setLorentzShiftEta(elementHash, LACorr*lorentzCorrectionEta);
// Monitoring value
writeCdo->setBiasVoltage(elementHash, biasVoltage/CLHEP::volt);
writeCdo->setTemperature(elementHash, temperature-273.15);
writeCdo->setDepletionVoltage(elementHash, deplVoltage/CLHEP::volt);
- ATH_MSG_DEBUG("Hash = " << elementHash << " tanPhi = " << lorentzCorrectionPhi << " shiftPhi = " << writeCdo->getLorentzShift(elementHash) << " Factor = " << m_correctionFactor << "Depletion depth = " << depletionDepth);
+ ATH_MSG_DEBUG("Hash = " << elementHash << " tanPhi = " << lorentzCorrectionPhi << " shiftPhi = " << writeCdo->getLorentzShift(elementHash) << " Factor = " << LACorr << " Depletion depth = " << depletionDepth);
ATH_MSG_DEBUG("Hash = " << elementHash << " tanPhi = " << lorentzCorrectionPhi << " shiftPhi = " << writeCdo->getLorentzShift(elementHash) << "Depletion depth = " << depletionDepth);
ATH_MSG_VERBOSE("Temperature (C), bias voltage, depletion voltage: " << temperature-273.15 << ", " << biasVoltage/CLHEP::volt << ", " << deplVoltage/CLHEP::volt);
ATH_MSG_VERBOSE("Depletion depth: " << depletionDepth/CLHEP::mm);
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h
index 0ac808add49895d7f1708d07ed526851eca20ead..3ecb7efcdec92396b34ced773e2dd5eab4dd465a 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h
@@ -18,6 +18,7 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
+#include "PixelConditionsData/PixelModuleData.h"
#include "PixelConditionsData/PixelDCSHVData.h"
#include "PixelConditionsData/PixelDCSTempData.h"
#include "GaudiKernel/ICondSvc.h"
@@ -44,6 +45,9 @@ class PixelSiLorentzAngleCondAlg: public AthReentrantAlgorithm {
private:
ServiceHandle<ICondSvc> m_condSvc;
+ SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
+ {this, "PixelModuleData", "PixelModuleData", "Pixel module data"};
+
SG::ReadCondHandleKey<PixelDCSTempData> m_readKeyTemp
{this, "ReadKeyeTemp", "PixelDCSTempCondData", "Key of input sensor temperature conditions folder"};
@@ -66,7 +70,7 @@ class PixelSiLorentzAngleCondAlg: public AthReentrantAlgorithm {
DoubleProperty m_nominalField {this, "NominalField", 2.0834*Gaudi::Units::tesla, "Default nominal field"};
BooleanProperty m_useMagFieldCache{this, "UseMagFieldCache", true};
BooleanProperty m_useMagFieldDcs{this, "UseMagFieldDcs", true};
- DoubleProperty m_correctionFactor{this, "CorrectionFactor", 0.9, "Lorentz angle correction factor"};
+
unsigned int m_maxHash;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index 7015d588204d9d6bb41189907f0d9674368a6627..926160070e0a5aa2dab751140f00f26c3e211e34 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -202,9 +202,10 @@ def PixelConfigCondAlg_MC():
alg.FEI3BarrelHitDuplication2016 = [ False, False, False, False]
alg.FEI3BarrelSmallHitToT2016 = [ -1, -1, -1, -1]
alg.FEI3BarrelTimingSimTune2016 = [ -1, 2015, 2015, 2015]
- alg.BarrelCrossTalk2016 = [ 0.30, 0.06, 0.06, 0.06]
+ alg.BarrelCrossTalk2016 = [ 0.30, 0.12, 0.12, 0.12]
alg.BarrelNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbability2016 = [ 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltage2016 = [ 80.0, 350.0, 200.0, 150.0]
alg.BarrelFluence2016 = [0.80e14,1.61e14,0.71e14,0.48e14]
@@ -221,6 +222,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalk2016 = [ 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbability2016 = [ 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltage2016 = [150.0,150.0,150.0]
alg.DBMToTThreshold2016 = [ -1, -1, -1]
@@ -247,9 +249,10 @@ def PixelConfigCondAlg_MC():
alg.FEI3BarrelHitDuplication2017 = [ False, False, False, False]
alg.FEI3BarrelSmallHitToT2017 = [ -1, -1, -1, -1]
alg.FEI3BarrelTimingSimTune2017 = [ -1, 2018, 2018, 2018]
- alg.BarrelCrossTalk2017 = [ 0.30, 0.06, 0.06, 0.06]
+ alg.BarrelCrossTalk2017 = [ 0.30, 0.12, 0.12, 0.12]
alg.BarrelNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbability2017 = [ 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltage2017 = [ 350.0, 350.0, 200.0, 150.0]
alg.BarrelFluence2017 = [3.18e14,3.42e14,1.50e14,1.01e14]
@@ -266,6 +269,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalk2017 = [ 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbability2017 = [ 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltage2017 = [150.0,150.0,150.0]
alg.DBMToTThreshold2017 = [ -1, -1, -1]
@@ -286,9 +290,10 @@ def PixelConfigCondAlg_MC():
alg.FEI3BarrelHitDuplication2018 = [ False, False, False, False]
alg.FEI3BarrelSmallHitToT2018 = [ -1, -1, -1, -1]
alg.FEI3BarrelTimingSimTune2018 = [ -1, 2018, 2018, 2018]
- alg.BarrelCrossTalk2018 = [ 0.30, 0.06, 0.06, 0.06]
+ alg.BarrelCrossTalk2018 = [ 0.30, 0.12, 0.12, 0.12]
alg.BarrelNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbability2018 = [ 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltage2018 = [ 400.0, 400.0, 250.0, 250.0]
alg.BarrelFluence2018 = [5.50e14,5.19e14,2.28e14,1.53e14]
@@ -305,6 +310,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalk2018 = [ 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbability2018 = [ 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltage2018 = [250.0,250.0,250.0]
alg.DBMToTThreshold2018 = [ -1, -1, -1]
@@ -327,10 +333,11 @@ def PixelConfigCondAlg_MC():
alg.BarrelCrossTalkRUN1 = [ 0.06, 0.06, 0.06]
alg.BarrelNoiseOccupancyRUN1 = [ 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbabilityRUN1 = [ 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltageRUN1 = [ 150.0, 150.0, 150.0]
alg.BarrelFluenceRUN1 = [1.01e14,0.44e14,0.30e14]
- alg.BarrelFluenceMapRUN1 = ["PixelDigitization/maps_PIX_250V_fl1_01e14.root",
+ alg.BarrelFluenceMapRUN1 = ["PixelDigitization/maps_PIX_150V_fl1_01e14.root",
"PixelDigitization/maps_PIX_150V_fl0_44e14.root",
"PixelDigitization/maps_PIX_150V_fl0_3e14.root"]
@@ -342,6 +349,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalkRUN1 = [ 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancyRUN1 = [ 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbabilityRUN1 = [ 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltageRUN1 = [150.0,150.0,150.0]
alg.BLayerNoiseShapeRUN1 = [0.0, 0.0, 0.0, 0.0, 0.2204, 0.5311, 0.7493, 0.8954, 0.9980, 1.0]
@@ -353,6 +361,7 @@ def PixelConfigCondAlg_MC():
alg.BarrelCrossTalkITK = [ 0.06, 0.06, 0.06, 0.06, 0.06]
alg.BarrelNoiseOccupancyITK = [ 5e-8, 5e-8, 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbabilityITK = [ 9e-3, 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltageITK = [ 150.0, 150.0, 150.0, 150.0, 150.0]
alg.BarrelFluenceITK = [0.0e14,0.0e14,0.0e14,0.0e14,0.0e14]
@@ -366,6 +375,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalkITK = [ 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancyITK = [ 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbabilityITK = [ 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltageITK = [150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0]
alg.InnermostNoiseShapeITK = [0.0, 1.0]
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
index 4444967edfbca94fb9f6f4be8adf5a6e473c649a..da8ac64821e5fa0c48b38fa9e5db109c58c170a6 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
@@ -205,7 +205,7 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
double collectionDist = 0.2*CLHEP::mm;
double smearScale = 1. + 0.35*smearRand;
double tanLorentz = m_lorentzAngleTool->getTanLorentzAngle(Module.identifyHash());
- double coLorentz=sqrt(1+pow(tanLorentz,2));
+ double coLorentz=std::sqrt(1.0+pow(tanLorentz,2));
const EBC_EVCOLL evColl = EBC_MAINEVCOLL;
const HepMcParticleLink::PositionFlag idxFlag = (phit.eventId()==0) ? HepMcParticleLink::IS_POSITION: HepMcParticleLink::IS_INDEX;
diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref
index 0fbea1060ec9066ea5bee727c901d0cd42320a9d..3be71b3829ddcceb2a6ab279d13f64292183bb2e 100644
--- a/Tools/PROCTools/data/master_q221_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref
@@ -1,26 +1,26 @@
run event nTopo nIdTracks nJets nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot
- 284500 87473001 122 130 4 1 8 2 6 7 4 3
+ 284500 87473001 122 129 4 1 8 2 6 7 4 3
284500 87473014 83 80 6 0 10 1 9 7 5 2
- 284500 87473022 38 29 4 0 4 1 3 3 2 1
+ 284500 87473022 38 30 4 0 4 2 2 4 3 1
284500 87473032 30 33 4 1 10 4 6 5 2 3
- 284500 87473037 62 38 7 0 12 2 10 6 4 2
- 284500 87473040 107 96 10 1 17 1 16 10 5 5
- 284500 87473051 140 112 11 1 16 1 15 23 16 7
+ 284500 87473037 62 39 7 0 13 2 11 5 3 2
+ 284500 87473040 107 95 10 1 17 1 16 10 5 5
+ 284500 87473051 140 111 11 1 16 1 15 23 16 7
284500 87473063 62 76 5 2 7 1 6 6 4 2
284500 87473068 25 34 1 1 0 0 0 0 0 0
- 284500 87473075 60 85 6 0 5 0 5 6 5 1
- 284500 87473084 78 85 7 2 14 1 13 9 3 6
+ 284500 87473075 60 87 6 0 5 0 5 6 5 1
+ 284500 87473084 78 87 7 2 14 1 13 9 3 6
284500 87473091 41 49 3 0 4 2 2 4 2 2
284500 87473096 66 75 3 2 3 0 3 4 3 1
- 284500 87473104 64 62 6 0 5 1 4 4 3 1
- 284500 87473114 89 81 7 2 12 1 11 9 6 3
+ 284500 87473104 64 63 6 0 6 2 4 4 3 1
+ 284500 87473114 89 80 7 2 12 1 11 9 6 3
284500 87473121 93 100 6 3 15 4 11 8 6 2
- 284500 87473132 84 57 9 1 12 0 12 3 3 0
- 284500 87473137 94 70 8 3 15 0 15 8 8 0
- 284500 87473144 78 65 7 1 8 2 6 8 6 2
- 284500 87473154 86 88 7 0 13 3 10 10 4 6
- 284500 87473162 53 52 4 0 7 0 7 3 2 1
+ 284500 87473132 84 56 9 1 12 0 12 3 3 0
+ 284500 87473137 94 71 8 3 15 0 15 9 9 0
+ 284500 87473144 78 66 7 1 8 2 6 8 6 2
+ 284500 87473154 86 88 7 0 14 3 11 9 4 5
+ 284500 87473162 53 51 4 0 7 0 7 3 2 1
284500 87473167 77 54 6 3 14 2 12 13 8 5
- 284500 87473171 77 70 8 3 4 2 2 6 5 1
- 284500 87473184 75 86 5 2 8 1 7 5 3 2
+ 284500 87473171 77 69 8 3 4 2 2 5 4 1
+ 284500 87473184 75 87 5 2 8 1 7 5 3 2
284500 87473192 55 52 4 1 7 4 3 5 4 1
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest.ref b/Tools/PROCTools/data/master_q431_AOD_digest.ref
index 997e935bd5782d51fb237592f6d83a4b0745d99b..fa7194dfd35bf013b8502adea860043314ec573e 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest.ref
@@ -1,26 +1,26 @@
run event nTopo nIdTracks nJets nMuons
330470 1183722158 1 0 0 0
- 330470 1183722342 394 429 16 0
- 330470 1183727953 532 588 11 4
- 330470 1183732647 467 484 12 1
+ 330470 1183722342 394 428 16 0
+ 330470 1183727953 532 590 11 4
+ 330470 1183732647 467 485 12 1
330470 1183733040 381 288 6 1
330470 1183734651 361 368 14 3
- 330470 1183735332 406 386 9 1
- 330470 1183736475 741 686 15 1
+ 330470 1183735332 406 385 9 1
+ 330470 1183736475 741 684 15 1
330470 1183738728 1 0 0 0
330470 1183738949 368 444 9 1
330470 1183742489 152 127 2 1
330470 1183743040 285 326 5 0
- 330470 1183746343 492 495 12 0
+ 330470 1183746343 492 492 12 0
330470 1183746710 6 0 0 0
330470 1183751782 239 246 2 0
330470 1183752624 347 366 7 2
330470 1183753006 357 398 11 3
330470 1183754806 470 423 14 0
- 330470 1183769295 342 336 7 2
+ 330470 1183769295 342 335 7 2
330470 1183769939 348 362 10 3
330470 1183773832 307 209 7 0
330470 1183775209 57 0 0 0
- 330470 1183787124 431 382 10 2
+ 330470 1183787124 431 383 10 2
330470 1183787946 321 324 5 1
330470 1183795329 458 355 18 0
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index f8d45345731f77dd1435e9f3e1b8fdf12b73d5f5..8ccd831bb2faf218696cdd8f72d7fbf8f4df4977 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -31,10 +31,10 @@ ciRefFileMap = {
# OverlayTier0Test_required-test
'overlay-d1498-21.0' : 'v2',
'overlay-d1498-22.0' : 'v38',
- 'overlay-d1592-22.0' : 'v1',
+ 'overlay-d1592-22.0' : 'v2',
'overlay-bkg-21.0' : 'v1',
'overlay-bkg-22.0' : 'v4',
- 'dataoverlay-d1590-22.0' : 'v4',
+ 'dataoverlay-d1590-22.0' : 'v5',
'dataoverlay-hits-22.0' : 'v1',
}
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index df116303bdfd2e3cf56eef495725832bc0301b96..3006e7252de8b40bca2e66ac3ca3f7f8a8feec24 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -60,8 +60,8 @@ HLT_2e3_etcut_L12EM3:
stepFeatures:
0: 342
1: 976
- 2: 712
- 3: 270
+ 2: 708
+ 3: 268
HLT_2g10_loose_mu20_L1MU20:
eventCount: 0
stepCounts:
@@ -872,8 +872,8 @@ HLT_e3_etcut_L1EM3:
stepFeatures:
0: 171
1: 491
- 2: 360
- 3: 136
+ 2: 358
+ 3: 135
HLT_e5_etcut_L1EM3:
eventCount: 20
stepCounts:
@@ -883,7 +883,7 @@ HLT_e5_etcut_L1EM3:
3: 20
stepFeatures:
0: 137
- 1: 458
+ 1: 459
2: 173
3: 102
HLT_e5_lhloose_L1EM3:
@@ -896,7 +896,7 @@ HLT_e5_lhloose_L1EM3:
4: 6
stepFeatures:
0: 60
- 1: 145
+ 1: 146
2: 81
3: 46
4: 7
@@ -910,7 +910,7 @@ HLT_e5_lhloose_noringer_L1EM3:
4: 6
stepFeatures:
0: 56
- 1: 128
+ 1: 130
2: 84
3: 46
4: 7
@@ -924,7 +924,7 @@ HLT_e5_lhmedium_L1EM3:
4: 4
stepFeatures:
0: 58
- 1: 131
+ 1: 132
2: 76
3: 44
4: 5
@@ -938,7 +938,7 @@ HLT_e5_lhmedium_noringer_L1EM3:
4: 4
stepFeatures:
0: 48
- 1: 97
+ 1: 99
2: 66
3: 38
4: 5
@@ -952,7 +952,7 @@ HLT_e5_lhtight_L1EM3:
4: 4
stepFeatures:
0: 57
- 1: 128
+ 1: 129
2: 74
3: 43
4: 5
@@ -966,7 +966,7 @@ HLT_e5_lhtight_nod0_L1EM3:
4: 4
stepFeatures:
0: 57
- 1: 128
+ 1: 129
2: 74
3: 43
4: 5
@@ -980,7 +980,7 @@ HLT_e5_lhtight_noringer_L1EM3:
4: 4
stepFeatures:
0: 45
- 1: 92
+ 1: 94
2: 61
3: 36
4: 5
@@ -994,7 +994,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3:
4: 4
stepFeatures:
0: 45
- 1: 92
+ 1: 94
2: 61
3: 36
4: 5
@@ -1035,7 +1035,7 @@ HLT_e7_etcut_L1EM3:
3: 20
stepFeatures:
0: 89
- 1: 361
+ 1: 362
2: 117
3: 73
HLT_e7_lhmedium_mu24_L1MU20:
@@ -1673,11 +1673,11 @@ HLT_j45_pf_subjesgscIS_ftf_L1J15:
0: 20
1: 52
HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
- eventCount: 13
+ eventCount: 14
stepCounts:
0: 19
1: 18
- 2: 13
+ 2: 14
stepFeatures:
0: 19
1: 49
@@ -1739,25 +1739,25 @@ HLT_j45_subjesgscIS_ftf_L1J15:
0: 20
1: 48
HLT_j45_subjesgscIS_ftf_bdl1r70_split_L1J20:
- eventCount: 13
+ eventCount: 12
stepCounts:
0: 19
1: 19
- 2: 13
+ 2: 12
stepFeatures:
0: 19
1: 47
- 2: 24
+ 2: 23
HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20:
- eventCount: 14
+ eventCount: 15
stepCounts:
0: 19
1: 19
- 2: 14
+ 2: 15
stepFeatures:
0: 19
1: 47
- 2: 26
+ 2: 28
HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:
eventCount: 19
stepCounts:
@@ -2493,17 +2493,17 @@ HLT_sct_noise_SCTPEB_L1RD0_EMPTY:
HLT_tau0_perf_ptonly_L1TAU100:
eventCount: 0
HLT_tau0_perf_ptonly_L1TAU12:
- eventCount: 15
+ eventCount: 16
stepCounts:
0: 18
- 1: 15
- 2: 15
- 3: 15
+ 1: 16
+ 2: 16
+ 3: 16
stepFeatures:
0: 42
- 1: 23
- 2: 23
- 3: 23
+ 1: 24
+ 2: 24
+ 3: 24
HLT_tau0_perf_ptonly_L1TAU60:
eventCount: 3
stepCounts:
@@ -2913,7 +2913,7 @@ HLT_unconvtrk120_isohpttrack_imedium_L1XE50:
stepCounts:
0: 6
stepFeatures:
- 0: 11
+ 0: 10
HLT_xe100_cvfpufit_L1XE50:
eventCount: 6
stepCounts:
@@ -2945,13 +2945,13 @@ HLT_xe100_mhtpufit_pf_subjesgscIS_L1XE50:
0: 10
1: 5
HLT_xe100_pfopufit_L1XE50:
- eventCount: 5
+ eventCount: 4
stepCounts:
0: 10
- 1: 5
+ 1: 4
stepFeatures:
0: 10
- 1: 5
+ 1: 4
HLT_xe100_pfsum_L1XE50:
eventCount: 6
stepCounts:
@@ -2997,21 +2997,21 @@ HLT_xe110_pfsum_L1XE50:
0: 10
1: 5
HLT_xe110_pfsum_cssk_L1XE50:
- eventCount: 3
+ eventCount: 2
stepCounts:
0: 10
- 1: 3
+ 1: 2
stepFeatures:
0: 10
- 1: 3
+ 1: 2
HLT_xe110_pfsum_vssk_L1XE50:
- eventCount: 4
+ eventCount: 3
stepCounts:
0: 10
- 1: 4
+ 1: 3
stepFeatures:
0: 10
- 1: 4
+ 1: 3
HLT_xe110_tc_em_L1XE50:
eventCount: 5
stepCounts:
@@ -3129,7 +3129,7 @@ HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrloose_L1XE50:
stepCounts:
0: 3
stepFeatures:
- 0: 7
+ 0: 6
HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrmedium_L1XE50:
eventCount: 2
stepCounts:
@@ -3141,13 +3141,13 @@ HLT_xe80_tcpufit_unconvtrk120_isohpttrack_imedium_L1XE50:
stepCounts:
0: 5
stepFeatures:
- 0: 15
+ 0: 14
HLT_xe80_tcpufit_unconvtrk80_isohpttrack_imedium_L1XE50:
eventCount: 6
stepCounts:
0: 6
stepFeatures:
- 0: 20
+ 0: 19
HLT_xe95_trkmht_xe90_tcpufit_xe75_cell_L1XE50:
eventCount: 4
stepCounts: