Douglas Clowes
16b435befe
Fix an unbalanced brace
2014-07-23 14:27:50 +10:00
Douglas Clowes
001d41a703
Change newserver to a link to server_date_time in deploySICS
2014-07-21 15:34:18 +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
b9b386e3f6
Capture error messages in prun and pdrive.
2014-07-20 20:49:20 +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
17c212ee2e
Merge branch 'RELEASE-3_1' into RELEASE-3_2
2014-07-17 11:55:26 +10:00
Ferdi Franceschini
bffd3ae130
Workaround for SICS-596 'histmem loadconf' fails while histogram is running.
...
The hmm init was being issued before the histogram had actually stopped.
2014-07-17 11:01:18 +10:00
Ferdi Franceschini
0cc126572d
nguide now selects apertures as well as guides.
2014-07-17 09:44:56 +10:00
Ferdi Franceschini
b5c64c2a03
Add convenience commands prun and pdrive for posit motors.
2014-07-17 09:44:18 +10:00
Ferdi Franceschini
22c701b816
Fix LS340 tc driveable by setting the right value for the model number.
2014-07-17 08:55:19 +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
Douglas Clowes
b217eb0dcf
Add whatsthere.py to check revs on instruments
2014-07-16 12:57:33 +10:00
Douglas Clowes
d698c302fd
Merge branch 'RELEASE-3_1' into temp
...
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
sics/site_ansto/instrument/util/config_edit.py
sics/site_ansto/instrument/util/gen_sct.py
2014-07-16 12:56:40 +10:00
Ferdi Franceschini
0e53fe3757
Save 5T magnet sensor reading and setpoint.
2014-07-16 11:27:13 +10:00
Ferdi Franceschini
de264c5f02
Update 5T magnet driver name in Quokka sics_config.ini
2014-07-16 10:11:37 +10:00
Ferdi Franceschini
c03bbdc38e
Add permlink to 5T magnet driver and load the driver in the quokka config.
2014-07-16 10:11:07 +10:00
Ferdi Franceschini
b29eecc549
Use V1 with I1 for autolab setup on wombat
2014-07-16 09:28:26 +10:00
Douglas Clowes
fd7d369ea2
Julabo sct driver to use @@NOREPLY@@
2014-07-15 18:52:09 +10:00
Douglas Clowes
acec319ee3
Zeroing rotary encoder motor steps fix
2014-07-15 18:52:05 +10:00
Douglas Clowes
db24e03106
Add sct driver for New Zealand magnet
2014-07-15 18:48:38 +10:00
Douglas Clowes
22b34395c1
SICS-761 Zero the motor step counter for rotary encoders.
2014-07-15 18:48:38 +10:00
Douglas Clowes
8849dc90c5
SICS-760 Add NOREPLY mechanism in aqadapter and asyncqueue
...
This removes the expectation of a reply when sending is suffixed
with "{0}" or "@@NOREPLY@@" or, for asyncqueue, a custom string.
2014-07-15 18:48:38 +10:00
Ferdi Franceschini
994f4a48c1
Add 5T New Zealand magnet configuration to Quokka configuration.
2014-07-15 17:30:51 +10:00
Ferdi Franceschini
739ab393a5
Add an Autolab setup to the Wombat config and fix the mercury configuration.
2014-07-15 15:20:20 +10:00
Ferdi Franceschini
4996d84187
Set an @description property on the protek sensor reading.
2014-07-15 15:17:59 +10:00
Ferdi Franceschini
d892d6c4df
Fix broken catch block
2014-07-15 12:51:41 +10:00
Ferdi Franceschini
c1b5b558f0
Make all sct drivers.
2014-07-15 10:56:27 +10:00
Ferdi Franceschini
ac136f3426
Cleanup legacy Julabo driver.
2014-07-15 08:59:20 +10:00
Ferdi Franceschini
c83e5d681c
Update sics_config.ini files for Wombat and Quokka.
2014-07-15 08:59:19 +10:00
Ferdi Franceschini
ee539a5341
Load wrapper code for legacy drivers.
2014-07-15 08:59:18 +10:00
Ferdi Franceschini
58a64da712
Wrapper code for legacy drivers.
2014-07-15 08:59:18 +10:00
Ferdi Franceschini
67b8576f35
Modify legacy drivers so that they can be called by sct wrappers and define wrapper templates.
2014-07-15 08:59:17 +10:00
Ferdi Franceschini
6112c8afa0
Don't copy 'id' from the option section into the implementation section.
...
The read_config procs should fetch arguments from both the option and implemention sections.
2014-07-15 08:59:16 +10:00
Ferdi Franceschini
deb6716f9b
make_args can now be set in the option section of a sics_config.ini
2014-07-15 08:59:16 +10:00
Ferdi Franceschini
9305d6da53
Don't fetch an implementation if an option is disabled.
2014-07-15 08:59:15 +10:00
Douglas Clowes
f916462be6
Updated julabo SCT template
2014-07-11 18:30:55 +10:00
Ferdi Franceschini
47fbb1979e
You can now set the privilege and type for MakeSICSObj in an sct template.
2014-07-11 17:14:08 +10:00
Ferdi Franceschini
867c6c8eaa
Generate a wrapper for the old protek driver from a protekmm.sct template.
2014-07-11 13:52:37 +10:00
Douglas Clowes
4f72bcaaf5
allow legacy sct controllers in generated drivers
2014-07-11 13:37:50 +10:00
Douglas Clowes
5ee7e6719f
Defer makesctdrive to end of mkDriver to avoid possible forward references.
2014-07-11 13:37:35 +10:00
Douglas Clowes
0dbe7bd53e
Allow empty braces on sct vars and remove semicolons from python code
2014-07-11 13:37:21 +10:00
Douglas Clowes
35067c3673
Clean up Nagelfar warnings in generated drivers
2014-07-11 13:37:17 +10:00
Douglas Clowes
a9e4c80a87
Reindent gen_sct.py to 4 spaces
2014-07-11 13:37:02 +10:00
Ferdi Franceschini
16b228dc0e
Sort and save the the Quokka sics_config.ini file in its default configuration.
2014-07-11 09:30:59 +10:00
Ferdi Franceschini
679651bd28
Add some help and feedback when saving a file.
2014-07-11 08:49:40 +10:00
Ferdi Franceschini
6aa229ee75
Driver changes made on ics1-wombat-test.
2014-07-11 08:49:40 +10:00
