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
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
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
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
e1cbf10ed7
Source hipadaba config after other configs.
...
r1642 | ffr | 2007-03-13 16:42:24 +1100 (Tue, 13 Mar 2007) | 2 lines
2012-11-15 13:06:22 +11:00
Ferdi Franceschini
046e642f3d
Variables to calculate polar angles in a region of interest.
...
r1629 | ffr | 2007-03-12 09:17:04 +1100 (Mon, 12 Mar 2007) | 2 lines
2012-11-15 13:05:48 +11:00
Ferdi Franceschini
463c433f24
Set detector_type and detector_description for wombat.
...
r1596 | ffr | 2007-03-05 20:47:40 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:10 +11:00
Ferdi Franceschini
81343c4e5e
Added user group, detector angular coverage, vertical axis and polar angle (currently filled with zeros because I recently broke it)
...
r1577 | ffr | 2007-03-03 09:19:52 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:03:13 +11:00
Ferdi Franceschini
b32a0dff3c
Added detector physical specs.
...
r1551 | ffr | 2007-02-23 09:20:25 +1100 (Fri, 23 Feb 2007) | 2 lines
2012-11-15 13:01:58 +11:00
Ferdi Franceschini
fb84767b54
Create a state monitor for hmscan.
...
r1530 | ffr | 2007-02-20 16:10:08 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:01:00 +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
Douglas Clowes
5f657bded4
Re-factor motor configurations
...
r1284 | dcl | 2006-11-14 09:40:29 +1100 (Tue, 14 Nov 2006) | 2 lines
2012-11-15 12:52:47 +11:00
Ferdi Franceschini
c7aed4a93c
Refactored for my new hipadaba xml support.
...
r1247 | ffr | 2006-11-07 13:06:51 +1100 (Tue, 07 Nov 2006) | 2 lines
2012-11-15 12:51:24 +11:00
Ferdi Franceschini
03cf7741f5
Use named ports for sics ports.
...
r1209 | ffr | 2006-10-31 15:03:01 +1100 (Tue, 31 Oct 2006) | 2 lines
2012-11-15 12:50:08 +11:00
Ferdi Franceschini
96ca8f9743
Added hm configuration.
...
r1144 | ffr | 2006-10-13 16:33:52 +1000 (Fri, 13 Oct 2006) | 2 lines
2012-11-15 12:48:20 +11:00
Ferdi Franceschini
edafee2865
Renamed hipd_configuration
...
r1136 | ffr | 2006-10-13 08:51:22 +1000 (Fri, 13 Oct 2006) | 2 lines
2012-11-15 12:48:01 +11:00