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
a8e95faacf
Cleanup
...
r2229 | ffr | 2007-11-05 13:30:16 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:28:56 +11:00
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
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
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
008249dc18
::nexus::data report error if trying to link a data axis which doesn't have an hdb node, ie privilege=internal
...
::nexus::nxscript::save
support saving mutable data from a sicsdata object
::nexus::nxscript::sdsinfo support mutable data
r2225 | ffr | 2007-11-05 13:20:36 +1100 (Mon, 05 Nov 2007) | 5 lines
2012-11-15 13:28:41 +11:00
5d491581e6
Added data, control, nxsave, mutable attributes to axes data scripts.
...
Fixed detector offset.
r2224 | ffr | 2007-11-05 13:18:40 +1100 (Mon, 05 Nov 2007) | 3 lines
2012-11-15 13:28:37 +11:00
8550b93a00
Adapted ::nexus::script::save to use sicsdata objects for data arrays returned from script -arrayname
...
Added data, control, nxsave, mutable attributes to axes data scripts.
r2223 | ffr | 2007-11-05 13:17:36 +1100 (Mon, 05 Nov 2007) | 4 lines
2012-11-15 13:28:33 +11:00
05c5b5ee12
Don't add objects which have privilege=internal to the hdb tree.
...
r2222 | ffr | 2007-11-05 13:14:25 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:28:29 +11:00
9b6fb6ac77
Added callstack procedure (useful for debugging)
...
r2221 | ffr | 2007-11-05 13:11:41 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:28:25 +11:00
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
9c1a9a37ae
Add TAS (taipan)
...
r2219 | dcl | 2007-11-05 11:46:05 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:28:18 +11:00
8d3817c9ef
Some code cleanup.
...
r2218 | ffr | 2007-11-01 13:04:31 +1100 (Thu, 01 Nov 2007) | 2 lines
2012-11-15 13:28:14 +11:00
6308cd312a
pre_hmm_scan_prepare now gets the chopper status and sets the histogram memor frequency to match it.
...
r2217 | ffr | 2007-11-01 13:03:16 +1100 (Thu, 01 Nov 2007) | 2 lines
2012-11-15 13:28:10 +11:00
59b953be0e
Move creation of hmm objects to common hmm configuration file.
...
pre_count does nothing now.
Added function to set hmm freq to match chopper freq and extended _histmem with a tochfreq subcommand.
r2216 | ffr | 2007-11-01 13:01:39 +1100 (Thu, 01 Nov 2007) | 4 lines
2012-11-15 13:28:06 +11:00
9a17f9249c
Moved creation of histogram objects (including simulated drivers) to here.
...
Added frame_source parameter ::histogram_memory::set_frame_freq with a default of INTERNAL. NOTE If the frequency parameter is zero then the frequency is set to 50Hz and the source is set to INTERNAL.
The instrument specific histogram memory configuration must now implement the "histmem" command and call the _histmem procedure, this lets us extend the command with instrument specific functions.
r2215 | ffr | 2007-11-01 12:57:43 +1100 (Thu, 01 Nov 2007) | 5 lines
2012-11-15 13:28:03 +11:00
beb622526f
Remove type prefixes from the "commands" which were refactored as tcl procedures.
...
r2214 | ffr | 2007-11-01 09:03:54 +1100 (Thu, 01 Nov 2007) | 2 lines
2012-11-15 13:27:59 +11:00
83b82e43d0
Set required attributes 'klass' and 'long_name' on two_theta virtual motor.
...
r2213 | ffr | 2007-10-31 17:16:46 +1100 (Wed, 31 Oct 2007) | 2 lines
2012-11-15 13:27:55 +11:00
16ec7dddff
Added the "is_drivable" query. This is useful for scan commands.
...
Added some error checking.
r2212 | ffr | 2007-10-31 17:15:17 +1100 (Wed, 31 Oct 2007) | 3 lines
2012-11-15 13:27:52 +11:00
991662fa5d
The fake motors now work with the current motor driver.
...
r2211 | ffr | 2007-10-31 17:10:30 +1100 (Wed, 31 Oct 2007) | 2 lines
2012-11-15 13:27:48 +11:00
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
a182c2f60b
Code cleanup
...
r2209 | ffr | 2007-10-31 17:07:10 +1100 (Wed, 31 Oct 2007) | 2 lines
2012-11-15 13:27:41 +11:00
f7d01ceb6b
Implemented ::scan::pre_hmm_scan_prepare hook to make sure that the chopper is ready before commencing a scan.
...
r2208 | ffr | 2007-10-31 17:05:15 +1100 (Wed, 31 Oct 2007) | 2 lines
2012-11-15 13:27:37 +11:00
5b5b3b4cc8
Use x,y bin boundaries for histogram horizontal and vertical axes.
...
Set the hmm frequency with the ::histogram_memory::set_frame_freq command to make sure that the maximum time bin is set properly.
r2207 | ffr | 2007-10-31 17:03:01 +1100 (Wed, 31 Oct 2007) | 3 lines
2012-11-15 13:27:33 +11:00
03b583655c
Added chopper "ready?" query and "get_frequency" command.
...
Also added chopper simulation mode.
r2206 | ffr | 2007-10-31 17:00:54 +1100 (Wed, 31 Oct 2007) | 3 lines
2012-11-15 13:27:30 +11:00
c661cf16a7
Check that the instrument is ready before starting a scan.
...
Added "runscan" command using syntax requested by Andy Nelson for platypus.
r2205 | ffr | 2007-10-31 16:51:16 +1100 (Wed, 31 Oct 2007) | 3 lines
2012-11-15 13:27:26 +11:00
f8c64b55a0
Save scratch files in data directory.
...
Refactor to have explicit ::nexus:: prefix on procedures.
r2204 | ffr | 2007-10-31 16:44:38 +1100 (Wed, 31 Oct 2007) | 3 lines
2012-11-15 13:27:22 +11:00
5c66aa29ac
Histogram memory data acquisition is now controlled by the histogram server.
...
Implemented "histmem" convenience command for use on command line and in batch files.
Make sure that the maximum time bin is set when setting the histogram memory frame frequency.
x_bin and y_bin axes are now available for nexus data entries.
r2203 | ffr | 2007-10-31 16:39:00 +1100 (Wed, 31 Oct 2007) | 5 lines
2012-11-15 13:27:19 +11:00
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
33e93c6d3d
Check for duplicate scan variables when adding a scan variable.
...
r2201 | ffr | 2007-10-31 15:49:16 +1100 (Wed, 31 Oct 2007) | 2 lines
2012-11-15 13:27:11 +11:00
9a2e98a0e3
Include motor_utility.tcl
...
r2200 | dcl | 2007-10-29 14:00:55 +1100 (Mon, 29 Oct 2007) | 2 lines
2012-11-15 13:27:08 +11:00
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
506bb5febc
Functions for creating and supporting motors
...
r2198 | dcl | 2007-10-29 13:58:12 +1100 (Mon, 29 Oct 2007) | 2 lines
2012-11-15 13:27:00 +11:00
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
f33f62ba20
Added pre_count method which sets the histogram frame frequency from the chopper frequency.
...
r2196 | ffr | 2007-10-23 14:01:36 +1000 (Tue, 23 Oct 2007) | 2 lines
2012-11-15 13:26:53 +11:00
a35b5573cf
Added dy attributes required for building hdb tree.
...
r2195 | ffr | 2007-10-23 13:59:36 +1000 (Tue, 23 Oct 2007) | 2 lines
2012-11-15 13:26:49 +11:00
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
3077fddc3b
We now take care of our own copy of the astrium chopper driver. It has the following changes.
...
Status is now updated on demand.
A status request returns a ready status message for the chopper as well as updating the chopper parameters.
We don't compensate for MW CMW on choppers 2 and 3.
PHASETOL=0.2
You can read the frequency from chopper one.
r2193 | ffr | 2007-10-23 12:58:13 +1000 (Tue, 23 Oct 2007) | 8 lines
2012-11-15 13:26:42 +11:00
3a7e6a9768
Added "abortbatch" command for use within batch files.
...
It gives a user the option of aborting a batch file if their code detects an error.
r2192 | ffr | 2007-10-23 12:46:16 +1000 (Tue, 23 Oct 2007) | 3 lines
2012-11-15 13:26:38 +11:00
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
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
8b1996996a
Terminition conditions when acquiring detector data are now controlled by the histogram server instead of the beam monitor. So more termination methods are now available and timed counts should be more precise.
...
hmm_configuration_common_1.tcl
Map hmm dim0,1,2 to histogram server OAT dimensions.
Added commands to set the histogram server count method, size and stop condition.
scan_common_1.tcl
hmscan is now controlled by the histogram server instead of the beam monitor.
NOTE: the mode and preset parameters for hmscan run are now ignored in favour of the parameters set on the hmm object.
r2189 | ffr | 2007-10-23 12:40:09 +1000 (Tue, 23 Oct 2007) | 10 lines
2012-11-15 13:26:27 +11:00
8e6d4e4da6
hipadaba_configuration_common.tcl
...
Check all kinds of hdb nodes for units.
nxscripts_common_1.tcl
Make units optional when saving data.
Catch histogram memory savecmd errors.
r2188 | ffr | 2007-10-23 12:32:41 +1000 (Tue, 23 Oct 2007) | 7 lines
2012-11-15 13:26:23 +11:00
9c307402cc
Fix a couple of typos, reimplement thread zero checks and amplifier error checks. (Disable amplifier error checks pending controllers returning good status for all OK motors.)
...
r2187 | dcl | 2007-10-22 13:26:54 +1000 (Mon, 22 Oct 2007) | 2 lines
2012-11-15 13:26:20 +11:00
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
a4d7cb12cc
Begin migration of motor positions from encoder counts to motor units (mm/degree)
...
r2185 | dcl | 2007-10-17 08:36:19 +1000 (Wed, 17 Oct 2007) | 2 lines
2012-11-15 13:26:13 +11:00
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
5d311bf61f
A bit more rationalisation
...
r2183 | dcl | 2007-10-11 18:00:02 +1000 (Thu, 11 Oct 2007) | 2 lines
2012-11-15 13:26:05 +11:00
34d8abac97
convert radians to degrees
...
r2182 | dcl | 2007-10-11 17:58:54 +1000 (Thu, 11 Oct 2007) | 2 lines
2012-11-15 13:26:02 +11:00
50ac8c30e7
commissioning iteration
...
r2181 | dcl | 2007-10-11 17:57:58 +1000 (Thu, 11 Oct 2007) | 2 lines
2012-11-15 13:25:58 +11:00
Ferdi Franceschini