From 0952afe09526c2032d5bfbbbf73152d33a76e983 Mon Sep 17 00:00:00 2001 From: Ruud Overeem <overeem@astron.nl> Date: Wed, 30 Jan 2008 10:24:56 +0000 Subject: [PATCH] Bug 1154: Moved subbands and beamlets to Beam. Removed obsolete nyquistzone field. --- MAC/Deployment/data/OTDB/Beam.comp | 5 +++-- MAC/Deployment/data/OTDB/ObsSW.comp | 2 +- MAC/Deployment/data/OTDB/Observation.comp | 7 ++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/MAC/Deployment/data/OTDB/Beam.comp b/MAC/Deployment/data/OTDB/Beam.comp index 55c0860a4cb..3b61e6cb526 100644 --- a/MAC/Deployment/data/OTDB/Beam.comp +++ b/MAC/Deployment/data/OTDB/Beam.comp @@ -23,7 +23,7 @@ # -- Beam -- # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- -node Beam 1.0.0 development 'node constraint' "Beam specification" +node Beam 2.0.0 development 'node constraint' "Beam specification" # # name name of the parameter @@ -42,4 +42,5 @@ par angle1 I vdbl - 10 0 0 - 'RightAscention(s) or Azimut par angle2 I vdbl - 10 0 0 - 'Declination(s) or Elevation of the source(s) in rad.' par directionTypes I ptext - 10 0 'J2000|AZEL|LMN;J2000' - 'Coord.system used for the sources' par angleTimes I vuint - 10 0 0 - 'Relative time (to starttime) when to activate the angles' - +par subbandList I text - 10 0 [0] - 'List of all used subbands, eg.[205,276..300]. Range 0..511.' +par beamletList I text - 10 0 [0] - 'Mapping of subbands on beamlets, eg.[0..47]. Range 0..215' diff --git a/MAC/Deployment/data/OTDB/ObsSW.comp b/MAC/Deployment/data/OTDB/ObsSW.comp index bcf162b5db1..5596a97353a 100644 --- a/MAC/Deployment/data/OTDB/ObsSW.comp +++ b/MAC/Deployment/data/OTDB/ObsSW.comp @@ -5,4 +5,4 @@ # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- node ObsSW 1.0.1 development 'node constraint' "Observation Software" -uses Observation 2.0.1 development 1 "Observations under this SW control" +uses Observation 3.0.0 development 1 "Observations under this SW control" diff --git a/MAC/Deployment/data/OTDB/Observation.comp b/MAC/Deployment/data/OTDB/Observation.comp index 42c230af9ee..2dd9f794431 100644 --- a/MAC/Deployment/data/OTDB/Observation.comp +++ b/MAC/Deployment/data/OTDB/Observation.comp @@ -7,7 +7,7 @@ # -- Observation-- # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- -node Observation 2.0.1 development 'node constraint' "Observation" +node Observation 3.0.0 development 'node constraint' "Observation" # name dir. type unit prun. vm value constr. descr. #-------------------------------------------------------------------------------------------------------- @@ -18,9 +18,6 @@ par claimPeriod I int - 10 100 120 par preparePeriod I int - 10 100 120 - 'Periodlength in seconds the PREPARE phases will take' # measurement information -par nyquistZone I pint - 10 0 '1|2|3;1' - 'Nyquistzone of the filter' -par subbandList I text - 10 0 [0] - 'List of all used subbands, eg.[205,276..300]. Range 0..511.' -par beamletList I text - 10 0 [0] - 'Mapping of subbands on beamlets, eg.[0..47]. Range 0..215' par bandFilter I ptext - 10 0 'LBL_10_80|LBL_30_80|LBH_10_80|LBH_30_80|HB_100_190|HB_170_230|HB_210_240;LBL_30_80' - 'one of the seven filters to use' par antennaArray I ptext - 10 0 'LBA|HBA;LBA' - 'Name of the antenneArray (AntennaArrays.conf)' par receiverList I text - 10 0 [0] - 'List of the receivers to use, eg.[0..7,10,11]. Range 0..191.' @@ -39,6 +36,6 @@ par channelWidth I dbl Hz 10 100 >>Observation.clock # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- uses VirtualInstrument 1.0.0 development '1' "Virtual Instrument" -uses Beam 1.0.0 development '1' "Beam specification" +uses Beam 2.0.0 development '1' "Beam specification" uses TBB 1.0.0 development '1' "TBB settings" uses ObsCtrl 1.0.1 development '1' "Observation Control" -- GitLab