Commit 3fdc21fa authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #341, fix #507 (#508) 

Issue #341: added new nodding configurations for Sardara component. This will be tested on the upcoming 29th of January.
Issue #507: commented the Sardara `setup` command inside component `Init` method. This means that whenever the component starts it no longer sets a default configuration to the Sardara backend. The command with the desired configuration should still be issued by the observer as usual.
parent dd4c3a2a

Common/Servers/Sardara/include/CommandLine.h

+15 −2
Original line number Diff line number Diff line
@@ -751,21 +751,34 @@ private: 
	inline void clearStatusField(TstatusFields field) { m_backendStatus &= ~(1 << field); }



    bool m_SK77;

    bool m_SK00;

    bool m_SK01;

    bool m_SK02;

    bool m_SK03;

    bool m_SK04;

    bool m_SK05;

    bool m_SK06;

    bool m_SK00;

    bool m_SC00;

    bool m_SL00;

    bool m_SP00;

    bool m_SK77S;

    bool m_SK00S;

    bool m_SK01S;

    bool m_SK02S;

    bool m_SK03S;

    bool m_SK04S;

    bool m_SK05S;

    bool m_SK06S;

    bool m_SK00S;

    bool m_SC00S;

    bool m_SL00S;

    bool m_SP00S;

    bool m_SCC00;

    bool m_SCH00;

    bool m_SCC00S;

    bool m_SCH00S;



    bool m_stationSRT;

    bool m_stationMED;

	

};

Common/Servers/Sardara/src/CommandLine.cpp

+367 −32

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
               CommandLineTimeout="10000000"

               ConnectTimeout="3000000"

               PropertyRefreshTime="1000000"

               Configuration="SC00"

               Configuration="SCC00"

               TimeTollerance="250000"

               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"

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

+26 −56
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
</Configuration>



<Configuration>

	<configurationID>SK03</configurationID>

	<configurationID>SK01</configurationID>

	<sections>4</sections>

	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

	<inputPort>GREGORIAN</inputPort>
@@ -30,43 +30,28 @@ 
 	<attenuation>7.0</attenuation>		

	<section_boards>0 1 2 3</section_boards>

	<polarizations>L R L R</polarizations>

	<feed>0 0 3 3</feed>

	<feed>0 0 1 1</feed>

	<IF>0 1 0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>SK06</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 6 6</feed>

	<IF>0 1 0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>SK77</configurationID>

	<sections>14</sections>

	<configurationID>SCC00</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

	<inputPort>GREGORIAN</inputPort>

	<beams>7</beams>

 	<inputPort>BWG</inputPort>

 	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>7.0</attenuation>		

	<section_boards>0 1 2 3 4 5 6 7 8 9 10 11 12 13</section_boards>

	<polarizations>L R L R L R L R L R L R L R</polarizations>

	<feed>0 0 1 1 2 2 3 3 4 4 5 5 6 6</feed>

	<IF>0 1 0 1 0 1 0 1 0 1 0 1 0 1</IF>

 	<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>SC00</configurationID>

	<configurationID>SCH00</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

 	<inputPort>BWG</inputPort>
@@ -126,7 +111,7 @@ 
</Configuration>



<Configuration>

	<configurationID>SK03S</configurationID>

	<configurationID>SK01S</configurationID>

	<sections>4</sections>

	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

	<inputPort>GREGORIAN</inputPort>
@@ -135,43 +120,28 @@ 
 	<attenuation>7.0</attenuation>		

	<section_boards>0 1 2 3</section_boards>

	<polarizations>S S S S</polarizations>

	<feed>0 0 3 3</feed>

	<feed>0 0 1 1</feed>

	<IF>0 1 0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>SK06S</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 6 6</feed>

	<IF>0 1 0 1</IF>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>SK77S</configurationID>

	<sections>14</sections>

	<configurationID>SCC00S</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

	<inputPort>GREGORIAN</inputPort>

	<beams>7</beams>

 	<inputPort>BWG</inputPort>

 	<beams>1</beams>

 	<bandWidth>1500.0</bandWidth>

 	<attenuation>7.0</attenuation>		

	<section_boards>0 1 2 3 4 5 6 7 8 9 10 11 12 13</section_boards>

	<polarizations>S S S S S S S S S S S S S S</polarizations>

	<feed>0 0 1 1 2 2 3 3 4 4 5 5 6 6</feed>

	<IF>0 1 0 1 0 1 0 1 0 1 0 1 0 1</IF>

 	<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>SC00S</configurationID>

	<configurationID>SCH00S</configurationID>

 	<sections>2</sections>

 	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

 	<inputPort>BWG</inputPort>

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

+120 −0
Original line number Diff line number Diff line
@@ -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>