Commit Graph

210 Commits

Author SHA1 Message Date
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
Dan Bartlett
ad2b41fef2 no message
r2149 | dbx | 2007-09-24 11:10:59 +1000 (Mon, 24 Sep 2007) | 2 lines
2012-11-15 13:24:02 +11:00
Dan Bartlett
88489adc49 fast shutter code added
r2140 | dbx | 2007-08-23 15:48:22 +1000 (Thu, 23 Aug 2007) | 2 lines
2012-11-15 13:23:30 +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
b09d07915c Restore status from status.tcl when initialising SICS
Initialise hmm.

r2130 | ffr | 2007-08-16 17:04:07 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:22:54 +11:00
Ferdi Franceschini
2b2ec38ceb Don't MakeAsyncQueue when using simulated driver.
r2124 | ffr | 2007-08-16 16:40:00 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:22:32 +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
Dan Bartlett
85774be9f9 no message
r2113 | dbx | 2007-08-16 14:31:07 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:21:53 +11:00
Douglas Clowes
ce3e240c53 fix some typos and update measured home positions
r2108 | dcl | 2007-08-10 10:34:32 +1000 (Fri, 10 Aug 2007) | 2 lines
2012-11-15 13:21:35 +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
Dan Bartlett
1d35fb41b4 IP addresses changed. reduced by 2
r2081 | dbx | 2007-07-20 10:35:09 +1000 (Fri, 20 Jul 2007) | 2 lines
2012-11-15 13:20:52 +11:00
Douglas Clowes
85d58121a5 progressive commissioning
r2080 | dcl | 2007-07-20 10:05:00 +1000 (Fri, 20 Jul 2007) | 2 lines
2012-11-15 13:20:48 +11:00
Douglas Clowes
8a7108deca Copied from Platypus Reflectometer
r2054 | dcl | 2007-07-09 16:02:35 +1000 (Mon, 09 Jul 2007) | 2 lines
2012-11-15 13:20:38 +11:00
Douglas Clowes
9404d80fb9 place holder
r2052 | dcl | 2007-07-09 15:55:16 +1000 (Mon, 09 Jul 2007) | 2 lines
2012-11-15 13:20:34 +11:00
Douglas Clowes
75deabc9cc moved to config/velsel
r2051 | dcl | 2007-07-09 15:27:18 +1000 (Mon, 09 Jul 2007) | 2 lines
2012-11-15 13:20:31 +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