diff --git a/Common/Misc/Scripts/src/discos b/Common/Misc/Scripts/src/discos index fe5786d4773212082f2b6f20d5bf7b29a76fcc1d..5132d0c77a1c63f03415fc8a9c0fa04cc670d23b 100644 --- a/Common/Misc/Scripts/src/discos +++ b/Common/Misc/Scripts/src/discos @@ -69,13 +69,28 @@ if [ "$CL_HELP" ] ; then exit fi +# Load current DISCOS environment +# =============================== +if [ -f /discos-sw/config/misc/load_branch ]; then + source /discos-sw/config/misc/load_branch +fi + +STARTUP_SCRIPT="$INTROOT/app-defaults/discosStartup.xml" + +if [ "$CDB" == "test" ] ; then + SIMULATION_SCRIPT="$INTROOT/app-defaults/simulationStartup.xml" + if [ -f "$SIMULATION_SCRIPT" ] ; then + STARTUP_SCRIPT="$SIMULATION_SCRIPT" + fi +fi + if [ "$CL_START" ] ; then - acscommandcenter -g $GEOMETRY -r $INTROOT/app-defaults/discosStartup.xml & + acscommandcenter -g $GEOMETRY -r $STARTUP_SCRIPT & exit fi if [ "$CL_VIEW" ] ; then - acscommandcenter -g $GEOMETRY -r $INTROOT/app-defaults/discosStartup.xml $MANAGER & + acscommandcenter -g $GEOMETRY -r $STARTUP_SCRIPT $MANAGER & fi diff --git a/SRT/CDB/alma/DataBlock/Equipment/Equipment.xml b/SRT/CDB/alma/DataBlock/Equipment/Equipment.xml index 4e13421870ddefb224427d9d95918bc04ead8ad4..ca995a65259b0501a5a3f68a55c06684af9d1eab 100644 --- a/SRT/CDB/alma/DataBlock/Equipment/Equipment.xml +++ b/SRT/CDB/alma/DataBlock/Equipment/Equipment.xml @@ -22,7 +22,7 @@ - + diff --git a/SRT/Misc/SRTScripts/app-defaults/simulationStartup.xml b/SRT/Misc/SRTScripts/app-defaults/simulationStartup.xml new file mode 100644 index 0000000000000000000000000000000000000000..fc00b44c7c9598c93f4d087160e72fe3107f490e --- /dev/null +++ b/SRT/Misc/SRTScripts/app-defaults/simulationStartup.xml @@ -0,0 +1,329 @@ + + + remote_native + + 0 + MASTERHOST + discos + + false + + + + + + + + + + + + AntennaBossContainer + cpp + + true + 0 + MASTERHOST + discos + + + AntennaContainer + cpp + + true + 0 + MASTERHOST + discos + + + CalibrationToolContainer + cpp + + true + 0 + MASTERHOST + discos + + + DerotatorContainer + py + + true + 0 + MASTERHOST + discos + + + DerotatorPositionerContainer + py + + true + 0 + MASTERHOST + discos + + + FitsZillaContainer + cpp + + true + 0 + MASTERHOST + discos + + + LocalOscillatorLPContainer + py + + true + 0 + MASTERHOST + discos + + + LocalOscillatorCContainer + py + + true + 0 + MASTERHOST + discos + + + LocalOscillatorKContainer + py + + true + 0 + MASTERHOST + discos + + + LoggerContainer + cpp + + true + 0 + MASTERHOST + discos + + + ManagementContainer + cpp + + true + 0 + MASTERHOST + discos + + + MinorServoBossContainer + cpp + + true + 0 + MASTERHOST + discos + + + MinorServoContainer + cpp + + true + 0 + MASTERHOST + discos + + + MountContainer + cpp + + true + 0 + MASTERHOST + discos + + + PointContainer + cpp + + true + 0 + MASTERHOST + discos + + + ReceiversContainer + cpp + + true + 0 + MASTERHOST + discos + + + PyCalmuxContainer + py + + true + 0 + MASTERHOST + discos + + + SardaraContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRT7GHzContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRTKBandContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRTLPBandContainer + cpp + + true + 0 + MASTERHOST + discos + + + TotalPowerContainer + cpp + + true + 0 + MASTERHOST + discos + + + WeatherStationContainer + cpp + + true + 0 + MASTERHOST + discos + + + ExternalClientsContainer + cpp + + true + 0 + MASTERHOST + discos + + + RFIMonitoringContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer01 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer02 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer03 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer04 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer05 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer06 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer07 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer08 + cpp + + true + 0 + MASTERHOST + discos + + + diff --git a/SRT/Misc/SRTScripts/src/Makefile b/SRT/Misc/SRTScripts/src/Makefile index 7adcfaf6ffa77cd069539221875d485288462edd..714173ccb87bb461b64b2d69ce2ac52184208bb1 100644 --- a/SRT/Misc/SRTScripts/src/Makefile +++ b/SRT/Misc/SRTScripts/src/Makefile @@ -172,7 +172,7 @@ ASCII_TO_MIF = # other files to be installed #---------------------------- #INSTALL_FILES = ../app-defaults/nuragheStartup.xml -INSTALL_FILES = ../app-defaults/discosStartup.xml +INSTALL_FILES = ../app-defaults/discosStartup.xml ../app-defaults/simulationStartup.xml # # list of all possible C-sources (used to create automatic dependencies) @@ -210,6 +210,7 @@ all: do_all clean : clean_all @rm -f $(INTROOT)/app-defaults/discosStartup.xml + @rm -f $(INTROOT)/app-defaults/simulationStartup.xml @echo " . . . clean done" clean_dist : clean_all clean_dist_all @@ -222,7 +223,9 @@ install : install_all # @chmod 764 $(INTROOT)/bin/nuraghe # @chmod 764 $(INTROOT)/app-defaults/nuragheStartup.xml @sed -i 's/MASTERHOST/$(MASTER)/g' $(INTROOT)/app-defaults/discosStartup.xml - @chmod 700 $(INTROOT)/app-defaults/discosStartup.xml + @chmod 700 $(INTROOT)/app-defaults/discosStartup.xml + @sed -i 's/MASTERHOST/$(MASTER)/g' $(INTROOT)/app-defaults/simulationStartup.xml + @chmod 700 $(INTROOT)/app-defaults/simulationStartup.xml @chmod 700 $(INTROOT)/bin/discosdown @chmod 700 $(INTROOT)/bin/discosup @chmod 700 $(INTROOT)/bin/receiversmonitor.py