DM-38944: Move photodiode computations from linearity to ptc code. #204
Conversation
tests/test_linearity.py
Outdated
| @@ -85,6 +87,9 @@ def _create_ptc(self, amp_names, exp_times, means, ccobcurr=None): | |||
| """ | |||
| exp_id_pairs = np.arange(len(exp_times)*2).reshape((len(exp_times), 2)).tolist() | |||
|
|
|||
| if photo_charges is None: | |||
| photo_charges = np.zeros(len(exp_times)) + np.nan | |||
There was a problem hiding this comment.
Is this more efficient than np.full(len(exp_times), np.nan)?
There was a problem hiding this comment.
Oddly enough, for small N the zeros is faster (but negligible time), for medium N full is faster, and for large N they're very close. I don't think it matters much, I can change to full if you like.
There was a problem hiding this comment.
(small ~10; medium ~10000; large ~1000000)
There was a problem hiding this comment.
I assumed they were both extremely optimized, I think I just find full easier to read.
erykoff
force-pushed
the
tickets/DM-38944
branch
4 times, most recently
from
2cd9d1f
to
a57dddf
Compare
tests/test_linearity.py
Outdated
| pd_calib.currentScale = -1.0 | ||
| pd_calib.integrationMethod = "CHARGE_SUM" | ||
| # Add one bad photodiode value, but don't put it at the very | ||
| # end because that will mess up the spline node positions. |
There was a problem hiding this comment.
Is this a problem that we need to check for and deal with? I'm assuming it's not a trivial fix given this note.
There was a problem hiding this comment.
Ah, sorry this is not clear. The issue is simply that I want the spline positions in the test code ("truth") to match the spline positions in the data, which are computed from 0 to max. So I don't want to mess with max or else the tests won't be comparing the same numbers.
erykoff
force-pushed
the
tickets/DM-38944
branch
from
a57dddf
to
4283018
Compare
Masking out a value slightly increased the noise in the fit, leading to the need to relax tolerances slightly. These tolerances are somewhat arbitrary.
This moves the photodiode connections and integration code from the linearity code to the PTC code. This will use the photoCharges part of the PTC dataset which was previously unfilled.
This also updates the default PTC and linearity pipelines for LSSTCam as appropriate.