Merging release 2.0 branch with CVS trunk

r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines

site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl

@@ -32,11 +32,107 @@ set instrument_dictionary [subst {
     datatype @none
     property {data true control true nxsave false klass NXinstrument type instrument}
   }
-  instrument/status {
+  instrument/aperture {
     privilege spy
-    sobj {@any plc}
+    sobj {@any aperture}
     datatype @none
-    property {data false control true nxsave false klass @none type part}
+    property {data true control true nxsave false klass NXaperture type part}
+  }
+  instrument/attenuator {
+    privilege spy
+    sobj {@any attenuator}
+    datatype @none
+    property {data true control true nxsave false klass NXattenuator type part}
+  }
+  instrument/beam_stop {
+    privilege spy
+    sobj {@any beam_stop}
+    datatype @none
+    property {data true control true nxsave false klass NXbeam_stop type part}
+  }
+  instrument/bending_magnet {
+    privilege spy
+    sobj {@any bending_magnet}
+    datatype @none
+    property {data true control true nxsave false klass NXbending_magnet type part}
+  }
+  instrument/crystal {
+    privilege spy
+    sobj {@any crystal}
+    datatype @none
+    property {data true control true nxsave false klass NXcrystal type part}
+  }
+  instrument/disk_chopper {
+    privilege spy
+    sobj {@any disk_chopper}
+    datatype @none
+    property {data true control true nxsave false klass NXdisk_chopper type part}
+  }
+  instrument/fermi_chopper {
+    privilege spy
+    sobj {@any fermi_chopper}
+    datatype @none
+    property {data true control true nxsave false klass NXfermi_chopper type part}
+  }
+  instrument/filter {
+    privilege spy
+    sobj {@any filter}
+    datatype @none
+    property {data true control true nxsave false klass NXfilter type part}
+  }
+  instrument/flipper {
+    privilege spy
+    sobj {@any flipper}
+    datatype @none
+    property {data true control true nxsave false klass NXflipper type part}
+  }
+  instrument/guide {
+    privilege spy
+    sobj {@any guide}
+    datatype @none
+    property {data true control true nxsave false klass NXguide type part}
+  }
+  instrument/insertion_device {
+    privilege spy
+    sobj {@any insertion_device}
+    datatype @none
+    property {data true control true nxsave false klass NXinsertion_device type part}
+  }
+  instrument/mirror {
+    privilege spy
+    sobj {@any mirror}
+    datatype @none
+    property {data true control true nxsave false klass NXmirror type part}
+  }
+  instrument/moderator {
+    privilege spy
+    sobj {@any moderator}
+    datatype @none
+    property {data true control true nxsave false klass NXmoderator type part}
+  }
+  instrument/polarizer {
+    privilege spy
+    sobj {@any polarizer}
+    datatype @none
+    property {data true control true nxsave false klass NXpolarizer type part}
+  }
+  instrument/positioner {
+    privilege spy
+    sobj {@any positioner}
+    datatype @none
+    property {data true control true nxsave false klass NXpositioner type part}
+  }
+  instrument/source {
+    privilege spy
+    sobj {@any source}
+    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
@@ -44,29 +140,17 @@ set instrument_dictionary [subst {
     datatype @none
     property {data true control true nxsave false klass NXdetector type part}
   }
-  sample {
-    privilege spy
-    sobj {@any sample}
-    datatype @none
-    property {data true control true nxsave false klass NXsample type part}
-  }
   instrument/collimator {
     privilege spy
     sobj {@any collimator}
     datatype @none
     property {data true control true nxsave false klass NXcollimator type part}
   }
-  monitor {
-    privilege spy
-    sobj {@any monitor}
-    datatype @none
-    property {data true control true nxsave false klass NXmonitor type part}
-  }
   instrument/monochromator {
     privilege spy
-    sobj {@any monochromator @any crystal}
+    sobj {@any monochromator}
     datatype @none
-    property {data true control true nxsave false klass NXcrystal type part}
+    property {data true control true nxsave false klass NXmonochromator type part}
   }
   instrument/slits {
     privilege spy
@@ -74,17 +158,17 @@ set instrument_dictionary [subst {
     datatype @none
     property {data true control true nxsave false klass NXfilter type part}
   }
-  user {
+  sample {
     privilege spy
-    sobj {@any user}
+    sobj {@any sample @any environment}
     datatype @none
-    property {data true control true nxsave false klass NXuser type part}
+    property {data true control true nxsave false klass NXsample type part}
   }
-  experiment {
+  monitor {
     privilege spy
-    sobj {@any experiment}
+    sobj {@any monitor}
     datatype @none
-    property {data true control true nxsave false klass NXnote type part}
+    property {data true control true nxsave false klass NXmonitor type part}
   }
   data {
     privilege spy
@@ -92,6 +176,43 @@ set instrument_dictionary [subst {
     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}
+    datatype @none
+    property {data true control false nxsave false klass NXevent_data type part datatype UNKNOWN currentfiletype UNKNOWN}
+  }
+  user {
+    privilege spy
+    sobj {@any user}
+    datatype @none
+    property {data true control true nxsave false klass NXuser type part}
+  }
+  process {
+    privilege spy
+    sobj {@any process}
+    datatype @none
+    property {data true control true nxsave false klass NXprocess type part}
+  }
+  characterization {
+    privilege spy
+    sobj {@any characterization}
+    datatype @none
+    property {data true control true nxsave false klass NXcharacterization type part}
+  }
+
+  experiment {
+    privilege spy
+    sobj {@any experiment}
+    datatype @none
+    property {data true control true nxsave false klass NXnote type part}
+  }
+  instrument/status {
+    privilege spy
+    sobj {@any plc}
+    datatype @none
+    property {data false control true nxsave false klass @none type part}
+  }
   data/data_set {
     privilege spy
     datatype @none