Commit Graph

43 Commits

Author SHA1 Message Date
Ferdi Franceschini
d416695b4b Merged in-situ changes from Echidna
r3252 | ffr | 2011-09-23 14:21:09 +1000 (Fri, 23 Sep 2011) | 2 lines
2012-11-15 17:16:17 +11:00
Ferdi Franceschini
08898a04f4 Get resolver changes for monochromator motors.
r3073 | ffr | 2011-02-25 19:25:31 +1100 (Fri, 25 Feb 2011) | 1 line
2012-11-15 17:08:54 +11:00
Ferdi Franceschini
d274698ff4 echidna_configuration.tcl
Load sct_lakeshore 340 and 336 configurations.  Load new robot pick and place configuration

hmm_configuration.tcl
Override proc CAT_TABLE to add offset and magnification configuration.

motor_configuration.tcl
Modularised for tilt and euler configurations.

Added euler_configuration.tcl and put tilt stage configuration in tilt_configuration.tcl
r3030 | ffr | 2010-12-01 10:29:42 +1100 (Wed, 01 Dec 2010) | 10 lines
2012-11-15 17:06:37 +11:00
Ferdi Franceschini
e6e3c3be52 Merged in-situ modifications for Release 2.5 candidate 5
r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
2012-11-15 17:00:43 +11:00
Ferdi Franceschini
fd6a955d6b Remove keywords to simplify merging branches.
r2859 | ffr | 2010-01-13 15:41:46 +1100 (Wed, 13 Jan 2010) | 2 lines
2012-11-15 16:59:06 +11:00
Ferdi Franceschini
b6ed01fc13 Merge changes made in-situ.
r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines
2012-11-15 16:58:14 +11:00
Ferdi Franceschini
2ec6505ef8 Merged 2.4 branch
r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
2012-11-15 16:57:26 +11:00
Ferdi Franceschini
8e5b7842e3 Merged changes made in-situ
r2768 | ffr | 2009-03-31 17:25:20 +1100 (Tue, 31 Mar 2009) | 2 lines
2012-11-15 16:57:09 +11:00
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
e36e9f1146 conman.c
Reduce log noise by setting iout = eInternal for macros.

servlog.c
Fixed timestamp in logfiles to get hours.

hmm_configuration_common_1.tcl
Added ML's mods to wombat config: ie BAT and FAT TABLE attributes and elements for multi-period acquisition and histo-streaming.
Fixed "failed lsearch" bug. It's more robust to test for a non-successful lsearch instead of a failed lsearch.

nxscripts_common_1.tcl
SICS-297 Fixed Saving data series in a scratch file overwrites earlier entries.

instdict_specification.tcl
Added "scobj" kind and "sct_indexed_motor" sics object type for script context controllers and and objects.

hipadaba_configuration_common.tcl
Added sct_indexed_motor sics obj type to ::hdb::sobjadd and scobj kind to ::hdb::add_node

sct_positmotor_common.tcl
Update the index SICS variable when updating the current index value to make sure that the position is saved in the data file.
You must now provide the hdb node_name when creating the sct posit motor.
mk_sct_positmotor now sets the "param" and "long_name" attributes on the posit motor object

util/utility.tcl
Added ::utility::set_sct_indexed_motor_attributes to set SICS object attributes required for generating hdb info for an SCT_POSIT_MOTOR

nxscript.c
Merge the ansto mod to putslab (rev1.7) which adds support for saving unbuffered data from the histmem.

sicshipadaba.c
This incorporates the patch made to CommandSetCallback in rev1.10 so it can just be copied as is (ie no merge required).
WARNING: There are changes to ListHdbNode to handle record separators which may affect us.
Disabled sending hdb command start and stop messages because they break gumtree

sicshdbfactory.c
Disabled sending hdb command start and stop messages because they break gumtree

hipadaba_configuration_common.tcl R2.4DEV
The sct_posit_motor case of ::hdb::sobjadd is only needed to call add_node with kind=scobj.

nxscripts_common_1.tcl R2.4DEV
Added ::nexus::scobj::sdsinfo
_gen_nxdict now skips nodes with data_type == "none"

new util/script_context_util.tcl R2.4DEV
Adds ::scobj::hinitprops command to initialise the hdb properties for script context object nodes.

sct_positmotor_common.tcl R2.4DEV
Use ::scobj::hinitprops utility command to initialise hdb properties on script context object parameter nodes.

dynstring.c
DynStringReplace should memcopy '\0', otherwise it can get the wrong length for iTextLen.
Added DynStringReplaceWithLen to allow initialising a dynstring with char arrays which contain null chars and
other non-ascii chars.  Useful for read and write buffers in script context.

ascon.c
AsconRead return NULL for noResponse and AsconFailed otherwise the "result" node gets set with a spurious empty value.

scriptcontext.c
SctActionHandler only set  the "result" node if there really is a reply.

sicsobj.c
Update from M.K.

site_ansto.c
Added galil and ordela hvps protocol handlers for scriptcontext.

motor_dmc2280.c
Allow home parameter to be outside of limits (for KOWARI)

hardsup/makefile
Added ordela HVPS protocol handler

hardsup/sct_orhvpsprot.c
New ordela HVPS protocol handler.  Retries on NAKs and re-orders pot channels (ie toggles lower two bits).

hardsup/sct_velselprot.c
Start velocity selector protocol handler.

hardsup/sct_galilprot.c
Completed galil protocol handler.

hipadaba_configuration_common.tcl
Add new style SICS objects to hdb tree.

instdict_specification.tcl
Added scobj to kind list and sct_motor to sics object list. (and some housekeeping)

hmm_configuration_common_1.tcl
Added ratemaps to simulation.  Fixe BAT_TABLE and added PERIOD_INDICES as per Mark Lesha's mods for multi-period acquisition.
ratemaps now return float.

sct_postimotor_common.tcl
Now setting properties on the posit motor object so that it can be automatically added to the hdb tree.

hrpd/config/motors/motor_configuration.tcl
Fixed simulated msd motor so that it's handle properly in the hdb layer.

sans/config/hmm/detector_ordela.tcl
Updated the ordela calibration script to use the new sct_orhvpsprop.c script context controller.

quokka_configuration.tcl
Deleted lines which set the hdb properties for script context posit motors.  This is now handled automatically as for other SICS objects.

utility.tcl
setpos now replaces the motor setpos subcommand.
Added functions to set script context object attributes and sct_posit motor attributes.
Created hparPath and hsibPath convenience commands for new-style SICS objects.

script_context_util.tcl
NEW! Adds hinitprops function to initialise the hdb properties for a script context object

r2758 | ffr | 2008-12-12 17:53:53 +1100 (Fri, 12 Dec 2008) | 113 lines
2012-11-15 16:56:43 +11:00
Ferdi Franceschini
81f98bd337 commands_common.tcl
Added histmem and runscan command

hmm_configuration_common_1.tcl
Set histmem_cmd  status feedback to IDLE on COUNTEND event

nxscripts_common_1.tcl
When saving a set of files the time-stamp is offset from the time the first file is created.

scan_common_1.tcl
The hmscan hook functions now set feedback on the runscan_cmd

sct_positmotor_common.tcl
Added mk_sct_positmotor command to create a script context controller which runs a motor to an indexed position.

Added positmotor_configuration.tcl to echidna, wombat, kowari, quokka, platypus.

sans/config/motors/positmotor_configuration.tcl
Has an example of a positmotor configuration for the sample changer

sanx/quokka_configuration.tcl
Setup feedback nodes for AttRotDeg and RotApDeg.

motor_utility.tcl
Added reldrive and relrun commands along with getmotpar convenience command.

r2725 | ffr | 2008-10-27 15:55:48 +1100 (Mon, 27 Oct 2008) | 26 lines
2012-11-15 16:55:51 +11:00
Ferdi Franceschini
7ded983eba More common initialisation code has been moved from the instrument configuration files to server_config.tcl:server_init
server_init now handles restoring status before calling initialisation commands as well as loading extraconfig, building the HDB and catching errors.
Added dummy_motors in the motor_configuration.tcl files for automated tests.

sicshipadaba.c
Fix broken "hset /path start" by set connection object in command callback.

r2724 | ffr | 2008-10-20 11:08:31 +1100 (Mon, 20 Oct 2008) | 7 lines
2012-11-15 16:55:47 +11:00
Ferdi Franceschini
e1cea8763e common_instrument_dictionary.tcl
instrument/slits is now an NXaperture and collects all 'slits' objects.

instdict_specification.tcl
Added 'slits' to sobj_klass_list

motor_configuration.tcl files
Reverted 18/09/08

r2701 | ffr | 2008-09-24 08:44:01 +1000 (Wed, 24 Sep 2008) | 9 lines
2012-11-15 13:42:48 +11:00
Ferdi Franceschini
ab218f64b6 source_common.tcl
SICS-280 Check RCMS data-type and return -1 if it's invalid

motor_configuration.tcl files
Make sure that long_name matches data name for slit motors in data file.

hmm_configuration_common_1.tcl
SICS-268 Don't set VIEW_MAG_X/Y on histmem

r2699 | ffr | 2008-09-22 15:58:31 +1000 (Mon, 22 Sep 2008) | 9 lines
2012-11-15 13:42:39 +11:00
Ferdi Franceschini
d7cea6914c oscillate.c SICS-232
You can now run the oscillating collimator for a specified number of cycles.
A MOTEND event is now sent when the oscillator stops.
Also temporarily set status to eEager to allow changing the motor accesscode parameter while something else is running, (eg a counter)

motor.c
finishDriving is no longer static so we can call it from the oscilator and generate a MOTEND event.

west4100.c
Return 'success' from wrapper on "controlsensor" and "sensorlist" queries so we can test and capture their values in scripts.

Makefile
Compile the quokka beamstopaction object

site_ansto.c
Add the MakeActionObject command.  Currently only makes the hardcoded beamstopaction object

obpar.c
Report object name and parameter on an illegal attempt to set a parameter

hmm_configuration_common_1.tcl
Add oscillating collimator control flag for Wombat.  If true we use hmm to start the histogram server instead of hmc.  TODO remove hmc and always use hmm.

hipd/config/motors/motor_configuration.tcl
Don't load anticollider config twice.  Fix oct limits

wombat_configuration.tcl
Environment configuration must be loaded before running server_init.

hrpd/config/hmm/hmm_configuration.tcl
Fix default time-bin to match 10Hz frame frequency

hrpd/config/motors/motor_configuration.tcl
Added dummy motor for testing.

reflectometer/config/hmm/detector.tcl
Fill in dhv1 configuration parameters.

sans/config/hmm/detector.tcl
Enable detector voltage control

sans/config/hmm/hmm_configuration.tcl
SICS-227 set default resolution to 192x192

sans/config/motors/motor_configuration.tcl
Added dummy motor for testing

quokka parameters.tcl
Fix L2mm calculation, Fix SICS-228 users cannot set rotapdeg

beamstopaction.[ch]
NEW: Implements an action command to drive the quokka beamstops up and down.

r2670 | ffr | 2008-08-07 13:17:29 +1000 (Thu, 07 Aug 2008) | 53 lines
2012-11-15 13:40:44 +11:00
Douglas Clowes
17e0c0b5bc get msd into gumtree
r2612 | dcl | 2008-06-05 16:24:32 +1000 (Thu, 05 Jun 2008) | 2 lines
2012-11-15 13:38:54 +11:00
Douglas Clowes
c61c709b11 add msd klass unitsa and long_name
r2611 | dcl | 2008-06-05 15:32:42 +1000 (Thu, 05 Jun 2008) | 2 lines
2012-11-15 13:38:50 +11:00
Douglas Clowes
419a746c77 Update sample stage limits and speeds
r2607 | dcl | 2008-06-04 16:08:08 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:41 +11:00
Douglas Clowes
62de717b11 adjust limits and add Mono-Samp Distance (msd) simulated motor
r2606 | dcl | 2008-06-04 15:21:36 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:37 +11:00
Ferdi Franceschini
0749b0effa Merging release 2.0 branch with CVS trunk
r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
2012-11-15 13:38:17 +11:00
Douglas Clowes
a9746d1190 Monochromator focussing
r2594 | dcl | 2008-05-29 14:54:06 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:48 +11:00
Douglas Clowes
b8711e9bc4 Motor Off Delay is in milliSeconds
r2483 | dcl | 2008-04-24 12:09:25 +1000 (Thu, 24 Apr 2008) | 2 lines
2012-11-15 13:35:54 +11:00
Douglas Clowes
4562daf398 Implement changes made on instrument during commissioning
r2451 | dcl | 2008-04-14 13:51:07 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:35:27 +11:00
Douglas Clowes
317c7398ca Move functions to motor_utility
r2199 | dcl | 2007-10-29 13:59:58 +1100 (Mon, 29 Oct 2007) | 2 lines
2012-11-15 13:27:04 +11:00
Ferdi Franceschini
950037bfc3 Don't MakeAsyncQueue when using simulated driver.
Add metedata to slit gap and offset motors for new hdb and nexus code.

r2123 | ffr | 2007-08-16 16:37:45 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:22:29 +11:00
Douglas Clowes
d0ac56e112 reduce mx and my hard and soft limits to be within limit switches
r2101 | dcl | 2007-07-26 12:22:57 +1000 (Thu, 26 Jul 2007) | 2 lines
2012-11-15 13:21:10 +11:00
Douglas Clowes
f374e445bf multichan becomes AsyncQueue and AsyncProtocol
r1965 | dcl | 2007-05-15 13:15:34 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:25 +11:00
Ferdi Franceschini
a151a2a163 Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280.
r1952 | ffr | 2007-05-10 13:24:28 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:40 +11:00
Ferdi Franceschini
ade5216ea9 Merged Release 1.2
r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:32 +11:00
Ferdi Franceschini
55f45afcc4 Fixes to RELEASE-1_1
Tubes weren't paired when folding
Fix sign for cartesian coordinates on slits.

r1838 | ffr | 2007-04-06 19:32:57 +1000 (Fri, 06 Apr 2007) | 4 lines
2012-11-15 13:13:59 +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
Douglas Clowes
636fb54aa7 Make the slits cartesian and do a little cleaning up
r1781 | dcl | 2007-04-02 15:00:20 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:29 +11:00
Ferdi Franceschini
6d673e01dc Added missing long_name mphi.
r1767 | ffr | 2007-04-01 12:24:16 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:42 +11:00
Ferdi Franceschini
4712347649 Both hipd and hrpd motors have now been configured with part identifiers and and long names, and the hpaths now use the long_name fields.
r1766 | ffr | 2007-04-01 11:58:58 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:39 +11:00
Ferdi Franceschini
51079b5e9d Set part names for real motors.
r1757 | ffr | 2007-03-31 13:34:29 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:12:09 +11:00
Douglas Clowes
5960ce1d00 Modify to use multichannel controller for motor connections
r1722 | dcl | 2007-03-26 08:09:46 +1000 (Mon, 26 Mar 2007) | 2 lines
2012-11-15 13:10:14 +11:00
Douglas Clowes
108d20b2f1 Change mtth softupperlim from 137 to 140
r1692 | dcl | 2007-03-21 13:22:22 +1100 (Wed, 21 Mar 2007) | 2 lines
2012-11-15 13:08:50 +11:00
Douglas Clowes
072d0fc1c6 Change mtth hardupperlim from 137 to 140
r1689 | dcl | 2007-03-20 14:13:17 +1100 (Tue, 20 Mar 2007) | 2 lines
2012-11-15 13:08:41 +11:00
Douglas Clowes
9f49b838cc Increase pcx upper limit after modifying limit switch
r1641 | dcl | 2007-03-13 12:29:22 +1100 (Tue, 13 Mar 2007) | 2 lines
2012-11-15 13:06:19 +11:00
Douglas Clowes
25f914431d Change reference zero for stth
r1606 | dcl | 2007-03-06 08:46:51 +1100 (Tue, 06 Mar 2007) | 2 lines
2012-11-15 13:04:42 +11:00
Douglas Clowes
2a806a7abf Add airpads, settling and motoffdelay for mtth
r1548 | dcl | 2007-02-23 08:18:25 +1100 (Fri, 23 Feb 2007) | 2 lines
2012-11-15 13:01:49 +11:00
Douglas Clowes
9e0346f718 Update primary collimator and monochromator config
r1545 | dcl | 2007-02-22 18:05:57 +1100 (Thu, 22 Feb 2007) | 2 lines
2012-11-15 13:01:40 +11:00
Ferdi Franceschini
d5cde7c4f6 Modifications for new util, config directory structure.
r1498 | ffr | 2007-02-16 16:43:59 +1100 (Fri, 16 Feb 2007) | 2 lines
2012-11-15 12:59:31 +11:00