From ab3d7c5adf039ed90101633d36092278d6fd27f7 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Mon, 21 Jul 2014 10:58:01 +1000 Subject: [PATCH] Remove explicit test debug_threshold from SCT files and regenerate --- .../instrument/bilby/config/chopper/astrium_chopper.sct | 2 -- .../instrument/bilby/config/chopper/sct_astrium_chopper.tcl | 5 ++--- site_ansto/instrument/config/environment/huber_pilot.sct | 1 - site_ansto/instrument/config/environment/nhq_200.sct | 1 - site_ansto/instrument/config/environment/omron_hldc.sct | 1 - site_ansto/instrument/config/environment/sct_huber_pilot.tcl | 4 ++-- site_ansto/instrument/config/environment/sct_nhq_200.tcl | 4 ++-- .../config/environment/temperature/julabo_lh45.sct | 1 - .../config/environment/temperature/sct_julabo_lh45_gen.tcl | 4 ++-- 9 files changed, 8 insertions(+), 15 deletions(-) diff --git a/site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct b/site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct index f7efeabd..a25a2902 100644 --- a/site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct +++ b/site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct @@ -1,5 +1,4 @@ driver astrium_chopper = { - debug_threshold = 2; vendor = astrium; device = chopper; protocol = std; class = NXdisk_chopper; simulation_group = chopper_simulation; @@ -108,6 +107,5 @@ driver astrium_chopper = { %%} code mkDriver = {%% - hsetprop ${scobj_hpath} debug_threshold 1 %%} } diff --git a/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl b/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl index e537f5bb..1c8091e1 100644 --- a/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl +++ b/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl @@ -3,7 +3,7 @@ # namespace eval ::scobj::astrium_chopper { - set debug_threshold 2 + set debug_threshold 5 } proc ::scobj::astrium_chopper::debug_log {tc_root debug_level debug_string} { @@ -526,9 +526,8 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name } { ::scobj::astrium_chopper::sics_log 9 "[chopper_simulation] => No poll/write for astrium_chopper" } hsetprop ${scobj_hpath} klass NXdisk_chopper - hsetprop ${scobj_hpath} debug_threshold 2 + hsetprop ${scobj_hpath} debug_threshold 5 # mkDriver hook code starts - hsetprop ${scobj_hpath} debug_threshold 1 # mkDriver hook code ends } catch_message ] handle_exception ${catch_status} ${catch_message} diff --git a/site_ansto/instrument/config/environment/huber_pilot.sct b/site_ansto/instrument/config/environment/huber_pilot.sct index b2cb92bc..2abf3f36 100644 --- a/site_ansto/instrument/config/environment/huber_pilot.sct +++ b/site_ansto/instrument/config/environment/huber_pilot.sct @@ -2,7 +2,6 @@ # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent # driver huber_pilot = { - debug_threshold = 1; vendor = Huber; device = 'Pilot ONE'; protocol = std; class = environment; simulation_group = environment_simulation; diff --git a/site_ansto/instrument/config/environment/nhq_200.sct b/site_ansto/instrument/config/environment/nhq_200.sct index b33d38eb..1b98f4f1 100644 --- a/site_ansto/instrument/config/environment/nhq_200.sct +++ b/site_ansto/instrument/config/environment/nhq_200.sct @@ -2,7 +2,6 @@ # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent # driver nhq_200 = { - debug_threshold = 1; vendor = FastComTech; device = NHQ; protocol = std; class = environment; simulation_group = environment_simulation; diff --git a/site_ansto/instrument/config/environment/omron_hldc.sct b/site_ansto/instrument/config/environment/omron_hldc.sct index 8d6fea5e..3331b342 100644 --- a/site_ansto/instrument/config/environment/omron_hldc.sct +++ b/site_ansto/instrument/config/environment/omron_hldc.sct @@ -2,7 +2,6 @@ # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent # driver omron_hldc = { - debug_threshold = 5; vendor = Omron; device = 'ZS-HDLC'; protocol = std; class = environment; simulation_group = environment_simulation; diff --git a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl index 52e6f55f..94f7c23f 100644 --- a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl +++ b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl @@ -3,7 +3,7 @@ # namespace eval ::scobj::huber_pilot { - set debug_threshold 1 + set debug_threshold 5 if { ![info exists ::scobj::permlink_device_counter]} { set ::scobj::permlink_device_counter 0 } @@ -418,7 +418,7 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name } { ::scobj::huber_pilot::sics_log 9 "[environment_simulation] => No poll/write for huber_pilot" } hsetprop ${scobj_hpath} klass environment - hsetprop ${scobj_hpath} debug_threshold 1 + hsetprop ${scobj_hpath} debug_threshold 5 if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor_int ${sct_controller} } diff --git a/site_ansto/instrument/config/environment/sct_nhq_200.tcl b/site_ansto/instrument/config/environment/sct_nhq_200.tcl index fe1ce39e..897ad052 100644 --- a/site_ansto/instrument/config/environment/sct_nhq_200.tcl +++ b/site_ansto/instrument/config/environment/sct_nhq_200.tcl @@ -3,7 +3,7 @@ # namespace eval ::scobj::nhq_200 { - set debug_threshold 1 + set debug_threshold 5 } proc ::scobj::nhq_200::debug_log {tc_root debug_level debug_string} { @@ -664,7 +664,7 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name } { ::scobj::nhq_200::sics_log 9 "[environment_simulation] => No poll/write for nhq_200" } hsetprop ${scobj_hpath} klass environment - hsetprop ${scobj_hpath} debug_threshold 1 + hsetprop ${scobj_hpath} debug_threshold 5 if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { ansto_makesctdrive ${name}_ch1_v_sp ${scobj_hpath}/ch1/v_sp ${scobj_hpath}/ch1/voltage ${sct_controller} ansto_makesctdrive ${name}_ch2_v_sp ${scobj_hpath}/ch2/v_sp ${scobj_hpath}/ch2/voltage ${sct_controller} diff --git a/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct b/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct index e7e78ca5..20b2f7e3 100644 --- a/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct +++ b/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct @@ -6,7 +6,6 @@ driver julabo_lh45_gen = { vendor = julabo; device = lh45; protocol = std; class = environment; simulation_group = environment_simulation - debug_threshold = 1; add_args = '{id 1} {ctrl_sensor "bath"} {tol 5.0}'; make_args = 'id ctrl_sensor tol'; protocol_args = '"\r"'; diff --git a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl index 6fe8aa75..f071bd88 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl @@ -3,7 +3,7 @@ # namespace eval ::scobj::julabo_lh45_gen { - set debug_threshold 1 + set debug_threshold 5 } proc ::scobj::julabo_lh45_gen::debug_log {tc_root debug_level debug_string} { @@ -594,7 +594,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name id ctrl_sensor tol ::scobj::julabo_lh45_gen::sics_log 9 "[environment_simulation] => No poll/write for julabo_lh45_gen" } hsetprop ${scobj_hpath} klass environment - hsetprop ${scobj_hpath} debug_threshold 1 + hsetprop ${scobj_hpath} debug_threshold 5 if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { ansto_makesctdrive ${name}_setpoint ${scobj_hpath}/setpoint ${scobj_hpath}/sensor/value ${sct_controller} }