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

Merge pull request #801 from discos/stable-into-master 

Porting latest changes from stable into master
parents 5a759787 9447aa7a

Common/Servers/Sardara/include/CommandLine.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -794,7 +794,6 @@ ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl,BackendsErrors::Mal 
    	bool m_stokes;

    	bool m_stokes;

    	bool m_CK;

    	bool m_CK;

      bool m_SardaraInitialized;

      bool m_SardaraInitialized;

	

};

};





#endif /*_COMMANDLINE_H_*/
 
#endif /*_COMMANDLINE_H_*/

Common/Servers/Sardara/src/CommandLine.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -536,6 +536,7 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const 
                ACS_LOG(LM_FULL_INFO,"CCommandLine::setSection()",(LM_NOTICE,"BACKEND_SARDARA_SET_SECTION ERROR")); 

                ACS_LOG(LM_FULL_INFO,"CCommandLine::setSection()",(LM_NOTICE,"BACKEND_SARDARA_SET_SECTION ERROR")); 

            }

            }

        }

        }



        if (m_stationMEDNT == true) {

        if (m_stationMEDNT == true) {

	        try {

	        try {

                Message request = Command::setSection(inputId, newFreq, newBW, newFeed, newPol, newSR, newBins);

                Message request = Command::setSection(inputId, newFreq, newBW, newFeed, newPol, newSR, newBins);

Medicina/CDB/alma/DataBlock/Sardara/Sardara.xml

+90 −0
Original line number Original line Diff line number Diff line
@@ -80,6 +80,51 @@ 
	<bins>1024</bins>

	<bins>1024</bins>

</Configuration>

</Configuration>





<Configuration>

	<configurationID>SCC00</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

 	<inputPort>BWG</inputPort>

 	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>9.0</attenuation>	 	

 	<section_boards>0 1</section_boards>

 	<polarizations>L R</polarizations>

 	<feed>0 0</feed>

 	<IF>0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>SCH00</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

 	<inputPort>BWG</inputPort>

 	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>9.0</attenuation>	 	

 	<section_boards>0 1</section_boards>

 	<polarizations>L R</polarizations>

 	<feed>0 0</feed>

 	<IF>0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>SX00</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

 	<inputPort>BWG</inputPort>

 	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>9.0</attenuation>	 	

 	<section_boards>0 1</section_boards>

 	<polarizations>L R</polarizations>

 	<feed>0 0</feed>

 	<IF>0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

<Configuration>

	<configurationID>SL00</configurationID>

	<configurationID>SL00</configurationID>

 	<sections>2</sections>

 	<sections>2</sections>
@@ -185,6 +230,51 @@ 
	<bins>1024</bins>

	<bins>1024</bins>

</Configuration>

</Configuration>





<Configuration>

	<configurationID>SCC00S</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

 	<inputPort>BWG</inputPort>

 	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>9.0</attenuation>	 	

 	<section_boards>0 1</section_boards>

 	<polarizations>S S</polarizations>

 	<feed>0 0</feed>

 	<IF>0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>SCH00S</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

 	<inputPort>BWG</inputPort>

 	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>9.0</attenuation>	 	

 	<section_boards>0 1</section_boards>

 	<polarizations>S S</polarizations>

 	<feed>0 0</feed>

 	<IF>0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>SX00S</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

 	<inputPort>BWG</inputPort>

 	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>9.0</attenuation>	 	

 	<section_boards>0 1</section_boards>

 	<polarizations>S S</polarizations>

 	<feed>0 0</feed>

 	<IF>0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

<Configuration>

	<configurationID>SL00S</configurationID>

	<configurationID>SL00S</configurationID>

 	<sections>2</sections>

 	<sections>2</sections>

Medicina/Configuration/CDB/alma/ANTENNA/Mount/Mount.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -17,9 +17,9 @@ 
               RepetitionExpireTime="5000000"

               RepetitionExpireTime="5000000"

               CheckMode="false"

               CheckMode="false"

               CheckOscillation="true"

               CheckOscillation="true"

			   OscillationThreshold="0.025"

			   OscillationThreshold="0.030"

			   OscillationAlarmDuration="2000000"	

			   OscillationAlarmDuration="2000000"	

			   OscillationNumberThreshold="4"	

			   OscillationNumberThreshold="5"	

			   OscillationRecoverWaitTime="3000000">

			   OscillationRecoverWaitTime="3000000">

               

               

	<azimuth description="Azimuth drive position" 

	<azimuth description="Azimuth drive position"

Medicina/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml

+31 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,21 @@ 
	<bins>1024</bins>

	<bins>1024</bins>

</Configuration>

</Configuration>





<Configuration>

	<configurationID>SX00</configurationID>

        <sections>2</sections>

	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

	<inputPort>GREGORIAN</inputPort>

	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>7.0</attenuation>		

	<section_boards>0 1</section_boards>

	<polarizations>L R</polarizations>

	<feed>0 0</feed>

	<IF>0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

<Configuration>

	<configurationID>SK01</configurationID>

	<configurationID>SK01</configurationID>

	<sections>4</sections>

	<sections>4</sections>
@@ -110,6 +125,21 @@ 
	<bins>1024</bins>

	<bins>1024</bins>

</Configuration>

</Configuration>





<Configuration>

	<configurationID>SX00S</configurationID>

	<sections>2</sections>

	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

	<inputPort>GREGORIAN</inputPort>

	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>7.0</attenuation>		

	<section_boards>0 1 2 3</section_boards>

	<polarizations>S S</polarizations>

	<feed>0 0</feed>

	<IF>0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

<Configuration>

	<configurationID>SK01S</configurationID>

	<configurationID>SK01S</configurationID>

	<sections>4</sections>

	<sections>4</sections>