From b3d8159e52c38b2a74cfff5dc3b12f51c6ed29e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Offringa?= <offringa@astron.nl>
Date: Fri, 3 Dec 2010 17:24:18 +0000
Subject: [PATCH] Bug 1491: fix
---
.../AOFlagger/rfi/strategy/timeconvolutionaction.h | 2 +-
.../AOFlagger/include/AOFlagger/rfi/uvprojection.h | 8 +++++---
CEP/DP3/AOFlagger/src/imaging/uvimager.cpp | 11 -----------
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/timeconvolutionaction.h b/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/timeconvolutionaction.h
index bc2fc01f0ee..6570fcb7460 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/timeconvolutionaction.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/timeconvolutionaction.h
@@ -569,7 +569,7 @@ private:
AOLogger::Debug << "Central frequency: " << centralFreq << "\n";
const numl_t sincDist = ActualSincScaleAsRaDecDist(artifacts, centralFreq);
numl_t ignoreRadius = sincDist / imager.UVScaling();
- AOLogger::Debug << "Ignoring " << ignoreRadius << "\n";
+ AOLogger::Debug << "Ignoring radius=" << ignoreRadius << "\n";
long maxX = 0, maxY = 0;
num_t maxValue = image->Value(maxX, maxY);
diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/rfi/uvprojection.h b/CEP/DP3/AOFlagger/include/AOFlagger/rfi/uvprojection.h
index ba89b194a1b..6378d033377 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/rfi/uvprojection.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/rfi/uvprojection.h
@@ -25,6 +25,8 @@
#include <AOFlagger/msio/image2d.h>
#include <AOFlagger/msio/timefrequencymetadata.h>
+#include <AOFlagger/imaging/uvimager.h>
+
class UVProjection
{
public:
@@ -68,15 +70,15 @@ class UVProjection
uProject = uvw.u * cosRotate - uvw.v * sinRotate;
currentSign = 1.0;
currentSignIsNegatated = false;
- rowVPositions[t] = vProject * frequency;
+ rowVPositions[t] = vProject * frequency / UVImager::SpeedOfLight();
} else {
uProject = -uvw.u * cosRotate + uvw.v * sinRotate;
currentSign = bottomSign;
currentSignIsNegatated = isImaginary;
- rowVPositions[t] = -vProject * frequency;
+ rowVPositions[t] = -vProject * frequency / UVImager::SpeedOfLight();
}
rowValues[t] = currentSign * image->Value(t, y);
- rowUPositions[t] = uProject * frequency;
+ rowUPositions[t] = uProject * frequency / UVImager::SpeedOfLight();
rowNegatedSigns[t] = currentSignIsNegatated;
}
diff --git a/CEP/DP3/AOFlagger/src/imaging/uvimager.cpp b/CEP/DP3/AOFlagger/src/imaging/uvimager.cpp
index e4dfb1b8520..b9706f076a3 100644
--- a/CEP/DP3/AOFlagger/src/imaging/uvimager.cpp
+++ b/CEP/DP3/AOFlagger/src/imaging/uvimager.cpp
@@ -283,16 +283,6 @@ void UVImager::Image(const TimeFrequencyData &data, TimeFrequencyMetaDataCPtr me
if(_uvReal == 0)
Empty();
- //long double frequency = metaData->Band().channels[frequencyIndex].frequencyHz;
- //long double speedOfLight = 299792458.0L;
- //AntennaCache cache;
- //cache.wavelength = speedOfLight / frequency;
-
- // dx, dy, dz is the baseline
- //cache.dx = metaData->Antenna1().position.x - metaData->Antenna2().position.x;
- //cache.dy = metaData->Antenna1().position.y - metaData->Antenna2().position.y;
- //cache.dz = metaData->Antenna1().position.z - metaData->Antenna2().position.z;
-
Image2DCPtr
real = data.GetRealPart(),
imaginary = data.GetImaginaryPart();
@@ -313,7 +303,6 @@ void UVImager::Image(const TimeFrequencyData &data, TimeFrequencyMetaDataCPtr me
SetUVValue(u, v, vr, vi, 1.0);
SetUVValue(-u, -v, vr, -vi, 1.0);
}
- //calcTimer.Pause();
}
break;
case Flagging:
--
GitLab