linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,822 Commits 1 Branch 0 Tags
579ad59ebf645b630dd19c966d6b020de0a3211d
Commit Graph

307 Commits

Author SHA1 Message Date
Ferdi Franceschini
528d125efe Fixes SICS-144 
target value was wrong when checking scan variable.

r2623 | ffr | 2008-06-11 16:26:36 +1000 (Wed, 11 Jun 2008) | 3 lines
 2012-11-15 13:39:06 +11:00
Ferdi Franceschini
3d3ecdd83e Merged configuration from release 2.0P1 
Added appropriate defaults for frame source for each instrument.

r2619 | ffr | 2008-06-10 14:40:30 +1000 (Tue, 10 Jun 2008) | 3 lines
 2012-11-15 13:39:02 +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
Mark Lesha
0f2cde7ed9 Changed SICS username and password to 'SICS' to suit new histogram server. Port is still 8080. 
r2361 | mle | 2008-02-19 12:40:12 +1100 (Tue, 19 Feb 2008) | 2 lines
 2012-11-15 13:33:12 +11:00
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
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
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
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
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
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
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
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
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
Ferdi Franceschini
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
Ferdi Franceschini
75e7862cc6 Fix order of axes to match the order in which the histogram memory is written 
ie Time, Vertical, Horizontal.

r2171 | ffr | 2007-10-03 10:07:27 +1000 (Wed, 03 Oct 2007) | 3 lines
 2012-11-15 13:25:21 +11:00
Ferdi Franceschini
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

r2165 | ffr | 2007-09-26 16:21:23 +1000 (Wed, 26 Sep 2007) | 4 lines
 2012-11-15 13:25:00 +11:00
Ferdi Franceschini
7722ccaff3 Cosmetic changes. 
r2164 | ffr | 2007-09-26 16:19:39 +1000 (Wed, 26 Sep 2007) | 2 lines
 2012-11-15 13:24:56 +11:00
Ferdi Franceschini
f78b9cefd3 Removed obsolete tables from the histogram memory configuration. 
r2163 | ffr | 2007-09-26 16:19:06 +1000 (Wed, 26 Sep 2007) | 2 lines
 2012-11-15 13:24:52 +11:00
Ferdi Franceschini
9e170b66d3 Removed 'event' and 'ilist' kind for SICS objects. 
r2162 | ffr | 2007-09-26 16:17:51 +1000 (Wed, 26 Sep 2007) | 2 lines
 2012-11-15 13:24:49 +11:00
Ferdi Franceschini
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.

r2161 | ffr | 2007-09-26 16:13:03 +1000 (Wed, 26 Sep 2007) | 3 lines
 2012-11-15 13:24:45 +11:00
Ferdi Franceschini
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.

r2160 | ffr | 2007-09-26 16:11:40 +1000 (Wed, 26 Sep 2007) | 4 lines
 2012-11-15 13:24:42 +11:00
Ferdi Franceschini
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. 
r2159 | ffr | 2007-09-26 16:10:12 +1000 (Wed, 26 Sep 2007) | 2 lines
 2012-11-15 13:24:38 +11:00
Ferdi Franceschini
e33a7cf971 Modified documentation to work with the tcl-dox doxygen filter. 
r2147 | ffr | 2007-09-04 09:02:59 +1000 (Tue, 04 Sep 2007) | 2 lines
 2012-11-15 13:23:55 +11:00
Ferdi Franceschini
69afaec27e Removed legacy code and added Doxygen annotations. 
r2146 | ffr | 2007-09-03 13:55:26 +1000 (Mon, 03 Sep 2007) | 2 lines
 2012-11-15 13:23:51 +11:00
Mark Lesha
0ed6ecbffb Fixed insane typo. 
r2142 | mle | 2007-08-23 17:05:35 +1000 (Thu, 23 Aug 2007) | 2 lines
 2012-11-15 13:23:37 +11:00
Mark Lesha
943b0c8293 Added evcontroller sdsinfo and save commands 
r2141 | mle | 2007-08-23 16:42:40 +1000 (Thu, 23 Aug 2007) | 2 lines
 2012-11-15 13:23:33 +11:00
Ferdi Franceschini
c4fd7a4d9f Added environment controller as a sics object type to the new hdb/nexus code. 
r2137 | ffr | 2007-08-21 08:52:25 +1000 (Tue, 21 Aug 2007) | 2 lines
 2012-11-15 13:23:19 +11:00
Ferdi Franceschini
df40d6a26f Provide cylindrical detector support for Echidna and Wombat. 
Includes a proc to generate a two_theta axis from the X bin boundaries.

r2135 | ffr | 2007-08-16 17:14:51 +1000 (Thu, 16 Aug 2007) | 3 lines
 2012-11-15 13:23:12 +11:00
Ferdi Franceschini
6ce90065d3 Check scan variable limits before starting a scan. 
Added reset_position option to hmm_scan_finish to drive motors back to their start position at the end of a scan.

r2119 | ffr | 2007-08-16 16:03:14 +1000 (Thu, 16 Aug 2007) | 3 lines
 2012-11-15 13:22:14 +11:00
Ferdi Franceschini
530436b257 Set metadata for plc variables. 
r2118 | ffr | 2007-08-16 15:42:07 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:22:11 +11:00
Ferdi Franceschini
01890b5cff Initial scratch file support 
Added support for aliasing data.

r2117 | ffr | 2007-08-16 15:11:07 +1000 (Thu, 16 Aug 2007) | 3 lines
 2012-11-15 13:22:07 +11:00
Ferdi Franceschini
a8d5cff322 Added detector height and width variables. 
Use anstohm_linked.xml so we can override default config.
Specify alias names for data axes.
Define macros for generating X, Y, T axes from bin boundaries.
XXX_TABLE procs now support the following subcommands, -clear, -init, -get, -list
OAT_TABLE now calculates bin boundaries, this is useful for generating axes.
Initialise OAT and FAT tables.

r2116 | ffr | 2007-08-16 14:50:04 +1000 (Thu, 16 Aug 2007) | 8 lines
 2012-11-15 13:22:04 +11:00
Ferdi Franceschini
000de2ec2b Remove children list from spec. 
Added instrument klass.

r2115 | ffr | 2007-08-16 14:34:46 +1000 (Thu, 16 Aug 2007) | 3 lines
 2012-11-15 13:22:00 +11:00
Ferdi Franceschini
bf8d5e63be Add macros to hdb. 
r2114 | ffr | 2007-08-16 14:31:50 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:21:57 +11:00
Ferdi Franceschini
127249e294 Fixup paths to match nexus spec. 
r2112 | ffr | 2007-08-16 14:28:14 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:21:49 +11:00
Ferdi Franceschini
1feea01434 Fixup data paths and names to match nexus spec. 
r2111 | ffr | 2007-08-16 14:27:13 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:21:46 +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
Ferdi Franceschini
55347984ec Checked files modified by the merge with: 
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD

r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
 2012-11-15 13:16:23 +11:00