Skip to content
This repository has been archived by the owner on Jun 5, 2024. It is now read-only.

Fix s2 photon timing bug #434

Merged
merged 3 commits into from
Apr 18, 2024
+6 −6
Merged

Fix s2 photon timing bug #434

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82cdf39
force photon_timings to return np.int64
FaroutYLq Mar 20, 2024
187a997
more photon timing int
FaroutYLq Mar 20, 2024
bb835b3
more photon timing int
FaroutYLq Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions wfsim/core/s2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ def photon_timings(positions, n_photons_per_xy, _electron_timings, n_photons_per
if config['s2_luminescence_model']=='simple':
_photon_timings = S2.luminescence_timings_simple(positions, n_photons_per_xy,
config=config,
resource=resource)
resource=resource).astype(np.int64)
elif config['s2_luminescence_model']=='garfield':
confine_position=None
if 's2_garfield_confine_position' in config:
Expand All @@ -527,21 +527,21 @@ def photon_timings(positions, n_photons_per_xy, _electron_timings, n_photons_per
_photon_timings = S2.luminescence_timings_garfield(positions, n_photons_per_xy,
config=config,
resource=resource,
confine_position=confine_position)
confine_position=confine_position).astype(np.int64)

elif config['s2_luminescence_model']=='garfield_gas_gap':
_photon_timings = S2.luminescence_timings_garfield_gasgap(positions, n_photons_per_xy,
resource=resource)
resource=resource).astype(np.int64)
else:
raise KeyError(f"{config['s2_luminescence_model']} is not valid! Use 'simple' or 'garfield' or 'garfield_gas_gap'")

# Emission Delay
_photon_timings += Pulse.singlet_triplet_delays(len(_photon_timings), config['singlet_fraction_gas'], config, phase)
_photon_timings += Pulse.singlet_triplet_delays(len(_photon_timings), config['singlet_fraction_gas'], config, phase).astype(np.int64)

# Optical Propagation Delay
if "optical_propagation" in config['s2_time_model']:
# optical propagation splitting top and bottom
_photon_timings += S2.optical_propagation(_photon_channels, config, resource.s2_optical_propagation_spline)
_photon_timings += S2.optical_propagation(_photon_channels, config, resource.s2_optical_propagation_spline).astype(np.int64)
elif "zero_delay" in config['s2_time_model']:
# no optical propagation delay
_photon_timings += np.zeros_like(_photon_timings, dtype=np.int64)
Expand All @@ -554,7 +554,7 @@ def photon_timings(positions, n_photons_per_xy, _electron_timings, n_photons_per
# repeat for n photons per electron # Should this be before adding delays?
_photon_timings += np.repeat(_electron_timings, n_photons_per_ele)

return _photon_timings
return _photon_timings.astype(np.int64)

@staticmethod
def s2_pattern_map_diffuse(n_electron, z, xy, config, resource):
Expand Down
Loading