diff --git a/.gitignore b/.gitignore index a090e504f6c877b2ae05ba1d084b02b6b74a51b5..be668e2bd4ea589d265739323ac659e4523ff55e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ Common/Libraries/SlaLibrary Common/Clients/CaltoolClient/src/calibrationtool_ui.py Common/Clients/CaltoolClient/src/calibrationtool_ui.pye Common/Errors/AntennaErrors/idl/AntennaErrors.idl +Common/Errors/ActiveSurfaceErrors/idl/ASErrors.idl Common/Errors/BackendsErrors/idl/BackendsErrors.idl Common/Errors/ClientErrors/idl/ClientErrors.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/Observatory.idl Common/Interfaces/AntennaInterface/idl/SkySource.idl +Common/Interfaces/ActiveSurfaceInterface/idl/ActiveSurfaceCommon.idl Common/Interfaces/CommonInterface/idl/AntennaDefinitions.idl Common/Interfaces/CommonInterface/idl/BackendsDefinitions.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/src/moc_SRTActiveSurfaceCore.cpp 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 diff --git a/Medicina/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml b/Medicina/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml index 4a5c808fa5c88035951f638394012bae835f22f3..190445f6f820c27345a66ed05a1e64c8c2d56438 100644 --- a/Medicina/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml +++ b/Medicina/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml @@ -77,18 +77,23 @@ 0 0 + + KKC 90.0 - 1 0.1510259807 + 1 0.1510259807 0 0 1 0.2146179527 1 -0.0199117530 1 -0.0069123046 1 -0.0001305724 - 1 0.1411607116 + 1 0.0411607116 1 0.0013927888 - 1 0.0038510617 + 1 0.0038510617 0 0 0 0 0 0 diff --git a/Medicina/Configuration/CDB/alma/MANAGEMENT/Palmiro/Palmiro.xml b/Medicina/Configuration/CDB/alma/MANAGEMENT/Palmiro/Palmiro.xml index b162fd47364a27166ab7751dc76c5834b1330b89..f8fbdca4b7710aa6c2da9693e1e7f677e6984d42 100644 --- a/Medicina/Configuration/CDB/alma/MANAGEMENT/Palmiro/Palmiro.xml +++ b/Medicina/Configuration/CDB/alma/MANAGEMENT/Palmiro/Palmiro.xml @@ -23,13 +23,13 @@ AntennaBossInterface="IDL:alma/Antenna/AntennaBoss:1.0" ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0" ReceiversBossInterface="IDL:alma/Receivers/ReceiversBoss:1.0" - MinorServoBossInterface="IDL:alma/MinorServo/MinorServoBoss:1.0" + MinorServoBossInterface="" ActiveSurfaceBossInterface="" CustomLoggerInterface="IDL:alma/Management/CustomLogger:1.0" WeatherStationInstance="IDL:alma/Weather/GenericWeatherStation:1.0" DefaultBackendInstance="BACKENDS/TotalPower" DefaultDataReceiverInstance="MANAGEMENT/FitsZilla" - DefaultProjectCode="maintenance" + DefaultProjectCode="staff" CheckProjectCode="true" > diff --git a/Medicina/Servers/MedicinaPyDMed/src/_dmed.py b/Medicina/Servers/MedicinaPyDMed/src/_dmed.py index b5661cb43fc74dab7fbbbad577b2c20bb33941af..f305b2ee550d0849297c67e8a81f6603f562ae94 100644 --- a/Medicina/Servers/MedicinaPyDMed/src/_dmed.py +++ b/Medicina/Servers/MedicinaPyDMed/src/_dmed.py @@ -14,6 +14,7 @@ import maciErrType import cdbErrType import maciErrTypeImpl import ManagementErrorsImpl +import ComponentErrorsImpl from IRAPy import logger,userLogger from SimpleParserPy import add_user_message import xml.etree.ElementTree as ET