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

141 Commits

Author SHA1 Message Date
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
Ferdi Franceschini
4594b23f13 Merged in favour of branch. 
Get the horizontal and vertical axis names for the data from the _hmm_{hor,vert}_axis SICS variables when saving data.
These variables are set by the command which collects the data.

r1944 | ffr | 2007-05-08 14:58:51 +1000 (Tue, 08 May 2007) | 4 lines
 2012-11-15 13:16:16 +11:00
Ferdi Franceschini
c01188bc8b Fixed order of histogram memory data axes. 
r1903 | ffr | 2007-04-23 10:34:44 +1000 (Mon, 23 Apr 2007) | 2 lines
 2012-11-15 13:15:46 +11:00
Ferdi Franceschini
ade5216ea9 Merged Release 1.2 
r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:32 +11:00
Ferdi Franceschini
487f370d5e Added extended hmake "xhmake" to make it easier to create long paths. 
r1857 | ffr | 2007-04-16 14:44:25 +1000 (Mon, 16 Apr 2007) | 2 lines
 2012-11-15 13:14:55 +11:00
Ferdi Franceschini
1c65171e4e Create beam monitor in instrument specific configuration and provide option for creating simulated beam monitor driver. 
r1851 | ffr | 2007-04-13 12:52:49 +1000 (Fri, 13 Apr 2007) | 2 lines
 2012-11-15 13:14:35 +11:00
Ferdi Franceschini
e7324b8335 Merged RELEASE-1_1 back into trunk. 
r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines
 2012-11-15 13:13:55 +11:00
Ferdi Franceschini
f38e44c8d8 Construct motor hipadaba paths from type and group info 
in the "motor part" field.

r1785 | ffr | 2007-04-02 18:19:17 +1000 (Mon, 02 Apr 2007) | 3 lines
 2012-11-15 13:13:42 +11:00
Ferdi Franceschini
f3a6c7bd49 OK, now here's the thing. 
You have to save a dataset before you can link a VGroup to it.

r1779 | ffr | 2007-04-01 15:44:56 +1000 (Sun, 01 Apr 2007) | 3 lines
 2012-11-15 13:13:22 +11:00
Ferdi Franceschini
3e8375c974 What's the point? 
ie I forgot to set the run number.

r1778 | ffr | 2007-04-01 15:38:16 +1000 (Sun, 01 Apr 2007) | 3 lines
 2012-11-15 13:13:19 +11:00
Ferdi Franceschini
9fbaec72fd The procedure which writes the data must write the run_number. 
r1777 | ffr | 2007-04-01 15:34:26 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:13:15 +11:00
Ferdi Franceschini
aded505558 The run number should be written when making a new scan entry. 
r1776 | ffr | 2007-04-01 15:29:08 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:13:12 +11:00
Ferdi Franceschini
486b82c526 Fixed call to nxscript. 
r1775 | ffr | 2007-04-01 15:19:04 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:13:09 +11:00
Ferdi Franceschini
cae44262ab Match up x and y pixel_offsets with the corresponding dimension. 
r1774 | ffr | 2007-04-01 15:15:44 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:13:06 +11:00
Ferdi Franceschini
935116cb9b dim0 is vertical 
dim1 is horizontal
It's the C order thing, rows columns.

r1773 | ffr | 2007-04-01 15:01:27 +1000 (Sun, 01 Apr 2007) | 4 lines
 2012-11-15 13:13:02 +11:00
Ferdi Franceschini
374151be26 Fixed mixups between sics variables and tcl variables, and nxdict aliases with nexus dataset names. 
r1772 | ffr | 2007-04-01 14:53:39 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:12:59 +11:00
Ferdi Franceschini
b1b0057d8b For want of a space the battle was lost. 
r1771 | ffr | 2007-04-01 14:51:58 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:12:55 +11:00