Commit 389d081b authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #374, fixed some SRT CDBs inconsistencies (#375)

parent 5027efc0

SRT/CDB/alma/BACKENDS/XBackends/XBackends.xml

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

               IPAddress="127.0.0.1"

               Port="1234"

	       	   Configuration="22GHzMultiFeed">

               Configuration="NNNN"

               Mode8Bit="0">

	<time/>

	<backendName/>

	<bandWidth/>

SRT/CDB/alma/MINORSERVO/Boss/Boss.xml

+15 −9
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
        @ GFR: park;

        @ SRP: TX = (-1.5); 

               TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); 

               TZ = (11.5796960573, -0.4234293285, 0.0115320065, -0.0001960492, 0.0000012410);

               TZ = (91.5590595452, -16.4202062811, 1.16941963489, -0.040640240455, 0.000733782714288, -6.62393455442e-06, 2.36410838911e-08);

               RX = (-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053);

               RY = (-0.036111111111111108); 

               RZ = (0);
@@ -62,7 +62,7 @@ 
        @ GFR: park;

        @ SRP: TX = (-1.5); 

               TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); 

               TZ = (11.5796960573, -0.4234293285, 0.0115320065, -0.0001960492, 0.0000012410);

	       TZ = (-62.4908146635, 6.98439048963, -0.29490654835, 0.00576168925985, -5.37111297435e-05, 1.93982122885e-07 );

               RX = (-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053);

               RY = (-0.036111111111111108); 

               RZ = (0);
@@ -73,7 +73,7 @@ 
        @ GFR: park;

        @ SRP: TX(mm) = (-1.5); 

               TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958);

               TZ(mm) = (9.530113849340003, -0.169826241752, 0.000419997047, 0.000003985237);

               TZ = (7.92754535681, -1.73279985542, 0.147346047014, -0.00516934108597, 7.69094654954e-05, -4.0697957632e-07 );

               RX(degree) = (-0.011392527142374848, -0.0001426193499425, 0.000039508844799, -0.000000131010010); 

               RY(degree) = (-0.03611111111111111); 

               RZ(degree) = (0);
@@ -91,6 +91,18 @@ 
        @ GFR: RZ(mm) = (1323.5);

        @ M3R: RZ(mm) = (860);

    "

    KKG_TEST_ASACTIVE="

        @ PFP: park;

        @ SRP: TX = (-1.5);

               TY = (83.53947196, -9.17664589, 0.42877766, -0.00940768, 0.00009361, -0.00000035);

               TZ = (-15.6669651675, 1.9293068324, -0.0628990613, 0.0007771141, -0.0000032940);

               RX = (-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053);

               RY = (-0.036111111111111108);

               RZ = (0);

        @ GFR: RZ(mm) = (1323.5);

        @ M3R: RZ(mm) = (860);

    "



    KKG="

        @ PFP: park;

        @ SRP: TX(mm) = (-1.5);
@@ -142,12 +154,6 @@ 
        @ M3R: RZ(mm) = (860);

    "



    SSP="

        @ SRP: park;

        @ PFP: RY(mm) = (-25.95); TX(mm) = (-223); TZ(mm) = (-67);

        @ GFR: RZ(mm) = (-600);

        @ M3R: RZ(mm) = (860);

    "



    slaves="GFR, M3R, PFP, SRP"

>

SRT/CDB/alma/WEATHERSTATION/WeatherStation/WeatherStation.xml

+16 −27
Original line number Diff line number Diff line
@@ -7,25 +7,14 @@ xmlns="urn:schemas-cosylab-com:WeatherStation: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"

	      IPAddress="192.168.202.66" port="5000">

    IPAddress="192.168.202.66" port="5000"

    MountInterface="IDL:alma/Antenna/SRTMount:1.0"

    windthreshold="60" >



	<temperature

		     description="current temperature"

		     units ="deg Celsius"/>

	<winddir    

		     description="instantaneous wind direction"

		     units = "deg"	/>

	<windspeed 

		     description="average wind speed"

		     units = "m/s"

		     max_value="55"	/>

	<windspeedpeak 

		     description="spike wind direction"

		     units = "m/s" 

                     max_value="60"

			

		

		 />

    <temperature description="current temperature" units="deg Celsius" />

    <winddir description="instantaneous wind direction" units="deg" />

    <windspeed description="average wind speed" units="km/h" max_value="55" />

    <windspeedpeak description="spike wind direction" units="km/h" max_value="60" />

    <humidity description="Humidity" />

    <pressure description="pressure" />

    <autoparkThreshold description="Threshold for wind auto park" />

SRT/Configuration/CDB/alma/WEATHERSTATION/WeatherStation/WeatherStation.xml

+17 −9
Original line number Diff line number Diff line
@@ -3,11 +3,19 @@ 
    - History:

    -   Tue Jul 10 13:47:38 UTC 2012 modified by jDAL

-->

<WeatherStation xmlns="urn:schemas-cosylab-com:WeatherStation: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" IPAddress="192.168.202.66" port="5000" windthreshold="60" >

<WeatherStation

    xmlns="urn:schemas-cosylab-com:WeatherStation: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"

    IPAddress="192.168.202.66" port="5000"

    MountInterface="IDL:alma/Antenna/SRTMount:1.0"

    windthreshold="60" >



    <temperature description="current temperature" units="deg Celsius" />

    <winddir description="instantaneous wind direction" units="deg" />

	<windspeed description="average wind speed" units="km/s" max_value="50" />

	<windspeedpeak description="spike wind direction" units="km/h" max_value="55" />

    <windspeed description="average wind speed" units="km/h" max_value="55" />

    <windspeedpeak description="spike wind direction" units="km/h" max_value="60" />

    <humidity description="Humidity" />

    <pressure description="pressure" />

    <autoparkThreshold description="Threshold for wind auto park" />