From d1e0026670ec2c1bfdd5905fd86d1657e6fa483f Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Tue, 31 Jul 2012 12:33:41 +0000
Subject: [PATCH] Task #3464: Added option to setupsourcedb to generate the
skydb as one big blob
---
.../recipes/sip/bin/msss_calibrator_pipeline.py | 3 ++-
.../recipes/sip/bin/msss_target_pipeline.py | 3 ++-
CEP/Pipeline/recipes/sip/master/setupsourcedb.py | 8 +++++++-
CEP/Pipeline/recipes/sip/nodes/setupsourcedb.py | 13 +++++++------
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py b/CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py
index b38af4a67b1..0af1a4ad42c 100755
--- a/CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py
+++ b/CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py
@@ -196,7 +196,8 @@ class msss_calibrator_pipeline(control):
'share', 'pipeline', 'skymodels', 'Ateam_LBA_CC.skymodel'
),
mapfile=os.path.join(mapfile_dir, 'dppp.sourcedb.mapfile'),
- suffix='.dppp.sourcedb'
+ suffix='.dppp.sourcedb',
+ type='blob'
)['mapfile']
# Create a parameter-subset for DPPP and write it to file.
diff --git a/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py b/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
index 47feb97b754..0105e5bf4f8 100755
--- a/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
+++ b/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
@@ -271,7 +271,8 @@ class msss_target_pipeline(control):
'share', 'pipeline', 'skymodels', 'Ateam_LBA_CC.skymodel'
),
mapfile=os.path.join(mapfile_dir, 'dppp.sourcedb.mapfile'),
- suffix='.dppp.sourcedb'
+ suffix='.dppp.sourcedb',
+ type='blob'
)['mapfile']
# Create a parameter-subset for DPPP and write it to file.
diff --git a/CEP/Pipeline/recipes/sip/master/setupsourcedb.py b/CEP/Pipeline/recipes/sip/master/setupsourcedb.py
index 046d595ff82..22241a86927 100644
--- a/CEP/Pipeline/recipes/sip/master/setupsourcedb.py
+++ b/CEP/Pipeline/recipes/sip/master/setupsourcedb.py
@@ -37,6 +37,11 @@ class setupsourcedb(BaseRecipe, RemoteCommandRecipeMixIn):
help="Input sky catalogue",
default=''
),
+ 'type': ingredient.StringField(
+ '--type',
+ help="Output type (casa or blob)",
+ default="casa"
+ ),
'mapfile': ingredient.StringField(
'--mapfile',
help="Full path of mapfile to produce; it will contain "
@@ -109,7 +114,8 @@ class setupsourcedb(BaseRecipe, RemoteCommandRecipeMixIn):
arguments=[
self.inputs['executable'],
self.inputs['skymodel'],
- outfile
+ outfile,
+ self.inputs['type']
]
)
)
diff --git a/CEP/Pipeline/recipes/sip/nodes/setupsourcedb.py b/CEP/Pipeline/recipes/sip/nodes/setupsourcedb.py
index a9c1f4469f6..b2abea746f4 100644
--- a/CEP/Pipeline/recipes/sip/nodes/setupsourcedb.py
+++ b/CEP/Pipeline/recipes/sip/nodes/setupsourcedb.py
@@ -5,7 +5,7 @@
# loose@astron.nl
# ------------------------------------------------------------------------------
-from subprocess import Popen, CalledProcessError, PIPE, STDOUT
+from subprocess import CalledProcessError
import errno
import os
import tempfile
@@ -19,7 +19,7 @@ from lofarpipe.support.utilities import catch_segfaults
class setupsourcedb(LOFARnodeTCP):
- def run(self, executable, catalogue, skydb):
+ def run(self, executable, catalogue, skydb, dbtype):
with log_time(self.logger):
# Create output directory if it does not yet exist.
skydb_dir = os.path.dirname(skydb)
@@ -38,9 +38,10 @@ class setupsourcedb(LOFARnodeTCP):
scratch_dir = tempfile.mkdtemp()
try:
cmd = [executable,
+ "in=%s" % catalogue,
+ "out=%s" % skydb,
+ "outtype=%s" % dbtype,
"format=<",
- "in=%s" % (catalogue),
- "out=%s" % (skydb),
"append=false"
]
with CatchLog4CPlus(
@@ -49,10 +50,10 @@ class setupsourcedb(LOFARnodeTCP):
os.path.basename(executable)
) as logger:
catch_segfaults(cmd, scratch_dir, None, logger)
- except CalledProcessError, e:
+ except CalledProcessError, err:
# For CalledProcessError isn't properly propagated by IPython
# Temporary workaround...
- self.logger.error(str(e))
+ self.logger.error(str(err))
return 1
finally:
shutil.rmtree(scratch_dir)
--
GitLab