JuSt cHangINg S0M3 fiLes

FlamTeam · Sep 19, 2024 · 8c2fb00 · 8c2fb00
1 parent e1e2541
commit 8c2fb00
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/flamedisx/lz/lz.py b/flamedisx/lz/lz.py
@@ -229,7 +229,7 @@ def add_extra_columns(self, d):
             d['s2_pos_corr_latest'] = np.ones_like(d['x'].values)
 
         if 'event_time' in d.columns and 'electron_lifetime' not in d.columns:
-            d['electron_lifetime'] = self.get_elife(d['event_time'].values)
+            d['electron_lifetime'] = self.elife#self.get_elife(d['event_time'].values)
 
         if 's1' in d.columns and 'cs1' not in d.columns:
             d['cs1'] = d['s1'] / d['s1_pos_corr_LZAP']
@@ -292,8 +292,8 @@ def add_extra_columns(self, d):
 
             radius_cm = d['r'].values
 
-            accept_upper_drift_time = np.where(drift_time_us < 936.5, 1., 0.)
-            accept_lower_drift_time = np.where(drift_time_us > 86., 1., 0.)
+            accept_upper_drift_time = np.where(drift_time_us < 960.5, 1., 0.)
+            accept_lower_drift_time = np.where(drift_time_us > 71., 1., 0.)
             accept_radial = np.where(radius_cm < boundaryR, 1., 0.)
 
             d['fv_acceptance'] = accept_upper_drift_time * accept_lower_drift_time * accept_radial
@@ -338,16 +338,16 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
     def mean_yield_electron(self, energy):
         #Refactored to take constants from lzlama !397
-        er_m1=12.4886
-        er_m2=85.0
-        er_m3=0.6050
-        er_m4= 2.14687
-        er_m5=25.721
-        er_m6=-1.0
-        er_m7=59.651,
-        er_m8=3.6869
-        er_m9=0.2872
-        er_m10=0.1121
+        m1=12.4886
+        m2=85.0
+        m3=0.6050
+        m4= 2.14687
+        m5=25.721
+        m6=-1.0
+        m7=59.651,
+        m8=3.6869
+        m9=0.2872
+        m10=0.1121
         Wq_eV = self.Wq_keV * 1e3
 
         Nq = energy * 1e3 / Wq_eV       
@@ -716,7 +716,7 @@ def add_extra_columns(self, d):
         lz_source = LZERSource()
 
         if 'event_time' in d.columns and 'electron_lifetime' not in d.columns:
-            d['electron_lifetime'] = lz_source.get_elife(d['event_time'].values)
+            d['electron_lifetime'] =self.elife # lz_source.get_elife(d['event_time'].values)
 
         if 's1' in d.columns and 'cs1' not in d.columns:
             d['cs1'] = d['s1'] / d['s1_pos_corr_LZAP']

diff --git a/flamedisx/nest/config/lz_SR3.ini b/flamedisx/nest/config/lz_SR3.ini
@@ -6,7 +6,7 @@ pressure_config = 1.86 ; bar
 drift_field_config = 96.5 ; V/cm
 gas_field_config = 8.301178 ; kV/cm
 
-radius_config = 68.8 ; cm not sure what to do here
+radius_config = 67.3 ; cm not sure what to do here
 ;grab from core cuts
 dt_min_config = 71000. ; ns
 dt_max_config = 1030000. ; ns