Douglas Clowes
|
3ce5ae0977
|
Merge branch 'RELEASE-3_1'
Conflicts:
sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
sics/site_ansto/instrument/hipd/wombat_configuration.tcl
sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
sics/site_ansto/instrument/pelican/pelican_configuration.tcl
sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
sics/site_ansto/instrument/util/gen_sct.py
|
2014-11-06 14:13:20 +11:00 |
|
Ferdi Franceschini
|
e40b053c70
|
Load available environment controller configurations for Kookaburra.
|
2014-10-17 16:42:56 +11:00 |
|
Douglas Clowes
|
972e3232cd
|
Change the names in all of the files
|
2014-07-23 17:30:44 +10:00 |
|
Douglas Clowes
|
92d3acb5d5
|
Remove superfluous trailing white space from TCL files
|
2014-05-16 17:23:58 +10:00 |
|
Ferdi Franceschini
|
fcbdfd51d1
|
Added parameters requested by Christine.
|
2014-02-20 07:52:46 +11:00 |
|
Ferdi Franceschini
|
d60710a3e1
|
Updated configuration from ics1-kookaburra.
|
2013-12-20 09:08:57 +11:00 |
|
Ferdi Franceschini
|
2d8d4864ef
|
Merge branch 'dingo' into merge-replace
|
2013-06-11 08:30:24 +10:00 |
|
Jing Chen
|
b5989bdb50
|
Kookaburra Integration
|
2013-05-22 10:51:07 +10:00 |
|
Ferdi Franceschini
|
16e744be12
|
Moved MakeDrive to instrument specific configuration.
This lets us make run and drive wrappers for the fermi motors on pelican
by renaming the SICS run and drive.
|
2013-04-09 14:15:55 +10:00 |
|
Jing Chen
|
49bcdfb9e8
|
init config for kookaburra
r3441 | jgn | 2012-03-05 15:14:55 +1100 (Mon, 05 Mar 2012) | 1 line
|
2012-11-15 17:25:06 +11:00 |
|