diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/share/signalShapes/proportionalArgonLT.dat b/InnerDetector/InDetDigitization/TRT_Digitization/share/signalShapes/proportionalArgonLT.dat
index 04502251ebb578c51423a4e9dbd522efb749205f..103888def2625c099a9d717db675bb947746d767 100755
--- a/InnerDetector/InDetDigitization/TRT_Digitization/share/signalShapes/proportionalArgonLT.dat
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/share/signalShapes/proportionalArgonLT.dat
@@ -1,160 +1,160 @@
-0.390625 0.0615367
-1.17188 0.182727
-1.95312 0.297239
-2.73438 0.412757
-3.51562 0.538228
-4.29688 0.663099
-5.07812 0.776969
-5.85938 0.875428
-6.64062 0.94405
-7.42188 0.984161
-8.20312 0.993044
-8.98438 0.966288
-9.76562 0.913313
-10.5469 0.856057
-11.3281 0.794949
-12.1094 0.730736
-12.8906 0.666524
-13.6719 0.602311
-14.4531 0.536858
-15.2344 0.471147
-16.0156 0.406935
-16.7969 0.342722
-17.5781 0.286429
-18.3594 0.232919
-19.1406 0.180758
-19.9219 0.134739
-20.7031 0.093536
-21.4844 0.0548587
-22.2656 0.0215861
-23.0469 -0.00311429
-23.8281 -0.0207727
-24.6094 -0.0321704
-25.3906 -0.0401969
-26.1719 -0.0461473
-26.9531 -0.0504281
-27.7344 -0.0526969
-28.5156 -0.054131
-29.2969 -0.0546725
-30.0781 -0.0542552
-30.8594 -0.0529709
-31.6406 -0.0518622
-32.4219 -0.0509654
-33.2031 -0.0501327
-33.9844 -0.0490625
-34.7656 -0.0479923
-35.5469 -0.0469221
-36.3281 -0.0458519
-37.1094 -0.0447817
-37.8906 -0.0437114
-38.6719 -0.0423651
-39.4531 -0.0408497
-40.2344 -0.0390839
-41.0156 -0.0369435
-41.7969 -0.0348031
-42.5781 -0.0328086
-43.3594 -0.0308653
-44.1406 -0.028922
-44.9219 -0.0269787
-45.7031 -0.0250354
-46.4844 -0.0230922
-47.2656 -0.021149
-48.0469 -0.0192057
-48.8281 -0.0172624
-49.6094 -0.0157585
-50.3906 -0.0145334
-51.1719 -0.0133454
-51.9531 -0.0117401
-52.7344 -0.0106379
-53.5156 -0.00956765
-54.2969 -0.00849743
-55.0781 -0.00742723
-55.8594 -0.00635702
-56.6406 -0.00528681
-57.4219 -0.00421661
-58.2031 -0.00314641
-58.9844 -0.00207619
-59.7656 -0.00100599
-60.5469 0
-61.3281 0
-62.1094 0
-62.8906 0
-63.6719 0
-64.4531 0
-65.2344 0
-66.0156 0
-66.7969 0
-67.5781 0
-68.3594 0
-69.1406 0
-69.9219 0
-70.7031 0
-71.4844 0
-72.2656 0
-73.0469 0
-73.8281 0
-74.6094 0
- 75.390625 0.0
- 76.171875 0.0
- 76.953125 0.0
- 77.734375 0.0
- 78.515625 0.0
- 79.296875 0.0
- 80.078125 0.0
- 80.859375 0.0
- 81.640625 0.0
- 82.421875 0.0
- 83.203125 0.0
- 83.984375 0.0
- 84.765625 0.0
- 85.546875 0.0
- 86.328125 0.0
- 87.109375 0.0
- 87.890625 0.0
- 88.671875 0.0
- 89.453125 0.0
- 90.234375 0.0
- 91.015625 0.0
- 91.796875 0.0
- 92.578125 0.0
- 93.359375 0.0
- 94.140625 0.0
- 94.921875 0.0
- 95.703125 0.0
- 96.484375 0.0
- 97.265625 0.0
- 98.046875 0.0
- 98.828125 0.0
- 99.609375 0.0
- 100.390625 0.0
- 101.171875 0.0
- 101.953125 0.0
- 102.734375 0.0
- 103.515625 0.0
- 104.296875 0.0
- 105.078125 0.0
- 105.859375 0.0
- 106.640625 0.0
- 107.421875 0.0
- 108.203125 0.0
- 108.984375 0.0
- 109.765625 0.0
- 110.546875 0.0
- 111.328125 0.0
- 112.109375 0.0
- 112.890625 0.0
- 113.671875 0.0
- 114.453125 0.0
- 115.234375 0.0
- 116.015625 0.0
- 116.796875 0.0
- 117.578125 0.0
- 118.359375 0.0
- 119.140625 0.0
- 119.921875 0.0
- 120.703125 0.0
- 121.484375 0.0
- 122.265625 0.0
- 123.046875 0.0
- 123.828125 0.0
- 124.609375 0.0
+0.390625 0.0585938
+1.17188 0.175781
+1.95312 0.292969
+2.73438 0.410156
+3.51562 0.527344
+4.29688 0.644531
+5.07812 0.769031
+5.85938 0.886891
+6.64062 0.966388
+7.42188 0.994571
+8.20312 0.965874
+8.98438 0.883619
+9.76562 0.759288
+10.5469 0.609766
+11.3281 0.45343
+12.1094 0.306347
+12.8906 0.179643
+13.6719 0.0785878
+14.4531 0.00327442
+15.2344 -0.0497191
+16.0156 -0.0854337
+16.7969 -0.108986
+17.5781 -0.124645
+18.3594 -0.135499
+19.1406 -0.143531
+19.9219 -0.14988
+20.7031 -0.155123
+21.4844 -0.159518
+22.2656 -0.163151
+23.0469 -0.166033
+23.8281 -0.168147
+24.6094 -0.169472
+25.3906 -0.169992
+26.1719 -0.1697
+26.9531 -0.1686
+27.7344 -0.166709
+28.5156 -0.164053
+29.2969 -0.160669
+30.0781 -0.156605
+30.8594 -0.151916
+31.6406 -0.146664
+32.4219 -0.140919
+33.2031 -0.134753
+33.9844 -0.128243
+34.7656 -0.121465
+35.5469 -0.114497
+36.3281 -0.107413
+37.1094 -0.100288
+37.8906 -0.0931886
+38.6719 -0.0861789
+39.4531 -0.0793164
+40.2344 -0.0726523
+41.0156 -0.0662308
+41.7969 -0.060089
+42.5781 -0.0542567
+43.3594 -0.0487569
+44.1406 -0.0436057
+44.9219 -0.0388127
+45.7031 -0.0343818
+46.4844 -0.0303115
+47.2656 -0.0265957
+48.0469 -0.0232241
+48.8281 -0.0201832
+49.6094 -0.0174568
+50.3906 -0.0152344
+51.1719 -0.0140625
+51.9531 -0.0128907
+52.7344 -0.0117188
+53.5156 -0.0105469
+54.2969 -0.00937504
+55.0781 -0.00820316
+55.8594 -0.00703129
+56.6406 -0.00585941
+57.4219 -0.00468754
+58.2031 -0.00351566
+58.9844 -0.00234379
+59.7656 -0.00117191
+60.5469 0
+61.3281 0
+62.1094 0
+62.8906 0
+63.6719 0
+64.4531 0
+65.2344 0
+66.0156 0
+66.7969 0
+67.5781 0
+68.3594 0
+69.1406 0
+69.9219 0
+70.7031 0
+71.4844 0
+72.2656 0
+73.0469 0
+73.8281 0
+74.6094 0
+75.3906 0
+76.1719 0
+76.9531 0
+77.7344 0
+78.5156 0
+79.2969 0
+80.0781 0
+80.8594 0
+81.6406 0
+82.4219 0
+83.2031 0
+83.9844 0
+84.7656 0
+85.5469 0
+86.3281 0
+87.1094 0
+87.8906 0
+88.6719 0
+89.4531 0
+90.2344 0
+91.0156 0
+91.7969 0
+92.5781 0
+93.3594 0
+94.1406 0
+94.9219 0
+95.7031 0
+96.4844 0
+97.2656 0
+98.0469 0
+98.8281 0
+99.6094 0
+100.391 0
+101.172 0
+101.953 0
+102.734 0
+103.516 0
+104.297 0
+105.078 0
+105.859 0
+106.641 0
+107.422 0
+108.203 0
+108.984 0
+109.766 0
+110.547 0
+111.328 0
+112.109 0
+112.891 0
+113.672 0
+114.453 0
+115.234 0
+116.016 0
+116.797 0
+117.578 0
+118.359 0
+119.141 0
+119.922 0
+120.703 0
+121.484 0
+122.266 0
+123.047 0
+123.828 0
+124.609 0
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx
index d5493c6b452417654a2bb7d3e87555c646f7821c..c599109f7c8163951ac4f0d3a49bde5ac19fefec 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx
@@ -494,16 +494,16 @@ void TRTDigSettings::fillDefaults(const InDetDD::TRT_DetectorManager* detmgr) {
// LT timimg shift in steps of 0.78125 ns.
m_ltT0shiftBarShortXe=0;
m_ltT0shiftBarShortKr=0;
- m_ltT0shiftBarShortAr=0;
+ m_ltT0shiftBarShortAr=4;
m_ltT0shiftBarLongXe=0;
m_ltT0shiftBarLongKr=0;
- m_ltT0shiftBarLongAr=0;
+ m_ltT0shiftBarLongAr=4;
m_ltT0shiftECAwheelsXe=0;
m_ltT0shiftECAwheelsKr=0;
- m_ltT0shiftECAwheelsAr=0;
+ m_ltT0shiftECAwheelsAr=4;
m_ltT0shiftECBwheelsXe=0;
m_ltT0shiftECBwheelsKr=0;
- m_ltT0shiftECBwheelsAr=0;
+ m_ltT0shiftECBwheelsAr=4;
// length
m_innerRadiusOfStraw = 2.0*CLHEP::mm;
@@ -549,9 +549,9 @@ void TRTDigSettings::fillDefaults(const InDetDD::TRT_DetectorManager* detmgr) {
// (Argon) Initial tuning by Artem July 2014. See log file. Requires fine tuning.
// HT middle-bit fraction tune - wider shaping function; 01-00-24
// HT middle-bit fraction tune - 2015 data; 01-01-16
- // Argon LT tune to 2015 data; 01-02-06
- m_lowThresholdBarArgon = 0.150*CLHEP::keV;
- m_lowThresholdECArgon = 0.150*CLHEP::keV;
+ // Argon LT tune to 2015 data; r22
+ m_lowThresholdBarArgon = 0.100*CLHEP::keV;
+ m_lowThresholdECArgon = 0.100*CLHEP::keV;
m_highThresholdBarShortArgon = 2.607*CLHEP::keV;
m_highThresholdBarLongArgon = 2.540*CLHEP::keV;
m_highThresholdECAwheelsArgon = 2.414*CLHEP::keV;
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.cxx
index 5cc072e7e6682be5c0ab9640fa2c4a13e35c9854..72002d3071644ae6276ae84b2666c0fc44a5d606 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.cxx
@@ -163,14 +163,14 @@ void TRTElectronicsProcessing::TabulateSignalShape() {
};
const double pArLT[160] = {
- 0.061537, 0.182727, 0.297239, 0.412757, 0.538228, 0.663099, 0.776969, 0.875428, 0.944050, 0.984161,
- 0.993044, 0.966288, 0.913313, 0.856057, 0.794949, 0.730736, 0.666524, 0.602311, 0.536858, 0.471147,
- 0.406935, 0.342722, 0.286429, 0.232919, 0.180758, 0.134739, 0.093536, 0.054859, 0.021586, -0.003114,
- -0.020773, -0.032170, -0.040197, -0.046147, -0.050428, -0.052697, -0.054131, -0.054672, -0.054255, -0.052971,
- -0.051862, -0.050965, -0.050133, -0.049063, -0.047992, -0.046922, -0.045852, -0.044782, -0.043711, -0.042365,
- -0.040850, -0.039084, -0.036943, -0.034803, -0.032809, -0.030865, -0.028922, -0.026979, -0.025035, -0.023092,
- -0.021149, -0.019206, -0.017262, -0.015759, -0.014533, -0.013345, -0.011740, -0.010638, -0.009568, -0.008497,
- -0.007427, -0.006357, -0.005287, -0.004217, -0.003146, -0.002076, -0.001006, 0.0, 0.0, 0.0,
+ 0.058594, 0.175781, 0.292969, 0.410156, 0.527344, 0.644531, 0.769031, 0.886891, 0.966388, 0.994571,
+ 0.965874, 0.883619, 0.759288, 0.609766, 0.453430, 0.306347, 0.179643, 0.078588, 0.003274, -0.049719,
+ -0.085434, -0.108986, -0.124645, -0.135499, -0.143531, -0.149880, -0.155123, -0.159518, -0.163151, -0.166033,
+ -0.168147, -0.169472, -0.169992, -0.169700, -0.168600, -0.166709, -0.164053, -0.160669, -0.156605, -0.151916,
+ -0.146664, -0.140919, -0.134753, -0.128243, -0.121465, -0.114497, -0.107413, -0.100288, -0.093189, -0.086179,
+ -0.079316, -0.072652, -0.066231, -0.060089, -0.054257, -0.048757, -0.043606, -0.038813, -0.034382, -0.030312,
+ -0.026596, -0.023224, -0.020183, -0.017457, -0.015234, -0.014063, -0.012891, -0.011719, -0.010547, -0.009375,
+ -0.008203, -0.007031, -0.005859, -0.004688, -0.003516, -0.002344, -0.001172, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index 0340ce2777ab934a83c8c04bebf072ea51a310ea..63f8a7e7062cac94e75f09661fbe8df25cbccebe 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -28,7 +28,7 @@ ciRefFileMap = {
's3505-22.0' : 'v2',
# OverlayTier0Test_required-test
'overlay-d1498-21.0' : 'v2',
- 'overlay-d1498-22.0' : 'v29',
+ 'overlay-d1498-22.0' : 'v30',
'overlay-bkg-21.0' : 'v1',
'overlay-bkg-22.0' : 'v4',
}