Commit Graph

45 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
a2289207c0 Added RELEASE_NUMBER: reference in comments
r2703 | ffr | 2008-09-24 11:37:59 +1000 (Wed, 24 Sep 2008) | 2 lines
2012-11-15 13:42:56 +11:00
Ferdi Franceschini
5411611352 First draft of "action" and "waitacion" commands
r2681 | ffr | 2008-08-26 14:09:09 +1000 (Tue, 26 Aug 2008) | 2 lines
2012-11-15 13:41:26 +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
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
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
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
Ferdi Franceschini
27db513c0e Report serverport number after loading configs.
r2220 | ffr | 2007-11-05 13:09:06 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:28:21 +11:00
Ferdi Franceschini
f54146b58e Added ::plc::inst_ready command which is used to check if the instrument is ready before starting a scan.
Also add plc simulation mode

r2202 | ffr | 2007-10-31 15:54:49 +1100 (Wed, 31 Oct 2007) | 3 lines
2012-11-15 13:27:15 +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
c4fd7a4d9f Added environment controller as a sics object type to the new hdb/nexus code.
r2137 | ffr | 2007-08-21 08:52:25 +1000 (Tue, 21 Aug 2007) | 2 lines
2012-11-15 13:23:19 +11:00
Ferdi Franceschini
f873ffce89 Allow named ports or port numbers for the SICS ports
Use nexus data names.
Set SICS object attributes for new hdb and nexus support.

r2110 | ffr | 2007-08-16 14:25:37 +1000 (Thu, 16 Aug 2007) | 4 lines
2012-11-15 13:21:42 +11:00
Ferdi Franceschini
8770acc191 Merged new hdb and nexus code.
r2099 | ffr | 2007-07-22 15:23:41 +1000 (Sun, 22 Jul 2007) | 2 lines
2012-11-15 13:21:03 +11:00
Douglas Clowes
416fbe4879 Configuration files mostly copied from Platypus Reflectometer
r2050 | dcl | 2007-07-09 15:25:57 +1000 (Mon, 09 Jul 2007) | 2 lines
2012-11-15 13:20:27 +11:00
Ferdi Franceschini
ebba5a8052 Added motor_simulation flag. If true then the motor_configuration.tcl files should create ANSTO simulated motor drivers.
r1951 | ffr | 2007-05-10 13:21:51 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:37 +11:00
Ferdi Franceschini
ade5216ea9 Merged Release 1.2
r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:32 +11:00
Ferdi Franceschini
f48217e383 Added option to select simulation mode for SICS.
r1853 | ffr | 2007-04-13 13:13:22 +1000 (Fri, 13 Apr 2007) | 2 lines
2012-11-15 13:14:42 +11:00
Ferdi Franceschini
fd8e8a6a3f Ensure zero offset for index into cvs keyword list values.
r1737 | ffr | 2007-03-28 13:24:36 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:11:04 +11:00
Ferdi Franceschini
932bf1bf18 Handle cases when only the cvs key value is set for $Revision:$ and $Name:$
r1735 | ffr | 2007-03-28 13:04:29 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:10:57 +11:00
Ferdi Franceschini
3df6a5a8da Added release tag and revision number info for SICS and the nexus data files.
r1731 | ffr | 2007-03-28 11:55:39 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:10:44 +11:00
Ferdi Franceschini
f48e601fc6 Add sics datafileName variable so we can provide automatic notification of filename changes.
r1622 | ffr | 2007-03-12 08:29:55 +1100 (Mon, 12 Mar 2007) | 2 lines
2012-11-15 13:05:26 +11:00
Ferdi Franceschini
012ce9a194 Set sics_release to development
r1610 | ffr | 2007-03-07 15:05:05 +1100 (Wed, 07 Mar 2007) | 2 lines
2012-11-15 13:04:54 +11:00
Ferdi Franceschini
e5c4650a30 Added detector_type and detector_description for metadata in nexus files.
r1595 | ffr | 2007-03-05 20:45:36 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:07 +11:00
Ferdi Franceschini
b2fa95bc05 Added sics_release variable. This will be set to the release tag.
r1567 | ffr | 2007-03-03 08:46:03 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:02:44 +11:00
Ferdi Franceschini
d939d28771 Set SicsDataPrefix from the Instrument variable.
r1526 | ffr | 2007-02-20 15:58:40 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:00:48 +11:00
Ferdi Franceschini
5ac29e785b Set batchpath to ../batch
r1503 | ffr | 2007-02-19 12:14:38 +1100 (Mon, 19 Feb 2007) | 2 lines
2012-11-15 12:59:45 +11:00
Ferdi Franceschini
4654c4c9c7 Modified to for new util, config directory structure.
r1497 | ffr | 2007-02-16 16:39:16 +1100 (Fri, 16 Feb 2007) | 2 lines
2012-11-15 12:59:28 +11:00
Ferdi Franceschini
c9379f4258 Move sicsdataprefix to instrument specific configuration files.
r1477 | ffr | 2007-02-13 16:21:01 +1100 (Tue, 13 Feb 2007) | 2 lines
2012-11-15 12:58:30 +11:00
Ferdi Franceschini
9ac6c7b414 Modified during MK's visit.
r1461 | ffr | 2007-02-12 12:01:02 +1100 (Mon, 12 Feb 2007) | 2 lines
2012-11-15 12:57:52 +11:00
Ferdi Franceschini
300dce063c Allow the data file suffix to be modified at runtime SicsDataPostFix
r1326 | ffr | 2006-11-30 08:26:29 +1100 (Thu, 30 Nov 2006) | 2 lines
2012-11-15 12:54:23 +11:00
Ferdi Franceschini
65d0b79508 Restored accidentally removed file.
r1244 | ffr | 2006-11-07 12:57:45 +1100 (Tue, 07 Nov 2006) | 2 lines
2012-11-15 12:51:16 +11:00
Ferdi Franceschini
899aaa90d5 Moved to hipadaba directory.
r1242 | ffr | 2006-11-07 12:20:07 +1100 (Tue, 07 Nov 2006) | 2 lines
2012-11-15 12:51:11 +11:00
Ferdi Franceschini
b263875f22 Using named ports.
r1184 | ffr | 2006-10-26 10:29:48 +1000 (Thu, 26 Oct 2006) | 2 lines
2012-11-15 12:49:09 +11:00
Ferdi Franceschini
24a131b265 Use relative path for sicsroot, this makes creating test deployments easier.
r1135 | ffr | 2006-10-13 08:49:52 +1000 (Fri, 13 Oct 2006) | 2 lines
2012-11-15 12:47:59 +11:00
Ferdi Franceschini
97680fc917 Set LogFileBaseName before other variables to maximise amount of information that gets logged
r1127 | ffr | 2006-10-09 13:03:59 +1000 (Mon, 09 Oct 2006) | 2 lines
2012-11-15 12:47:40 +11:00
Ferdi Franceschini
e96a42f581 Don't set instrument name here.
r1109 | ffr | 2006-09-07 14:59:35 +1000 (Thu, 07 Sep 2006) | 2 lines
2012-11-15 12:47:12 +11:00
Ferdi Franceschini
e3c462aa66 Keep all config files in one directory.
r1107 | ffr | 2006-09-06 13:51:41 +1000 (Wed, 06 Sep 2006) | 2 lines
2012-11-15 12:47:07 +11:00
Ferdi Franceschini
6e8501e19a Use the SICS* environment variables to locate configuration files and scripts.
r1104 | ffr | 2006-09-04 15:13:34 +1000 (Mon, 04 Sep 2006) | 2 lines
2012-11-15 12:47:00 +11:00
Ferdi Franceschini
d10c726ccf Common SICS configuration and some utility functions
r1080 | ffr | 2006-08-25 12:44:09 +1000 (Fri, 25 Aug 2006) | 2 lines
2012-11-15 12:46:20 +11:00