From fe3489b61f797de26b65de4afe40e04211832392 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Thu, 26 Jun 2014 13:48:44 +1000 Subject: [PATCH] SICS-754 Use "clientput" instead of "puts stdout" in generated drivers --- .../instrument/bilby/config/chopper/sct_astrium_chopper.tcl | 2 +- site_ansto/instrument/bilby/config/motors/sct_shutters.tcl | 2 +- site_ansto/instrument/bilby/config/motors/sct_tank.tcl | 2 +- site_ansto/instrument/config/environment/sct_hiden_xcs.tcl | 2 +- site_ansto/instrument/config/environment/sct_huber_pilot.tcl | 2 +- site_ansto/instrument/config/environment/sct_isotech_ps.tcl | 2 +- site_ansto/instrument/config/environment/sct_nhq_200.tcl | 2 +- site_ansto/instrument/config/environment/sct_omron_hldc.tcl | 2 +- .../config/environment/temperature/sct_lakeshore_218.tcl | 2 +- .../config/environment/temperature/sct_mercury_base.tcl | 2 +- .../config/environment/temperature/sct_mercury_level.tcl | 2 +- .../config/environment/temperature/sct_mercury_pres.tcl | 2 +- .../config/environment/temperature/sct_mercury_scpi.tcl | 2 +- .../config/environment/temperature/sct_mercury_temp.tcl | 2 +- .../config/environment/temperature/sct_mercury_valve.tcl | 2 +- .../config/environment/temperature/sct_pfeiffer_hg.tcl | 2 +- site_ansto/instrument/config/source/sct_reactor_status.tcl | 2 +- site_ansto/instrument/util/gen_sct.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) 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 eabdbd45..c56f12fc 100644 --- a/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl +++ b/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl @@ -561,7 +561,7 @@ proc add_astrium_chopper {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_astrium_chopper.tcl" +clientput "file evaluation of sct_astrium_chopper.tcl" ::scobj::astrium_chopper::sics_log 9 "file evaluation of sct_astrium_chopper.tcl" proc ::scobj::astrium_chopper::read_config {} { diff --git a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl index 045fe039..4685fa3e 100644 --- a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl +++ b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl @@ -299,7 +299,7 @@ proc add_shutters {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_shutters.tcl" +clientput "file evaluation of sct_shutters.tcl" ::scobj::shutters::sics_log 9 "file evaluation of sct_shutters.tcl" proc ::scobj::shutters::read_config {} { diff --git a/site_ansto/instrument/bilby/config/motors/sct_tank.tcl b/site_ansto/instrument/bilby/config/motors/sct_tank.tcl index bc7cd3ea..c781bac7 100644 --- a/site_ansto/instrument/bilby/config/motors/sct_tank.tcl +++ b/site_ansto/instrument/bilby/config/motors/sct_tank.tcl @@ -334,7 +334,7 @@ proc add_tank {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_tank.tcl" +clientput "file evaluation of sct_tank.tcl" ::scobj::tank::sics_log 9 "file evaluation of sct_tank.tcl" proc ::scobj::tank::read_config {} { diff --git a/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl b/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl index 33b8bb1f..e9c0ec96 100644 --- a/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl +++ b/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl @@ -1148,7 +1148,7 @@ proc add_hiden_xcs {name IP port id} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_hiden_xcs.tcl" +clientput "file evaluation of sct_hiden_xcs.tcl" ::scobj::hiden_xcs::sics_log 9 "file evaluation of sct_hiden_xcs.tcl" proc ::scobj::hiden_xcs::read_config {} { diff --git a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl index 3065ea50..d879ed90 100644 --- a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl +++ b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl @@ -452,7 +452,7 @@ proc add_huber_pilot {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_huber_pilot.tcl" +clientput "file evaluation of sct_huber_pilot.tcl" ::scobj::huber_pilot::sics_log 9 "file evaluation of sct_huber_pilot.tcl" proc ::scobj::huber_pilot::read_config {} { diff --git a/site_ansto/instrument/config/environment/sct_isotech_ps.tcl b/site_ansto/instrument/config/environment/sct_isotech_ps.tcl index 392241ce..63e760ed 100644 --- a/site_ansto/instrument/config/environment/sct_isotech_ps.tcl +++ b/site_ansto/instrument/config/environment/sct_isotech_ps.tcl @@ -339,7 +339,7 @@ proc add_isotech_ps {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_isotech_ps.tcl" +clientput "file evaluation of sct_isotech_ps.tcl" ::scobj::isotech_ps::sics_log 9 "file evaluation of sct_isotech_ps.tcl" proc ::scobj::isotech_ps::read_config {} { diff --git a/site_ansto/instrument/config/environment/sct_nhq_200.tcl b/site_ansto/instrument/config/environment/sct_nhq_200.tcl index 10cc5d54..6ea8513f 100644 --- a/site_ansto/instrument/config/environment/sct_nhq_200.tcl +++ b/site_ansto/instrument/config/environment/sct_nhq_200.tcl @@ -699,7 +699,7 @@ proc add_nhq_200 {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_nhq_200.tcl" +clientput "file evaluation of sct_nhq_200.tcl" ::scobj::nhq_200::sics_log 9 "file evaluation of sct_nhq_200.tcl" proc ::scobj::nhq_200::read_config {} { diff --git a/site_ansto/instrument/config/environment/sct_omron_hldc.tcl b/site_ansto/instrument/config/environment/sct_omron_hldc.tcl index 92ad56d3..41eb0266 100644 --- a/site_ansto/instrument/config/environment/sct_omron_hldc.tcl +++ b/site_ansto/instrument/config/environment/sct_omron_hldc.tcl @@ -266,7 +266,7 @@ proc add_omron_hldc {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_omron_hldc.tcl" +clientput "file evaluation of sct_omron_hldc.tcl" ::scobj::omron_hldc::sics_log 9 "file evaluation of sct_omron_hldc.tcl" proc ::scobj::omron_hldc::read_config {} { diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl index 5c1db94c..974c0432 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl @@ -332,7 +332,7 @@ proc add_lakeshore_218 {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_lakeshore_218.tcl" +clientput "file evaluation of sct_lakeshore_218.tcl" ::scobj::lakeshore_218::sics_log 9 "file evaluation of sct_lakeshore_218.tcl" proc ::scobj::lakeshore_218::read_config {} { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl index 783fafc1..dd9b6e2b 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl @@ -542,7 +542,7 @@ proc add_mercury_base {name IP port {id 99} {tol 1}} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_mercury_base.tcl" +clientput "file evaluation of sct_mercury_base.tcl" ::scobj::mercury_base::sics_log 9 "file evaluation of sct_mercury_base.tcl" proc ::scobj::mercury_base::read_config {} { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl index 7d3864d1..41993631 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl @@ -219,7 +219,7 @@ proc add_mercury_level {name IP port {id 99}} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_mercury_level.tcl" +clientput "file evaluation of sct_mercury_level.tcl" ::scobj::mercury_level::sics_log 9 "file evaluation of sct_mercury_level.tcl" proc ::scobj::mercury_level::read_config {} { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl index e0cea9d6..d9ca99b0 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl @@ -383,7 +383,7 @@ proc add_mercury_pres {name IP port {id 99} {tol 1}} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_mercury_pres.tcl" +clientput "file evaluation of sct_mercury_pres.tcl" ::scobj::mercury_pres::sics_log 9 "file evaluation of sct_mercury_pres.tcl" proc ::scobj::mercury_pres::read_config {} { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl index d8d0dd57..b83d22c4 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl @@ -738,7 +738,7 @@ proc add_mercury_scpi {name IP port {id 99} {permlink LT} {tol 1} {valve_tol 2}} handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_mercury_scpi.tcl" +clientput "file evaluation of sct_mercury_scpi.tcl" ::scobj::mercury_scpi::sics_log 9 "file evaluation of sct_mercury_scpi.tcl" proc ::scobj::mercury_scpi::read_config {} { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl index ee909103..1de9e634 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl @@ -388,7 +388,7 @@ proc add_mercury_temp {name IP port {id 99} {tol 1}} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_mercury_temp.tcl" +clientput "file evaluation of sct_mercury_temp.tcl" ::scobj::mercury_temp::sics_log 9 "file evaluation of sct_mercury_temp.tcl" proc ::scobj::mercury_temp::read_config {} { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl index cec21537..68a5522b 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl @@ -337,7 +337,7 @@ proc add_mercury_valve {name IP port {id 99} {valve_tol 2}} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_mercury_valve.tcl" +clientput "file evaluation of sct_mercury_valve.tcl" ::scobj::mercury_valve::sics_log 9 "file evaluation of sct_mercury_valve.tcl" proc ::scobj::mercury_valve::read_config {} { diff --git a/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl b/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl index f066ad7b..20baf081 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl @@ -487,7 +487,7 @@ proc add_pfeiffer_hg {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_pfeiffer_hg.tcl" +clientput "file evaluation of sct_pfeiffer_hg.tcl" ::scobj::pfeiffer_hg::sics_log 9 "file evaluation of sct_pfeiffer_hg.tcl" proc ::scobj::pfeiffer_hg::read_config {} { diff --git a/site_ansto/instrument/config/source/sct_reactor_status.tcl b/site_ansto/instrument/config/source/sct_reactor_status.tcl index 60c4bc15..b3dedab2 100644 --- a/site_ansto/instrument/config/source/sct_reactor_status.tcl +++ b/site_ansto/instrument/config/source/sct_reactor_status.tcl @@ -338,7 +338,7 @@ proc add_reactor_status {name IP port} { handle_exception ${catch_status} ${catch_message} } -puts stdout "file evaluation of sct_reactor_status.tcl" +clientput "file evaluation of sct_reactor_status.tcl" ::scobj::reactor_status::sics_log 9 "file evaluation of sct_reactor_status.tcl" proc ::scobj::reactor_status::read_config {} { diff --git a/site_ansto/instrument/util/gen_sct.py b/site_ansto/instrument/util/gen_sct.py index 5c2478bc..02d55c68 100755 --- a/site_ansto/instrument/util/gen_sct.py +++ b/site_ansto/instrument/util/gen_sct.py @@ -1389,7 +1389,7 @@ def put_postamble(MyDriver): txt += [' handle_exception ${catch_status} ${catch_message}'] txt += ['}'] txt += [''] - txt += ['puts stdout "file evaluation of sct_%s.tcl"' % MyDriver['name']] + txt += ['clientput "file evaluation of sct_%s.tcl"' % MyDriver['name']] txt += ['%s::sics_log 9 "file evaluation of sct_%s.tcl"' % (MyDriver['namespace'], MyDriver['name'])] emit(txt)