Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions tools/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,8 @@ class VolumeIntermediates(NamedTuple):
positions_cm: jnp.ndarray # (N, 3) original positions (for NN response)
positions_yz_cm: jnp.ndarray # (N, 2) projected (for wire distances)
t0_us: jnp.ndarray # (N,) initial deposit time in μs
interaction_ids: jnp.ndarray # (N,) interaction label (int16)
ancestor_track_ids: jnp.ndarray # (N,) primary shower ancestor (int32)


class PlaneIntermediates(NamedTuple):
Expand Down
2 changes: 2 additions & 0 deletions tools/physics.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ def compute_volume_physics(
positions_cm=positions_cm,
positions_yz_cm=yz,
t0_us=deposits.t0_us,
interaction_ids=deposits.interaction_ids,
ancestor_track_ids=deposits.ancestor_track_ids,
)


Expand Down
14 changes: 10 additions & 4 deletions tools/simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,8 @@ def light_one_volume(vol_deps, sim_params):
sce_fn = sce_factory()
vol_int = compute_volume_physics(
vol_deps, sim_params, vol_geom, sce_fn, _recomb_fn)
return vol_int.charges, vol_int.photons, vol_int.positions_cm
return (vol_int.charges, vol_int.photons, vol_int.positions_cm,
vol_int.interaction_ids, vol_int.ancestor_track_ids)

@jax.jit
def _light_calculator_jit(sim_params, stacked_deps):
Expand Down Expand Up @@ -730,11 +731,16 @@ def process_event_light(self, deposits: DepositData, sim_params=None):
sim_params = self._default_sim_params

stacked_deps = jax.tree.map(lambda *xs: jnp.stack(xs), *deposits.volumes)
all_charges, all_photons, all_positions = self._light_calculator_jit(
sim_params, stacked_deps)
all_charges, all_photons, all_positions, all_interaction_ids, all_ancestor_track_ids = \
self._light_calculator_jit(sim_params, stacked_deps)

filled_volumes = tuple(
vol._replace(charge=all_charges[v], photons=all_photons[v])
vol._replace(
charge=all_charges[v],
photons=all_photons[v],
interaction_ids=all_interaction_ids[v],
ancestor_track_ids=all_ancestor_track_ids[v],
)
for v, vol in enumerate(deposits.volumes)
)
return deposits._replace(volumes=filled_volumes)
Expand Down