Unverified Commit 73b16fcc authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

Fix #902, added configuration for Noto (#903) 



* fix issue #902: fixed an issue, related to the porting to python 3 for the Noto LocalOscillator component

* fix issue #902: changed totalpower, weather station configuration and IfDistributr python code (ported to python 3)

* fix issue #902: small fix as requested in Pull Request review

* fix issue #902: adjusted attenutaions in setup procedure for primary band recevier

---------

Co-authored-by: default avatarAndrea Orlati <a.orati@ira.inaf.it>
parent 2790826c

Noto/CDB/alma/RECEIVERS/NotoReceivers/NotoReceivers.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
<!--

<!--

   - History:

   - History:

   - 17 - 11 -2016 created Andrea Orlati (a.orlati@ira.inaf.it)

   - 17 - 11 -2016 created Andrea Orlati (a.orlati@ira.inaf.it)

   LocalOscillatorInstance="RECEIVERS/LocalOscillator"

-->

-->





<NotoReceivers xmlns="urn:schemas-cosylab-com:NotoReceivers:1.0" 

<NotoReceivers xmlns="urn:schemas-cosylab-com:NotoReceivers:1.0"
@@ -10,7 +11,7 @@ 
				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   

				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   

				HPIBIPAddress="192.167.187.201"

				HPIBIPAddress="192.167.187.201"

				HPIBPort="1234"

				HPIBPort="1234"

				LocalOscillatorInstance="RECEIVERS/LocalOscillator"

				LocalOscillatorInstance=""

				LocalOscillatorEnabledReceivers="KKC QQC CCC MMC"				

				LocalOscillatorEnabledReceivers="KKC QQC CCC MMC"				

				FocusSelectorInterface="IDL:alma/Backends/TotalPower:1.0"

				FocusSelectorInterface="IDL:alma/Backends/TotalPower:1.0"

>

>

Noto/Configuration/CDB/MACI/Components/BACKENDS/TotalPower/TotalPower.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
	Code="TotalPowerImpl"

	Code="TotalPowerImpl"

	Type="IDL:alma/Backends/TotalPower:1.0"

	Type="IDL:alma/Backends/TotalPower:1.0"

	Container="TotalPowerContainer"

	Container="TotalPowerContainer"

    Default="true"

	KeepAliveTime="-1"

	KeepAliveTime="-1"

    ImplLang="cpp"

    ImplLang="cpp"

/>
 
/>

Noto/Configuration/CDB/alma/BACKENDS/TotalPower/TotalPower.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
               RepetitionCacheTime="2000000"

               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"

               RepetitionExpireTime="5000000"

               DataPort="9001"

               DataPort="9001"

               DataIPAddress="192.167.187.40"

               DataIPAddress="192.167.187.17"

               DataLatency="3000000"

               DataLatency="3000000"

               SenderSleepTime="300000"

               SenderSleepTime="300000"

               SenderResponseTime="1000000"

               SenderResponseTime="1000000"

Noto/Configuration/CDB/alma/DataBlock/TotalPower/TotalPower.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ 
	<sections>2</sections>

	<sections>2</sections>

	<calSwitchingEnabled>FALSE</calSwitchingEnabled>

	<calSwitchingEnabled>FALSE</calSwitchingEnabled>

	<inputPort>GREGORIAN</inputPort>

	<inputPort>GREGORIAN</inputPort>

	<inputPortDB>3</inputPortDB>

	<inputPortDB>9</inputPortDB>

	<inputPortBW>730</inputPortBW>

	<inputPortBW>730</inputPortBW>

	<beams>1</beams>

	<beams>1</beams>

	<section_boards>0 1</section_boards>

	<section_boards>0 1</section_boards>

Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml

+6 −6
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ 
    ifdist=1,3,-1

    ifdist=1,3,-1

    ifdist=2,3,-1

    ifdist=2,3,-1

	ifdist=1,-1,10

	ifdist=1,-1,10

	ifdist=2,-1,10

	ifdist=2,-1,11

</body>

</body>

</Procedure>

</Procedure>
@@ -121,8 +121,8 @@ 
    calOff

    calOff

    ifdist=1,2,-1

    ifdist=1,2,-1

    ifdist=2,2,-1

    ifdist=2,2,-1

	ifdist=1,-1,44

	ifdist=1,-1,22

	ifdist=2,-1,44

	ifdist=2,-1,22

</body>

</body>

</Procedure>

</Procedure>
@@ -138,8 +138,8 @@ 
    calOff

    calOff

    ifdist=1,4,-1

    ifdist=1,4,-1

    ifdist=2,4,-1

    ifdist=2,4,-1

	ifdist=1,-1,8

	ifdist=1,-1,10

	ifdist=2,-1,8

	ifdist=2,-1,10

</body>

</body>

</Procedure>

</Procedure>
@@ -155,7 +155,7 @@ 
    calOff

    calOff

    ifdist=1,5,-1

    ifdist=1,5,-1

    ifdist=2,3,-1

    ifdist=2,3,-1

	ifdist=1,-1,8

	ifdist=1,-1,10

	ifdist=2,-1,10

	ifdist=2,-1,10

</body>

</body>

</Procedure>

</Procedure>