Commit Graph

129 Commits

Author SHA1 Message Date
Ferdi Franceschini
b75e0b5efb Make sure that the Lt0 command returns an error if the master_chopper_id isn't set. 2015-02-26 10:51:18 +11:00
Ferdi Franceschini
e0626f4b6a Improve response of t0_chopper_id command by working around the chopsel IO
Box communications problems.
2015-02-26 10:49:39 +11:00
Ferdi Franceschini
243dddc9a3 Fix calculation of ap_limit in collimator anticollision code. 2015-02-26 10:47:56 +11:00
Ferdi Franceschini
52ba801f28 Generated new motor configuration after updating the Bilby_motion_control_commissioning_checklist.xls
The update includes corrections for samz and sapmot and configures the beam position as the origin
for the slit motors.
The left and down slit motors "sign" parameter has been changed so all slits drive away from the beam.
2015-02-25 09:44:06 +11:00
Ferdi Franceschini
59309cec60 SICS-847: Replace t0_chopper_id with master_chopper_id in Lt0 calculation.
Also added some extra chopper status variables.
2015-02-06 14:36:39 +11:00
Ferdi Franceschini
e45edb3913 selrs now reports status of shutters when called without arguments. 2015-02-06 14:31:19 +11:00
Ferdi Franceschini
f1eb273db6 Allow selecting histogram memory server as source of beam monitor counts. 2015-02-06 08:48:11 +11:00
Ferdi Franceschini
ae06a182c6 Add Oxford magnet configuration to Bilby. 2015-02-06 08:48:09 +11:00
Ferdi Franceschini
4c3b3f71e5 Fix reference to chopper sim_mode variable. 2015-02-06 08:48:08 +11:00
Ferdi Franceschini
79fb7292bc Fix some duplicate definitions. 2015-02-06 08:48:07 +11:00
Ferdi Franceschini
fae83b3d9e Only set the posit_count parameter on motors that need to drive to discrete positions. 2015-02-06 08:48:05 +11:00
Ferdi Franceschini
e8601615e6 Add an OUT position to apertures. Copy bug fixes and improvements from ics1-bilby.
Also provide a motor object to read the second encoder on the velocity selector
translation stage for diagnostic purposes.
2015-02-06 08:48:03 +11:00
Ferdi Franceschini
ec1d83f77d Text nodes can't be mutable. 2015-02-06 08:48:02 +11:00
Ferdi Franceschini
6b1a192af6 Fix updating parameters when a value changes. 2015-02-06 08:48:01 +11:00
Ferdi Franceschini
06f1f2f62a SICS-841: import new selrs command. 2015-02-06 08:47:59 +11:00
Ferdi Franceschini
0c6168a526 SICS-840: Added selrs to select roughing slits and guarantee that a slit is always selected.
Also disabled driving slits via hset on GumTree.
2015-02-06 08:47:58 +11:00
Douglas Clowes
c3bb4a9591 Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
2015-01-07 13:09:27 +11:00
Douglas Clowes
5f2223510f Regenerate SCT drivers 2014-12-02 10:09:17 +11:00
Douglas Clowes
ee4cd27f0e Regenerate SCT drivers 2014-11-13 14:20:52 +11:00
Douglas Clowes
c443411764 Realign SCT drivers with R3.2 2014-11-13 14:14:04 +11:00
Douglas Clowes
5fefe5f009 Regenerate SCT drivers 2014-11-13 12:41:22 +11:00
Douglas Clowes
38dff05881 Regenerate SCT drivers 2014-11-13 12:38:03 +11:00
Douglas Clowes
3450b4cbf9 Regenerate SCT drivers 2014-11-13 12:35:46 +11:00
Douglas Clowes
9909c1412e Regenerate all the SCT drivers with new generator 2014-11-07 09:14:09 +11:00
Douglas Clowes
0b2f3d520b Regen SCT drivers 2014-11-06 13:36:47 +11:00
Douglas Clowes
d41e77cc79 Regenerate the affected drivers 2014-10-22 16:03:22 +11:00
Douglas Clowes
3ad3bf3524 Regen SCT drivers 2014-10-03 09:58:11 +10:00
Douglas Clowes
29650b420c Regen sct drivers after refactoring 2014-10-03 09:58:11 +10:00
Douglas Clowes
e4b88fd2ad Regen SCT drivers 2014-10-03 09:58:10 +10:00
Ferdi Franceschini
78372baae9 Fix posname algorithm so that it works if position lists are in descending order. 2014-09-30 15:12:42 +10:00
Ferdi Franceschini
06a5df0b27 Set upperlimits to 1800V on dhv1 and dhv2 for Bilby detector voltages. 2014-09-30 15:12:42 +10:00
Ferdi Franceschini
5bb2d6ca6f SICS-608: Implemented detector protection using anticollider using a voltage limit of 56 volts. 2014-09-30 15:12:41 +10:00
Douglas Clowes
0cb3f4f91c Regenerated drivers 2014-09-11 13:29:52 +10:00
Ferdi Franceschini
e9e4d81c30 Add variables for Bilby beamcenter position and selected beamstop. 2014-09-10 15:01:26 +10:00
Ferdi Franceschini
55744da3b5 Use nhq200 driver for Bilby detector voltage control. 2014-09-10 15:01:25 +10:00
Ferdi Franceschini
7bd9409144 SICS-771 Save name of selected sample aperture and improve nguide command. 2014-09-10 15:01:25 +10:00
Ferdi Franceschini
b70fb72e8f Always allow driving collimation table into the aperture position or higher. 2014-09-10 15:01:24 +10:00
Ferdi Franceschini
3c51b17eb9 Fix beamstop targets in Bilby selbs command. 2014-09-10 15:01:24 +10:00
Ferdi Franceschini
ea7ce034b0 Make sure we return a value when querying nguide. 2014-09-10 15:01:23 +10:00
Ferdi Franceschini
2d2b76dcb5 Fix chopper frequency modification. 2014-09-10 15:01:22 +10:00
Ferdi Franceschini
9a7f4608b7 SICS-771 Add sample_aperture size macro.
Make sure that positions are saved as -9999 if the guides are misaligned.
2014-09-10 15:01:04 +10:00
Ferdi Franceschini
6ec4cf66cb Fix direction for beamstop motors. 2014-09-10 15:01:04 +10:00
Ferdi Franceschini
c827933d0d SICS-771 Implement selbs command and set beamstop ID in data file. 2014-09-10 15:01:03 +10:00
Ferdi Franceschini
b6b4c4fb72 Return frequency for reference chopper 2014-09-10 15:01:03 +10:00
Ferdi Franceschini
23df15f7e8 SICS-771 Add frequency for each chopper disk. 2014-09-10 15:01:03 +10:00
Douglas Clowes
3650e68f9a Regenerate template drivers 2014-08-19 12:04:53 +10:00
Douglas Clowes
44f6b65aef Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
2014-08-19 11:46:24 +10:00
Douglas Clowes
a93819572a Regenerate template drivers 2014-08-19 11:43:45 +10:00
Douglas Clowes
3c53392b34 Regenerate bilby's astrium_chopper SCT driver 2014-08-06 13:54:28 +10:00
Douglas Clowes
507ddafb2a Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
2014-08-06 13:53:18 +10:00