Skip to content
Snippets Groups Projects
Commit 6ce5386c authored by Marcel Loose's avatar Marcel Loose :sunglasses:
Browse files

Task #3208: Renamed recipe parmdb to setupparmdb and sourcedb to... 

Task #3208: Renamed recipe parmdb to setupparmdb and sourcedb to setupsourcedb, because that's what they do: setup an initial instrument model and sky model.
parent c3aea4fa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 54 additions and 43 deletions
.gitattributes
+ 4
− 4
View file @ 6ce5386c
......@@ -1174,12 +1174,12 @@ CEP/Pipeline/recipes/sip/master/imager_prepare.py eol=lf
CEP/Pipeline/recipes/sip/master/imager_source_finding.py eol=lf
CEP/Pipeline/recipes/sip/master/make_flaggable.py eol=lf
CEP/Pipeline/recipes/sip/master/new_bbs.py eol=lf
CEP/Pipeline/recipes/sip/master/parmdb.py eol=lf
CEP/Pipeline/recipes/sip/master/parmexportcal.py eol=lf
CEP/Pipeline/recipes/sip/master/parset.test eol=lf
CEP/Pipeline/recipes/sip/master/rficonsole.py eol=lf
CEP/Pipeline/recipes/sip/master/setupparmdb.py eol=lf
CEP/Pipeline/recipes/sip/master/setupsourcedb.py eol=lf
CEP/Pipeline/recipes/sip/master/skymodel.py eol=lf
CEP/Pipeline/recipes/sip/master/sourcedb.py eol=lf
CEP/Pipeline/recipes/sip/master/storagemapper.py eol=lf
CEP/Pipeline/recipes/sip/master/vdsmaker.py eol=lf
CEP/Pipeline/recipes/sip/master/vdsreader.py eol=lf
......@@ -1213,10 +1213,10 @@ CEP/Pipeline/recipes/sip/nodes/imager_prepare.py eol=lf
CEP/Pipeline/recipes/sip/nodes/imager_source_finding.py eol=lf
CEP/Pipeline/recipes/sip/nodes/make_flaggable.py eol=lf
CEP/Pipeline/recipes/sip/nodes/new_bbs.py eol=lf
CEP/Pipeline/recipes/sip/nodes/parmdb.py eol=lf
CEP/Pipeline/recipes/sip/nodes/parmexportcal.py eol=lf
CEP/Pipeline/recipes/sip/nodes/rficonsole.py eol=lf
CEP/Pipeline/recipes/sip/nodes/sourcedb.py eol=lf
CEP/Pipeline/recipes/sip/nodes/setupparmdb.py eol=lf
CEP/Pipeline/recipes/sip/nodes/setupsourcedb.py eol=lf
CEP/Pipeline/recipes/sip/nodes/vdsmaker.py eol=lf
CEP/Pipeline/recipes/sip/pipeline.cfg eol=lf
CEP/Pipeline/recipes/sip/skymodels/3C196.skymodel eol=lf
......
CEP/Pipeline/recipes/sip/CMakeLists.txt
+ 4
− 4
View file @ 6ce5386c
......@@ -24,11 +24,11 @@ python_install(
master/get_metadata.py
master/make_flaggable.py
master/new_bbs.py
master/parmdb.py
master/parmexportcal.py
master/rficonsole.py
master/setupparmdb.py
master/setupsourcedb.py
master/skymodel.py
master/sourcedb.py
master/storagemapper.py
master/vdsmaker.py
master/vdsreader.py
......@@ -55,10 +55,10 @@ python_install(
nodes/imager_finalize.py
nodes/imager_prepare.py
nodes/imager_source_finding.py
nodes/parmdb.py
nodes/parmexportcal.py
nodes/rficonsole.py
nodes/sourcedb.py
nodes/setupparmdb.py
nodes/setupsourcedb.py
nodes/vdsmaker.py
DESTINATION lofarpipe/recipes)
......
CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py
+ 2
− 2
View file @ 6ce5386c
......@@ -191,11 +191,11 @@ class msss_calibrator_pipeline(control):
self.run_task("rficonsole", demix_mapfile, indirect_read=True)
# Create an empty parmdb for DPPP
parmdb_mapfile = self.run_task("parmdb", data_mapfile)['mapfile']
parmdb_mapfile = self.run_task("setupparmdb", data_mapfile)['mapfile']
# Create a sourcedb based on sourcedb's input argument "skymodel"
sourcedb_mapfile = self.run_task(
"sourcedb", data_mapfile,
"setupsourcedb", data_mapfile,
skymodel=os.path.join(
self.config.get('DEFAULT', 'lofarroot'),
'share', 'pipeline', 'skymodels',
......
CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
+ 2
− 2
View file @ 6ce5386c
#!/usr/bin/env python
# LOFAR IMAGING PIPELINE
#
# Calibrator Pipeline recipe
# Target Pre-Processing Pipeline recipe
# Marcel Loose, 2011
# loose@astron.nl
# ------------------------------------------------------------------------------
......@@ -200,7 +200,7 @@ class msss_target_pipeline(control):
# Create a sourcedb based on sourcedb's input argument "skymodel"
# (see, e.g., tasks.cfg file).
sourcedb_mapfile = self.run_task("sourcedb", data_mapfile)['mapfile']
sourcedb_mapfile = self.run_task("setupsourcedb", data_mapfile)['mapfile']
# Produce a GVDS file describing the data on the compute nodes.
gvds_file = self.run_task("vdsmaker", data_mapfile)['gvds']
......
CEP/Pipeline/recipes/sip/master/parmdb.py → CEP/Pipeline/recipes/sip/master/setupparmdb.py
+ 9
− 10
View file @ 6ce5386c
# LOFAR IMAGING PIPELINE
#
# parmdb recipe
# setupparmdb master recipe
# John Swinbank, 2010
# swinbank@transientskp.org
# Marcel Loose, 2012
# loose@astron.nl
# ------------------------------------------------------------------------------
import os
......@@ -29,16 +31,13 @@ adddef DirectionalGain:0:0:Ampl values=1.0
adddef DirectionalGain:1:1:Ampl values=1.0
adddef DirectionalGain:0:0:Real values=1.0
adddef DirectionalGain:1:1:Real values=1.0
adddef AntennaOrientation values=5.497787144
quit
"""
class parmdb(BaseRecipe, RemoteCommandRecipeMixIn):
class setupparmdb(BaseRecipe, RemoteCommandRecipeMixIn):
"""
Add a parameter database to input MeasurementSets.
This recipe is called by the :class:`bbs.bbs` recipe; it may also be used
standalone.
Create a distributed parameter database (ParmDB) for a distributed
Measurement set (MS).
**Arguments**
......@@ -76,8 +75,8 @@ class parmdb(BaseRecipe, RemoteCommandRecipeMixIn):
}
def go(self):
self.logger.info("Starting parmdb run")
super(parmdb, self).go()
self.logger.info("Starting setupparmdb run")
super(setupparmdb, self).go()
self.logger.info("Generating template parmdb")
pdbdir = tempfile.mkdtemp(
......@@ -155,4 +154,4 @@ class parmdb(BaseRecipe, RemoteCommandRecipeMixIn):
if __name__ == '__main__':
sys.exit(parmdb().main())
sys.exit(setupparmdb().main())
CEP/Pipeline/recipes/sip/master/sourcedb.py → CEP/Pipeline/recipes/sip/master/setupsourcedb.py
+ 10
− 10
View file @ 6ce5386c
# LOFAR IMAGING PIPELINE
#
# sourcedb recipe
# setupsourcedb master recipe
# John Swinbank, 2010
# swinbank@transientskp.org
# Marcel Loose, 2012
# loose@astron.nl
# ------------------------------------------------------------------------------
from __future__ import with_statement
......@@ -16,13 +18,11 @@ from lofarpipe.support.group_data import load_data_map, store_data_map
from lofarpipe.support.group_data import validate_data_maps
from lofarpipe.support.remotecommand import ComputeJob
class sourcedb(BaseRecipe, RemoteCommandRecipeMixIn):
class setupsourcedb(BaseRecipe, RemoteCommandRecipeMixIn):
"""
Add a source database to input MeasurementSets.
This recipe is called by the :class:`bbs.bbs` recipe; it may also be used
standalone.
Create a distributed Sky Model database (SourceDB) for a distributed
Measurement Set (MS).
**Arguments**
A mapfile describing the data to be processed.
......@@ -64,8 +64,8 @@ class sourcedb(BaseRecipe, RemoteCommandRecipeMixIn):
def go(self):
self.logger.info("Starting sourcedb run")
super(sourcedb, self).go()
self.logger.info("Starting setupsourcedb run")
super(setupsourcedb, self).go()
# Load file <-> compute node mapping from disk
# ----------------------------------------------------------------------
......@@ -125,4 +125,4 @@ class sourcedb(BaseRecipe, RemoteCommandRecipeMixIn):
if __name__ == '__main__':
sys.exit(sourcedb().main())
sys.exit(setupsourcedb().main())
CEP/Pipeline/recipes/sip/nodes/parmdb.py → CEP/Pipeline/recipes/sip/nodes/setupparmdb.py
+ 10
− 4
View file @ 6ce5386c
from __future__ import with_statement
# LOFAR IMAGING PIPELINE
#
# setupparmdb nodes recipe
# Marcel Loose, 2012
# loose@astron.nl
# ------------------------------------------------------------------------------
from lofarpipe.support.lofarnode import LOFARnodeTCP
from lofarpipe.support.utilities import log_time
import shutil, os.path
import shutil
import sys
class parmdb(LOFARnodeTCP):
class setupparmdb(LOFARnodeTCP):
def run(self, pdb_in, pdb_out):
with log_time(self.logger):
self.logger.debug("Copying parmdb: %s --> %s" % (pdb_in, pdb_out))
......@@ -22,4 +28,4 @@ if __name__ == "__main__":
# and pass the rest to the run() method defined above
# --------------------------------------------------------------------------
jobid, jobhost, jobport = sys.argv[1:4]
sys.exit(parmdb(jobid, jobhost, jobport).run_with_stored_arguments())
sys.exit(setupparmdb(jobid, jobhost, jobport).run_with_stored_arguments())
CEP/Pipeline/recipes/sip/nodes/sourcedb.py → CEP/Pipeline/recipes/sip/nodes/setupsourcedb.py
+ 9
− 3
View file @ 6ce5386c
from __future__ import with_statement
# LOFAR IMAGING PIPELINE
#
# setupsourcedb nodes recipe
# Marcel Loose, 2012
# loose@astron.nl
# ------------------------------------------------------------------------------
from subprocess import Popen, CalledProcessError, PIPE, STDOUT
import errno
import os
......@@ -12,7 +18,7 @@ from lofarpipe.support.pipelinelogging import CatchLog4CPlus
from lofarpipe.support.utilities import catch_segfaults
class sourcedb(LOFARnodeTCP):
class setupsourcedb(LOFARnodeTCP):
def run(self, executable, catalogue, skydb):
with log_time(self.logger):
# Create output directory if it does not yet exist.
......@@ -57,4 +63,4 @@ if __name__ == "__main__":
# and pass the rest to the run() method defined above
# --------------------------------------------------------------------------
jobid, jobhost, jobport = sys.argv[1:4]
sys.exit(sourcedb(jobid, jobhost, jobport).run_with_stored_arguments())
sys.exit(setupsourcedb(jobid, jobhost, jobport).run_with_stored_arguments())
CEP/Pipeline/recipes/sip/tasks.cfg
+ 4
− 4
View file @ 6ce5386c
......@@ -35,13 +35,13 @@ parmdbm = %(lofarroot)s/bin/parmdbm
recipe = vdsreader
gvds = %(runtime_directory)s/jobs/%(job_name)s/vds/%(job_name)s.gvds
[parmdb]
recipe = parmdb
[setupparmdb]
recipe = setupparmdb
executable = %(lofarroot)s/bin/parmdbm
mapfile = %(runtime_directory)s/jobs/%(job_name)s/mapfiles/parmdb.mapfile
[sourcedb]
recipe = sourcedb
[setupsourcedb]
recipe = setupsourcedb
executable = %(lofarroot)s/bin/makesourcedb
skymodel = %(runtime_directory)s/jobs/%(job_name)s/parsets/bbs.skymodel
mapfile = %(runtime_directory)s/jobs/%(job_name)s/mapfiles/sky.mapfile
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment