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
58 lines
1.5 KiB
Tcl
58 lines
1.5 KiB
Tcl
# $Revision: 1.25 $
|
|
# $Date: 2008-08-07 03:17:28 $
|
|
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
|
# Last revision by: $Author: ffr $
|
|
|
|
# Required by server_config.tcl
|
|
VarMake Instrument Text Internal
|
|
Instrument wombat
|
|
Instrument lock
|
|
|
|
#START SERVER CONFIGURATION SECTION
|
|
source util/dmc2280/dmc2280_util.tcl
|
|
source sics_ports.tcl
|
|
source server_config.tcl
|
|
#END SERVER CONFIGURATION SECTION
|
|
|
|
########################################
|
|
# INSTRUMENT SPECIFIC CONFIGURATION
|
|
|
|
fileeval $cfPath(motors)/motor_configuration.tcl
|
|
|
|
source instrument_vars.tcl
|
|
|
|
fileeval $cfPath(source)/source.tcl
|
|
source $cfPath(hipadaba)/hipadaba_configuration.tcl
|
|
fileeval $cfPath(plc)/plc.tcl
|
|
fileeval $cfPath(counter)/counter.tcl
|
|
#TODO Provide method for choosing environment controller
|
|
fileeval $cfPath(environment)/temperature/lakeshore340.tcl
|
|
fileeval $cfPath(hmm)/hmm_configuration.tcl
|
|
fileeval $cfPath(nexus)/nxscripts.tcl
|
|
fileeval $cfPath(scan)/scan.tcl
|
|
fileeval $cfPath(commands)/commands.tcl
|
|
fileeval $cfPath(anticollider)/anticollider.tcl
|
|
source gumxml.tcl
|
|
|
|
########
|
|
# Parameters set above the restore command will be clobbered by
|
|
# the values in the status.tcl file
|
|
# BIG WARNING: DON'T PUT 'restore' IN A CATCH BLOCK BECAUSE IT RETURNS
|
|
# AN ERROR IF THERE IS NO ../log/status.tcl FILE.
|
|
restore
|
|
|
|
catch {
|
|
::anticollider::init
|
|
# ::environment::temperature::add_ls340
|
|
server_init
|
|
|
|
if [file exists ../extraconfig.tcl] {
|
|
fileeval ../extraconfig.tcl
|
|
}
|
|
|
|
buildHDB instrument_dictionary
|
|
}
|
|
|
|
clientput $errorContext
|
|
clientput $callStack
|