Commit Graph

1576 Commits

Author SHA1 Message Date
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
f7ed40b160 Deploy some extra environment controllers to Taipan.
r3586 | ffr | 2012-06-04 19:45:25 +1000 (Mon, 04 Jun 2012) | 2 lines
2012-11-15 17:29:38 +11:00
Jing Chen
c3b99ff2f0 update sct_hv.tcl accroing to new requirements
r3585 | jgn | 2012-06-04 15:42:37 +1000 (Mon, 04 Jun 2012) | 1 line
2012-11-15 17:29:33 +11:00
Ferdi Franceschini
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.

r3584 | ffr | 2012-06-04 13:21:42 +1000 (Mon, 04 Jun 2012) | 6 lines
2012-11-15 17:29:29 +11:00
Jing Chen
9518e46440 remove hmm from Dingo
r3575 | jgn | 2012-06-04 09:34:16 +1000 (Mon, 04 Jun 2012) | 1 line
2012-11-15 17:29:24 +11:00
Jing Chen
66aa3f943c create initial SICS file for Dingo
r3574 | jgn | 2012-06-01 16:07:14 +1000 (Fri, 01 Jun 2012) | 1 line
2012-11-15 17:29:19 +11:00
Douglas Clowes
6b6838eaae Do NOT fix the motors here
r3559 | dcl | 2012-05-30 14:38:28 +1000 (Wed, 30 May 2012) | 1 line
2012-11-15 17:29:14 +11:00
Douglas Clowes
d057d0e7dc WIP Commissioning refinement
r3558 | dcl | 2012-05-30 14:37:44 +1000 (Wed, 30 May 2012) | 1 line
2012-11-15 17:29:10 +11:00
Douglas Clowes
85d88a7bc6 WIP Commissioning refinement
r3557 | dcl | 2012-05-30 14:09:27 +1000 (Wed, 30 May 2012) | 1 line
2012-11-15 17:29:05 +11:00
Jing Chen
ac494897c6 move lcoation of sct_hv.tcl
r3556 | jgn | 2012-05-30 11:54:14 +1000 (Wed, 30 May 2012) | 1 line
2012-11-15 17:29:01 +11:00
Jing Chen
d3390e278d move file sct_hv.tcl to ./hmm
r3555 | jgn | 2012-05-30 11:52:58 +1000 (Wed, 30 May 2012) | 1 line
2012-11-15 17:28:56 +11:00
Jing Chen
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
2012-11-15 17:28:51 +11:00
Douglas Clowes
4887c8959a New 'limswi' function/command found on Pelican
r3553 | dcl | 2012-05-29 10:27:54 +1000 (Tue, 29 May 2012) | 1 line
2012-11-15 17:28:47 +11:00
Douglas Clowes
a9a90feaaf Bring into step with instrument
r3552 | dcl | 2012-05-24 13:53:53 +1000 (Thu, 24 May 2012) | 1 line
2012-11-15 17:28:42 +11:00
Douglas Clowes
b497feba9f WIP refinements
r3551 | dcl | 2012-05-24 10:12:10 +1000 (Thu, 24 May 2012) | 1 line
2012-11-15 17:28:38 +11:00
Douglas Clowes
201f9104b3 undo previous change
r3550 | dcl | 2012-05-18 16:32:30 +1000 (Fri, 18 May 2012) | 1 line
2012-11-15 17:28:33 +11:00
Douglas Clowes
b784e43bae Reconnect was bleeding socket handles on a path
r3549 | dcl | 2012-05-18 16:25:52 +1000 (Fri, 18 May 2012) | 1 line
2012-11-15 17:28:28 +11:00
Douglas Clowes
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
2012-11-15 17:28:24 +11:00
Douglas Clowes
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
2012-11-15 17:28:19 +11:00
Douglas Clowes
b28a43dd87 Correct syntax error
r3546 | dcl | 2012-05-17 11:37:34 +1000 (Thu, 17 May 2012) | 1 line
2012-11-15 17:28:15 +11:00
Douglas Clowes
2ee0d5bdec Commissioning WIP
r3545 | dcl | 2012-05-17 11:04:14 +1000 (Thu, 17 May 2012) | 1 line
2012-11-15 17:28:10 +11:00
Douglas Clowes
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
2012-11-15 17:28:06 +11:00
Ferdi Franceschini
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.

r3541 | ffr | 2012-05-03 17:28:34 +1000 (Thu, 03 May 2012) | 4 lines
2012-11-15 17:28:01 +11:00
Douglas Clowes
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
2012-11-15 17:27:56 +11:00
Douglas Clowes
7959d78fd1 WIP: another pass at the Pelican motor configuration
r3539 | dcl | 2012-04-27 14:40:00 +1000 (Fri, 27 Apr 2012) | 1 line
2012-11-15 17:27:52 +11:00
Douglas Clowes
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
2012-11-15 17:27:47 +11:00
Douglas Clowes
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
2012-11-15 17:27:43 +11:00
Douglas Clowes
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
2012-11-15 17:27:38 +11:00
Douglas Clowes
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
2012-11-15 17:27:33 +11:00
Douglas Clowes
317d123960 Strip out the Quokka specific configuration
r3534 | dcl | 2012-04-24 17:09:22 +1000 (Tue, 24 Apr 2012) | 1 line
2012-11-15 17:27:29 +11:00
Ferdi Franceschini
1cddcfd82d Wombat and Echidna use fileeval and cfPath to load configs for the
eulerian cradle.

r3533 | ffr | 2012-04-19 10:27:08 +1000 (Thu, 19 Apr 2012) | 3 lines
2012-11-15 17:27:24 +11:00
Douglas Clowes
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
2012-11-15 17:27:20 +11:00
Douglas Clowes
5156f4375c Undo my bad update
r3531 | dcl | 2012-04-10 11:09:30 +1000 (Tue, 10 Apr 2012) | 1 line
2012-11-15 17:27:15 +11:00
Jing Chen
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
2012-11-15 17:27:11 +11:00
Jing Chen
1dceabc8b7 fixed issue SICS-459 - sics crashes when running hcommand without arguments
r3529 | jgn | 2012-04-05 11:24:32 +1000 (Thu, 05 Apr 2012) | 1 line
2012-11-15 17:27:06 +11:00
Douglas Clowes
5e83e57d54 Another refinement for mono focus resolver bias
r3527 | dcl | 2012-04-02 13:03:47 +1000 (Mon, 02 Apr 2012) | 1 line
2012-11-15 17:27:02 +11:00
Douglas Clowes
34c397dfb7 Add a header template file
r3526 | dcl | 2012-04-02 13:02:14 +1000 (Mon, 02 Apr 2012) | 1 line
2012-11-15 17:26:57 +11:00
Douglas Clowes
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
2012-11-15 17:26:52 +11:00
Douglas Clowes
dc256607b7 Add filea according to ffr
r3524 | dcl | 2012-04-02 13:01:13 +1000 (Mon, 02 Apr 2012) | 1 line
2012-11-15 17:26:48 +11:00
Douglas Clowes
3f23e5de32 Include lakeshore 336 and 340 drivers for TAS
r3523 | dcl | 2012-04-02 13:00:22 +1000 (Mon, 02 Apr 2012) | 1 line
2012-11-15 17:26:43 +11:00
Douglas Clowes
8fd30089a1 ensure namespace ::utility exists
r3522 | dcl | 2012-04-02 12:58:59 +1000 (Mon, 02 Apr 2012) | 1 line
2012-11-15 17:26:39 +11:00
Douglas Clowes
9a5db33658 Add missing is_homing_list
r3521 | dcl | 2012-04-02 12:57:47 +1000 (Mon, 02 Apr 2012) | 1 line
2012-11-15 17:26:34 +11:00
Douglas Clowes
534459e51f Add a needed SplitReply tom the bmonscan noscanvar
r3520 | dcl | 2012-04-02 12:56:40 +1000 (Mon, 02 Apr 2012) | 1 line
2012-11-15 17:26:30 +11:00
Douglas Clowes
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
2012-11-15 17:26:25 +11:00
Douglas Clowes
872e852215 M2 for wedge control, analyzers unbiased
Use Dan's computed values for M2 and make steps=counts for the wedge control
Make analyzer motors use unbiased absolute encoder values
r3506 | dcl | 2012-03-29 12:35:12 +1100 (Thu, 29 Mar 2012) | 4 lines
2012-11-15 17:26:21 +11:00
Douglas Clowes
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
2012-11-15 17:26:16 +11:00
Douglas Clowes
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
2012-11-15 17:26:11 +11:00