Commit Graph

54 Commits

Author SHA1 Message Date
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
Ferdi Franceschini
e5431d5e97 tas/config/hmm/hmm_configuration.tcl
Taipan doesn't not have a histogram memory server.

tas/config/motors/positmotor_configuration.tcl
Taipan doesn't currently have discrete position motors

config/commands/commands_common.tcl
Taipan doesn't have a histogram memory server.

config/nexus/nxscripts_common_1.tcl
Specify internal path name convention for Taipan hdf files

r3282 | ffr | 2011-11-25 10:11:59 +1100 (Fri, 25 Nov 2011) | 13 lines
2012-11-15 17:18:28 +11:00
Jing Chen
3c82aacfa1 modify config file
r3233 | jgn | 2011-07-22 15:35:14 +1000 (Fri, 22 Jul 2011) | 1 line
2012-11-15 17:15:41 +11:00
Jing Chen
ea79b86986 modify motor group of s2 and m2
r3212 | jgn | 2011-06-09 14:08:38 +1000 (Thu, 09 Jun 2011) | 1 line
2012-11-15 17:14:10 +11:00
Ferdi Franceschini
8b995f6d71 Use physical units for speeds and accelerations.
r3147 | ffr | 2011-05-20 10:12:34 +1000 (Fri, 20 May 2011) | 1 line
2012-11-15 17:13:40 +11:00
Jing Chen
3c9db46bd7 update
r3132 | jgn | 2011-05-12 15:13:47 +1000 (Thu, 12 May 2011) | 1 line
2012-11-15 17:12:39 +11:00
Jing Chen
d1aea5ae48 update accelation values
r3131 | jgn | 2011-05-12 13:52:54 +1000 (Thu, 12 May 2011) | 1 line
2012-11-15 17:12:35 +11:00
Jing Chen
d275ce5509 r3124 | jgn | 2011-05-03 11:25:15 +1000 (Tue, 03 May 2011) | 1 line 2012-11-15 17:12:05 +11:00
Jing Chen
0105298d79 update motor class for Taipan/Lyrebird
r3121 | jgn | 2011-04-29 10:45:37 +1000 (Fri, 29 Apr 2011) | 1 line
2012-11-15 17:11:52 +11:00
Jing Chen
30d9edb0dd update group for motors
r3117 | jgn | 2011-04-28 10:39:23 +1000 (Thu, 28 Apr 2011) | 1 line
2012-11-15 17:11:35 +11:00
Jing Chen
3f6a01d405 add Pelican
r3106 | jgn | 2011-04-20 12:09:49 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:10:45 +11:00
Jing Chen
8eb9a86c01 r3100 | jgn | 2011-04-11 11:34:11 +1000 (Mon, 11 Apr 2011) | 1 line 2012-11-15 17:10:18 +11:00
Jing Chen
cf4660747a update for Taipan purpose
r3099 | jgn | 2011-04-11 10:50:10 +1000 (Mon, 11 Apr 2011) | 1 line
2012-11-15 17:10:14 +11:00
Jing Chen
729a4c6eff r3098 | jgn | 2011-04-08 16:16:38 +1000 (Fri, 08 Apr 2011) | 1 line 2012-11-15 17:10:10 +11:00
Jing Chen
a9f7812e47 r3097 | jgn | 2011-04-08 16:05:02 +1000 (Fri, 08 Apr 2011) | 1 line 2012-11-15 17:10:06 +11:00
Jing Chen
bda5f46596 r3096 | jgn | 2011-04-08 15:44:27 +1000 (Fri, 08 Apr 2011) | 1 line 2012-11-15 17:10:01 +11:00
Jing Chen
1671ec3612 r3095 | jgn | 2011-04-08 12:34:34 +1000 (Fri, 08 Apr 2011) | 1 line 2012-11-15 17:09:57 +11:00
Jing Chen
cf9a94abd3 remove quokka stuff
r3094 | jgn | 2011-04-08 12:15:13 +1000 (Fri, 08 Apr 2011) | 1 line
2012-11-15 17:09:53 +11:00
Jing Chen
074344f63d comment out initxmlscan
r3089 | jgn | 2011-03-31 14:06:28 +1100 (Thu, 31 Mar 2011) | 1 line
2012-11-15 17:09:44 +11:00
Jing Chen
66e3096b24 move folder tasmad
r3086 | jgn | 2011-03-29 15:32:07 +1100 (Tue, 29 Mar 2011) | 1 line
2012-11-15 17:09:32 +11:00
Jing Chen
e92dce3948 add folder tasmad
r3084 | jgn | 2011-03-29 11:50:43 +1100 (Tue, 29 Mar 2011) | 1 line
2012-11-15 17:09:27 +11:00
Jing Chen
c15a4ca1d6 r3078 | jgn | 2011-03-10 09:56:54 +1100 (Thu, 10 Mar 2011) | 1 line 2012-11-15 17:09:07 +11:00
Jing Chen
fb86744209 add motors
r3055 | jgn | 2011-02-15 11:49:27 +1100 (Tue, 15 Feb 2011) | 2 lines
2012-11-15 17:07:37 +11:00