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

98 Commits

Author SHA1 Message Date
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
Jing Chen
e4df7329f3 r3707 | jgn | 2012-08-27 09:13:29 +1000 (Mon, 27 Aug 2012) | 1 line 2012-11-15 17:36:54 +11:00
Jing Chen
263b7e9c78 r3704 | jgn | 2012-08-24 10:42:55 +1000 (Fri, 24 Aug 2012) | 1 line 2012-11-15 17:36:40 +11:00
Douglas Clowes
6f836ae4cf bring back some changes from the instrument 
r3681 | dcl | 2012-07-26 15:47:15 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:56 +11:00
Jing Chen
87e623c9af add magnetic 
r3650 | jgn | 2012-07-16 09:56:45 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:40 +11:00
Jing Chen
e4a57f0162 add magnetic 
r3646 | jgn | 2012-07-16 09:50:06 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:21 +11:00
Ferdi Franceschini
d85341b8fc Added aerotech motor control for 12T oxford magnet and oxford 
temperatuer controller.

r3641 | ffr | 2012-07-13 15:41:42 +1000 (Fri, 13 Jul 2012) | 3 lines
 2012-11-15 17:32:58 +11:00
Douglas Clowes
393c20b23d Implement a virtuel Ei motor (vei) that does not drive anything but M1 and M2 
r3609 | dcl | 2012-06-19 13:44:11 +1000 (Tue, 19 Jun 2012) | 1 line
 2012-11-15 17:30:57 +11:00
Douglas Clowes
e6c6552bd7 Set the same units and encoder values as in SpICE (point in time) 
r3608 | dcl | 2012-06-19 13:42:14 +1000 (Tue, 19 Jun 2012) | 1 line
 2012-11-15 17:30:52 +11:00
Ferdi Franceschini
192baf1e95 SICS-477 Set the detector type to "bmon" for Taipan and lock it so that 
it can't be changed.

r3591 | ffr | 2012-06-04 20:19:00 +1000 (Mon, 04 Jun 2012) | 3 lines
 2012-11-15 17:30:01 +11:00
Ferdi Franceschini
d71dbd9b9a Load new environment controllers and logbook command. 
r3588 | ffr | 2012-06-04 19:51:33 +1000 (Mon, 04 Jun 2012) | 2 lines
 2012-11-15 17:29:47 +11:00
Ferdi Franceschini
f7ed40b160 Deploy some extra environment controllers to Taipan. 
r3586 | ffr | 2012-06-04 19:45:25 +1000 (Mon, 04 Jun 2012) | 2 lines
 2012-11-15 17:29:38 +11:00
Ferdi Franceschini
0b393d04f4 SICS-469: Define a dummy ::histogram_memory::set_sobj_attributes 
function for Taipan because SICS will abort setting the attributes on
other objects if this raises an error.  This means that some objects
like environment controllers (eg ls340) won't be added to the control
interface or saved in the data file.

r3584 | ffr | 2012-06-04 13:21:42 +1000 (Mon, 04 Jun 2012) | 6 lines
 2012-11-15 17:29:29 +11:00
Douglas Clowes
a9a90feaaf Bring into step with instrument 
r3552 | dcl | 2012-05-24 13:53:53 +1000 (Thu, 24 May 2012) | 1 line
 2012-11-15 17:28:42 +11:00
Douglas Clowes
5156f4375c Undo my bad update 
r3531 | dcl | 2012-04-10 11:09:30 +1000 (Tue, 10 Apr 2012) | 1 line
 2012-11-15 17:27:15 +11:00
Douglas Clowes
5e83e57d54 Another refinement for mono focus resolver bias 
r3527 | dcl | 2012-04-02 13:03:47 +1000 (Mon, 02 Apr 2012) | 1 line
 2012-11-15 17:27:02 +11:00
Douglas Clowes
34c397dfb7 Add a header template file 
r3526 | dcl | 2012-04-02 13:02:14 +1000 (Mon, 02 Apr 2012) | 1 line
 2012-11-15 17:26:57 +11:00
Douglas Clowes
16ef2cc998 Add a simulated PLC because TAS doesn't have it connected yet 
r3525 | dcl | 2012-04-02 13:01:50 +1000 (Mon, 02 Apr 2012) | 1 line
 2012-11-15 17:26:52 +11:00
Douglas Clowes
dc256607b7 Add filea according to ffr 
r3524 | dcl | 2012-04-02 13:01:13 +1000 (Mon, 02 Apr 2012) | 1 line
 2012-11-15 17:26:48 +11:00
Douglas Clowes
3f23e5de32 Include lakeshore 336 and 340 drivers for TAS 
r3523 | dcl | 2012-04-02 13:00:22 +1000 (Mon, 02 Apr 2012) | 1 line
 2012-11-15 17:26:43 +11:00
Douglas Clowes
9a5db33658 Add missing is_homing_list 
r3521 | dcl | 2012-04-02 12:57:47 +1000 (Mon, 02 Apr 2012) | 1 line
 2012-11-15 17:26:34 +11:00
Douglas Clowes
872e852215 M2 for wedge control, analyzers unbiased 
Use Dan's computed values for M2 and make steps=counts for the wedge control
Make analyzer motors use unbiased absolute encoder values
r3506 | dcl | 2012-03-29 12:35:12 +1100 (Thu, 29 Mar 2012) | 4 lines
 2012-11-15 17:26:21 +11:00
Douglas Clowes
a2355b57b8 Update to reflect the 33000 series ports on das2-taipan 
r3504 | dcl | 2012-03-29 10:41:41 +1100 (Thu, 29 Mar 2012) | 1 line
 2012-11-15 17:26:11 +11:00
Douglas Clowes
f3cf38bb89 Add the two lakeshores to the manifest 
r3502 | dcl | 2012-03-29 07:55:33 +1100 (Thu, 29 Mar 2012) | 1 line
 2012-11-15 17:26:02 +11:00
Douglas Clowes
335400ec58 Updates from ics1-taipan 
r3476 | dcl | 2012-03-21 12:53:06 +1100 (Wed, 21 Mar 2012) | 1 line
 2012-11-15 17:25:49 +11:00
Ferdi Franceschini
3ceb24c5c6 Fix typo 
r3366 | ffr | 2012-02-13 20:54:34 +1100 (Mon, 13 Feb 2012) | 2 lines
 2012-11-15 17:24:43 +11:00
Douglas Clowes
d52e112481 Adjust encoder values for home position on s2 and a2 after maintenance 
r3363 | dcl | 2012-02-01 11:03:02 +1100 (Wed, 01 Feb 2012) | 1 line
 2012-11-15 17:24:30 +11:00
Douglas Clowes
2d56b5ea5f Update to reflect encoder for A2 and S2 at zero, also motor on delay to allow for airpads ON transition 
r3347 | dcl | 2012-01-19 16:43:38 +1100 (Thu, 19 Jan 2012) | 1 line
 2012-11-15 17:23:18 +11:00
Douglas Clowes
942b56d249 Fix Typos 
r3330 | dcl | 2012-01-05 12:24:01 +1100 (Thu, 05 Jan 2012) | 1 line
 2012-11-15 17:22:01 +11:00
Douglas Clowes
d03d70dbfd Update the slit configurations 
r3313 | dcl | 2011-12-02 17:21:40 +1100 (Fri, 02 Dec 2011) | 1 line
 2012-11-15 17:20:45 +11:00
Douglas Clowes
57e675756a Fix coding error and increase deceleration on hitting a limit switch 
r3312 | dcl | 2011-12-02 17:20:53 +1100 (Fri, 02 Dec 2011) | 1 line
 2012-11-15 17:20:41 +11:00
Douglas Clowes
0b6171f6c6 Fix cut-and-paste error in airpad control 
r3311 | dcl | 2011-12-02 17:19:33 +1100 (Fri, 02 Dec 2011) | 1 line
 2012-11-15 17:20:36 +11:00
Douglas Clowes
ef9dfb64f3 WIP set (roughly) measured slit gaps 
r3305 | dcl | 2011-12-02 09:39:57 +1100 (Fri, 02 Dec 2011) | 1 line
 2012-11-15 17:20:10 +11:00
Douglas Clowes
1e341a9dfa Correct some apparent transfer errors 
r3304 | dcl | 2011-12-02 09:33:57 +1100 (Fri, 02 Dec 2011) | 1 line
 2012-11-15 17:20:05 +11:00