Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
DP3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mattia Mancini
DP3
Commits
c2e103e1
Commit
c2e103e1
authored
6 years ago
by
Tammo Jan Dijkema
Browse files
Options
Downloads
Patches
Plain Diff
Task #10805: merge r39420 on preRelease branch
parent
0622dc28
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
DPPP/src/OneApplyCal.cc
+21
-10
21 additions, 10 deletions
DPPP/src/OneApplyCal.cc
with
21 additions
and
10 deletions
DPPP/src/OneApplyCal.cc
+
21
−
10
View file @
c2e103e1
...
...
@@ -59,10 +59,6 @@ namespace LOFAR {
parset
.
getString
(
prefix
+
"parmdb"
)
:
parset
.
getString
(
defaultPrefix
+
"parmdb"
)),
itsUseH5Parm
(
itsParmDBName
.
find
(
".h5"
)
!=
string
::
npos
),
itsTimeSlotsPerParmUpdate
(
parset
.
isDefined
(
prefix
+
"timeslotsperparmupdate"
)
?
parset
.
getInt
(
prefix
+
"timeslotsperparmupdate"
)
:
parset
.
getInt
(
defaultPrefix
+
"timeslotsperparmupdate"
,
500
)),
itsSigmaMMSE
(
parset
.
isDefined
(
prefix
+
"MMSE.Sigma"
)
?
parset
.
getDouble
(
prefix
+
"MMSE.Sigma"
)
:
...
...
@@ -90,6 +86,7 @@ namespace LOFAR {
}
if
(
itsUseH5Parm
)
{
itsTimeSlotsPerParmUpdate
=
0
;
string
directionStr
;
directionStr
=
(
parset
.
isDefined
(
prefix
+
"direction"
)
?
parset
.
getString
(
prefix
+
"direction"
)
:
...
...
@@ -117,6 +114,10 @@ namespace LOFAR {
itsDirection
=
itsSolTab
.
getDirIndex
(
directionStr
);
}
}
else
{
itsTimeSlotsPerParmUpdate
=
parset
.
isDefined
(
prefix
+
"timeslotsperparmupdate"
)
?
parset
.
getInt
(
prefix
+
"timeslotsperparmupdate"
)
:
parset
.
getInt
(
defaultPrefix
+
"timeslotsperparmupdate"
,
500
);
string
correctTypeStr
=
toLower
(
parset
.
isDefined
(
prefix
+
"correction"
)
?
parset
.
getString
(
prefix
+
"correction"
)
:
...
...
@@ -176,7 +177,9 @@ namespace LOFAR {
ASSERT
(
itsNCorr
==
4
);
if
(
!
itsUseH5Parm
)
{
// Use ParmDB
if
(
itsUseH5Parm
)
{
itsTimeSlotsPerParmUpdate
=
info
().
ntime
();
}
else
{
// Use ParmDB
itsParmDB
.
reset
(
new
BBS
::
ParmFacade
(
itsParmDBName
));
}
...
...
@@ -323,9 +326,7 @@ namespace LOFAR {
if
(
itsInvert
)
{
os
<<
" sigmaMMSE: "
<<
itsSigmaMMSE
<<
endl
;
}
if
(
!
itsUseH5Parm
)
{
os
<<
" timeSlotsPerParmUpdate: "
<<
itsTimeSlotsPerParmUpdate
<<
endl
;
}
os
<<
" timeSlotsPerParmUpdate: "
<<
itsTimeSlotsPerParmUpdate
<<
endl
;
}
void
OneApplyCal
::
showTimings
(
std
::
ostream
&
os
,
double
duration
)
const
...
...
@@ -455,14 +456,24 @@ namespace LOFAR {
h5freqinterval
=
itsSolTab
.
getFreqInterval
();
ASSERT
(
h5freqinterval
>
0
);
freqUpsampleFactor
=
h5freqinterval
/
info
().
chanWidths
()[
0
]
+
0.5
;
// Round;
ASSERT
(
near
(
h5freqinterval
,
freqUpsampleFactor
*
info
().
chanWidths
()[
0
],
1.e-5
));
ASSERTSTR
(
near
(
h5freqinterval
,
freqUpsampleFactor
*
info
().
chanWidths
()[
0
],
1.e-5
),
"H5Parm freq interval ("
<<
h5freqinterval
<<
") is not an integer "
<<
"multiple of MS freq interval ("
<<
info
().
chanWidths
()[
0
]
<<
")"
);
if
(
freqUpsampleFactor
>
numFreqs
)
{
freqUpsampleFactor
=
numFreqs
;
}
}
uint
timeUpsampleFactor
=
numTimes
;
if
(
itsSolTab
.
hasAxis
(
"time"
)
&&
itsSolTab
.
getAxis
(
"time"
).
size
>
1
)
{
double
h5timeInterval
=
itsSolTab
.
getTimeInterval
();
timeUpsampleFactor
=
h5timeInterval
/
itsTimeInterval
+
0.5
;
// Round
ASSERT
(
near
(
h5timeInterval
,
timeUpsampleFactor
*
itsTimeInterval
,
1.e-5
));
ASSERTSTR
(
near
(
h5timeInterval
,
timeUpsampleFactor
*
itsTimeInterval
,
1.e-5
),
"H5Parm time interval ("
<<
h5timeInterval
<<
") is not an integer "
<<
"multiple of MS time interval ("
<<
itsTimeInterval
<<
")"
);
if
(
timeUpsampleFactor
>
numTimes
)
{
timeUpsampleFactor
=
numTimes
;
}
}
// Figure out whether time or frequency is first axis
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment