From e3eefc996a2e004aa19e4419bcc0f6a9c66e63e0 Mon Sep 17 00:00:00 2001 From: Marcel Loose <loose@astron.nl> Date: Mon, 7 Jan 2013 14:34:20 +0000 Subject: [PATCH] Task #3995: Merged task branch into the trunk. --- CEP/Pipeline/recipes/sip/bin/calibration_pipeline.py | 12 ++++++++++++ .../recipes/sip/bin/preprocessing_pipeline.py | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/CEP/Pipeline/recipes/sip/bin/calibration_pipeline.py b/CEP/Pipeline/recipes/sip/bin/calibration_pipeline.py index 46a64a916dd..b61ea593292 100644 --- a/CEP/Pipeline/recipes/sip/bin/calibration_pipeline.py +++ b/CEP/Pipeline/recipes/sip/bin/calibration_pipeline.py @@ -236,6 +236,18 @@ class calibration_pipeline(control): sky_mapfile=sourcedb_mapfile ) + # ********************************************************************* + # 6. Create feedback file for further processing by the LOFAR framework + # (MAC) + # Create a parset-file containing the metadata for MAC/SAS + with duration(self, "get_metadata"): + self.run_task("get_metadata", output_data_mapfile, + parset_file=self.parset_feedback_file, + parset_prefix=( + self.parset.getString('prefix') + + self.parset.fullModuleName('DataProducts')), + product_type="Correlated") + return 0 diff --git a/CEP/Pipeline/recipes/sip/bin/preprocessing_pipeline.py b/CEP/Pipeline/recipes/sip/bin/preprocessing_pipeline.py index 4cadbf9dd0e..9295904d869 100644 --- a/CEP/Pipeline/recipes/sip/bin/preprocessing_pipeline.py +++ b/CEP/Pipeline/recipes/sip/bin/preprocessing_pipeline.py @@ -192,6 +192,18 @@ class preprocessing_pipeline(control): data_end_time=vdsinfo['end_time'], parset=ndppp_parset) + # ********************************************************************* + # 6. Create feedback file for further processing by the LOFAR framework + # (MAC) + # Create a parset-file containing the metadata for MAC/SAS + with duration(self, "get_metadata"): + self.run_task("get_metadata", output_data_mapfile, + parset_file=self.parset_feedback_file, + parset_prefix=( + self.parset.getString('prefix') + + self.parset.fullModuleName('DataProducts')), + product_type="Correlated") + return 0 -- GitLab