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

76 Commits

Author SHA1 Message Date
Douglas Clowes
d1920069ae Pullback motor changes on Taipan 2014-09-10 15:25:26 +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
92d3acb5d5 Remove superfluous trailing white space from TCL files 2014-05-16 17:23:58 +10:00
Ferdi Franceschini
0ae4d40470 Deploy all environment drivers to all instruments. 2014-05-16 13:56:51 +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
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
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
28b7acbeff Added magnet arm (marm) motor to provide feedback during wedge movements. 2013-07-08 11:42:25 +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
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
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
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
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
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
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
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
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
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
173b05f86b Adjust sgu and sgl absEncHome values to remove SpICE "drift" 
r3302 | dcl | 2011-12-01 10:25:22 +1100 (Thu, 01 Dec 2011) | 1 line
 2012-11-15 17:19:56 +11:00
Douglas Clowes
254db51d26 WIP commissioning 
r3296 | dcl | 2011-11-29 18:59:09 +1100 (Tue, 29 Nov 2011) | 1 line
 2012-11-15 17:19:30 +11:00
Ferdi Franceschini
1b6d046394 Revert the SICS scan object to allow multidimensional scans. 
r3289 | ffr | 2011-11-25 15:05:19 +1100 (Fri, 25 Nov 2011) | 2 lines
 2012-11-15 17:18:59 +11:00
Jing Chen
c45d1472e6 remove those commands being commented out. 
r3284 | jgn | 2011-11-25 10:46:10 +1100 (Fri, 25 Nov 2011) | 3 lines
 2012-11-15 17:18:37 +11:00