Commit Graph

75 Commits

Author SHA1 Message Date
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
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
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
165f1b90a4 lakeshore340_common.tcl
Lakeshore controllers will be connected to the ca5-[instrument] moxa box
Default config parameters are now available via a tc_dfltPar array
IP and socket number are now mandatory when creating an ls340 object

hrpd/.../lakeshore340.tcl
Multiple lakeshores can now be added to the hdb tree

echidna_configuration.tcl
Provide example  for configuring two lakeshores

SICS-134 reflectometer/../commands.tcl
First draft of beam/attenuator command, currently sends POS=xx (this won't work)

reflectometer/../motor_configuration.tcl
Add bat position feedback via action

sans/../motor_configuration.tcl
Renamed action parameter (aoid) to "action"

server_config.tcl
Initialise motor movecount to 500 to reduce number of position updates by a factor of 50

SICS-134 action.c
Update the beam/attenuator command feedback variable when POS changes.

SICS-134 motor_dmc2280.c
Added PLP:BAT:POS status response handler for platypus bat position updates
Only send IDLE state position updates if position change is greater than the precision.
Rename action parameter (aoid) to "action"

r2679 | ffr | 2008-08-19 15:11:55 +1000 (Tue, 19 Aug 2008) | 31 lines
2012-11-15 13:41:17 +11:00
Ferdi Franceschini
348bd3aed1 SICS-46
commands_common.tcl
Added ::motor::go_home command to run motors to their home positions.

hrpd,hipd,rsd,sans,reflectometer/commands.tcl
Initilise ::motor::is_homing_list for the ::motor::go_hom command

util/command.tcl
Allow an empty parameter list

server_config.tcl
Call the "commands" initilisation function on server init

motor_asim.c
Added the "home" parameter so we can test the go_home command

r2677 | ffr | 2008-08-14 15:00:18 +1000 (Thu, 14 Aug 2008) | 17 lines
2012-11-15 13:41:09 +11:00
Ferdi Franceschini
f7c357a56d SICS-251 Added transmission and beamcenter parameters
r2675 | ffr | 2008-08-13 14:41:05 +1000 (Wed, 13 Aug 2008) | 2 lines
2012-11-15 13:41:05 +11:00
Ferdi Franceschini
8a07f5eaf6 SICS-188 hdb_path is now a comma separated list of paths. NOTE: nodes listed as derived parameter dependencies aren't added to the path.
sans/config/hmm/detector.tcl
Use dns-name for voltage controller address.

sans/config/motors/motor_configuration.tcl
Set det home position.
SICS-122 Added FastShutter variable and configured det motor with an action object to set the FastShutter variable.
SICS-248 Replaced beamstop motor objects with beamstop action objects.

action.[ch]
The action object factory will eventuall be defined here.
SICS-122 Currently there is just a funcion which sets the FastShutter variable

beamstopaction.c
Added motion control enabled check.
Added "list" subcommand.

Makefile
Compile action.c

motor_dmc2280.c
The status check command now always checks the TI1 and TI0 interrupts.
Added action-object configuration parameter.  Call AO_istatus with TI1
if configured with an action object.

r2674 | ffr | 2008-08-13 14:16:30 +1000 (Wed, 13 Aug 2008) | 26 lines
2012-11-15 13:41:01 +11:00
Ferdi Franceschini
2567cde82b SICS-80 Updated detector y-motor (det) limits
r2672 | ffr | 2008-08-07 16:18:17 +1000 (Thu, 07 Aug 2008) | 2 lines
2012-11-15 13:40:52 +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
Ferdi Franceschini
dd984f6327 Prevent x/y translation of detector when voltage >= 800V
r2667 | ffr | 2008-08-06 12:47:47 +1000 (Wed, 06 Aug 2008) | 2 lines
2012-11-15 13:40:40 +11:00
Ferdi Franceschini
e31aa973a6 Merged release 2.1
r2664 | ffr | 2008-07-18 14:33:39 +1000 (Fri, 18 Jul 2008) | 2 lines
2012-11-15 13:40:36 +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
Ferdi Franceschini
01be487c52 pelican
Create pas/config/source/source.tcl
config/source/source_common.tcl
pelican_configuration.tcl

deploySICS.sh
Don't deploy script validator configs, they are obsolete

server_config.tcl
Source config has been moved to  config/source and is specialised for each instrument by calling the instrument specific initialiser ::source:isc_initalize

commands_common_1.tcl
The monitor mode and preset are recorded when running the count command

counter_common_1.tcl
Report and record the counts and time for the multicounter and each monitor.  Also record the mode and preset for the multicounter.

hmm_configuration_common_1.tcl
Cleanup, remove obsolete code.
Report and record the hmm total counts and time.
Allow monitor controlled acquisition from the histogram server

nxscripts_common_1.tcl
Add DataType to NXdata section, preserve case in text attributes.

scan_common_1.tcl
Provide sensible feedback for our bmonscan and hmscan objects.
Set run_mode when doing a scan.  Allow users to select the datatype for histmem scans and to force a scan

wombat_configuration.tcl
echidna_configuration.tcl
platypus_configuration.tcl
kowari_configuration.tcl
quokka_configuration.tcl
Load source config.

quokka_configuration.tcl
SICS-198 HACK, Add AttrotDeg and RotApDeg status feedback.

sans/commands/commands.tcl
Add status feedback for quokka "guide" command.

sans/parameters/parameters.tcl
Make sure data can be saved as xml (replace % with _percent)
SICS-198 HACK, add AttRotDeg and RotApDeg status feedback.

utility.tcl
Fix nasty "params array generator" bug.  SICS commands execute at runlevel 0 which means that the params anonymous array must be made at this level.
Provide the normalattlist command to enable creating attribute lists with the case preserved.

Added the runsics, runtestsics and sicsclient scripts to CVS.
Added source configurations for echidna, wombat, kowari, quokka, platypus, and pelican to CVS

r2644 | ffr | 2008-07-11 11:09:57 +1000 (Fri, 11 Jul 2008) | 53 lines
2012-11-15 13:40:07 +11:00
Ferdi Franceschini
0f96e4f82f server_config.tcl
server_init now calls ::counter::isc_initialize, ::histogram_memory::isc_initialize and ::scan::isc_initialize

scan.c
SICS-158  Restrict bmonscan and hmscan to only one scan variable

count_common.tcl
Create a mulicounter which uses the available monitors as channels.  The multicounter is used in bmonscans

hipadaba_configuration_common.tcl
Use _link as the suffix for the nxvgroup name when making nexus file links.

hmm_configuration_common.tcl
SICS-190 Create hdb entries for bm_counts, bm_event_rate, bm_status
SICS-164 Allow running histmem in simulated mode.

hmm_cylindrical_detector_configuration.tcl
Only refer to detector SICSVariables when necessary, otherwise we get dependency problems.

nxscripts_common_1.tcl
Separate histmem_filtype_spec from bmon_filetype_spec so that we can use the histem_filetyp_spec names to restrict the histmem scan filetypes.
Close the data file on error in proc ::nexus::save
Allow int and text types when saving macro data

scan_common_1.tcl
SICS-173  Allow users to force a scan when the instrument isn't ready
Added ic_initialize proc so we can make dependencies explicit in the init_server proc
SICS-186 Allow monitor modes for histmem scans
Allow selection of histmem file policies from runscan command

echidna, wombat, kowari, quokka and platypus component and server configurations
Added instrument specific configuration initialisation functions in the component configuration files.
Add a catch block to the top-level instrument server configuration file and printout the errorContext and callStack

r2641 | ffr | 2008-07-01 17:02:26 +1000 (Tue, 01 Jul 2008) | 34 lines
2012-11-15 13:39:55 +11:00
Ferdi Franceschini
c2186b037e Increase srce maxspeed to allow setting speed to 5 degrees/s
r2637 | ffr | 2008-06-23 12:58:58 +1000 (Mon, 23 Jun 2008) | 2 lines
2012-11-15 13:39:50 +11:00
Ferdi Franceschini
e76d2094c6 SICS-168 Increase srce speed to 5 degrees per second
r2636 | ffr | 2008-06-23 12:54:30 +1000 (Mon, 23 Jun 2008) | 2 lines
2012-11-15 13:39:46 +11:00
Ferdi Franceschini
ef7c2a6f87 histmem.c
sicvar.c
SICS-93 Save histogram data and instrument state during an acquisition

hipadaba_configuration_common.tcl
SICS-185 Preserve case on hdb node names

hmm_configuration_common_1.tcl
nxscripts_common_1.tcl
sicvar.c
SICS-174 Allow saving of histmem data and instrument status during a count operation.

wombat_configuration.tcl
echidna_configuration.tcl
platypus_configuration.tcl
kowari_configuration.tcl
quokka_configuration.tcl
SICS-153 Move setup of statemon to new server_init function for the new sics_uid state variable

server_config.tcl
SICS-153 set attributes on the sics_suid var which is now created by MakeStateMon
SICS-187 Add cold source info (TODO move to platypus,quokka and pelican configs)

utility.tcl
SICS-185 Added normalgetatt to preserve case on hdb node names etc.

sans/config/optics/aperture_configuration.tcl
New file, Provides lookup tables for attenuation and entrance apertures. (SICS-157)

sans/config/optics/optics.tcl
Load the new aperture_configuration.tcl

sans/config/parameters/parameters.tcl
SICS-157 Add instrument parameters section with derived parameters and their dependencies

statemon.c
SICS-153 Create sics_suid sicsvariable when loading statemon and increment it on each status change.

r2635 | ffr | 2008-06-23 12:41:12 +1000 (Mon, 23 Jun 2008) | 38 lines
2012-11-15 13:39:42 +11:00
Ferdi Franceschini
eea4d4d9eb L2mm depends on sample position (ported from RELEASE-2_0P1)
r2634 | ffr | 2008-06-18 10:56:27 +1000 (Wed, 18 Jun 2008) | 2 lines
2012-11-15 13:39:38 +11:00
Ferdi Franceschini
6c6156174f Manually merged the following changes from RELEASE-2_0P1
commands_common.tcl
fixed counter feedback

anticollider_common.tcl
implement anticollider administrative override

reflectometer,sans/.../anticollider.tcl
implement administrative override to move detector

r2626 | ffr | 2008-06-12 12:55:28 +1000 (Thu, 12 Jun 2008) | 11 lines
2012-11-15 13:39:18 +11:00
Ferdi Franceschini
177d5f3ed6 Provide a parameters and parameters/derived_parameters section as a one stop shop for all your instrument parameter needs.
r2625 | ffr | 2008-06-12 12:42:17 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:14 +11:00
Ferdi Franceschini
3a40ea5693 Merged release 2.0 patch-set 1 (RELEASE-2_0P1 )
r2624 | ffr | 2008-06-12 09:05:36 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:10 +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
fe682b39ac Change over to Quokka SIS PLC address
r2494 | dcl | 2008-04-30 11:57:08 +1000 (Wed, 30 Apr 2008) | 2 lines
2012-11-15 13:36:21 +11:00
Douglas Clowes
0937bc2ba2 Handle simulated PLC
r2486 | dcl | 2008-04-24 12:11:51 +1000 (Thu, 24 Apr 2008) | 2 lines
2012-11-15 13:36:06 +11:00
Douglas Clowes
ed9f92c6ef rotary beam attenuator motor
r2363 | dcl | 2008-02-19 15:27:19 +1100 (Tue, 19 Feb 2008) | 2 lines
2012-11-15 13:33:20 +11:00
Douglas Clowes
0fc5f6b303 Initial Oak Ridge High Voltage Power Supply for ORDELA detector
r2289 | dcl | 2008-01-21 09:57:53 +1100 (Mon, 21 Jan 2008) | 2 lines
2012-11-15 13:32:42 +11:00
Ferdi Franceschini
cb89c02daf Use ::histogram_memory::upload_config instead of the deprecated ::histogram_memory::configure_server procedure.
r2284 | ffr | 2008-01-15 15:03:41 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:32:23 +11:00
Douglas Clowes
b8c0f9ac5b Add mechanism to pop up beam stops small(1) to (large(5)
r2281 | dcl | 2008-01-15 12:39:04 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:32:11 +11:00
Douglas Clowes
034cb7a6ac Detector and beam stop commissioning
r2258 | dcl | 2007-12-07 10:19:01 +1100 (Fri, 07 Dec 2007) | 2 lines
2012-11-15 13:30:45 +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
a9b10d5451 Added placeholder for pre_hmscan_prepare hook.
r2227 | ffr | 2007-11-05 13:27:14 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:28:48 +11:00
Ferdi Franceschini
e8982428e0 Add convenience histmem command wrapper for command line users.
Improve simulation support.

r2226 | ffr | 2007-11-05 13:25:15 +1100 (Mon, 05 Nov 2007) | 3 lines
2012-11-15 13:28:44 +11:00
Ferdi Franceschini
34c0c59594 eval the "drive" command to make sure that the parameters aren't interpreted as a single list value.
r2210 | ffr | 2007-10-31 17:09:45 +1100 (Wed, 31 Oct 2007) | 2 lines
2012-11-15 13:27:44 +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
Douglas Clowes
d5a0489a3b commissioning refinement
r2197 | dcl | 2007-10-26 10:59:12 +1000 (Fri, 26 Oct 2007) | 2 lines
2012-11-15 13:26:57 +11:00
Ferdi Franceschini
3fcb976816 Optics subsystem.
Currently only guide configuration is implemented.

r2194 | ffr | 2007-10-23 12:59:44 +1000 (Tue, 23 Oct 2007) | 3 lines
2012-11-15 13:26:46 +11:00
Ferdi Franceschini
7b0162177e Added optics subsystem path.
Also added chopper_simulation flag for platypus.

r2191 | ffr | 2007-10-23 12:42:52 +1000 (Tue, 23 Oct 2007) | 3 lines
2012-11-15 13:26:35 +11:00
Ferdi Franceschini
2018e71b8f Set rank for hmm objects.
r2190 | ffr | 2007-10-23 12:41:00 +1000 (Tue, 23 Oct 2007) | 2 lines
2012-11-15 13:26:31 +11:00
Douglas Clowes
6c357b6fdc commissioning iteration
r2186 | dcl | 2007-10-22 13:24:33 +1000 (Mon, 22 Oct 2007) | 2 lines
2012-11-15 13:26:16 +11:00
Douglas Clowes
9052167b7f Rename Physical Collimator motors from cx to pcx and virtual motors from vc0x to cx
r2184 | dcl | 2007-10-17 08:35:07 +1000 (Wed, 17 Oct 2007) | 2 lines
2012-11-15 13:26:09 +11:00
Douglas Clowes
79595e0e03 Generated files
r2178 | dcl | 2007-10-05 12:01:17 +1000 (Fri, 05 Oct 2007) | 2 lines
2012-11-15 13:25:47 +11:00
Douglas Clowes
06fba540ec Commissioning iteration
r2177 | dcl | 2007-10-05 11:55:46 +1000 (Fri, 05 Oct 2007) | 2 lines
2012-11-15 13:25:43 +11:00
Douglas Clowes
5ee42733ba Commissioning iteration
r2176 | dcl | 2007-10-04 09:15:02 +1000 (Thu, 04 Oct 2007) | 2 lines
2012-11-15 13:25:40 +11:00
Ferdi Franceschini
d8117b6b8b histogram_memory::setmode is obsolete.
So it's gone.

r2175 | ffr | 2007-10-04 08:33:28 +1000 (Thu, 04 Oct 2007) | 3 lines
2012-11-15 13:25:36 +11:00
Ferdi Franceschini
67a8a8c0c3 Fixed maximum and minimum bin boundaries.
Code cleanup.

r2172 | ffr | 2007-10-03 10:08:40 +1000 (Wed, 03 Oct 2007) | 3 lines
2012-11-15 13:25:25 +11:00
Douglas Clowes
f7cce8d15a Commissioning changes
r2168 | dcl | 2007-10-02 11:31:00 +1000 (Tue, 02 Oct 2007) | 2 lines
2012-11-15 13:25:11 +11:00
Ferdi Franceschini
a173158d0e Create extra hmm objects to fetch xy, yt, t, ..., etc. data from the histogram server.
r2166 | ffr | 2007-09-26 16:22:43 +1000 (Wed, 26 Sep 2007) | 2 lines
2012-11-15 13:25:03 +11:00
Douglas Clowes
bef9e542ae Commissioning calibration of collimator
virtual collimator motors

r2154 | dcl | 2007-09-26 09:33:29 +1000 (Wed, 26 Sep 2007) | 3 lines
2012-11-15 13:24:20 +11:00