Skip to content
Snippets Groups Projects

Fix/3.0.0-test04 on max-exfl017: proposal-yaml, AGIPD correct, PnCCD notebooks, and DSSC dark

Merged Karim Ahmed requested to merge fix/3.0.0-test04 into master
All threads resolved!
1 file
+ 8
3
Compare changes
  • Side-by-side
  • Inline
@@ -840,10 +840,15 @@ class AgipdCorrections:
# or with only simple pulse ranging.
if pulse_step > 1 or \
allpulses[first_pulse] >= allpulses[last_pulse]:
can_calibrate = can_calibrate and np.isin(allpulses, cal_pulses)
can_calibrate = np.logical_and(can_calibrate,
np.isin(allpulses, cal_pulses))
else:
can_calibrate = can_calibrate and (allpulses <= np.min(cal_pulses)) # noqa
can_calibrate = can_calibrate and (allpulses >= np.max(cal_pulses)) # noqa
# Check interesection between array of booleans and
# array of pulses to calibrate.
can_calibrate = np.logical_and(can_calibrate,
(allpulses <= np.max(cal_pulses)),
(allpulses >= np.min(cal_pulses))
)
return can_calibrate
Loading