From 7ed81c310d0026373df6aae3c2694af6be44a803 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 7 Nov 2016 08:38:06 -0600 Subject: [PATCH 1/6] fix hardcode gains for hf upgrade --- CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc b/CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc index 6c299441fc180..1168cd87c5325 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc @@ -60,8 +60,8 @@ const int HcalDbHardcode::getGainIndex(HcalGenericDetId fId){ else index = 1; } else if (fId.genericSubdet() == HcalGenericDetId::HcalGenForward) { HcalDetId hid(fId); - if (hid.depth() == 1) index = 0; - else if (hid.depth() == 2) index = 1; + if (hid.depth() % 2 == 1) index = 0; //depths 1,3 + else if (hid.depth() % 2 == 0) index = 1; //depths 2,4 } return index; } From 65b7999e6752ef7e5769e60d2535e9093d004aaf Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 7 Nov 2016 08:41:34 -0600 Subject: [PATCH 2/6] fix legacy hardcode pedestals and widths to be in fC --- .../python/Hcal_Conditions_forGlobalTag_cff.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py index 6861a7950a478..3fcba81c2a695 100644 --- a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py +++ b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py @@ -26,8 +26,8 @@ killHE = cms.bool(False), useLayer0Weight = cms.bool(False), hb = cms.PSet( - pedestal = cms.double(3.0), - pedestalWidth = cms.double(0.55), + pedestal = cms.double(3.285), + pedestalWidth = cms.double(0.809), gain = cms.vdouble(0.19), gainWidth = cms.vdouble(0.0), qieType = cms.int32(0), @@ -39,8 +39,8 @@ darkCurrent = cms.double(0.0), ), he = cms.PSet( - pedestal = cms.double(3.0), - pedestalWidth = cms.double(0.79), + pedestal = cms.double(3.163), + pedestalWidth = cms.double(0.9698), gain = cms.vdouble(0.23), gainWidth = cms.vdouble(0), qieType = cms.int32(0), @@ -52,8 +52,8 @@ darkCurrent = cms.double(0.0), ), hf = cms.PSet( - pedestal = cms.double(3.0), - pedestalWidth = cms.double(0.84), + pedestal = cms.double(9.354), + pedestalWidth = cms.double(2.516), gain = cms.vdouble(0.14,0.135), gainWidth = cms.vdouble(0.0,0.0), qieType = cms.int32(0), @@ -65,8 +65,8 @@ darkCurrent = cms.double(0.0), ), ho = cms.PSet( - pedestal = cms.double(11.0), - pedestalWidth = cms.double(0.57), + pedestal = cms.double(12.06), + pedestalWidth = cms.double(0.6285), gain = cms.vdouble(0.0060,0.0087), gainWidth = cms.vdouble(0.0,0.0), qieType = cms.int32(0), From cac4219c0aa30dc64af268af56a71ed336b0f511 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 7 Nov 2016 08:55:54 -0600 Subject: [PATCH 3/6] remove unnecessary photoelectronsToAnalog param (now taken from db for SiPMs) --- SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py b/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py index a19d5174050e3..f3ac8044dd230 100644 --- a/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py +++ b/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py @@ -123,7 +123,6 @@ from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017 run2_HE_2017.toModify( hcalSimParameters, he = dict( - photoelectronsToAnalog = cms.vdouble([57.5]*14), doSiPMSmearing = cms.bool(True), sipmTau = cms.double(10.), ) @@ -132,7 +131,6 @@ from Configuration.Eras.Modifier_run3_HB_cff import run3_HB run3_HB.toModify( hcalSimParameters, hb = dict( - photoelectronsToAnalog = cms.vdouble([57.5]*16), doSiPMSmearing = cms.bool(True), sipmTau = cms.double(10.), ) From 2b3ca4b032403e85209ede8199cb090f8fcc21a1 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 7 Nov 2016 09:01:44 -0600 Subject: [PATCH 4/6] update SiPM parameters --- .../Hcal_Conditions_forGlobalTag_cff.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py index 3fcba81c2a695..38f3bff935aa2 100644 --- a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py +++ b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py @@ -80,28 +80,28 @@ hbUpgrade = cms.PSet( pedestal = cms.double(17.3), pedestalWidth = cms.double(1.5), - gain = cms.vdouble(1/3568.), #62.06 is pe/GeV 57.5 is fC/pe. + gain = cms.vdouble(1/2276.), #51.72 is pe/GeV 44.0 is fC/pe. gainWidth = cms.vdouble(0), qieType = cms.int32(2), qieOffset = cms.vdouble(0.,0.,0.,0.), qieSlope = cms.vdouble(0.05376,0.05376,0.05376,0.05376), #1/(3.1*6) where 6 is shunt factor mcShape = cms.int32(203), recoShape = cms.int32(203), - photoelectronsToAnalog = cms.double(57.5), - darkCurrent = cms.double(0.055), + photoelectronsToAnalog = cms.double(44.0), + darkCurrent = cms.double(0.01), ), heUpgrade = cms.PSet( pedestal = cms.double(17.3), pedestalWidth = cms.double(1.5), - gain = cms.vdouble(1/3568.), #62.06 is pe/GeV 57.5 is fC/pe. + gain = cms.vdouble(1/2276.), #51.72 is pe/GeV 44.0 is fC/pe. gainWidth = cms.vdouble(0), qieType = cms.int32(2), qieOffset = cms.vdouble(0.,0.,0.,0.), qieSlope = cms.vdouble(0.05376,0.05376,0.05376,0.05376), #1/(3.1*6) where 6 is shunt factor mcShape = cms.int32(203), recoShape = cms.int32(203), - photoelectronsToAnalog = cms.double(57.5), - darkCurrent = cms.double(0.055), + photoelectronsToAnalog = cms.double(44.0), + darkCurrent = cms.double(0.01), ), hfUpgrade = cms.PSet( pedestal = cms.double(13.33), @@ -120,10 +120,10 @@ SiPMCharacteristics = cms.VPSet( cms.PSet( pixels = cms.int32(36000), crosstalk = cms.double(0.0), nonlin1 = cms.double(1.0), nonlin2 = cms.double(0.0), nonlin3 = cms.double(0.0) ), cms.PSet( pixels = cms.int32(2500), crosstalk = cms.double(0.0), nonlin1 = cms.double(1.0), nonlin2 = cms.double(0.0), nonlin3 = cms.double(0.0) ), - cms.PSet( pixels = cms.int32(27370), crosstalk = cms.double(0.32), nonlin1 = cms.double(1.00985), nonlin2 = cms.double(7.84089E-6), nonlin3 = cms.double(2.86282E-10) ), - cms.PSet( pixels = cms.int32(38018), crosstalk = cms.double(0.32), nonlin1 = cms.double(1.00546), nonlin2 = cms.double(6.40239E-6), nonlin3 = cms.double(1.27011E-10) ), - cms.PSet( pixels = cms.int32(27370), crosstalk = cms.double(0.32), nonlin1 = cms.double(1.00985), nonlin2 = cms.double(7.84089E-6), nonlin3 = cms.double(2.86282E-10) ), - cms.PSet( pixels = cms.int32(38018), crosstalk = cms.double(0.32), nonlin1 = cms.double(1.00546), nonlin2 = cms.double(6.40239E-6), nonlin3 = cms.double(1.27011E-10) ), + cms.PSet( pixels = cms.int32(27370), crosstalk = cms.double(0.17), nonlin1 = cms.double(1.00985), nonlin2 = cms.double(7.84089E-6), nonlin3 = cms.double(2.86282E-10) ), + cms.PSet( pixels = cms.int32(38018), crosstalk = cms.double(0.17), nonlin1 = cms.double(1.00546), nonlin2 = cms.double(6.40239E-6), nonlin3 = cms.double(1.27011E-10) ), + cms.PSet( pixels = cms.int32(27370), crosstalk = cms.double(0.17), nonlin1 = cms.double(1.00985), nonlin2 = cms.double(7.84089E-6), nonlin3 = cms.double(2.86282E-10) ), + cms.PSet( pixels = cms.int32(38018), crosstalk = cms.double(0.17), nonlin1 = cms.double(1.00546), nonlin2 = cms.double(6.40239E-6), nonlin3 = cms.double(1.27011E-10) ), ), ) From 6f61f36165aee8a4896baaa07ad7cca99ca8b7a4 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 7 Nov 2016 09:44:33 -0600 Subject: [PATCH 5/6] allow separate dark current for different SiPM types --- .../interface/HcalHardcodeParameters.h | 7 +++--- .../HcalAlgos/src/HcalDbHardcode.cc | 24 ++++++++++++++----- .../HcalAlgos/src/HcalHardcodeParameters.cc | 4 ++-- .../Hcal_Conditions_forGlobalTag_cff.py | 14 +++++------ .../src/HcalHardcodeCalibrations.cc | 14 +++++------ 5 files changed, 38 insertions(+), 25 deletions(-) diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalHardcodeParameters.h b/CalibCalorimetry/HcalAlgos/interface/HcalHardcodeParameters.h index 0b49526b462b4..fabde72508d7f 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalHardcodeParameters.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalHardcodeParameters.h @@ -12,7 +12,7 @@ class HcalHardcodeParameters { //construct from values HcalHardcodeParameters(double pedestal, double pedestalWidth, std::vector gain, std::vector gainWidth, int qieType, std::vector qieOffset, std::vector qieSlope, int mcShape, int recoShape, - double photoelectronsToAnalog, double darkCurrent); + double photoelectronsToAnalog, std::vector darkCurrent); //construct from pset HcalHardcodeParameters(const edm::ParameterSet & p); @@ -31,7 +31,7 @@ class HcalHardcodeParameters { const int mcShape() const { return mcShape_; } const int recoShape() const { return recoShape_; } const double photoelectronsToAnalog() const { return photoelectronsToAnalog_; } - const double darkCurrent() const { return darkCurrent_; } + const double darkCurrent(unsigned index) const { return darkCurrent_.at(index); } private: //member variables @@ -40,7 +40,8 @@ class HcalHardcodeParameters { int qieType_; std::vector qieOffset_, qieSlope_; int mcShape_, recoShape_; - double photoelectronsToAnalog_, darkCurrent_; + double photoelectronsToAnalog_; + std::vector darkCurrent_; }; #endif diff --git a/CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc b/CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc index 1168cd87c5325..02c47149a92d4 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc @@ -14,7 +14,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" HcalDbHardcode::HcalDbHardcode() -: theDefaultParameters_(3.0,0.5,{0.2,0.2},{0.0,0.0},0,{0.0,0.0,0.0,0.0},{0.9,0.9,0.9,0.9},125,105,0.0,0.0), //"generic" set of conditions +: theDefaultParameters_(3.0,0.5,{0.2,0.2},{0.0,0.0},0,{0.0,0.0,0.0,0.0},{0.9,0.9,0.9,0.9},125,105,0.0,{0.0}), //"generic" set of conditions setHB_(false), setHE_(false), setHF_(false), setHO_(false), setHBUpgrade_(false), setHEUpgrade_(false), setHFUpgrade_(false), useHBUpgrade_(false), useHEUpgrade_(false), useHOUpgrade_(true), @@ -563,17 +563,29 @@ HcalSiPMParameter HcalDbHardcode::makeHardcodeSiPMParameter (HcalGenericDetId fI // rule for type: cells with >4 layers use larger device (3.3mm diameter), otherwise 2.8mm HcalSiPMType theType = HcalNoSiPM; double thePe2fC = getParameters(fId).photoelectronsToAnalog(); - double theDC = getParameters(fId).darkCurrent(); + double theDC = getParameters(fId).darkCurrent(0); if (fId.genericSubdet() == HcalGenericDetId::HcalGenBarrel && useHBUpgrade_) { HcalDetId hid(fId); int nLayersInDepth = getLayersInDepth(hid.ietaAbs(),hid.depth(),topo); - if(nLayersInDepth > 4) theType = HcalHBHamamatsu2; - else theType = HcalHBHamamatsu1; + if(nLayersInDepth > 4) { + theType = HcalHBHamamatsu2; + theDC = getParameters(fId).darkCurrent(1); + } + else { + theType = HcalHBHamamatsu1; + theDC = getParameters(fId).darkCurrent(0); + } } else if (fId.genericSubdet() == HcalGenericDetId::HcalGenEndcap && useHEUpgrade_) { HcalDetId hid(fId); int nLayersInDepth = getLayersInDepth(hid.ietaAbs(),hid.depth(),topo); - if(nLayersInDepth > 4) theType = HcalHEHamamatsu2; - else theType = HcalHEHamamatsu1; + if(nLayersInDepth > 4) { + theType = HcalHEHamamatsu2; + theDC = getParameters(fId).darkCurrent(1); + } + else { + theType = HcalHEHamamatsu1; + theDC = getParameters(fId).darkCurrent(0); + } } else if (fId.genericSubdet() == HcalGenericDetId::HcalGenOuter && useHOUpgrade_) { theType = HcalHOHamamatsu; } diff --git a/CalibCalorimetry/HcalAlgos/src/HcalHardcodeParameters.cc b/CalibCalorimetry/HcalAlgos/src/HcalHardcodeParameters.cc index 10434eb830422..1b0f8456816f0 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalHardcodeParameters.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalHardcodeParameters.cc @@ -2,7 +2,7 @@ HcalHardcodeParameters::HcalHardcodeParameters(double pedestal, double pedestalWidth, std::vector gain, std::vector gainWidth, int qieType, std::vector qieOffset, std::vector qieSlope, int mcShape, int recoShape, - double photoelectronsToAnalog, double darkCurrent) + double photoelectronsToAnalog, std::vector darkCurrent) : pedestal_(pedestal), pedestalWidth_(pedestalWidth), gain_(gain), @@ -28,6 +28,6 @@ HcalHardcodeParameters::HcalHardcodeParameters(const edm::ParameterSet & p) mcShape_(p.getParameter("mcShape")), recoShape_(p.getParameter("recoShape")), photoelectronsToAnalog_(p.getParameter("photoelectronsToAnalog")), - darkCurrent_(p.getParameter("darkCurrent")) + darkCurrent_(p.getParameter>("darkCurrent")) { } diff --git a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py index 38f3bff935aa2..aa8a78d2f74d2 100644 --- a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py +++ b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py @@ -36,7 +36,7 @@ mcShape = cms.int32(125), recoShape = cms.int32(105), photoelectronsToAnalog = cms.double(0.0), - darkCurrent = cms.double(0.0), + darkCurrent = cms.vdouble(0.0), ), he = cms.PSet( pedestal = cms.double(3.163), @@ -49,7 +49,7 @@ mcShape = cms.int32(125), recoShape = cms.int32(105), photoelectronsToAnalog = cms.double(0.0), - darkCurrent = cms.double(0.0), + darkCurrent = cms.vdouble(0.0), ), hf = cms.PSet( pedestal = cms.double(9.354), @@ -62,7 +62,7 @@ mcShape = cms.int32(301), recoShape = cms.int32(301), photoelectronsToAnalog = cms.double(0.0), - darkCurrent = cms.double(0.0), + darkCurrent = cms.vdouble(0.0), ), ho = cms.PSet( pedestal = cms.double(12.06), @@ -75,7 +75,7 @@ mcShape = cms.int32(201), recoShape = cms.int32(201), photoelectronsToAnalog = cms.double(4.0), - darkCurrent = cms.double(0.0), + darkCurrent = cms.vdouble(0.0), ), hbUpgrade = cms.PSet( pedestal = cms.double(17.3), @@ -88,7 +88,7 @@ mcShape = cms.int32(203), recoShape = cms.int32(203), photoelectronsToAnalog = cms.double(44.0), - darkCurrent = cms.double(0.01), + darkCurrent = cms.vdouble(0.01,0.015), ), heUpgrade = cms.PSet( pedestal = cms.double(17.3), @@ -101,7 +101,7 @@ mcShape = cms.int32(203), recoShape = cms.int32(203), photoelectronsToAnalog = cms.double(44.0), - darkCurrent = cms.double(0.01), + darkCurrent = cms.vdouble(0.01,0.015), ), hfUpgrade = cms.PSet( pedestal = cms.double(13.33), @@ -114,7 +114,7 @@ mcShape = cms.int32(301), recoShape = cms.int32(301), photoelectronsToAnalog = cms.double(0.0), - darkCurrent = cms.double(0.0), + darkCurrent = cms.vdouble(0.0), ), # types (in order): HcalHOZecotek, HcalHOHamamatsu, HcalHEHamamatsu1, HcalHEHamamatsu2, HcalHBHamamatsu1, HcalHBHamamatsu2 SiPMCharacteristics = cms.VPSet( diff --git a/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc b/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc index a3c5419c21b6c..0095898fab64a 100644 --- a/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc +++ b/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc @@ -873,7 +873,7 @@ void HcalHardcodeCalibrations::fillDescriptions(edm::ConfigurationDescriptions & desc_hb.add("mcShape",125); desc_hb.add("recoShape",105); desc_hb.add("photoelectronsToAnalog",0.0); - desc_hb.add("darkCurrent",0.0); + desc_hb.add>("darkCurrent",std::vector(0.0)); desc.add("hb", desc_hb); edm::ParameterSetDescription desc_hbUpgrade; @@ -887,7 +887,7 @@ void HcalHardcodeCalibrations::fillDescriptions(edm::ConfigurationDescriptions & desc_hbUpgrade.add("mcShape",203); desc_hbUpgrade.add("recoShape",203); desc_hbUpgrade.add("photoelectronsToAnalog",57.5); - desc_hbUpgrade.add("darkCurrent",0.055); + desc_hbUpgrade.add>("darkCurrent",std::vector(0.055)); desc.add("hbUpgrade", desc_hbUpgrade); edm::ParameterSetDescription desc_he; @@ -901,7 +901,7 @@ void HcalHardcodeCalibrations::fillDescriptions(edm::ConfigurationDescriptions & desc_he.add("mcShape",125); desc_he.add("recoShape",105); desc_he.add("photoelectronsToAnalog",0.0); - desc_he.add("darkCurrent",0.0); + desc_he.add>("darkCurrent",std::vector(0.0)); desc.add("he", desc_he); edm::ParameterSetDescription desc_heUpgrade; @@ -915,7 +915,7 @@ void HcalHardcodeCalibrations::fillDescriptions(edm::ConfigurationDescriptions & desc_heUpgrade.add("mcShape",203); desc_heUpgrade.add("recoShape",203); desc_heUpgrade.add("photoelectronsToAnalog",57.5); - desc_heUpgrade.add("darkCurrent",0.055); + desc_heUpgrade.add>("darkCurrent",std::vector(0.055)); desc.add("heUpgrade", desc_heUpgrade); edm::ParameterSetDescription desc_hf; @@ -929,7 +929,7 @@ void HcalHardcodeCalibrations::fillDescriptions(edm::ConfigurationDescriptions & desc_hf.add("mcShape",301); desc_hf.add("recoShape",301); desc_hf.add("photoelectronsToAnalog",0.0); - desc_hf.add("darkCurrent",0.0); + desc_hf.add>("darkCurrent",std::vector(0.0)); desc.add("hf", desc_hf); edm::ParameterSetDescription desc_hfUpgrade; @@ -943,7 +943,7 @@ void HcalHardcodeCalibrations::fillDescriptions(edm::ConfigurationDescriptions & desc_hfUpgrade.add("mcShape",301); desc_hfUpgrade.add("recoShape",301); desc_hfUpgrade.add("photoelectronsToAnalog",0.0); - desc_hfUpgrade.add("darkCurrent",0.0); + desc_hfUpgrade.add>("darkCurrent",std::vector(0.0)); desc.add("hfUpgrade", desc_hfUpgrade); edm::ParameterSetDescription desc_hfrecal; @@ -964,7 +964,7 @@ void HcalHardcodeCalibrations::fillDescriptions(edm::ConfigurationDescriptions & desc_ho.add("mcShape",201); desc_ho.add("recoShape",201); desc_ho.add("photoelectronsToAnalog",4.0); - desc_ho.add("darkCurrent",0.055); + desc_ho.add>("darkCurrent",std::vector(0.0)); desc.add("ho", desc_ho); edm::ParameterSetDescription validator_sipm; From 8bb6f5a8ae890aa960895722f16a3f02b8ced10b Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 7 Nov 2016 09:47:13 -0600 Subject: [PATCH 6/6] also different crosstalk for large SiPMs --- .../HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py index aa8a78d2f74d2..b31e34078e1bb 100644 --- a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py +++ b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py @@ -121,9 +121,9 @@ cms.PSet( pixels = cms.int32(36000), crosstalk = cms.double(0.0), nonlin1 = cms.double(1.0), nonlin2 = cms.double(0.0), nonlin3 = cms.double(0.0) ), cms.PSet( pixels = cms.int32(2500), crosstalk = cms.double(0.0), nonlin1 = cms.double(1.0), nonlin2 = cms.double(0.0), nonlin3 = cms.double(0.0) ), cms.PSet( pixels = cms.int32(27370), crosstalk = cms.double(0.17), nonlin1 = cms.double(1.00985), nonlin2 = cms.double(7.84089E-6), nonlin3 = cms.double(2.86282E-10) ), - cms.PSet( pixels = cms.int32(38018), crosstalk = cms.double(0.17), nonlin1 = cms.double(1.00546), nonlin2 = cms.double(6.40239E-6), nonlin3 = cms.double(1.27011E-10) ), + cms.PSet( pixels = cms.int32(38018), crosstalk = cms.double(0.196), nonlin1 = cms.double(1.00546), nonlin2 = cms.double(6.40239E-6), nonlin3 = cms.double(1.27011E-10) ), cms.PSet( pixels = cms.int32(27370), crosstalk = cms.double(0.17), nonlin1 = cms.double(1.00985), nonlin2 = cms.double(7.84089E-6), nonlin3 = cms.double(2.86282E-10) ), - cms.PSet( pixels = cms.int32(38018), crosstalk = cms.double(0.17), nonlin1 = cms.double(1.00546), nonlin2 = cms.double(6.40239E-6), nonlin3 = cms.double(1.27011E-10) ), + cms.PSet( pixels = cms.int32(38018), crosstalk = cms.double(0.196), nonlin1 = cms.double(1.00546), nonlin2 = cms.double(6.40239E-6), nonlin3 = cms.double(1.27011E-10) ), ), )