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

131 Commits

Author SHA1 Message Date
Ferdi Franceschini
a974be9c86 SICS-844 Add eulerian cradle configuration to Taipan 2015-02-23 10:22:28 +11:00
Douglas Clowes
106d61a883 Merge branch 'Taipan_R31' into temp 
Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
	sics/site_ansto/instrument/tas/util/sics_config.ini
 2015-02-19 14:50:39 +11:00
Douglas Clowes
2dcf274618 Tilt configuration from Taipan 2015-02-19 2015-02-19 10:35:21 +11:00
Douglas Clowes
fbdd46e258 Pullback from Taipan 2015-02-19 2015-02-19 10:34:12 +11:00
Douglas Clowes
f629ea24ed Pull various config files closer into alignment 2014-11-20 15:56:30 +11:00
Ferdi Franceschini
de7b1d40e7 Add CF4 configuration from ics1-taipan 2014-10-12 17:31:01 +11:00
Ferdi Franceschini
6ff638b36e SICS-793: Bring GIT up to date with changes made on ics1-taipan 2014-10-08 19:36:35 +11:00
Ferdi Franceschini
84cc1d5b4c SICS-782 Configure autofocussing on Taipan. 2014-09-19 12:16:32 +10:00
Ferdi Franceschini
0ba5045fd9 Update motor configuration from ics1-taipan. 
Also put off renaming s1 to ms1 for magnet config.  We need to make sure
that there is a sample/s1 link to sample/ms1 and use ms1 in tasub.
 2014-09-19 12:16:30 +10:00
Ferdi Franceschini
0606e66f90 Add new sics_config.ini for Taipan 
TODO SICS-779 Changing sample_stage to 12tmagnet_sample_insert doesn't work.
 2014-09-12 13:36:26 +10:00
Douglas Clowes
d1920069ae Pullback motor changes on Taipan 2014-09-10 15:25:26 +10:00
Douglas Clowes
99fae91ff9 Add sics_simulation.tcl to each instrument MANIFEST.TXT file 2014-09-10 10:14:46 +10:00
Douglas Clowes
499c5c422d Break simulation flagss out of the server_config.tcl 
These are the most frequent instrument-specific changes
 2014-09-09 15:14:57 +10:00
Ferdi Franceschini
cf24ac127b Update motor configuration from ics1-taipan. 2014-08-28 17:08:30 +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
e3377553bd Sort the *.ini files so we can better compare them 2014-06-24 17:22:46 +10:00
Douglas Clowes
92d3acb5d5 Remove superfluous trailing white space from TCL files 2014-05-16 17:23:58 +10:00
Douglas Clowes
cf8a08ea7e Generated modular mercury drivers 2014-05-16 15:42:11 +10:00
Ferdi Franceschini
0ae4d40470 Deploy all environment drivers to all instruments. 2014-05-16 13:56:51 +10:00
Ferdi Franceschini
d7acb7c16c Load drivers which have been enabled in the SICS config ini files. 
Lakeshore 336 drivers with known IP addresses have been added to the ini files with unique IDs.
All entries in the ini files now have unique IDs
The wombat ini now has radio buttons to select sample stage motor configurations.
 2014-05-05 12:25:00 +10:00
Ferdi Franceschini
be653c91fe Make instrument specific Oxford configs consistent for Quokka and Taipan. 2014-05-01 09:18:55 +10:00
Ferdi Franceschini
bea943ddf2 Add new reactor status object to instruments. 2014-03-25 09:23:57 +11:00
Ferdi Franceschini
03c00623ee Allow two LS336 and two LS340 temperature controllers to be selected. 2013-12-20 09:09:03 +11:00
Ferdi Franceschini
216e2b3529 SICS-697 Make named links in data group for LS336 and Oxford Mercury. 
SICS-705 Fixed log file name bug in Mercury controller.
 2013-12-20 09:08:57 +11:00
Ferdi Franceschini
093479f808 SICS-697 Make named links to data group using new typed naming system. 2013-12-20 09:08:49 +11:00
Ferdi Franceschini
c3fd00c079 Add west4100 to Taipan's sics_config.ini 2013-10-28 15:33:43 +11:00
Ferdi Franceschini
c1f724c246 Taipan: Enable the plc/SIS feedback in SICS 2013-10-18 18:13:51 +11:00
Ferdi Franceschini
6277d3f7ad Taipan: Reduce stepsperx on sample stage rotation to avoid overdriving it. 2013-10-18 18:13:01 +11:00
Ferdi Franceschini
3366f21421 Taipan: Add LS370 and Mercury to sics_config.ini 2013-10-15 03:26:52 +11:00
Ferdi Franceschini
ad3aa5cd3b Use sics_config.ini to configure LS370, oxford ITC, oxford Mercury, and oxford labview drivers. 2013-10-15 03:25:22 +11:00
Ferdi Franceschini
79cdd71a78 Taipan: set absencHome and limits for 12T magnet sample motor. 2013-10-15 03:06:52 +11:00
Ferdi Franceschini
7c99ed7948 Configure 12T magnet motor as specified in Dan's email 18/9/13. 2013-09-24 07:57:20 +10:00
Ferdi Franceschini
7bacc4dc7f Use sics_config.ini to generate 12T magnet setup on Taipan. 2013-09-18 16:16:06 +10:00
Ferdi Franceschini
bdfb01ca49 Set SIS address for taipan. 2013-08-15 14:57:49 +10:00
Ferdi Franceschini
9b6a7f38e7 Get creep_precision and other updated parameters from ics2-taipan. 2013-08-12 11:32:22 +10:00
Ferdi Franceschini
27f09f5a0a SICS-655 Update tasmots when driving axes. 
SICS-512 Experimental anticollider for m2, s2 and a2
 2013-08-09 05:30:57 +10:00
Ferdi Franceschini
38d915cc6a SICS-646: Restore histogram command to hdb tree. 
Instruments which don't have a histogram should add
"set no_histmem true"
to the top of their instrument config file before the commands_common
file is sourced.
 2013-08-09 05:30:54 +10:00
Ferdi Franceschini
28b7acbeff Added magnet arm (marm) motor to provide feedback during wedge movements. 2013-07-08 11:42:25 +10:00
Douglas Clowes
cbc1c940a1 Skip mc5 socket for taipan mc6 test addresses 2013-06-27 16:43:07 +10:00
Ferdi Franceschini
f0c008c714 Use the right host address for counters on Taipan. 2013-05-17 07:36:30 +10:00
Ferdi Franceschini
3f75de6357 Added Dan's changes to motor acceleration. Axes now drive more smoothly. 
Also set creep control on focussing motors.  This has improved precision
of the monochromator focussing from 0.5 to 0.1 degrees.
 2013-05-15 20:40:41 +10:00
Ferdi Franceschini
babc5fe17e A new runsics script has been implemented in python (runsics.py). 
It supports the new "fakedev" simulation mode which runs SICS with real
drivers for devices which have simulated controllers.
There are advance options which allow multiple instances of SICS to be
launched on development and test environments.
Also we no longer depend on having serverport numbers in /etc/services.
 2013-05-13 23:11:15 +10:00
Ferdi Franceschini
da0b00c938 Load environment configuration file taipan_setup.txt if it exists. 2013-05-06 21:23:41 +10:00
Ferdi Franceschini
5c76f7a243 SICS-587 (in progress) Put IP and PORT configurations in a single file. 
TODO environment
 2013-05-06 20:41:37 +10:00
Ferdi Franceschini
3e33a7b8b2 Merged in-situ modifications from ics1-taipan. 2013-05-06 20:13:36 +10:00
Ferdi Franceschini
b3a2c5c976 Merge in changes from taipan branch. 2013-04-28 17:15:45 +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
Douglas Clowes
43346d6ea5 add hostnam and portnum commands 2012-12-13 14:07:38 +11:00
Douglas Clowes
d287611f03 Add virtual motors (e.g. for wavelength) 
r3729 | dcl | 2012-08-30 11:16:06 +1000 (Thu, 30 Aug 2012) | 1 line
 2012-11-15 17:37:33 +11:00