Commit Graph

17 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
Ferdi Franceschini
04d0a2ab9a Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS.
r2239 | ffr | 2007-11-07 15:44:44 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:33 +11:00
Ferdi Franceschini
0b53e28ef0 We're now saving two theta, not polar angle.
r2230 | ffr | 2007-11-05 14:23:46 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:29:00 +11:00
Ferdi Franceschini
55347984ec Checked files modified by the merge with:
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD

r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
2012-11-15 13:16:23 +11:00
Ferdi Franceschini
e7324b8335 Merged RELEASE-1_1 back into trunk.
r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines
2012-11-15 13:13:55 +11:00
Ferdi Franceschini
467943d64c Set motor position datasets to rank 1.
r1761 | ffr | 2007-04-01 10:03:26 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:23 +11:00
Ferdi Franceschini
69d58fbaca Reduce entries for each "real" motor to just three types by nexus group.
TODO: Configurable virtual motors.

r1686 | ffr | 2007-03-20 12:03:35 +1100 (Tue, 20 Mar 2007) | 3 lines
2012-11-15 13:08:31 +11:00
Ferdi Franceschini
0640a1edaf The wombat specific addnxentry has been made obsolete with the addition of hmm_* variables set by the hmm_setup function.
r1683 | ffr | 2007-03-20 11:54:44 +1100 (Tue, 20 Mar 2007) | 2 lines
2012-11-15 13:08:21 +11:00
Ferdi Franceschini
d59a3fd642 Specialized addnxscanentry for wombat
r1636 | ffr | 2007-03-13 09:00:50 +1100 (Tue, 13 Mar 2007) | 2 lines
2012-11-15 13:06:10 +11:00
Ferdi Franceschini
df9b9e2ff1 Nexus file configuration is now modular.
r1604 | ffr | 2007-03-05 21:04:40 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:36 +11:00
Ferdi Franceschini
774b92f94b nexus dic files are now being constructed per use case.
r1600 | ffr | 2007-03-05 20:57:36 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:23 +11:00
Ferdi Franceschini
6acd4f19fd Modified to use common configuration
r1589 | ffr | 2007-03-05 16:43:33 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:03:49 +11:00
Ferdi Franceschini
8d176f702b Added user group, detector angular coverage, vertical axis and polar angle (currently filled with zeros because I recently broke it)
r1582 | ffr | 2007-03-03 09:24:57 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:03:28 +11:00
Ferdi Franceschini
75711dde2a Create 2D polar angle grid.
r1555 | ffr | 2007-02-26 13:17:13 +1100 (Mon, 26 Feb 2007) | 2 lines
2012-11-15 13:02:09 +11:00
Ferdi Franceschini
5f3eeed030 Made structural mods suggested by MK and now creates 2D polar_angle array.
r1550 | ffr | 2007-02-23 09:19:27 +1100 (Fri, 23 Feb 2007) | 2 lines
2012-11-15 13:01:55 +11:00
Ferdi Franceschini
3ea7556258 Use generic name for nexus dictionary.
r1531 | ffr | 2007-02-20 16:12:59 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:01:03 +11:00
Ferdi Franceschini
14a244d014 Use new dir structure.
r1515 | ffr | 2007-02-20 08:03:21 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:00:19 +11:00