GitLab

beamline_settings.py .setup() checks _no_setup key exists before popping

  - CLOSE --> CLOSED
  - state from method to attribute

# Conflicts:
#	id26/controllers/id26undulators.py

position_instances.py added admin_wardr_positions(), self.axis_objlist, new position values always converted to float()

 mono.sock.flush() and sync_hard() added at scan ending and in error cleanup
 MyMusstAcquisitionMaster() renamed into FscanAquisitionMaster()
 prepared for BackgroundCalcCounterController

- sync_hard() necessary in error cleanup to allow restoration of positions
- swapped PM600 XS command (500ms) and OPIOM IMA 0x4 (5ms) not to loose 500 ms of acquisition !!!
- profiling time info and other debug rubbish changes

fscan: use opiom O8 to trig the musst acquisition, bug fixes in external_channel conversion functions

* _check_limits() tested ok
* added some debugging dirty print out and bench calls
* MyMusstAcquisitionMaster class written to ensure trajectory is started after the musst
* bug fixes: scan_info, nbpoints

fscan.py group.move_to_end() replaced by direct calls to M600.controller.start_trajectory(*group.trajectories) and PM600.controller.raw_write ('\003')
         PM600.sync_hard() added to cleanup procedures (error and ending)

fscan.py : fscan_check_traj() and test_fscan_launch() functions added

scripts/fscan.py gap_error (gap_energy_error) removed as it was based on buggy spec macros
scripts/gap_scan.py prepared for u27c calib handling

backlash handling removed
undulator status checked before changing velocity or moving
default harmonic order taken from self.parameters.gscan_order rather than being 1

scripts/fscan_pm600.prog.py added class ID26FscanCyclicTrajectory hacking CyclicTrajectory to remove last pvt point in case of more than 1 cycle