Merge pull request #772 from SBNSoftware/bugfix/wirecellgrouped

Coherent Noise Removal Nonuniformity Mitigation

Author: nathanielerowe

sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/chndb-base.jsonnet

@@ -86,6 +86,7 @@ function(params, anode, field, n, rms_cuts=[])
         roi_min_max_ratio: 0.8, // default 0.8
         min_rms_cut: 1.0,  // units???
         max_rms_cut: 30.0,  // units???
+        protection_factor: 2.0,
 
         // parameter used to make "rcrc" spectrum
         rcrc: 0.5 * wc.millisecond, // 1.1 for collection, 3.3 for induction
@@ -117,8 +118,9 @@ function(params, anode, field, n, rms_cuts=[])
         /// this uses hard-coded waveform.
         response: { waveform: handmade.u_resp, waveformid: wc.Ulayer },
         response_offset: 125.6, // offset of the negative peak
-        pad_window_front: 20,
-        decon_limit: 0.02,
+        pad_window_front: 120, // 20,
+        pad_window_back: 25, // 20
+        decon_limit: 0.002, // 0.02,
         decon_limit1: 0.07,
         roi_min_max_ratio: 3.0,
       },
@@ -137,7 +139,9 @@ function(params, anode, field, n, rms_cuts=[])
         /// this uses hard-coded waveform.
         response: { waveform: handmade.v_resp, waveformid: wc.Vlayer },
         response_offset: 129.5,
-        decon_limit: 0.01,
+        pad_window_front: 40, // 20
+        pad_window_back: 30, // 20
+        decon_limit: 0.002, // 0.01,
         decon_limit1: 0.08,
         roi_min_max_ratio: 1.5,
       },
@@ -151,10 +155,14 @@ function(params, anode, field, n, rms_cuts=[])
 
       {
         //channels: { wpid: wc.WirePlaneId(wc.Wlayer) },
-//        channels: std.range(n * 2560 + 1600, n * 2560 + 2560- 1),
+      //  channels: std.range(n * 2560 + 1600, n * 2560 + 2560- 1),
         channels: std.range(n * 5638 + 3968, n * 5638 + 5638-1),
+        response: { waveform: handmade.w_resp, waveformid: wc.Wlayer },
+        response_offset: 129, 
         nominal_baseline: 650,
-        decon_limit: 0.05,
+        pad_window_front: 30, // 20
+        pad_window_back: 30, // 20
+        decon_limit: 0.0025,
         decon_limit1: 0.08,
         freqmasks: freqbinner.freqmasks(harmonic_freqs, 5.0*wc.kilohertz),
       },

sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/chndb-resp.jsonnet

@@ -10,4 +10,7 @@ u_resp : [
 
 v_resp : [
 2.7027618940000003e-07,7.430170020000002e-05,0.0017782846129999997,0.00862459381,0.0221973409,0.040657049300000005,0.060399728900000005,0.07818915720000001,0.0922499172,0.1022825461,0.10893164169999998,0.11318773480000002,0.11598667989999999,0.1180232025,0.11972972550000001,0.12133833390000004,0.12295098550000003,0.12460414889999999,0.12630360959999998,0.1280483169,0.1298349458,0.1316642278,0.13353644220000002,0.1354572415,0.1374271843,0.13944674940000001,0.14151809140000005,0.1436430989,0.1458242324,0.14806054759999998,0.15035552910000002,0.1527118502,0.1551294311,0.15761171649999997,0.1601611403,0.1627785537,0.1654673482,0.16822923950000002,0.1710668477,0.1739826732,0.17697880410000005,0.1800579137,0.18322338020000004,0.1864783424,0.18982572629999997,0.1932679525,0.19680971590000002,0.20045265239999996,0.2042015633,0.20805932140000002,0.21202894579999998,0.21611615550000007,0.220323943,0.2246573756,0.2291177168,0.2337133988,0.23844773330000008,0.24332437780000002,0.24834934390000002,0.25352800480000004,0.258864417,0.2643662147,0.2700364968,0.27588170050000005,0.28190842259999993,0.28812292740000006,0.2945313196,0.3011408743,0.3079578558,0.31498868799999996,0.32224077900000003,0.329720699,0.33743578960000004,0.3453944032,0.35360318979999994,0.3620707944,0.37080522360000007,0.37981498939999997,0.3891070078,0.3986889928,0.4085703608,0.41875764209999994,0.4292590428000001,0.4400839128000001,0.45123745240000007,0.46273000900000005,0.4745681528,0.48675997019999995,0.4993126764500001,0.5122327924070001,0.5255267689700001,0.53919979141,0.5532587918199999,0.5677083587000001,0.5825553748000001,0.59780250943,0.6134535384600002,0.6295113440000001,0.6459782735,0.6628567449,0.6801454933700001,0.6978454007000001,0.7159524063999998,0.73446206694,0.7533665698999998,0.7726554934,0.7923100472000002,0.8123105539500001,0.8326239166000001,0.8532032460000001,0.8739996314000004,0.8949384066,0.9159221890000001,0.936831917,0.9575180719999998,0.9778004389999998,0.9974349629999999,1.0161374230000002,1.0371451720000002,1.1666701480000004,2.250862075000001,5.966484670999999,12.879900560800005,20.592172412000004,24.042244947,19.470110064999997,7.324775633,-8.013183978799999,-20.6681403362,-26.9779757058,-26.909867789000003,-22.7293312442,-16.9641049529,-11.418605780400002,-7.001344819210001,-3.9266593179099996,-2.0149885553699995,-0.9443304889200002,-0.4039790811,-0.16002736371299997,-0.06171746270899998,-0.025761063903399994,-0.011875130514799997,-0.0053241077502200005,-0.00205456946709,-0.00017071601423520002,-0.00010105296083399999,-0.000226570376312,-0.000186611240788,4.3499331120000015e-07,2.127716577e-07,-2.1503892200000003e-07,3.539106193e-07,3.1053418549999995e-07,6.860861525e-07,3.5306020399999996e-07,6.252263633000001e-07,1.0712758314999999e-06,6.119958957e-07,1.0622040211999998e-06,5.065312979999999e-07,5.019957054e-07,1.3872952030000004e-07,-3.9350672759999994e-07,-2.1470912190000007e-07,-4.694870873000001e-07,-1.5120308489999998e-07,-2.3398725910000005e-07,1.2323115000000001e-07,2.419257099e-07,4.929234296000001e-07,2.0110098218000002e-07,2.646059073e-07,2.846406283e-07,1.9807651430000003e-07,-5.195725465e-07,-1.4685612619999997e-07,-3.5249335800000006e-07,-1.961860523e-07,-3.288687009999998e-08,-2.3247556780000008e-07,2.5043083379999996e-07,2.8917445200000016e-08,2.0620405120000005e-07,5.135248463099998e-07,6.817383027e-07,7.477015014e-07,1.0565363060000003e-07,3.451220324999999e-07,-1.8522364699999968e-08,-6.74739324e-08,-3.388855693999999e-07,-4.1582848999999675e-09,-3.4361038109999997e-07,4.536105581e-07,1.1831662709999995e-07,5.632331215000001e-07,2.7745921349999995e-07,4.037132008e-07,4.902771950999999e-07],
+
+w_resp: [
+    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,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.29333333333333333,0.88,2.0533333333333332,3.813333333333333,6.746666666666666,11.44,18.186666666666664,26.986666666666665,36.666666666666664,46.05333333333333,52.8,55.43999999999999,52.8,46.05333333333333,36.666666666666664,26.986666666666665,18.186666666666664,11.44,6.746666666666666,3.813333333333333,2.0533333333333337,0.88,0.29333333333333333,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],
 }

sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/nf-data.jsonnet

@@ -28,6 +28,8 @@ function(params, anode, chndbobj, n, name='', dft=default_dft)
         anode: wc.tn(anode),
         dft: wc.tn(dft),
         rms_threshold: 0.0,
+        correlation_threshold: 1.0,
+        default_scaling: 1.0,
       },
     },
     local sticky = {

sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/nf.jsonnet

@@ -28,6 +28,8 @@ function(params, anode, chndbobj, n, name='', dft=default_dft)
         anode: wc.tn(anode),
         dft: wc.tn(dft),
         rms_threshold: 0.0,
+        correlation_threshold: 1.0,
+        default_scaling: 1.0,
       },
     },
     local sticky = {

sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-sim-drift-depoflux-nf-sp.jsonnet

@@ -127,11 +127,11 @@ local wcls_depoflux_writer = g.pnode({
     anodes: [wc.tn(anode) for anode in tools.anodes],
     field_response: wc.tn(tools.field),
     tick: 0.5 * wc.us,
-    window_start: 0.0 * wc.ms,
+    window_start: params.sim.tick0_time, // -205 * wc.us,
     window_duration: self.tick * params.daq.nticks,
     nsigma: 3.0,
 
-    reference_time: -1700 * wc.us,
+    reference_time: - 1700  * wc.us - self.window_start, // target is tick 410 should be 3400
 
     //energy: 1, # equivalent to use_energy = true
     simchan_label: 'simpleSC',