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
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
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
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
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
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
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
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
SICS-226
util/utility.tcl
Added set_chopper_attributes to set hdb metadata on chopperadapters
server_config.tcl
Set hdb metadata on chopperadapters
hipadaba_configuration_common.tcl
:hdb::sobjadd can now add chopperadapters to the hdb tree
::hdb::cmd_par now preserves case when adding command parameters.
instdict_specification.tcl
Added chopperadapter sicstype and disk_chopper class
nxscripts_common_1.tcl
Added chopperadapter save and sdsinfo commands.
reflectometer/config/chopper/chopper.tcl
Set units on chopperadapters.
##################################
hipd,hrpd,rsd, /config/commands.tcl
Add instrument specific initialisation procedure for commands
reflectometer/config/commands.tcl
Created omega_2theta and set_mode commands from Andrew Nelson's procs in extraconfig.tcl
reflectometer/.../motor_configuration.tcl
Added ds and rs prefix to the two_theta drive and read scripts to prevent name collision with the two_theta procs in commans.tcl
SICS-108 reflectometer/../parameters.tcl
Added parameters for guide, slit and chopper distances and elements.
SICS-108 common_instrument_dictionary.tcl
Make parameters saveable
r2678 | ffr | 2008-08-18 13:01:29 +1000 (Mon, 18 Aug 2008) | 40 lines
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
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
Set histmem view mag to auto
Workaround for SICS-204 hmc sets bm preset to 0
hrpd/config/count/counter.tcl
reflectometer/config/count/counter.tcl
echidna only has two beam monitors enabled
SICS should not start or stop the third beam monitor on platypus
config/scan/scan_common_1.tcl
Show counts from available beam monitors during scans
r2649 | ffr | 2008-07-14 15:15:58 +1000 (Mon, 14 Jul 2008) | 12 lines
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
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
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