From da220bbe158c767f1bbb225c4e899bc208f77fb7 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni <giuseppecarboni89@live.com> Date: Wed, 16 Oct 2024 10:37:53 +0200 Subject: [PATCH] Fix #888, fixed AntennaBoss SkydipRange sscanf (#889) --- .../Servers/AntennaBoss/src/Configuration.cpp | 2 +- Medicina/CDB/alma/ANTENNA/Boss/Boss.xml | 18 +++++++++--------- .../CDB/alma/ANTENNA/Boss/Boss.xml | 18 +++++++++--------- Noto/CDB/alma/ANTENNA/Boss/Boss.xml | 18 +++++++++--------- .../CDB/alma/ANTENNA/Boss/Boss.xml | 18 +++++++++--------- SRT/CDB/alma/ANTENNA/Boss/Boss.xml | 18 +++++++++--------- .../CDB/alma/ANTENNA/Boss/Boss.xml | 2 +- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Common/Servers/AntennaBoss/src/Configuration.cpp b/Common/Servers/AntennaBoss/src/Configuration.cpp index 8f9142819..2bd36acfb 100644 --- a/Common/Servers/AntennaBoss/src/Configuration.cpp +++ b/Common/Servers/AntennaBoss/src/Configuration.cpp @@ -97,7 +97,7 @@ void CConfiguration::init(maci::ContainerServices *Services) throw (ComponentErr _GET_STRING_ATTRIBUTE("SkydipElevationRange","The skydip elevation range is (degrees):",temp); _GET_STRING_ATTRIBUTE("CoordinatesFilename", "The text file path in which the received coordinates will be written:", m_coordinatesFile); - if (sscanf((const char *)temp,"%lf-%lf",&m_skydipElDown,&m_skydipElUp)!=2) { + if (sscanf((const char *)temp,"%lf %lf",&m_skydipElDown,&m_skydipElUp)!=2) { _EXCPT(ComponentErrors::CDBAccessExImpl,dummy,"CConfiguration::Init()"); dummy.setFieldName("SkydipElevationRange"); throw dummy; diff --git a/Medicina/CDB/alma/ANTENNA/Boss/Boss.xml b/Medicina/CDB/alma/ANTENNA/Boss/Boss.xml index a5a52c6cc..ca8e8aeed 100644 --- a/Medicina/CDB/alma/ANTENNA/Boss/Boss.xml +++ b/Medicina/CDB/alma/ANTENNA/Boss/Boss.xml @@ -14,19 +14,19 @@ MinPointNumber="20" MaxPointNumber="1000" GapTime="200000" - CoordinateIntegration="1000000" - CutOffElevation="70.0" - SkydipElevationRange="15.0-90.0" + CoordinateIntegration="1000000" + CutOffElevation="70.0" + SkydipElevationRange="15.0 90.0" MountInstance="ANTENNA/Mount" ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0" PointingModelInstance="ANTENNA/PointingModel" RefractionInstance="ANTENNA/Refraction" - Sidereal="IDL:alma/Antenna/SkySource:1.0" - Sun="" - Moon="IDL:alma/Antenna/Moon:1.0" - Satellite="" - SolarSystemBody="" - Otf="IDL:alma/Antenna/OTF:1.0"> + Sidereal="IDL:alma/Antenna/SkySource:1.0" + Sun="" + Moon="IDL:alma/Antenna/Moon:1.0" + Satellite="" + SolarSystemBody="" + Otf="IDL:alma/Antenna/OTF:1.0"> <target/> <targetRightAscension/> diff --git a/Medicina/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml b/Medicina/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml index a5a52c6cc..ca8e8aeed 100644 --- a/Medicina/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml +++ b/Medicina/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml @@ -14,19 +14,19 @@ MinPointNumber="20" MaxPointNumber="1000" GapTime="200000" - CoordinateIntegration="1000000" - CutOffElevation="70.0" - SkydipElevationRange="15.0-90.0" + CoordinateIntegration="1000000" + CutOffElevation="70.0" + SkydipElevationRange="15.0 90.0" MountInstance="ANTENNA/Mount" ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0" PointingModelInstance="ANTENNA/PointingModel" RefractionInstance="ANTENNA/Refraction" - Sidereal="IDL:alma/Antenna/SkySource:1.0" - Sun="" - Moon="IDL:alma/Antenna/Moon:1.0" - Satellite="" - SolarSystemBody="" - Otf="IDL:alma/Antenna/OTF:1.0"> + Sidereal="IDL:alma/Antenna/SkySource:1.0" + Sun="" + Moon="IDL:alma/Antenna/Moon:1.0" + Satellite="" + SolarSystemBody="" + Otf="IDL:alma/Antenna/OTF:1.0"> <target/> <targetRightAscension/> diff --git a/Noto/CDB/alma/ANTENNA/Boss/Boss.xml b/Noto/CDB/alma/ANTENNA/Boss/Boss.xml index a5a52c6cc..ca8e8aeed 100644 --- a/Noto/CDB/alma/ANTENNA/Boss/Boss.xml +++ b/Noto/CDB/alma/ANTENNA/Boss/Boss.xml @@ -14,19 +14,19 @@ MinPointNumber="20" MaxPointNumber="1000" GapTime="200000" - CoordinateIntegration="1000000" - CutOffElevation="70.0" - SkydipElevationRange="15.0-90.0" + CoordinateIntegration="1000000" + CutOffElevation="70.0" + SkydipElevationRange="15.0 90.0" MountInstance="ANTENNA/Mount" ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0" PointingModelInstance="ANTENNA/PointingModel" RefractionInstance="ANTENNA/Refraction" - Sidereal="IDL:alma/Antenna/SkySource:1.0" - Sun="" - Moon="IDL:alma/Antenna/Moon:1.0" - Satellite="" - SolarSystemBody="" - Otf="IDL:alma/Antenna/OTF:1.0"> + Sidereal="IDL:alma/Antenna/SkySource:1.0" + Sun="" + Moon="IDL:alma/Antenna/Moon:1.0" + Satellite="" + SolarSystemBody="" + Otf="IDL:alma/Antenna/OTF:1.0"> <target/> <targetRightAscension/> diff --git a/Noto/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml b/Noto/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml index a5a52c6cc..ca8e8aeed 100644 --- a/Noto/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml +++ b/Noto/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml @@ -14,19 +14,19 @@ MinPointNumber="20" MaxPointNumber="1000" GapTime="200000" - CoordinateIntegration="1000000" - CutOffElevation="70.0" - SkydipElevationRange="15.0-90.0" + CoordinateIntegration="1000000" + CutOffElevation="70.0" + SkydipElevationRange="15.0 90.0" MountInstance="ANTENNA/Mount" ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0" PointingModelInstance="ANTENNA/PointingModel" RefractionInstance="ANTENNA/Refraction" - Sidereal="IDL:alma/Antenna/SkySource:1.0" - Sun="" - Moon="IDL:alma/Antenna/Moon:1.0" - Satellite="" - SolarSystemBody="" - Otf="IDL:alma/Antenna/OTF:1.0"> + Sidereal="IDL:alma/Antenna/SkySource:1.0" + Sun="" + Moon="IDL:alma/Antenna/Moon:1.0" + Satellite="" + SolarSystemBody="" + Otf="IDL:alma/Antenna/OTF:1.0"> <target/> <targetRightAscension/> diff --git a/SRT/CDB/alma/ANTENNA/Boss/Boss.xml b/SRT/CDB/alma/ANTENNA/Boss/Boss.xml index c514e786f..a15766a83 100644 --- a/SRT/CDB/alma/ANTENNA/Boss/Boss.xml +++ b/SRT/CDB/alma/ANTENNA/Boss/Boss.xml @@ -14,19 +14,19 @@ MinPointNumber="25" MaxPointNumber="250" GapTime="200000" - CoordinateIntegration="1000000" - CutOffElevation="70.0" - SkydipElevationRange="15.0-90.0" + CoordinateIntegration="1000000" + CutOffElevation="70.0" + SkydipElevationRange="15.0 90.0" MountInstance="ANTENNA/Mount" ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0" PointingModelInstance="ANTENNA/PointingModel" RefractionInstance="ANTENNA/Refraction" - Sidereal="IDL:alma/Antenna/SkySource:1.0" - Sun="" - Moon="IDL:alma/Antenna/Moon:1.0" - Satellite="" - SolarSystemBody="" - Otf="IDL:alma/Antenna/OTF:1.0"> + Sidereal="IDL:alma/Antenna/SkySource:1.0" + Sun="" + Moon="IDL:alma/Antenna/Moon:1.0" + Satellite="" + SolarSystemBody="" + Otf="IDL:alma/Antenna/OTF:1.0"> <target/> <targetRightAscension/> diff --git a/SRT/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml b/SRT/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml index b2614e2f6..918f7dde4 100644 --- a/SRT/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml +++ b/SRT/Configuration/CDB/alma/ANTENNA/Boss/Boss.xml @@ -16,7 +16,7 @@ GapTime="200000" CoordinateIntegration="1000000" CutOffElevation="70.0" - SkydipElevationRange="15.0-90.0" + SkydipElevationRange="15.0 90.0" MountInstance="ANTENNA/Mount" ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0" PointingModelInstance="ANTENNA/PointingModel" -- GitLab