From e997d3c9bd86ea73a54f72658b6adccf0b17511c Mon Sep 17 00:00:00 2001 From: Tammo Jan Dijkema <dijkema@astron.nl> Date: Thu, 9 Jan 2014 12:43:22 +0000 Subject: [PATCH] Task #5404: added default gains of 0 to DPPP applycal --- CEP/DP3/DPPP/src/ApplyCal.cc | 3 ++- CEP/DP3/DPPP/test/tApplyCal.in_parmdb.tgz | Bin 2954 -> 2961 bytes CEP/DP3/DPPP/test/tApplyCal_parmdbscript | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CEP/DP3/DPPP/src/ApplyCal.cc b/CEP/DP3/DPPP/src/ApplyCal.cc index c2fc63dd773..631c7019766 100644 --- a/CEP/DP3/DPPP/src/ApplyCal.cc +++ b/CEP/DP3/DPPP/src/ApplyCal.cc @@ -276,10 +276,11 @@ namespace LOFAR { } else if (itsParmDB->getDefValues(itsParmExprs[parmExprNum]).size() == 1) { //Default value - //TODO: not including * in the pattern above may be too strict itsParmDB->getDefValues(itsParmExprs[parmExprNum]).get(0,defValues); ASSERT(defValues.size()==1); defValue=defValues.data()[0]; + } else if (itsParmExprs[parmExprNum].substr(0,5)=="Gain:") { + defValue=0.; } else { THROW (Exception, "No parameter value found for "+ diff --git a/CEP/DP3/DPPP/test/tApplyCal.in_parmdb.tgz b/CEP/DP3/DPPP/test/tApplyCal.in_parmdb.tgz index 8433129c89dd6bd6622eea35ac669078354f943b..4c14cc17721364d02af8f9a7c73d3815929b7429 100644 GIT binary patch literal 2961 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 literal 2954 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 diff --git a/CEP/DP3/DPPP/test/tApplyCal_parmdbscript b/CEP/DP3/DPPP/test/tApplyCal_parmdbscript index e06417a4ed7..01414cdf6bc 100644 --- a/CEP/DP3/DPPP/test/tApplyCal_parmdbscript +++ b/CEP/DP3/DPPP/test/tApplyCal_parmdbscript @@ -7,10 +7,8 @@ clear adddef Gain:0:0:Real values=1 adddef Gain:0:0:Imag values=0 adddef Gain:1:1:Real values=1 -adddef Gain:1:1:Imag values=0 adddef Gain:0:1:Real values=0 adddef Gain:0:1:Imag values=0 -adddef Gain:1:0:Real values=0 adddef Gain:1:0:Imag values=0 adddef Clock values=0.0000037 -- GitLab