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
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
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
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
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
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
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
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
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
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
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
Ferdi Franceschini
bb588c7d05
Fixed duplication of ss1u for long_name calls.
...
r1768 | ffr | 2007-04-01 12:25:40 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:46 +11:00
Ferdi Franceschini
4712347649
Both hipd and hrpd motors have now been configured with part identifiers and and long names, and the hpaths now use the long_name fields.
...
r1766 | ffr | 2007-04-01 11:58:58 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:39 +11:00
Ferdi Franceschini
467943d64c
Set motor position datasets to rank 1.
...
r1761 | ffr | 2007-04-01 10:03:26 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:23 +11:00
Ferdi Franceschini
db9a45ff1e
The instrument specific hmm configurations are now responsible for creating the hmm and hmc objects. This makes it possible to drop dummy or instrumented histogram memory objects into the common setup and control code.
...
r1754 | ffr | 2007-03-31 11:30:31 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:11:59 +11:00
Douglas Clowes
5960ce1d00
Modify to use multichannel controller for motor connections
...
r1722 | dcl | 2007-03-26 08:09:46 +1000 (Mon, 26 Mar 2007) | 2 lines
2012-11-15 13:10:14 +11:00
Ferdi Franceschini
aaba6ffb44
Set new browser view display format.
...
r1700 | ffr | 2007-03-22 18:34:14 +1100 (Thu, 22 Mar 2007) | 2 lines
2012-11-15 13:09:12 +11:00
Ferdi Franceschini
737635dbd7
Source common counter configuration.
...
r1699 | ffr | 2007-03-22 18:32:29 +1100 (Thu, 22 Mar 2007) | 2 lines
2012-11-15 13:09:09 +11:00
Ferdi Franceschini
69d58fbaca
Reduce entries for each "real" motor to just three types by nexus group.
...
TODO: Configurable virtual motors.
r1686 | ffr | 2007-03-20 12:03:35 +1100 (Tue, 20 Mar 2007) | 3 lines
2012-11-15 13:08:31 +11:00
Ferdi Franceschini
978b06587c
Use new hmm setup and initialisation functions and initialise hmm_start to read from the start of the histogram memory for each instrument.
...
r1685 | ffr | 2007-03-20 11:59:53 +1100 (Tue, 20 Mar 2007) | 2 lines
2012-11-15 13:08:28 +11:00
Ferdi Franceschini
da2e771687
Update histogram memory configuration in anticipation of new histogram memory server.
...
r1684 | ffr | 2007-03-20 11:57:40 +1100 (Tue, 20 Mar 2007) | 2 lines
2012-11-15 13:08:24 +11:00
Ferdi Franceschini
0640a1edaf
The wombat specific addnxentry has been made obsolete with the addition of hmm_* variables set by the hmm_setup function.
...
r1683 | ffr | 2007-03-20 11:54:44 +1100 (Tue, 20 Mar 2007) | 2 lines
2012-11-15 13:08:21 +11:00
Ferdi Franceschini
d59a3fd642
Specialized addnxscanentry for wombat
...
r1636 | ffr | 2007-03-13 09:00:50 +1100 (Tue, 13 Mar 2007) | 2 lines
2012-11-15 13:06:10 +11:00
Ferdi Franceschini
1745977df4
Initialise and setup hmm.
...
r1627 | ffr | 2007-03-12 08:57:37 +1100 (Mon, 12 Mar 2007) | 2 lines
2012-11-15 13:05:42 +11:00
Douglas Clowes
f27b1c8e87
Configure Monochromator focus motor
...
r1613 | dcl | 2007-03-08 13:30:10 +1100 (Thu, 08 Mar 2007) | 2 lines
2012-11-15 13:05:03 +11:00
Ferdi Franceschini
df9b9e2ff1
Nexus file configuration is now modular.
...
r1604 | ffr | 2007-03-05 21:04:40 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:36 +11:00
Ferdi Franceschini
6eb1a84a53
Run make file in config dir.
...
r1602 | ffr | 2007-03-05 21:03:31 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:29 +11:00
Ferdi Franceschini
774b92f94b
nexus dic files are now being constructed per use case.
...
r1600 | ffr | 2007-03-05 20:57:36 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:23 +11:00
Ferdi Franceschini
7af960461b
Added common nxscript.tcl file.
...
r1598 | ffr | 2007-03-05 20:51:43 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:16 +11:00
Ferdi Franceschini
6acd4f19fd
Modified to use common configuration
...
r1589 | ffr | 2007-03-05 16:43:33 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:03:49 +11:00
Ferdi Franceschini
3de5fefb5e
Moved to instrument/config dir to provide a common config file.
...
r1588 | ffr | 2007-03-05 16:42:42 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:03:46 +11:00
Ferdi Franceschini
17e789fcf9
List of common configuration files.
...
r1587 | ffr | 2007-03-05 16:40:02 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:03:43 +11:00
Ferdi Franceschini
8d176f702b
Added user group, detector angular coverage, vertical axis and polar angle (currently filled with zeros because I recently broke it)
...
r1582 | ffr | 2007-03-03 09:24:57 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:03:28 +11:00
Ferdi Franceschini
fbe9e006bc
Put start and end times in each scan point entry.
...
r1581 | ffr | 2007-03-03 09:24:40 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:03:25 +11:00
Ferdi Franceschini
99c55c1a07
Wombat hmm config file from Mark Lesha
...
r1580 | ffr | 2007-03-03 09:23:39 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:03:22 +11:00
Ferdi Franceschini
70873d959c
Added scan point start time for each nexus file entry.
...
r1556 | ffr | 2007-02-26 13:23:00 +1100 (Mon, 26 Feb 2007) | 2 lines
2012-11-15 13:02:12 +11:00
Ferdi Franceschini
75711dde2a
Create 2D polar angle grid.
...
r1555 | ffr | 2007-02-26 13:17:13 +1100 (Mon, 26 Feb 2007) | 2 lines
2012-11-15 13:02:09 +11:00
Ferdi Franceschini
903c446391
Set zero posn to right edge of detector for detector rotate.
...
r1554 | ffr | 2007-02-26 13:15:32 +1100 (Mon, 26 Feb 2007) | 2 lines
2012-11-15 13:02:06 +11:00
Ferdi Franceschini
edfbb73b10
Added config for hmm.
...
r1553 | ffr | 2007-02-26 13:14:07 +1100 (Mon, 26 Feb 2007) | 2 lines
2012-11-15 13:02:03 +11:00
Ferdi Franceschini
1155552dde
Separated bm configuration from hmm config.
...
r1552 | ffr | 2007-02-26 13:13:09 +1100 (Mon, 26 Feb 2007) | 2 lines
2012-11-15 13:02:00 +11:00
Ferdi Franceschini
5f3eeed030
Made structural mods suggested by MK and now creates 2D polar_angle array.
...
r1550 | ffr | 2007-02-23 09:19:27 +1100 (Fri, 23 Feb 2007) | 2 lines
2012-11-15 13:01:55 +11:00
Douglas Clowes
507725d402
remove duplicate movecount
...
r1549 | dcl | 2007-02-23 08:26:09 +1100 (Fri, 23 Feb 2007) | 2 lines
2012-11-15 13:01:52 +11:00
Douglas Clowes
961aa0b8aa
Add movecount from echidna, reduce mtth settling to 5 seconds
...
r1547 | dcl | 2007-02-23 08:17:25 +1100 (Fri, 23 Feb 2007) | 2 lines
2012-11-15 13:01:46 +11:00
Douglas Clowes
405981c815
Tighten up MOM and MTTH, add new airpads code
...
r1542 | dcl | 2007-02-22 16:36:25 +1100 (Thu, 22 Feb 2007) | 2 lines
2012-11-15 13:01:32 +11:00
Ferdi Franceschini
8d2488b9de
Use generic name for scan header.
...
r1532 | ffr | 2007-02-20 16:15:49 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:01:06 +11:00
Ferdi Franceschini
3ea7556258
Use generic name for nexus dictionary.
...
r1531 | ffr | 2007-02-20 16:12:59 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:01:03 +11:00
Ferdi Franceschini
14a244d014
Use new dir structure.
...
r1515 | ffr | 2007-02-20 08:03:21 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:00:19 +11:00