Skip to content
Snippets Groups Projects
Unverified Commit 1c3fb1eb authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #614, fix #615. See changelog below. (#616) 

* Fix #614, fix #615. See changelog below.

Issue #614: added the simulation .xml file for the ACS command center. It is automatically used when the testing CDB is in use.
Issue #615: changed output directory for Sardara NODATA files when the testing CDB is in use.

* Fix #614, now the correct environment is always loaded even when started graphically

This fixes a wrong behavior that showed up when launching discos from a .desktop file
The .desktop file loaded the environment variables at graphical session startup, so any environment update made by the discos-set command was simply ignored.
parent 093115ed
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Common/Misc/Scripts/src/discos
+ 17
− 2
View file @ 1c3fb1eb
......@@ -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
......
SRT/CDB/alma/DataBlock/Equipment/Equipment.xml
+ 1
− 1
View file @ 1c3fb1eb
......@@ -22,7 +22,7 @@
<AvailableBackend alias="TotalPower" backend="BACKENDS/TotalPower" noData="false" dataPath="" />
<AvailableBackend alias="XArcos" backend="BACKENDS/XBackends" noData="false" dataPath="" />
<AvailableBackend alias="Sardara" backend="BACKENDS/Sardara" noData="true" dataPath="/roach2_nuraghe/data/" />
<AvailableBackend alias="Sardara" backend="BACKENDS/Sardara" noData="true" dataPath="" />
<AvailableBackend alias="Holograpy" backend="BACKENDS/Holography" noData="true" dataPath="" />
</TelescopeEquipment>
SRT/Misc/SRTScripts/app-defaults/simulationStartup.xml 0 → 100644
+ 329
− 0
View file @ 1c3fb1eb
<?xml version="1.0" encoding="UTF-8"?>
<AcsCommandCenterProject xmlns="Alma/Acs/AcsCommandCenterProject"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
creator="acc-v8.1" xsi:type="AcsCommandCenterProject">
<mode>remote_native</mode>
<servicesLocalJavaRoot></servicesLocalJavaRoot>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
<remotePassword></remotePassword>
<toolRunAgainstDedicatedSettings>false</toolRunAgainstDedicatedSettings>
<toolAgainstManagerHost></toolAgainstManagerHost>
<toolAgainstManagerPort></toolAgainstManagerPort>
<toolAgainstInterfaceRepository></toolAgainstInterfaceRepository>
<toolAgainstNameService></toolAgainstNameService>
<containers>
<select>34</select>
<againstManagerHost></againstManagerHost>
<againstManagerPort></againstManagerPort>
<againstCDB></againstCDB>
<againstInterfaceRepository></againstInterfaceRepository>
<container>
<name>AntennaBossContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>AntennaContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>CalibrationToolContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>DerotatorContainer</name>
<type>py</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>DerotatorPositionerContainer</name>
<type>py</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>FitsZillaContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>LocalOscillatorLPContainer</name>
<type>py</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>LocalOscillatorCContainer</name>
<type>py</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>LocalOscillatorKContainer</name>
<type>py</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>LoggerContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>ManagementContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>MinorServoBossContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>MinorServoContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>MountContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>PointContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>ReceiversContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>PyCalmuxContainer</name>
<type>py</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SardaraContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRT7GHzContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTKBandContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTLPBandContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>TotalPowerContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>WeatherStationContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>ExternalClientsContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>RFIMonitoringContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTActiveSurfaceContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTActiveSurfaceContainer01</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTActiveSurfaceContainer02</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTActiveSurfaceContainer03</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTActiveSurfaceContainer04</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTActiveSurfaceContainer05</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTActiveSurfaceContainer06</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTActiveSurfaceContainer07</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>SRTActiveSurfaceContainer08</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
</containers>
</AcsCommandCenterProject>
SRT/Misc/SRTScripts/src/Makefile
+ 5
− 2
View file @ 1c3fb1eb
......@@ -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
......@@ -223,6 +224,8 @@ install : install_all
# @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
@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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment