Commit Graph

1243 Commits

Author SHA1 Message Date
Ferdi Franceschini
b134c901c5 Wombat
hipd/config/commands/commands.tcl
Added some of the procedures in extraconfig.tcl as "commands"

motors/sct_jogmotor_common.tcl
Added stop command.  Send SH, JG and BG commands on one line when jogging motor.

fakeDMC
dmc2280Server.tcl
mkSimAxes.tcl
simAxis.tcl
Added jog command.

exebuf.c
Batch file executor now sends a BATCHEND event when there is an AbortBatch interrupt.
This means we can now execute cleanup comands when a batch file terminates.

r2764 | ffr | 2009-01-23 16:06:03 +1100 (Fri, 23 Jan 2009) | 17 lines
2012-11-15 16:56:55 +11:00
Ferdi Franceschini
fb817f2aa8 sct_positmotor_common.tcl
script_context_util.tcl
Readability improvements.

sicshipadaba.c
SICS-321 Fix segfault

sct_jogmotor_common.tcl
Started making a jog motor object.

r2762 | ffr | 2008-12-24 13:24:25 +1100 (Wed, 24 Dec 2008) | 10 lines
2012-11-15 16:56:51 +11:00
Ferdi Franceschini
2d6dbe647f Only send histmem parameters if they've been changed
r2759 | ffr | 2008-12-22 14:57:01 +1100 (Mon, 22 Dec 2008) | 2 lines
2012-11-15 16:56:47 +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
121aac2946 Tested OK on development controller
r2747 | ffr | 2008-11-18 10:40:03 +1100 (Tue, 18 Nov 2008) | 2 lines
2012-11-15 16:56:38 +11:00
Ferdi Franceschini
283c7d56dc nxscript.c SICS-295
Restored a modification made in revision 1.7 which was reverted during the PSI update (2/10/08) probably when investigating SICS-291

hmm_configuration_common_1.tcl
Added hmm ratemap_xy_max_bin and ratemap_xy_total

site_ansto/hardsup/sct_galilprot.c
site_ansto/hardsup/makefile
Started adding galil protocol for script-context controllers.

sans/config/parameters/parameters.tcl
SICS-180 BeamCenterY should have been BeamCenterZ

r2742 | ffr | 2008-11-07 10:13:51 +1100 (Fri, 07 Nov 2008) | 13 lines
2012-11-15 16:56:34 +11:00
Ferdi Franceschini
a00b32dbe4 Publish chopper::ready? and get_frequency procs.
r2734 | ffr | 2008-11-04 17:00:52 +1100 (Tue, 04 Nov 2008) | 2 lines
2012-11-15 16:56:30 +11:00
Ferdi Franceschini
4d740d11e8 Set the DO_NOT_SELECT_BEFORE_SEND macro def for network.c
This stops GumTree from killing SICS when it exits.

r2733 | ffr | 2008-11-04 16:02:43 +1100 (Tue, 04 Nov 2008) | 3 lines
2012-11-15 16:56:26 +11:00
Ferdi Franceschini
25ac6f8b27 sct controllers should have their data property set to false
r2732 | ffr | 2008-11-04 10:23:25 +1100 (Tue, 04 Nov 2008) | 2 lines
2012-11-15 16:56:21 +11:00
Ferdi Franceschini
0c69a21706 Incorporated in-situ modifications to Release 2.2
r2731 | ffr | 2008-11-03 19:59:56 +1100 (Mon, 03 Nov 2008) | 2 lines
2012-11-15 16:56:17 +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
04e2e75d80 All
Added "STARTING" message to the histmem command status.
Can now make multiple script context positional motors
Added table and table entry IDs for posit motor lookup tables.
Fixed the runsics script so that the stop command sends an EndServer interrupt via the UDP port instead of killing SICS, this ensures that status is saved.

Platypus
Added chopper speed, phase and phase offsets for all choppers on hdb tree and in datafile

Quokka
Replace the sample/select command with the changer_position script context positional motor interface.
Fixed upper limit on apx motor
Added full sample changer and auto aperture positional motors

r2727 | ffr | 2008-10-31 15:37:32 +1100 (Fri, 31 Oct 2008) | 14 lines
2012-11-15 16:56:00 +11:00
Ferdi Franceschini
b9e1b19252 Convert MT to A for the the gn and pn rows.
r2726 | ffr | 2008-10-27 16:10:48 +1100 (Mon, 27 Oct 2008) | 2 lines
2012-11-15 16:55:55 +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
fb97ee8631 Refactored file saving.
r2723 | ffr | 2008-10-17 12:47:58 +1100 (Fri, 17 Oct 2008) | 2 lines
2012-11-15 16:55:42 +11:00
Rodney Davies
8f95806ecc Updated to send Jz prior to any voltage setting command
r2721 | rdd | 2008-10-14 11:35:35 +1100 (Tue, 14 Oct 2008) | 3 lines
2012-11-15 16:55:35 +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
f0973c6196 Restored file collection feature from 2.0 branch
r2718 | ffr | 2008-10-01 14:10:50 +1000 (Wed, 01 Oct 2008) | 2 lines
2012-11-15 13:43:24 +11:00
Ferdi Franceschini
82bebc6a5f The ::chopper::get_frequency comment was misleading.
r2709 | ffr | 2008-09-25 10:58:57 +1000 (Thu, 25 Sep 2008) | 2 lines
2012-11-15 13:43:20 +11:00
Ferdi Franceschini
815eeefc1c Incorporated the cg123He_temp local mod from the R2_1 deployment.
Added validation and fixed attributes.

r2708 | ffr | 2008-09-25 10:49:06 +1000 (Thu, 25 Sep 2008) | 3 lines
2012-11-15 13:43:16 +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
c30ce9c5a0 Added west400.tcl config to wombat config/environment/temperature
util/utility.tcl
The 'setpoint_script' for temperature controllers is now generated by '::utility::macro::getset'

r2706 | ffr | 2008-09-25 08:47:12 +1000 (Thu, 25 Sep 2008) | 5 lines
2012-11-15 13:43:08 +11:00
Ferdi Franceschini
1f755ccb0d Added allowed CAT_TABLE elements and echidna specific cat config
r2705 | ffr | 2008-09-24 14:28:45 +1000 (Wed, 24 Sep 2008) | 2 lines
2012-11-15 13:43:04 +11:00
Ferdi Franceschini
79d54fb1fe Generate md5 sums for SICS server files so we can check for local modifications
during a release cycle.

r2704 | ffr | 2008-09-24 12:23:41 +1000 (Wed, 24 Sep 2008) | 3 lines
2012-11-15 13:43:00 +11:00
Ferdi Franceschini
a2289207c0 Added RELEASE_NUMBER: reference in comments
r2703 | ffr | 2008-09-24 11:37:59 +1000 (Wed, 24 Sep 2008) | 2 lines
2012-11-15 13:42:56 +11:00
Ferdi Franceschini
805a66ea82 Transferred dhv1 limits from deployed Quokka detector config.
r2702 | ffr | 2008-09-24 10:51:03 +1000 (Wed, 24 Sep 2008) | 2 lines
2012-11-15 13:42:52 +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
e1c9d6348d Fix invalid slit motor names.
Set correct IP address for detector voltage controller.

r2700 | ffr | 2008-09-22 16:42:08 +1000 (Mon, 22 Sep 2008) | 3 lines
2012-11-15 13:42:43 +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
538a36df3f Catch comms failure when creating asyncqueue
r2698 | ffr | 2008-09-22 10:35:34 +1000 (Mon, 22 Sep 2008) | 2 lines
2012-11-15 13:42:35 +11:00
Ferdi Franceschini
3afb9597f2 Fixed SICS-273: hnotify sends position updates for some stationary motors
Reverted change from rev 1.79 19-Aug-08
which was supposed to send IDLE state position updates if position change is greater than the precision.

r2697 | ffr | 2008-09-18 16:00:52 +1000 (Thu, 18 Sep 2008) | 5 lines
2012-11-15 13:42:31 +11:00
Ferdi Franceschini
7919c7cd6a Mark Lesha's fixes to the asyncqueue and voltage controller
r2696 | ffr | 2008-09-18 14:50:09 +1000 (Thu, 18 Sep 2008) | 2 lines
2012-11-15 13:42:27 +11:00
Ferdi Franceschini
70f194fe85 Standardised on using controlsensor = A and range = 5
r2695 | ffr | 2008-09-18 14:12:24 +1000 (Thu, 18 Sep 2008) | 2 lines
2012-11-15 13:42:23 +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
8b4c571d63 Code cleanup.
r2693 | ffr | 2008-09-17 08:40:39 +1000 (Wed, 17 Sep 2008) | 2 lines
2012-11-15 13:42:14 +11:00
Ferdi Franceschini
02015668e2 Mark Lesha fixed some bugs associated with "send"
r2692 | ffr | 2008-09-17 08:39:33 +1000 (Wed, 17 Sep 2008) | 2 lines
2012-11-15 13:42:10 +11:00
Ferdi Franceschini
801ec1430b The motor lowerlimits were being checked against the scan target position instead of the
scan start position.

r2691 | ffr | 2008-09-16 14:33:15 +1000 (Tue, 16 Sep 2008) | 3 lines
2012-11-15 13:42:06 +11:00
Ferdi Franceschini
7d36e98479 SICS-263 Provide access to histogram memory veto
Added a ::histogram_memory::veto proc but it can't be used yet because you need to run hmm init to update the veto flag

r2690 | ffr | 2008-08-29 22:22:53 +1000 (Fri, 29 Aug 2008) | 3 lines
2012-11-15 13:42:02 +11:00
Ferdi Franceschini
c35f37420e Added stitch ordering parameter
r2689 | ffr | 2008-08-29 22:18:17 +1000 (Fri, 29 Aug 2008) | 2 lines
2012-11-15 13:41:58 +11:00
Ferdi Franceschini
19e448cda7 Load the new eventutil.tcl
r2688 | ffr | 2008-08-29 22:14:19 +1000 (Fri, 29 Aug 2008) | 2 lines
2012-11-15 13:41:54 +11:00
Ferdi Franceschini
c6b5e65a71 SICS-264 Allow sequencing of motors while counting
A "waitfor" command has been implement which waits for an object to finish after running the given command.

r2687 | ffr | 2008-08-29 22:09:19 +1000 (Fri, 29 Aug 2008) | 3 lines
2012-11-15 13:41:50 +11:00
Ferdi Franceschini
c53b56b97b SICS-262 TC1 and TC2 sensor readings are duplicates of each other for lakeshore
An AsyncQueue is now being created for each temperature controller.

r2686 | ffr | 2008-08-29 21:55:02 +1000 (Fri, 29 Aug 2008) | 3 lines
2012-11-15 13:41:46 +11:00
Ferdi Franceschini
e390dcb920 SICS-261 hmscan aborts when instrument isn't ready
You can now call "force_scan" to force an hmscan

r2685 | ffr | 2008-08-29 21:47:57 +1000 (Fri, 29 Aug 2008) | 3 lines
2012-11-15 13:41:42 +11:00
Ferdi Franceschini
6a3b8e2f49 SICS-260: "File saving fails and aborts scans"
SICS was trying to save the AttRotDeg and RotApDeg status feedback nodes
The data property of the status feedback nodes has been set to false.

r2684 | ffr | 2008-08-29 21:38:20 +1000 (Fri, 29 Aug 2008) | 4 lines
2012-11-15 13:41:38 +11:00
Ferdi Franceschini
2b02d7d1f1 SICS-215, SICS-234 Fixed two-theta direction.
r2683 | ffr | 2008-08-29 01:24:56 +1000 (Fri, 29 Aug 2008) | 2 lines
2012-11-15 13:41:34 +11:00
Ferdi Franceschini
de037231a9 SICS-156 Correcting detector active width (3490.64mm)
r2682 | ffr | 2008-08-27 19:28:41 +1000 (Wed, 27 Aug 2008) | 2 lines
2012-11-15 13:41:30 +11:00
Ferdi Franceschini
5411611352 First draft of "action" and "waitacion" commands
r2681 | ffr | 2008-08-26 14:09:09 +1000 (Tue, 26 Aug 2008) | 2 lines
2012-11-15 13:41:26 +11:00