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
5dd1ff27a4
If the multicounter is set to count controlled mode then set all slave counters to timer mode with a preset time of one year
...
otherwise set them to the given mode and preset.
r3615 | ffr | 2012-06-22 18:30:59 +1000 (Fri, 22 Jun 2012) | 3 lines
2012-11-15 17:31:25 +11:00
f8124ccc5c
SICS-485: Revert r3251 so that we can set "mot interruptmode" to control the if an
...
HWFault aborts a scan or batch file.
r3614 | ffr | 2012-06-21 18:09:49 +1000 (Thu, 21 Jun 2012) | 3 lines
2012-11-15 17:31:20 +11:00
79c4acc5ad
Reverse compare operator to correct report rate logic
...
r3613 | dcl | 2012-06-20 14:57:37 +1000 (Wed, 20 Jun 2012) | 1 line
2012-11-15 17:31:16 +11:00
d99d9cc7ee
SICS-435: Save setpoint in data file.
...
r3612 | ffr | 2012-06-19 20:42:15 +1000 (Tue, 19 Jun 2012) | 2 lines
2012-11-15 17:31:11 +11:00
da624bba07
Change movecount to millisecond rather than loop count because of faster loop count on newere hardware/software
...
r3611 | dcl | 2012-06-19 14:01:09 +1000 (Tue, 19 Jun 2012) | 1 line
2012-11-15 17:31:07 +11:00
6891ac08ee
Add the date to the start of message in the log
...
r3610 | dcl | 2012-06-19 14:00:10 +1000 (Tue, 19 Jun 2012) | 1 line
2012-11-15 17:31:02 +11:00
393c20b23d
Implement a virtuel Ei motor (vei) that does not drive anything but M1 and M2
...
r3609 | dcl | 2012-06-19 13:44:11 +1000 (Tue, 19 Jun 2012) | 1 line
2012-11-15 17:30:57 +11:00
e6c6552bd7
Set the same units and encoder values as in SpICE (point in time)
...
r3608 | dcl | 2012-06-19 13:42:14 +1000 (Tue, 19 Jun 2012) | 1 line
2012-11-15 17:30:52 +11:00
ca6ee7a191
add switch (on/off) in controlling data recording in log file
...
r3601 | jgn | 2012-06-14 11:28:03 +1000 (Thu, 14 Jun 2012) | 1 line
2012-11-15 17:30:48 +11:00
9fa9bcf4f9
Make the MOTEND reporting into a one-shot
...
r3600 | dcl | 2012-06-13 17:15:41 +1000 (Wed, 13 Jun 2012) | 1 line
2012-11-15 17:30:43 +11:00
50e508d79b
r3599 | jgn | 2012-06-12 14:10:46 +1000 (Tue, 12 Jun 2012) | 1 line
2012-11-15 17:30:39 +11:00
97fcb9ecf3
remove HMM component of Dingo
...
r3598 | jgn | 2012-06-12 10:01:17 +1000 (Tue, 12 Jun 2012) | 1 line
2012-11-15 17:30:34 +11:00
843c12d208
add Dingo into Makefile
...
r3597 | jgn | 2012-06-07 09:49:10 +1000 (Thu, 07 Jun 2012) | 1 line
2012-11-15 17:30:29 +11:00
f6cb6602b1
re-produce package for Dingo
...
r3596 | jgn | 2012-06-06 12:01:42 +1000 (Wed, 06 Jun 2012) | 1 line
2012-11-15 17:30:25 +11:00
06ab0664eb
r3595 | jgn | 2012-06-06 11:30:16 +1000 (Wed, 06 Jun 2012) | 1 line
2012-11-15 17:30:20 +11:00
dbef490724
getpar has a FUPAOPT argument which should be returned as text not as an
...
iVal. See pg 237 (Function Parser) of the SICS reference manual or the
comment in fupa.h
r3594 | ffr | 2012-06-06 09:07:01 +1000 (Wed, 06 Jun 2012) | 4 lines
2012-11-15 17:30:15 +11:00
dc230ad1ab
add items to log file
...
r3593 | jgn | 2012-06-05 12:03:28 +1000 (Tue, 05 Jun 2012) | 1 line
2012-11-15 17:30:10 +11:00
a24df1fc78
SICS-477 In the runscan command restrict mode to 'time' and 'monitor' when the detector type is
...
set to 'bmon'. Also check that detector type is either 'bmon' or
'histmem'.
r3592 | ffr | 2012-06-05 08:21:33 +1000 (Tue, 05 Jun 2012) | 4 lines
2012-11-15 17:30:06 +11:00
192baf1e95
SICS-477 Set the detector type to "bmon" for Taipan and lock it so that
...
it can't be changed.
r3591 | ffr | 2012-06-04 20:19:00 +1000 (Mon, 04 Jun 2012) | 3 lines
2012-11-15 17:30:01 +11:00
d5da9eba15
SICS-477 Added the "detector" parameter to the "runscan" command tree
...
with a default value of "histmem". Also created a "detector"
convenience macro so that the detector type can be easily queried and
set from the command line.
r3590 | ffr | 2012-06-04 20:16:07 +1000 (Mon, 04 Jun 2012) | 5 lines
2012-11-15 17:29:56 +11:00
6b3f71cc6a
SICS-477 Modified the runscan command to do bmon scans as well as
...
hmscans. The type of scan is determined by the new "detector" parameter
on the /commands/scan/runscan tree. It is fixed to 'bmon' for Taipan
but is selectable on other instruments with default="histmem"
r3589 | ffr | 2012-06-04 20:11:51 +1000 (Mon, 04 Jun 2012) | 5 lines
2012-11-15 17:29:52 +11:00
d71dbd9b9a
Load new environment controllers and logbook command.
...
r3588 | ffr | 2012-06-04 19:51:33 +1000 (Mon, 04 Jun 2012) | 2 lines
2012-11-15 17:29:47 +11:00
81befc1e0a
instrument/MANIFEST.TXT
...
r3587 | ffr | 2012-06-04 19:48:54 +1000 (Mon, 04 Jun 2012) | 2 lines
2012-11-15 17:29:42 +11:00
Jing Chen