diff --git a/MAC/Config/Apc/ApcLogicalDeviceScheduler.xml b/MAC/Config/Apc/ApcLogicalDeviceScheduler.xml index ccce44e41c53b9d4846ec134bf325560661300fc..49d47ece3a0e630c33bddb785c321dd2f4654b8b 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 26b6b901b1a773a2eb0ce5f2d55548d249491470..1932d8b46b13edc6b369964867c3d8013e0599df 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 e538eeac0b73453f1ad82be040116f88268383e0..e33d56635ff4fc93cf228c0a81e07391ed435315 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 e538eeac0b73453f1ad82be040116f88268383e0..400da7a0aa0bbf43ae84d5e2e80f24f9cb54db57 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 fff26a846281d67901cb1a15909aa4143e90eb05..1288a2fd79f72c38790db4db37ce51a669bdb2e1 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>