Commit Graph

82 Commits

Author SHA1 Message Date
Douglas Clowes
a2120c79e8 Make args optional and fix some issues 2014-02-03 11:05:03 +11:00
Ferdi Franceschini
4f65f5281f Don't insert date in generated motor configuration file. 2014-02-02 17:31:56 +11:00
Ferdi Franceschini
8f2a1adec4 Make genmotconf a bit quieter.
But it would be good to generate labels for the posit_n values.
2014-01-31 13:52:22 +11:00
Ferdi Franceschini
4a134cf2d0 genmotconf.tcl now sorts the posit_n parameters by value.
Sort is ascending if cntsperx is positive, descending if negative.
Improve error and report logs generated by genmotconf.tcl
It is not an error if a missing attributed can be initialised with a
default value by genmotconf.tcl.
Replace the COLLIMATOR_POSITIONS.csv with Bilby_motion_control_commissioning_checklist.csv
Generate new "generated_motor_configuration.tcl" file.
2014-01-31 09:15:07 +11:00
Douglas Clowes
c2c7128245 Put the generated driver where we got the input 2014-01-30 17:22:09 +11:00
Douglas Clowes
172e69f9e3 Make gen_sct python program executable 2014-01-30 17:15:11 +11:00
Douglas Clowes
aebcd90f9b Python program to generate script context driver from a definition file 2014-01-30 13:17:55 +11:00
Ferdi Franceschini
2481abb8af Scripts which generate a motor configuration file from CSV data files. 2014-01-15 16:31:14 +11:00
Ferdi Franceschini
e984619d77 Initial bilby configuration. 2014-01-15 16:31:14 +11:00
Ferdi Franceschini
55e93c8386 Set a convenient default path for config ini file on ICS and ICS TEST hosts. 2013-10-15 03:08:23 +11:00
Ferdi Franceschini
7bacc4dc7f Use sics_config.ini to generate 12T magnet setup on Taipan. 2013-09-18 16:16:06 +10:00
Douglas Clowes
362e490121 Add order=, recursion detection, --verbose 2013-08-28 15:33:01 +10:00
Douglas Clowes
50f4ea9721 Add config_reader.tcl in the instrument/util directory 2013-08-27 18:10:02 +10:00
Douglas Clowes
8967885412 Implement group headings in the listbox 2013-08-27 17:59:33 +10:00
Douglas Clowes
9fc130bff2 Implement command to reread the configuration file 2013-08-27 17:59:33 +10:00
Douglas Clowes
ecbe9953e8 cascade, onifon, onifoff, offifon and offofoff 2013-08-27 17:59:32 +10:00
Douglas Clowes
9da47fc1f7 groups, sorted display, sorted write 2013-08-27 17:59:31 +10:00
Douglas Clowes
1941679718 cascade and a bit of cleanup 2013-08-27 17:59:31 +10:00
Douglas Clowes
dcca4385b3 Write input file with backups 2013-08-27 17:59:30 +10:00
Douglas Clowes
45a20823ba Cleanup and put focus change on cb_list 2013-08-27 17:59:30 +10:00
Douglas Clowes
7225f1920f Attempt a focus change callback 2013-08-27 17:59:30 +10:00
Douglas Clowes
4ecebd5e1f Add change callback, and write code 2013-08-27 17:59:29 +10:00
Douglas Clowes
75cc6a1ff6 Limit it to the Checkbox list 2013-08-27 17:59:29 +10:00
Douglas Clowes
b9d9721a5f Massage in ConfigParser 2013-08-27 17:59:28 +10:00
Douglas Clowes
160babe51a Start a config editor with an extract from the urwid tour 2013-08-27 17:59:28 +10:00
Douglas Clowes
a0bf852024 Move displayscreen to the general utility directory "instrument/util" 2013-07-01 12:20:11 +10:00
Ferdi Franceschini
94f21f832e SICS-561: Wait for the hmm COUNTEND event in blocking mode.
Also allow veto when scanning.
2013-03-04 18:03:55 +11:00
Ferdi Franceschini
9e30a158fb server_config.tcl
Remove call to obsolete ::utility::set_sctobj_attributes because it
returns an error and aborts the server_set_sobj_attributes proc.
This bug meant that script context objects weren't being linked into the
hdb tree.

util/utility.tcl
Removed obselete ::utility::set_sctobj_attributes proc because
sctcontrollers are no longer being added to the root of the hdb tree.
2013-02-14 11:32:36 +11:00
Ferdi Franceschini
49da4dea29 util/utlity.tcl
Hack to make the set_motor_attributes function work with motor objects
implements as tclmot type drivers.

r3752 | ffr | 2012-09-26 10:06:48 +1000 (Wed, 26 Sep 2012) | 4 lines
2012-11-15 17:39:23 +11:00
Douglas Clowes
813a1c0de8 add some catch blocks
r3712 | dcl | 2012-08-28 15:12:57 +1000 (Tue, 28 Aug 2012) | 1 line
2012-11-15 17:37:18 +11:00
Douglas Clowes
4887c8959a New 'limswi' function/command found on Pelican
r3553 | dcl | 2012-05-29 10:27:54 +1000 (Tue, 29 May 2012) | 1 line
2012-11-15 17:28:47 +11:00
Douglas Clowes
8fd30089a1 ensure namespace ::utility exists
r3522 | dcl | 2012-04-02 12:58:59 +1000 (Mon, 02 Apr 2012) | 1 line
2012-11-15 17:26:39 +11:00
Douglas Clowes
132fb83389 Add a writeTree capability for writing hdb trees and properties
r3477 | dcl | 2012-03-21 13:36:09 +1100 (Wed, 21 Mar 2012) | 1 line
2012-11-15 17:25:53 +11:00
Jing Chen
c9051e1b67 add kookaburra
r3452 | jgn | 2012-03-13 11:09:10 +1100 (Tue, 13 Mar 2012) | 1 line
2012-11-15 17:25:31 +11:00
Ferdi Franceschini
a24420bf69 Add TasMot motors to hipadaba tree and NeXus data files.
nxscripts_common_1.tcl
Set the savecmd and sdsinfo attributes for the TasMot motors in
::nexus::set_sobj_attributes

instdict_specification.tcl
Add tasmot to the sobj_sicstype_list

hipadaba_configuration_common.tcl
Add tasmot to the motor switch statement of ::hdb::sobjadd

util/utility.tcl
Add TasMot to ::utility::set_motor_attributes

r3367 | ffr | 2012-02-13 20:59:50 +1100 (Mon, 13 Feb 2012) | 15 lines
2012-11-15 17:24:48 +11:00
Jing Chen
28772f6ec2 added Lyrebird instrument config
r3038 | jgn | 2010-12-13 16:10:57 +1100 (Mon, 13 Dec 2010) | 1 line
2012-11-15 17:07:02 +11:00
Ferdi Franceschini
bbc133dab9 Quokka environment.tcl
Don't make the temperature getset-macro or select the control sensor for the script validator instance of SICS. (fixed in-situ)
Use new ls340 and ls336 controllers.

script_context_util.tcl
Modified hinitprops so that it can take sub-paths

nxscripts_common_1.tcl
Added ::nexus::OnFirstsave ::nexus:OnLastSave to register commands which will be executed on the first and last save of a data file.

sct_julabo_lh45.tcl
Added start_temperature and end_temperature parameters to record the initial and final temperature readings in the data files.
Also only set the setpoint if the Julabo is in remote mode.

sct_positmotor_common.tcl
Report 99999 if a posit motor table is out of range.

quokka guide_configuration.tcl
Updated aperture size for p1, p1lp, p1lens in the guide configuration table.

r2969 | ffr | 2010-07-01 22:09:09 +1000 (Thu, 01 Jul 2010) | 20 lines
2012-11-15 17:04:40 +11:00
Ferdi Franceschini
b8811330f1 script_context_util.tcl
hinitprops can now be called with a list of parameters.
SICS-403 hinitprops will now check for "argtype" and "values" attributes on script context objects to create drop down lists valid arguments for GumTree

sct_positmotor_common.tcl
SICS-403 Now sets "argtype" and a list of "values" properties so GumTree can create drop-down lists of arguments.

quokka positmotor_configuration.tcl
SICS-401 diameter and sampleNum selectors report communications errors

sct_rfamp.c
The controller state should be set before calling AsconError.

r2931 | ffr | 2010-05-22 13:56:13 +1000 (Sat, 22 May 2010) | 13 lines
2012-11-15 17:03:11 +11:00
Ferdi Franceschini
eb7e4877cc You can now specify multiple parameters when annotating script context object paths
r2925 | ffr | 2010-05-18 15:11:27 +1000 (Tue, 18 May 2010) | 2 lines
2012-11-15 17:02:43 +11:00
Ferdi Franceschini
6470d0e65e The release number has been relocated
r2911 | ffr | 2010-05-07 15:40:58 +1000 (Fri, 07 May 2010) | 2 lines
2012-11-15 17:01:44 +11:00
Ferdi Franceschini
4f3fb5e250 sct_julabo_lh45.tcl
Create object when in simulation mode

nxscripts_common_1.tcl
Set units attributes on script context objects data

sans aperture_configuration.tcl
Update rotary attenuator lookup table. Set parameters when motors positions are
within tolerance of the lookup table positions.

sans, parameters.tcl sct_velsel.tcl
Set units and update parameter names to be consistent

quokka_configuration.tcl
Add convenience command to load environment controllers.

server_config.tcl
Make sure that controllers are properly generated when loading them from the ext
raconfig.tcl.

r2881 | ffr | 2010-01-29 16:50:51 +1100 (Fri, 29 Jan 2010) | 20 lines
2012-11-15 17:00:10 +11:00
Ferdi Franceschini
3a3b6764ee SICS-377 hipadaba_configuration_common.tcl
One typo and forgetting to clear a temporary variable meant that the list of candidates for removal never shrank while pruning

reflectometer/config/motors/sct_batmotor.tcl
The beam attenuator is on axis D not A.  Also provide statemon feedback, "busy" or "idle"

sans/config/velsel/velsel.tcl
Update velocity selector parameters for NVS 43

SICS-374 sans/config/velsel/sct_velsel.tcl
Set velocity selector identifier

script_context_util.tcl
Don't override the "klass' attribute, just make sure that it matches the hdb klass property if it's defined.

event.h and statemon.c
Added statemon BUSY and IDLE events for the scbat because it when it oscillates it's busy doing something.

r2875 | ffr | 2010-01-22 20:41:36 +1100 (Fri, 22 Jan 2010) | 18 lines
2012-11-15 16:59:48 +11:00
Ferdi Franceschini
7970a94acf Remove obsolete hlistplainprop procedure.
r2861 | ffr | 2010-01-13 16:12:16 +1100 (Wed, 13 Jan 2010) | 2 lines
2012-11-15 16:59:11 +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
695c5a8f82 Document handle_exception function.
r2858 | ffr | 2010-01-13 12:53:19 +1100 (Wed, 13 Jan 2010) | 2 lines
2012-11-15 16:59:01 +11:00
Ferdi Franceschini
f494ece7e7 Augment exception handler to allow users to add extra information to error messages.
r2841 | ffr | 2009-12-10 14:57:13 +1100 (Thu, 10 Dec 2009) | 2 lines
2012-11-15 16:58:09 +11:00
Ferdi Franceschini
c73c4c85c8 Merges from ics1-wombat
r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:39 +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
c58ee9fbcb Allow users to define a batch cleanup function which is called when a batch file finishes or aborts.
r2802 | ffr | 2009-08-11 12:25:26 +1000 (Tue, 11 Aug 2009) | 2 lines
2012-11-15 16:57:21 +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