From 3c5d77de7b73b42456ad6f67b6f9a1bf8a2ea7c0 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Wed, 13 Jan 2010 12:46:35 +0000
Subject: [PATCH] Bug 1237: Using vector length of the relative antenna
positions that are available in the AntennaPos class.
---
MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc | 15 ++++----
.../ITRFBeamServer/src/Package__Version.cc | 35 -------------------
2 files changed, 8 insertions(+), 42 deletions(-)
delete mode 100644 MAC/APL/PAC/ITRFBeamServer/src/Package__Version.cc
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
index f2eb30f2275..c1c6899c423 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
@@ -1382,11 +1382,14 @@ void BeamServer::compute_weights(Timestamp weightTime)
blitz::Array<double, 2> rcuPosITRF = LBAfield ? itsAntennaPos->LBARCUPos() : itsAntennaPos->HBARCUPos();
LOG_DEBUG_STR("ITRFRCUPos = " << rcuPosITRF);
- // Get geographical location of subarray in ITRF
+ // Get geographical location of subarray in ITRF and place it in an AMC Position class.
blitz::Array<double, 1> fieldCentreITRF = LBAfield ? itsAntennaPos->LBACentre() : itsAntennaPos->HBACentre();
Position fieldPositionITRF(Coord3D(blitz2vector(fieldCentreITRF)), Position::ITRF);
LOG_DEBUG_STR("ITRF position antennaField: " << fieldPositionITRF);
+ // Lengths of the vector of the antennaPosition i.r.t. the fieldCentre,
+ blitz::Array<double,1> rcuPosLengths = LBAfield ? itsAntennaPos->LBARCULengths() : itsAntennaPos->HBARCULengths();
+
// for all beams using this field
map<string, Beam*>::iterator beamIter = itsBeamPool.begin();
map<string, Beam*>::iterator end = itsBeamPool.end();
@@ -1427,13 +1430,11 @@ void BeamServer::compute_weights(Timestamp weightTime)
ResultData result;
itsAMCclient.itrfToJ2000(result, request);
vector<double> direction = result.direction[0].coord().get();
+
// Note AMCServer returns an unit vector.
- double originalLength = sqrt((rcuPosITRF(rcu,0)*rcuPosITRF(rcu,0)) +
- (rcuPosITRF(rcu,1)*rcuPosITRF(rcu,1)) +
- (rcuPosITRF(rcu,2)*rcuPosITRF(rcu,2)));
- J2000SingleRCUPos(0) = direction[0] * originalLength;
- J2000SingleRCUPos(1) = direction[1] * originalLength;
- J2000SingleRCUPos(2) = direction[2] * originalLength;
+ J2000SingleRCUPos(0) = direction[0] * rcuPosLengths(rcu);
+ J2000SingleRCUPos(1) = direction[1] * rcuPosLengths(rcu);
+ J2000SingleRCUPos(2) = direction[2] * rcuPosLengths(rcu);
LOG_DEBUG_STR("J2000RCUPos[" << rcu << "]=[" << J2000SingleRCUPos(0) << ", " <<
J2000SingleRCUPos(1) << ", " << J2000SingleRCUPos(2) << "]");
// END OF NOTE.
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/Package__Version.cc b/MAC/APL/PAC/ITRFBeamServer/src/Package__Version.cc
deleted file mode 100644
index 10f16a9abac..00000000000
--- a/MAC/APL/PAC/ITRFBeamServer/src/Package__Version.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-//# Get revision info; generated by autoconf_share/makeversion
-
-//## pkg=ITRFBeamServer
-//## incpath=ITRFBeamServer
-//## incdir=src
-
-#include <ITRFBeamServer/Package__Version.h>
-#include <Common/Version.h>
-#include "FillPackage__VersionInc.h"
-
-namespace LOFAR {
- Version ITRFBeamServerVersion::getInfo()
- {
- return Version ("ITRFBeamServer",
- getVersion(), getConfVersion(),
- getRevision(), getPackageRevision(),
- getNrChangedFiles(),
- getBuildTime(), getBuildUser(), getBuildMachine());
- }
-
- std::string ITRFBeamServerVersion::getVersion()
- { return "Unknown"; }
- std::string ITRFBeamServerVersion::getConfVersion()
- { return "0.1"; }
- std::string ITRFBeamServerVersion::getRevision()
- { return "Unknown"; }
- std::string ITRFBeamServerVersion::getPackageRevision()
- { return "Unknown"; }
- std::string ITRFBeamServerVersion::getNrChangedFiles()
- { return "0"; }
-}
-
-//# fillversion.h is generated in build area by lofar_internal.m4
-//# It contains function fillInfo
-#include "FillPackage__VersionFunc.h"
--
GitLab