Commit Graph

216 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
8090104407 ##################################
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
2012-11-15 13:41:13 +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
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
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
dd927d18af hmm_configuration_common_1.tcl
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
2012-11-15 13:40:27 +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
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
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
Douglas Clowes
17e0c0b5bc get msd into gumtree
r2612 | dcl | 2008-06-05 16:24:32 +1000 (Thu, 05 Jun 2008) | 2 lines
2012-11-15 13:38:54 +11:00
Douglas Clowes
c61c709b11 add msd klass unitsa and long_name
r2611 | dcl | 2008-06-05 15:32:42 +1000 (Thu, 05 Jun 2008) | 2 lines
2012-11-15 13:38:50 +11:00
Douglas Clowes
419a746c77 Update sample stage limits and speeds
r2607 | dcl | 2008-06-04 16:08:08 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:41 +11:00
Douglas Clowes
62de717b11 adjust limits and add Mono-Samp Distance (msd) simulated motor
r2606 | dcl | 2008-06-04 15:21:36 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:37 +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
a9746d1190 Monochromator focussing
r2594 | dcl | 2008-05-29 14:54:06 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:48 +11:00
Douglas Clowes
b5d157c67a incorporate Dan's change to resolver code
r2508 | dcl | 2008-05-08 16:48:32 +1000 (Thu, 08 May 2008) | 2 lines
2012-11-15 13:36:41 +11:00
Douglas Clowes
8ced552998 Change comments
r2493 | dcl | 2008-04-30 11:56:22 +1000 (Wed, 30 Apr 2008) | 2 lines
2012-11-15 13:36:17 +11:00
Douglas Clowes
b8711e9bc4 Motor Off Delay is in milliSeconds
r2483 | dcl | 2008-04-24 12:09:25 +1000 (Thu, 24 Apr 2008) | 2 lines
2012-11-15 13:35:54 +11:00
Douglas Clowes
bdf5e24cc0 Remove extraconfig
r2453 | dcl | 2008-04-14 13:53:40 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:35:35 +11:00
Douglas Clowes
4562daf398 Implement changes made on instrument during commissioning
r2451 | dcl | 2008-04-14 13:51:07 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:35:27 +11:00
Douglas Clowes
7220f040ef wait for motion to complete before turning air and motor off (was crashing thread 0)
r2430 | dcl | 2008-04-14 09:50:38 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:35:11 +11:00
Douglas Clowes
106159ca58 Substantially modified controller software: mainly limit switches and deceleration.
r2388 | dcl | 2008-03-07 16:12:47 +1100 (Fri, 07 Mar 2008) | 2 lines
2012-11-15 13:33:47 +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
Ferdi Franceschini
bc19061460 Don't make plc object when in simulated mode.
r2243 | ffr | 2007-11-07 15:54:45 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:48 +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
0b53e28ef0 We're now saving two theta, not polar angle.
r2230 | ffr | 2007-11-05 14:23:46 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:29:00 +11:00
Ferdi Franceschini
94987872cb Code cleanup
r2228 | ffr | 2007-11-05 13:29:31 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:28:52 +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
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
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
Mark Lesha
565267647b Temporarily keep evcontroller config here
Two extra temperature controllers have been added.

r2148 | mle | 2007-09-04 15:46:58 +1000 (Tue, 04 Sep 2007) | 3 lines
2012-11-15 13:23:58 +11:00
Ferdi Franceschini
a85720686b Make sure that the last things we do are to set the sics object attributes and then build the hdb tree.
r2138 | ffr | 2007-08-21 08:54:45 +1000 (Tue, 21 Aug 2007) | 2 lines
2012-11-15 13:23:22 +11:00
Ferdi Franceschini
4495f867e4 Use new common hipada config file.
r2128 | ffr | 2007-08-16 16:55:36 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:22:47 +11:00
Ferdi Franceschini
d469bb8aa0 Added empty set_sobj_attributes proc.
r2127 | ffr | 2007-08-16 16:53:24 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:22:43 +11:00
Ferdi Franceschini
5c9b53efbc Added new hdb/nexus support.
r2126 | ffr | 2007-08-16 16:46:12 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:22:40 +11:00
Ferdi Franceschini
091dc0d2d2 Copy config files for new hdb/nexus support.
Copy cylindrical detector configuration

r2125 | ffr | 2007-08-16 16:45:23 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:22:36 +11:00
Ferdi Franceschini
950037bfc3 Don't MakeAsyncQueue when using simulated driver.
Add metedata to slit gap and offset motors for new hdb and nexus code.

r2123 | ffr | 2007-08-16 16:37:45 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:22:29 +11:00
Ferdi Franceschini
307e29e60e Added instrument specific initialisation function.
r2122 | ffr | 2007-08-16 16:31:37 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:22:25 +11:00
Douglas Clowes
d0ac56e112 reduce mx and my hard and soft limits to be within limit switches
r2101 | dcl | 2007-07-26 12:22:57 +1000 (Thu, 26 Jul 2007) | 2 lines
2012-11-15 13:21:10 +11:00
Douglas Clowes
f374e445bf multichan becomes AsyncQueue and AsyncProtocol
r1965 | dcl | 2007-05-15 13:15:34 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:25 +11:00
Ferdi Franceschini
5b683ecbe0 Fixed botched merge.
The merge effectively created  duplicate setmode procs.

r1953 | ffr | 2007-05-10 13:28:27 +1000 (Thu, 10 May 2007) | 3 lines
2012-11-15 13:16:44 +11:00