Commit 5d0b4842 authored by Medicina Operator's avatar Medicina Operator
Browse files

some tuning for the Roach2 backend integration in Medicina

parent becd1296

Common/Servers/Roach/src/CommandLine.cpp

+12 −1
Original line number Diff line number Diff line
@@ -157,7 +157,18 @@ void CCommandLine::stopDataAcquisition() throw (BackendsErrors::ConnectionExImpl 
		ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl,ComponentErrors::NotAllowedExImpl,BackendsErrors::BackendFailExImpl)

{

	AUTO_TRACE("CCommandLine::stopDataAcquisition()");

	/*****************************************************************/

	// since both suspend and stop data acquisition are mapped into Command::stop message to the backend

	// It happens (@ the end of a scan) that the backend receives two Command::stop messages. Even if this is not

	// an issue for the backend, this leads to an unwanted behviour of the control software. The thrown exception, infact,

	// leads to skip the first subscan of the next scan. Temporarly workround if to catch the exception here. A debug messages is sent. 

	/*****************************************************************/

	try {

		Message reply = sendBackendCommand(Command::stop());

	}

	catch (...) {

		ACS_LOG(LM_FULL_INFO,"CCommandLine::stopDataAcquisition()",(LM_DEBUG,"backend error while issuing a stop ascquisition"));		

	}

	ACS_LOG(LM_FULL_INFO,"CCommandLine::stopDataAcquisition()",(LM_INFO,"TRANSFER_JOB_STOPPED"));

	clearStatusField(CCommandLine::BUSY); // sets the component status to busy

	clearStatusField(CCommandLine::SUSPEND); // sets the component status to transfer job suspended......

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

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
               xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

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

               sender_protocols="TCP=${HOST}:14000"

               IPAddress="192.168.52.11"

               IPAddress="192.168.1.10"

               Port="10000"

               CommandLineTimeout="10000000"

               ConnectTimeout="3000000"
@@ -18,13 +18,13 @@ 
               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"

               DataPort="6001"

               DataIPAddress="192.168.10.9"            	   

               DataIPAddress="192.168.1.98"            	   

               DataLatency="3000000"

               SenderSleepTime="300000"

               SenderResponseTime="1000000"

               ControlSleepTime="900000"

               ControlResponseTime="1000000"

               BoardsNumber="14"

               BoardsNumber="4"

               DataBufferSize="64">

	<time/>

	<backendName/>

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

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
	

	<AvailableBackend alias="TotalPower" backend="BACKENDS/TotalPower" noData="false" dataPath="" />

	<AvailableBackend alias="XArcos" backend="BACKENDS/XBackends" noData="false" dataPath="" />

	<AvailableBackend alias="Roach" backend="BACKENDS/Roach" noData="true" dataPath="" />

	<AvailableBackend alias="Roach" backend="BACKENDS/Roach" noData="true" dataPath="/locallustre/roachdata/" />

	

</TelescopeEquipment>

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

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

</Configuration>



<Configuration>

	<configurationID>RK77</configurationID>

	<sections>14</sections>

	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

	<inputPort>GREGORIAN</inputPort>

	<beams>7</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>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>RC00</configurationID>

 	<sections>2</sections>
@@ -95,21 +80,6 @@ 
	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>RK77S</configurationID>

	<sections>7</sections>

	<calSwitchingEnabled>TRUE</calSwitchingEnabled>

	<inputPort>GREGORIAN</inputPort>

	<beams>7</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</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>

	<bins>1024</bins>

</Configuration>



<Configuration>

	<configurationID>RC00S</configurationID>

 	<sections>1</sections>

Medicina/Misc/MedScripts/app-defaults/escsStartup.xml

+11 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
    <toolAgainstInterfaceRepository></toolAgainstInterfaceRepository>

    <toolAgainstNameService></toolAgainstNameService>

    <containers>

        <select>11</select>

        <select>13</select>

        <againstManagerHost></againstManagerHost>

        <againstManagerPort></againstManagerPort>

        <againstCDB></againstCDB>
@@ -116,7 +116,7 @@ 
            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.51.98</remoteHost>

            <remoteHost>192.168.1.98</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>
@@ -128,5 +128,14 @@ 
            <remoteHost>192.168.1.104</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>

            <name>RoachContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase></scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

    </containers>

</AcsCommandCenterProject>