Commit Graph

23 Commits

Author SHA1 Message Date
Ferdi Franceschini
d2f57e4615 SICS-294 anstohttp.c
Histmem now only calls TaskYield after SICS has finished initalising, this stops the statusfile task from being called early and overwriting the status file. Created ANSTO_MakeHistMemory command to install ANSTO_HistAction
Added veto functions.  Mapped the HistDriver interface Pause() and Continue() commands to AnstoHttpVeto and AnstoHttpNoVeto. Implemented an ANSTO_Histaction to call AnstoHttpPause when sent a "pause" subcommand.

hmcontrol_ansto.c
Call AnstoHttpPause() directly when Pause_HM_After_Count is set to preserver current behaviour.

counterdriv.c
Now sends the correct "SICS RESUME" command to resume a paused count.

ansto_sctdriveadapter.c NEW
This lets you create driveable objects from script-context controllers which have one node for setting a parameter and another node for reading the parameter (eg temperature controllers, choppers, velocity selectors)

sctemonadapter.c NEW
This generates an environment monitor interface for script-context controllers so that the emon object in SICS will be able to pause counters if the controller goes out of tolerance.

sct_usbtmcprot.c, usbtmc.h NEW
First attempt at a protocol handler for USB Test and Measurement Class devices

sct_julabo_lh45.tcl NEW
Implements script-context controller for the Julabo LH45 temperature controller.

Makefile
Added ansto_sctdriveadapter and sctemonadapter

hardsup/makefile
Added velocity selector and usbtmc protocol handlers

hardsup/sct_velselprot.c
Simplified, don't worry about trying to implement a login handler for now, just implement a "Reading" handler.

site_ansto.c
Add the velocity selector and USBTMC protocol handlers.
Added the ANSTO_MakeHM command

instrument/config/hipadaba/common_instrument_dictionary.tcl
Added support for auxiliary data, ie extra meta-data entries in the "data" group of the nexus file.
Add new NXvelocity_selector object under /instrument.

instrument/config/hipadaba/hipadaba_configuration_common.tcl
Add the new "sct_object" script-context controller objects to the hdb tree.

instrument/config/hipadaba/instdict_specification.tcl
Define the new sct_object controllers.

instrument/config/hmm/hmm_configuration_common_1.tcl
Use the new ANSTO_MakeHM command to create histmem drivers which support veto.
Define allowed attributes and elements for the BAT_TABLE and FAT_TABLE
Stop between counts instead of pausing because setting pause now sends a veto.

instrument/config/motors/sct_jogmotor_common.tcl
You now need to specify klass when creating a jogmotor.

instrument/config/motors/sct_positmotor_common.tcl
You can now specify an optional function which calculates the instrument parameter (eg attenuation) from a posit table entry when defining a posit motor.

instrument/config/nexus/nxscripts_common_1.tcl
Report file status info in the /experiment section of the hdb tree.  Add auxiliary data to data file.
Handle saving data from script-context controller objects.

instrument/util/script_context_util.tcl
Added procedure to set required properties  for saving script-context object data.

instrument/util/utility.tcl
Added set_sct_object_attributes proc to automatically set required attributes on SCT_OBJECTs
Fixed hlistplainprop to deal with empty property fields on hdb nodes.

instrument/server_config.tcl
Call the new nexus initialisation command and set attributes on sct objects.

hrpd/config/motors/motor_configuration.tcl
New absenc home readings for mchi and mphi. New absenc home and range for mf1

hipd/config/commands/commands.tcl
Exported and published the new ajscmds so that they can be used in batch files.

hipd/config/motors/motor_configuration.tcl
New mchi absenc home

rsd/config/hmm/hmm_configuration.tcl
Provide support for saving corrected hmm data

rsd/config/motors/motor_configuration.tcl
Use simple names for motors.

SICS-329

sans/config/INSTCFCOMMON.TXT
Added julabo and lakeshore configuration files to list.

sans/config/optics/guide_configuration.tcl
Added entrance aperture positions to the configuration table and the cn_maps which map the index to the component ID.

sans/commands/commands.tcl
The "guide" command now set EApPosYmm after driving the guides in place.
The indexed position to component maps (cn_map) have been moved to the guide_configuration.tcl file.

sans/motors/motor_configuration.tcl
Set samy home to 56.1mm

sans/config/velsel/sct_velsel.tc NEW
Implements script-context controller object for the NVS40 velocity selector. TODO tilt-angle control, driveable interface.

sans/config/hmm/hmm_configuration.tcl
Set 5.08mm spacing on detector width. Use pixel-offset for vertical and horizontal detector axes.

sans/config/motors/motor_configuration.tcl
Swap directions of beamstops 4 and 5 (the two smallest)
New config parameters for samx, samthet, apx, det, detoff, bsz,

sans/config/motors/positmotor_configuration.tcl
Added descriptive headers to positmotor configuration tables and new synstax for the make positmotor command.

sans/config/nexus/nxscripts.tcl
Implemented initialisation command.

sans/config/parameters/parameters.tcl
Added SampleThickness and TransmissionFlag.  Calculate SamplePosYmm from samy and SamyOffsetmm.
Added beamstops to hdb tree.

reflectometer/config/nexus/nxscripts.tcl
Implement the initialisation procedure.

r2767 | ffr | 2009-03-31 10:16:54 +1100 (Tue, 31 Mar 2009) | 123 lines
2012-11-15 16:57:04 +11:00
Douglas Clowes
6e49b1e6c1 dereference pointer
r2421 | dcl | 2008-04-14 09:20:48 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:34:36 +11:00
Douglas Clowes
e57006789b Make debug logging dependent on counter debug parameter
r1558 | dcl | 2007-02-26 17:40:49 +1100 (Mon, 26 Feb 2007) | 2 lines
2012-11-15 13:02:18 +11:00
Douglas Clowes
6a070fd774 remove some compiler warnings
r1509 | dcl | 2007-02-19 12:30:28 +1100 (Mon, 19 Feb 2007) | 2 lines
2012-11-15 13:00:02 +11:00
Douglas Clowes
f84960d4a5 Add TCP socket disconnection discovery and reconnection attempt.
r1317 | dcl | 2006-11-23 13:38:21 +1100 (Thu, 23 Nov 2006) | 2 lines
2012-11-15 12:54:02 +11:00
Douglas Clowes
2590869f4d handle changed format of event report
r1289 | dcl | 2006-11-15 08:08:28 +1100 (Wed, 15 Nov 2006) | 2 lines
2012-11-15 12:52:57 +11:00
Ferdi Franceschini
0d3e2fb735 Set replyterminator to crlf
r1124 | ffr | 2006-10-09 12:51:26 +1000 (Mon, 09 Oct 2006) | 2 lines
2012-11-15 12:47:33 +11:00
Ferdi Franceschini
a78ca021e6 Explicitly handle the unknown error case in MonTryAndFixit
r1075 | ffr | 2006-08-25 12:16:23 +1000 (Fri, 25 Aug 2006) | 2 lines
2012-11-15 12:46:08 +11:00
Douglas Clowes
b2ce43d554 Largely comments and splint conformance
r1070 | dcl | 2006-08-21 09:47:25 +1000 (Mon, 21 Aug 2006) | 2 lines
2012-11-15 12:46:06 +11:00
Douglas Clowes
b61c088873 Update monitor response handling
r1056 | dcl | 2006-08-10 16:44:01 +1000 (Thu, 10 Aug 2006) | 2 lines
2012-11-15 12:45:59 +11:00
Ferdi Franceschini
fe3af60196 Handle incomplete reads.
r1055 | ffr | 2006-08-10 12:45:17 +1000 (Thu, 10 Aug 2006) | 2 lines
2012-11-15 12:45:56 +11:00
Ferdi Franceschini
d316f5950c Handle communications faults.
r1054 | ffr | 2006-08-10 12:00:11 +1000 (Thu, 10 Aug 2006) | 2 lines
2012-11-15 12:45:54 +11:00
Douglas Clowes
2c0465c43a *** empty log message ***
r1052 | dcl | 2006-08-09 15:50:37 +1000 (Wed, 09 Aug 2006) | 2 lines
2012-11-15 12:45:49 +11:00
Douglas Clowes
4a7ba8a69b adjusting interaction with monitor - wip
r1050 | dcl | 2006-08-09 15:29:20 +1000 (Wed, 09 Aug 2006) | 2 lines
2012-11-15 12:45:45 +11:00
Douglas Clowes
bcc2cbaf57 sort of working
r1049 | dcl | 2006-08-09 12:03:55 +1000 (Wed, 09 Aug 2006) | 2 lines
2012-11-15 12:45:43 +11:00
Douglas Clowes
e516da7691 Handle input and status
r1048 | dcl | 2006-08-08 13:41:57 +1000 (Tue, 08 Aug 2006) | 2 lines
2012-11-15 12:45:40 +11:00
Ferdi Franceschini
3615c8d60b Return status so SICs doesn't segfault.
r1047 | ffr | 2006-08-08 13:25:35 +1000 (Tue, 08 Aug 2006) | 2 lines
2012-11-15 12:45:38 +11:00
Ferdi Franceschini
c588e389aa Initialised get set and number of monitors in drivable interface.
r1042 | ffr | 2006-08-04 12:17:54 +1000 (Fri, 04 Aug 2006) | 2 lines
2012-11-15 12:45:34 +11:00
Douglas Clowes
4aa50787c2 Minor changes to casting self, implementation of Fix
r1038 | dcl | 2006-08-02 16:19:22 +1000 (Wed, 02 Aug 2006) | 2 lines
2012-11-15 12:45:24 +11:00
Ferdi Franceschini
3da52afb10 Added create drive command to site ansto
r1037 | ffr | 2006-08-01 17:03:00 +1000 (Tue, 01 Aug 2006) | 2 lines
2012-11-15 12:45:22 +11:00
Ferdi Franceschini
7d8657e41e Added MonConnect function and some documentation.
r1034 | ffr | 2006-08-01 13:08:23 +1000 (Tue, 01 Aug 2006) | 2 lines
2012-11-15 12:45:15 +11:00
Ferdi Franceschini
a7ebdff308 Created anstoutil to share the getParam function.
Modified motor_dmc2280 and counterdiv to use anstoutil

r1033 | ffr | 2006-07-25 16:48:14 +1000 (Tue, 25 Jul 2006) | 3 lines
2012-11-15 12:45:13 +11:00
Ferdi Franceschini
36f76e9486 Counter driver for beam monitor.
r1032 | ffr | 2006-07-25 09:56:47 +1000 (Tue, 25 Jul 2006) | 2 lines
2012-11-15 12:45:11 +11:00