Skip to content
Snippets Groups Projects
Commit 583137da authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Porting master branch features into stable

parents b2e657a2 590ce504
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 232 additions and 4 deletions
SRT/Configuration/CDB/MACI/Containers/LocalOscillatorKContainer/LocalOscillatorKContainer.xml 0 → 100644
+ 33
− 0
View file @ 583137da
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Author Infos
* ============
* Name: Giuseppe Carboni
* E-mail: giuseppe.carboni@inaf.it
-->
<Container xmlns="urn:schemas-cosylab-com:Container:1.0"
xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0"
Timeout="30.0"
UseIFR="true"
ManagerRetry="10"
ImplLang="py"
Recovery="false">
<Autoload>
<cdb:_ string="baci" />
</Autoload>
<LoggingConfig
centralizedLogger="Log"
minLogLevel="5"
minLogLevelLocal="5"
dispatchPacketSize="0"
immediateDispatchLevel="8"
flushPeriodSeconds="1"
>
</LoggingConfig>
</Container>
SRT/Configuration/CDB/MACI/Containers/PyCalmuxContainer/PyCalmuxContainer.xml 0 → 100644
+ 27
− 0
View file @ 583137da
<?xml version="1.0" encoding="ISO-8859-1"?>
<Container xmlns="urn:schemas-cosylab-com:Container:1.0"
xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0"
ImplLang="py"
Timeout="30.0"
UseIFR="true"
ManagerRetry="10"
Recovery="false">
<Autoload>
<cdb:_ string="baci" />
</Autoload>
<LoggingConfig
centralizedLogger="Log"
minLogLevel="5"
minLogLevelLocal="5"
dispatchPacketSize="0"
immediateDispatchLevel="8"
flushPeriodSeconds="1"
>
</LoggingConfig>
</Container>
SRT/Configuration/CDB/MACI/Managers/Manager/Manager.xml
+ 0
− 1
View file @ 583137da
......@@ -33,7 +33,6 @@
</ServiceComponents>
<ServiceDaemons>
<cdb:_ string="nuraghe-mng.srt.inaf.it"/>
</ServiceDaemons>
......
SRT/Configuration/CDB/alma/BACKENDS/PyCalmux/PyCalmux.xml 0 → 100644
+ 11
− 0
View file @ 583137da
<?xml version='1.0' encoding='ISO-8859-1'?>
<!--
Giuseppe Carboni, giuseppe.carboni@inaf.it
-->
<PyCalmux
xmlns="urn:schemas-cosylab-com:PyCalmux:1.0"
xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
IP="192.168.200.123"
PORT="5003"/>
SRT/Configuration/CDB/alma/BACKENDS/TotalPower/TotalPower.xml
+ 1
− 1
View file @ 583137da
......@@ -18,7 +18,7 @@
RepetitionCacheTime="2000000"
RepetitionExpireTime="5000000"
DataPort="6001"
DataIPAddress="192.168.200.200"
DataIPAddress="192.168.200.203"
DataLatency="3000000"
SenderSleepTime="300000"
SenderResponseTime="1000000"
......
SRT/Configuration/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml 0 → 100755
+ 11
− 0
View file @ 583137da
<?xml version='1.0' encoding='ISO-8859-1'?>
<CalMuxTable xmlns="urn:schemas-cosylab-com:CalMuxTable:1.0"
xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<BackendEntry><Backend>DBBC</Backend><Channel>6</Channel><Polarity>0</Polarity></BackendEntry>
<BackendEntry><Backend>DFB</Backend><Channel>8</Channel><Polarity>0</Polarity></BackendEntry>
</CalMuxTable>
SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml
+ 120
− 0
View file @ 583137da
......@@ -20,6 +20,36 @@
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK01</configurationID>
<sections>4</sections>
<calSwitchingEnabled>TRUE</calSwitchingEnabled>
<inputPort>GREGORIAN</inputPort>
<beams>2</beams>
<bandWidth>1500.0</bandWidth>
<attenuation>7.0</attenuation>
<section_boards>0 1 2 3</section_boards>
<polarizations>L R L R</polarizations>
<feed>0 0 1 1</feed>
<IF>0 1 0 1</IF>
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK02</configurationID>
<sections>4</sections>
<calSwitchingEnabled>TRUE</calSwitchingEnabled>
<inputPort>GREGORIAN</inputPort>
<beams>2</beams>
<bandWidth>1500.0</bandWidth>
<attenuation>7.0</attenuation>
<section_boards>0 1 2 3</section_boards>
<polarizations>L R L R</polarizations>
<feed>0 0 2 2</feed>
<IF>0 1 0 1</IF>
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK03</configurationID>
<sections>4</sections>
......@@ -35,6 +65,36 @@
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK04</configurationID>
<sections>4</sections>
<calSwitchingEnabled>TRUE</calSwitchingEnabled>
<inputPort>GREGORIAN</inputPort>
<beams>2</beams>
<bandWidth>1500.0</bandWidth>
<attenuation>7.0</attenuation>
<section_boards>0 1 2 3</section_boards>
<polarizations>L R L R</polarizations>
<feed>0 0 4 4</feed>
<IF>0 1 0 1</IF>
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK05</configurationID>
<sections>4</sections>
<calSwitchingEnabled>TRUE</calSwitchingEnabled>
<inputPort>GREGORIAN</inputPort>
<beams>2</beams>
<bandWidth>1500.0</bandWidth>
<attenuation>7.0</attenuation>
<section_boards>0 1 2 3</section_boards>
<polarizations>L R L R</polarizations>
<feed>0 0 5 5</feed>
<IF>0 1 0 1</IF>
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK06</configurationID>
<sections>4</sections>
......@@ -125,6 +185,36 @@
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK01S</configurationID>
<sections>4</sections>
<calSwitchingEnabled>TRUE</calSwitchingEnabled>
<inputPort>GREGORIAN</inputPort>
<beams>2</beams>
<bandWidth>1500.0</bandWidth>
<attenuation>7.0</attenuation>
<section_boards>0 1 2 3</section_boards>
<polarizations>S S S S</polarizations>
<feed>0 0 1 1</feed>
<IF>0 1 0 1</IF>
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK02S</configurationID>
<sections>4</sections>
<calSwitchingEnabled>TRUE</calSwitchingEnabled>
<inputPort>GREGORIAN</inputPort>
<beams>2</beams>
<bandWidth>1500.0</bandWidth>
<attenuation>7.0</attenuation>
<section_boards>0 1 2 3</section_boards>
<polarizations>S S S S</polarizations>
<feed>0 0 2 2</feed>
<IF>0 1 0 1</IF>
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK03S</configurationID>
<sections>4</sections>
......@@ -140,6 +230,36 @@
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK04S</configurationID>
<sections>4</sections>
<calSwitchingEnabled>TRUE</calSwitchingEnabled>
<inputPort>GREGORIAN</inputPort>
<beams>2</beams>
<bandWidth>1500.0</bandWidth>
<attenuation>7.0</attenuation>
<section_boards>0 1 2 3</section_boards>
<polarizations>S S S S</polarizations>
<feed>0 0 4 4</feed>
<IF>0 1 0 1</IF>
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK05S</configurationID>
<sections>4</sections>
<calSwitchingEnabled>TRUE</calSwitchingEnabled>
<inputPort>GREGORIAN</inputPort>
<beams>2</beams>
<bandWidth>1500.0</bandWidth>
<attenuation>7.0</attenuation>
<section_boards>0 1 2 3</section_boards>
<polarizations>S S S S</polarizations>
<feed>0 0 5 5</feed>
<IF>0 1 0 1</IF>
<bins>1024</bins>
</Configuration>
<Configuration>
<configurationID>SK06S</configurationID>
<sections>4</sections>
......
SRT/Misc/SRTScripts/app-defaults/discosStartup.xml
+ 28
− 1
View file @ 583137da
......@@ -14,7 +14,7 @@
<toolAgainstInterfaceRepository></toolAgainstInterfaceRepository>
<toolAgainstNameService></toolAgainstNameService>
<containers>
<select>32</select>
<select>35</select>
<againstManagerHost></againstManagerHost>
<againstManagerPort></againstManagerPort>
<againstCDB></againstCDB>
......@@ -82,6 +82,24 @@
<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>
......@@ -154,6 +172,15 @@
<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>
......
SystemMake/Makefile
+ 1
− 1
View file @ 583137da
......@@ -34,7 +34,7 @@ COMMON_LIBRARIES:=SlaLibrary IRALibrary DiscosVersion TextWindowLibrary ParserLi
COMMON_SERVERS:=AntennaBoss Observatory OTF PointingModel Refraction SkySource \
Moon FitsWriter Scheduler ReceiversBoss ExternalClients \
CalibrationTool TotalPower NoiseGenerator CustomLogger \
XBackend PyDewarPositioner Sardara PyLocalOscillator MFKBandBaseReceiver
XBackend PyDewarPositioner Sardara PyLocalOscillator MFKBandBaseReceiver PyCalmux
COMMON_CLIENTS:=AntennaBossTextClient ObservatoryTextClient \
GenericBackendTextClient ReceiversBossTextClient \
SystemTerminal CaltoolClient CustomLoggingClient \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment