4195 Commits

Author SHA1 Message Date
6f2226fa40 Changes to Makefile for building on 64-bit RHEL 2014-07-30 11:40:47 +10:00
9b965e6313 Minimal scan.tcl and dingo_configuration.tcl
FIX: The scan fails to update the motor positions in the camera server meta data.
2014-07-28 10:10:18 +10:00
a7039c5ca0 Don't abort server_init if one of the initialisation commands fails. 2014-07-28 10:02:49 +10:00
a24afd1298 Modify test configuration for testing on Dingo.
The dingo_configuration.tcl could be based on this.
TODO: Move scan configuration to scan.tcl
2014-07-24 13:57:15 +10:00
29e17ba482 Report HWIdle to SICS if the camera driver has been reset via halt(). 2014-07-24 13:53:35 +10:00
1707cba55f Add debug parameter to Dingo camera driver. 2014-07-24 13:53:34 +10:00
67a3a198ac Added command latch ready event and camera upload configuration event.
The camera driver will now upload the exposure time when it's called from a scan object.
The output function now returns events which are not targeted at the camera or SICS
so that they can be fed back into the state transition function.
The input event handler (camera.c:camdriv_input) now feeds output events back into the
transition function.
2014-07-24 13:53:34 +10:00
a62a284372 Define Echidna sics_config.ini with configurable sample stage. 2014-07-24 13:53:33 +10:00
972e3232cd Change the names in all of the files 2014-07-23 17:30:44 +10:00
9c90153f37 Perform the rename 2014-07-23 17:14:18 +10:00
e04785f3a8 Code to generate the move/rename 2014-07-23 17:14:13 +10:00
dda4a0f8f6 Fix erroneous filenames that match other files 2014-07-23 16:20:34 +10:00
dedcc49284 Fix erroneous filenames that match other files 2014-07-23 16:20:22 +10:00
e3b583150e SICS-696 Explicity include the namespace on mk_sct_ calls 2014-07-23 14:32:26 +10:00
16b435befe Fix an unbalanced brace 2014-07-23 14:27:50 +10:00
8d4366fa95 Change newserver to a link to server_date_time in deploySICS 2014-07-21 15:50:43 +10:00
001d41a703 Change newserver to a link to server_date_time in deploySICS 2014-07-21 15:34:18 +10:00
ab3d7c5adf Remove explicit test debug_threshold from SCT files and regenerate 2014-07-21 10:58:01 +10:00
b9f67a2562 Fix saving t0_chopper_freq and tof length values. 2014-07-20 21:42:36 +10:00
3d051f5bb9 Update aperture positions from Bilby spreadsheet. 2014-07-20 21:29:48 +10:00
c992ae0a2c Refactor aperture selection and report aperture positions at end of drive.
Improve feedback.
2014-07-20 21:29:19 +10:00
b9b386e3f6 Capture error messages in prun and pdrive. 2014-07-20 20:49:20 +10:00
1d1f102b08 - Fixed a serious bug in interface.c introduced while cleaning SetStatus 2014-07-18 15:50:04 +02:00
f5e797dd6a - Cleaned all old dtatus setting code 2014-07-18 14:02:57 +02:00
0becbe914a Use the sct_pulser sctcontroller generated from the agilent_33220A.sct wrapper. 2014-07-18 15:54:59 +10:00
9752c6dbaf Fix list of apertures which should be raised before moving guides.
Optimise aperture selection.
2014-07-18 14:33:16 +10:00
b5b8b32788 Don't report non-numeric values on Ltof hdb nodes.
This also eliminates logging type violation errors caused by polling of the hdb nodes when the guides are misaligned.
Make sure that aprrest_list is empty when N = 8
Improved argument checking and optimisations.

Also allow for setting an offset to the aperture positions on initialisation.
This was found to be necessary after the encoders were replace and ap2 upperlimit
was found to be lower than the ap2 topmost position for an aperture.
2014-07-18 00:16:27 +10:00
17c212ee2e Merge branch 'RELEASE-3_1' into RELEASE-3_2 2014-07-17 11:55:26 +10:00
bffd3ae130 Workaround for SICS-596 'histmem loadconf' fails while histogram is running.
The hmm init was being issued before the histogram had actually stopped.
2014-07-17 11:01:18 +10:00
0cc126572d nguide now selects apertures as well as guides. 2014-07-17 09:44:56 +10:00
b5c64c2a03 Add convenience commands prun and pdrive for posit motors. 2014-07-17 09:44:18 +10:00
22c701b816 Fix LS340 tc driveable by setting the right value for the model number. 2014-07-17 08:55:19 +10:00
423244858e Added t0_chopper_freq for Bilby. 2014-07-16 15:02:49 +10:00
3d6488e254 Rename blade to disk for Bilby choppers. 2014-07-16 15:02:18 +10:00
b217eb0dcf Add whatsthere.py to check revs on instruments 2014-07-16 12:57:33 +10:00
d698c302fd Merge branch 'RELEASE-3_1' into temp
Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/util/config_edit.py
	sics/site_ansto/instrument/util/gen_sct.py
2014-07-16 12:56:40 +10:00
0e53fe3757 Save 5T magnet sensor reading and setpoint. 2014-07-16 11:27:13 +10:00
de264c5f02 Update 5T magnet driver name in Quokka sics_config.ini 2014-07-16 10:11:37 +10:00
c03bbdc38e Add permlink to 5T magnet driver and load the driver in the quokka config. 2014-07-16 10:11:07 +10:00
b29eecc549 Use V1 with I1 for autolab setup on wombat 2014-07-16 09:28:26 +10:00
6a47bd9441 Merge branch 'master' into status 2014-07-15 16:46:22 +02:00
db6167bfa1 - Removed old stuff in conman
- Fixed a bug in processnode which hangs SICS when processnode is called from multiple
  clients on the same node
- Fixed a bug in multicountsersec which caused thrashing of the Tcl results which caused ugly
  error messages when calling the transfer script. Now a copy of the connection is made
  before calling the transfer script
2014-07-15 16:43:09 +02:00
fd7d369ea2 Julabo sct driver to use @@NOREPLY@@ 2014-07-15 18:52:09 +10:00
acec319ee3 Zeroing rotary encoder motor steps fix 2014-07-15 18:52:05 +10:00
db24e03106 Add sct driver for New Zealand magnet 2014-07-15 18:48:38 +10:00
22b34395c1 SICS-761 Zero the motor step counter for rotary encoders. 2014-07-15 18:48:38 +10:00
8849dc90c5 SICS-760 Add NOREPLY mechanism in aqadapter and asyncqueue
This removes the expectation of a reply when sending is suffixed
with "{0}" or "@@NOREPLY@@" or, for asyncqueue, a custom string.
2014-07-15 18:48:38 +10:00
994f4a48c1 Add 5T New Zealand magnet configuration to Quokka configuration. 2014-07-15 17:30:51 +10:00
739ab393a5 Add an Autolab setup to the Wombat config and fix the mercury configuration. 2014-07-15 15:20:20 +10:00
4996d84187 Set an @description property on the protek sensor reading. 2014-07-15 15:17:59 +10:00