Commit Graph

47 Commits

Author SHA1 Message Date
Ferdi Franceschini
ff2657c5e3 Update parameters to match parameters on instrument.
r3629 | ffr | 2012-07-09 09:53:00 +1000 (Mon, 09 Jul 2012) | 2 lines
2012-11-15 17:32:16 +11:00
Ferdi Franceschini
fd703373d8 New home position readings for Huber cradle.
r3628 | ffr | 2012-07-09 09:51:37 +1000 (Mon, 09 Jul 2012) | 2 lines
2012-11-15 17:32:11 +11:00
Ferdi Franceschini
a06ed5c6e9 Modified eulerian configuration to allow selection of either the Huber
or tiny black cradle.

r3342 | ffr | 2012-01-16 12:04:45 +1100 (Mon, 16 Jan 2012) | 3 lines
2012-11-15 17:22:55 +11:00
Ferdi Franceschini
3ca3bdf30a Get updated motor encoder readings.
r3074 | ffr | 2011-02-25 19:29:16 +1100 (Fri, 25 Feb 2011) | 1 line
2012-11-15 17:08:59 +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
d9da95a5df sct_protek608.c
Implements a protocol handler for the protek  608 multimeters which just allows us to read the display.
It reports all elements of the display including the bar graph, it does not provide remote control of the multimeter.  The protocol handler broadcasts a warning to all clients if the auto-off function is enabled.

sct_rfamp.c
This is a protocol handler for the Mirrortron 35V 7A AC Generator (ANSFR-83B).

sinqhttpprot.c
Copied the PSI script context http protocol handler.

sct_orhvpsprot.c
Ordela high voltage power supply protocol handler now catches unknown commands.

sct_eurotherm_2000.tcl
Eurotherm controller for the kowari load frame by Douglas Clowes.

sct_lakeshore_3xx.tcl
Latest update from Arndt.  The two control loops are now independent, settletime and tolerance now work properly.

common_instrument_dictionary.tcl
Make instrument/status saveable.

sct_orhvps_common.tcl
Provides voltage ramping and implements the dhv1 command for the Ordela HVPS via the sct_orhpsprot.c protocol handler.

hmm_configuration_common_1.tcl
Adds new "histmem clockscale" subcommand to get and set the clock scale from the fat_clock_scale FAT parameter.
You can now upload the FAT FRAME_BUFFER and FRAME_DUTYCYCLE parameters to the histogram memory.
The veto commands are now "histmem veto on" and "histmem veto off".

hmm_object.tcl
The axis order for the histmem object has been restore to t,y,x

sct_positmotor_common.tcl
Code has been simplified.

nxscripts_common_1.tcl
Removed obsolete ::nexus::data function.  TOF axis now correctly report time_of_flight instead of "time".

plc_common_1.tcl
Make PLC info saveable.

scan_common_1.tcl
SICS-385 The scan command should check the final scan variable value against he soft upper and lower limits, not against the hard limits.
Make sure that the scan variable axis is saved.

platypus, kowari, quokka hmm_configuration.tcl
Use the HOR and VER entries in the new histmem_axes hash to select the horizontal and vertical axes for the histmem.

kowari motor_configuration.tcl secondary_slit_configuration.tcl
Flatten slits motor structure to match old layout in data files.

quokka commands.tcl
SICS-380 EApPosYmm -> EApPosY

quokka detector.tcl
Use new script context controller for Ordela HVPS

quokka hmm_configuration.tcl
Set detector height to 5.08*192 the same as the width

quokka motor_configuration.tcl
Code cleanup

quokka positmotor_configuration.tcl
Use new positmotor code.

quokka aperture_configuration.tcl
Added attenuation factor column to AttRotLookupTable

quokka parameters.tcl
SICS-380 Refactor nexus, remove redundant parameters.

site_ansto.c
Added the following protocols, Httpl, Protek608, aand RFAmp.

scriptcontext.c
SICS-386 SctActionHandler: set "send" string to NULL when a chain of scripts completes with state=idle.
It turns out that if none of the scripts in the "read chain" call [sct send] each time the chain is executed, then SICS will hammer the device with calls to AsconWrite(). This can be avoided if SctActionHandler sets the 'send' string to NULL before "goto finish" in the idle state. This will be safer and still let you have chains with multiple [sct send] and read scripts.

asyncprotocol.c
Fix platypus memory leak.

devser.c
SICS-387 Started adding code to pass signals on to script context drivers.

ascon.c
AsconTask(): Make sure we return to the AsconIdle state when sending a command which expect no response, also only reconnect if there is a Timeout when there has been an error.

r2888 | ffr | 2010-04-19 14:04:41 +1000 (Mon, 19 Apr 2010) | 90 lines
2012-11-15 17:00:29 +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
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
c791fc65c7 Don't remove MakeAsyncQueue and MakeAsyncProtocol commands in ofac.c, we need them for the kowari/sylvac.tcl and for the robot.
Save positmotor indexed positions for Quokka

r2730 | ffr | 2008-11-03 18:20:34 +1100 (Mon, 03 Nov 2008) | 4 lines
2012-11-15 16:56:13 +11:00
Ferdi Franceschini
2734e05a73 Fixed stth and mf1 home and mf1 lowelim typos
r2729 | ffr | 2008-10-31 16:40:32 +1100 (Fri, 31 Oct 2008) | 2 lines
2012-11-15 16:56:09 +11:00
Ferdi Franceschini
ae09c27329 Incorporated changes made in-situ
r2728 | ffr | 2008-10-31 16:02:33 +1100 (Fri, 31 Oct 2008) | 2 lines
2012-11-15 16:56:05 +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
0adecdcec9 PSI UPDATE
r2720 | ffr | 2008-10-13 15:40:07 +1100 (Mon, 13 Oct 2008) | 2 lines
2012-11-15 16:53:52 +11:00
Ferdi Franceschini
e1978867e9 Set home for sx, sy, som, ephi, echi
Set motOffDelay for mtth
Enable sz and disable debug
Incorporated config parameter changes for sz,sy,som, stth, psho, psp, psw, ssho, ssp, ssw
Incorporated eulerian config: TODO Use a flag to select the eulerian config.

r2707 | ffr | 2008-09-25 09:42:08 +1000 (Thu, 25 Sep 2008) | 6 lines
2012-11-15 13:43:12 +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
cc640e2fb0 lakeshore340_common.tcl
Now supports creation of multiple lakeshore controller objects.

hmm_configuration_common_1.tcl
SICS-275 histmem command now rejects invalid frame source arguments

hipd/config/environment/temperature/lakeshore340.tcl
Now supports creation of multiple lakeshore controller objects.

wombat_configuration.tcl
Added example which creates two lakeshore controllers.

rsd/config/motors/motor_configuration.tcl
SICS-276 Disable debug mode on sz motor.

r2694 | ffr | 2008-09-18 12:20:09 +1000 (Thu, 18 Sep 2008) | 15 lines
2012-11-15 13:42:19 +11:00
Ferdi Franceschini
8fb864ee37 Incorporate changes from deployed motor configurations.
r2663 | ffr | 2008-07-18 12:39:35 +1000 (Fri, 18 Jul 2008) | 2 lines
2012-11-15 13:40:32 +11:00
Douglas Clowes
03853605c9 Redo stth and sz
r2610 | dcl | 2008-06-04 17:00:46 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:46 +11:00
Douglas Clowes
588a44305a Change sz to temporary replacement
r2605 | dcl | 2008-06-02 14:41:14 +1000 (Mon, 02 Jun 2008) | 2 lines
2012-11-15 13:38:33 +11:00
Douglas Clowes
6af0b58582 Change cntsPerX
r2604 | dcl | 2008-06-02 11:59:50 +1000 (Mon, 02 Jun 2008) | 2 lines
2012-11-15 13:38:30 +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
be033cddcd stth and monochromator focussing
r2597 | dcl | 2008-05-29 14:55:49 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:59 +11:00
Douglas Clowes
fba2b55fb9 Adjust sx,sy homes
r2522 | dcl | 2008-05-12 11:06:54 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:37:01 +11:00
Douglas Clowes
03394dcc9e tweak sz configuration
r2431 | dcl | 2008-04-14 09:51:48 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:35:15 +11:00
Douglas Clowes
4f92b60077 Incremental commissioning and calibration
r2302 | dcl | 2008-01-31 10:32:41 +1100 (Thu, 31 Jan 2008) | 2 lines
2012-11-15 13:32:53 +11:00
Douglas Clowes
2c334ba3c2 commissioning refinement
r2278 | dcl | 2008-01-15 12:36:08 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:32:00 +11:00
Douglas Clowes
32595554bc Incremental commissioning and calibration
r2261 | dcl | 2007-12-07 10:22:38 +1100 (Fri, 07 Dec 2007) | 2 lines
2012-11-15 13:30:56 +11:00
Douglas Clowes
83ac14eeac commissioning refinement
r2254 | dcl | 2007-11-09 10:38:23 +1100 (Fri, 09 Nov 2007) | 2 lines
2012-11-15 13:30:30 +11:00
Douglas Clowes
5eb6f4330b commissioning refinement
r2252 | dcl | 2007-11-09 09:47:47 +1100 (Fri, 09 Nov 2007) | 2 lines
2012-11-15 13:30:22 +11:00
Douglas Clowes
0cf9f1d35f commissioning refinement
r2247 | dcl | 2007-11-08 09:46:46 +1100 (Thu, 08 Nov 2007) | 2 lines
2012-11-15 13:30:04 +11:00
Douglas Clowes
f4f1c5f152 commissioning refinement
r2231 | dcl | 2007-11-06 08:47:17 +1100 (Tue, 06 Nov 2007) | 2 lines
2012-11-15 13:29:03 +11:00
Douglas Clowes
50ac8c30e7 commissioning iteration
r2181 | dcl | 2007-10-11 17:57:58 +1000 (Thu, 11 Oct 2007) | 2 lines
2012-11-15 13:25:58 +11:00
Ferdi Franceschini
2b2ec38ceb Don't MakeAsyncQueue when using simulated driver.
r2124 | ffr | 2007-08-16 16:40:00 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:22:32 +11:00
Ferdi Franceschini
2494fa6ad3 Updated kowari for new hdb and nexus code.
r2100 | ffr | 2007-07-22 15:58:52 +1000 (Sun, 22 Jul 2007) | 2 lines
2012-11-15 13:21:07 +11:00
Ferdi Franceschini
7d9d72a79d Updated the mtth encoder value to match what Vladimir tells me is 90 degrees.
mx is now positive towards dance floor.

r2046 | ffr | 2007-07-05 11:56:58 +1000 (Thu, 05 Jul 2007) | 3 lines
2012-11-15 13:20:16 +11:00
Douglas Clowes
a63bf65270 Set mtth home encoder position at 90 degrees
r2037 | dcl | 2007-07-05 10:32:19 +1000 (Thu, 05 Jul 2007) | 2 lines
2012-11-15 13:20:13 +11:00
Douglas Clowes
3aa3c41114 Reverse sense of X on monochromator (left is positive)
r2036 | dcl | 2007-07-05 10:30:46 +1000 (Thu, 05 Jul 2007) | 2 lines
2012-11-15 13:20:09 +11:00
Douglas Clowes
5c0036fe87 Swap MX and MY and change sign
r2033 | dcl | 2007-07-05 09:42:46 +1000 (Thu, 05 Jul 2007) | 2 lines
2012-11-15 13:20:02 +11:00
Douglas Clowes
3431ff478f Calibration of monochromator motors
r2005 | dcl | 2007-06-13 09:51:49 +1000 (Wed, 13 Jun 2007) | 2 lines
2012-11-15 13:19:38 +11:00
Douglas Clowes
c8d13fef1d Commissioning of monochromator stage
r2001 | dcl | 2007-06-05 11:56:59 +1000 (Tue, 05 Jun 2007) | 2 lines
2012-11-15 13:19:28 +11:00
Douglas Clowes
fa5e2711e8 Gross changes for commissioning.
r1999 | dcl | 2007-06-01 16:54:25 +1000 (Fri, 01 Jun 2007) | 2 lines
2012-11-15 13:19:21 +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
6d9120f796 Added motor_driver_type variable so we can switch between the real (DMC2280) drivers and the simulated drivers.
r1956 | ffr | 2007-05-10 16:12:25 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:54 +11:00
Ferdi Franceschini
6fc1a8feca Bringing kowari layout and config inline with the current requirements of
the deployment script.

r1940 | ffr | 2007-05-07 15:30:02 +1000 (Mon, 07 May 2007) | 3 lines
2012-11-15 13:16:03 +11:00