291892e6d7
use same folder name magnetic r3645 | jgn | 2012-07-16 09:44:48 +1000 (Mon, 16 Jul 2012) | 1 line
Jing Chen
2012-07-16 09:44:48 +10:00
83e8b77271
use same folder name magnetic r3643 | jgn | 2012-07-16 09:41:40 +1000 (Mon, 16 Jul 2012) | 1 line
Jing Chen
2012-07-16 09:41:40 +10: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"
Ferdi Franceschini
2012-07-13 15:48:30 +10:00
d85341b8fc
Added aerotech motor control for 12T oxford magnet and oxford temperatuer controller.
Ferdi Franceschini
2012-07-13 15:41:42 +10: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
Douglas Clowes
2012-07-11 17:31:41 +10:00
25c10fb105
Convert difscan skip count to be milliseconds r3639 | dcl | 2012-07-11 15:12:51 +1000 (Wed, 11 Jul 2012) | 1 line
Douglas Clowes
2012-07-11 15:12:51 +10: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
Douglas Clowes
2012-07-11 15:11:41 +10: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
Douglas Clowes
2012-07-11 15:08:50 +10: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
Douglas Clowes
2012-07-11 12:16:07 +10: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
Douglas Clowes
2012-07-11 12:04:43 +10: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
Douglas Clowes
2012-07-11 11:59:16 +10: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
Douglas Clowes
2012-07-11 11:56:25 +10:00
ff2657c5e3
Update parameters to match parameters on instrument.
Ferdi Franceschini
2012-07-09 09:53:00 +10:00
fd703373d8
New home position readings for Huber cradle.
Ferdi Franceschini
2012-07-09 09:51:37 +10: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.
Ferdi Franceschini
2012-07-06 07:49:07 +10: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.
Ferdi Franceschini
2012-07-02 09:38:29 +10:00
683e73b4e0
SICS-488: In monitor controlled acquisitions normalise the slave counts against slave time and monitor time and set slave time = monitor time.
Ferdi Franceschini
2012-06-29 16:15:04 +10:00
9ef0bb8afd
Make sure bmon scans can save scratch files when the savetype is set to nosave.
Ferdi Franceschini
2012-06-29 16:12:30 +10:00
a2a9eb6f72
Fixed typo. Although this didn't seem to cause any problems.
Ferdi Franceschini
2012-06-29 16:05:50 +10:00
66caf6916b
Don't change anything on startup, defer settings until moving and then do each time
Douglas Clowes
2012-06-28 15:39:47 +10: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
Douglas Clowes
2012-06-27 15:11:04 +10: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
Douglas Clowes
2012-06-27 15:03:22 +10: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
Douglas Clowes
2012-06-26 14:36:32 +10: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.
Ferdi Franceschini
2012-06-22 18:30:59 +10: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.
Ferdi Franceschini
2012-06-21 18:09:49 +10: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
Douglas Clowes
2012-06-20 14:57:37 +10:00
d99d9cc7ee
SICS-435: Save setpoint in data file.
Ferdi Franceschini
2012-06-19 20:42:15 +10: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
Douglas Clowes
2012-06-19 14:01:09 +10: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
Douglas Clowes
2012-06-19 14:00:10 +10: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
Douglas Clowes
2012-06-19 13:44:11 +10: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
Douglas Clowes
2012-06-19 13:42:14 +10: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
Jing Chen
2012-06-14 11:28:03 +10: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
Douglas Clowes
2012-06-13 17:15:41 +10:00
50e508d79b
r3599 | jgn | 2012-06-12 14:10:46 +1000 (Tue, 12 Jun 2012) | 1 line
Jing Chen
2012-06-12 14:10:46 +10:00
97fcb9ecf3
remove HMM component of Dingo r3598 | jgn | 2012-06-12 10:01:17 +1000 (Tue, 12 Jun 2012) | 1 line
Jing Chen
2012-06-12 10:01:17 +10:00
843c12d208
add Dingo into Makefile r3597 | jgn | 2012-06-07 09:49:10 +1000 (Thu, 07 Jun 2012) | 1 line
Jing Chen
2012-06-07 09:49:10 +10:00
f6cb6602b1
re-produce package for Dingo r3596 | jgn | 2012-06-06 12:01:42 +1000 (Wed, 06 Jun 2012) | 1 line
Jing Chen
2012-06-06 12:01:42 +10:00
06ab0664eb
r3595 | jgn | 2012-06-06 11:30:16 +1000 (Wed, 06 Jun 2012) | 1 line
Jing Chen
2012-06-06 11:30:16 +10: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
Ferdi Franceschini
2012-06-06 09:07:01 +10:00
dc230ad1ab
add items to log file r3593 | jgn | 2012-06-05 12:03:28 +1000 (Tue, 05 Jun 2012) | 1 line
Jing Chen
2012-06-05 12:03:28 +10: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'.
Ferdi Franceschini
2012-06-05 08:21:33 +10:00
192baf1e95
SICS-477 Set the detector type to "bmon" for Taipan and lock it so that it can't be changed.
Ferdi Franceschini
2012-06-04 20:19:00 +10: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.
Ferdi Franceschini
2012-06-04 20:16:07 +10: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"
Ferdi Franceschini
2012-06-04 20:11:51 +10:00
d71dbd9b9a
Load new environment controllers and logbook command.
Ferdi Franceschini
2012-06-04 19:51:33 +10:00
f7ed40b160
Deploy some extra environment controllers to Taipan.
Ferdi Franceschini
2012-06-04 19:45:25 +10:00
c3b99ff2f0
update sct_hv.tcl accroing to new requirements r3585 | jgn | 2012-06-04 15:42:37 +1000 (Mon, 04 Jun 2012) | 1 line
Jing Chen
2012-06-04 15:42:37 +10:00
0b393d04f4
SICS-469: Define a dummy ::histogram_memory::set_sobj_attributes function for Taipan because SICS will abort setting the attributes on other objects if this raises an error. This means that some objects like environment controllers (eg ls340) won't be added to the control interface or saved in the data file.
Ferdi Franceschini
2012-06-04 13:21:42 +10:00
9518e46440
remove hmm from Dingo r3575 | jgn | 2012-06-04 09:34:16 +1000 (Mon, 04 Jun 2012) | 1 line
Jing Chen
2012-06-04 09:34:16 +10:00
66aa3f943c
create initial SICS file for Dingo r3574 | jgn | 2012-06-01 16:07:14 +1000 (Fri, 01 Jun 2012) | 1 line
Jing Chen
2012-06-01 16:07:14 +10:00
6b6838eaae
Do NOT fix the motors here r3559 | dcl | 2012-05-30 14:38:28 +1000 (Wed, 30 May 2012) | 1 line
Douglas Clowes
2012-05-30 14:38:28 +10:00
d057d0e7dc
WIP Commissioning refinement r3558 | dcl | 2012-05-30 14:37:44 +1000 (Wed, 30 May 2012) | 1 line
Douglas Clowes
2012-05-30 14:37:44 +10:00
85d88a7bc6
WIP Commissioning refinement r3557 | dcl | 2012-05-30 14:09:27 +1000 (Wed, 30 May 2012) | 1 line
Douglas Clowes
2012-05-30 14:09:27 +10:00
ac494897c6
move lcoation of sct_hv.tcl r3556 | jgn | 2012-05-30 11:54:14 +1000 (Wed, 30 May 2012) | 1 line
Jing Chen
2012-05-30 11:54:14 +10:00
d3390e278d
move file sct_hv.tcl to ./hmm r3555 | jgn | 2012-05-30 11:52:58 +1000 (Wed, 30 May 2012) | 1 line
Jing Chen
2012-05-30 11:52:58 +10:00
915ab1a0a2
replace name hv_control.tcl with sct_hv.tcl r3554 | jgn | 2012-05-30 11:50:11 +1000 (Wed, 30 May 2012) | 1 line
Jing Chen
2012-05-30 11:50:11 +10:00
4887c8959a
New 'limswi' function/command found on Pelican r3553 | dcl | 2012-05-29 10:27:54 +1000 (Tue, 29 May 2012) | 1 line
Douglas Clowes
2012-05-29 10:27:54 +10:00
a9a90feaaf
Bring into step with instrument r3552 | dcl | 2012-05-24 13:53:53 +1000 (Thu, 24 May 2012) | 1 line
Douglas Clowes
2012-05-24 13:53:53 +10:00
b497feba9f
WIP refinements r3551 | dcl | 2012-05-24 10:12:10 +1000 (Thu, 24 May 2012) | 1 line
Douglas Clowes
2012-05-24 10:12:10 +10:00
201f9104b3
undo previous change r3550 | dcl | 2012-05-18 16:32:30 +1000 (Fri, 18 May 2012) | 1 line
Douglas Clowes
2012-05-18 16:32:30 +10:00
b784e43bae
Reconnect was bleeding socket handles on a path r3549 | dcl | 2012-05-18 16:25:52 +1000 (Fri, 18 May 2012) | 1 line
Douglas Clowes
2012-05-18 16:25:52 +10:00
32d8224dd7
Add uninterest to Virtual Motors and externalize CheckMotiMatch in motor.c r3548 | dcl | 2012-05-18 14:05:11 +1000 (Fri, 18 May 2012) | 1 line
Douglas Clowes
2012-05-18 14:05:11 +10:00
585b67ca5a
Do not reset the "failed" bit after the error function sets it r3547 | dcl | 2012-05-18 13:53:45 +1000 (Fri, 18 May 2012) | 1 line
Douglas Clowes
2012-05-18 13:53:45 +10:00
b28a43dd87
Correct syntax error r3546 | dcl | 2012-05-17 11:37:34 +1000 (Thu, 17 May 2012) | 1 line
Douglas Clowes
2012-05-17 11:37:34 +10:00
2ee0d5bdec
Commissioning WIP r3545 | dcl | 2012-05-17 11:04:14 +1000 (Thu, 17 May 2012) | 1 line
Douglas Clowes
2012-05-17 11:04:14 +10:00
b10b1608b2
Creep last encoder count by steps-per-count/10 instead of one, for motors with large steps-per-count r3544 | dcl | 2012-05-17 11:02:53 +1000 (Thu, 17 May 2012) | 1 line
Douglas Clowes
2012-05-17 11:02:53 +10:00
a5d64c28ab
SICS-467 Catch the bm COUNTSTART and COUNTEND events to set the feedback status even if the counter is started via "bm count" or stopped by an INT1712.
Ferdi Franceschini
2012-05-03 17:28:34 +10:00
eb0a758a72
Prefer static libs to dynamic ones, TCL 8.4 to 8.5 r3540 | dcl | 2012-04-27 14:42:52 +1000 (Fri, 27 Apr 2012) | 1 line
Douglas Clowes
2012-04-27 14:42:52 +10:00
7959d78fd1
WIP: another pass at the Pelican motor configuration r3539 | dcl | 2012-04-27 14:40:00 +1000 (Fri, 27 Apr 2012) | 1 line
Douglas Clowes
2012-04-27 14:40:00 +10:00
1326492c00
Add the oxford temperature controller and soloist motor for the 12T magnet r3538 | dcl | 2012-04-27 14:39:01 +1000 (Fri, 27 Apr 2012) | 1 line
Douglas Clowes
2012-04-27 14:39:01 +10:00
4061642380
Configure motor controller 1 motors and clean up a bit r3537 | dcl | 2012-04-26 13:10:46 +1000 (Thu, 26 Apr 2012) | 1 line
Douglas Clowes
2012-04-26 13:10:46 +10:00
c9c632de9b
Apply changes to accel/decel/speed as found on the instrument - limits to 0.1875 r3536 | dcl | 2012-04-24 17:13:50 +1000 (Tue, 24 Apr 2012) | 1 line
Douglas Clowes
2012-04-24 17:13:50 +10:00
d42ff4d491
Apply changes to monochromator tilt stages as found on the instrument - limits tilts to 2 degrees r3535 | dcl | 2012-04-24 17:11:54 +1000 (Tue, 24 Apr 2012) | 1 line
Douglas Clowes
2012-04-24 17:11:54 +10:00
317d123960
Strip out the Quokka specific configuration r3534 | dcl | 2012-04-24 17:09:22 +1000 (Tue, 24 Apr 2012) | 1 line
Douglas Clowes
2012-04-24 17:09:22 +10:00
1cddcfd82d
Wombat and Echidna use fileeval and cfPath to load configs for the eulerian cradle.
Ferdi Franceschini
2012-04-19 10:27:08 +10:00
17c5d43030
Brain-dead driver for Aerotech Soloist "driver" for 12T magnet sample rotation motor r3532 | dcl | 2012-04-10 11:16:36 +1000 (Tue, 10 Apr 2012) | 1 line
Douglas Clowes
2012-04-10 11:16:36 +10:00
5156f4375c
Undo my bad update r3531 | dcl | 2012-04-10 11:09:30 +1000 (Tue, 10 Apr 2012) | 1 line
Douglas Clowes
2012-04-10 11:09:30 +10:00
e05c4d28ba
Issue SICS-55 - set privilege field in hcommand command r3530 | jgn | 2012-04-05 15:35:24 +1000 (Thu, 05 Apr 2012) | 1 line
Jing Chen
2012-04-05 15:35:24 +10:00
5e83e57d54
Another refinement for mono focus resolver bias r3527 | dcl | 2012-04-02 13:03:47 +1000 (Mon, 02 Apr 2012) | 1 line
Douglas Clowes
2012-04-02 13:03:47 +10:00
34c397dfb7
Add a header template file r3526 | dcl | 2012-04-02 13:02:14 +1000 (Mon, 02 Apr 2012) | 1 line
Douglas Clowes
2012-04-02 13:02:14 +10:00
16ef2cc998
Add a simulated PLC because TAS doesn't have it connected yet r3525 | dcl | 2012-04-02 13:01:50 +1000 (Mon, 02 Apr 2012) | 1 line
Douglas Clowes
2012-04-02 13:01:50 +10:00
dc256607b7
Add filea according to ffr r3524 | dcl | 2012-04-02 13:01:13 +1000 (Mon, 02 Apr 2012) | 1 line
Douglas Clowes
2012-04-02 13:01:13 +10:00
3f23e5de32
Include lakeshore 336 and 340 drivers for TAS r3523 | dcl | 2012-04-02 13:00:22 +1000 (Mon, 02 Apr 2012) | 1 line
Douglas Clowes
2012-04-02 13:00:22 +10:00
534459e51f
Add a needed SplitReply tom the bmonscan noscanvar r3520 | dcl | 2012-04-02 12:56:40 +1000 (Mon, 02 Apr 2012) | 1 line
Douglas Clowes
2012-04-02 12:56:40 +10:00
010aa7f945
Adjust stth creep_offset and settle parameters to speed up detector movement r3519 | dcl | 2012-03-30 17:04:05 +1100 (Fri, 30 Mar 2012) | 1 line
Douglas Clowes
2012-03-30 17:04:05 +11:00
872e852215
M2 for wedge control, analyzers unbiased
Douglas Clowes
2012-03-29 12:35:12 +11:00
810788577b
Set the link property to data_set for all of the bmonscan axes r3505 | dcl | 2012-03-29 10:42:57 +1100 (Thu, 29 Mar 2012) | 1 line
Douglas Clowes
2012-03-29 10:42:57 +11:00
a2355b57b8
Update to reflect the 33000 series ports on das2-taipan r3504 | dcl | 2012-03-29 10:41:41 +1100 (Thu, 29 Mar 2012) | 1 line
Douglas Clowes
2012-03-29 10:41:41 +11:00
38c4ef833a
This change sets the @axes property on the bmonscan data r3503 | dcl | 2012-03-29 07:57:33 +1100 (Thu, 29 Mar 2012) | 1 line
Douglas Clowes
2012-03-29 07:57:33 +11:00
f3cf38bb89
Add the two lakeshores to the manifest r3502 | dcl | 2012-03-29 07:55:33 +1100 (Thu, 29 Mar 2012) | 1 line
Douglas Clowes
2012-03-29 07:55:33 +11:00
132fb83389
Add a writeTree capability for writing hdb trees and properties r3477 | dcl | 2012-03-21 13:36:09 +1100 (Wed, 21 Mar 2012) | 1 line
Douglas Clowes
2012-03-21 13:36:09 +11:00
335400ec58
Updates from ics1-taipan r3476 | dcl | 2012-03-21 12:53:06 +1100 (Wed, 21 Mar 2012) | 1 line
Douglas Clowes
2012-03-21 12:53:06 +11:00
Jing Chen