a9617da982
Don't make plc object when in simulated mode.
Ferdi Franceschini
2007-11-08 17:02:24 +11:00
0cf9f1d35f
commissioning refinement
Douglas Clowes
2007-11-08 09:46:46 +11:00
56f7cde455
Remove old code.
Ferdi Franceschini
2007-11-07 15:57:40 +11:00
45fb8a2865
Set maximum number of channels when using simulated driver.
Ferdi Franceschini
2007-11-07 15:57:02 +11:00
a1a07d3d0f
Set the default scan finish behaviour for the "runscan" command to to reset the scan motor to the start position
Ferdi Franceschini
2007-11-07 15:56:33 +11:00
bc19061460
Don't make plc object when in simulated mode.
Ferdi Franceschini
2007-11-07 15:54:45 +11:00
6c63380822
Provide a runscan_reset_position variable so we can make the "runscan" command behaviour instrument specific. It defaults to false, which means that the scan motor position won't be reset on scan finish.
Ferdi Franceschini
2007-11-07 15:51:37 +11:00
b6d7cb5e1b
Default to using boundaries for two_theta values.
Ferdi Franceschini
2007-11-07 15:48:42 +11:00
0c6e24747f
Make the default frame source setting instrument specific
Ferdi Franceschini
2007-11-07 15:47:34 +11:00
04d0a2ab9a
Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS.
Ferdi Franceschini
2007-11-07 15:44:44 +11:00
a19b2864e1
Don't set current position to target value when respond to a STop.
Ferdi Franceschini
2007-11-07 15:42:31 +11:00
1c181fb68f
Handle INT1712 1 interrupts in MotorOn state. This can happen if you abort an operation during a posfault retry or immediately after a run/drive command.
Ferdi Franceschini
2007-11-07 15:41:21 +11:00
d6f484f6dc
We can now STop motors when SICS gets and INT1712 1
Ferdi Franceschini
2007-11-06 14:49:11 +11:00
75ae6a9445
Don't create a plc object when in the simulated plc mode.
Ferdi Franceschini
2007-11-06 14:48:13 +11:00
5eaae53de0
Remove namespace qualification when setting attributes on runscan
Ferdi Franceschini
2007-11-06 14:47:01 +11:00
2853f0ae66
Hide hmm objects from gumtree control view. Improve feedback.
Ferdi Franceschini
2007-11-06 14:43:46 +11:00
ebf70bfe5c
Bug fixes and improved error handling, more on controller variables
Douglas Clowes
2007-11-06 08:50:18 +11:00
f4f1c5f152
commissioning refinement
Douglas Clowes
2007-11-06 08:47:17 +11:00
0b53e28ef0
We're now saving two theta, not polar angle.
Ferdi Franceschini
2007-11-05 14:23:46 +11:00
e8982428e0
Add convenience histmem command wrapper for command line users. Improve simulation support.
Ferdi Franceschini
2007-11-05 13:25:15 +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
Ferdi Franceschini
2007-11-05 13:20:36 +11:00
5d491581e6
Added data, control, nxsave, mutable attributes to axes data scripts. Fixed detector offset.
Ferdi Franceschini
2007-11-05 13:18:40 +11:00
8550b93a00
Adapted ::nexus::script::save to use sicsdata objects for data arrays returned from script -arrayname
Ferdi Franceschini
2007-11-05 13:17:36 +11:00
05c5b5ee12
Don't add objects which have privilege=internal to the hdb tree.
Ferdi Franceschini
2007-11-05 13:14:25 +11:00
27db513c0e
Report serverport number after loading configs.
Ferdi Franceschini
2007-11-05 13:09:06 +11:00
9c1a9a37ae
Add TAS (taipan)
Douglas Clowes
2007-11-05 11:46:05 +11:00
8d3817c9ef
Some code cleanup.
Ferdi Franceschini
2007-11-01 13:04:31 +11:00
6308cd312a
pre_hmm_scan_prepare now gets the chopper status and sets the histogram memor frequency to match it.
Ferdi Franceschini
2007-11-01 13:03:16 +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.
Ferdi Franceschini
2007-11-01 13:01:39 +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.
Ferdi Franceschini
2007-11-01 12:57:43 +11:00
beb622526f
Remove type prefixes from the "commands" which were refactored as tcl procedures.
Ferdi Franceschini
2007-11-01 09:03:54 +11:00
83b82e43d0
Set required attributes 'klass' and 'long_name' on two_theta virtual motor.
Ferdi Franceschini
2007-10-31 17:16:46 +11:00
16ec7dddff
Added the "is_drivable" query. This is useful for scan commands. Added some error checking.
Ferdi Franceschini
2007-10-31 17:15:17 +11:00
991662fa5d
The fake motors now work with the current motor driver.
Ferdi Franceschini
2007-10-31 17:10:30 +11:00
34c0c59594
eval the "drive" command to make sure that the parameters aren't interpreted as a single list value.
Ferdi Franceschini
2007-10-31 17:09:45 +11:00
f7d01ceb6b
Implemented ::scan::pre_hmm_scan_prepare hook to make sure that the chopper is ready before commencing a scan.
Ferdi Franceschini
2007-10-31 17:05:15 +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.
Ferdi Franceschini
2007-10-31 17:03:01 +11:00
03b583655c
Added chopper "ready?" query and "get_frequency" command. Also added chopper simulation mode.
Ferdi Franceschini
2007-10-31 17:00:54 +11:00
c661cf16a7
Check that the instrument is ready before starting a scan. Added "runscan" command using syntax requested by Andy Nelson for platypus.
Ferdi Franceschini
2007-10-31 16:51:16 +11:00
f8c64b55a0
Save scratch files in data directory. Refactor to have explicit ::nexus:: prefix on procedures.
Ferdi Franceschini
2007-10-31 16:44:38 +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.
Ferdi Franceschini
2007-10-31 16:39:00 +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
Ferdi Franceschini
2007-10-31 15:54:49 +11:00
33e93c6d3d
Check for duplicate scan variables when adding a scan variable.
Ferdi Franceschini
2007-10-31 15:49:16 +11:00
9a2e98a0e3
Include motor_utility.tcl
Douglas Clowes
2007-10-29 14:00:55 +11:00
317c7398ca
Move functions to motor_utility
Douglas Clowes
2007-10-29 13:59:58 +11:00
506bb5febc
Functions for creating and supporting motors
Douglas Clowes
2007-10-29 13:58:12 +11:00
d5a0489a3b
commissioning refinement
Douglas Clowes
2007-10-26 10:59:12 +10:00
f33f62ba20
Added pre_count method which sets the histogram frame frequency from the chopper frequency.
Ferdi Franceschini
2007-10-23 14:01:36 +10:00
a35b5573cf
Added dy attributes required for building hdb tree.
Ferdi Franceschini
2007-10-23 13:59:36 +10:00
3fcb976816
Optics subsystem. Currently only guide configuration is implemented.
Ferdi Franceschini
2007-10-23 12:59:44 +10:00
3077fddc3b
We now take care of our own copy of the astrium chopper driver. It has the following changes.
Ferdi Franceschini
2007-10-23 12:58:13 +10: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.
Ferdi Franceschini
2007-10-23 12:46:16 +10:00
7b0162177e
Added optics subsystem path. Also added chopper_simulation flag for platypus.
Ferdi Franceschini
2007-10-23 12:42:52 +10:00
2018e71b8f
Set rank for hmm objects.
Ferdi Franceschini
2007-10-23 12:41:00 +10: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.
Ferdi Franceschini
2007-10-23 12:40:09 +10:00
8e6d4e4da6
hipadaba_configuration_common.tcl Check all kinds of hdb nodes for units.
Ferdi Franceschini
2007-10-23 12:32:41 +10: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.)
Douglas Clowes
2007-10-22 13:26:54 +10:00
6c357b6fdc
commissioning iteration
Douglas Clowes
2007-10-22 13:24:33 +10:00
a4d7cb12cc
Begin migration of motor positions from encoder counts to motor units (mm/degree)
Douglas Clowes
2007-10-17 08:36:19 +10:00
9052167b7f
Rename Physical Collimator motors from cx to pcx and virtual motors from vc0x to cx
Douglas Clowes
2007-10-17 08:35:07 +10:00
5d311bf61f
A bit more rationalisation
Douglas Clowes
2007-10-11 18:00:02 +10:00
34d8abac97
convert radians to degrees
Douglas Clowes
2007-10-11 17:58:54 +10:00
50ac8c30e7
commissioning iteration
Douglas Clowes
2007-10-11 17:57:58 +10:00
e04b31a2b8
Turn axis F motor on/off
Douglas Clowes
2007-10-09 11:44:16 +10:00
4c569fcd5e
Fix typo in variable name
Douglas Clowes
2007-10-09 09:28:53 +10:00
79595e0e03
Generated files
Douglas Clowes
2007-10-05 12:01:17 +10:00
06fba540ec
Commissioning iteration
Douglas Clowes
2007-10-05 11:55:46 +10:00
5ee42733ba
Commissioning iteration
Douglas Clowes
2007-10-04 09:15:02 +10:00
d8117b6b8b
histogram_memory::setmode is obsolete. So it's gone.
Ferdi Franceschini
2007-10-04 08:33:28 +10:00
8fa8fd8806
Don't upload the histogram server configuration twice.
Ferdi Franceschini
2007-10-03 11:55:12 +10:00
67a8a8c0c3
Fixed maximum and minimum bin boundaries. Code cleanup.
Ferdi Franceschini
2007-10-03 10:08:40 +10:00
75e7862cc6
Fix order of axes to match the order in which the histogram memory is written ie Time, Vertical, Horizontal.
Ferdi Franceschini
2007-10-03 10:07:27 +10:00
67810158ee
refactor SZ steps and counts equations
Douglas Clowes
2007-10-02 12:43:43 +10:00
dc266a1c92
convert 'send' arguments to upper case and substitute '%' and '`' with axis_label
Douglas Clowes
2007-10-02 12:41:34 +10:00
f7cce8d15a
Commissioning changes
Douglas Clowes
2007-10-02 11:31:00 +10:00
72e0d389e5
Calculate non-overlapping UID based port numbers when running sics from your home directory
Ferdi Franceschini
2007-09-26 16:23:57 +10:00
a173158d0e
Create extra hmm objects to fetch xy, yt, t, ..., etc. data from the histogram server.
Ferdi Franceschini
2007-09-26 16:22:43 +10:00
0edaa1d5d0
Added code and filetype spec for data file policy Added environment controller save and sdsinfo commands. Dynamically set histogram memory rank and dimensions for data file
Ferdi Franceschini
2007-09-26 16:21:23 +10:00
f78b9cefd3
Removed obsolete tables from the histogram memory configuration.
Ferdi Franceschini
2007-09-26 16:19:06 +10:00
9e170b66d3
Removed 'event' and 'ilist' kind for SICS objects.
Ferdi Franceschini
2007-09-26 16:17:51 +10:00
78c42a2427
Don't set plottable data links and data save policy here, this is now taken care of when setting the data file policy with the 'newfile' command. Only check if scan variables of type=motor are locked (ie 'fixed') in position before running a scan.
Ferdi Franceschini
2007-09-26 16:13:03 +10:00
baaeb44fc3
Don't set plottable data links and data save policy here, this is now taken care of when setting the data file policy with the 'newfile' command. Use common interface for hmm server TABLE configuration commands. Remove obsolete code.
Ferdi Franceschini
2007-09-26 16:11:40 +10:00
39fd5d2a4a
Don't set plottable data links and data save policy here, this is now taken care of when setting the data file policy with the 'newfile' command.
Ferdi Franceschini
2007-09-26 16:10:12 +10:00
08296df12f
Send a warning message if a scan point is skipped because of a drive or count failure.
Ferdi Franceschini
2007-09-26 14:20:27 +10:00
5322cb8254
Replace the space in the "Environment Controller" type with an underscore so that it can be easily parsed as a single token.
Ferdi Franceschini
2007-09-26 14:19:39 +10:00
0b583db52f
Ensure that the state monitor reports the full node path when a device is started via hipadaba.
Ferdi Franceschini
2007-09-26 14:17:19 +10:00
efb0b117f6
POSIT handling code for position-mode motors and a little refactoring
Douglas Clowes
2007-09-26 09:50:53 +10:00
bef9e542ae
Commissioning calibration of collimator virtual collimator motors
Douglas Clowes
2007-09-26 09:33:29 +10:00
07a1d939d9
Posit config for collimator Config for detector Y translation motor
Douglas Clowes
2007-09-26 09:31:44 +10:00
4eae37065b
Controller files added
Dan Bartlett
2007-09-24 14:40:45 +10:00
846d6e7b15
no message
Dan Bartlett
2007-09-24 11:29:31 +10:00
5bbbe9b419
no message
Dan Bartlett
2007-09-24 11:20:08 +10:00
ad2b41fef2
no message
Dan Bartlett
2007-09-24 11:10:59 +10:00
Ferdi Franceschini