Commit Graph

265 Commits

Author SHA1 Message Date
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
Ferdi Franceschini
2d7cf89385 Set x and y pixel offsets and run number.
The run number is used as the first dimension axis for
simple count and save operations.

r1770 | ffr | 2007-04-01 14:36:09 +1000 (Sun, 01 Apr 2007) | 4 lines
2012-11-15 13:12:52 +11:00
Ferdi Franceschini
e67510e6bd Fetch descriptive motor name from the motor's long_name field.
r1769 | ffr | 2007-04-01 12:34:29 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:49 +11:00
Ferdi Franceschini
aa1d192960 Revert to allowing no value for nx schema release attribute.
So if there is no release there will be no release tag entries in the file.

r1763 | ffr | 2007-04-01 10:20:32 +1000 (Sun, 01 Apr 2007) | 3 lines
2012-11-15 13:12:29 +11:00
Ferdi Franceschini
68298124bf Try to ensure that the nx_content_release_tag attribute has at least a blank value.
r1762 | ffr | 2007-04-01 10:14:44 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:26 +11:00
Ferdi Franceschini
abb82d02ea Restored $Name:$ and $Revision:$ keywords.
r1760 | ffr | 2007-04-01 09:40:39 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:19 +11:00
Ferdi Franceschini
8d6b79db3a Link scanvariable to scan dataset and set axes attribute on data.
r1759 | ffr | 2007-03-31 14:49:10 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:12:16 +11:00
Ferdi Franceschini
7526a7b93d Modified the simulated hmm configurations so that they now source the common config and override the hmc control, the histogram::initialize and the histogram::hmmdititemval procs.
r1753 | ffr | 2007-03-31 11:27:52 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:11:56 +11:00
Ferdi Franceschini
53e7a69cb0 Removed duplicate parameters for hmm in putslab call.
r1752 | ffr | 2007-03-31 09:44:06 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:11:53 +11:00
Ferdi Franceschini
7391c7122d Make sure that putslab gets the histogram memory directly just in case we need to do an unbuffered hmm get as is the case for wombat.
r1746 | ffr | 2007-03-30 17:54:55 +1000 (Fri, 30 Mar 2007) | 2 lines
2012-11-15 13:11:33 +11:00
Ferdi Franceschini
a617837388 Update ::histogram_memory::save to handle writing to growable 3D arrays.
r1745 | ffr | 2007-03-30 17:51:35 +1000 (Fri, 30 Mar 2007) | 2 lines
2012-11-15 13:11:30 +11:00
Ferdi Franceschini
e0e6bed82e Initial support for growing multidimensional histogram memory datasets.
r1744 | ffr | 2007-03-30 17:21:49 +1000 (Fri, 30 Mar 2007) | 2 lines
2012-11-15 13:11:26 +11:00
Ferdi Franceschini
83a528ad10 Use nexus compliant name for phone number.
r1743 | ffr | 2007-03-30 17:20:53 +1000 (Fri, 30 Mar 2007) | 2 lines
2012-11-15 13:11:23 +11:00
Ferdi Franceschini
fd8e8a6a3f Ensure zero offset for index into cvs keyword list values.
r1737 | ffr | 2007-03-28 13:24:36 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:11:04 +11:00
Ferdi Franceschini
ee3fc81807 Fixed setting of nx_content_revision_num variable.
r1736 | ffr | 2007-03-28 13:15:08 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:11:00 +11:00
Ferdi Franceschini
932bf1bf18 Handle cases when only the cvs key value is set for $Revision:$ and $Name:$
r1735 | ffr | 2007-03-28 13:04:29 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:10:57 +11:00
Ferdi Franceschini
b2706c74cf Fixed attribute syntax for nx release and revision tags.
r1734 | ffr | 2007-03-28 12:28:37 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:10:54 +11:00
Ferdi Franceschini
3df6a5a8da Added release tag and revision number info for SICS and the nexus data files.
r1731 | ffr | 2007-03-28 11:55:39 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:10:44 +11:00
Ferdi Franceschini
1035b72981 Set long_name on motors.
r1730 | ffr | 2007-03-28 10:25:33 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:10:41 +11:00
Ferdi Franceschini
d49a7be3bb Create single entry nexus files for scans with instrument state in 1D arrays indexed by scan point.
Use putslab and sics data objects to grow arrays.

r1725 | ffr | 2007-03-27 08:04:19 +1000 (Tue, 27 Mar 2007) | 3 lines
2012-11-15 13:10:24 +11:00
Ferdi Franceschini
5d593ff615 Bring into line with changes in the hmm common configuration file.
r1718 | ffr | 2007-03-24 19:21:21 +1100 (Sat, 24 Mar 2007) | 2 lines
2012-11-15 13:10:07 +11:00
Ferdi Franceschini
63fc628e89 Added hmm_save function and refactored hmm_addnxscanentry to use it.
r1717 | ffr | 2007-03-24 19:17:54 +1100 (Sat, 24 Mar 2007) | 2 lines
2012-11-15 13:10:04 +11:00
Ferdi Franceschini
8ee21d58f4 The prepare count_with_bm and finish functions can now be used independently of scans.
Added count_with_bm and save commands

r1716 | ffr | 2007-03-24 19:12:51 +1100 (Sat, 24 Mar 2007) | 3 lines
2012-11-15 13:10:01 +11:00
Ferdi Franceschini
4568b365a6 Make bmonscan graphics view info independent of the bmonscan feedback.
r1715 | ffr | 2007-03-24 14:44:03 +1100 (Sat, 24 Mar 2007) | 2 lines
2012-11-15 13:09:58 +11:00
Ferdi Franceschini
e2c2657dcd Use the following generic node names for graph data
(see Jira SICS-32)
axis - 1D float array for x axis data
data - 1D float array for y axis data
lastaxis - last updated x value
lastdata -last updated y value

r1698 | ffr | 2007-03-22 18:31:18 +1100 (Thu, 22 Mar 2007) | 7 lines
2012-11-15 13:09:06 +11:00
Ferdi Franceschini
bfa6c2f887 bm_addnxscanentry is now more dynamic. It sets nexus dictionary variables for the scan variable attributes.
r1697 | ffr | 2007-03-22 18:19:56 +1100 (Thu, 22 Mar 2007) | 2 lines
2012-11-15 13:09:03 +11:00
Ferdi Franceschini
f19a328280 Store hmm_setup parameters in hmm_* SICS variables for use in file writing, the GumTree interface and commandline feedback code.
Set place holders for hpath setup and initialisation functions.

r1682 | ffr | 2007-03-20 11:50:11 +1100 (Tue, 20 Mar 2007) | 3 lines
2012-11-15 13:08:18 +11:00