From 22837cbf823adaa260e2ca2be767ae69aa7174a0 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Fri, 27 Jul 2012 16:39:06 +0000
Subject: [PATCH] Task #2942: Reverted commit r21701. Don't know if it's really
needed, and it doesn't seem to work the way I thought
---
.../framework/lofarpipe/support/stateful.py | 4 ++--
.../recipes/sip/bin/msss_target_pipeline.py | 18 +++++++++++++-----
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/CEP/Pipeline/framework/lofarpipe/support/stateful.py b/CEP/Pipeline/framework/lofarpipe/support/stateful.py
index fb4912252d2..5bf344f215a 100644
--- a/CEP/Pipeline/framework/lofarpipe/support/stateful.py
+++ b/CEP/Pipeline/framework/lofarpipe/support/stateful.py
@@ -67,7 +67,7 @@ class StatefulRecipe(BaseRecipe):
'statefile'
),
'w')
- state = [self.inputs, self.outputs, self.state]
+ state = [self.inputs, self.state]
cPickle.dump(state, statefile)
def go(self):
@@ -78,7 +78,7 @@ class StatefulRecipe(BaseRecipe):
)
try:
statefile = open(statefile, 'r')
- inputs, self.outputs, self.state = cPickle.load(statefile)
+ inputs, self.state = cPickle.load(statefile)
statefile.close()
# What's the correct thing to do if inputs differ from the saved
diff --git a/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py b/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
index 592ca816454..23746c90bfe 100755
--- a/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
+++ b/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
@@ -170,7 +170,7 @@ class msss_target_pipeline(control):
mapfile_target=target_path,
mapfiles_dir=copier_map_path,
mapfile=copied_files_path,
- target_dir="instument_models")['mapfile']
+ target_dir="instrument_models")['mapfile']
return new_instrument_map
@@ -256,7 +256,11 @@ class msss_target_pipeline(control):
vdsinfo = self.run_task("vdsreader", gvds=gvds_file)
# Create an empty parmdb for DPPP
- parmdb_mapfile = self.run_task("setupparmdb", data_mapfile)['mapfile']
+ parmdb_mapfile = self.run_task(
+ "setupparmdb", data_mapfile,
+ mapfile=os.path.join(mapfile_dir, 'dppp.parmdb.mapfile'),
+ suffix='.dppp.parmdb'
+ )['mapfile']
# Create a sourcedb to be used by the demixing phase of DPPP
# The path to the A-team sky model is currently hard-coded.
@@ -265,7 +269,9 @@ class msss_target_pipeline(control):
skymodel=os.path.join(
self.config.get('DEFAULT', 'lofarroot'),
'share', 'pipeline', 'skymodels', 'Ateam_LBA_CC.skymodel'
- )
+ ),
+ mapfile=os.path.join(mapfile_dir, 'dppp.sourcedb.mapfile'),
+ suffix='.dppp.sourcedb'
)['mapfile']
# Create a parameter-subset for DPPP and write it to file.
@@ -290,7 +296,9 @@ class msss_target_pipeline(control):
# Create an empty sourcedb for BBS
sourcedb_mapfile = self.run_task(
- "setupsourcedb", data_mapfile
+ "setupsourcedb", data_mapfile,
+ mapfile=os.path.join(mapfile_dir, 'bbs.sourcedb.mapfile'),
+ suffix='.bbs.sourcedb'
)['mapfile']
# Create a parameter-subset for BBS and write it to file.
@@ -315,7 +323,7 @@ class msss_target_pipeline(control):
# CORRECTED_DATA column of the original MS.
self.run_task("ndppp",
(bbs_mapfile, corrected_mapfile),
- clobber=False,
+ clobber=True, #False,
suffix='',
parset=ndppp_parset,
mapfile=os.path.join(mapfile_dir, 'dppp[1].mapfile')
--
GitLab