diff --git a/pax/config/XENON1T.ini b/pax/config/XENON1T.ini
index 3d146510..7bc57e67 100644
--- a/pax/config/XENON1T.ini
+++ b/pax/config/XENON1T.ini
@@ -464,255 +464,260 @@ channels_bottom = list(range(127, 247 + 1))
 # @ 2017-02-14 The default gains now come from PMT WG. 
 # It is the average values for the first science run
 # Only for waveform simulation usage
+# @ 2017-09-05 Switch to use the PMT mask for SR1
+# from the note:
+# xenon:xenon1t:analysis:sciencerun1:pmt
+# gain values from:
+# https://xe1t-wiki.lngs.infn.it/lib/exe/fetch.php?media=xenon:gain_sr1_20170815.html
 gains = [
-    2454700.0, # PMT ID = 0
+    2432700.0, # PMT ID = 0
     0.0, # PMT ID = 1
-    2220960.0, # PMT ID = 2
-    2155720.0, # PMT ID = 3
-    3914230.0, # PMT ID = 4
-    2193190.0, # PMT ID = 5
-    4794680.0, # PMT ID = 6
-    2306410.0, # PMT ID = 7
-    2302830.0, # PMT ID = 8
-    3568740.0, # PMT ID = 9
-    2431830.0, # PMT ID = 10
-    3051300.0, # PMT ID = 11
+    0.0, # PMT ID = 2
+    2118231.0, # PMT ID = 3
+    3913679.2, # PMT ID = 4
+    2179060.2, # PMT ID = 5
+    4783011.4, # PMT ID = 6
+    2285389.8, # PMT ID = 7
+    2304369.7, # PMT ID = 8
+    3553740.5, # PMT ID = 9
+    2424223.8, # PMT ID = 10
+    2962568.5, # PMT ID = 11
     0.0, # PMT ID = 12
-    3106890.0, # PMT ID = 13
-    2162410.0, # PMT ID = 14
-    2447030.0, # PMT ID = 15
-    2680920.0, # PMT ID = 16
-    2142420.0, # PMT ID = 17
-    2399060.0, # PMT ID = 18
-    2299720.0, # PMT ID = 19
-    2393640.0, # PMT ID = 20
-    2240190.0, # PMT ID = 21
-    4351390.0, # PMT ID = 22
-    2360750.0, # PMT ID = 23
-    3167230.0, # PMT ID = 24
-    2316990.0, # PMT ID = 25
+    3088785.2, # PMT ID = 13
+    2156613.5, # PMT ID = 14
+    2443124.3, # PMT ID = 15
+    2681879.8, # PMT ID = 16
+    2115355.6, # PMT ID = 17
+    2397658.0, # PMT ID = 18
+    2307939.8, # PMT ID = 19
+    2397467.7, # PMT ID = 20
+    1503646.1, # PMT ID = 21
+    4320583.4, # PMT ID = 22
+    2353569.4, # PMT ID = 23
+    3171167.4, # PMT ID = 24
+    2315386.7, # PMT ID = 25
     0.0, # PMT ID = 26
     0.0, # PMT ID = 27
-    2369150.0, # PMT ID = 28
-    2360410.0, # PMT ID = 29
-    4065970.0, # PMT ID = 30
-    2293450.0, # PMT ID = 31
-    4155640.0, # PMT ID = 32
-    2455290.0, # PMT ID = 33
+    2433459.0, # PMT ID = 28
+    2358719.1, # PMT ID = 29
+    4061145.3, # PMT ID = 30
+    1021081.0, # PMT ID = 31
+    4145097.0, # PMT ID = 32
+    2436739.4, # PMT ID = 33
     0.0, # PMT ID = 34
-    3181110.0, # PMT ID = 35
-    2343640.0, # PMT ID = 36
-    2470630.0, # PMT ID = 37
-    3798760.0, # PMT ID = 38
-    3369460.0, # PMT ID = 39
-    2450890.0, # PMT ID = 40
-    3178970.0, # PMT ID = 41
-    3736900.0, # PMT ID = 42
-    2350790.0, # PMT ID = 43
-    2795680.0, # PMT ID = 44
-    2641520.0, # PMT ID = 45
-    2262460.0, # PMT ID = 46
-    3631590.0, # PMT ID = 47
-    2314930.0, # PMT ID = 48
-    3264430.0, # PMT ID = 49
-    3760810.0, # PMT ID = 50
-    0.0, # PMT ID = 51
-    2409370.0, # PMT ID = 52
-    2139890.0, # PMT ID = 53
-    3652190.0, # PMT ID = 54
-    1972600.0, # PMT ID = 55
-    4568780.0, # PMT ID = 56
-    3448980.0, # PMT ID = 57
-    2104010.0, # PMT ID = 58
-    2270160.0, # PMT ID = 59
-    2844820.0, # PMT ID = 60
-    2129320.0, # PMT ID = 61
+    3187287.6, # PMT ID = 35
+    2319201.6, # PMT ID = 36
+    2443450.6, # PMT ID = 37
+    3784919.3, # PMT ID = 38
+    3313370.1, # PMT ID = 39
+    2404329.8, # PMT ID = 40
+    3125667.6, # PMT ID = 41
+    3727044.8, # PMT ID = 42
+    2339796.2, # PMT ID = 43
+    2794000.1, # PMT ID = 44
+    2631032.2, # PMT ID = 45
+    2259287.6, # PMT ID = 46
+    3602532.9, # PMT ID = 47
+    2268778.2, # PMT ID = 48
+    2273325.8, # PMT ID = 49
+    3753031.0, # PMT ID = 50
+    3726368.9, # PMT ID = 51
+    2408890.0, # PMT ID = 52
+    2141638.7, # PMT ID = 53
+    3644141.6, # PMT ID = 54
+    1974087.3, # PMT ID = 55
+    4578696.0, # PMT ID = 56
+    3446182.6, # PMT ID = 57
+    1654483.8, # PMT ID = 58
+    2275539.1, # PMT ID = 59
+    2845516.2, # PMT ID = 60
+    1376923.5, # PMT ID = 61
     0.0, # PMT ID = 62
-    3808380.0, # PMT ID = 63
-    3544490.0, # PMT ID = 64
+    3817850.8, # PMT ID = 63
+    3553878.9, # PMT ID = 64
     0.0, # PMT ID = 65
-    2288970.0, # PMT ID = 66
-    2391430.0, # PMT ID = 67
-    4828820.0, # PMT ID = 68
-    3072220.0, # PMT ID = 69
-    3779430.0, # PMT ID = 70
-    2222680.0, # PMT ID = 71
-    2232660.0, # PMT ID = 72
+    2107886.8, # PMT ID = 66
+    2358730.3, # PMT ID = 67
+    4822737.0, # PMT ID = 68
+    3032499.1, # PMT ID = 69
+    3767360.1, # PMT ID = 70
+    1984868.5, # PMT ID = 71
+    2151208.7, # PMT ID = 72
     0.0, # PMT ID = 73
-    4812910.0, # PMT ID = 74
-    4664870.0, # PMT ID = 75
-    2921810.0, # PMT ID = 76
-    3367480.0, # PMT ID = 77
-    1913240.0, # PMT ID = 78
+    4802930.6, # PMT ID = 74
+    4651988.1, # PMT ID = 75
+    2921450.4, # PMT ID = 76
+    3349141.4, # PMT ID = 77
+    1750132.2, # PMT ID = 78
     0.0, # PMT ID = 79
-    3377140.0, # PMT ID = 80
-    4191370.0, # PMT ID = 81
-    4439910.0, # PMT ID = 82
-    2110200.0, # PMT ID = 83
-    2550060.0, # PMT ID = 84
-    2188750.0, # PMT ID = 85
+    3376351.8, # PMT ID = 80
+    4189051.2, # PMT ID = 81
+    4433400.7, # PMT ID = 82
+    2098564.5, # PMT ID = 83
+    2547402.2, # PMT ID = 84
+    1898619.0, # PMT ID = 85
     0.0, # PMT ID = 86
-    2488540.0, # PMT ID = 87
+    2472596.0, # PMT ID = 87
     0.0, # PMT ID = 88
-    2653900.0, # PMT ID = 89
-    2332770.0, # PMT ID = 90
+    2631022.4, # PMT ID = 89
+    2318192.8, # PMT ID = 90
     0.0, # PMT ID = 91
-    3498370.0, # PMT ID = 92
-    2312630.0, # PMT ID = 93
-    2959870.0, # PMT ID = 94
-    4258430.0, # PMT ID = 95
-    4458110.0, # PMT ID = 96
-    2982780.0, # PMT ID = 97
-    2103810.0, # PMT ID = 98
-    2251460.0, # PMT ID = 99
-    2255500.0, # PMT ID = 100
-    3081240.0, # PMT ID = 101
+    3485209.5, # PMT ID = 92
+    2291383.5, # PMT ID = 93
+    2943499.7, # PMT ID = 94
+    4228517.1, # PMT ID = 95
+    4396198.1, # PMT ID = 96
+    2972169.7, # PMT ID = 97
+    2106049.8, # PMT ID = 98
+    2250216.7, # PMT ID = 99
+    2251522.5, # PMT ID = 100
+    3088910.7, # PMT ID = 101
     0.0, # PMT ID = 102
-    2403450.0, # PMT ID = 103
-    3415100.0, # PMT ID = 104
-    3740300.0, # PMT ID = 105
-    3904240.0, # PMT ID = 106
-    2313870.0, # PMT ID = 107
-    4807940.0, # PMT ID = 108
-    2286720.0, # PMT ID = 109
-    2402270.0, # PMT ID = 110
-    2373820.0, # PMT ID = 111
-    2228830.0, # PMT ID = 112
-    2858710.0, # PMT ID = 113
-    2916730.0, # PMT ID = 114
-    1781090.0, # PMT ID = 115
-    3648120.0, # PMT ID = 116
-    2187960.0, # PMT ID = 117
+    2407942.8, # PMT ID = 103
+    3413813.4, # PMT ID = 104
+    3750955.2, # PMT ID = 105
+    3846970.1, # PMT ID = 106
+    2305216.0, # PMT ID = 107
+    4803797.3, # PMT ID = 108
+    2262734.9, # PMT ID = 109
+    2393566.9, # PMT ID = 110
+    2337492.5, # PMT ID = 111
+    2229830.5, # PMT ID = 112
+    2843725.6, # PMT ID = 113
+    2922553.8, # PMT ID = 114
+    1778200.5, # PMT ID = 115
+    3663065.1, # PMT ID = 116
+    2174280.5, # PMT ID = 117
     0.0, # PMT ID = 118
-    2264870.0, # PMT ID = 119
-    2452100.0, # PMT ID = 120
-    4718690.0, # PMT ID = 121
-    2300960.0, # PMT ID = 122
-    2306600.0, # PMT ID = 123
-    2213380.0, # PMT ID = 124
-    2221760.0, # PMT ID = 125
-    4896670.0, # PMT ID = 126
-    4770270.0, # PMT ID = 127
-    2310130.0, # PMT ID = 128
-    2685350.0, # PMT ID = 129
+    1581556.2, # PMT ID = 119
+    2447642.7, # PMT ID = 120
+    4738854.5, # PMT ID = 121
+    2287168.0, # PMT ID = 122
+    2300981.5, # PMT ID = 123
+    2229850.3, # PMT ID = 124
+    2228500.4, # PMT ID = 125
+    4911399.2, # PMT ID = 126
+    4745375.9, # PMT ID = 127
+    2304545.0, # PMT ID = 128
+    2687277.1, # PMT ID = 129
     0.0, # PMT ID = 130
-    3365590.0, # PMT ID = 131
-    4624650.0, # PMT ID = 132
-    3286860.0, # PMT ID = 133
+    3358897.6, # PMT ID = 131
+    4604376.0, # PMT ID = 132
+    3281145.7, # PMT ID = 133
     0.0, # PMT ID = 134
     0.0, # PMT ID = 135
-    3889670.0, # PMT ID = 136
+    3867213.4, # PMT ID = 136
     0.0, # PMT ID = 137
-    4449840.0, # PMT ID = 138
+    4424895.0, # PMT ID = 138
     0.0, # PMT ID = 139
-    4762350.0, # PMT ID = 140
-    3208830.0, # PMT ID = 141
-    2236040.0, # PMT ID = 142
-    3357250.0, # PMT ID = 143
-    2659320.0, # PMT ID = 144
-    3396690.0, # PMT ID = 145
-    3991870.0, # PMT ID = 146
-    4898720.0, # PMT ID = 147
+    4763962.5, # PMT ID = 140
+    3204981.4, # PMT ID = 141
+    2040636.9, # PMT ID = 142
+    3361400.7, # PMT ID = 143
+    2657899.5, # PMT ID = 144
+    3382850.8, # PMT ID = 145
+    4004996.8, # PMT ID = 146
+    4895845.4, # PMT ID = 147
     0.0, # PMT ID = 148
-    2353690.0, # PMT ID = 149
+    2355569.0, # PMT ID = 149
     0.0, # PMT ID = 150
-    4052570.0, # PMT ID = 151
+    4035769.6, # PMT ID = 151
     0.0, # PMT ID = 152
-    3628540.0, # PMT ID = 153
-    2743550.0, # PMT ID = 154
-    2358020.0, # PMT ID = 155
-    3237420.0, # PMT ID = 156
-    2287810.0, # PMT ID = 157
-    4468640.0, # PMT ID = 158
-    4120150.0, # PMT ID = 159
-    2291580.0, # PMT ID = 160
-    2351640.0, # PMT ID = 161
+    3631995.4, # PMT ID = 153
+    2737401.4, # PMT ID = 154
+    2353328.8, # PMT ID = 155
+    3208296.8, # PMT ID = 156
+    2270820.3, # PMT ID = 157
+    4458172.2, # PMT ID = 158
+    3091663.2, # PMT ID = 159
+    2286101.2, # PMT ID = 160
+    2343698.3, # PMT ID = 161
     0.0, # PMT ID = 162
-    2218320.0, # PMT ID = 163
-    2282280.0, # PMT ID = 164
-    2583050.0, # PMT ID = 165
-    2360800.0, # PMT ID = 166
+    2208745.5, # PMT ID = 163
+    2265005.5, # PMT ID = 164
+    2574094.7, # PMT ID = 165
+    2351592.2, # PMT ID = 166
     0.0, # PMT ID = 167
-    2279370.0, # PMT ID = 168
-    4541610.0, # PMT ID = 169
-    4793430.0, # PMT ID = 170
-    3299140.0, # PMT ID = 171
-    3995930.0, # PMT ID = 172
-    2331190.0, # PMT ID = 173
-    2216930.0, # PMT ID = 174
-    4323330.0, # PMT ID = 175
-    2757670.0, # PMT ID = 176
-    2936360.0, # PMT ID = 177
+    2258103.0, # PMT ID = 168
+    4515907.9, # PMT ID = 169
+    4787913.4, # PMT ID = 170
+    3290881.6, # PMT ID = 171
+    3998070.0, # PMT ID = 172
+    2328998.5, # PMT ID = 173
+    2210546.7, # PMT ID = 174
+    4289614.2, # PMT ID = 175
+    2750604.8, # PMT ID = 176
+    2925434.2, # PMT ID = 177
     0.0, # PMT ID = 178
-    2342170.0, # PMT ID = 179
-    4784790.0, # PMT ID = 180
-    4817250.0, # PMT ID = 181
-    3261000.0, # PMT ID = 182
+    2335768.4, # PMT ID = 179
+    4788268.4, # PMT ID = 180
+    4802241.7, # PMT ID = 181
+    3259283.1, # PMT ID = 182
     0.0, # PMT ID = 183
-    2239070.0, # PMT ID = 184
-    4246190.0, # PMT ID = 185
-    4003630.0, # PMT ID = 186
-    4074060.0, # PMT ID = 187
-    2262390.0, # PMT ID = 188
-    2271890.0, # PMT ID = 189
-    4770520.0, # PMT ID = 190
-    2658560.0, # PMT ID = 191
-    3535460.0, # PMT ID = 192
-    4630830.0, # PMT ID = 193
-    3372580.0, # PMT ID = 194
-    2256000.0, # PMT ID = 195
-    2253920.0, # PMT ID = 196
-    2234930.0, # PMT ID = 197
+    2234728.2, # PMT ID = 184
+    4236769.3, # PMT ID = 185
+    3985946.4, # PMT ID = 186
+    4067105.1, # PMT ID = 187
+    2257972.3, # PMT ID = 188
+    2257539.9, # PMT ID = 189
+    0.0, # PMT ID = 190
+    2672913.9, # PMT ID = 191
+    3526263.3, # PMT ID = 192
+    4599147.9, # PMT ID = 193
+    3364867.0, # PMT ID = 194
+    2257249.4, # PMT ID = 195
+    2243348.3, # PMT ID = 196
+    2227130.8, # PMT ID = 197
     0.0, # PMT ID = 198
-    3268330.0, # PMT ID = 199
-    2168200.0, # PMT ID = 200
-    3443220.0, # PMT ID = 201
-    2170770.0, # PMT ID = 202
+    3266518.4, # PMT ID = 199
+    2141982.7, # PMT ID = 200
+    3222968.0, # PMT ID = 201
+    2168047.1, # PMT ID = 202
     0.0, # PMT ID = 203
-    3892380.0, # PMT ID = 204
-    1904620.0, # PMT ID = 205
+    3888656.0, # PMT ID = 204
+    1450886.1, # PMT ID = 205
     0.0, # PMT ID = 206
-    3810420.0, # PMT ID = 207
-    2432080.0, # PMT ID = 208
-    2031360.0, # PMT ID = 209
-    3356590.0, # PMT ID = 210
-    3857000.0, # PMT ID = 211
-    4256180.0, # PMT ID = 212
+    3797610.9, # PMT ID = 207
+    2431951.1, # PMT ID = 208
+    1986429.9, # PMT ID = 209
+    3348428.3, # PMT ID = 210
+    3856516.4, # PMT ID = 211
+    4249209.3, # PMT ID = 212
     0.0, # PMT ID = 213
     0.0, # PMT ID = 214
-    4834730.0, # PMT ID = 215
-    4109580.0, # PMT ID = 216
-    2037580.0, # PMT ID = 217
-    4711720.0, # PMT ID = 218
-    4705220.0, # PMT ID = 219
-    2352110.0, # PMT ID = 220
-    4788170.0, # PMT ID = 221
-    3412780.0, # PMT ID = 222
-    4755180.0, # PMT ID = 223
-    3188370.0, # PMT ID = 224
-    2385220.0, # PMT ID = 225
-    4619810.0, # PMT ID = 226
-    2764010.0, # PMT ID = 227
-    2653900.0, # PMT ID = 228
-    4630550.0, # PMT ID = 229
-    2230830.0, # PMT ID = 230
-    3732750.0, # PMT ID = 231
-    2296410.0, # PMT ID = 232
-    2553580.0, # PMT ID = 233
+    4839853.2, # PMT ID = 215
+    4105876.1, # PMT ID = 216
+    1804120.8, # PMT ID = 217
+    4704599.2, # PMT ID = 218
+    4671564.5, # PMT ID = 219
+    2354243.6, # PMT ID = 220
+    4781690.7, # PMT ID = 221
+    3406115.5, # PMT ID = 222
+    4761844.5, # PMT ID = 223
+    3176912.2, # PMT ID = 224
+    2387929.0, # PMT ID = 225
+    4593492.5, # PMT ID = 226
+    2761105.2, # PMT ID = 227
+    2648806.2, # PMT ID = 228
+    4638143.8, # PMT ID = 229
+    2229885.9, # PMT ID = 230
+    3741967.0, # PMT ID = 231
+    2299486.1, # PMT ID = 232
+    2544000.2, # PMT ID = 233
     0.0, # PMT ID = 234
-    4664230.0, # PMT ID = 235
-    2295320.0, # PMT ID = 236
-    2274810.0, # PMT ID = 237
-    4755530.0, # PMT ID = 238
+    4678772.8, # PMT ID = 235
+    2289942.6, # PMT ID = 236
+    2270578.3, # PMT ID = 237
+    4709968.8, # PMT ID = 238
     0.0, # PMT ID = 239
-    2328320.0, # PMT ID = 240
-    4243100.0, # PMT ID = 241
-    4610070.0, # PMT ID = 242
-    4307860.0, # PMT ID = 243
+    2334480.3, # PMT ID = 240
+    4225956.6, # PMT ID = 241
+    4580827.1, # PMT ID = 242
+    4314836.2, # PMT ID = 243
     0.0, # PMT ID = 244
-    3981150.0, # PMT ID = 245
-    3444510.0, # PMT ID = 246
-    4587680.0, # PMT ID = 247
+    3999214.9, # PMT ID = 245
+    3457237.1, # PMT ID = 246
+    4543867.4, # PMT ID = 247
     2e6, # PMT ID = 248
     2e6, # PMT ID = 249
     2e6, # PMT ID = 250