From 0ae4d40470240ce2671327f9121b8894109f8e8d Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Fri, 9 May 2014 09:34:38 +1000 Subject: [PATCH] Deploy all environment drivers to all instruments. --- site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT | 12 +----------- site_ansto/instrument/deploySICS.sh | 10 ++++++++-- site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT | 1 + site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT | 10 +--------- site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT | 10 +--------- .../instrument/kookaburra/config/INSTCFCOMMON.TXT | 1 + .../instrument/lyrebird/config/INSTCFCOMMON.TXT | 1 + site_ansto/instrument/pas/config/INSTCFCOMMON.TXT | 2 +- .../instrument/pelican/config/INSTCFCOMMON.TXT | 3 +-- .../instrument/reflectometer/config/INSTCFCOMMON.TXT | 8 +------- site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT | 10 +--------- site_ansto/instrument/sans/config/INSTCFCOMMON.TXT | 12 +----------- site_ansto/instrument/tas/config/INSTCFCOMMON.TXT | 12 +----------- 13 files changed, 20 insertions(+), 72 deletions(-) diff --git a/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT b/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT index 0f1607f8..35af79de 100644 --- a/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT @@ -17,16 +17,6 @@ config/commands/commands_common.tcl config/commands/pulser.tcl config/commands/hvcommands.tcl config/motors/sct_positmotor_common.tcl -config/environment/sct_protek_common.tcl -config/environment/temperature/sct_julabo_lh45.tcl -config/environment/temperature/sct_lakeshore_340.tcl -config/environment/temperature/sct_lakeshore_336.tcl -config/environment/temperature/sct_qlink.tcl -config/environment/temperature/sct_watlow_st4.tcl -config/environment/temperature/sct_rvasm2.tcl -config/environment/temperature/sct_oxford_itc.tcl -config/environment/magneticField/sct_bruker_BEC1.tcl -config/environment/magneticField/sct_oxford_ips.tcl -config/environment/magneticField/sct_oxford_labview.tcl +config/environment/ config/motors/sct_jogmotor_common.tcl diff --git a/site_ansto/instrument/deploySICS.sh b/site_ansto/instrument/deploySICS.sh index 8e528cba..4d7d6281 100755 --- a/site_ansto/instrument/deploySICS.sh +++ b/site_ansto/instrument/deploySICS.sh @@ -55,8 +55,14 @@ copy_server_config() { sicserver_path=$1 cp -v -a --preserve=timestamps $COMMON $INSTSPEC $TEMPDIR/$DESTDIR/$sicserver_path >>$FILEMAP if [ -e $INSTCFDIR/INSTCFCOMMON.TXT ]; then - for f in $(cat $INSTCFDIR/INSTCFCOMMON.TXT); do - cp -v --parents --preserve=timestamps $f $TEMPDIR/$DESTDIR/$sicserver_path >>$FILEMAP + for fpath in $(cat $INSTCFDIR/INSTCFCOMMON.TXT); do + if [ -f $fpath ]; then + cp -v --parents --preserve=timestamps $fpath $TEMPDIR/$DESTDIR/$sicserver_path >>$FILEMAP + else + for fn in `find $fpath -name '*.tcl'`; do + cp -v --parents --preserve=timestamps $fn $TEMPDIR/$DESTDIR/$sicserver_path >>$FILEMAP + done + fi done fi } diff --git a/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT b/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT index f0ad4f76..3e405f6f 100644 --- a/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ config/source/sct_reactor_status.tcl +config/environment/ config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT index f6e21877..3f54d2b1 100644 --- a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT @@ -3,16 +3,8 @@ config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl -config/environment/temperature/sct_oxford_itc.tcl -config/environment/temperature/sct_eurotherm_2000.tcl -config/environment/temperature/sct_lakeshore_336.tcl -config/environment/temperature/sct_lakeshore_340.tcl -config/environment/temperature/sct_julabo_lh45.tcl -config/environment/temperature/sct_qlink.tcl -config/environment/temperature/west400.tcl -config/environment/magneticField/sct_oxford_labview.tcl -config/environment/magneticField/sct_green_magnet.tcl config/hipadaba/hipadaba_configuration_common.tcl +config/environment/ config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/instdict_specification.tcl config/hmm/hmm_configuration_common_1.tcl diff --git a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT index e84f2219..65034522 100644 --- a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT @@ -3,16 +3,8 @@ config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl -config/environment/sct_keithley_2700.tcl -config/environment/temperature/sct_eurotherm_2000.tcl -config/environment/temperature/sct_lakeshore_336.tcl -config/environment/temperature/sct_lakeshore_340.tcl -config/environment/temperature/sct_oxford_mercury.tcl -config/environment/temperature/sct_watlow_pm.tcl -config/environment/temperature/west400.tcl -config/environment/magneticField/sct_oxford_labview.tcl -config/environment/magneticField/sct_green_magnet.tcl config/hipadaba/hipadaba_configuration_common.tcl +config/environment/ config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/instdict_specification.tcl config/hmm/hmm_configuration_common_1.tcl diff --git a/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT b/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT index 04f2a106..212655af 100644 --- a/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ config/source/sct_reactor_status.tcl +config/environment/ config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT b/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT index 93b623e1..a469882a 100644 --- a/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ config/source/sct_reactor_status.tcl +config/environment/ config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/pas/config/INSTCFCOMMON.TXT b/site_ansto/instrument/pas/config/INSTCFCOMMON.TXT index 55c528b6..2d4533c6 100644 --- a/site_ansto/instrument/pas/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/pas/config/INSTCFCOMMON.TXT @@ -2,8 +2,8 @@ config/source/source_common.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl -config/environment/temperature/sct_lakeshore_3xx.tcl config/hipadaba/hipadaba_configuration_common.tcl +config/environment/ config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/instdict_specification.tcl config/hmm/hmm_configuration_common_1.tcl diff --git a/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT b/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT index 9231db47..edacec40 100644 --- a/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT @@ -13,9 +13,8 @@ config/hmm/anstohm_linked.xml config/hmm/sct_orhvps_common.tcl config/scan/scan_common_1.hdd config/scan/scan_common_1.tcl -config/environment/temperature/sct_lakeshore_218.tcl -config/environment/temperature/sct_lakeshore_340.tcl config/nexus/nxscripts_common_1.tcl +config/environment/ config/commands/commands_common.tcl config/motors/sct_positmotor_common.tcl config/motors/sct_jogmotor_common.tcl diff --git a/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT b/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT index 6e8f55be..c7964b10 100644 --- a/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT @@ -3,7 +3,6 @@ config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl -config/environment/magneticField/sct_bruker_BEC1.tcl config/hipadaba/hipadaba_configuration_common.tcl config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/instdict_specification.tcl @@ -17,10 +16,5 @@ config/commands/commands_common.tcl config/commands/hvcommands.tcl config/commands/pulser.tcl config/motors/sct_positmotor_common.tcl -config/environment/sct_protek_common.tcl -config/environment/sct_mvp.tcl -config/environment/sct_syr.tcl -config/environment/temperature/sct_lakeshore_340.tcl -config/environment/temperature/sct_lakeshore_336.tcl -config/environment/temperature/sct_julabo_lh45.tcl config/motors/sct_jogmotor_common.tcl +config/environment/ diff --git a/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT index bd21df6c..015212e6 100644 --- a/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT @@ -3,16 +3,8 @@ config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl -config/environment/sct_keithley_2700.tcl -config/environment/temperature/sct_lakeshore_336.tcl -config/environment/temperature/sct_lakeshore_340.tcl -config/environment/temperature/sct_eurotherm_2000.tcl -config/environment/sct_protek_common.tcl -config/environment/temperature/sct_oxford_itc.tcl -config/environment/temperature/sct_oxford_mercury.tcl -config/environment/magneticField/sct_oxford_ips.tcl -config/environment/magneticField/sct_oxford_labview.tcl config/hipadaba/hipadaba_configuration_common.tcl +config/environment/ config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/instdict_specification.tcl config/hmm/hmm_configuration_common_1.tcl diff --git a/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT b/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT index 0f1607f8..35af79de 100644 --- a/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT @@ -17,16 +17,6 @@ config/commands/commands_common.tcl config/commands/pulser.tcl config/commands/hvcommands.tcl config/motors/sct_positmotor_common.tcl -config/environment/sct_protek_common.tcl -config/environment/temperature/sct_julabo_lh45.tcl -config/environment/temperature/sct_lakeshore_340.tcl -config/environment/temperature/sct_lakeshore_336.tcl -config/environment/temperature/sct_qlink.tcl -config/environment/temperature/sct_watlow_st4.tcl -config/environment/temperature/sct_rvasm2.tcl -config/environment/temperature/sct_oxford_itc.tcl -config/environment/magneticField/sct_bruker_BEC1.tcl -config/environment/magneticField/sct_oxford_ips.tcl -config/environment/magneticField/sct_oxford_labview.tcl +config/environment/ config/motors/sct_jogmotor_common.tcl diff --git a/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT b/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT index e66adad3..2cdc8009 100644 --- a/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT @@ -4,15 +4,6 @@ config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl -config/environment/he3/sct_he3.tcl -config/environment/temperature/sct_eurotherm_2000.tcl -config/environment/temperature/sct_julabo_lh45.tcl -config/environment/temperature/sct_lakeshore_336.tcl -config/environment/temperature/sct_lakeshore_340.tcl -config/environment/temperature/sct_lakeshore_370.tcl -config/environment/temperature/sct_oxford_itc.tcl -config/environment/temperature/sct_oxford_mercury.tcl -config/environment/temperature/west400.tcl config/hipadaba/hipadaba_configuration_common.tcl config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/instdict_specification.tcl @@ -26,7 +17,6 @@ config/commands/commands_common.tcl config/commands/pulser.tcl config/commands/hvcommands.tcl config/motors/sct_positmotor_common.tcl -config/environment/magneticField/sct_oxford_ips.tcl -config/environment/magneticField/sct_oxford_labview.tcl config/motors/sct_jogmotor_common.tcl +config/environment/ config/motors/sct_aerotech_soloist.tcl