linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,021 Commits 1 Branch 0 Tags
c7794c40924db3c941cb6661a7c08e5c36da8d04
Commit Graph

1021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
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
Douglas Clowes
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
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
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
Douglas Clowes
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