From eb537ed27f931880ff9aad529ba70c72c1d6d0d8 Mon Sep 17 00:00:00 2001 From: blaakmeer <sdos@astron.nl> Date: Wed, 15 Sep 2004 09:57:08 +0000 Subject: [PATCH] %[ER: 117]% integration successful --- MAC/Config/Apc/ApcLogicalDeviceScheduler.xml | 36 +++++++-------- MAC/Config/Apc/ApcStationBeamformer.xml | 8 ++++ MAC/Config/Apc/ApcStationReceptor.xml | 43 ++++++++++-------- MAC/Config/Apc/ApcStationReceptorGroup.xml | 47 +++++++++++--------- MAC/Config/Apc/ApcVirtualTelescope.xml | 9 ++++ 5 files changed, 85 insertions(+), 58 deletions(-) diff --git a/MAC/Config/Apc/ApcLogicalDeviceScheduler.xml b/MAC/Config/Apc/ApcLogicalDeviceScheduler.xml index ccce44e41c5..49d47ece3a0 100644 --- a/MAC/Config/Apc/ApcLogicalDeviceScheduler.xml +++ b/MAC/Config/Apc/ApcLogicalDeviceScheduler.xml @@ -2,25 +2,21 @@ <LogicalDeviceScheduler> <command> - <MACType> MACString </MACType> - <MACDefault> </MACDefault> - </command> + <MACType> MACString </MACType> + <MACDefault> </MACDefault> + </command> <status> - <MACType> MACString </MACType> - <MACDefault> </MACDefault> - </status> - <WaveFormGenerator> - <frequency> - <MACType>MACDouble</MACType> - <MACDefault>1000000.0</MACDefault> - </frequency> - <amplitude> - <MACType>MACUnsigned</MACType> - <MACDefault>128</MACDefault> - </amplitude> - <samplePeriod> - <MACType>MACUnsigned</MACType> - <MACDefault>2</MACDefault> - </samplePeriod> - </WaveFormGenerator> + <MACType> MACString </MACType> + <MACDefault> </MACDefault> + </status> + <WaveFormGenerator> + <frequency> + <MACType>MACDouble</MACType> + <MACDefault>1500000.0</MACDefault> + </frequency> + <amplitude> + <MACType>MACUnsigned</MACType> + <MACDefault>128</MACDefault> + </amplitude> + </WaveFormGenerator> </LogicalDeviceScheduler> diff --git a/MAC/Config/Apc/ApcStationBeamformer.xml b/MAC/Config/Apc/ApcStationBeamformer.xml index 26b6b901b1a..1932d8b46b1 100644 --- a/MAC/Config/Apc/ApcStationBeamformer.xml +++ b/MAC/Config/Apc/ApcStationBeamformer.xml @@ -21,4 +21,12 @@ <MACType>MACDouble</MACType> <MACDefault>0.0</MACDefault> </directionAngle2> + <subbandStart> <!-- used by PVSS panels --> + <MACType>MACUnsigned</MACType> + <MACDefault>0</MACDefault> + </subbandStart> + <subbandEnd> <!-- used by PVSS panels --> + <MACType>MACUnsigned</MACType> + <MACDefault>127</MACDefault> + </subbandEnd> </StationBeamformer> diff --git a/MAC/Config/Apc/ApcStationReceptor.xml b/MAC/Config/Apc/ApcStationReceptor.xml index e538eeac0b7..e33d56635ff 100644 --- a/MAC/Config/Apc/ApcStationReceptor.xml +++ b/MAC/Config/Apc/ApcStationReceptor.xml @@ -9,24 +9,31 @@ <MACType> MACString </MACType> <MACDefault> </MACDefault> </status> - <startTime> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> - </startTime> - <stopTime> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> - </stopTime> - <filter> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> - </filter> - <antenna> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> - </antenna> + <startTime> + <MACType> MACInteger </MACType> + <MACDefault> </MACDefault> + </startTime> + <stopTime> + <MACType> MACInteger </MACType> + <MACDefault> </MACDefault> + </stopTime> + <filter> + <!-- 1, 2, 3, 4 --> + <MACType> MACInteger </MACType> + <MACDefault> 1 </MACDefault> + </filter> + <antenna> + <!-- 0=LBA, 1=HBA --> + <MACType> MACInteger </MACType> + <MACDefault> 0 </MACDefault> + </antenna> <power> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> + <!-- 0=off, 1=on --> + <MACType> MACInteger </MACType> + <MACDefault> 1 </MACDefault> </power> + <frequency> <!-- used by PVSS panels --> + <MACType> MACDouble </MACType> + <MACDefault> 110.0 </MACDefault> + </frequency> </StationReceptor> diff --git a/MAC/Config/Apc/ApcStationReceptorGroup.xml b/MAC/Config/Apc/ApcStationReceptorGroup.xml index e538eeac0b7..400da7a0aa0 100644 --- a/MAC/Config/Apc/ApcStationReceptorGroup.xml +++ b/MAC/Config/Apc/ApcStationReceptorGroup.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<StationReceptor> +<StationReceptorGroup> <command> <MACType> MACString </MACType> <MACDefault> </MACDefault> @@ -9,24 +9,31 @@ <MACType> MACString </MACType> <MACDefault> </MACDefault> </status> - <startTime> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> - </startTime> - <stopTime> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> - </stopTime> - <filter> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> - </filter> - <antenna> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> - </antenna> + <startTime> + <MACType> MACInteger </MACType> + <MACDefault> </MACDefault> + </startTime> + <stopTime> + <MACType> MACInteger </MACType> + <MACDefault> </MACDefault> + </stopTime> + <filter> + <!-- 1, 2, 3, 4 --> + <MACType> MACInteger </MACType> + <MACDefault> 1 </MACDefault> + </filter> + <antenna> + <!-- 0=LBA, 1=HBA --> + <MACType> MACInteger </MACType> + <MACDefault> 0 </MACDefault> + </antenna> <power> - <MACType> MACInteger </MACType> - <MACDefault> 0 </MACDefault> + <!-- 0=off, 1=on --> + <MACType> MACInteger </MACType> + <MACDefault> 1 </MACDefault> </power> -</StationReceptor> + <frequency> <!-- used by PVSS panels --> + <MACType> MACDouble </MACType> + <MACDefault> 110.0 </MACDefault> + </frequency> +</StationReceptorGroup> diff --git a/MAC/Config/Apc/ApcVirtualTelescope.xml b/MAC/Config/Apc/ApcVirtualTelescope.xml index fff26a84628..1288a2fd79f 100644 --- a/MAC/Config/Apc/ApcVirtualTelescope.xml +++ b/MAC/Config/Apc/ApcVirtualTelescope.xml @@ -9,4 +9,13 @@ <MACType> MACString </MACType> <MACDefault> </MACDefault> </status> + + <srgName> <!-- used by PVSS panels --> + <MACType> MACString </MACType> + <MACDefault> </MACDefault> + </srgName> + <bfName> <!-- used by PVSS panels --> + <MACType> MACString </MACType> + <MACDefault> </MACDefault> + </bfName> </VirtualTelescope> -- GitLab