From b2e2b5598e0aadf9407f04ed5a9b30af9d0b5040 Mon Sep 17 00:00:00 2001 From: Ruud Overeem <overeem@astron.nl> Date: Mon, 23 Apr 2007 09:09:03 +0000 Subject: [PATCH] BugID: 809 Update for getting OLAP to work under ACC. --- MAC/Deployment/data/OTDB/ApplCntl.comp | 6 ++-- MAC/Deployment/data/OTDB/Beam.comp | 4 +-- MAC/Deployment/data/OTDB/Fringe.comp | 18 ------------ MAC/Deployment/data/OTDB/InputAppl.comp | 36 ++++++++++++++++++----- MAC/Deployment/data/OTDB/OLAP.comp | 31 ++++++++++++------- MAC/Deployment/data/OTDB/Observation.comp | 28 +++++++++--------- MAC/Deployment/data/OTDB/OnlineCtrl.comp | 15 ++++++---- MAC/Deployment/data/OTDB/StationNode.base | 1 + MAC/Deployment/data/OTDB/StorageAppl.comp | 22 +++++++++----- 9 files changed, 95 insertions(+), 66 deletions(-) delete mode 100644 MAC/Deployment/data/OTDB/Fringe.comp diff --git a/MAC/Deployment/data/OTDB/ApplCntl.comp b/MAC/Deployment/data/OTDB/ApplCntl.comp index b104d6ba88c..e1e973a4042 100644 --- a/MAC/Deployment/data/OTDB/ApplCntl.comp +++ b/MAC/Deployment/data/OTDB/ApplCntl.comp @@ -21,8 +21,10 @@ par timeout_snapshot I text period 10 0 30 - "M par timeout_reinit I text period 10 0 30 - "Max time the reinit phase of the processes may take" par timeout_info I text period 10 0 30 - "Max time it may take to give an answer" par timeout_quit I text period 10 0 60 - "Max time the processes may take to quit" -par timeout_kill I text period 10 0 60 - "Delay after the quit command before the remaining processes are killed"" +par timeout_kill I text period 10 0 60 - "Delay after the quit command before the remaining processes are killed" -par application I text - 10 0 '[]' - "List of the applications that must be controlled" +par application I vtext - 10 0 '[]' - "The name of the application that must be controlled." +par processes I vtext - 10 0 '[]' - "List of processes that must be started, syntax: procname|procname(n)" +par procesOrder I vtext - 10 0 '[]' - "For future use." par resultfile I text - 10 0 ../log/ACC.result - "The file the results should be written in." diff --git a/MAC/Deployment/data/OTDB/Beam.comp b/MAC/Deployment/data/OTDB/Beam.comp index 471365d811e..55c0860a4cb 100644 --- a/MAC/Deployment/data/OTDB/Beam.comp +++ b/MAC/Deployment/data/OTDB/Beam.comp @@ -38,8 +38,8 @@ node Beam 1.0.0 development 'node constraint' "Beam specification" #-------------------------------------------------------------------------------------------------------- # name dir. type unit prun. vm value constr. descr. #-------------------------------------------------------------------------------------------------------- -par angle1 I vdbl - 10 0 0 - 'Declination(s) of the source(s)' -par angle2 I vdbl - 10 0 0 - 'rightAscention(s) of the source(s)' +par angle1 I vdbl - 10 0 0 - 'RightAscention(s) or Azimuth of the source(s) in rad.' +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' diff --git a/MAC/Deployment/data/OTDB/Fringe.comp b/MAC/Deployment/data/OTDB/Fringe.comp deleted file mode 100644 index 5ba2aada35b..00000000000 --- a/MAC/Deployment/data/OTDB/Fringe.comp +++ /dev/null @@ -1,18 +0,0 @@ -# -- Fringe -- -# -# $Id$ -# -# --Fringe Global-- -# -# name vers qual constr. descr. -#-------------------------------------------------------------------------------------------------------- -node Fringe 1.0.0 development 'node constraint' "Fringe" - -# name dir. type unit prun. vm value constr. descr. -#-------------------------------------------------------------------------------------------------------- -par DataSet I text - 10 0 >>Observation.MSNameMask - 'Name of the measurement set' -par _nodes I text - 10 0 '[]' - 'Nodes used by the process' -par _startstopType I text - 10 0 cmdline,mpirun,bgl - 'Method of starting the proces' -par _executable I text - 10 0 - - 'The name of the executable to start' -par _hostname I text - 10 0 - - 'The hostname of the machine to start the proces on' -par _depends I text - 10 0 '[Imager]' - 'The processes that must be finished before this process can start' diff --git a/MAC/Deployment/data/OTDB/InputAppl.comp b/MAC/Deployment/data/OTDB/InputAppl.comp index e48f582dc9f..249f3635775 100644 --- a/MAC/Deployment/data/OTDB/InputAppl.comp +++ b/MAC/Deployment/data/OTDB/InputAppl.comp @@ -4,15 +4,37 @@ # # --InputAppl Global-- # + # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- -node InputAppl 1.0.0 development 'node constraint' "InputAppl" +node Transpose 1.0.0 development 'node constraint' "Transpose" +# name dir. type unit prun. vm value constr. descr. +#-------------------------------------------------------------------------------------------------------- +par _hostname I text - 10 0 cs001t - 'The machine on which the start- and stop-script is executed.' +par _executable I text - 10 0 CS1_InputSection - 'The name of the executable to start' +par _nodes I vtext - 10 0 '[cs001t]' - 'Nodes used by the (mpi)processes' +par _startstopType I ptext - 10 0 "cmdline|mpirun|bgl;mpirun" - 'Method of starting the proces' + +# name vers qual constr. descr. +#-------------------------------------------------------------------------------------------------------- +node DelayCompensation 1.0.0 development 'node constraint' "DelayCompensation" # name dir. type unit prun. vm value constr. descr. #-------------------------------------------------------------------------------------------------------- -par DataSet I text - 10 0 >>Observation.MSNameMask - 'Name of the measurement set' -par _nodes I text - 10 0 '[]' - 'Nodes used by the process' -par _startstopType I text - 10 0 cmdline,mpirun,bgl - 'Method of starting the proces' -par _executable I text - 10 0 - - 'The name of the executable to start' -par _hostname I text - 10 0 - - 'The hostname of the machine to start the proces on' -par _depends I text - 10 0 '[Imager]' - 'The processes that must be finished before this process can start' +par _hostname I text - 10 0 cs001t - 'The machine on which the start- and stop-script is executed.' +par _executable I text - 10 0 CS1_DelayCompensation - 'The name of the executable to start' +par _nodes I vtext - 10 0 '[cs001t]' - 'Nodes used by the (mpi)processes' +par _startstopType I ptext - 10 0 "cmdline|mpirun|bgl;cmdline" - 'Method of starting the proces' + + +# name vers qual constr. descr. +#-------------------------------------------------------------------------------------------------------- +node InputAppl 1.0.0 development 'node constraint' "InputAppl" +uses Transpose 1.0.0 development 'node constraint' "Transpose" +uses DelayCompensation 1.0.0 development 'node constraint' "DelayCompensation" +# name dir. type unit prun. vm value constr. descr. +#-------------------------------------------------------------------------------------------------------- +par processes I vtext - 10 0 '[DelayComp,Transpose(12)]' - "list of processes that must be started" +par procesOrder I vtext - 10 0 '[]' - "Order of the processes, if any! FOR FUTURE USE." +par extraInfo I vtext - 10 0 '[.OLAP,PIC]' - "list of components that the application expects to be in the parsettfile." + diff --git a/MAC/Deployment/data/OTDB/OLAP.comp b/MAC/Deployment/data/OTDB/OLAP.comp index e6f905f3a7f..29b30e28a37 100644 --- a/MAC/Deployment/data/OTDB/OLAP.comp +++ b/MAC/Deployment/data/OTDB/OLAP.comp @@ -21,11 +21,15 @@ node OLAP_Conn 1.0.0 development 'node constraint' "Connection specificati # name dir. type unit prun. vm value constr. descr. #-------------------------------------------------------------------------------------------------------- -par AMCServerPort I node - 10 0 7000 - "Port the AMCServer is listening on" -par AMCServerHost I text - 10 0 lii001 - "Machine the AMCServer is running on" -par Station_Input_Transport I ptext - 10 0 'File|Socket|Ethernet|Null;Socket' - 'Type of transport used between Station en InputSection.' -par BGLProc_Storage_Transport I ptext - 10 0 'File|Socket|Ethernet|Null;Socket' - 'Type of transport used between Blue Gene and StorageSection.' -par Input_BGLProc_Transport I ptext - 10 0 'File|Socket|Ethernet|Null;Socket' - 'Type of transport used between Input section and the Blue Gene.' +par AMCServerPort I int - 10 0 31337 - "Port the AMCServer is listening on" +par AMCServerHost I text - 10 0 localhost - "Machine the AMCServer is running on" +par Station_Input_Transport I ptext - 10 0 'File|TCP|UDP|Ethernet|Null;UDP' - 'Type of transport used between Station en InputSection.' +par Input_BGLProc_Transport I ptext - 10 0 'File|TCP|UDP|Ethernet|Null;TCP' - 'Type of transport used between Input section and the Blue Gene.' +par Input_BGLProc_Ports I vtext - 10 0 '[8100..8163]' - 'Portnumbers to use in the connections.' +par Input_BGLProc_BaseFileName I text - 10 0 '/data/gijs' - 'File to use when transport=File' +par BGLProc_Storage_Transport I ptext - 10 0 'File|TCP|UDP|Ethernet|Null;TCP' - 'Type of transport used between Blue Gene and StorageSection.' +par BGLProc_Storage_Ports I vtext - 10 0 '[8300..8363]' - 'Portnumbers to use in the connections.' +par BGLProc_Storage_BaseFileName I text - 10 0 'Correlations' - 'File to use when transport=File' # -- DelayComp -- @@ -35,9 +39,9 @@ node DelayComp 1.0.0 development 'node constraint' "Setting of the delayco # name dir. type unit prun. vm value constr. descr. #-------------------------------------------------------------------------------------------------------- -par converterType I ptext - 10 0 'Impl|Client;Impl' - 'Depends on whether of not AIPS++ is installed' +par converterType I ptext - 10 0 'IMPL|Client;IMPL' - 'Depends on whether of not AIPS++ is installed' par hostname I text - 10 0 'list012' - 'Machine the Delay Compensation-program runs on' -par ports I vint - 10 0 '[7000]' - 'The port(2) the Delay Compansation-program listens on' +par ports I vint - 10 0 '[7200..7220]' - 'The ports the Delay Compansation-program listens on' # -- OLAP-- @@ -47,13 +51,20 @@ node OLAP 1.0.0 development 'node constraint' "OLAP" # name dir. type unit prun. vm value constr. descr. #-------------------------------------------------------------------------------------------------------- -par nrBitsPerSample I int - 10 0 16 - '???' par IPHeaderSize I int - 10 0 32 - '???' -par nrTimesInFrame I int - 10 0 16 - '???' par EPAHeaderSize I int - 10 0 16 - '???' -par minorIntegrationSteps I int - 10 0 1000 - '???' +par firstInputPortnr I int - 10 0 4346 - 'Portnumber the first RSPboard uses' +par nrBitsPerSample I int - 10 0 16 - '???' +par nrRSPboards I int - 10 0 16 - '???' +par nrSecondsOfBuffer I int - 10 0 40 - '???' +par nrSubbandsPerFrame I int - 10 0 32 - '???' +par nrTimesInFrame I int - 10 0 16 - '???' par majorIntegrationSteps I int - 10 0 1000 - '???' +par minorIntegrationSteps I int - 10 0 608 - '???' par positionType I text - 10 0 'ITRF' - '???' +par storageIntegrationTime I int - 10 0 60 - '???' +par storageStationNames I vtext - 10 0 '[CS010_us0..CS010_us3,CS001_dipole0,CS001_dipole4,CS001_dipole8,CS001_dipole12]' - '???' +par subbandsPerPset I int - 10 0 2 - '???' # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- diff --git a/MAC/Deployment/data/OTDB/Observation.comp b/MAC/Deployment/data/OTDB/Observation.comp index 4ce62f6550a..237db4b785d 100644 --- a/MAC/Deployment/data/OTDB/Observation.comp +++ b/MAC/Deployment/data/OTDB/Observation.comp @@ -12,26 +12,26 @@ node Observation 2.0.0 development 'node constraint' "Observation" # name dir. type unit prun. vm value constr. descr. #-------------------------------------------------------------------------------------------------------- # timing information -par startTime I text - 10 100 0 - 'start time of the observation in GMT (yyyy-mm-dd hh:mm:ss)' -par stopTime I text - 10 100 0 - 'stop time of the observation in GMT (yyyy-mm-dd hh:mm:ss)' -par claimPeriod I int - 10 100 600 - 'periodlength in seconds the CLAIM phases will take' -par preparePeriod I int - 10 100 300 - 'periodlength in seconds the PREPARE phases will take' +par startTime I text - 10 100 0 - 'Start time of the observation in GMT (yyyy-mm-dd hh:mm:ss)' +par stopTime I text - 10 100 0 - 'Stop time of the observation in GMT (yyyy-mm-dd hh:mm:ss)' +par claimPeriod I int - 10 100 600 - 'Periodlength in seconds the CLAIM phases will take' +par preparePeriod I int - 10 100 300 - '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 in this observation' -par beamletList I text - 10 0 [0] - 'mapping of subbands on beamlets' -par bandFilter I ptext - 10 0 'LBL_10_90|LBL_30_80|LBH_10_90|LBH_30_80|HB_100_190|HB_170_230|HB_210_250;LBL_30_80' - 'one of the seven filters to use' -par antennaArray I ptext - 10 0 'LBA|CS1-TEST;LBA' - 'name of the antenneArray (AntennaArrays.conf)' -par receiverList I text - 10 0 [0] - 'list of the receivers to use in the observation' +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|CS1-TEST;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.' par MSNameMask I text - 10 0 '/data2/ObservationA.MS' - 'Name for the Measurement set for this Observation' -par channelsPerSubband I int - 10 100 256 - 'number of channels per subband' -par nrBeams I int - 10 100 1 - 'number of simultaneous beams in this observation' -par nrPolarisations I pint - 10 100 '1|2;2' - 'number of polarisations to use in this observation' +par channelsPerSubband I int - 10 100 256 - 'Number of channels per subband' +par nrBeams I int - 10 100 1 - 'Number of simultaneous beams in this observation' +par nrPolarisations I pint - 10 100 '1|2;2' - 'Number of polarisations to use in this observation' # clock related info par clockMode I pnode - 10 0 '<<Clock160|<<Clock200;<<Clock160' - 'Mode in which clock is running' -par sampleClock I dbl MHz 10 100 >>Observation.clockMode.systemClock - 'sampleClock' +par sampleClock I dbl MHz 10 100 >>Observation.clockMode.systemClock - 'SampleClock' par samplesPerSecond I int - 10 100 >>Observation.clockMode.samplesPerSecond - 'Samples per second' par subbandWidth I dbl kHz 10 100 >>Observation.clockMode.subbandWidth - '' par channelWidth I dbl Hz 10 100 >>Observation.clockMode.channelWidth - '' diff --git a/MAC/Deployment/data/OTDB/OnlineCtrl.comp b/MAC/Deployment/data/OTDB/OnlineCtrl.comp index 66c0e6719b0..86be09616aa 100644 --- a/MAC/Deployment/data/OTDB/OnlineCtrl.comp +++ b/MAC/Deployment/data/OTDB/OnlineCtrl.comp @@ -6,13 +6,16 @@ #-------------------------------------------------------------------------------------------------------- node OnlineCtrl 1.0.0 development 'node constraint' "Controller for the online datastream" -# name dir. type unit prun. vm value constr. descr. +# name dir. type unit prun. vm value constr. descr. #-------------------------------------------------------------------------------------------------------- -par _hostname I text - 10 0 RS002 - "Machine the program should run on" +par _hostname I text - 10 0 CS001T - "Machine this controller should run on." +par applications I vtext - 10 0 [InputAppl,CorrAppl,StorageAppl] - "The applications the controller should manage." +par applOrder I vtext - 10 0 [] - "The application depencies if any!" uses ApplCtrl 1.0.0 development 1 "The ACC controller" -uses InputAppl 1.0.0 development 1 "Online Applications" -uses Fringe 1.0.0 development 1 "Online Applications" -uses OLAP 1.0.0 development 1 "Online Applications" -uses StorageAppl 1.0.0 development 1 "Online Applications" +uses InputAppl 1.0.0 development 1 "InputSection Application" +uses CorrAppl 1.0.0 development 1 "Blue Gene Application" +uses StorageAppl 1.0.0 development 1 "StorageSection Application" +uses OLAP 1.0.0 development 1 "OLAP specific information" + diff --git a/MAC/Deployment/data/OTDB/StationNode.base b/MAC/Deployment/data/OTDB/StationNode.base index 5df6ba45f3e..e472a46d3bf 100644 --- a/MAC/Deployment/data/OTDB/StationNode.base +++ b/MAC/Deployment/data/OTDB/StationNode.base @@ -14,6 +14,7 @@ par nrLBAntennas I int - 10 0 0 par nrHBAntennas I int - 10 0 0 - 'Number of HighBand antennas in this station' par stsPosition I text - 10 0 [0,0,0] - 'Station position in longitude, latitude and heigth' par RSPMacAddresses I text - 10 0 '[00:30:00:00:00:00, 00:30:00:00:00:00]' - 'MAC addresses of the RSPBoards' +par inputNodeList I text - 10 0 '[lii001,lii001,lii002,lii003]' - 'Inputnodes connected to the RSPBoards' # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- diff --git a/MAC/Deployment/data/OTDB/StorageAppl.comp b/MAC/Deployment/data/OTDB/StorageAppl.comp index 9c6da03a4f1..3240ca170b9 100644 --- a/MAC/Deployment/data/OTDB/StorageAppl.comp +++ b/MAC/Deployment/data/OTDB/StorageAppl.comp @@ -6,13 +6,21 @@ # # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- -node StorageAppl 1.0.0 development 'node constraint' "Storage" +node StorageProg 1.0.0 development 'node constraint' "StorageProg" +# name dir. type unit prun. vm value constr. descr. +#-------------------------------------------------------------------------------------------------------- +par _executable I text - 10 0 "CS1_Storage" - 'The name of the executable to start' +par _hostname I text - 10 0 "cs001t" - 'The machine on which the start- and stop-script is executed.' +par _nodes I vtext - 10 0 '[list001..list004]' - 'Nodes used by the (mpi)processes' +par _startstopType I ptext - 10 0 "cmdline|mpirun|bgl;mpirun" - 'Method of starting the proces' + +# name vers qual constr. descr. +#-------------------------------------------------------------------------------------------------------- +node StorageAppl 1.0.0 development 'node constraint' "Storage" +uses StorageProg 1.0.0 development 'node constraint' "StorageProg" # name dir. type unit prun. vm value constr. descr. #-------------------------------------------------------------------------------------------------------- -par DataSet I text - 10 0 >>Observation.MSNameMask - 'Name of the measurement set' -par _nodes I text - 10 0 '[]' - 'Nodes used by the process' -par _startstopType I text - 10 0 cmdline,mpirun,bgl - 'Method of starting the proces' -par _executable I text - 10 0 - - 'The name of the executable to start' -par _hostname I text - 10 0 - - 'The hostname of the machine to start the proces on' -par _depends I text - 10 0 '[Imager]' - 'The processes that must be finished before this process can start' +par processes I vtext - 10 0 '[StorageProg(4)]' - "list of processes that must be started" +par procesOrder I vtext - 10 0 '[]' - "Order of the processes, if any! FOR FUTURE USE." +par extraInfo I vtext - 10 0 '[.OLAP,PIC]' - "list of components that the application expects to be in the parsettfile." -- GitLab