Commit Graph

613 Commits

Author SHA1 Message Date
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
Douglas Clowes
84f883f5d7 Implement finite state machine model. Improved backlash (unidirectional motor driving). Precision motor creeping. Ensure thread zero is operating. Floating point steps and counts per unit. "send", "reset", "state" and "trace" commands.
r1939 | dcl | 2007-05-04 14:01:19 +1000 (Fri, 04 May 2007) | 2 lines
2012-11-15 13:15:59 +11:00
Douglas Clowes
bbdc2f820d minor, trivial and cosmetic changes not related to state machine implementation
r1938 | dcl | 2007-05-04 13:47:21 +1000 (Fri, 04 May 2007) | 2 lines
2012-11-15 13:15:56 +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
Douglas Clowes
56cdbec451 remove trailing spaces on numerous lines
r1898 | dcl | 2007-04-20 11:56:22 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:36 +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
d0957b18d5 Move things around, fix typo
r1896 | dcl | 2007-04-20 09:11:03 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:29 +11:00
Douglas Clowes
093bf92438 cosmetic changes
r1895 | dcl | 2007-04-20 09:08:32 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:25 +11:00
Douglas Clowes
8b27116358 backlash preseek made internal
r1891 | dcl | 2007-04-19 15:56:56 +1000 (Thu, 19 Apr 2007) | 2 lines
2012-11-15 13:15:22 +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
4b33abe79c change comment and reposition stepsPerX in list command
r1871 | dcl | 2007-04-18 09:59:04 +1000 (Wed, 18 Apr 2007) | 2 lines
2012-11-15 13:15:15 +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
4693ad1686 move string parameters from "list" to "slist" because non-numerics in "list" upset hipadaba stuff. Also implement motor "setpos" command with two arguments.
r1869 | dcl | 2007-04-18 09:35:32 +1000 (Wed, 18 Apr 2007) | 2 lines
2012-11-15 13:15:09 +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
Douglas Clowes
40e1042cda reverse comparison operators
r1856 | dcl | 2007-04-16 10:46:55 +1000 (Mon, 16 Apr 2007) | 2 lines
2012-11-15 13:14:52 +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
Douglas Clowes
57a2cff61c typo
r1850 | dcl | 2007-04-12 17:08:41 +1000 (Thu, 12 Apr 2007) | 2 lines
2012-11-15 13:14:32 +11:00
Douglas Clowes
a3ec8b98a0 First pass at Universal Unidirectional Motor Driving (UUMD)
r1849 | dcl | 2007-04-12 16:59:32 +1000 (Thu, 12 Apr 2007) | 2 lines
2012-11-15 13:14:29 +11:00
Douglas Clowes
cff3ac6553 Added code for counter source filtering
r1848 | dcl | 2007-04-12 15:54:04 +1000 (Thu, 12 Apr 2007) | 2 lines
2012-11-15 13:14:25 +11:00
Dan Bartlett
f95142b219 no message
r1846 | dbx | 2007-04-10 13:40:09 +1000 (Tue, 10 Apr 2007) | 2 lines
2012-11-15 13:14:22 +11:00
Douglas Clowes
3534fcefb9 Remove trailing spaces to reduce differences with echidna
r1845 | dcl | 2007-04-10 10:31:41 +1000 (Tue, 10 Apr 2007) | 2 lines
2012-11-15 13:14:19 +11:00
Douglas Clowes
7363a846e1 motion is OK if motor has no absolute encoder
r1844 | dcl | 2007-04-10 10:17:01 +1000 (Tue, 10 Apr 2007) | 2 lines
2012-11-15 13:14:15 +11:00
Douglas Clowes
466e1bf4a9 Change stepsPerX and CountsPerX calculations to floating point
r1843 | dcl | 2007-04-10 09:56:18 +1000 (Tue, 10 Apr 2007) | 2 lines
2012-11-15 13:14:12 +11:00
Douglas Clowes
a7a480c5d1 Change stepsPerX and CountsPerX to float and revise PA calculation to avoid floting point limitation in GALIL
r1841 | dcl | 2007-04-10 09:50:47 +1000 (Tue, 10 Apr 2007) | 2 lines
2012-11-15 13:14:05 +11:00
Dan Bartlett
72fd4d9ff5 no message
r1839 | dbx | 2007-04-10 08:08:20 +1000 (Tue, 10 Apr 2007) | 2 lines
2012-11-15 13:14:02 +11:00
Ferdi Franceschini
55f45afcc4 Fixes to RELEASE-1_1
Tubes weren't paired when folding
Fix sign for cartesian coordinates on slits.

r1838 | ffr | 2007-04-06 19:32:57 +1000 (Fri, 06 Apr 2007) | 4 lines
2012-11-15 13:13:59 +11:00
Ferdi Franceschini
e7324b8335 Merged RELEASE-1_1 back into trunk.
r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines
2012-11-15 13:13:55 +11:00
Mark Lesha
79ac59740f MJL 4/4/07 Added upload of any dictonary entries starting with 'read_data_' as HTTP options in data read reques to histogram server, allows read data source & format to be adjusted on-the-fly.
r1795 | mle | 2007-04-04 07:57:29 +1000 (Wed, 04 Apr 2007) | 2 lines
2012-11-15 13:13:52 +11:00
Ferdi Franceschini
b250273deb Change filter "type" for slits to "aperture" and add grouping information.
r1788 | ffr | 2007-04-02 18:22:56 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:48 +11:00
Ferdi Franceschini
f338cf5b4e Map motor types to hipadaba paths in the motor_hpath tuple list.
r1787 | ffr | 2007-04-02 18:20:20 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:45 +11:00
Ferdi Franceschini
f38e44c8d8 Construct motor hipadaba paths from type and group info
in the "motor part" field.

r1785 | ffr | 2007-04-02 18:19:17 +1000 (Mon, 02 Apr 2007) | 3 lines
2012-11-15 13:13:42 +11:00
Douglas Clowes
62aa98edf7 fix sz steprate and limits
r1783 | dcl | 2007-04-02 17:33:11 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:35 +11:00
Douglas Clowes
2da08390b8 Change sz count rate, remove obsolete code and do some cleaning
r1782 | dcl | 2007-04-02 15:02:21 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:32 +11:00
Douglas Clowes
636fb54aa7 Make the slits cartesian and do a little cleaning up
r1781 | dcl | 2007-04-02 15:00:20 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:29 +11:00
Douglas Clowes
c944a7383d Should not be in CVS
r1780 | dcl | 2007-04-02 14:58:24 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:25 +11:00
Ferdi Franceschini
f3a6c7bd49 OK, now here's the thing.
You have to save a dataset before you can link a VGroup to it.

r1779 | ffr | 2007-04-01 15:44:56 +1000 (Sun, 01 Apr 2007) | 3 lines
2012-11-15 13:13:22 +11:00
Ferdi Franceschini
3e8375c974 What's the point?
ie I forgot to set the run number.

r1778 | ffr | 2007-04-01 15:38:16 +1000 (Sun, 01 Apr 2007) | 3 lines
2012-11-15 13:13:19 +11:00
Ferdi Franceschini
9fbaec72fd The procedure which writes the data must write the run_number.
r1777 | ffr | 2007-04-01 15:34:26 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:13:15 +11:00
Ferdi Franceschini
aded505558 The run number should be written when making a new scan entry.
r1776 | ffr | 2007-04-01 15:29:08 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:13:12 +11:00
Ferdi Franceschini
486b82c526 Fixed call to nxscript.
r1775 | ffr | 2007-04-01 15:19:04 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:13:09 +11:00