Unverified Commit 983e97de authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #571, fixed the uncaught exception raised when calling a preset command in wrong mode (#589) 

* Fix #571, fixed the uncaught exception raised when calling a preset command in wrong mode

* Fix #571, change the scheduler status to warning when executing preset in wrong mode
parent bf7de0b5

Common/Servers/AntennaBoss/src/BossCore_extra.i

+11 −0
Original line number Diff line number Diff line
@@ -122,6 +122,17 @@ void CBossCore::preset(const double& az,const double& el) throw (ComponentErrors 
		changeBossStatus(Management::MNG_FAILURE);

		throw impl;

	}

	catch (AntennaErrors::AntennaErrorsEx& ex) {

		_ADD_BACKTRACE(ComponentErrors::CouldntCallOperationExImpl,impl,ex,"CBossCore::preset()");

		impl.setComponentName((const char*)m_mount->name());

		impl.setOperationName("preset()");

		changeBossStatus(Management::MNG_WARNING);

		throw impl;

	}

	catch (...) {

		changeBossStatus(Management::MNG_FAILURE);

		_THROW_EXCPT(ComponentErrors::UnexpectedExImpl,"CBossCore::preset()");

	}

}



#endif

SRT/CDB/MACI/Channels/PositionerData/PositionerData.xml

deleted100755 → 0
+0 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<EventChannel xmlns="urn:schemas-cosylab-com:EventChannel:1.0"

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	IntegrationLogs="false"

	MaxQueueLength="5"

	MaxSuppliers="20"

	RejectNewEvents="false"

	DiscardPolicy="FifoOrder"

	EventReliability="BestEffort"

	ConnectionReliability="Persistent">

   <Events>

     <_ Name="PositionerDataBlock" MaxProcessTime="2.0"/>

   </Events>

</EventChannel>

SRT/CDB/alma/DataBlock/DewarPositioner/KKG/BSC/UpdatingPosition/UpdatingPosition.xml

+6 −6
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


    <UpdatingRecord>

        <axisCode>MNG_HOR_LAT</axisCode>

        <initialPosition>-79.2</initialPosition>

        <initialPosition>-49.2</initialPosition>

        <functionName>static0</functionName>

    </UpdatingRecord>
@@ -41,7 +41,7 @@ 


    <UpdatingRecord>

        <axisCode>MNG_EQ_LAT</axisCode>

        <initialPosition>-79.2</initialPosition>

        <initialPosition>-49.2</initialPosition>

        <functionName>parallactic</functionName>

    </UpdatingRecord>
@@ -54,19 +54,19 @@ 
    <UpdatingRecord>

        <axisCode>MNG_GAL_LON</axisCode>

        <initialPosition>-19.2</initialPosition>

        <functionName>gpa</functionName>

        <functionName>galacticParallactic</functionName>

    </UpdatingRecord>



    <UpdatingRecord>

        <axisCode>MNG_GAL_LAT</axisCode>

        <initialPosition>-79.2</initialPosition>

        <functionName>gpa</functionName>

        <initialPosition>-49.2</initialPosition>

        <functionName>galacticParallactic</functionName>

    </UpdatingRecord>



    <UpdatingRecord>

        <axisCode>JUST_FOR_TEST</axisCode>

        <initialPosition>-9.0</initialPosition>

        <functionName>gpa</functionName>

        <functionName>galacticParallactic</functionName>

    </UpdatingRecord>



</DewarPositionerUpdatingTable>

SRT/CDB/alma/DataBlock/DewarPositioner/KKG/BSC_OPT/UpdatingPosition/UpdatingPosition.xml

+6 −6
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


    <UpdatingRecord>

        <axisCode>MNG_HOR_LAT</axisCode>

        <initialPosition>-79.2</initialPosition>

        <initialPosition>-49.2</initialPosition>

        <functionName>static0</functionName>

    </UpdatingRecord>
@@ -41,7 +41,7 @@ 


    <UpdatingRecord>

        <axisCode>MNG_EQ_LAT</axisCode>

        <initialPosition>-79.2</initialPosition>

        <initialPosition>-49.2</initialPosition>

        <functionName>parallactic</functionName>

    </UpdatingRecord>
@@ -54,19 +54,19 @@ 
    <UpdatingRecord>

        <axisCode>MNG_GAL_LON</axisCode>

        <initialPosition>-19.2</initialPosition>

        <functionName>gpa</functionName>

        <functionName>galacticParallactic</functionName>

    </UpdatingRecord>



    <UpdatingRecord>

        <axisCode>MNG_GAL_LAT</axisCode>

        <initialPosition>-79.2</initialPosition>

        <functionName>gpa</functionName>

        <initialPosition>-49.2</initialPosition>

        <functionName>galacticParallactic</functionName>

    </UpdatingRecord>



    <UpdatingRecord>

        <axisCode>JUST_FOR_TEST</axisCode>

        <initialPosition>-9.0</initialPosition>

        <functionName>gpa</functionName>

        <functionName>galacticParallactic</functionName>

    </UpdatingRecord>



</DewarPositionerUpdatingTable>

SRT/CDB/alma/DataBlock/DewarPositioner/KKG/CUSTOM/UpdatingPosition/UpdatingPosition.xml

+3 −3
Original line number Diff line number Diff line
@@ -54,19 +54,19 @@ 
    <UpdatingRecord>

        <axisCode>MNG_GAL_LON</axisCode>

        <initialPosition>0.0</initialPosition>

        <functionName>gpa</functionName>

        <functionName>galacticParallactic</functionName>

    </UpdatingRecord>



    <UpdatingRecord>

        <axisCode>MNG_GAL_LAT</axisCode>

        <initialPosition>0.0</initialPosition>

        <functionName>gpa</functionName>

        <functionName>galacticParallactic</functionName>

    </UpdatingRecord>



    <UpdatingRecord>

        <axisCode>JUST_FOR_TEST</axisCode>

        <initialPosition>0.0</initialPosition>

        <functionName>gpa</functionName>

        <functionName>galacticParallactic</functionName>

    </UpdatingRecord>



</DewarPositionerUpdatingTable>