JetCalibTools structural re-work (retry)
This is to restore the changes made in !48724 (merged), which was reverted due to a false negative in the CI. See that MR for a description of the changes. This will be identical, plus any bug fixes that were causing the test failure(s) that previously flew under the radar.