From 973f8441860084358f03704878f38f216699287e Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Tue, 5 Aug 2014 17:07:02 +1000 Subject: [PATCH] Allow Group_Property override for klass and type and set topleve data true --- site_ansto/instrument/util/gen_sct.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/site_ansto/instrument/util/gen_sct.py b/site_ansto/instrument/util/gen_sct.py index b5fcee7a..4dfbb604 100755 --- a/site_ansto/instrument/util/gen_sct.py +++ b/site_ansto/instrument/util/gen_sct.py @@ -761,10 +761,13 @@ def adjust_group(MyGroup): if MyData is not None: if 'GroupProperty' not in MyGroup: MyGroup['GroupProperty'] = {} - MyGroup['GroupProperty']['data'] = MyData + if 'data' not in MyGroup['GroupProperty']: + MyGroup['GroupProperty']['data'] = MyData if MyData: - MyGroup['GroupProperty']['klass'] = '@none' - MyGroup['GroupProperty']['type'] = 'part' + if 'klass' not in MyGroup['GroupProperty']: + MyGroup['GroupProperty']['klass'] = '@none' + if 'type' not in MyGroup['GroupProperty']: + MyGroup['GroupProperty']['type'] = 'part' if Verbose: print 'post adjust_group', MyGroup @@ -1373,6 +1376,7 @@ def put_mkDriver(MyDriver): txt += put_group(MyDriver, MyDriver['Groups'][group]) txt += [' hsetprop ${scobj_hpath} klass %s' % MyDriver['class']] + txt += [' hsetprop ${scobj_hpath} data true'] txt += [' hsetprop ${scobj_hpath} debug_threshold %s' % str(MyDriver['debug_threshold'])] if len(MyDriver['Deferred']) > 0: txt += [' if {[string equal -nocase [SplitReply [%s]] "false"]} {' % MyDriver['simulation_group']]