From 9620ce4ae54f7a53caddcf40282f26ffbb63e37f Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Fri, 29 Apr 2011 08:45:02 +1000
Subject: [PATCH] Added NXdisk_chopper class to the instrument path and
 refactored the reduce group (SICS-365) r3119 | ffr | 2011-04-29 08:45:02
 +1000 (Fri, 29 Apr 2011) | 1 line

---
 .../hipadaba/common_instrument_dictionary.tcl  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl b/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
index 8bc7612e..53f92e56 100644
--- a/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
+++ b/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
@@ -27,28 +27,26 @@ set instrument_dictionary [subst {
     property {data true control true nxsave false klass @none type graphset}
   }
   instrument {
-    sobj {@any instrument @any NXvelocity_selector @any NXaperture @any NXcollimator @any NXdetector}
+    sobj {@any instrument @any NXvelocity_selector @any NXaperture @any NXcollimator @any NXdetector @any NXdisk_chopper}
     privilege spy
     datatype @none
     property {data true control true nxsave false klass NXinstrument type instrument}
   }
-  instrument/reduce {
+  reduce {
     privilege spy
     sobj {@any reduce}
     datatype @none
     property {data true control true nxsave true klass reduce type part}
   }
-  instrument/reduce/parameters {
+  instrument/parameters {
     privilege spy
     sobj {@any parameter}
     datatype @none
     property {data true control true nxsave true klass parameters type part}
   }
-  instrument/reduce/parameters/parameters_group {
+  instrument/parameters/parameters_group {
     privilege spy
-    sobj {@any parameters_group}
-    datatype @nonei
-    #property {data true control false nxsave false klass @none type nxvgroup nxalias parameters_group}
+    datatype @none
     property {data true control false nxsave false klass @none type part nxalias parameters_group}
   }
   instrument/aperture {
@@ -81,12 +79,6 @@ set instrument_dictionary [subst {
     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}