Commit Graph

790 Commits

Author SHA1 Message Date
Ferdi Franceschini
7d9d72a79d Updated the mtth encoder value to match what Vladimir tells me is 90 degrees.
mx is now positive towards dance floor.

r2046 | ffr | 2007-07-05 11:56:58 +1000 (Thu, 05 Jul 2007) | 3 lines
2012-11-15 13:20:16 +11:00
Douglas Clowes
a63bf65270 Set mtth home encoder position at 90 degrees
r2037 | dcl | 2007-07-05 10:32:19 +1000 (Thu, 05 Jul 2007) | 2 lines
2012-11-15 13:20:13 +11:00
Douglas Clowes
3aa3c41114 Reverse sense of X on monochromator (left is positive)
r2036 | dcl | 2007-07-05 10:30:46 +1000 (Thu, 05 Jul 2007) | 2 lines
2012-11-15 13:20:09 +11:00
Douglas Clowes
5c0036fe87 Swap MX and MY and change sign
r2033 | dcl | 2007-07-05 09:42:46 +1000 (Thu, 05 Jul 2007) | 2 lines
2012-11-15 13:20:02 +11:00
Douglas Clowes
063fafbe83 Update the beam attenuator (bat) home, increase deceleration for slit motors to prevent overrun, adjust slit ranges individually for maximum scan range
r2031 | dcl | 2007-06-27 11:02:36 +1000 (Wed, 27 Jun 2007) | 2 lines
2012-11-15 13:19:59 +11:00
Douglas Clowes
4ce55c17ac Logic inversion from "if true" to "if not false"
r2030 | dcl | 2007-06-27 10:59:52 +1000 (Wed, 27 Jun 2007) | 2 lines
2012-11-15 13:19:55 +11:00
Douglas Clowes
c30c1a97f8 add sics_ports.tcl because it breaks deployment when this file is empty
r2007 | dcl | 2007-06-13 09:57:10 +1000 (Wed, 13 Jun 2007) | 2 lines
2012-11-15 13:19:45 +11:00
Douglas Clowes
90c48ae7c5 Move gumxml.tcl to instrument directory
r2006 | dcl | 2007-06-13 09:53:39 +1000 (Wed, 13 Jun 2007) | 2 lines
2012-11-15 13:19:42 +11:00
Douglas Clowes
3431ff478f Calibration of monochromator motors
r2005 | dcl | 2007-06-13 09:51:49 +1000 (Wed, 13 Jun 2007) | 2 lines
2012-11-15 13:19:38 +11:00
Douglas Clowes
be40877668 Modified from sics/tcl/gumxml.tcl to select only nodes with attribute control=true
r2004 | dcl | 2007-06-08 14:03:27 +1000 (Fri, 08 Jun 2007) | 2 lines
2012-11-15 13:19:35 +11:00
Douglas Clowes
c8d13fef1d Commissioning of monochromator stage
r2001 | dcl | 2007-06-05 11:56:59 +1000 (Tue, 05 Jun 2007) | 2 lines
2012-11-15 13:19:28 +11:00
Douglas Clowes
7d28dd3cd4 Initial working version
r2000 | dcl | 2007-06-01 16:55:34 +1000 (Fri, 01 Jun 2007) | 2 lines
2012-11-15 13:19:24 +11:00
Douglas Clowes
fa5e2711e8 Gross changes for commissioning.
r1999 | dcl | 2007-06-01 16:54:25 +1000 (Fri, 01 Jun 2007) | 2 lines
2012-11-15 13:19:21 +11:00
Douglas Clowes
fe63096315 Change Flight Tube to use REQx/RSPx instead of FTUBE/APDONE variables. Now workks for RSD Sample raise dual motor as well.
r1998 | dcl | 2007-06-01 16:53:25 +1000 (Fri, 01 Jun 2007) | 2 lines
2012-11-15 13:19:17 +11:00
Douglas Clowes
d75f423f43 Change Flight Tube to use REQx/RSPx instead of APDONE variables.
r1997 | dcl | 2007-06-01 16:52:06 +1000 (Fri, 01 Jun 2007) | 2 lines
2012-11-15 13:19:14 +11:00
Dan Bartlett
98e8fb742f no message
r1993 | dbx | 2007-05-31 16:33:10 +1000 (Thu, 31 May 2007) | 2 lines
2012-11-15 13:19:00 +11:00
Dan Bartlett
76d4c83793 Oscillating collimator code added
r1967 | dbx | 2007-05-16 17:05:58 +1000 (Wed, 16 May 2007) | 2 lines
2012-11-15 13:17:32 +11:00
Dan Bartlett
20e00a8504 Beam attenuator commissioned
r1966 | dbx | 2007-05-16 17:04:01 +1000 (Wed, 16 May 2007) | 2 lines
2012-11-15 13:17:28 +11:00
Douglas Clowes
f374e445bf multichan becomes AsyncQueue and AsyncProtocol
r1965 | dcl | 2007-05-15 13:15:34 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:25 +11:00
Douglas Clowes
27d849ea23 multichan becomes AsyncQueue and AsyncProtocol
r1963 | dcl | 2007-05-15 12:47:58 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:18 +11:00
Douglas Clowes
1eb1698d79 make the arguments case insensitive i.e. allow test or TEST
r1961 | dcl | 2007-05-15 12:31:22 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:11 +11:00
Douglas Clowes
bc3224a9c4 changes to mtth
r1959 | dcl | 2007-05-11 17:34:24 +1000 (Fri, 11 May 2007) | 2 lines
2012-11-15 13:17:04 +11:00
Douglas Clowes
c41f37b657 Better cleanup of CVS and build files and directories, improve tar and ssh commands
r1958 | dcl | 2007-05-11 17:29:57 +1000 (Fri, 11 May 2007) | 2 lines
2012-11-15 13:17:01 +11:00
Ferdi Franceschini
6d9120f796 Added motor_driver_type variable so we can switch between the real (DMC2280) drivers and the simulated drivers.
r1956 | ffr | 2007-05-10 16:12:25 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:54 +11:00
Ferdi Franceschini
5b683ecbe0 Fixed botched merge.
The merge effectively created  duplicate setmode procs.

r1953 | ffr | 2007-05-10 13:28:27 +1000 (Thu, 10 May 2007) | 3 lines
2012-11-15 13:16:44 +11:00
Ferdi Franceschini
a151a2a163 Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280.
r1952 | ffr | 2007-05-10 13:24:28 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:40 +11:00
Ferdi Franceschini
ebba5a8052 Added motor_simulation flag. If true then the motor_configuration.tcl files should create ANSTO simulated motor drivers.
r1951 | ffr | 2007-05-10 13:21:51 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:37 +11:00
Ferdi Franceschini
717f9beea7 Tidied up indents etc, to make it easy to compare diffs against the echidna config.
r1950 | ffr | 2007-05-10 13:18:06 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:34 +11:00
Dan Bartlett
cb7d9fc8ae no message
r1947 | dbx | 2007-05-09 12:27:37 +1000 (Wed, 09 May 2007) | 2 lines
2012-11-15 13:16:27 +11:00
Ferdi Franceschini
55347984ec Checked files modified by the merge with:
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD

r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
2012-11-15 13:16:23 +11:00
Ferdi Franceschini
86b99280d4 Merged the simulation mode setup from the trunk with the modified setmode command from the branch.
r1945 | ffr | 2007-05-08 14:59:26 +1000 (Tue, 08 May 2007) | 2 lines
2012-11-15 13:16:20 +11:00
Ferdi Franceschini
4594b23f13 Merged in favour of branch.
Get the horizontal and vertical axis names for the data from the _hmm_{hor,vert}_axis SICS variables when saving data.
These variables are set by the command which collects the data.

r1944 | ffr | 2007-05-08 14:58:51 +1000 (Tue, 08 May 2007) | 4 lines
2012-11-15 13:16:16 +11:00
Ferdi Franceschini
4ce126650e Refactored kowari configuration layout.
r1942 | ffr | 2007-05-07 16:10:55 +1000 (Mon, 07 May 2007) | 2 lines
2012-11-15 13:16:10 +11:00
Ferdi Franceschini
6fc1a8feca Bringing kowari layout and config inline with the current requirements of
the deployment script.

r1940 | ffr | 2007-05-07 15:30:02 +1000 (Mon, 07 May 2007) | 3 lines
2012-11-15 13:16:03 +11:00
Dan Bartlett
911c0d8450 no message
r1937 | dbx | 2007-05-03 16:53:56 +1000 (Thu, 03 May 2007) | 2 lines
2012-11-15 13:15:53 +11:00
Ferdi Franceschini
c01188bc8b Fixed order of histogram memory data axes.
r1903 | ffr | 2007-04-23 10:34:44 +1000 (Mon, 23 Apr 2007) | 2 lines
2012-11-15 13:15:46 +11:00
Ferdi Franceschini
83744c2e15 Added "master" motor name lists for configurable virtualmotors.
r1901 | ffr | 2007-04-20 12:47:27 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:43 +11:00
Ferdi Franceschini
65a1fc1a1d Added safety plc configuration files.
r1900 | ffr | 2007-04-20 12:46:11 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:39 +11:00
Ferdi Franceschini
ade5216ea9 Merged Release 1.2
r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:32 +11:00
Douglas Clowes
34da43b4ee Update slit gearing ratio to computed 6 * 7:3 stages
r1885 | dcl | 2007-04-19 10:08:59 +1000 (Thu, 19 Apr 2007) | 2 lines
2012-11-15 13:15:19 +11:00
Douglas Clowes
a77d9feb59 Add MakeStateMon
r1870 | dcl | 2007-04-18 09:38:07 +1000 (Wed, 18 Apr 2007) | 2 lines
2012-11-15 13:15:12 +11:00
Douglas Clowes
98a2081f99 Update safety PLC multichan to remove RS232 controller
r1868 | dcl | 2007-04-18 09:32:58 +1000 (Wed, 18 Apr 2007) | 2 lines
2012-11-15 13:15:05 +11:00
Ferdi Franceschini
c8558d0a5b Reverted hipadaba paths to original settings.
r1861 | ffr | 2007-04-16 16:16:57 +1000 (Mon, 16 Apr 2007) | 2 lines
2012-11-15 13:15:02 +11:00
Ferdi Franceschini
784b391415 Added part and type info to motors and modified hpaths to work with new hipadaba config code.
r1858 | ffr | 2007-04-16 14:46:49 +1000 (Mon, 16 Apr 2007) | 2 lines
2012-11-15 13:14:59 +11:00
Ferdi Franceschini
487f370d5e Added extended hmake "xhmake" to make it easier to create long paths.
r1857 | ffr | 2007-04-16 14:44:25 +1000 (Mon, 16 Apr 2007) | 2 lines
2012-11-15 13:14:55 +11:00
Ferdi Franceschini
3e5a3d1201 motor_hpath now maps part identifiers to hipadaba nodes
r1855 | ffr | 2007-04-13 16:37:02 +1000 (Fri, 13 Apr 2007) | 2 lines
2012-11-15 13:14:49 +11:00
Ferdi Franceschini
e2f968c923 Added part identifiers to support the new hipadaba path generation code.
Added long_name fields to support nexus file writing.

r1854 | ffr | 2007-04-13 16:33:48 +1000 (Fri, 13 Apr 2007) | 3 lines
2012-11-15 13:14:45 +11:00
Ferdi Franceschini
f48217e383 Added option to select simulation mode for SICS.
r1853 | ffr | 2007-04-13 13:13:22 +1000 (Fri, 13 Apr 2007) | 2 lines
2012-11-15 13:14:42 +11:00
Ferdi Franceschini
d0b8de93b1 Provided option to use simulated hmm drivers.
r1852 | ffr | 2007-04-13 12:57:17 +1000 (Fri, 13 Apr 2007) | 2 lines
2012-11-15 13:14:39 +11:00
Ferdi Franceschini
1c65171e4e Create beam monitor in instrument specific configuration and provide option for creating simulated beam monitor driver.
r1851 | ffr | 2007-04-13 12:52:49 +1000 (Fri, 13 Apr 2007) | 2 lines
2012-11-15 13:14:35 +11:00