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

3510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d010e76076 SICS-759 Make asyncprotocol look for the list command in the correct place. 2014-07-14 13:19:52 +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
Ferdi Franceschini
d79865edb4 Write sections to the configuration file in the same order as the screen layout. 2014-07-11 08:49:39 +10:00
Ferdi Franceschini
8953273dac Show IP address and PORT number for implmentations that have them. 2014-07-11 08:49:38 +10:00
Ferdi Franceschini
9be5cc4cec set_imp now works in initialisation code and makes sure that 'none' is not used as a key in imp2opt_dict. 
Also provide consistency_check() method to check that there is a one to one
mapping between options and implementations.
 2014-07-11 08:49:37 +10:00
Ferdi Franceschini
1b4cca9390 Options not in the cascade list should have their implementation set to 'none' 2014-07-11 08:49:37 +10:00
Ferdi Franceschini
b5d3b745c3 Don't allow the implementation of permanent options to be set to 'none'. 2014-07-11 08:49:36 +10:00
Ferdi Franceschini
a294d50a1d A bit of refactoring, a bit of housekeeping. Make Pylint happy. Mmmmm nice. 2014-07-11 08:49:35 +10:00
Ferdi Franceschini
dee4b0430e The order that __get_options() and __get_implementations() are called in shouldn't matter. 2014-07-11 08:49:35 +10:00