diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/timeconvolutionaction.h b/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/timeconvolutionaction.h index bc2fc01f0ee213a375a23a051b20b8f524a7565b..6570fcb746094bb8830a24edfdfbcc42a33f92b3 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 ba89b194a1bb6ee5dbd75f8da325da2096ae6884..6378d033377ab83acddf4285973c5a02fe76cda0 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 e4dfb1b852079b3586276f18593cefb699a9b98e..b9706f076a3cf9ef1a779543b34be2bcd83162c2 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: