Merged 2.4 branch

r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-11-25 09:56:49 +11:00
committed by Douglas Clowes
parent c58ee9fbcb
commit 2ec6505ef8
71 changed files with 2237 additions and 1528 deletions

View File

@@ -27,7 +27,7 @@ set instrument_dictionary [subst {
property {data true control true nxsave false klass @none type graphset}
}
instrument {
sobj {@any instrument @any NXvelocity_selector}
sobj {@any instrument @any NXvelocity_selector @any NXaperture @any NXdetector}
privilege spy
datatype @none
property {data true control true nxsave false klass NXinstrument type instrument}
@@ -38,6 +38,11 @@ set instrument_dictionary [subst {
datatype @none
property {data true control true nxsave true klass NXparameter type part}
}
instrument/parameters/parameters_group {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias parameters_group}
}
instrument/parameters/derived_parameters {
privilege spy
sobj {@any derived_parameter}
@@ -140,12 +145,6 @@ set instrument_dictionary [subst {
datatype @none
property {data true control true nxsave false klass NXsource type part}
}
instrument/velocity_selector {
privilege spy
sobj {@any velocity_selector}
datatype @none
property {data true control true nxsave false klass NXvelocity_selector type part}
}
instrument/detector {
privilege spy
sobj {@any detector}
@@ -176,18 +175,17 @@ set instrument_dictionary [subst {
datatype @none
property {data true control true nxsave false klass NXsample type part}
}
sample/sample_group {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias sample_group}
}
monitor {
privilege spy
sobj {@any monitor}
datatype @none
property {data true control true nxsave false klass NXmonitor type part}
}
data {
privilege spy
sobj {@any data}
datatype @none
property {data true control false nxsave false klass NXdata type part datatype UNKNOWN currentfiletype UNKNOWN}
}
event_data {
privilege spy
sobj {@any event_data}
@@ -225,74 +223,15 @@ set instrument_dictionary [subst {
datatype @none
property {data false control true nxsave false klass @none type part}
}
data {
privilege spy
sobj {@any data}
datatype @none
property {data true control false nxsave false klass NXdata type part datatype UNKNOWN currentfiletype UNKNOWN}
}
data/data_set {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias data_set link @none}
}
data/axis_1 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias axis_1 link @none}
}
data/axis_2 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias axis_2 link @none}
}
data/axis_3 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias axis_3 link @none}
}
data/axis_4 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias axis_4 link @none}
}
data/aux_data_1 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias aux_data_1 link @none}
}
data/aux_data_2 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias aux_data_2 link @none}
}
data/aux_data_3 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias aux_data_3 link @none}
}
data/aux_data_4 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias aux_data_4 link @none}
}
data/aux_data_5 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias aux_data_5 link @none}
}
data/aux_data_6 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias aux_data_6 link @none}
}
data/aux_data_7 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias aux_data_7 link @none}
}
data/aux_data_8 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias aux_data_8 link @none}
}
data/aux_data_9 {
privilege spy
datatype @none
property {data true control false nxsave false klass @none type nxvgroup nxalias aux_data_9 link @none}
property {data true control false nxsave false klass @none type nxvgroup nxalias data_set}
}
}]