74edc8ab56
SICS-496: Set the output power limit to 40% on startup as requested.
...
r3687 | ffr | 2012-08-02 09:47:33 +1000 (Thu, 02 Aug 2012) | 2 lines
2012-11-15 17:35:24 +11:00
a311f331cd
add Dlition Sample temperautre contorl
...
r3686 | jgn | 2012-08-01 09:50:08 +1000 (Wed, 01 Aug 2012) | 1 line
2012-11-15 17:35:19 +11:00
cad63a8578
change data type
...
r3685 | jgn | 2012-07-30 16:31:14 +1000 (Mon, 30 Jul 2012) | 1 line
2012-11-15 17:35:14 +11:00
152d637507
added features
...
r3684 | jgn | 2012-07-30 15:22:31 +1000 (Mon, 30 Jul 2012) | 1 line
2012-11-15 17:35:10 +11:00
822b6d57a1
Add scan object to peak command, as: peak [scanObject] ["value"|"data"]
...
r3683 | dcl | 2012-07-26 15:50:47 +1000 (Thu, 26 Jul 2012) | 1 line
2012-11-15 17:35:05 +11:00
a9fc20abee
make poll rates configurable by adding motorPollSlow, motorPollFast and airPollTimer parameters
...
r3682 | dcl | 2012-07-26 15:48:38 +1000 (Thu, 26 Jul 2012) | 1 line
2012-11-15 17:35:00 +11:00
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
45549fddb5
Improve logging robustness
...
r3680 | dcl | 2012-07-26 15:46:07 +1000 (Thu, 26 Jul 2012) | 1 line
2012-11-15 17:34:51 +11:00
d6ad841174
Set auto by default on startup - as per Paolo
...
r3679 | dcl | 2012-07-26 15:45:13 +1000 (Thu, 26 Jul 2012) | 1 line
2012-11-15 17:34:46 +11:00
8da55b8784
Taipan uses MC1-4,6 and not MC5
...
r3678 | dcl | 2012-07-26 12:09:34 +1000 (Thu, 26 Jul 2012) | 1 line
2012-11-15 17:34:41 +11:00
9a39b9912a
make timing defaults 1,1000,3 like histogram sets
...
r3677 | dcl | 2012-07-26 10:14:02 +1000 (Thu, 26 Jul 2012) | 1 line
2012-11-15 17:34:37 +11:00
710d76def7
r3676 | jgn | 2012-07-26 09:46:53 +1000 (Thu, 26 Jul 2012) | 1 line
2012-11-15 17:34:32 +11:00
f1fc1e59e5
r3675 | jgn | 2012-07-25 13:25:02 +1000 (Wed, 25 Jul 2012) | 1 line
2012-11-15 17:34:27 +11:00
7453eb2458
add new protocl controller for ag1010
...
r3674 | jgn | 2012-07-23 13:42:05 +1000 (Mon, 23 Jul 2012) | 1 line
2012-11-15 17:34:23 +11:00
1da7a21805
add new protocl controller for ag1010
...
r3673 | jgn | 2012-07-23 13:41:34 +1000 (Mon, 23 Jul 2012) | 1 line
2012-11-15 17:34:18 +11:00
31b6cd6d3f
add new protocl controller for ag1010
...
r3672 | jgn | 2012-07-23 13:41:13 +1000 (Mon, 23 Jul 2012) | 1 line
2012-11-15 17:34:13 +11:00
96d8af4de2
add new protocl controller for ag1010
...
r3671 | jgn | 2012-07-23 13:41:03 +1000 (Mon, 23 Jul 2012) | 1 line
2012-11-15 17:34:09 +11:00
28e090f1a2
add new protocl controller for ag1010
...
r3670 | jgn | 2012-07-23 13:40:48 +1000 (Mon, 23 Jul 2012) | 1 line
2012-11-15 17:34:04 +11:00
4309b28c2c
Fix the Gaussian smoothing calculation
...
r3657 | dcl | 2012-07-19 14:59:00 +1000 (Thu, 19 Jul 2012) | 1 line
2012-11-15 17:33:59 +11:00
7727408b80
Add some initialisaton for each new scan, so we don't reuse old data
...
r3656 | dcl | 2012-07-19 14:58:21 +1000 (Thu, 19 Jul 2012) | 1 line
2012-11-15 17:33:55 +11:00
5118d7b23e
Add TCP address:port to displayed parameters for use in simulation
...
r3655 | dcl | 2012-07-19 14:57:03 +1000 (Thu, 19 Jul 2012) | 1 line
2012-11-15 17:33:50 +11:00
45f27b98cc
Minor improvement in timing and jitter of simulation
...
r3654 | dcl | 2012-07-19 14:55:45 +1000 (Thu, 19 Jul 2012) | 1 line
2012-11-15 17:33:45 +11:00
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
df847f6239
add magnetic
...
r3649 | jgn | 2012-07-16 09:56:37 +1000 (Mon, 16 Jul 2012) | 1 line
2012-11-15 17:33:36 +11:00
e0e7745291
add magnetic
...
r3648 | jgn | 2012-07-16 09:56:02 +1000 (Mon, 16 Jul 2012) | 1 line
2012-11-15 17:33:31 +11:00
21af2ad20e
add magnetic
...
r3647 | jgn | 2012-07-16 09:50:15 +1000 (Mon, 16 Jul 2012) | 1 line
2012-11-15 17:33:26 +11:00
e4a57f0162
add magnetic
...
r3646 | jgn | 2012-07-16 09:50:06 +1000 (Mon, 16 Jul 2012) | 1 line
2012-11-15 17:33:21 +11:00
291892e6d7
use same folder name magnetic
...
r3645 | jgn | 2012-07-16 09:44:48 +1000 (Mon, 16 Jul 2012) | 1 line
2012-11-15 17:33:17 +11:00
83e8b77271
use same folder name magnetic
...
r3643 | jgn | 2012-07-16 09:41:40 +1000 (Mon, 16 Jul 2012) | 1 line
2012-11-15 17:33:07 +11:00
a6fd5af72c
Made the isobus address configurable for the Oxford Mercury ITC.
...
NOTE: Address is option and defaults to @1
Eg Set tol=5.0 and isobus address= @8 for the Mercury ITC
add_itc500 tc1 localhost 7777 5.0 "@8"
r3642 | ffr | 2012-07-13 15:48:30 +1000 (Fri, 13 Jul 2012) | 5 lines
2012-11-15 17:33:03 +11:00
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
53d5339c66
Remove the lower limit on count rate for simulated hardware
...
r3640 | dcl | 2012-07-11 17:31:41 +1000 (Wed, 11 Jul 2012) | 1 line
2012-11-15 17:32:53 +11:00
25c10fb105
Convert difscan skip count to be milliseconds
...
r3639 | dcl | 2012-07-11 15:12:51 +1000 (Wed, 11 Jul 2012) | 1 line
2012-11-15 17:32:49 +11:00
f5537d7c9e
Provide a way to configure a simulated motor if it identifies itself as being simulated
...
r3638 | dcl | 2012-07-11 15:11:41 +1000 (Wed, 11 Jul 2012) | 1 line
2012-11-15 17:32:44 +11:00
c59a3979be
Implement simulated counter hardware and more string literal changes
...
r3637 | dcl | 2012-07-11 15:08:50 +1000 (Wed, 11 Jul 2012) | 1 line
2012-11-15 17:32:39 +11:00
a4581ba153
string literals are now const so declare args as such to suppress compiler warnings
...
r3636 | dcl | 2012-07-11 12:16:07 +1000 (Wed, 11 Jul 2012) | 1 line
2012-11-15 17:32:35 +11:00
b8c3bc3acd
bugfix: was overwriting short constant string or argv
...
r3635 | dcl | 2012-07-11 12:04:43 +1000 (Wed, 11 Jul 2012) | 1 line
2012-11-15 17:32:30 +11:00
6a539d2321
string literals are now const so declare args as such to suppress compiler warnings
...
r3634 | dcl | 2012-07-11 11:59:16 +1000 (Wed, 11 Jul 2012) | 1 line
2012-11-15 17:32:25 +11:00
556b69063c
bugfix: was overwriting short constant string or argv
...
r3633 | dcl | 2012-07-11 11:56:25 +1000 (Wed, 11 Jul 2012) | 1 line
2012-11-15 17:32:21 +11:00
ff2657c5e3
Update parameters to match parameters on instrument.
...
r3629 | ffr | 2012-07-09 09:53:00 +1000 (Mon, 09 Jul 2012) | 2 lines
2012-11-15 17:32:16 +11:00
fd703373d8
New home position readings for Huber cradle.
...
r3628 | ffr | 2012-07-09 09:51:37 +1000 (Mon, 09 Jul 2012) | 2 lines
2012-11-15 17:32:11 +11:00
db8c6d6004
In monitor mode the multicounter should stop when the monitor is idle
...
unless one of the other counters is in fault, nobeam or paused.
In timer mode the multicounter should stop when all the counters are idle
unless one of the other counters is in fault, nobeam or paused.
r3627 | ffr | 2012-07-06 07:49:07 +1000 (Fri, 06 Jul 2012) | 5 lines
2012-11-15 17:32:07 +11:00
540aaccc48
SICS-486: When in timer mode only stop the multicounter when all of the slaves are
...
idle or at the first slave which reports a fault.
NOTE: If slave[0] == pause and slave[1] == fault then the multicounter will pause and then
possibly fail if slave[1] is still in fault when slave[0] continues.
r3626 | ffr | 2012-07-02 09:38:29 +1000 (Mon, 02 Jul 2012) | 5 lines
2012-11-15 17:32:02 +11:00
683e73b4e0
SICS-488: In monitor controlled acquisitions normalise the slave counts
...
against slave time and monitor time and set slave time = monitor time.
r3625 | ffr | 2012-06-29 16:15:04 +1000 (Fri, 29 Jun 2012) | 3 lines
2012-11-15 17:31:58 +11:00
9ef0bb8afd
Make sure bmon scans can save scratch files when the savetype is set to nosave.
...
r3624 | ffr | 2012-06-29 16:12:30 +1000 (Fri, 29 Jun 2012) | 2 lines
2012-11-15 17:31:53 +11:00
a2a9eb6f72
Fixed typo. Although this didn't seem to cause any problems.
...
r3623 | ffr | 2012-06-29 16:05:50 +1000 (Fri, 29 Jun 2012) | 2 lines
2012-11-15 17:31:48 +11:00
66caf6916b
Don't change anything on startup, defer settings until moving and then do each time
...
We don't want to change anything on the controller when we start SICS so we don't interfere with whatever else is talking to it. So don't command it during init.
We also want to send Speed, Accel and Decel on each move so we defer those until then.
r3622 | dcl | 2012-06-28 15:39:47 +1000 (Thu, 28 Jun 2012) | 5 lines
2012-11-15 17:31:44 +11:00
2c4f45b573
Try to defer HWIdle notification until the motor is really idle
...
r3620 | dcl | 2012-06-27 15:11:04 +1000 (Wed, 27 Jun 2012) | 1 line
2012-11-15 17:31:39 +11:00
4000de7ec8
Restore stth StepsPerX to 250000 after the coupling was repaired.
...
r3618 | dcl | 2012-06-27 15:03:22 +1000 (Wed, 27 Jun 2012) | 1 line
2012-11-15 17:31:34 +11:00
eeac77f9ce
Refactor the timer clearing; force timer clear on set; improve the tracing of timer operations.
...
r3616 | dcl | 2012-06-26 14:36:32 +1000 (Tue, 26 Jun 2012) | 1 line
2012-11-15 17:31:30 +11:00
Ferdi Franceschini