SE shape: optical propagation + anode focusing (#320)

* Make the electrons extract only near the anode * Make the electrons only extract near the anode * s2 photon timings update * update s2 production steps * update Garfield xy conf * changed optical prop delay adding method * change conxy name, default to None * remove duplicate code * remove hard code map interpolation * restructure for optical prop * reorder s2 methodes * bug fixes * add s2 time model to model config * update commit id in basic tests * Adapting confine to be its own option in fax config * Fixing tests Co-authored-by: Jianyang Qi <jiq019@ucsd.edu> Co-authored-by: tianyu zhu <tz2263@columbia.edu> Co-authored-by: Melih <melih.kara@kit.edu> Co-authored-by: Joran R. Angevaare <jorana@nikhef.nl> Co-authored-by: Andrii Terliuk <andrey.terlyuk@gmail.com>
XENONnT · Mar 28, 2022 · b4dc86f · b4dc86f
1 parent b45a100
commit b4dc86f
Show file tree

Hide file tree

Showing 5 changed files with 222 additions and 201 deletions.
diff --git a/files/XENONnT_wfsim_config.json b/files/XENONnT_wfsim_config.json
@@ -8,6 +8,7 @@
 {
     // Configuration flags
     "s1_model_type": "simple",
+    "s2_time_model": "s2_time_spread around zero",
     "s2_luminescence_model": "simple",
     "enable_gas_gap_warping": false,
     "enable_pmt_afterpulses": false,

diff --git a/tests/test_load_resource.py b/tests/test_load_resource.py
@@ -29,7 +29,7 @@ def test_load_nt():
             "drift_speed_map": False,
             "diffusion_longitudinal_map": False,
             "diffusion_transverse_map": False},
-        "url_base": "https://raw.githubusercontent.com/XENONnT/WFSim/9e6ecfab13a314a83eec9844ba40811bc4a2dc36/files",
+        "url_base": "https://raw.githubusercontent.com/XENONnT/WFSim/b33656ac59d0366ccf3b20ab0686500cfd403cb6/files",
         "photon_area_distribution": "XENONnT_spe_distributions_single_channel.csv",
         "s1_pattern_map": ["constant dummy", 14e-5, [494,]],
         "s1_lce_correction_map": ["constant dummy", 1, []],

diff --git a/tests/test_wfsim.py b/tests/test_wfsim.py
@@ -41,10 +41,10 @@ def test_sim_1T():
                 nchunk=2, event_rate=1, chunk_size=1,
                 detector='XENON1T',
                 fax_config=('https://raw.githubusercontent.com/XENONnT/strax_auxiliary_files'
-                            '/c76f30ad20516efbcc832c97842abcba743f0017/sim_files/fax_config_1t.json'),  # noqa
+                            '/36d352580b328ff057b1588b8af8c9a6ed8ae704/sim_files/fax_config_1t.json'),  # noqa
                 fax_config_override=dict(
                     url_base=("https://raw.githubusercontent.com/XENONnT/strax_auxiliary_files"
-                              "/c76f30ad20516efbcc832c97842abcba743f0017/sim_files/"), ),
+                              "/36d352580b328ff057b1588b8af8c9a6ed8ae704/sim_files/"), ),
                 **straxen.contexts.x1t_common_config),
             **straxen.contexts.x1t_context_config,
         )
@@ -87,7 +87,7 @@ def test_sim_nT_basics():
                 nchunk=1, event_rate=1, chunk_size=2,
                 detector='XENONnT',
                 fax_config=('https://raw.githubusercontent.com/XENONnT/WFSim'
-                            '/9e6ecfab13a314a83eec9844ba40811bc4a2dc36/files/XENONnT_wfsim_config.json'),
+                            '/b33656ac59d0366ccf3b20ab0686500cfd403cb6/files/XENONnT_wfsim_config.json'),
                 **conf,
                 fax_config_override=conf_override),
             **straxen.contexts.common_opts)
@@ -122,6 +122,7 @@ def test_sim_nT_advanced():
         st.set_config(dict(nchunk=1, event_rate=1, chunk_size=2,))
 
         st.set_config({'fax_config_override': dict(s2_luminescence_model='simple',
+                                                   s2_time_model="s2_time_spread around zero",
                                                    s1_lce_correction_map='XENONnT_s1_xyz_LCE_corrected_qes_MCva43fa9b_wires.json.gz',
                                                    s1_time_spline='XENONnT_s1_proponly_va43fa9b_wires_20200625.json.gz',
                                                    s1_model_type='optical_propagation+simple',)})
@@ -173,6 +174,7 @@ def test_sim_mc_chain():
             fax_config='fax_config_nt_design.json',
             fax_config_override=dict(
                 s1_model_type='nest',
+                s2_time_model="s2_time_spread around zero",
                 url_base='https://raw.githubusercontent.com/XENONnT/private_nt_aux_files/master/sim_files',
                 s1_lce_correction_map=["constant dummy", 1, []],
                 enable_electron_afterpulses=False),