Unverified Commit 39ccfdad authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Update master with commits from issue #634 branch (#642) 



* present Pt model loaded, smal bug fixed in dmed

* Issue #634, updated .gitignore

Co-authored-by: default avatarAndrea Orlati <a.orlati@ira.inaf.it>
parent 65982e60

.gitignore

+2 −3
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ Common/Libraries/SlaLibrary 
Common/Clients/CaltoolClient/src/calibrationtool_ui.py

Common/Clients/CaltoolClient/src/calibrationtool_ui.py

Common/Clients/CaltoolClient/src/calibrationtool_ui.pye

Common/Clients/CaltoolClient/src/calibrationtool_ui.pye

Common/Errors/AntennaErrors/idl/AntennaErrors.idl

Common/Errors/AntennaErrors/idl/AntennaErrors.idl

Common/Errors/ActiveSurfaceErrors/idl/ASErrors.idl

Common/Errors/BackendsErrors/idl/BackendsErrors.idl

Common/Errors/BackendsErrors/idl/BackendsErrors.idl

Common/Errors/ClientErrors/idl/ClientErrors.idl

Common/Errors/ClientErrors/idl/ClientErrors.idl

Common/Errors/ComponentErrors/idl/ComponentErrors.idl

Common/Errors/ComponentErrors/idl/ComponentErrors.idl
@@ -31,6 +32,7 @@ Common/Interfaces/AntennaInterface/idl/Mount.idl 
Common/Interfaces/AntennaInterface/idl/OTF.idl

Common/Interfaces/AntennaInterface/idl/OTF.idl

Common/Interfaces/AntennaInterface/idl/Observatory.idl

Common/Interfaces/AntennaInterface/idl/Observatory.idl

Common/Interfaces/AntennaInterface/idl/SkySource.idl

Common/Interfaces/AntennaInterface/idl/SkySource.idl

Common/Interfaces/ActiveSurfaceInterface/idl/ActiveSurfaceCommon.idl

Common/Interfaces/CommonInterface/idl/AntennaDefinitions.idl

Common/Interfaces/CommonInterface/idl/AntennaDefinitions.idl

Common/Interfaces/CommonInterface/idl/BackendsDefinitions.idl

Common/Interfaces/CommonInterface/idl/BackendsDefinitions.idl

Common/Interfaces/CommonInterface/idl/ManagmentDefinitions.idl

Common/Interfaces/CommonInterface/idl/ManagmentDefinitions.idl
@@ -45,7 +47,4 @@ Noto/Interfaces/NotoActiveSurfaceInterface/idl/NotoActiveSurfaceBoss.idl 
SRT/Clients/SRTActiveSurfaceGUIClient/include/SRTActiveSurfaceGUI.h

SRT/Clients/SRTActiveSurfaceGUIClient/include/SRTActiveSurfaceGUI.h

SRT/Clients/SRTActiveSurfaceGUIClient/src/moc_SRTActiveSurfaceCore.cpp

SRT/Clients/SRTActiveSurfaceGUIClient/src/moc_SRTActiveSurfaceCore.cpp

SRT/Clients/SRTActiveSurfaceGUIClient/src/moc_SRTActiveSurfaceGUIui.cpp

SRT/Clients/SRTActiveSurfaceGUIClient/src/moc_SRTActiveSurfaceGUIui.cpp

SRT/Errors/SRTActiveSurfaceErrors/idl/ASErrors.idl

SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.idl
 
SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.idl
 
SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceCommon.idl

.DS_Store

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

+8 −3
Original line number Original line Diff line number Diff line
@@ -77,6 +77,11 @@ 
        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0 </coefficientVal29>

        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0 </coefficientVal29>

</Receiver>

</Receiver>





<!--

   KKC model modified in order to use secondary feed as primary. 

   Original: <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.1411607116 </coefficientVal06>

-->



<Receiver>

<Receiver>

	<receiverCode>KKC</receiverCode>	

	<receiverCode>KKC</receiverCode>	

        <phi>90.0</phi>

        <phi>90.0</phi>
@@ -86,7 +91,7 @@ 
        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0199117530 </coefficientVal03>

        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0199117530 </coefficientVal03>

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0069123046 </coefficientVal04>     

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0069123046 </coefficientVal04>     

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0001305724 </coefficientVal05>

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0001305724 </coefficientVal05>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.1411607116 </coefficientVal06>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0411607116 </coefficientVal06>

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.0013927888 </coefficientVal07>

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.0013927888 </coefficientVal07>

        <coefficientNum08> 1 </coefficientNum08> <coefficientVal08> 0.0038510617 </coefficientVal08>                

        <coefficientNum08> 1 </coefficientNum08> <coefficientVal08> 0.0038510617 </coefficientVal08>                

        <coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0 </coefficientVal09>

        <coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0 </coefficientVal09>

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

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

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

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

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

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

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

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

	     MinorServoBossInterface=""

	     ActiveSurfaceBossInterface=""

	     ActiveSurfaceBossInterface=""

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

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

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

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

	     	 DefaultBackendInstance="BACKENDS/TotalPower"

	     	 DefaultBackendInstance="BACKENDS/TotalPower"

	     	 DefaultDataReceiverInstance="MANAGEMENT/FitsZilla"

	     	 DefaultDataReceiverInstance="MANAGEMENT/FitsZilla"

	     	 DefaultProjectCode="maintenance"

	     	 DefaultProjectCode="staff"

	     	 CheckProjectCode="true"

	     	 CheckProjectCode="true"

>

>

Medicina/Servers/MedicinaPyDMed/src/_dmed.py

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ import maciErrType 
import cdbErrType

import cdbErrType

import maciErrTypeImpl

import maciErrTypeImpl

import ManagementErrorsImpl

import ManagementErrorsImpl

import ComponentErrorsImpl

from IRAPy import logger,userLogger

from IRAPy import logger,userLogger

from SimpleParserPy import add_user_message

from SimpleParserPy import add_user_message

import xml.etree.ElementTree as ET

import xml.etree.ElementTree as ET