linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,712 Commits 1 Branch 0 Tags
d41e77cc796eb7632ef2a5518ed5aa99a1398085
Commit Graph

103 Commits

Author SHA1 Message Date
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
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
Ferdi Franceschini
639e4dc3c8 Generated sct tcl drivers from sct templates. 2014-08-06 11:20:46 +10:00
Ferdi Franceschini
7b6b11eef2 Let everyone have a magnet sample stick motor. 2014-08-06 10:08:12 +10:00
Ferdi Franceschini
8a6da09326 Deploy all environment control drivers. 2014-08-06 10:08:10 +10:00
Douglas Clowes
972e3232cd Change the names in all of the files 2014-07-23 17:30:44 +10:00
Douglas Clowes
9c90153f37 Perform the rename 2014-07-23 17:14:18 +10:00
Douglas Clowes
ab3d7c5adf Remove explicit test debug_threshold from SCT files and regenerate 2014-07-21 10:58:01 +10:00
Ferdi Franceschini
b9f67a2562 Fix saving t0_chopper_freq and tof length values. 2014-07-20 21:42:36 +10:00
Ferdi Franceschini
3d051f5bb9 Update aperture positions from Bilby spreadsheet. 2014-07-20 21:29:48 +10:00
Ferdi Franceschini
c992ae0a2c Refactor aperture selection and report aperture positions at end of drive. 
Improve feedback.
 2014-07-20 21:29:19 +10:00
Ferdi Franceschini
9752c6dbaf Fix list of apertures which should be raised before moving guides. 
Optimise aperture selection.
 2014-07-18 14:33:16 +10:00
Ferdi Franceschini
b5b8b32788 Don't report non-numeric values on Ltof hdb nodes. 
This also eliminates logging type violation errors caused by polling of the hdb nodes when the guides are misaligned.
Make sure that aprrest_list is empty when N = 8
Improved argument checking and optimisations.

Also allow for setting an offset to the aperture positions on initialisation.
This was found to be necessary after the encoders were replace and ap2 upperlimit
was found to be lower than the ap2 topmost position for an aperture.
 2014-07-18 00:16:27 +10:00
Ferdi Franceschini
0cc126572d nguide now selects apertures as well as guides. 2014-07-17 09:44:56 +10:00
Ferdi Franceschini
423244858e Added t0_chopper_freq for Bilby. 2014-07-16 15:02:49 +10:00
Ferdi Franceschini
3d6488e254 Rename blade to disk for Bilby choppers. 2014-07-16 15:02:18 +10:00
Ferdi Franceschini
c1b5b558f0 Make all sct drivers. 2014-07-15 10:56:27 +10:00
Douglas Clowes
202004766a Check for existence of config dict fields before using them in generated drivers 2014-06-30 12:49:22 +10:00
Ferdi Franceschini
e971cd8b64 New sicsconfig.ini file configuration editor. 
Updated wombat sics_config.ini and gen_sct.py
Generated new tcl files from sct templates and
modified some old sct_*.tcl drivers.

TODO
sct_keithley_2700.tcl
magneticField/sct_oxford_labview.tcl
magneticField/sct_bruker_BEC1.tcl
temperature/sct_watlow_st4.tcl
temperature/sct_oxford_mercury.tcl
temperature/sct_mercury_pres.tcl
temperature/sct_julabo_lh45.tcl
temperature/sct_lakeshore_340.tcl
temperature/sct_julabo_lh45_gen.tcl
temperature/sct_watlow_rm.tcl
temperature/sct_eurotherm_2000.tcl
temperature/sct_lakeshore_336.tcl
temperature/sct_watlow_pm.tcl
temperature/sct_oxford_itc.tcl
temperature/sct_lakeshore_370.tcl
temperature/west400.tcl
 2014-06-30 09:08:19 +10:00
Douglas Clowes
fe3489b61f SICS-754 Use "clientput" instead of "puts stdout" in generated drivers 2014-06-26 13:48:44 +10:00
Ferdi Franceschini
0b293e5399 Use the new make_vmot command to make a virtual motor has the same klass as the real motor it is chained to. 2014-06-23 10:29:18 +10:00
Ferdi Franceschini
713452aac6 Added sap ten position virtual motor for sample aperture. 2014-06-18 16:52:20 +10:00
Ferdi Franceschini
0711340da7 The biggest aperture has been setup as the zero position on the sample aperture. 
The changes have been sent to Dan for inclusion in the Bilby motion control spreadsheet.
 2014-06-18 16:01:19 +10:00
Ferdi Franceschini
e32e46b84e Added sap eleven position virtual motor to select apertures via sapmot. 2014-06-17 22:31:39 +10:00
Ferdi Franceschini
3bffbf720f Added sapmot sample aperture motor from new Bilby motion control spreadsheet. 2014-06-17 22:31:38 +10:00
Douglas Clowes
171342c97e Make driver nodes mutable and regen 2014-06-17 15:45:03 +10:00
Ferdi Franceschini
79cedd58dc Fix return value for simulated t0_chopper_id. 
Also save value as an array, this is useful when testing the code.
 2014-06-17 12:30:54 +10:00
Ferdi Franceschini
e0edfb8d0a Implement the Ltof_<det> time of flight length calculations and the nguide selection command. 2014-06-17 12:30:53 +10:00