Skip to content

Resolve !SIM.random.seed per apply_to call, not once #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
astronomyk wants to merge 1 commit into from
Closed

Resolve !SIM.random.seed per apply_to call, not once #974

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 14 additions & 10 deletions scopesim/effects/electronic/noise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,23 @@ def apply_to(self, det, **kwargs):
if not isinstance(det, Detector):
return det

self.meta["random_seed"] = from_currsys(self.meta["random_seed"],
self.cmds)
if self.meta["random_seed"] is not None:
np.random.seed(self.meta["random_seed"])
# Resolve into locals rather than back into self.meta: writing the
# resolved value over the "!SIM.random.seed" reference froze the
# first frame's seed into the effect, so repeated readouts from a
# reused OpticalTrain could never be reseeded per exposure.
random_seed = from_currsys(self.meta["random_seed"], self.cmds)
if random_seed is not None:
np.random.seed(random_seed)

self.meta = from_currsys(self.meta, self.cmds)
ron_keys = ["noise_std", "n_channels", "channel_fraction",
"line_fraction", "pedestal_fraction", "read_fraction"]
ron_kwargs = {key: self.meta[key] for key in ron_keys}
ron_kwargs = {key: from_currsys(self.meta[key], self.cmds)
for key in ron_keys}
ron_kwargs["image_shape"] = det._hdu.data.shape

ron_frame = _make_ron_frame(**ron_kwargs)
stacked_ron_frame = np.zeros_like(ron_frame)
for i in range(self.meta["ndit"]):
for i in range(from_currsys(self.meta["ndit"], self.cmds)):
dx = np.random.randint(0, ron_frame.shape[1])
dy = np.random.randint(0, ron_frame.shape[0])
stacked_ron_frame += np.roll(ron_frame, (dy, dx), axis=(0, 1))
Expand Down Expand Up @@ -240,9 +243,10 @@ def apply_to(self, det, **kwargs):
if not isinstance(det, Detector):
return det

self.meta["random_seed"] = from_currsys(self.meta["random_seed"],
self.cmds)
rng = np.random.default_rng(self.meta["random_seed"])
# Local resolution (see PoorMansHxRGReadoutNoise.apply_to): keep the
# "!SIM.random.seed" reference intact so every readout re-resolves it.
random_seed = from_currsys(self.meta["random_seed"], self.cmds)
rng = np.random.default_rng(random_seed)

# numpy has a problem with generating Poisson distributions above
# certain values. E.g. on linux, numpy.random.poisson(1e20) raises
Expand Down