Commit Graph

839 Commits

Author SHA1 Message Date
Ferdi Franceschini
1732ecdb99 Made sure that we run "hmm init" in a catch block to catch any attempt to modify an hmm parameter when it's not allowed.
The histmem command now returns clean error messages.
Stack traces are displayed for errors which are triggered from the second call level with the histmem command.
Made sure that catch blocks don't enclose a 'return' because this triggers the catch to report the contents of errorInfo.
Removed obsolete setup procedure.
Made sure that uploading of configuration files to the histogram server is only enabled for the 'hmm' object in the ::histogram_memory::upload_config procedure.  Uploading config files is disabled for all other histmem objects at all times.

r2282 | ffr | 2008-01-15 14:53:47 +1100 (Tue, 15 Jan 2008) | 7 lines
2012-11-15 13:32:15 +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
cad1e0a4d5 Handle change to asyncqueue to handle binary protocols
r2280 | dcl | 2008-01-15 12:37:52 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:32:08 +11:00
Douglas Clowes
2ebe674425 Detector Y motor initial configuration
r2279 | dcl | 2008-01-15 12:36:59 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:32:04 +11:00
Douglas Clowes
2c334ba3c2 commissioning refinement
r2278 | dcl | 2008-01-15 12:36:08 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:32:00 +11:00
Douglas Clowes
8bd0037997 Add ORHVPS and FSM
r2275 | dcl | 2008-01-15 12:30:01 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:31:49 +11:00
Douglas Clowes
24621a0562 Add ORHVPS initialisation
r2274 | dcl | 2008-01-15 12:29:35 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:31:45 +11:00
Douglas Clowes
722fd4b539 Oak Ridge (Ordella) High Voltage Power Supply environment controller
r2273 | dcl | 2008-01-15 12:28:38 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:31:41 +11:00
Douglas Clowes
ebdcc7be0b Extracted abstract Finite State Machine (from DMC2280 motor driver)
r2272 | dcl | 2008-01-15 12:27:25 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:31:37 +11:00
Douglas Clowes
c75e16d4bd Handle change to asyncqueue to handle binary protocols
r2271 | dcl | 2008-01-15 12:25:16 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:31:34 +11:00
Douglas Clowes
5874e38152 text formatting
r2270 | dcl | 2008-01-15 12:23:36 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:31:30 +11:00
Douglas Clowes
8325c68cea Fix uninitialized variable
r2269 | dcl | 2008-01-15 12:21:08 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:31:26 +11:00
Douglas Clowes
3926e47ab5 Change floats to doubles, controller virtual motor variables, a little refactoring
r2264 | dcl | 2007-12-07 10:38:34 +1100 (Fri, 07 Dec 2007) | 2 lines
2012-11-15 13:31:08 +11:00
Douglas Clowes
32595554bc Incremental commissioning and calibration
r2261 | dcl | 2007-12-07 10:22:38 +1100 (Fri, 07 Dec 2007) | 2 lines
2012-11-15 13:30:56 +11:00
Douglas Clowes
a2fb2b9571 Redirect from Echidna to Kowari PLC inputs
r2260 | dcl | 2007-12-07 10:21:00 +1100 (Fri, 07 Dec 2007) | 2 lines
2012-11-15 13:30:53 +11:00
Douglas Clowes
0634295e45 Detector Y axis
r2259 | dcl | 2007-12-07 10:19:54 +1100 (Fri, 07 Dec 2007) | 2 lines
2012-11-15 13:30:49 +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
b07f75f756 Added frame source option to histmem.
Allow forcing of frame source to internal (useful for scans on Platypus)

r2257 | ffr | 2007-11-09 17:09:36 +1100 (Fri, 09 Nov 2007) | 3 lines
2012-11-15 13:30:41 +11:00
Ferdi Franceschini
21796674c3 Changed names to protect the innocent.
r2256 | ffr | 2007-11-09 17:07:30 +1100 (Fri, 09 Nov 2007) | 2 lines
2012-11-15 13:30:37 +11:00
Douglas Clowes
2cb9e55f63 change counts and steps to integer for 31bit encoder handling
r2255 | dcl | 2007-11-09 14:08:46 +1100 (Fri, 09 Nov 2007) | 2 lines
2012-11-15 13:30:34 +11:00
Douglas Clowes
83ac14eeac commissioning refinement
r2254 | dcl | 2007-11-09 10:38:23 +1100 (Fri, 09 Nov 2007) | 2 lines
2012-11-15 13:30:30 +11:00
Douglas Clowes
52a5be7c0d A bit of refactoring and a bug fix
r2253 | dcl | 2007-11-09 09:49:19 +1100 (Fri, 09 Nov 2007) | 2 lines
2012-11-15 13:30:26 +11:00
Douglas Clowes
5eb6f4330b commissioning refinement
r2252 | dcl | 2007-11-09 09:47:47 +1100 (Fri, 09 Nov 2007) | 2 lines
2012-11-15 13:30:22 +11:00
Ferdi Franceschini
3d81b204d6 Frame source now defaults to EXTERNAL if setting a non-zero frame frequency.
r2251 | ffr | 2007-11-09 08:34:17 +1100 (Fri, 09 Nov 2007) | 2 lines
2012-11-15 13:30:19 +11:00
Ferdi Franceschini
3489c4c7cc You can now save data in the toplevel of an NXentry
r2250 | ffr | 2007-11-08 17:05:26 +1100 (Thu, 08 Nov 2007) | 2 lines
2012-11-15 13:30:15 +11:00
Ferdi Franceschini
643b2bad1b Now supports adding toplevel entries to an NXentry.
Added start_time and end_time.

r2249 | ffr | 2007-11-08 17:04:07 +1100 (Thu, 08 Nov 2007) | 3 lines
2012-11-15 13:30:11 +11:00
Ferdi Franceschini
a9617da982 Don't make plc object when in simulated mode.
r2248 | ffr | 2007-11-08 17:02:24 +1100 (Thu, 08 Nov 2007) | 2 lines
2012-11-15 13:30:07 +11:00
Douglas Clowes
0cf9f1d35f commissioning refinement
r2247 | dcl | 2007-11-08 09:46:46 +1100 (Thu, 08 Nov 2007) | 2 lines
2012-11-15 13:30:04 +11:00
Ferdi Franceschini
56f7cde455 Remove old code.
r2246 | ffr | 2007-11-07 15:57:40 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:30:00 +11:00
Ferdi Franceschini
45fb8a2865 Set maximum number of channels when using simulated driver.
r2245 | ffr | 2007-11-07 15:57:02 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:56 +11:00
Ferdi Franceschini
a1a07d3d0f Set the default scan finish behaviour for the "runscan" command to to reset the scan motor to the start position
r2244 | ffr | 2007-11-07 15:56:33 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:52 +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
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.
r2242 | ffr | 2007-11-07 15:51:37 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:44 +11:00
Ferdi Franceschini
b6d7cb5e1b Default to using boundaries for two_theta values.
r2241 | ffr | 2007-11-07 15:48:42 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:41 +11:00
Ferdi Franceschini
0c6e24747f Make the default frame source setting instrument specific
r2240 | ffr | 2007-11-07 15:47:34 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:37 +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
a19b2864e1 Don't set current position to target value when respond to a STop.
r2238 | ffr | 2007-11-07 15:42:31 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:29 +11:00
Ferdi Franceschini
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.
Handle TimeOut events during Idle state.  These have been observed to occur when a scan skips a point because of a drive failure.

r2237 | ffr | 2007-11-07 15:41:21 +1100 (Wed, 07 Nov 2007) | 4 lines
2012-11-15 13:29:25 +11:00
Ferdi Franceschini
d6f484f6dc We can now STop motors when SICS gets and INT1712 1
r2236 | ffr | 2007-11-06 14:49:11 +1100 (Tue, 06 Nov 2007) | 2 lines
2012-11-15 13:29:22 +11:00
Ferdi Franceschini
75ae6a9445 Don't create a plc object when in the simulated plc mode.
r2235 | ffr | 2007-11-06 14:48:13 +1100 (Tue, 06 Nov 2007) | 2 lines
2012-11-15 13:29:18 +11:00
Ferdi Franceschini
5eaae53de0 Remove namespace qualification when setting attributes on runscan
r2234 | ffr | 2007-11-06 14:47:01 +1100 (Tue, 06 Nov 2007) | 2 lines
2012-11-15 13:29:14 +11:00
Ferdi Franceschini
2853f0ae66 Hide hmm objects from gumtree control view.
Improve feedback.

r2233 | ffr | 2007-11-06 14:43:46 +1100 (Tue, 06 Nov 2007) | 3 lines
2012-11-15 13:29:11 +11:00
Douglas Clowes
ebf70bfe5c Bug fixes and improved error handling, more on controller variables
r2232 | dcl | 2007-11-06 08:50:18 +1100 (Tue, 06 Nov 2007) | 2 lines
2012-11-15 13:29:07 +11:00
Douglas Clowes
f4f1c5f152 commissioning refinement
r2231 | dcl | 2007-11-06 08:47:17 +1100 (Tue, 06 Nov 2007) | 2 lines
2012-11-15 13:29:03 +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
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
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
Ferdi Franceschini
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