From 8a40aa3aa80ba36c89ccb125a40b86cf0f8be37e Mon Sep 17 00:00:00 2001 From: Arno Schoenmakers <schoenmakers@astron.nl> Date: Wed, 8 Feb 2012 10:38:31 +0000 Subject: [PATCH] Task #3048: Fixes by R. Overeem for problem in MACScheduler/TiedArrayBeams --- MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc | 2 +- MAC/Deployment/data/PVSS/Observation.dpdef | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc index 25a8d2cbccf..6f21710f981 100644 --- a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc +++ b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc @@ -305,7 +305,7 @@ GCFEvent::TResult ObsClaimer::preparePVSS_state (GCFEvent& event, GCFPortInterfa theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_ANGLE1, GCFPVDynArr(LPT_DYNDOUBLE, TABangle1Arr), 0.0, false); theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_ANGLE2, GCFPVDynArr(LPT_DYNDOUBLE, TABangle2Arr), 0.0, false); theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_DIRECTION_TYPE, GCFPVDynArr(LPT_DYNSTRING, TABdirTypesArr), 0.0, false); - theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_DISPERSION, GCFPVDynArr(LPT_DYNSTRING, dispersionArr), 0.0, false); + theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_DISPERSION, GCFPVDynArr(LPT_DYNDOUBLE, dispersionArr), 0.0, false); theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_COHERENT, GCFPVDynArr(LPT_DYNBOOL, coherentArr), 0.0, false); theObsPS->flush(); diff --git a/MAC/Deployment/data/PVSS/Observation.dpdef b/MAC/Deployment/data/PVSS/Observation.dpdef index 2cc5935c70c..91235ccb84d 100644 --- a/MAC/Deployment/data/PVSS/Observation.dpdef +++ b/MAC/Deployment/data/PVSS/Observation.dpdef @@ -25,7 +25,7 @@ Beams.directionType stringArr Beams.beamletList stringArr Beams.subbandList stringArr -TiedArrayBeams.beamIndex doubleArr +TiedArrayBeams.beamIndex intArr TiedArrayBeams.angle1 doubleArr TiedArrayBeams.angle2 doubleArr TiedArrayBeams.directionType stringArr -- GitLab