Unverified Commit 6e0f9cc8 authored by Fabio Vitello's avatar Fabio Vitello Committed by GitHub
Browse files

Merge pull request #624 from discos/fix-issue-588 

Fix issue 588
parents 6ef7fb77 d3164e5d

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -48,3 +48,4 @@ SRT/Clients/SRTActiveSurfaceGUIClient/src/moc_SRTActiveSurfaceGUIui.cpp 
SRT/Errors/SRTActiveSurfaceErrors/idl/ASErrors.idl

SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.idl

SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceCommon.idl

.DS_Store

Medicina/CDB/alma/Procedures/StationProcedures/StationProcedures.xml

+6 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
<body>

	antennaSetup=CCC

	receiversSetup=CCC

	servoSetup=CCC

	chooseBackend=TotalPower

	initialize=CCC

	setSection=0,*,730.0,*,*,*,*
@@ -21,6 +22,7 @@ 
<body>

	antennaSetup=CHC

	receiversSetup=CHC

	servoSetup=CHC

	chooseBackend=TotalPower

	initialize=CHC

	setSection=0,*,300.0,*,*,*,*
@@ -37,6 +39,7 @@ 
<body>

	antennaSetup=KKC

	receiversSetup=KKC

	servoSetup=KKC

	chooseBackend=TotalPower

	initialize=KKC

	device=0
@@ -53,6 +56,7 @@ 
<body>

	antennaSetup=XXP

	receiversSetup=XXP

	servoSetup=XXP

	chooseBackend=TotalPower

	initialize=XXP

	setSection=0,*,730.0,*,*,*,*
@@ -67,6 +71,7 @@ 
<body>

	antennaSetup=CCC

	receiversSetup=CCC

	servoSetup=CCC

	receiversMode=NARROWBANDWIDTH

	chooseBackend=TotalPower

	initialize=CCCL
@@ -84,6 +89,7 @@ 
<body>

	antennaSetup=CHC

	receiversSetup=CHC

	servoSetup=CHC

	receiversMode=NARROWBANDWIDTH

	chooseBackend=TotalPower

	initialize=CHCL

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

+18 −8
Original line number Diff line number Diff line
@@ -26,20 +26,30 @@ 
        elevation tracking corrections

        -->

        <Xaxis>mm,-70.0,70.0,15,0,0,0,0</Xaxis>

        <Yaxis>mm,-70.0,70.0,-37.9929,0,0,0,0</Yaxis>

        <Zaxis>mm,-70.0,70.0,14.4818,0,0,0,0</Zaxis>

        <THETAXaxis>deg,-5,5.0,-0.0150346,0,0,0,0</THETAXaxis>

        <THETAYaxis>deg,-5,5.0,-0.0486663,0,0,0,0</THETAYaxis>

        <Yaxis>mm,-70.0,70.0,-37.9928595,0.73212879,-0.00306993,0,0</Yaxis>

        <Zaxis>mm,-70.0,70.0,14.4818271,-0.33632055,0.0016314,0,0</Zaxis>

        <THETAXaxis>deg,-5,5.0,-0.015034618,0.000379257,-0.0000031825,0,0</THETAXaxis>

        <THETAYaxis>deg,-5,5.0,-0.048666344,-0.000499178,0.0000063829,0,0</THETAYaxis>

    </MinorServo>

    <MinorServo>

        <code>CCC</code>

        <primary>0</primary>

        <trackel>1</trackel>

        <Xaxis>mm,-70.0,70.0,-7.62,0,0,0,0</Xaxis>

        <Yaxis>mm,-70.0,70.0,-18.2314,0,0,0,0</Yaxis>

        <Zaxis>mm,-70.0,70.0,-6.53656,0,0,0,0</Zaxis>

        <THETAXaxis>deg,-5,5.0,-0.0663735,0,0,0,0</THETAXaxis>

        <THETAYaxis>deg,-5,5.0,0.0287089,0,0,0,0</THETAYaxis>

        <Yaxis>mm,-70.0,70.0,-18.231423,0,0,0,0</Yaxis>

        <Zaxis>mm,-70.0,70.0,-6.536418,0,0,0,0</Zaxis>

        <THETAXaxis>deg,-5,5.0,-0.066373534,0,0,0,0</THETAXaxis>

        <THETAYaxis>deg,-5,5.0,0.028708897,0,0,0,0</THETAYaxis>

    </MinorServo>

    <MinorServo>

        <code>CHC</code>

        <primary>0</primary>

        <trackel>1</trackel>

        <Xaxis>mm,-70.0,70.0,-18.41,0,0,0,0</Xaxis>

        <Yaxis>mm,-70.0,70.0,7.546086,0,0,0,0</Yaxis>

        <Zaxis>mm,-70.0,70.0,14.781045,-0.41865813,0.00259974,0,0</Zaxis>

        <THETAXaxis>deg,-5,5.0,0.025683975,0,0,0,0</THETAXaxis>

        <THETAYaxis>deg,-5,5.0,0.066054159,0,0,0,0</THETAYaxis>

    </MinorServo>

    <MinorServo>

        <code>XXP</code>

Medicina/Configuration/CDB/alma/MANAGEMENT/CalibrationTool/CalibrationTool.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
               RepetitionExpireTime="10000000"

               TrackingFlagDutyCycle="100000"

               AntennaBossInterface="IDL:alma/Antenna/AntennaBoss:1.0"

               MinorServoBossInterface=""

               MinorServoBossInterface="IDL:alma/MinorServo/MinorServoBoss:1.0"

               SchedulerInterface="IDL:alma/Management/Scheduler:1.0"

               ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0"

               GenerateFile="1"

Medicina/Configuration/CDB/alma/MANAGEMENT/Palmiro/Palmiro.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
             AntennaBossInterface="IDL:alma/Antenna/AntennaBoss:1.0"

             ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0"

	     ReceiversBossInterface="IDL:alma/Receivers/ReceiversBoss:1.0"

	     MinorServoBossInterface=""

	     MinorServoBossInterface="IDL:alma/MinorServo/MinorServoBoss:1.0"

	     ActiveSurfaceBossInterface=""

		 	 CustomLoggerInterface="IDL:alma/Management/CustomLogger:1.0"

	     	 WeatherStationInstance="IDL:alma/Weather/GenericWeatherStation:1.0"