diff --git a/.gitattributes b/.gitattributes
index 27be6b2a9d6722cb6775eca1f172f2b1d93da365..51255694e0a8ec4eef8619af562514af815b59c4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -915,6 +915,27 @@ CEP/DP3/DPPP/test/tApplyCal_parmdbscript -text
CEP/DP3/DPPP/test/tNDPPP.in_MS.tgz -text svneol=unset#application/x-compressed-tar
CEP/DP3/DPPP/test/tScaleData.cc -text
CEP/DP3/DPPP/test/testdemixfilter -text
+CEP/DP3/PythonDPPP/CMakeLists.txt -text
+CEP/DP3/PythonDPPP/include/PythonDPPP/CMakeLists.txt -text
+CEP/DP3/PythonDPPP/include/PythonDPPP/DPStepBase.h -text
+CEP/DP3/PythonDPPP/include/PythonDPPP/PythonStep.h -text
+CEP/DP3/PythonDPPP/src/CMakeLists.txt -text
+CEP/DP3/PythonDPPP/src/DPStepBase.cc -text
+CEP/DP3/PythonDPPP/src/PythonDPPP.cc -text
+CEP/DP3/PythonDPPP/src/PythonStep.cc -text
+CEP/DP3/PythonDPPP/src/__init__.py -text
+CEP/DP3/PythonDPPP/test/CMakeLists.txt -text
+CEP/DP3/PythonDPPP/test/tPythonStep.py -text
+CEP/DP3/PythonDPPP/test/tPythonStep.run -text
+CEP/DP3/PythonDPPP/test/tPythonStep.sh -text
+CEP/DP3/TestDynDPPP/CMakeLists.txt -text
+CEP/DP3/TestDynDPPP/src/CMakeLists.txt -text
+CEP/DP3/TestDynDPPP/src/TestDynStep.cc -text
+CEP/DP3/TestDynDPPP/src/TestDynStep.h -text
+CEP/DP3/TestDynDPPP/test/CMakeLists.txt -text
+CEP/DP3/TestDynDPPP/test/tTestDynStep.cc -text
+CEP/DP3/TestDynDPPP/test/tTestDynStep.run -text
+CEP/DP3/TestDynDPPP/test/tTestDynStep.sh -text
CEP/GSM/bremen/Makefile -text
CEP/GSM/bremen/cleanup.py -text
CEP/GSM/bremen/doc/project.pdf -text
@@ -2196,6 +2217,7 @@ CMake/FindOpenCL.cmake -text
CMake/FindValgrind.cmake -text
CMake/LofarPackageList.cmake eol=lf
CMake/TODO -text
+CMake/get_casacore_deps.sh eol=lf
CMake/testscripts/assay -text
CMake/testscripts/checkfloat -text
CMake/testscripts/default.debug -text
@@ -3494,13 +3516,12 @@ MAC/Navigator2/panels/Processes/KeyValueLogger.pnl -text
MAC/Navigator2/panels/Processes/LogProcessor.pnl -text
MAC/Navigator2/panels/Processes/MACScheduler.pnl -text
MAC/Navigator2/panels/Processes/MainCU_Processes.pnl -text
-MAC/Navigator2/panels/Processes/ObservationAEmbedded.pnl -text
-MAC/Navigator2/panels/Processes/ObservationAdders.pnl -text
MAC/Navigator2/panels/Processes/ObservationControl.pnl -text
+MAC/Navigator2/panels/Processes/ObservationGPUProcEmbedded.pnl -text
+MAC/Navigator2/panels/Processes/ObservationGPUProcs.pnl -text
MAC/Navigator2/panels/Processes/ObservationIBEmbedded.pnl -text
MAC/Navigator2/panels/Processes/ObservationInputBuffers.pnl -text
-MAC/Navigator2/panels/Processes/ObservationWEmbedded.pnl -text
-MAC/Navigator2/panels/Processes/ObservationWriters.pnl -text
+MAC/Navigator2/panels/Processes/ObservationOutputProcs.pnl -text
MAC/Navigator2/panels/Processes/PVSSGateway.pnl -text
MAC/Navigator2/panels/Processes/PythonControl.pnl -text
MAC/Navigator2/panels/Processes/RSPDriver.pnl -text
@@ -3622,14 +3643,14 @@ MAC/Navigator2/panels/objects/Observations/observationFlow.pnl -text
MAC/Navigator2/panels/objects/Observations/observationProgressBar.pnl -text
MAC/Navigator2/panels/objects/Observations/observation_smallCEPView.pnl -text
MAC/Navigator2/panels/objects/Processes/CCUSWLevelView.pnl -text
+MAC/Navigator2/panels/objects/Processes/GPUProcDetail.pnl -text
+MAC/Navigator2/panels/objects/Processes/GPUProcSubbandInfo.pnl -text
MAC/Navigator2/panels/objects/Processes/MCUSWLevelView.pnl -text
MAC/Navigator2/panels/objects/Processes/ObsSW_CEP.pnl -text
MAC/Navigator2/panels/objects/Processes/ObsSW_Main.pnl -text
MAC/Navigator2/panels/objects/Processes/ObsSW_Station.pnl -text
MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl -text
-MAC/Navigator2/panels/objects/Processes/adder.pnl -text
-MAC/Navigator2/panels/objects/Processes/adderDetail.pnl -text
-MAC/Navigator2/panels/objects/Processes/adderView_small.pnl -text
+MAC/Navigator2/panels/objects/Processes/cobaltOutputProc.pnl -text
MAC/Navigator2/panels/objects/Processes/controller_small.pnl -text
MAC/Navigator2/panels/objects/Processes/controller_top.pnl -text
MAC/Navigator2/panels/objects/Processes/daemon_big.pnl -text
@@ -3646,8 +3667,6 @@ MAC/Navigator2/panels/objects/Processes/stationSWLevelView.pnl -text
MAC/Navigator2/panels/objects/Processes/stationStreamView_small.pnl -text
MAC/Navigator2/panels/objects/Processes/station_interactive_controller_small.pnl -text
MAC/Navigator2/panels/objects/Processes/streamView_small.pnl -text
-MAC/Navigator2/panels/objects/Processes/writerDetail.pnl -text
-MAC/Navigator2/panels/objects/Processes/writerDroppedl.pnl -text
MAC/Navigator2/panels/objects/Reports/SystemHD.pnl -text
MAC/Navigator2/panels/objects/Reports/SystemOverview.pnl -text
MAC/Navigator2/panels/objects/Reports/SystemRam.pnl -text
diff --git a/CEP/Calibration/BBSControl/scripts/parmdbplot.py b/CEP/Calibration/BBSControl/scripts/parmdbplot.py
index 396231bebc746702269a25bd841a8fc20d0a9c28..379bbaa75e6e23f71caaf46cc0998cf99b27a0b5 100755
--- a/CEP/Calibration/BBSControl/scripts/parmdbplot.py
+++ b/CEP/Calibration/BBSControl/scripts/parmdbplot.py
@@ -157,6 +157,8 @@ def normalize(phase):
# Convert to range [-2*pi, 2*pi].
out = numpy.fmod(phase, 2.0 * numpy.pi)
+ # Remove nans
+ numpy.putmask(out, out!=out, 0)
# Convert to range [-pi, pi]
out[out < -numpy.pi] += 2.0 * numpy.pi
out[out > numpy.pi] -= 2.0 * numpy.pi
@@ -776,6 +778,9 @@ class PlotWindow(QFrame):
if double:
+ # put nans to 0
+ [numpy.putmask(amp[i], amp[i]!=amp[i], 0) for i in xrange(len(amp))]
+ [numpy.putmask(phase[i], phase[i]!=phase[i], 0) for i in xrange(len(phase))]
if self.polar:
self.valminmax[0] = plot(self.fig, amp, x=xvalues, sub="211", labels=labels, show_legend=legend, xlabel=xlabel, ylabel="Amplitude",scatter=self.use_points)
self.valminmax[1] = plot(self.fig, phase, x=xvalues, clf=False, sub="212", stack=True, scatter=True, labels=labels, show_legend=legend, xlabel=xlabel, ylabel=phaselabel)
@@ -783,6 +788,8 @@ class PlotWindow(QFrame):
self.valminmax[0] = plot(self.fig, amp, x=xvalues, sub="211", labels=labels, show_legend=legend, xlabel=xlabel, ylabel="Real",scatter=self.use_points)
self.valminmax[1] = plot(self.fig, phase, x=xvalues, clf=False, sub="212", labels=labels, show_legend=legend, xlabel=xlabel, ylabel="Imaginary",scatter=self.use_points)
else:
+ # put nans to 0
+ [numpy.putmask(phase[i], phase[i]!=phase[i], 0) for i in xrange(len(phase))]
self.valminmax[0] = plot(self.fig, phase, x=xvalues, sub="111", stack=True, scatter=True, labels=labels, show_legend=legend, xlabel=xlabel, ylabel=phaselabel)
self.resize_plot()
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/BasicExpr.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/BasicExpr.h
index 4fe0abc8b8e6c49843a3c029f392caa0af6d6a9e..2f5779952c0f3e99b101b0ef0875e70fbde4c91e 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/BasicExpr.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/BasicExpr.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Cache.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Cache.h
index 92c63291d05f29b55efdfdcc7727cbcf85d2e287..bf0caaba43b24379f0948a6e884c52aa6f3a33fe 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Cache.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Cache.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ConditionNumber.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ConditionNumber.h
index d6c7353a4e1d2f09e8b55824b7dd3378633bf581..ecaf7ad879008f76eb8176ffe5575e69f5b77d93 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ConditionNumber.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ConditionNumber.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Element.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Element.h
index 2eb3690f57312fc62506aeb24cf0d7ac156536ec..29e123513cb3f32a1fdad6b7c12a52cdd9ae9efa 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Element.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Element.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprAdaptors.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprAdaptors.h
index a15cc4e5808fc8136e960a795172acd0db3b0840..5e1eb55823047dad02bc9cb67828d7bdeb1e02ec 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprAdaptors.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprAdaptors.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprId.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprId.h
index 910c853ac5b763fa49e607bd19c8126842a98ed2..232c1c162e6a8430f018ae8bef80acae07d104ae 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprId.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprId.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValue.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValue.h
index fd8187858eb0f5459f544e99047dee0a19beed39..d804a568c797736ea356c51ec9dee288535d4e50 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValue.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValue.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueIterator.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueIterator.h
index 435d88a017c8cecf428efb32628d65f7bd655f21..1d79e012f64e45535c8e0d23ec71e3a32494576d 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueIterator.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueIterator.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueView.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueView.h
index b752812de49be23f4802c086a571fe700ccb2264..4b87ffdeb185b8f3356635ebda601d14afd76733 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueView.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueView.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h
index 23e1e29b59a4a25ea3b06f7debef98922af83603..d7da107bd5717f4ea159366acf7efbc256dd1b3f 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagArray.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagArray.h
index bc2a1b433f4c37d2018f1f464f959b885e563b7c..6ce711d30340be52af078b8000b312d8dfbc83bc 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagArray.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagArray.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagIf.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagIf.h
index 45f27c48fe89c3382ae35f8e3a11611dfb80acb1..93670d5f19ccf2521d6bfbabbc7378ed0c17ea92 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagIf.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagIf.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Literal.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Literal.h
index 65d3f4163a3196d5288460d4f5857f2888f18183..e4244b1c79c0c21be224e538984634893a66743d 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Literal.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Literal.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul2.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul2.h
index f94f7d67fcbdaac0143f730fcae93e247858f359..304707b82282e3cecf65caab719e5089d2a7632d 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul2.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul2.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul3.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul3.h
index 1b7d7f8403fb98de07d17ef492a1e96f247f037f..da32f456e079bfeca43d204e48d501ec87c88ad4 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul3.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul3.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixSum.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixSum.h
index 25d5a028e76f3b25807bd473484000911c437f61..b1c32c9b6d8ea9e8f45f695a358fb7605ca78d30 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixSum.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixSum.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MergeFlags.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MergeFlags.h
index 6152a0c3e40462941c876b81e4217bf4bad156e5..03ee3c96c7b619ad3cd859c9562342d0b4358d50 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MergeFlags.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MergeFlags.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/RefCounting.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/RefCounting.h
index 06087a0143e6c24844b3534a8978dce8e3aa6810..e10179006a15ca7ee0d5dc326b77f42d47ae7fa9 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/RefCounting.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/RefCounting.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h
index f0cd66b32a9bf42a2b1d1b1e9704686a9ea7c903..b688ba9f87557f9e330bd946d3726d2a674cf921 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ScalarMatrixMul.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ScalarMatrixMul.h
index 8384af7f6d191b67930428414111b4d331618216..49339b0dcaa290d5207c2139d8eec069935be94e 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ScalarMatrixMul.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ScalarMatrixMul.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h
index 2e16593f5911460ebdeee3b56f94fa6cdb4befbc..87a57fcd194dbae8bd94881d8bbf684053ed90fc 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/ExprSet.h b/CEP/Calibration/BBSKernel/include/BBSKernel/ExprSet.h
index 035da2c4e63b780d81dfee5314996b762e26acb3..4b68d95a2806a104c9bc19a17eaf147dda29b90a 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/ExprSet.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/ExprSet.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Cache.cc b/CEP/Calibration/BBSKernel/src/Expr/Cache.cc
index 0afe323114637bcf023b666643e348ab630fc531..0a360c3d649c24043ce8a11b387b46778f0fca60 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Cache.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Cache.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ConditionNumber.cc b/CEP/Calibration/BBSKernel/src/Expr/ConditionNumber.cc
index 2a9c1ac1cb32525701ea5cbe3bebf5c58723cd3a..d0ac99c6e171cec9f1d97fc15e62b6dda1853655 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ConditionNumber.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ConditionNumber.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Element.cc b/CEP/Calibration/BBSKernel/src/Expr/Element.cc
index 68fbdffa2bd0b4fc4c0bad7dff20ee6a9e67fa91..942f6015d2bb52262b46ab4bd3bcf64414adad7e 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Element.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Element.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprAdaptors.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprAdaptors.cc
index e9cf8d47bbc459914ed66926968257e70272f3f6..b11c5f7e05b819a05c71c2d51240676db49680f1 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprAdaptors.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprAdaptors.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprValue.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprValue.cc
index e4991160a7622a15f56a916581a9e72b8233d901..8b3929e244d75b90e144799f152e138ff1e0f367 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprValue.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprValue.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprValueIterator.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprValueIterator.cc
index aef2c8d74a887e44374dd13aba6d492da35a0c31..9e93b6770b14ce11b507fb26d6acd3db165ee37b 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprValueIterator.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprValueIterator.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprValueView.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprValueView.cc
index d8d16449435903956b4f10fc33290e861d895596..dab6424991c8d919c67f5aee75503a66f2aa72ac 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprValueView.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprValueView.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprVisData.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprVisData.cc
index b2af6fd02f54dd2956ed459e27eb0dd287bc3ce2..61af1fc8defdede945e41b3904069e3f991ac806 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprVisData.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprVisData.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/FlagArray.cc b/CEP/Calibration/BBSKernel/src/Expr/FlagArray.cc
index 682b31f90369c43fedafc13986c3dabecc7e0721..5911a8df519c31de68e5f9ec195c985267abf6fb 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/FlagArray.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/FlagArray.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Literal.cc b/CEP/Calibration/BBSKernel/src/Expr/Literal.cc
index 349d25fe2784bcdfb33fe14399b5577966c8bbb9..4277844e9e4711d61cb3e1b4e88ee0fd4633d4ce 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Literal.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Literal.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/MatrixMul2.cc b/CEP/Calibration/BBSKernel/src/Expr/MatrixMul2.cc
index 80d570846fb828e970e7907dfc8b773ca88fa0d0..15969e6321c24834b4bacfc14302469e537654c7 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/MatrixMul2.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/MatrixMul2.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/MatrixMul3.cc b/CEP/Calibration/BBSKernel/src/Expr/MatrixMul3.cc
index 01205476e09046c6b20fda634b7dc63ca0e8a960..ab657e664f0dfe31a6455665f44da52e75a83eaa 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/MatrixMul3.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/MatrixMul3.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/MatrixSum.cc b/CEP/Calibration/BBSKernel/src/Expr/MatrixSum.cc
index 0b8a229058d0ff1378e465c7766b135ea3c67d2d..6fb22adc88000c1864347d5d77c0d394fb3c10de 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/MatrixSum.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/MatrixSum.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc b/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc
index a79e819e034c1a1177fe5e24ace4817079a3496a..c28f3f8b972f64503a9ada4e8e7e5916f0bd75c4 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ScalarMatrixMul.cc b/CEP/Calibration/BBSKernel/src/Expr/ScalarMatrixMul.cc
index 3fcb4c9267706d8ce879e68f3ce789a130cb5fbb..dd21233b0e82f4e205b2162b27edc3706e40572e 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ScalarMatrixMul.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ScalarMatrixMul.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc b/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc
index 1324eff88fa04ffd32b4d9d07a6e2375bf570f72..305edd1c4f4b0d2c0a5a88ac786610e2d765ca19 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/pyselfcal/src/class_selfcalparam.py b/CEP/Calibration/pyselfcal/src/class_selfcalparam.py
index 84e2b62997e132027480fd781806d53280988bae..5226cab3ef723e7f7dfbef5993679a5bd10b3dd3 100644
--- a/CEP/Calibration/pyselfcal/src/class_selfcalparam.py
+++ b/CEP/Calibration/pyselfcal/src/class_selfcalparam.py
@@ -20,9 +20,9 @@ import numpy as np
# Extra modules
########################################################################
-#from lofar.selfcal import class_obsPreprocessing
+from lofar.selfcal import class_obsPreprocessing
-import class_obsPreprocessing
+#import class_obsPreprocessing
########################################################################
## Define selfcalibration Parameters for cycles & prepare parsets
diff --git a/CEP/Calibration/pyselfcal/src/class_selfcalrun.py b/CEP/Calibration/pyselfcal/src/class_selfcalrun.py
index 4f1785977e12b40759b045fa5966e1aadb850c46..b77ea8ad1a4a5ced47e291f56142f55e1fbfcb20 100644
--- a/CEP/Calibration/pyselfcal/src/class_selfcalrun.py
+++ b/CEP/Calibration/pyselfcal/src/class_selfcalrun.py
@@ -610,7 +610,7 @@ class selfCalRun:
print ''
#extract the source model with pybdsm
- img = bdsm.process_image("""%sTemporary_Image_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sTemporary_Image_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature',psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
+ img = bdsm.process_image("""%sTemporary_Image_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sTemporary_Image_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature')#,psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
#write bbs catalog
img.write_catalog(outfile="""%sTemporary_Skymodel_Iter%s"""%(self.SkymodelPath,self.i+1),catalog_type='gaul',format='bbs',correct_proj='True')
@@ -635,7 +635,7 @@ class selfCalRun:
#extract the source model with pybdsm
- img = bdsm.process_image("""%sTemporary_Final_Image_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sTemporary_Final_Image_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature',psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
+ img = bdsm.process_image("""%sTemporary_Final_Image_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sTemporary_Final_Image_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature')#,psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
#write bbs catalog
img.write_catalog(outfile="""%sTemporary_Final_Skymodel_Iter%s"""%(self.SkymodelPath,self.i+1),catalog_type='gaul',format='bbs',correct_proj='True')
@@ -663,7 +663,7 @@ class selfCalRun:
print ''
#extract the source model with pybdsm
- img = bdsm.process_image("""%sImage_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sImage_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature',psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
+ img = bdsm.process_image("""%sImage_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sImage_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature')#,psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
#write bbs catalog
img.write_catalog(outfile="""%sSkymodel_Iter%s"""%(self.SkymodelPath,self.i+1),catalog_type='gaul',format='bbs',correct_proj='True')
@@ -686,7 +686,7 @@ class selfCalRun:
#extract the source model with pybdsm
- img = bdsm.process_image("""%sFinal_Image_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sFinal_Image_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature',psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
+ img = bdsm.process_image("""%sFinal_Image_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sFinal_Image_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature')#,psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
#write bbs catalog
img.write_catalog(outfile="""%sFinal_Skymodel_Iter%s"""%(self.SkymodelPath,self.i+1),catalog_type='gaul',format='bbs',correct_proj='True')
@@ -713,7 +713,7 @@ class selfCalRun:
print ''
#extract the source model with pybdsm
- img = bdsm.process_image("""%sImage_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sImage_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature',psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
+ img = bdsm.process_image("""%sImage_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sImage_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature')#,psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
#write bbs catalog
img.write_catalog(outfile="""%sSkymodel_Iter%s"""%(self.SkymodelPath,self.i+1),catalog_type='gaul',format='bbs',correct_proj='True')
@@ -736,7 +736,7 @@ class selfCalRun:
#extract the source model with pybdsm
- img = bdsm.process_image("""%sFinal_Image_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sFinal_Image_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature',psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
+ img = bdsm.process_image("""%sFinal_Image_%sarcsec_Iter%s.restored.corr"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),adaptive_rms_box='True',advanced_opts='True',detection_image="""%sFinal_Image_%sarcsec_Iter%s.restored"""%(self.ImagePathDir,self.pixsize[self.i-1],self.i),thresh_isl='%s'%(self.thresh_isl),thresh_pix='%s'%(self.thresh_pix),rms_box=(self.RMS_BOX[0],self.RMS_BOX[1]),rms_box_bright=(self.RMS_BOX_Bright[0],self.RMS_BOX_Bright[1]),adaptive_thresh=30,blank_limit=1E-4,atrous_do='True',ini_method='curvature')#,psf_vary_do='True',psf_stype_only='False',psf_snrcut=5,psf_snrcutstack=5,psf_snrtop=0.3)
#write bbs catalog
img.write_catalog(outfile="""%sFinal_Skymodel_Iter%s"""%(self.SkymodelPath,self.i+1),catalog_type='gaul',format='bbs',correct_proj='True')
diff --git a/CEP/Calibration/pyselfcal/src/mergeSB.py b/CEP/Calibration/pyselfcal/src/mergeSB.py
index 216f9bbc61f8a3c3ef3f94f385f3640de004cc5f..554f12cdcccd71d712a151196a04fd9761ae3eca 100755
--- a/CEP/Calibration/pyselfcal/src/mergeSB.py
+++ b/CEP/Calibration/pyselfcal/src/mergeSB.py
@@ -20,7 +20,9 @@ import numpy as np
########################################################################
from lofar.selfcal import class_obspar
from lofar.selfcal import class_mergesubbands
-
+
+#import class_obspar
+#import class_mergesubbands
########################################################################
# OVERVIEW
diff --git a/CEP/DP3/CMakeLists.txt b/CEP/DP3/CMakeLists.txt
index a20725f591953a708c8d50ab8dd3ae4fae0d3024..845e6009f0ebba30c08dc7afe321e9e27968aa51 100644
--- a/CEP/DP3/CMakeLists.txt
+++ b/CEP/DP3/CMakeLists.txt
@@ -1,5 +1,7 @@
# $Id$
lofar_add_package(DPPP)
+lofar_add_package(TestDynDPPP)
+lofar_add_package(PythonDPPP)
lofar_add_package(AOFlagger)
lofar_add_package(SPW_Combine SPWCombine)
diff --git a/CEP/DP3/DPPP/include/DPPP/ApplyCal.h b/CEP/DP3/DPPP/include/DPPP/ApplyCal.h
index 3107ed1de37e7e593b52591ef3ab52c42995f505..11aed062327344744301aca9cf31af615aebf4ba 100644
--- a/CEP/DP3/DPPP/include/DPPP/ApplyCal.h
+++ b/CEP/DP3/DPPP/include/DPPP/ApplyCal.h
@@ -87,6 +87,7 @@ namespace LOFAR {
//# Data members.
DPInput* itsInput;
+ DPBuffer itsBuffer;
string itsName;
string itsParmDBName;
boost::shared_ptr<BBS::ParmFacade> itsParmDB;
diff --git a/CEP/DP3/DPPP/include/DPPP/Averager.h b/CEP/DP3/DPPP/include/DPPP/Averager.h
index f137ef49baebfe023b63d3ae0a0a511b57dceb2f..c9bdec28fd0d540e72d19cac42958e2645d7fe27 100644
--- a/CEP/DP3/DPPP/include/DPPP/Averager.h
+++ b/CEP/DP3/DPPP/include/DPPP/Averager.h
@@ -81,8 +81,8 @@ namespace LOFAR {
virtual void showTimings (std::ostream&, double duration) const;
private:
- // Average and return the result.
- DPBuffer average() const;
+ // Average into itsBufOut.
+ void average();
// Copy the fullRes flags in the input buffer to the correct
// time index in the output buffer.
@@ -95,9 +95,12 @@ namespace LOFAR {
DPInput* itsInput;
string itsName;
DPBuffer itsBuf;
+ DPBuffer itsBufTmp;
+ DPBuffer itsBufOut;
casa::Cube<int> itsNPoints;
casa::Cube<casa::Complex> itsAvgAll;
casa::Cube<float> itsWeightAll;
+ casa::Cube<bool> itsFullResFlags;
uint itsNChanAvg;
uint itsNTimeAvg;
uint itsMinNPoint;
diff --git a/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt b/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt
index 459cc1514dc5dcb51a9ff2d6af338db41e45d5f3..ba1ff9ddc29b2933a9760b2b6283ec8f34b89ed9 100644
--- a/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt
+++ b/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt
@@ -13,6 +13,7 @@ set(inst_HEADERS
Apply.h EstimateMixed.h Simulate.h Simulator.h SubtractMixed.h Baseline.h
ModelComponent.h PointSource.h GaussianSource.h Patch.h
ModelComponentVisitor.h
+ DemixerNew.h DemixInfo.h DemixWorker.h
GainCal.h)
# Create symbolic link to include directory.
diff --git a/CEP/DP3/DPPP/include/DPPP/DPBuffer.h b/CEP/DP3/DPPP/include/DPPP/DPBuffer.h
index 0da6d129cfcfe787a694866d59080beffca812ed..1a2df9fe617a601a3ec876e4deaf236ca9c742db 100644
--- a/CEP/DP3/DPPP/include/DPPP/DPBuffer.h
+++ b/CEP/DP3/DPPP/include/DPPP/DPBuffer.h
@@ -67,11 +67,6 @@ namespace LOFAR {
// correlations are there is because the MS expects them.</td>
// </tr>
// <tr>
- // <td>AMPLITUDE</td>
- // <td>The amplitudes of the visibility data. It is used by the
- // MedFlagger to avoid having to recalculate amplitudes.</td>
- // </tr>
- // <tr>
// <td>WEIGHT</td>
// <td>The data weights as [ncorr,nchan,nbaseline].
// Similarly to FLAG the ncorr axis is redundant because the
@@ -93,13 +88,33 @@ namespace LOFAR {
// </td>
// </tr>
// </table>
- // The DATA and FLAG data members should always filled in, so each DPStep
- // should do that. Other data members do not need to be filled.
+ // The FLAG data member should always be filled in, so the first DPStep
+ // (MSReader) will do that. The DATA data member is filled in if any
+ // DPStep needs DATA. Other data members are filled on demand.
// The DPInput::fetch functions should be used to get data for those
- // members. They take care that the buffer's data is used if available,
- // otherwise they get it from the DPInput object.
+ // members. They take care that the input buffer's data are used if
+ // available, otherwise they get it from the DPInput object.
// In that way as little memory as needed is used. Note that e.g. the
- // MedFlagger can use a lot of memory if a large time window is used.
+ // AOFlagger can use a lot of memory if a large time window is used.
+ //
+ // Until early 2015 NDPPP used the strategy of shallow data copies.
+ // I.e., a step increased the data reference counter and did not make
+ // an actual copy. Only when data were changed, a new data array was made.
+ // Thus MSReader allocated a new array when it read the data.
+ // However, it appeared this strategy lead to memory fragmentation and
+ // to sudden jumps in memory usage on Linux systems.
+ // <br>Therefore the strategy was changed to having each step preallocate
+ // its buffers and making deep copies when moving data from one step to
+ // the next one. It appeared that it not only improved memory usage,
+ // but also improved performance, possible due to far less mallocs.
+ //
+ // The buffer/step guidelines are as follows:
+ // 1. If a step keeps a buffer for later processing (e.g. AORFlagger),
+ // it must make a copy of the buffer because the input data arrays
+ // might have changed before that step processes the data.
+ // 2. A shallow copy of a data member can be used if a step processes
+ // the data immediately (e.g. Averager).
+ // The DPInput::fetch functions come in those 2 flavours.
class DPBuffer
{
@@ -113,8 +128,11 @@ namespace LOFAR {
// Assignment uses reference copies.
DPBuffer& operator= (const DPBuffer&);
- // Remove all arrays from the buffer.
- void clear();
+ // Make a deep copy of all arrays in that to this.
+ void copy (const DPBuffer& that);
+
+ // Reference only the arrays that are filled in that.
+ void referenceFilled (const DPBuffer& that);
// Set or get the visibility data per corr,chan,baseline.
void setData (const casa::Cube<casa::Complex>& data)
@@ -132,16 +150,6 @@ namespace LOFAR {
casa::Cube<bool>& getFlags()
{ return itsFlags; }
- // Set or get the amplitudes of the visibility data.
- // This is used by the MedFlagger to avoid calculating amplitudes
- // over and over again.
- void setAmplitudes (const casa::Cube<float>& ampl)
- { itsAmpl.reference (ampl); }
- const casa::Cube<float>& getAmplitudes() const
- { return itsAmpl; }
- casa::Cube<float>& getAmplitudes()
- { return itsAmpl; }
-
// Set or get the weights per corr,chan,baseline.
void setWeights (const casa::Cube<float>& weights)
{ itsWeights.reference (weights); }
@@ -150,14 +158,6 @@ namespace LOFAR {
casa::Cube<float>& getWeights()
{ return itsWeights; }
- // Set or get model visibility data per corr,chan,baseline.
- void setModel(const casa::Cube<casa::Complex>& data)
- { itsModel.reference (data); }
- const casa::Cube<casa::Complex>& getModel() const
- { return itsModel; }
- casa::Cube<casa::Complex>& getModel()
- { return itsModel; }
-
// Set or get the flags at the full resolution per chan,timeavg,baseline.
void setFullResFlags (const casa::Cube<bool>& flags)
{ itsFullResFlags.reference (flags); }
@@ -203,11 +203,9 @@ namespace LOFAR {
double itsExposure;
casa::Vector<uint> itsRowNrs;
casa::Cube<casa::Complex> itsData; //# ncorr,nchan,nbasel
- casa::Cube<float> itsAmpl; //# amplitude of data
casa::Cube<bool> itsFlags; //# ncorr,nchan,nbasel
casa::Matrix<double> itsUVW; //# 3,nbasel
casa::Cube<float> itsWeights; //# ncorr,nchan,nbasel
- casa::Cube<casa::Complex> itsModel; //# ncorr,nchan,nbasel
casa::Cube<bool> itsFullResFlags; //# fullres_nchan,ntimeavg,nbl
};
diff --git a/CEP/DP3/DPPP/include/DPPP/DPInfo.h b/CEP/DP3/DPPP/include/DPPP/DPInfo.h
index 9ae70f47304d66cba370c712625f5fdf8d811667..74ea75d57e06d086a5981d0f1af48896157134f8 100644
--- a/CEP/DP3/DPPP/include/DPPP/DPInfo.h
+++ b/CEP/DP3/DPPP/include/DPPP/DPInfo.h
@@ -194,9 +194,6 @@ namespace LOFAR {
// Are the visibility data needed?
bool needVisData() const
{ return itsNeedVisData; }
- // Are the model data needed?
- bool needModelData() const
- { return itsNeedModelData; }
// Does the last step need to write data and/or flags?
int needWrite() const
{ return itsNeedWrite; }
@@ -204,9 +201,6 @@ namespace LOFAR {
// Set if visibility data needs to be read.
void setNeedVisData()
{ itsNeedVisData = true; }
- // Set if model data needs to be read.
- void setNeedModelData()
- { itsNeedModelData = true; }
// Set if the last step needs to write data and/or flags (default both).
void setNeedWrite (int needWrite = NeedWriteData+NeedWriteFlags)
{ itsNeedWrite |= needWrite; }
@@ -218,6 +212,14 @@ namespace LOFAR {
// Get the lengths of the baselines (in meters).
const vector<double>& getBaselineLengths() const;
+ // Convert to a Record.
+ // The names of the fields in the record are the data names without 'its'.
+ casa::Record toRecord() const;
+
+ // Update the DPInfo object from a Record.
+ // It is possible that only a few fields are defined in the record.
+ void fromRecord (const casa::Record& rec);
+
private:
// Set which antennae are actually used.
void setAntUsed();
@@ -227,7 +229,6 @@ namespace LOFAR {
//# Data members.
bool itsNeedVisData; //# Are the visibility data needed?
- bool itsNeedModelData; //# Is the model column needed?
int itsNeedWrite; //# Does the last step need to write data/flags?
string itsMSName;
string itsAntennaSet;
diff --git a/CEP/DP3/DPPP/include/DPPP/DPInput.h b/CEP/DP3/DPPP/include/DPPP/DPInput.h
index 373ade5e87e8dd8748eaa723d7a96d65f53f5f0d..9cfd2deea7d9b0f82622c084ce3fefd2039c44ca 100644
--- a/CEP/DP3/DPPP/include/DPPP/DPInput.h
+++ b/CEP/DP3/DPPP/include/DPPP/DPInput.h
@@ -65,18 +65,28 @@ namespace LOFAR {
public:
virtual ~DPInput();
- // Read the UVW at the given row numbers.
+ // Read the UVW at the given row numbers into the buffer.
// The default implementation throws an exception.
- virtual casa::Matrix<double> getUVW (const casa::RefRows& rowNrs);
+ virtual void getUVW (const casa::RefRows& rowNrs,
+ double time,
+ DPBuffer&);
- // Read the weights at the given row numbers.
+ // Read the weights at the given row numbers into the buffer.
// The default implementation throws an exception.
- virtual casa::Cube<float> getWeights (const casa::RefRows& rowNrs,
- const DPBuffer&);
+ virtual void getWeights (const casa::RefRows& rowNrs,
+ DPBuffer&);
- // Read the fullRes flags (LOFAR_FULL_RES_FLAG) at the given row numbers.
+ // Read the fullRes flags (LOFAR_FULL_RES_FLAG) at the given row numbers
+ // into the buffer.
+ // If undefined, false is returned.
// The default implementation throws an exception.
- virtual casa::Cube<bool> getFullResFlags (const casa::RefRows& rowNrs);
+ virtual bool getFullResFlags (const casa::RefRows& rowNrs,
+ DPBuffer&);
+
+ // Read the model data at the given row numbers into the array.
+ // The default implementation throws an exception.
+ virtual void getModelData (const casa::RefRows& rowNrs,
+ casa::Cube<casa::Complex>&);
// Get the MS name.
// The default implementation returns an empty string.
@@ -93,30 +103,32 @@ namespace LOFAR {
// Otherwise there are read from the input.
// If not defined in the input, they are filled using the flags in the
// buffer assuming that no averaging has been done so far.
- // If defined, they can be merged with the buffer's flags which means
+ // <src>If desired, they can be merged with the buffer's FLAG which means
// that if an averaged channel is flagged, the corresponding FullRes
// flags are set.
// <br>It does a stop/start of the timer when actually reading the data.
- casa::Cube<bool> fetchFullResFlags (const DPBuffer& buf,
- const casa::RefRows& rowNrs,
- NSTimer& timer,
- bool merge=false);
+ const casa::Cube<bool>& fetchFullResFlags (const DPBuffer& bufin,
+ DPBuffer& bufout,
+ NSTimer& timer,
+ bool merge=false);
// Fetch the weights.
// If defined in the buffer, they are taken from there.
// Otherwise there are read from the input.
+ // If they have to be read and if autoweighting is in effect, the buffer
+ // must contain DATA to calculate the weights.
// <br>It does a stop/start of the timer when actually reading the data.
- casa::Cube<float> fetchWeights (const DPBuffer& buf,
- const casa::RefRows& rowNrs,
- NSTimer& timer);
+ const casa::Cube<float>& fetchWeights (const DPBuffer& bufin,
+ DPBuffer& bufout,
+ NSTimer& timer);
// Fetch the UVW.
// If defined in the buffer, they are taken from there.
// Otherwise there are read from the input.
// <br>It does a stop/start of the timer when actually reading the data.
- casa::Matrix<double> fetchUVW (const DPBuffer& buf,
- const casa::RefRows& rowNrs,
- NSTimer& timer);
+ const casa::Matrix<double>& fetchUVW (const DPBuffer& bufin,
+ DPBuffer& bufout,
+ NSTimer& timer);
};
} //# end namespace
diff --git a/CEP/DP3/DPPP/include/DPPP/DPRun.h b/CEP/DP3/DPPP/include/DPPP/DPRun.h
index bfdb60ed08735ac2f7c5f00dd6ef1dbf1c0dd072..89aa3170dc58edc0bef4cf4452f289b649974a41 100644
--- a/CEP/DP3/DPPP/include/DPPP/DPRun.h
+++ b/CEP/DP3/DPPP/include/DPPP/DPRun.h
@@ -31,6 +31,8 @@
#include <DPPP/DPStep.h>
#include <Common/ParameterSet.h>
+#include <map>
+
namespace LOFAR {
namespace DPPP {
@@ -43,6 +45,19 @@ namespace LOFAR {
class DPRun
{
public:
+ // Define the function to create a step from the given parameterset.
+ typedef DPStep::ShPtr StepCtor (DPInput*, const ParameterSet&,
+ const std::string& prefix);
+
+ // Add a function creating a DPStep to the map.
+ static void registerStepCtor (const std::string&, StepCtor*);
+
+ // Create a step object from the given parameters.
+ // It looks up the step type in theirStepMap. If not found, it will
+ // try to load a shared library with that name and execute the
+ // register function in it.
+ static StepCtor* findStepCtor (const std::string& type);
+
// Execute the steps defined in the parset file.
// Possible parameters given at the command line are taken into account.
static void execute (const std::string& parsetName,
@@ -53,6 +68,9 @@ namespace LOFAR {
// It fills DPInfo object and the name of the MS being written.
static DPStep::ShPtr makeSteps (const ParameterSet& parset,
std::string& msName);
+
+ // The map to create a step object from its type name.
+ static std::map<std::string, StepCtor*> theirStepMap;
};
} //# end namespace
diff --git a/CEP/DP3/DPPP/include/DPPP/DPStep.h b/CEP/DP3/DPPP/include/DPPP/DPStep.h
index 4075cecfc1588f65bbbe2d6a77f4c2964b8cbcbe..6227b273daff557472c570273445b59efab86d66 100644
--- a/CEP/DP3/DPPP/include/DPPP/DPStep.h
+++ b/CEP/DP3/DPPP/include/DPPP/DPStep.h
@@ -67,6 +67,7 @@ namespace LOFAR {
// Define the shared pointer for this type.
typedef shared_ptr<DPStep> ShPtr;
+ // Destructor.
virtual ~DPStep();
// Process the data.
@@ -182,7 +183,7 @@ namespace LOFAR {
// Clear the buffer.
void clear()
- { itsBuffer.clear(); }
+ { itsBuffer = DPBuffer(); }
private:
DPBuffer itsBuffer;
@@ -201,7 +202,7 @@ namespace LOFAR {
{
public:
// Create the object. By default it sets its next step to the NullStep.
- MultiResultStep (uint reserveSize);
+ MultiResultStep (uint size);
virtual ~MultiResultStep();
@@ -221,12 +222,17 @@ namespace LOFAR {
vector<DPBuffer>& get()
{ return itsBuffers; }
+ // Get the size of the result.
+ size_t size() const
+ { return itsSize; }
+
// Clear the buffers.
void clear()
- { itsBuffers.clear(); }
+ { itsSize = 0; }
private:
vector<DPBuffer> itsBuffers;
+ size_t itsSize;
};
} //# end namespace
diff --git a/CEP/DP3/DPPP/include/DPPP/Demixer.h b/CEP/DP3/DPPP/include/DPPP/Demixer.h
index c45234304f1ab643404cd6e04aab1ebf57588ca4..e432b4ab016e1024645f44e506b7de93ab29d96a 100644
--- a/CEP/DP3/DPPP/include/DPPP/Demixer.h
+++ b/CEP/DP3/DPPP/include/DPPP/Demixer.h
@@ -124,6 +124,7 @@ namespace LOFAR {
//# Data members.
DPInput* itsInput;
string itsName;
+ DPBuffer itsBufTmp;
string itsSkyName;
string itsInstrumentName;
double itsDefaultGain;
@@ -198,6 +199,7 @@ namespace LOFAR {
vector<double> itsPrevSolution;
uint itsTimeIndex;
uint itsNConverged;
+ FlagCounter itsFlagCounter;
//# Timers.
NSTimer itsTimer;
diff --git a/CEP/DP3/DPPP/include/DPPP/Filter.h b/CEP/DP3/DPPP/include/DPPP/Filter.h
index b07da6625c5fa2afc6794ef547a63d2e8ab87f35..cfbd46b49b0e85abe1b225ec0f7acd97a1848ff0 100644
--- a/CEP/DP3/DPPP/include/DPPP/Filter.h
+++ b/CEP/DP3/DPPP/include/DPPP/Filter.h
@@ -189,6 +189,7 @@ namespace LOFAR {
DPInput* itsInput;
string itsName;
DPBuffer itsBuf;
+ DPBuffer itsBufTmp;
casa::String itsStartChanStr; //# startchan expression
casa::String itsNrChanStr; //# nchan expression
bool itsRemoveAnt; //# Remove from ANTENNA table?
diff --git a/CEP/DP3/DPPP/include/DPPP/GainCal.h b/CEP/DP3/DPPP/include/DPPP/GainCal.h
index 42cd304915c41f866acf25fb46dd3620c60260cb..7a6d1fd57872530165f6ee5f20df941650e45011 100644
--- a/CEP/DP3/DPPP/include/DPPP/GainCal.h
+++ b/CEP/DP3/DPPP/include/DPPP/GainCal.h
@@ -174,6 +174,8 @@ namespace {
//# Data members.
DPInput* itsInput;
string itsName;
+ DPBuffer itsBuf;
+ casa::Cube<casa::Complex> itsModelData;
string itsSourceDBName;
bool itsUseModelColumn;
string itsParmDBName;
diff --git a/CEP/DP3/DPPP/include/DPPP/MSReader.h b/CEP/DP3/DPPP/include/DPPP/MSReader.h
index fe3b457bf69a3b603bc6159766fb366b6ff5cc27..63c75e9ca03eb2d692a3d218eff33084d3725964 100644
--- a/CEP/DP3/DPPP/include/DPPP/MSReader.h
+++ b/CEP/DP3/DPPP/include/DPPP/MSReader.h
@@ -161,21 +161,26 @@ namespace LOFAR {
// Show the timings.
virtual void showTimings (std::ostream&, double duration) const;
- // Read the UVW at the given row numbers.
- virtual casa::Matrix<double> getUVW (const casa::RefRows& rowNrs);
-
- // Read the weights at the given row numbers.
- virtual casa::Cube<float> getWeights (const casa::RefRows& rowNrs,
- const DPBuffer& buf);
-
- // Read the FullRes flags (LOFAR_FULL_RES_FLAG) at the given row numbers.
- // It returns a 3-dim array [norigchan, ntimeavg, nbaseline].
- // If undefined, an empty array is returned.
- virtual casa::Cube<bool> getFullResFlags (const casa::RefRows& rowNrs);
-
- // Read the given data column at the given row numbers.
- /// virtual casa::Cube<casa::Complex> getData (const casa::String& columnName,
- /// const casa::RefRows& rowNrs);
+ // Read the UVW at the given row numbers into the buffer.
+ virtual void getUVW (const casa::RefRows& rowNrs,
+ double time,
+ DPBuffer&);
+
+ // Read the weights at the given row numbers into the buffer.
+ // Note: the buffer must contain DATA if autoweighting is in effect.
+ virtual void getWeights (const casa::RefRows& rowNrs,
+ DPBuffer&);
+
+ // Read the fullRes flags (LOFAR_FULL_RES_FLAG) at the given row numbers
+ // into the buffer.
+ // If there is no such column, the flags are set to false and false is
+ // returned.
+ virtual bool getFullResFlags (const casa::RefRows& rowNrs,
+ DPBuffer&);
+
+ // Read the model data at the given row numbers into the array.
+ virtual void getModelData (const casa::RefRows& rowNrs,
+ casa::Cube<casa::Complex>&);
// Fill the vector with station beam info from the input MS.
// Only fill it for the given station names.
@@ -185,9 +190,6 @@ namespace LOFAR {
// Tell if the visibility data are to be read.
virtual void setReadVisData (bool readVisData);
- // Tell if the visibility data are to be read.
- virtual void setReadModelData (bool readModelData);
-
// Get the main MS table.
casa::Table& table()
{ return itsMS; }
@@ -269,7 +271,7 @@ namespace LOFAR {
void skipFirstTimes();
// Calculate the UVWs for a missing time slot.
- void calcUVW();
+ void calcUVW (double time, DPBuffer&);
// Calculate the weights from the autocorrelations.
void autoWeight (casa::Cube<float>& weights, const DPBuffer& buf);
@@ -287,7 +289,6 @@ namespace LOFAR {
casa::String itsNrChanStr; //# nchan expression
string itsSelBL; //# Baseline selection string
bool itsReadVisData; //# read visibility data?
- bool itsReadModelData; //# read model data?
bool itsNeedSort; //# sort needed on time,baseline?
bool itsAutoWeight; //# calculate weights from autocorr?
bool itsAutoWeightForce; //# always calculate weights?
@@ -300,6 +301,7 @@ namespace LOFAR {
uint itsNrCorr;
uint itsNrChan;
uint itsStartChan;
+ double itsTimeTolerance; //# tolerance for time comparison
double itsTimeInterval;
double itsStartTime;
double itsFirstTime;
diff --git a/CEP/DP3/DPPP/include/DPPP/MSUpdater.h b/CEP/DP3/DPPP/include/DPPP/MSUpdater.h
index 3aebf006a7d418204f4c473267c69eb79915f2b0..c01b231aa9ddb62dbc37d9be5fc8a17d6be4681b 100644
--- a/CEP/DP3/DPPP/include/DPPP/MSUpdater.h
+++ b/CEP/DP3/DPPP/include/DPPP/MSUpdater.h
@@ -101,6 +101,7 @@ namespace LOFAR {
//# Data members
MSReader* itsReader;
+ DPBuffer itsBuffer;
casa::String itsDataColName;
casa::String itsWeightColName;
uint itsNrTimesFlush; //# flush every N time slots (0=no flush)
diff --git a/CEP/DP3/DPPP/include/DPPP/MSWriter.h b/CEP/DP3/DPPP/include/DPPP/MSWriter.h
index fcdee474d8983fc18bdf44be331cd8a4fb76d5ef..8966dcaad7452f065f0d79586f902cfc5d44e633 100644
--- a/CEP/DP3/DPPP/include/DPPP/MSWriter.h
+++ b/CEP/DP3/DPPP/include/DPPP/MSWriter.h
@@ -158,6 +158,7 @@ namespace LOFAR {
//# Data items.
MSReader* itsReader;
+ DPBuffer itsBuffer;
casa::Table itsMS;
casa::String itsDataColName;
casa::String itsWeightColName;
diff --git a/CEP/DP3/DPPP/include/DPPP/MedFlagger.h b/CEP/DP3/DPPP/include/DPPP/MedFlagger.h
index 3410d28bab401f92f322098fab2efcde1891dc9c..479ebcd204b1ccfac59fb4f7313603af52a76f14 100644
--- a/CEP/DP3/DPPP/include/DPPP/MedFlagger.h
+++ b/CEP/DP3/DPPP/include/DPPP/MedFlagger.h
@@ -141,6 +141,7 @@ namespace LOFAR {
double itsMaxBLength; //# maximum baseline length
vector<double> itsBLength; //# length of each baseline
vector<DPBuffer> itsBuf;
+ vector<casa::Cube<float> > itsAmpl; //# amplitudes of the data
FlagCounter itsFlagCounter;
NSTimer itsTimer;
NSTimer itsComputeTimer; //# move/median timer
diff --git a/CEP/DP3/DPPP/include/DPPP/MultiMSReader.h b/CEP/DP3/DPPP/include/DPPP/MultiMSReader.h
index 6a9c2255fee485420725afca95a178414b254dc5..647c7aaa64e97e6d611ddcea3b3e787e7ba2c52b 100644
--- a/CEP/DP3/DPPP/include/DPPP/MultiMSReader.h
+++ b/CEP/DP3/DPPP/include/DPPP/MultiMSReader.h
@@ -155,29 +155,24 @@ namespace LOFAR {
virtual void showTimings (std::ostream&, double duration) const;
// Read the UVW at the given row numbers.
- virtual casa::Matrix<double> getUVW (const casa::RefRows& rowNrs);
+ virtual void getUVW (const casa::RefRows& rowNrs,
+ double time,
+ DPBuffer& buf);
// Read the weights at the given row numbers.
- virtual casa::Cube<float> getWeights (const casa::RefRows& rowNrs,
- const DPBuffer& buf);
+ virtual void getWeights (const casa::RefRows& rowNrs,
+ DPBuffer& buf);
// Read the FullRes flags (LOFAR_FULL_RES_FLAG) at the given row numbers.
// It returns a 3-dim array [norigchan, ntimeavg, nbaseline].
- // If undefined, an empty array is returned.
- virtual casa::Cube<bool> getFullResFlags (const casa::RefRows& rowNrs);
-
- // Read the given data column at the given row numbers.
- /// virtual casa::Cube<casa::Complex> getData (const casa::String& columnName,
- /// const casa::RefRows& rowNrs);
+ // If undefined, false is returned.
+ virtual bool getFullResFlags (const casa::RefRows& rowNrs,
+ DPBuffer& buf);
// Tell if the visibility data are to be read.
virtual void setReadVisData (bool readVisData);
private:
- // Combine all cubes in the vector to a single one.
- void combineFullResFlags (const vector<casa::Cube<bool> >& vec,
- casa::Cube<bool>& flags) const;
-
// Handle the info for all bands.
void handleBands();
@@ -194,8 +189,8 @@ namespace LOFAR {
vector<string> itsMSNames;
vector<MSReader*> itsReaders; //# same as itsSteps
vector<DPStep::ShPtr> itsSteps; //# used for automatic destruction
+ vector<DPBuffer> itsBuffers;
uint itsFillNChan; //# nr of chans for missing MSs
- casa::Cube<bool> itsFullResCube; //# FullResFlags for missing MSs
FlagCounter itsFlagCounter;
};
diff --git a/CEP/DP3/DPPP/include/DPPP/PhaseShift.h b/CEP/DP3/DPPP/include/DPPP/PhaseShift.h
index 4018a9b06b5e5671e933495b2c5564697661f5a5..ec98944d4ccb3d2b7161ee9fbdb54acfc26ef8da 100644
--- a/CEP/DP3/DPPP/include/DPPP/PhaseShift.h
+++ b/CEP/DP3/DPPP/include/DPPP/PhaseShift.h
@@ -99,6 +99,7 @@ namespace LOFAR {
//# Data members.
DPInput* itsInput;
string itsName;
+ DPBuffer itsBuf;
vector<string> itsCenter;
vector<double> itsFreqC; //# freq/C
casa::Matrix<double> itsMat1; //# TT in phasehift.py
diff --git a/CEP/DP3/DPPP/include/DPPP/PreFlagger.h b/CEP/DP3/DPPP/include/DPPP/PreFlagger.h
index b335bc8c0714a354f5fa8f16d2c0e004dc21f7ee..57f1cac32b2b3d34523299069cf673c30d0305d3 100644
--- a/CEP/DP3/DPPP/include/DPPP/PreFlagger.h
+++ b/CEP/DP3/DPPP/include/DPPP/PreFlagger.h
@@ -127,7 +127,7 @@ namespace LOFAR {
PSet (DPInput*, const ParameterSet& parset, const string& prefix);
// Set and return the flags.
- casa::Cube<bool>* process (DPBuffer&, uint timeSlot,
+ casa::Cube<bool>* process (const DPBuffer&, DPBuffer&, uint timeSlot,
const casa::Block<bool>& matchBL,
NSTimer& timer);
@@ -282,6 +282,7 @@ namespace LOFAR {
//# Data members of PreFlagger.
string itsName;
DPInput* itsInput;
+ DPBuffer itsBuffer;
Mode itsMode;
NSTimer itsTimer;
PSet itsPSet;
diff --git a/CEP/DP3/DPPP/include/DPPP/StationAdder.h b/CEP/DP3/DPPP/include/DPPP/StationAdder.h
index ea3e409dee78db58f821ad4f8096e09e1896897f..76da17c464a0b93b0dfacceced0159b0a8de457c 100644
--- a/CEP/DP3/DPPP/include/DPPP/StationAdder.h
+++ b/CEP/DP3/DPPP/include/DPPP/StationAdder.h
@@ -105,6 +105,7 @@ namespace LOFAR {
DPInput* itsInput;
string itsName;
DPBuffer itsBuf;
+ DPBuffer itsBufTmp;
ParameterRecord itsStatRec; // stations definitions
vector<casa::Vector<int> > itsParts; // the stations in each superstation
vector<vector<int> > itsBufRows; // old baseline rows in each new baseline
diff --git a/CEP/DP3/DPPP/include/DPPP/UVWFlagger.h b/CEP/DP3/DPPP/include/DPPP/UVWFlagger.h
index eecef13440a5a928b215018c963a55778ae8a086..831bd329c53ab1aee2e2c458051c62c47e8311b3 100644
--- a/CEP/DP3/DPPP/include/DPPP/UVWFlagger.h
+++ b/CEP/DP3/DPPP/include/DPPP/UVWFlagger.h
@@ -108,6 +108,7 @@ namespace LOFAR {
//# Data members.
DPInput* itsInput;
string itsName;
+ DPBuffer itsBuffer;
uint itsNTimes;
casa::Vector<double> itsRecWavel; //# reciprokes of wavelengths
vector<double> itsRangeUVm; //# UV ranges (in m) to be flagged
diff --git a/CEP/DP3/DPPP/src/AORFlagger.cc b/CEP/DP3/DPPP/src/AORFlagger.cc
index 4f78406db200d7fbc185de825e9175fe6a6fe9ce..be3ff88eaee8c04c160d010eb4db0298de439cba 100644
--- a/CEP/DP3/DPPP/src/AORFlagger.cc
+++ b/CEP/DP3/DPPP/src/AORFlagger.cc
@@ -241,7 +241,10 @@ namespace LOFAR {
// Accumulate in the time window until the window and overlap are full.
itsNTimes++;
/// cout<<"inserted at " << itsBufIndex<<endl;
- itsBuf[itsBufIndex++] = buf;
+ itsBuf[itsBufIndex++].copy (buf);
+ ///if (itsBufIndex < 5) {
+ ///cout << (void*)(itsBuf[itsBufIndex-1].getData().data())<<' '<<itsBuf[itsBufIndex-1].getData().data()[0]<<endl;
+ ///}
if (itsBufIndex == itsWindowSize+2*itsOverlap) {
flag (2*itsOverlap);
}
@@ -339,7 +342,7 @@ namespace LOFAR {
// If possible, discard the buffer processed to minimize memory usage.
for (uint i=0; i<itsWindowSize; ++i) {
getNextStep()->process (itsBuf[i]);
- itsBuf[i] = DPBuffer();
+ /// itsBuf[i] = DPBuffer();
///cout << "cleared buffer " << i << endl;
}
itsTimer.start();
@@ -347,7 +350,7 @@ namespace LOFAR {
// This is a bit easier than keeping a wrapped vector.
// Note it is a cheap operation, because shallow copies are made.
for (uint i=0; i<rightOverlap; ++i) {
- itsBuf[i] = itsBuf[i+itsWindowSize];
+ itsBuf[i].copy (itsBuf[i+itsWindowSize]);
///cout << "moved buffer " <<i+itsWindowSize<<" to "<< i << endl;
}
itsBufIndex = rightOverlap;
diff --git a/CEP/DP3/DPPP/src/ApplyCal.cc b/CEP/DP3/DPPP/src/ApplyCal.cc
index 631c7019766b97e0579099efc8e4f9836ec78a82..46422e3c8314693e7d73314d670dc9f49af61bd3 100644
--- a/CEP/DP3/DPPP/src/ApplyCal.cc
+++ b/CEP/DP3/DPPP/src/ApplyCal.cc
@@ -168,13 +168,10 @@ namespace LOFAR {
bool ApplyCal::process (const DPBuffer& bufin)
{
itsTimer.start();
- DPBuffer buf(bufin);
- buf.getData().unique();
- RefRows rowNrs(buf.getRowNrs());
+ itsBuffer.copy (bufin);
+ double bufStartTime = bufin.getTime() - 0.5*itsTimeInterval;
- double bufStartTime = buf.getTime() - 0.5*itsTimeInterval;
-
- if (buf.getTime() > itsLastTime) {
+ if (bufin.getTime() > itsLastTime) {
updateParms(bufStartTime);
itsTimeStep=0;
}
@@ -183,16 +180,14 @@ namespace LOFAR {
}
// Loop through all baselines in the buffer.
- size_t nbl = bufin.getData().shape()[2];
+ size_t nbl = itsBuffer.getData().shape()[2];
- Complex* data = buf.getData().data();
+ Complex* data = itsBuffer.getData().data();
- if (itsUpdateWeights) {
- buf.setWeights(itsInput->fetchWeights (buf, rowNrs, itsTimer));
- }
- float* weight = buf.getWeights().data();
+ itsInput->fetchWeights (bufin, itsBuffer, itsTimer);
+ float* weight = itsBuffer.getWeights().data();
- size_t nchan = buf.getData().shape()[1];
+ size_t nchan = itsBuffer.getData().shape()[1];
#pragma omp parallel for
for (size_t bl=0; bl<nbl; ++bl) {
@@ -210,10 +205,11 @@ namespace LOFAR {
}
}
- MSReader::flagInfNaN(buf.getData(),buf.getFlags(),itsFlagCounter);
+ MSReader::flagInfNaN(itsBuffer.getData(), itsBuffer.getFlags(),
+ itsFlagCounter);
itsTimer.stop();
- getNextStep()->process(buf);
+ getNextStep()->process(itsBuffer);
return false;
}
diff --git a/CEP/DP3/DPPP/src/Averager.cc b/CEP/DP3/DPPP/src/Averager.cc
index 028148c1a8d645c3f85f346de77bb241c14a6180..00dd39656ebb7e0c7cf09c772bf066475a463855 100644
--- a/CEP/DP3/DPPP/src/Averager.cc
+++ b/CEP/DP3/DPPP/src/Averager.cc
@@ -107,29 +107,26 @@ namespace LOFAR {
return true;
}
itsTimer.start();
- RefRows rowNrs(buf.getRowNrs());
// Sum the data in time applying the weights.
// The summing in channel and the averaging is done in function average.
if (itsNTimes == 0) {
// The first time we assign because that is faster than first clearing
// and adding thereafter.
- itsBuf.getUVW() = itsInput->fetchUVW (buf, rowNrs, itsTimer);
- itsBuf.getWeights() = itsInput->fetchWeights (buf, rowNrs, itsTimer);
- Cube<bool> fullResFlags(itsInput->fetchFullResFlags (buf, rowNrs,
- itsTimer));
- itsBuf.getData() = buf.getData();
- IPosition shapeIn = buf.getData().shape();
+ itsBuf.getData().assign (buf.getData());
+ itsBuf.getFlags().assign (buf.getFlags());
+ itsBuf.getUVW().assign (itsInput->fetchUVW(buf, itsBuf, itsTimer));
+ itsBuf.getWeights().assign (itsInput->fetchWeights(buf, itsBuf, itsTimer));
+ IPosition shapeIn = buf.getData().shape();
itsNPoints.resize (shapeIn);
itsAvgAll.reference (buf.getData() * itsBuf.getWeights());
itsWeightAll.resize (shapeIn);
itsWeightAll = itsBuf.getWeights();
// Take care of the fullRes flags.
// We have to shape the output array and copy to a part of it.
+ const Cube<bool>& fullResFlags =
+ itsInput->fetchFullResFlags (buf, itsBufTmp, itsTimer);
IPosition ofShape = fullResFlags.shape();
ofShape[1] *= itsNTimeAvg; // more time entries, same chan and bl
- // Make it unique in case FullRes is referenced elsewhere.
- // (itsBuf.FullRes is referenced when set in buf by average())
- itsBuf.getFullResFlags().unique();
itsBuf.getFullResFlags().resize (ofShape);
itsBuf.getFullResFlags() = true; // initialize for times missing at end
copyFullResFlags (fullResFlags, buf.getFlags(), 0);
@@ -165,10 +162,12 @@ namespace LOFAR {
// For now we assume that all timeslots have the same nr of baselines,
// so check if the buffer sizes are the same.
ASSERT (itsBuf.getData().shape() == buf.getData().shape());
- itsBuf.getUVW() += itsInput->fetchUVW (buf, rowNrs, itsTimer);
- copyFullResFlags (itsInput->fetchFullResFlags(buf, rowNrs, itsTimer),
+ itsBufTmp.referenceFilled (buf);
+ itsBuf.getUVW() += itsInput->fetchUVW (buf, itsBufTmp, itsTimer);
+ copyFullResFlags (itsInput->fetchFullResFlags (buf, itsBufTmp, itsTimer),
buf.getFlags(), itsNTimes);
- Cube<float> weights(itsInput->fetchWeights(buf, rowNrs, itsTimer));
+ const Cube<float>& weights =
+ itsInput->fetchWeights (buf, itsBufTmp, itsTimer);
// Ignore flagged points.
Array<Complex>::const_contiter indIter = buf.getData().cbegin();
Array<float>::const_contiter inwIter = weights.cbegin();
@@ -200,9 +199,9 @@ namespace LOFAR {
// Do the averaging if enough time steps have been processed.
itsNTimes += 1;
if (itsNTimes >= itsNTimeAvg) {
- DPBuffer buf = average();
+ average();
itsTimer.stop();
- getNextStep()->process (buf);
+ getNextStep()->process (itsBufOut);
itsNTimes = 0;
} else {
itsTimer.stop();
@@ -215,25 +214,24 @@ namespace LOFAR {
// Average remaining entries.
if (itsNTimes > 0) {
itsTimer.start();
- DPBuffer buf = average();
+ average();
itsTimer.stop();
- getNextStep()->process (buf);
+ getNextStep()->process (itsBufOut);
itsNTimes = 0;
}
// Let the next steps finish.
getNextStep()->finish();
}
- DPBuffer Averager::average() const
+ void Averager::average()
{
IPosition shp = itsBuf.getData().shape();
uint nchanin = shp[1];
uint npin = shp[0] * nchanin;
shp[1] = (shp[1] + itsNChanAvg - 1) / itsNChanAvg;
- DPBuffer buf;
- buf.getData().resize (shp);
- buf.getWeights().resize (shp);
- buf.getFlags().resize (shp);
+ itsBufOut.getData().resize (shp);
+ itsBufOut.getWeights().resize (shp);
+ itsBufOut.getFlags().resize (shp);
uint ncorr = shp[0];
uint nchan = shp[1];
int nbl = shp[2];
@@ -246,9 +244,9 @@ namespace LOFAR {
const float* inwght = itsBuf.getWeights().data() + k*npin;
const float* inallw = itsWeightAll.data() + k*npin;
const int* innp = itsNPoints.data() + k*npin;
- Complex* outdata = buf.getData().data() + k*npout;
- float* outwght = buf.getWeights().data() + k*npout;
- bool* outflags = buf.getFlags().data() + k*npout;
+ Complex* outdata = itsBufOut.getData().data() + k*npout;
+ float* outwght = itsBufOut.getWeights().data() + k*npout;
+ bool* outflags = itsBufOut.getFlags().data() + k*npout;
for (uint i=0; i<ncorr; ++i) {
uint inxi = i;
uint inxo = i;
@@ -283,13 +281,12 @@ namespace LOFAR {
}
}
// Set the remaining values in the output buffer.
- buf.setTime (itsBuf.getTime());
- buf.setExposure (itsBuf.getExposure());
- buf.setFullResFlags (itsBuf.getFullResFlags());
+ itsBufOut.setTime (itsBuf.getTime());
+ itsBufOut.setExposure (itsBuf.getExposure());
+ itsBufOut.setFullResFlags (itsBuf.getFullResFlags());
// The result UVWs are the average of the input.
// If ever needed, UVWCalculator can be used to calculate the UVWs.
- buf.setUVW (itsBuf.getUVW() / double(itsNTimes));
- return buf;
+ itsBufOut.setUVW (itsBuf.getUVW() / double(itsNTimes));
}
void Averager::copyFullResFlags (const Cube<bool>& fullResFlags,
diff --git a/CEP/DP3/DPPP/src/DPBuffer.cc b/CEP/DP3/DPPP/src/DPBuffer.cc
index 458cfee2a185cb951bf20844d577cb556992ccf6..3d845e45d262f402bd419ff43c6280948dd29bf3 100644
--- a/CEP/DP3/DPPP/src/DPBuffer.cc
+++ b/CEP/DP3/DPPP/src/DPBuffer.cc
@@ -45,26 +45,60 @@ namespace LOFAR {
itsExposure = that.itsExposure;
itsRowNrs.reference (that.itsRowNrs);
itsData.reference (that.itsData);
- itsAmpl.reference (that.itsAmpl);
itsFlags.reference (that.itsFlags);
itsWeights.reference (that.itsWeights);
- itsModel.reference (that.itsModel);
itsUVW.reference (that.itsUVW);
itsFullResFlags.reference (that.itsFullResFlags);
}
return *this;
}
- void DPBuffer::clear()
+ void DPBuffer::copy (const DPBuffer& that)
{
- itsRowNrs.resize();
- itsData.resize();
- itsAmpl.resize();
- itsFlags.resize();
- itsWeights.resize();
- itsModel.resize();
- itsUVW.resize();
- itsFullResFlags.resize();
+ if (this != &that) {
+ itsTime = that.itsTime;
+ itsExposure = that.itsExposure;
+ itsRowNrs.assign (that.itsRowNrs);
+ if (! that.itsData.empty()) {
+ itsData.assign (that.itsData);
+ }
+ if (! that.itsFlags.empty()) {
+ itsFlags.assign (that.itsFlags);
+ }
+ if (! that.itsWeights.empty()) {
+ itsWeights.assign (that.itsWeights);
+ }
+ if (! that.itsUVW.empty()) {
+ itsUVW.assign (that.itsUVW);
+ }
+ if (! that.itsFullResFlags.empty()) {
+ itsFullResFlags.assign (that.itsFullResFlags);
+ }
+ }
+ }
+
+ void DPBuffer::referenceFilled (const DPBuffer& that)
+ {
+ if (this != &that) {
+ itsTime = that.itsTime;
+ itsExposure = that.itsExposure;
+ itsRowNrs.reference (that.itsRowNrs);
+ if (! that.itsData.empty()) {
+ itsData.reference (that.itsData);
+ }
+ if (! that.itsFlags.empty()) {
+ itsFlags.reference (that.itsFlags);
+ }
+ if (! that.itsWeights.empty()) {
+ itsWeights.reference (that.itsWeights);
+ }
+ if (! that.itsUVW.empty()) {
+ itsUVW.reference (that.itsUVW);
+ }
+ if (! that.itsFullResFlags.empty()) {
+ itsFullResFlags.reference (that.itsFullResFlags);
+ }
+ }
}
void DPBuffer::mergeFullResFlags (Cube<bool>& fullResFlags,
diff --git a/CEP/DP3/DPPP/src/DPInfo.cc b/CEP/DP3/DPPP/src/DPInfo.cc
index 8513135e952682a683cdafc5be2ab424c3284558..389e6ef8a66e60b6df50b992521d6728ebc0189b 100644
--- a/CEP/DP3/DPPP/src/DPInfo.cc
+++ b/CEP/DP3/DPPP/src/DPInfo.cc
@@ -39,7 +39,6 @@ namespace LOFAR {
DPInfo::DPInfo()
: itsNeedVisData (false),
- itsNeedModelData(false),
itsNeedWrite (0),
itsNCorr (0),
itsStartChan (0),
@@ -147,7 +146,8 @@ namespace LOFAR {
}
}
- MeasureHolder DPInfo::copyMeasure(const MeasureHolder fromMeas) {
+ MeasureHolder DPInfo::copyMeasure(const MeasureHolder fromMeas)
+ {
Record rec;
String msg;
ASSERT (fromMeas.toRecord (msg, rec));
@@ -297,5 +297,123 @@ namespace LOFAR {
return itsAutoCorrIndex;
}
+ Record DPInfo::toRecord() const
+ {
+ Record rec;
+ rec.define ("NeedVisData", itsNeedVisData);
+ rec.define ("NeedWrite", itsNeedWrite);
+ rec.define ("MSName", itsMSName);
+ rec.define ("AntennaSet", itsAntennaSet);
+ rec.define ("NCorr", itsNCorr);
+ rec.define ("StartChan", itsStartChan);
+ rec.define ("OrigNChan", itsOrigNChan);
+ rec.define ("NChan", itsNChan);
+ rec.define ("ChanAvg", itsChanAvg);
+ rec.define ("NTime", itsNTime);
+ rec.define ("TimeAvg", itsTimeAvg);
+ rec.define ("StartTime", itsStartTime);
+ rec.define ("TimeInterval", itsTimeInterval);
+ rec.define ("ChanFreqs", itsChanFreqs);
+ rec.define ("ChanWidths", itsChanWidths);
+ rec.define ("Resolutions", itsResolutions);
+ rec.define ("EffectiveBW", itsEffectiveBW);
+ rec.define ("TotalBW", itsTotalBW);
+ rec.define ("RefFreq", itsRefFreq);
+ rec.define ("AntNames", itsAntNames);
+ rec.define ("AntDiam", itsAntDiam);
+ rec.define ("AntUsed", Vector<int>(itsAntUsed));
+ rec.define ("AntMap", Vector<int>(itsAntMap));
+ rec.define ("Ant1", itsAnt1);
+ rec.define ("Ant2", itsAnt2);
+ rec.define ("BLength", Vector<double>(itsBLength));
+ rec.define ("AutoCorrIndex", Vector<int>(itsAutoCorrIndex));
+ return rec;
+ }
+
+ void DPInfo::fromRecord (const Record& rec)
+ {
+ if (rec.isDefined ("NeedVisData")) {
+ rec.get ("NeedVisData", itsNeedVisData);
+ }
+ if (rec.isDefined ("NeedWrite")) {
+ rec.get ("NeedWrite", itsNeedWrite);
+ }
+ if (rec.isDefined ("MSName")) {
+ itsMSName = rec.asString ("MSName");
+ }
+ if (rec.isDefined ("AntennaSet")) {
+ itsAntennaSet = rec.asString ("AntennaSet");
+ }
+ if (rec.isDefined ("NCorr")) {
+ rec.get ("NCorr", itsNCorr);
+ }
+ if (rec.isDefined ("StartChan")) {
+ rec.get ("StartChan", itsStartChan);
+ }
+ if (rec.isDefined ("OrigNChan")) {
+ rec.get ("OrigNChan", itsOrigNChan);
+ }
+ if (rec.isDefined ("NChan")) {
+ rec.get ("NChan", itsNChan);
+ }
+ if (rec.isDefined ("ChanAvg")) {
+ rec.get ("ChanAvg", itsChanAvg);
+ }
+ if (rec.isDefined ("NTime")) {
+ rec.get ("NTime", itsNTime);
+ }
+ if (rec.isDefined ("TimeAvg")) {
+ rec.get ("TimeAvg", itsTimeAvg);
+ }
+ if (rec.isDefined ("StartTime")) {
+ rec.get ("StartTime", itsStartTime);
+ }
+ if (rec.isDefined ("TimeInterval")) {
+ rec.get ("TimeInterval", itsTimeInterval);
+ }
+ if (rec.isDefined ("ChanFreqs")) {
+ rec.get ("ChanFreqs", itsChanFreqs);
+ }
+ if (rec.isDefined ("ChanWidths")) {
+ rec.get ("ChanWidths", itsChanWidths);
+ }
+ if (rec.isDefined ("Resolutions")) {
+ rec.get ("Resolutions", itsResolutions);
+ }
+ if (rec.isDefined ("EffectiveBW")) {
+ rec.get ("EffectiveBW", itsEffectiveBW);
+ }
+ if (rec.isDefined ("TotalBW")) {
+ rec.get ("TotalBW", itsTotalBW);
+ }
+ if (rec.isDefined ("RefFreq")) {
+ rec.get ("RefFreq", itsRefFreq);
+ }
+ if (rec.isDefined ("AntNames")) {
+ rec.get ("AntNames", itsAntNames);
+ }
+ if (rec.isDefined ("AntDiam")) {
+ rec.get ("AntDiam", itsAntDiam);
+ }
+ ///if (rec.isDefined ("AntUsed")) {
+ ///itsAntUsed = rec.toArrayInt("AntUsed").tovector();
+ ///}
+ ///if (rec.isDefined ("AntMap")) {
+ /// itsAntMap = rec.toArrayInt("AntMap").tovector();
+ ///}
+ if (rec.isDefined ("Ant1")) {
+ rec.get ("Ant1", itsAnt1);
+ }
+ if (rec.isDefined ("Ant2")) {
+ rec.get ("Ant2", itsAnt2);
+ }
+ ///if (rec.isDefined ("BLength")) {
+ /// itsBLength = rec.toArrayDouble("BLength").tovector();
+ ///}
+ ///if (rec.isDefined ("AutoCorrIndex")) {
+ /// itsAutoCorrIndex = rec.toArrayInt("AutoCorrIndex").tovector();
+ ///}
+ }
+
} //# end namespace
}
diff --git a/CEP/DP3/DPPP/src/DPInput.cc b/CEP/DP3/DPPP/src/DPInput.cc
index d710a415bba339a7ba51fa841284bc55dda6af6e..1a677f9c87cad8b6a1ca64060f67b51ce11580d4 100644
--- a/CEP/DP3/DPPP/src/DPInput.cc
+++ b/CEP/DP3/DPPP/src/DPInput.cc
@@ -42,77 +42,83 @@ namespace LOFAR {
return String();
}
- Cube<bool> DPInput::fetchFullResFlags (const DPBuffer& buf,
- const RefRows& rowNrs,
- NSTimer& timer,
- bool merge)
+ const Cube<bool>& DPInput::fetchFullResFlags (const DPBuffer& bufin,
+ DPBuffer& bufout,
+ NSTimer& timer,
+ bool merge)
{
// If already defined in the buffer, return those fullRes flags.
- if (! buf.getFullResFlags().empty()) {
- return buf.getFullResFlags();
+ if (! bufin.getFullResFlags().empty()) {
+ return bufin.getFullResFlags();
}
// No fullRes flags in buffer, so get them from the input.
timer.stop();
- Cube<bool> fullResFlags (getFullResFlags(rowNrs));
+ bool fnd = getFullResFlags (bufin.getRowNrs(), bufout);
timer.start();
- if (fullResFlags.empty()) {
+ Cube<bool>& fullResFlags = bufout.getFullResFlags();
+ if (!fnd) {
// No fullRes flags in input; form them from the flags in the buffer.
// Only use the XX flags; no averaging done, thus navgtime=1.
- IPosition shp(buf.getFlags().shape());
- IPosition ofShape(3, shp[1], 1, shp[2]); // nchan,navgtime,nbl
- fullResFlags.resize (ofShape);
- objcopy (fullResFlags.data(), buf.getFlags().data(),
+ // (If any averaging was done, the flags would be in the buffer).
+ IPosition shp(bufin.getFlags().shape());
+ ASSERT (fullResFlags.shape()[0] == shp[1] &&
+ fullResFlags.shape()[1] == 1 &&
+ fullResFlags.shape()[2] == shp[2]);
+ objcopy (fullResFlags.data(), bufin.getFlags().data(),
fullResFlags.size(), 1, shp[0]); // only copy XX.
return fullResFlags;
}
// There are fullRes flags.
// If needed, merge them with the buffer's flags.
if (merge) {
- DPBuffer::mergeFullResFlags (fullResFlags, buf.getFlags());
+ DPBuffer::mergeFullResFlags (fullResFlags, bufin.getFlags());
}
return fullResFlags;
}
- Cube<float> DPInput::fetchWeights (const DPBuffer& buf,
- const RefRows& rowNrs,
- NSTimer& timer)
+ const Cube<float>& DPInput::fetchWeights (const DPBuffer& bufin,
+ DPBuffer& bufout,
+ NSTimer& timer)
{
// If already defined in the buffer, return those weights.
- if (! buf.getWeights().empty()) {
- return buf.getWeights();
+ if (! bufin.getWeights().empty()) {
+ return bufin.getWeights();
}
// No weights in buffer, so get them from the input.
// It might need the data and flags in the buffer.
timer.stop();
- Cube<float> weights(getWeights(rowNrs, buf));
+ getWeights (bufin.getRowNrs(), bufout);
timer.start();
- return weights;
+ return bufout.getWeights();
}
- Matrix<double> DPInput::fetchUVW (const DPBuffer& buf,
- const RefRows& rowNrs,
- NSTimer& timer)
+ const Matrix<double>& DPInput::fetchUVW (const DPBuffer& bufin,
+ DPBuffer& bufout,
+ NSTimer& timer)
{
// If already defined in the buffer, return those UVW.
- if (! buf.getUVW().empty()) {
- return buf.getUVW();
+ if (! bufin.getUVW().empty()) {
+ return bufin.getUVW();
}
// No UVW in buffer, so get them from the input.
timer.stop();
- Matrix<double> uvws(getUVW(rowNrs));
+ getUVW (bufin.getRowNrs(), bufin.getTime(), bufout);
timer.start();
- return uvws;
+ return bufout.getUVW();
}
- Matrix<double> DPInput::getUVW (const RefRows&)
+ void DPInput::getUVW (const RefRows&, double, DPBuffer&)
{ throw Exception ("DPInput::getUVW not implemented"); }
- Cube<float> DPInput::getWeights (const RefRows&, const DPBuffer&)
+ void DPInput::getWeights (const RefRows&, DPBuffer&)
{ throw Exception ("DPInput::getWeights not implemented"); }
- Cube<bool> DPInput::getFullResFlags (const RefRows&)
+ bool DPInput::getFullResFlags (const RefRows&, DPBuffer&)
{ throw Exception ("DPInput::getFullResFlags not implemented"); }
+ void DPInput::getModelData (const RefRows&, Cube<Complex>&)
+ { throw Exception ("DPInput::getModelData not implemented"); }
+
void DPInput::fillBeamInfo (vector<StationResponse::Station::Ptr>&,
const Vector<String>&)
{ throw Exception ("DPInput::fillBeamInfo not implemented"); }
diff --git a/CEP/DP3/DPPP/src/DPRun.cc b/CEP/DP3/DPPP/src/DPRun.cc
index ad8feb0f80ce0cd46b1a8498d3daff7b983c5e55..7e1347b95ce50d221abf7b18f6496439c2b7868f 100644
--- a/CEP/DP3/DPPP/src/DPRun.cc
+++ b/CEP/DP3/DPPP/src/DPRun.cc
@@ -51,10 +51,49 @@
#include <casa/OS/Path.h>
#include <casa/OS/DirectoryIterator.h>
#include <casa/OS/Timer.h>
+#include <casa/OS/DynLib.h>
namespace LOFAR {
namespace DPPP {
+ // Initialize the statics.
+ std::map<std::string, DPRun::StepCtor*> DPRun::theirStepMap;
+
+ void DPRun::registerStepCtor (const std::string& type, StepCtor* func)
+ {
+ theirStepMap[type] = func;
+ }
+
+ DPRun::StepCtor* DPRun::findStepCtor (const std::string& type)
+ {
+ std::map<std::string,StepCtor*>::const_iterator iter =
+ theirStepMap.find (type);
+ if (iter != theirStepMap.end()) {
+ return iter->second;
+ }
+ // Try to load the step from a dynamic library with that name
+ // (in lowercase).
+ // A dot can be used to have a specific library name (so multiple
+ // steps can use the same shared library).
+ std::string libname(toLower(type));
+ string::size_type pos = libname.find_first_of (".");
+ if (pos != string::npos) {
+ libname = libname.substr (0, pos);
+ }
+ // Try to load and initialize the dynamic library.
+ casa::DynLib dl(libname, string(), "register_"+libname, false);
+ if (dl.getHandle()) {
+ // See if registered now.
+ iter = theirStepMap.find (type);
+ if (iter != theirStepMap.end()) {
+ return iter->second;
+ }
+ }
+ THROW(Exception, "Step type " + type +
+ " is unknown and no such shared library found");
+ }
+
+
void DPRun::execute (const string& parsetName, int argc, char* argv[])
{
casa::Timer timer;
@@ -278,7 +317,8 @@ namespace LOFAR {
} else if (type == "gaincal" || type == "calibrate") {
step = DPStep::ShPtr(new GainCal (reader, parset, prefix));
} else {
- THROW (LOFAR::Exception, "DPPP step type " << type << " is unknown");
+ // Maybe the step is defined in a dynamic library.
+ step = findStepCtor(type) (reader, parset, prefix);
}
lastStep->setNextStep (step);
lastStep = step;
@@ -298,7 +338,6 @@ namespace LOFAR {
}
// Tell the reader if visibility data needs to be read.
reader->setReadVisData (lastInfo.needVisData());
- reader->setReadModelData (lastInfo.needModelData());
// Create an updater step if an input MS was given; otherwise a writer.
// Create an updater step only if needed (e.g. not if only count is done).
// If the user specified an output MS name, a writer is always created
@@ -335,5 +374,6 @@ namespace LOFAR {
}
return firstStep;
}
+
} //# end namespace
}
diff --git a/CEP/DP3/DPPP/src/DPStep.cc b/CEP/DP3/DPPP/src/DPStep.cc
index aa9ab1192fb7f1d08235ddf23105f77319133c38..ca35b98e49993af00ced31267725d6e06f01db65 100644
--- a/CEP/DP3/DPPP/src/DPStep.cc
+++ b/CEP/DP3/DPPP/src/DPStep.cc
@@ -91,10 +91,11 @@ namespace LOFAR {
{}
- MultiResultStep::MultiResultStep (uint reserveSize)
+ MultiResultStep::MultiResultStep (uint size)
+ : itsSize (0)
{
setNextStep (DPStep::ShPtr (new NullStep()));
- itsBuffers.reserve (reserveSize);
+ itsBuffers.resize (size);
}
MultiResultStep::~MultiResultStep()
@@ -102,7 +103,9 @@ namespace LOFAR {
bool MultiResultStep::process (const DPBuffer& buf)
{
- itsBuffers.push_back (buf);
+ ASSERT (itsSize < itsBuffers.size());
+ itsBuffers[itsSize].copy (buf);
+ itsSize++;
getNextStep()->process (buf);
return true;
}
diff --git a/CEP/DP3/DPPP/src/DemixInfo.cc b/CEP/DP3/DPPP/src/DemixInfo.cc
index 75dca2c140f255deb825f8a3150e5c7b15f33302..1cecb61fb97d2fa19473db855eb7b03d12f28d9e 100644
--- a/CEP/DP3/DPPP/src/DemixInfo.cc
+++ b/CEP/DP3/DPPP/src/DemixInfo.cc
@@ -82,10 +82,12 @@ namespace LOFAR {
itsNTimeAvgSubtr)),
itsChunkSize (parset.getUint (prefix+"chunksize",
itsNTimeAvg)),
- itsNTimeChunk (parset.getUint (prefix+"ntimechunk",
- OpenMP::maxThreads())),
+ itsNTimeChunk (parset.getUint (prefix+"ntimechunk", 0)),
itsTimeIntervalAvg (0)
{
+ if (itsNTimeChunk == 0) {
+ itsNTimeChunk = OpenMP::maxThreads();
+ }
// Get delta in arcsec and take cosine of it (convert to radians first).
double delta = parset.getDouble (prefix+"target.delta", 60.);
itsCosTargetDelta = cos (delta / 3600. * casa::C::pi / 180.);
@@ -105,7 +107,9 @@ namespace LOFAR {
}
}
itsAteamDemixList = makePatchList (itsDemixModelName, itsSourceNames);
- itsTargetList = makePatchList (itsTargetModelName, vector<string>());
+ if (itsTargetHandling != 3) {
+ itsTargetList = makePatchList (itsTargetModelName, vector<string>());
+ }
// If no estimate model is given, use the demix model.
if (itsAteamList.empty()) {
itsAteamList = itsAteamDemixList;
diff --git a/CEP/DP3/DPPP/src/DemixWorker.cc b/CEP/DP3/DPPP/src/DemixWorker.cc
index 657d15c1135c73f362e77be0fc286d08e9a37e2b..0d7cbff71aae5f4efbee6186d995312116fab36b 100644
--- a/CEP/DP3/DPPP/src/DemixWorker.cc
+++ b/CEP/DP3/DPPP/src/DemixWorker.cc
@@ -565,8 +565,8 @@ namespace LOFAR {
itsAvgStepSubtr->process (bufin[i]);
}
itsAvgStepSubtr->finish();
- ASSERT (itsAvgResultFull->get().size() <= itsMix->ntimeOutSubtr());
- for (uint i=0; i<itsAvgResultFull->get().size(); ++i) {
+ ASSERT (itsAvgResultFull->size() <= itsMix->ntimeOutSubtr());
+ for (uint i=0; i<itsAvgResultFull->size(); ++i) {
bufout[i] = itsAvgResultFull->get()[i];
}
itsAvgResultFull->clear();
@@ -1074,8 +1074,8 @@ namespace LOFAR {
double time, double timeStep)
{
// Determine the various sizes.
- const size_t nTime = itsAvgResults[itsSrcSet[0]]->get().size();
- const size_t nTimeSubtr = itsAvgResultSubtr->get().size();
+ const size_t nTime = itsAvgResults[itsSrcSet[0]]->size();
+ const size_t nTimeSubtr = itsAvgResultSubtr->size();
const size_t multiplier = itsMix->ntimeAvg() / itsMix->ntimeAvgSubtr();
const size_t nSt = itsMix->nstation();
const size_t nBl = itsMix->baselines().size();
diff --git a/CEP/DP3/DPPP/src/Demixer.cc b/CEP/DP3/DPPP/src/Demixer.cc
index 657a99f66f2c44045e236f6f8e058f1f85424268..e60d8ef1a4767b559717089ad1404ace9777e3d3 100644
--- a/CEP/DP3/DPPP/src/Demixer.cc
+++ b/CEP/DP3/DPPP/src/Demixer.cc
@@ -33,6 +33,7 @@
#include <DPPP/Simulate.h>
#include <DPPP/SourceDBUtil.h>
#include <DPPP/SubtractMixed.h>
+#include <DPPP/MSReader.h>
#include <ParmDB/Axis.h>
#include <ParmDB/SourceDB.h>
@@ -345,6 +346,8 @@ namespace LOFAR {
*it++ = itsDefaultGain;
*it++ = 0.0;
}
+ // Initialize the flag counters.
+ itsFlagCounter.init (getInfo());
}
void Demixer::show (std::ostream& os) const
@@ -433,21 +436,14 @@ namespace LOFAR {
// Update the count.
itsNTimeIn++;
// Make sure all required data arrays are filled in.
- DPBuffer newBuf(buf);
- RefRows refRows(newBuf.getRowNrs());
- if (newBuf.getUVW().empty()) {
- newBuf.setUVW(itsInput->fetchUVW(newBuf, refRows, itsTimer));
- }
- if (newBuf.getWeights().empty()) {
- newBuf.setWeights(itsInput->fetchWeights(newBuf, refRows, itsTimer));
- }
- if (newBuf.getFullResFlags().empty()) {
- newBuf.setFullResFlags(itsInput->fetchFullResFlags(newBuf, refRows,
- itsTimer));
- }
+ /// itsBufTmp.referenceFilled (buf);
+ itsBufTmp.copy (buf);
+ itsInput->fetchUVW (buf, itsBufTmp, itsTimer);
+ itsInput->fetchWeights (buf, itsBufTmp, itsTimer);
+ itsInput->fetchFullResFlags (buf, itsBufTmp, itsTimer);
// Do the filter step first.
- itsFilter.process (newBuf);
+ itsFilter.process (itsBufTmp);
const DPBuffer& selBuf = itsFilter.getBuffer();
// Do the next steps (phaseshift and average) on the filter output.
itsTimerPhaseShift.start();
@@ -455,7 +451,7 @@ namespace LOFAR {
itsFirstSteps[i]->process(selBuf);
}
// Do the average and filter step for the output for all data.
- itsAvgStepSubtr->process (newBuf);
+ itsAvgStepSubtr->process (itsBufTmp);
itsTimerPhaseShift.stop();
// For each itsNTimeAvg times, calculate the phase rotation per direction
@@ -568,11 +564,15 @@ namespace LOFAR {
// Let the next step process the data.
for (uint i=0; i<itsNTimeOutSubtr; ++i) {
itsTimer.stop();
+ DPBuffer* bufptr;
if (itsSelBL.hasSelection()) {
- getNextStep()->process (itsAvgResultFull->get()[i]);
+ bufptr = &(itsAvgResultFull->get()[i]);
} else {
- getNextStep()->process (itsAvgResultSubtr->get()[i]);
+ bufptr = &(itsAvgResultSubtr->get()[i]);
}
+ MSReader::flagInfNaN (bufptr->getData(), bufptr->getFlags(),
+ itsFlagCounter);
+ getNextStep()->process (*bufptr);
itsTimer.start();
}
@@ -727,7 +727,7 @@ namespace LOFAR {
dirnr++;
}
}
- //cout<<"makefactors "<<weightSums<<bufOut;
+ ///cout<<"makefactors "<<weightSums<<bufOut;
}
void Demixer::deproject (Array<DComplex>& factors,
@@ -842,8 +842,8 @@ namespace LOFAR {
void Demixer::demix()
{
const size_t nThread = OpenMP::maxThreads();
- const size_t nTime = itsAvgResults[0]->get().size();
- const size_t nTimeSubtr = itsAvgResultSubtr->get().size();
+ const size_t nTime = itsAvgResults[0]->size();
+ const size_t nTimeSubtr = itsAvgResultSubtr->size();
const size_t multiplier = itsNTimeAvg / itsNTimeAvgSubtr;
const size_t nDr = itsNModel;
const size_t nDrSubtr = itsSubtrSources.size();
@@ -902,14 +902,14 @@ namespace LOFAR {
const_cursor<double> cr_uvw =
casa_const_cursor(itsAvgResults[dr]->get()[ts].getUVW());
splitUVW(nSt, nBl, cr_baseline, cr_uvw, cr_uvw_split);
- //cout<<"uvw"<<dr<<'='<<storage.uvw<<endl;
+ ///cout<<"uvw"<<dr<<'='<<storage.uvw<<endl;
cursor<dcomplex> cr_model(&(storage.model[dr * nSamples]), 3,
stride_model);
simulate(itsPatchList[dr]->position(), itsPatchList[dr], nSt,
nBl, nCh, cr_baseline, cr_freq, cr_uvw_split, cr_model);
}
- //cout<<"modelvis="<<storage.model<<endl;
+ ///cout<<"modelvis="<<storage.model<<endl;
// Estimate Jones matrices.
//
@@ -925,7 +925,7 @@ namespace LOFAR {
const_cursor<float> cr_weight =
casa_const_cursor(itsAvgResults[0]->get()[ts].getWeights());
const_cursor<dcomplex> cr_mix = casa_const_cursor(itsFactors[ts]);
- //cout << "demixfactor "<<ts<<" = "<<itsFactors[ts]<<endl;
+ ///cout << "demixfactor "<<ts<<" = "<<itsFactors[ts]<<endl;
vector<const_cursor<fcomplex> > cr_data(nDr);
vector<const_cursor<dcomplex> > cr_model(nDr);
diff --git a/CEP/DP3/DPPP/src/DemixerNew.cc b/CEP/DP3/DPPP/src/DemixerNew.cc
index 45a9483dc85f46b49ad26afa38418a45aefd49fe..c60d8da89bf5ac438acc348533b2ef5d19f6adac 100644
--- a/CEP/DP3/DPPP/src/DemixerNew.cc
+++ b/CEP/DP3/DPPP/src/DemixerNew.cc
@@ -340,18 +340,10 @@ namespace LOFAR {
// Collect sufficient data buffers.
// Make sure all required data arrays are filled in.
DPBuffer& newBuf = itsBufIn[itsNTime];
- newBuf = buf;
- RefRows refRows(newBuf.getRowNrs());
- if (newBuf.getUVW().empty()) {
- newBuf.setUVW(itsInput->fetchUVW(newBuf, refRows, itsTimer));
- }
- if (newBuf.getWeights().empty()) {
- newBuf.setWeights(itsInput->fetchWeights(newBuf, refRows, itsTimer));
- }
- if (newBuf.getFullResFlags().empty()) {
- newBuf.setFullResFlags(itsInput->fetchFullResFlags(newBuf, refRows,
- itsTimer));
- }
+ newBuf.copy (buf);
+ itsInput->fetchUVW(buf, newBuf, itsTimer);
+ itsInput->fetchWeights(buf, newBuf, itsTimer);
+ itsInput->fetchFullResFlags(buf, newBuf, itsTimer);
// Process the data if entire buffer is filled.
if (++itsNTime >= itsBufIn.size()) {
processData();
diff --git a/CEP/DP3/DPPP/src/Filter.cc b/CEP/DP3/DPPP/src/Filter.cc
index 17076a75c9bb89010d44d40a075248a4cb464c5a..d59b249f6769640228785c8f30748ccd8ea8f4dd 100644
--- a/CEP/DP3/DPPP/src/Filter.cc
+++ b/CEP/DP3/DPPP/src/Filter.cc
@@ -1,4 +1,4 @@
-//# Filter.cc: DPPP step class to add station to a superstation
+//# Filter.cc: DPPP step to filter out baselines and channels
//# Copyright (C) 2012
//# ASTRON (Netherlands Institute for Radio Astronomy)
//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
@@ -115,6 +115,9 @@ namespace LOFAR {
itsBuf.getData().resize (shape);
itsBuf.getFlags().resize (shape);
itsBuf.getWeights().resize (shape);
+ if (! itsSelBL.empty()) {
+ itsBuf.getUVW().resize (IPosition(2, 3, shape[2]));
+ }
}
}
}
@@ -141,25 +144,22 @@ namespace LOFAR {
{
itsTimer.start();
if (!itsDoSelect) {
- itsBuf = buf; // uses reference semantics
itsTimer.stop();
- getNextStep()->process (itsBuf);
+ getNextStep()->process (buf);
return true;
}
- // Make sure no other object references the DATA and UVW arrays.
- itsBuf.getData().unique();
- itsBuf.getFlags().unique();
- itsBuf.getWeights().unique();
- itsBuf.getFullResFlags().unique();
// Get the various data arrays.
- RefRows rowNrs(buf.getRowNrs());
+ itsBufTmp.referenceFilled (buf);
const Array<Complex>& data = buf.getData();
const Array<Bool>& flags = buf.getFlags();
- Array<Float> weights(itsInput->fetchWeights (buf, rowNrs, itsTimer));
- Array<Double> uvws(itsInput->fetchUVW (buf, rowNrs, itsTimer));
- Array<Bool> frFlags(itsInput->fetchFullResFlags(buf, rowNrs, itsTimer));
- int frfAvg = frFlags.shape()[0] / data.shape()[1];
+ const Array<Float>& weights =
+ itsInput->fetchWeights (buf, itsBufTmp, itsTimer);
+ const Array<Double>& uvws =
+ itsInput->fetchUVW (buf, itsBufTmp, itsTimer);
+ const Array<Bool>& frFlags =
+ itsInput->fetchFullResFlags (buf, itsBufTmp, itsTimer);
// Size fullResFlags if not done yet.
+ int frfAvg = frFlags.shape()[0] / data.shape()[1];
if (itsBuf.getFullResFlags().empty()) {
IPosition frfShp = frFlags.shape();
frfShp[0] = getInfo().nchan() * frfAvg;
@@ -180,20 +180,18 @@ namespace LOFAR {
// No baseline selection; copy all data for given channels to
// make them contiguous.
// UVW can be referenced, because not dependent on channel.
- itsBuf.getData() = data(first, last);
- itsBuf.getFlags() = flags(first, last);
- itsBuf.getWeights() = weights(first, last);
- itsBuf.getFullResFlags() = frFlags(frfFirst, frfLast);
+ itsBuf.getData().assign (data(first, last));
+ itsBuf.getFlags().assign (flags(first, last));
+ itsBuf.getWeights().assign (weights(first, last));
+ itsBuf.getFullResFlags().assign (frFlags(frfFirst, frfLast));
itsBuf.setUVW (buf.getUVW());
- itsBuf.setRowNrs (buf.getRowNrs());
+ itsBuf.setRowNrs (buf.getRowNrs());
} else {
- Vector<uint> rowNrs(0);
- if (!buf.getRowNrs().empty()) {
+ Vector<uint> rowNrs;
+ if (! buf.getRowNrs().empty()) {
rowNrs.resize(getInfo().nbaselines());
}
// Copy the data of the selected baselines and channels.
- itsBuf.getUVW().resize (IPosition(2, 3, getInfo().nbaselines()));
- itsBuf.getUVW().unique();
Complex* toData = itsBuf.getData().data();
Bool* toFlag = itsBuf.getFlags().data();
Float* toWeight = itsBuf.getWeights().data();
diff --git a/CEP/DP3/DPPP/src/GainCal.cc b/CEP/DP3/DPPP/src/GainCal.cc
index 295e6dc48810e263e1b15d51854c42bca00df113..854d3704ca4750a240b94ac457c65e978f5b672a 100644
--- a/CEP/DP3/DPPP/src/GainCal.cc
+++ b/CEP/DP3/DPPP/src/GainCal.cc
@@ -118,9 +118,6 @@ namespace LOFAR {
{
info() = infoIn;
info().setNeedVisData();
- if (itsUseModelColumn) {
- info().setNeedModelData();
- }
info().setNeedWrite();
uint nBl=info().nbaselines();
@@ -232,13 +229,10 @@ namespace LOFAR {
bool GainCal::process (const DPBuffer& bufin)
{
itsTimer.start();
- DPBuffer buf(bufin);
- buf.getData().unique();
- RefRows refRows(buf.getRowNrs());
-
- buf.setUVW(itsInput->fetchUVW(buf, refRows, itsTimer));
- buf.setWeights(itsInput->fetchWeights(buf, refRows, itsTimer));
- buf.setFullResFlags(itsInput->fetchFullResFlags(buf, refRows, itsTimer));
+ itsBuf.referenceFilled (bufin);
+ itsInput->fetchUVW(bufin, itsBuf, itsTimer);
+ itsInput->fetchWeights(bufin, itsBuf, itsTimer);
+ itsInput->fetchFullResFlags(bufin, itsBuf, itsTimer);
// Determine the various sizes.
const size_t nDr = itsPatchList.size();
@@ -253,10 +247,13 @@ namespace LOFAR {
const size_t thread = 0;//OpenMP::threadNum();
- Complex* data=buf.getData().data();
- Complex* model=buf.getModel().data();
- float* weight = buf.getWeights().data();
- const Bool* flag=buf.getFlags().data();
+ if (itsUseModelColumn) {
+ itsInput->getModelData (itsBuf.getRowNrs(), itsModelData);
+ }
+ Complex* data=itsBuf.getData().data();
+ Complex* model=itsModelData.data();
+ float* weight = itsBuf.getWeights().data();
+ const Bool* flag=itsBuf.getFlags().data();
// Simulate.
//
@@ -267,7 +264,7 @@ namespace LOFAR {
ThreadPrivateStorage &storage = itsThreadStorage[thread];
if (!itsUseModelColumn) {
- double time = buf.getTime();
+ double time = itsBuf.getTime();
size_t stride_uvw[2] = {1, 3};
cursor<double> cr_uvw_split(&(storage.uvw[0]), 2, stride_uvw);
@@ -275,7 +272,7 @@ namespace LOFAR {
size_t stride_model[3] = {1, nCr, nCr * nCh};
fill(storage.model.begin(), storage.model.end(), dcomplex());
- const_cursor<double> cr_uvw = casa_const_cursor(buf.getUVW());
+ const_cursor<double> cr_uvw = casa_const_cursor(itsBuf.getUVW());
splitUVW(nSt, nBl, cr_baseline, cr_uvw, cr_uvw_split);
cursor<dcomplex> cr_model(&(storage.model_patch[0]), 3, stride_model);
@@ -336,7 +333,7 @@ namespace LOFAR {
itsTimer.stop();
itsTStep++;
- getNextStep()->process(buf);
+ getNextStep()->process(itsBuf);
return false;
}
@@ -818,17 +815,6 @@ namespace LOFAR {
cout<<"]"<<endl;
}
- // Set phase of first station to zero
- if (nSt>0) {
- DComplex p = conj(iS.g(0,0))/abs(iS.g(0,0));
- // Set phase of first gain to zero
- for (uint st=0;st<nUn;++st) {
- for (uint cr=0;cr<nCr;++cr) {
- iS.g(st,cr)*=p;
- }
- }
- }
-
//for (uint ant2=0;ant2<nSt;++ant2) {
//cout<<"g["<<ant2<<"]={"<<g[ant2][0]<<", "<<g[ant2][1]<<", "<<g[ant2][2]<<", "<<g[ant2][3]<<"}"<<endl;
//cout<<"w["<<ant2<<"]={"<<w[ant2][0]<<", "<<w[ant2][1]<<", "<<w[ant2][2]<<", "<<w[ant2][3]<<"}"<<endl;
diff --git a/CEP/DP3/DPPP/src/MSReader.cc b/CEP/DP3/DPPP/src/MSReader.cc
index 11168dfba7b6aa50a1a684047bb9b2442a4b4af1..358294cfe460aa19ede18671c7a8a8aa3f0720ff 100644
--- a/CEP/DP3/DPPP/src/MSReader.cc
+++ b/CEP/DP3/DPPP/src/MSReader.cc
@@ -53,7 +53,6 @@ namespace LOFAR {
MSReader::MSReader()
: itsReadVisData (False),
- itsReadModelData (False),
itsLastMSTime (0),
itsNrRead (0),
itsNrInserted (0)
@@ -64,7 +63,6 @@ namespace LOFAR {
const string& prefix,
bool missingData)
: itsReadVisData (False),
- itsReadModelData (False),
itsMissingData (missingData),
itsLastMSTime (0),
itsNrRead (0),
@@ -77,6 +75,7 @@ namespace LOFAR {
itsNrChanStr = parset.getString (prefix+"nchan", "0");
string startTimeStr = parset.getString (prefix+"starttime", "");
string endTimeStr = parset.getString (prefix+"endtime", "");
+ itsTimeTolerance = parset.getDouble (prefix+"timetolerance", 1e-2);
itsUseFlags = parset.getBool (prefix+"useflag", true);
itsDataColName = parset.getString (prefix+"datacolumn", "DATA");
itsWeightColName = parset.getString (prefix+"weightcolumn",
@@ -209,16 +208,20 @@ namespace LOFAR {
itsReadVisData = readVisData;
}
- void MSReader::setReadModelData(bool readModelData)
- {
- itsReadModelData = readModelData;
- }
-
bool MSReader::process (const DPBuffer&)
{
+ if (itsNrRead == 0) {
+ if (itsReadVisData) {
+ itsBuffer.getData().resize (itsNrCorr, itsNrChan, itsNrBl);
+ }
+ if (itsUseFlags) {
+ itsBuffer.getFlags().resize (itsNrCorr, itsNrChan, itsNrBl);
+ }
+ ///cout<<(void*)(itsBuffer.getData().data())<<" upd"<<endl;
+ }
{
NSTimer::StartStop sstime(itsTimer);
- itsBuffer.clear();
+ /// itsBuffer.clear();
// Use time from the current time slot in the MS.
bool useIter = false;
while (!itsIter.pastEnd()) {
@@ -233,8 +236,10 @@ namespace LOFAR {
} else {
// Use the time slot if near or < nexttime, but > starttime.
// In this way we cater for irregular times in some WSRT MSs.
- if (near(mstime, itsNextTime) ||
- (mstime > itsFirstTime && mstime < itsNextTime)) {
+ if (nearAbs(mstime, itsNextTime, itsTimeTolerance)) {
+ useIter = true;
+ break;
+ } else if (mstime > itsFirstTime && mstime < itsNextTime) {
itsFirstTime -= itsNextTime-mstime;
itsNextTime = mstime;
useIter = true;
@@ -260,49 +265,45 @@ namespace LOFAR {
// Need to insert a fully flagged time slot.
itsBuffer.setRowNrs (Vector<uint>());
itsBuffer.setExposure (itsTimeInterval);
- itsBuffer.getData().resize (itsNrCorr, itsNrChan, itsNrBl);
- itsBuffer.getFlags().resize (itsNrCorr, itsNrChan, itsNrBl);
- itsBuffer.getData() = Complex();
itsBuffer.getFlags() = true;
- // Calculate UVWs for them. Setup UVW object if not done yet.
- calcUVW();
+ if (itsReadVisData){
+ itsBuffer.getData() = Complex();
+ }
itsNrInserted++;
} else {
itsBuffer.setRowNrs (itsIter.table().rowNumbers(itsMS, True));
if (itsMissingData) {
// Data column not present, so fill a fully flagged time slot.
itsBuffer.setExposure (itsTimeInterval);
- itsBuffer.getData().resize (itsNrCorr, itsNrChan, itsNrBl);
- itsBuffer.getFlags().resize (itsNrCorr, itsNrChan, itsNrBl);
- itsBuffer.getData() = Complex();
itsBuffer.getFlags() = true;
+ if (itsReadVisData) {
+ itsBuffer.getData() = Complex();
+ }
} else {
// Set exposure.
itsBuffer.setExposure (ROScalarColumn<double>
(itsIter.table(), "EXPOSURE")(0));
// Get data and flags from the MS.
+ /// if (itsNrRead%50 < 4) {
+ /// cout<<(void*)(itsBuffer.getData().data())<<" rd1"<<endl;
+ ///}
if (itsReadVisData) {
ROArrayColumn<Complex> dataCol(itsIter.table(), itsDataColName);
if (itsUseAllChan) {
- itsBuffer.setData (dataCol.getColumn());
- } else {
- itsBuffer.setData (dataCol.getColumn(itsColSlicer));
- }
- }
- if (itsReadModelData) {
- ROArrayColumn<Complex> modelCol(itsIter.table(), itsModelColName);
- if (itsUseAllChan) {
- itsBuffer.setModel(modelCol.getColumn());
+ dataCol.getColumn (itsBuffer.getData());
} else {
- itsBuffer.setModel(modelCol.getColumn(itsColSlicer));
+ dataCol.getColumn (itsColSlicer, itsBuffer.getData());
}
}
+ ///if (itsNrRead%50 < 4) {
+ ///cout<<(void*)(itsBuffer.getData().data())<<" rd2"<<endl;
+ ///}
if (itsUseFlags) {
ROArrayColumn<bool> flagCol(itsIter.table(), "FLAG");
if (itsUseAllChan) {
- itsBuffer.setFlags (flagCol.getColumn());
+ flagCol.getColumn (itsBuffer.getFlags());
} else {
- itsBuffer.setFlags (flagCol.getColumn(itsColSlicer));
+ flagCol.getColumn(itsColSlicer, itsBuffer.getFlags());
}
// Set flags if FLAG_ROW is set.
ROScalarColumn<bool> flagrowCol(itsIter.table(), "FLAG_ROW");
@@ -338,7 +339,8 @@ namespace LOFAR {
}
void MSReader::flagInfNaN(const casa::Cube<casa::Complex>& dataCube,
- casa::Cube<bool>& flagsCube, FlagCounter& flagCounter) {
+ casa::Cube<bool>& flagsCube,
+ FlagCounter& flagCounter) {
int ncorr=dataCube.shape()[0];
const Complex* dataPtr = dataCube.data();
bool* flagPtr = flagsCube.data();
@@ -641,76 +643,78 @@ namespace LOFAR {
}
}
- void MSReader::calcUVW()
+ void MSReader::calcUVW (double time, DPBuffer& buf)
{
- Matrix<double> uvws(3, itsNrBl);
+ Matrix<double>& uvws = buf.getUVW();
+ uvws.resize (3, itsNrBl);
const Vector<Int>& ant1 = getInfo().getAnt1();
const Vector<Int>& ant2 = getInfo().getAnt2();
for (uint i=0; i<itsNrBl; ++i) {
- uvws.column(i) = itsUVWCalc.getUVW (ant1[i], ant2[i], itsNextTime);
+ uvws.column(i) = itsUVWCalc.getUVW (ant1[i], ant2[i], time);
}
- itsBuffer.setUVW (uvws);
}
- Matrix<double> MSReader::getUVW (const RefRows& rowNrs)
+ void MSReader::getUVW (const RefRows& rowNrs, double time, DPBuffer& buf)
{
NSTimer::StartStop sstime(itsTimer);
- // Empty rownrs cannot happen for data, because in that case the buffer
- // should contain UVW for a missing time slot.
- ASSERT (! rowNrs.rowVector().empty());
- ROArrayColumn<double> dataCol(itsMS, "UVW");
- return dataCol.getColumnCells (rowNrs);
+ // Calculate UVWs if empty rownrs (i.e., missing data).
+ if (rowNrs.rowVector().empty()) {
+ calcUVW (time, buf);
+ } else {
+ ROArrayColumn<double> dataCol(itsMS, "UVW");
+ dataCol.getColumnCells (rowNrs, buf.getUVW());
+ }
}
- Cube<float> MSReader::getWeights (const RefRows& rowNrs,
- const DPBuffer& buf)
+ void MSReader::getWeights (const RefRows& rowNrs, DPBuffer& buf)
{
NSTimer::StartStop sstime(itsTimer);
+ Cube<float>& weights = buf.getWeights();
+ // Resize if needed (probably when called for first time).
+ if (weights.empty()) {
+ weights.resize (itsNrCorr, itsNrChan, itsNrBl);
+ }
if (rowNrs.rowVector().empty()) {
// rowNrs can be empty if a time slot was inserted.
- Cube<float> weights(itsNrCorr, itsNrChan, itsNrBl);
weights = 0;
- return weights;
- }
- Cube<float> weights;
- // Get weights for entire spectrum if present.
- if (itsHasWeightSpectrum) {
- ROArrayColumn<float> wsCol(itsMS, itsWeightColName);
- // Using getColumnCells(rowNrs,itsColSlicer) fails for LofarStMan.
- // Hence work around it.
- weights.reference (wsCol.getColumnCells (rowNrs));
- if (!itsUseAllChan) {
- // Make a copy, so the weights are consecutive in memory.
- weights.reference (weights(itsArrSlicer).copy());
- }
} else {
- // No spectrum present; get global weights and assign to each channel.
- ROArrayColumn<float> wCol(itsMS, "WEIGHT");
- Matrix<float> inArr = wCol.getColumnCells (rowNrs);
- Cube<float> outArr(itsNrCorr, itsNrChan, itsNrBl);
- float* inPtr = inArr.data();
- float* outPtr = outArr.data();
- for (uint i=0; i<itsNrBl; ++i) {
- // If global weights are zero, set them to 1. Some old MSs need that.
- for (uint k=0; k<itsNrCorr; ++k) {
- if (inPtr[k] == 0.) {
- inPtr[k] = 1.;
- }
+ // Get weights for entire spectrum if present.
+ if (itsHasWeightSpectrum) {
+ ROArrayColumn<float> wsCol(itsMS, itsWeightColName);
+ // Using getColumnCells(rowNrs,itsColSlicer) fails for LofarStMan.
+ // Hence work around it.
+ if (itsUseAllChan) {
+ wsCol.getColumnCells (rowNrs, weights);
+ } else {
+ Cube<float> w = wsCol.getColumnCells (rowNrs);
+ weights = w(itsArrSlicer);
}
- for (uint j=0; j<itsNrChan; ++j) {
+ } else {
+ // No spectrum present; get global weights and assign to each channel.
+ ROArrayColumn<float> wCol(itsMS, "WEIGHT");
+ Matrix<float> inArr = wCol.getColumnCells (rowNrs);
+ float* inPtr = inArr.data();
+ float* outPtr = weights.data();
+ for (uint i=0; i<itsNrBl; ++i) {
+ // Set global weights to 1 if zero. Some old MSs need that.
for (uint k=0; k<itsNrCorr; ++k) {
- *outPtr++ = inPtr[k];
+ if (inPtr[k] == 0.) {
+ inPtr[k] = 1.;
+ }
+ }
+ for (uint j=0; j<itsNrChan; ++j) {
+ for (uint k=0; k<itsNrCorr; ++k) {
+ *outPtr++ = inPtr[k];
+ }
}
+ inPtr += itsNrCorr;
}
- inPtr += itsNrCorr;
}
- weights.reference (outArr);
- }
- if (itsAutoWeight) {
- // Adapt weights using autocorrelations.
- autoWeight (weights, buf);
+ if (itsAutoWeight) {
+ // Adapt weights using autocorrelations.
+ autoWeight (weights, buf);
+ }
}
- return weights;
}
void MSReader::autoWeight (Cube<float>& weights, const DPBuffer& buf)
@@ -761,16 +765,24 @@ namespace LOFAR {
}
}
- Cube<bool> MSReader::getFullResFlags (const RefRows& rowNrs)
+ bool MSReader::getFullResFlags (const RefRows& rowNrs, DPBuffer& buf)
{
NSTimer::StartStop sstime(itsTimer);
+ Cube<bool>& flags = buf.getFullResFlags();
int norigchan = itsNrChan * itsFullResNChanAvg;
- // Return empty array if no fullRes flags.
+ // Resize if needed (probably when called for first time).
+ if (flags.empty()) {
+ flags.resize (norigchan, itsFullResNTimeAvg, itsNrBl);
+ }
+ // Return false if no fullRes flags available.
if (!itsHasFullResFlags) {
- return Cube<bool>();
- } else if (rowNrs.rowVector().empty()) {
- // Return all False if rows are missing.
- return Cube<bool>(norigchan, itsFullResNTimeAvg, itsNrBl, true);
+ flags = false;
+ return false;
+ }
+ // Flag everything if data rows are missing.
+ if (rowNrs.rowVector().empty()) {
+ flags = true;
+ return true;
}
ROArrayColumn<uChar> fullResFlagCol(itsMS, "LOFAR_FULL_RES_FLAG");
int origstart = itsStartChan * itsFullResNChanAvg;
@@ -781,40 +793,41 @@ namespace LOFAR {
// ntimeavg is the nr of times used when averaging.
// Return it as Cube<bool>[norigchan,ntimeavg,nrbl].
IPosition chShape = chars.shape();
- IPosition ofShape(3, norigchan, chShape[1], chShape[2]);
- Cube<bool> flags(ofShape);
+ ASSERT (chShape[1] == itsFullResNTimeAvg && chShape[2] == itsNrBl);
// Now expand the bits to bools.
// If all bits to convert are contiguous, do it all in one go.
// Otherwise we have to iterate.
- if (ofShape[0] == chShape[0]*8) {
+ if (norigchan == chShape[0]*8) {
Conversion::bitToBool (flags.data(), chars.data(), flags.size());
} else {
- ASSERT (ofShape[0] < chShape[0]*8);
+ ASSERT (norigchan < chShape[0]*8);
const uChar* charsPtr = chars.data();
bool* flagsPtr = flags.data();
- for (int i=0; i<ofShape[1]*ofShape[2]; ++i) {
- Conversion::bitToBool (flagsPtr, charsPtr, origstart, ofShape[0]);
- flagsPtr += ofShape[0];
+ for (int i=0; i<chShape[1]*chShape[2]; ++i) {
+ Conversion::bitToBool (flagsPtr, charsPtr, origstart, norigchan);
+ flagsPtr += norigchan;
charsPtr += chShape[0];
}
}
- return flags;
+ return true;
}
- /*
- Cube<Complex> MSReader::getData (const String& columnName,
- const RefRows& rowNrs)
+ void MSReader::getModelData (const casa::RefRows& rowNrs,
+ casa::Cube<casa::Complex>& arr)
{
NSTimer::StartStop sstime(itsTimer);
- // Empty rownrs cannot happen for data, because in that case the buffer
- // should contain data for a missing time slot.
- ASSERT (! rowNrs.rowVector().empty());
- ROArrayColumn<Complex> dataCol(itsMS, columnName);
- // Also work around LofarStMan/getColumnCells slice problem.
- Cube<Complex> data = dataCol.getColumnCells (rowNrs);
- return (itsUseAllChan ? data : data(itsArrSlicer));
+ if (rowNrs.rowVector().empty()) {
+ arr.resize (itsNrCorr, itsNrChan, itsNrBl);
+ arr = Complex();
+ } else {
+ ROArrayColumn<Complex> modelCol(itsMS, itsModelColName);
+ if (itsUseAllChan) {
+ modelCol.getColumnCells (rowNrs, arr);
+ } else {
+ modelCol.getColumnCells (rowNrs, itsColSlicer, arr);
+ }
+ }
}
- */
void MSReader::fillBeamInfo (vector<StationResponse::Station::Ptr>& vec,
const Vector<String>& antNames)
diff --git a/CEP/DP3/DPPP/src/MSUpdater.cc b/CEP/DP3/DPPP/src/MSUpdater.cc
index ed5de3a25d02768a639ee00bb9bf225233c84ef9..c363925f0f80c3a2688f6de4a247bfe4de22fa49 100644
--- a/CEP/DP3/DPPP/src/MSUpdater.cc
+++ b/CEP/DP3/DPPP/src/MSUpdater.cc
@@ -156,8 +156,9 @@ namespace LOFAR {
putData (buf.getRowNrs(), buf.getData());
}
if (itsWriteWeight) {
+ itsBuffer.referenceFilled (buf);
putWeights (buf.getRowNrs(),
- itsReader->fetchWeights(buf, buf.getRowNrs(), itsTimer));
+ itsReader->fetchWeights(buf, itsBuffer, itsTimer));
}
itsNrDone++;
if (itsNrTimesFlush > 0 && itsNrDone%itsNrTimesFlush == 0) {
diff --git a/CEP/DP3/DPPP/src/MSWriter.cc b/CEP/DP3/DPPP/src/MSWriter.cc
index f7798db86700a31b8eccfab243950600c4d478f8..0fabd8fff9008331efbfeb4068e7c97d21820e5a 100644
--- a/CEP/DP3/DPPP/src/MSWriter.cc
+++ b/CEP/DP3/DPPP/src/MSWriter.cc
@@ -35,6 +35,7 @@
#include <tables/Tables/SetupNewTab.h>
#include <tables/Tables/ArrColDesc.h>
#include <tables/Tables/StandardStMan.h>
+#include <tables/Tables/TiledStManAccessor.h>
#include <measures/TableMeasures/ArrayMeasColumn.h>
#include <measures/Measures/MCDirection.h>
#include <casa/Arrays/ArrayMath.h>
@@ -81,7 +82,7 @@ namespace LOFAR {
ASSERTSTR (itsWeightColName == "WEIGHT_SPECTRUM", "Currently only the "
"WEIGHT_SPECTRUM column can be used as output when writing a new MS");
// Create the MS.
- if (tileNChan <= 0) {
+ if (tileNChan <= 0 || tileNChan > info.nchan()) {
tileNChan = info.nchan();
}
createMS (outName, info, tileSize, tileNChan);
@@ -124,6 +125,14 @@ namespace LOFAR {
{
NSTimer::StartStop sstime(itsTimer);
itsMS.flush();
+ ///ROTiledStManAccessor acc1(itsMS, "TiledData");
+ ///acc1.showCacheStatistics (cout);
+ ///ROTiledStManAccessor acc2(itsMS, "TiledFlag");
+ ///acc2.showCacheStatistics (cout);
+ ///ROTiledStManAccessor acc3(itsMS, "TiledUVW");
+ ///acc3.showCacheStatistics (cout);
+ ///ROTiledStManAccessor acc4(itsMS, "TiledFullResFlag");
+ ///acc4.showCacheStatistics (cout);
// Create the VDS file.
if (! itsClusterDesc.empty()) {
string vdsName = itsMS.tableName() + ".vds";
@@ -299,7 +308,7 @@ namespace LOFAR {
// this run, so the full resolution is the combination of both.
uint orignchan = itsNrChan * itsNChanAvg;
IPosition dataShapeF(2, (orignchan+7)/8, itsNTimeAvg);
- IPosition tileShapeF(2, (orignchan+7)/8, 1024);
+ IPosition tileShapeF(3, (orignchan+7)/8, 1024, tileShape[2]);
TiledColumnStMan tsmf("TiledFullResFlag", tileShapeF);
ArrayColumnDesc<uChar> padesc("LOFAR_FULL_RES_FLAG",
"flags in original full resolution",
@@ -489,19 +498,20 @@ namespace LOFAR {
ArrayColumn<Float> weightCol(out, "WEIGHT_SPECTRUM");
ArrayColumn<Double> uvwCol(out, "UVW");
// Do not account for getting the data in the timings.
- Array<Float> weights (itsReader->fetchWeights (buf, buf.getRowNrs(),
- itsTimer));
+ itsBuffer.referenceFilled (buf);
+ const Array<Float>& weights = itsReader->fetchWeights (buf, itsBuffer,
+ itsTimer);
weightCol.putColumn (weights);
- Array<Double> uvws (itsReader->fetchUVW (buf, buf.getRowNrs(),
- itsTimer));
+ const Array<Double>& uvws = itsReader->fetchUVW (buf, itsBuffer,
+ itsTimer);
uvwCol.putColumn (uvws);
}
void MSWriter::writeFullResFlags (Table& out, const DPBuffer& buf)
{
// Get the flags.
- Cube<bool> flags (itsReader->fetchFullResFlags (buf, buf.getRowNrs(),
- itsTimer));
+ const Cube<bool>& flags = itsReader->fetchFullResFlags (buf, itsBuffer,
+ itsTimer);
const IPosition& ofShape = flags.shape();
ASSERTSTR (uint(ofShape[0]) == itsNChanAvg * itsNrChan,
ofShape<<itsNChanAvg<<'*'<<itsNrChan);
diff --git a/CEP/DP3/DPPP/src/MedFlagger.cc b/CEP/DP3/DPPP/src/MedFlagger.cc
index 544138e1e769543d7db951fd873e89590daa3270..7080736e426398472470acb27da9c00b8a178f70 100644
--- a/CEP/DP3/DPPP/src/MedFlagger.cc
+++ b/CEP/DP3/DPPP/src/MedFlagger.cc
@@ -130,6 +130,11 @@ namespace LOFAR {
// Evaluate the window size expressions.
getExprValues (infoIn.nchan(), infoIn.ntime());
itsBuf.resize (itsTimeWindow);
+ itsAmpl.resize (itsTimeWindow);
+ for (size_t i=0; i<itsAmpl.size(); ++i) {
+ itsAmpl[i].resize (infoIn.ncorr(), infoIn.nchan(),
+ infoIn.nbaselines());
+ }
// Set or check the correlations to flag on.
vector<uint> flagCorr;
uint ncorr = infoIn.ncorr();
@@ -163,12 +168,10 @@ namespace LOFAR {
// Accumulate in the time window.
// The buffer is wrapped, thus oldest entries are overwritten.
uint index = itsNTimes % itsTimeWindow;
- itsBuf[index] = buf;
- // Calculate amplitudes if needed.
+ itsBuf[index].copy (buf);
DPBuffer& dbuf = itsBuf[index];
- if (dbuf.getAmplitudes().empty()) {
- dbuf.setAmplitudes (amplitude(dbuf.getData()));
- }
+ // Calculate amplitudes if needed.
+ amplitude (itsAmpl[index], dbuf.getData());
// Fill flags if needed.
if (dbuf.getFlags().empty()) {
dbuf.getFlags().resize (dbuf.getData().shape());
@@ -273,7 +276,7 @@ namespace LOFAR {
int nrbl = shp[2]; // OpenMP 2.5 needs signed iteration variables
uint ntime = timeEntries.size();
// Get pointers to data and flags.
- const float* bufDataPtr = buf.getAmplitudes().data();
+ const float* bufDataPtr = itsAmpl[index].data();
bool* bufFlagPtr = buf.getFlags().data();
float MAD = 1.4826; //# constant determined by Pandey
itsComputeTimer.start();
@@ -431,9 +434,10 @@ namespace LOFAR {
const uint* endIter = iter + itsTimeWindowArr[bl];
for (; iter!=endIter; ++iter) {
const DPBuffer& inbuf = itsBuf[*iter];
+ const Cube<float>& ampl = itsAmpl[*iter];
// Get pointers to given baseline and correlation.
uint offset = bl*nchan*ncorr + corr;
- const float* dataPtr = inbuf.getAmplitudes().data() + offset;
+ const float* dataPtr = ampl.data() + offset;
const bool* flagPtr = inbuf.getFlags().data() + offset;
// Now move data from the two channel parts.
for (int i=s1*ncorr; i<e1*ncorr; i+=ncorr) {
diff --git a/CEP/DP3/DPPP/src/MultiMSReader.cc b/CEP/DP3/DPPP/src/MultiMSReader.cc
index aed2f289ab8cb1f2dccb424353fdfdedc059d16b..99a1fcc088df30643d6f399981247ec0d377146d 100644
--- a/CEP/DP3/DPPP/src/MultiMSReader.cc
+++ b/CEP/DP3/DPPP/src/MultiMSReader.cc
@@ -85,6 +85,7 @@ namespace LOFAR {
}
}
ASSERTSTR (itsFirst>=0, "All input MeasurementSets do not exist");
+ itsBuffers.resize (itsReaders.size());
}
MultiMSReader::~MultiMSReader()
@@ -200,14 +201,15 @@ namespace LOFAR {
itsBuffer.setTime (buf1.getTime());
itsBuffer.setExposure (buf1.getExposure());
itsBuffer.setRowNrs (buf1.getRowNrs());
- itsBuffer.setUVW (buf1.getUVW());
// Size the buffers.
- if (itsReadVisData) {
- itsBuffer.getData().resize (IPosition(3, itsNrCorr,
- itsNrChan, itsNrBl));
+ if (itsBuffer.getFlags().empty()) {
+ if (itsReadVisData) {
+ itsBuffer.getData().resize (IPosition(3, itsNrCorr,
+ itsNrChan, itsNrBl));
+ }
+ itsBuffer.getFlags().resize (IPosition(3, itsNrCorr,
+ itsNrChan, itsNrBl));
}
- itsBuffer.getFlags().resize (IPosition(3, itsNrCorr,
- itsNrChan, itsNrBl));
// Loop through all readers and get data and flags.
IPosition s(3, 0, 0, 0);
IPosition e(3, itsNrCorr-1, 0, itsNrBl-1);
@@ -355,100 +357,70 @@ namespace LOFAR {
}
}
- Matrix<double> MultiMSReader::getUVW (const RefRows& rowNrs)
+ void MultiMSReader::getUVW (const RefRows& rowNrs,
+ double time, DPBuffer& buf)
{
// All MSs have the same UVWs, so use first one.
- return itsReaders[itsFirst]->getUVW (rowNrs);
+ itsReaders[itsFirst]->getUVW (rowNrs, time, buf);
}
- Cube<float> MultiMSReader::getWeights (const RefRows& rowNrs,
- const DPBuffer& buf)
+ void MultiMSReader::getWeights (const RefRows& rowNrs, DPBuffer& buf)
{
- Cube<float> weights(itsNrCorr, itsNrChan, itsNrBl);
+ Cube<float>& weights = buf.getWeights();
+ // Resize if needed (probably when called for first time).
+ if (weights.empty()) {
+ weights.resize (itsNrCorr, itsNrChan, itsNrBl);
+ }
IPosition s(3, 0, 0, 0);
IPosition e(3, itsNrCorr-1, 0, itsNrBl-1);
for (uint i=0; i<itsReaders.size(); ++i) {
if (itsReaders[i]) {
uint nchan = itsReaders[i]->getInfo().nchan();
e[1] = s[1] + nchan-1;
- weights(s,e) = itsReaders[i]->getWeights (rowNrs, buf);
+ itsReaders[i]->getWeights (rowNrs, itsBuffers[i]);
+ weights(s,e) = itsBuffers[i].getWeights();
} else {
e[1] = s[1] + itsFillNChan-1;
weights(s,e) = float(0);
}
s[1] = e[1] + 1;
}
- return weights;
}
- Cube<bool> MultiMSReader::getFullResFlags (const RefRows& rowNrs)
+ bool MultiMSReader::getFullResFlags (const RefRows& rowNrs,
+ DPBuffer& buf)
{
- // Return empty array if no fullRes flags.
- if (!itsHasFullResFlags || rowNrs.rowVector().empty()) {
- return Cube<bool>();
+ Cube<bool>& flags = buf.getFullResFlags();
+ // Resize if needed (probably when called for first time).
+ if (flags.empty()) {
+ int norigchan = itsNrChan * itsFullResNChanAvg;
+ flags.resize (norigchan, itsFullResNTimeAvg, itsNrBl);
}
- Cube<bool> flags;
- vector<Cube<bool> > fullResFlags;
- fullResFlags.reserve (itsReaders.size());
- for (uint i=0; i<itsReaders.size(); ++i) {
- if (itsReaders[i]) {
- fullResFlags.push_back (itsReaders[i]->getFullResFlags (rowNrs));
- } else {
- // Fill a cube for missing fullres flags only once.
- if (itsFullResCube.empty()) {
- itsFullResCube.resize (itsFillNChan*itsFullResNChanAvg,
- itsFullResNTimeAvg,
- itsNrBl);
- itsFullResCube = True;
- }
- fullResFlags.push_back (itsFullResCube);
- }
+ // Return false if no fullRes flags available.
+ if (!itsHasFullResFlags) {
+ flags = false;
+ return false;
}
- combineFullResFlags (fullResFlags, flags);
- return flags;
- }
-
- /*
- Cube<Complex> MultiMSReader::getData (const String& columnName,
- const RefRows& rowNrs)
- {
- Cube<Complex> data(itsNrCorr, itsNrChan, itsNrBl);
- IPosition s(3, 0, 0, 0);
- IPosition e(3, itsNrCorr-1, 0, itsNrBl-1);
+ // Flag everything if data rows are missing.
+ if (rowNrs.rowVector().empty()) {
+ flags = true;
+ return true;
+ }
+ // Get the flags from all MSs and combine them.
+ IPosition s(3, 0);
+ IPosition e(flags.shape() - 1);
for (uint i=0; i<itsReaders.size(); ++i) {
if (itsReaders[i]) {
- uint nchan = itsReaders[i]->getInfo().nchan();
- e[1] = s[1] + nchan-1;
- data(s,e) = itsReaders[i]->getData (columnName, rowNrs);
+ itsReaders[i]->getFullResFlags (rowNrs, itsBuffers[i]);
+ e[0] = s[0] + itsBuffers[i].getFullResFlags().shape()[0] - 1;
+ flags(s,e) = itsBuffers[i].getFullResFlags();
} else {
- e[1] = s[1] + itsFillNChan-1;
- data(s,e) = Complex();
+ e[0] = s[0] + itsFillNChan - 1;
+ flags(s,e) = true;
}
- s[1] = e[1] + 1;
- }
- return data;
- }
- */
-
- void MultiMSReader::combineFullResFlags (const vector<Cube<bool> >& vec,
- Cube<bool>& flags) const
- {
- // The cubes have axes nchan, ntimeavg, nbl.
- IPosition s(3, 0);
- IPosition e(vec[0].shape());
- // Count nr of channels.
- uint nchan = 0;
- for (uint i=0; i<vec.size(); ++i) {
- nchan += vec[i].shape()[0];
- }
- e[0] = nchan;
- flags.resize (e);
- e -= 1;
- for (uint i=0; i<vec.size(); ++i) {
- e[0] = s[0] + vec[i].shape()[0] - 1;
- flags(s,e) = vec[i];
s[0] = e[0] + 1;
}
+ return true;
}
} //# end namespace
diff --git a/CEP/DP3/DPPP/src/PhaseShift.cc b/CEP/DP3/DPPP/src/PhaseShift.cc
index 4501069dcd8190ae3b017486a06be79e94b218a9..eeb284328e567f33fab5e7cd2059775d962db401 100644
--- a/CEP/DP3/DPPP/src/PhaseShift.cc
+++ b/CEP/DP3/DPPP/src/PhaseShift.cc
@@ -119,18 +119,12 @@ namespace LOFAR {
bool PhaseShift::process (const DPBuffer& buf)
{
itsTimer.start();
- DPBuffer newBuf(buf);
- RefRows rowNrs(newBuf.getRowNrs());
- if (newBuf.getUVW().empty()) {
- newBuf.getUVW().reference (itsInput->fetchUVW (newBuf, rowNrs,
- itsTimer));
- }
- // Make sure no other object references the DATA and UVW arrays.
- newBuf.getData().unique();
- newBuf.getUVW().unique();
- int ncorr = newBuf.getData().shape()[0];
- int nchan = newBuf.getData().shape()[1];
- int nbl = newBuf.getData().shape()[2];
+ ///itsBuf.referenceFilled (buf);
+ itsBuf.copy (buf);
+ itsInput->fetchUVW (buf, itsBuf, itsTimer);
+ int ncorr = itsBuf.getData().shape()[0];
+ int nchan = itsBuf.getData().shape()[1];
+ int nbl = itsBuf.getData().shape()[2];
DBGASSERT (itsPhasors.nrow() == uint(nchan) &&
itsPhasors.ncolumn() == uint(nbl));
const double* mat1 = itsMat1.data();
@@ -139,8 +133,8 @@ namespace LOFAR {
//# to process.
#pragma omp parallel for
for (int i=0; i<nbl; ++i) {
- Complex* __restrict__ data = newBuf.getData().data() + i*nchan*ncorr;
- double* __restrict__ uvw = newBuf.getUVW().data() + i*3;
+ Complex* __restrict__ data = itsBuf.getData().data() + i*nchan*ncorr;
+ double* __restrict__ uvw = itsBuf.getUVW().data() + i*3;
DComplex* __restrict__ phasors = itsPhasors.data() + i*nchan;
double u = uvw[0]*mat1[0] + uvw[1]*mat1[3] + uvw[2]*mat1[6];
double v = uvw[0]*mat1[1] + uvw[1]*mat1[4] + uvw[2]*mat1[7];
@@ -165,7 +159,7 @@ namespace LOFAR {
uvw += 3;
} //# end omp parallel for
itsTimer.stop();
- getNextStep()->process (newBuf);
+ getNextStep()->process (itsBuf);
return true;
}
diff --git a/CEP/DP3/DPPP/src/PreFlagger.cc b/CEP/DP3/DPPP/src/PreFlagger.cc
index b08631782d0d5b1f5f974ded6909b1e24fa31296..a172a3785d4e57336077ce19f351114f1144826c 100644
--- a/CEP/DP3/DPPP/src/PreFlagger.cc
+++ b/CEP/DP3/DPPP/src/PreFlagger.cc
@@ -127,19 +127,19 @@ namespace LOFAR {
bool PreFlagger::process (const DPBuffer& buf)
{
itsTimer.start();
- DPBuffer out(buf);
- // The flags will be changed, so make sure we have a unique array.
- out.getFlags().unique();
+ // Because no buffers are kept, we can reference the filled arrays
+ // in the input buffer instead of copying them.
+ itsBuffer.referenceFilled (buf);
// Do the PSet steps and combine the result with the current flags.
// Only count if the flag changes.
- Cube<bool>* flags = itsPSet.process (out, itsCount, Block<bool>(),
- itsTimer);
+ Cube<bool>* flags = itsPSet.process (buf, itsBuffer, itsCount,
+ Block<bool>(), itsTimer);
const IPosition& shape = flags->shape();
uint nrcorr = shape[0];
uint nrchan = shape[1];
uint nrbl = shape[2];
const bool* inPtr = flags->data();
- bool* outPtr = out.getFlags().data();
+ bool* outPtr = itsBuffer.getFlags().data();
switch (itsMode) {
case SetFlag:
setFlags (inPtr, outPtr, nrcorr, nrchan, nrbl, true);
@@ -156,7 +156,7 @@ namespace LOFAR {
}
itsTimer.stop();
// Let the next step do its processing.
- getNextStep()->process (out);
+ getNextStep()->process (itsBuffer);
itsCount++;
return true;
}
@@ -186,7 +186,7 @@ namespace LOFAR {
bool mode, const DPBuffer& buf)
{
const Complex* dataPtr = buf.getData().data();
- Cube<float> weights = itsInput->fetchWeights (buf, buf.getRowNrs(),
+ Cube<float> weights = itsInput->fetchWeights (buf, itsBuffer,
itsTimer);
const float* weightPtr = weights.data();
for (uint i=0; i<nrbl; ++i) {
@@ -480,7 +480,8 @@ namespace LOFAR {
}
}
- Cube<bool>* PreFlagger::PSet::process (DPBuffer& out,
+ Cube<bool>* PreFlagger::PSet::process (const DPBuffer& in,
+ DPBuffer& out,
uint timeSlot,
const Block<bool>& matchBL,
NSTimer& timer)
@@ -503,7 +504,7 @@ namespace LOFAR {
// Take over the baseline info from the parent. Default is all.
if (matchBL.empty()) {
itsMatchBL = true;
- } else{
+ } else {
itsMatchBL = matchBL;
}
// The PSet tree is a combination of ORs and ANDs.
@@ -521,8 +522,8 @@ namespace LOFAR {
return &itsFlags;
}
// Flag on UV distance if necessary.
- if (itsFlagOnUV && !flagUV (itsInput->fetchUVW(out, out.getRowNrs(),
- timer))) {
+ if (itsFlagOnUV && !flagUV (itsInput->fetchUVW (in, out,
+ timer))) {
return &itsFlags;
}
// Flag on AzEl is necessary.
@@ -543,10 +544,7 @@ namespace LOFAR {
}
// Flag on amplitude, phase or real/imaginary if necessary.
if (itsFlagOnAmpl) {
- if (out.getAmplitudes().empty()) {
- out.setAmplitudes (amplitude(out.getData()));
- }
- flagAmpl (out.getAmplitudes());
+ flagAmpl (amplitude(out.getData()));
}
if (itsFlagOnReal) {
flagReal (out.getData());
@@ -567,8 +565,8 @@ namespace LOFAR {
for (vector<int>::const_iterator oper = itsRpn.begin();
oper != itsRpn.end(); ++oper) {
if (*oper >= 0) {
- results.push (itsPSets[*oper]->process (out, timeSlot, itsMatchBL,
- timer));
+ results.push (itsPSets[*oper]->process (in, out, timeSlot,
+ itsMatchBL, timer));
} else if (*oper == OpNot) {
Cube<bool>* left = results.top();
// No ||= operator exists, so use the transform function.
diff --git a/CEP/DP3/DPPP/src/StationAdder.cc b/CEP/DP3/DPPP/src/StationAdder.cc
index af472adcb5d4214f381329c65c0e73ae55429ee5..d62995b3a8f524bde93ba8c52eb68d0c34e3d24b 100644
--- a/CEP/DP3/DPPP/src/StationAdder.cc
+++ b/CEP/DP3/DPPP/src/StationAdder.cc
@@ -292,13 +292,16 @@ namespace LOFAR {
bool StationAdder::process (const DPBuffer& buf)
{
itsTimer.start();
- RefRows rowNrs(buf.getRowNrs());
// Get the various data arrays.
+ itsBufTmp.referenceFilled (buf);
const Array<Complex>& data = buf.getData();
const Array<Bool>& flags = buf.getFlags();
- Array<Float> weights(itsInput->fetchWeights (buf, rowNrs, itsTimer));
- Array<Double> uvws(itsInput->fetchUVW (buf, rowNrs, itsTimer));
- Array<Bool> frFlags(itsInput->fetchFullResFlags(buf, rowNrs, itsTimer));
+ const Array<Float>& weights =
+ itsInput->fetchWeights (buf, itsBufTmp, itsTimer);
+ const Array<Double>& uvws =
+ itsInput->fetchUVW (buf, itsBufTmp, itsTimer);
+ const Array<Bool>& frFlags =
+ itsInput->fetchFullResFlags (buf, itsBufTmp, itsTimer);
// Size fullResFlags if not done yet.
if (itsBuf.getFullResFlags().empty()) {
IPosition frfShp = frFlags.shape();
diff --git a/CEP/DP3/DPPP/src/UVWFlagger.cc b/CEP/DP3/DPPP/src/UVWFlagger.cc
index 4c66f5184190fa709126fd374a2e32263d356d6f..051b16170e9060843b4d283980f5ecbd6463cca0 100644
--- a/CEP/DP3/DPPP/src/UVWFlagger.cc
+++ b/CEP/DP3/DPPP/src/UVWFlagger.cc
@@ -127,10 +127,10 @@ namespace LOFAR {
bool UVWFlagger::process (const DPBuffer& buf)
{
itsTimer.start();
- DPBuffer out(buf);
- // The flags will be changed, so make sure we have a unique array.
- Cube<bool>& flags = out.getFlags();
- flags.unique();
+ // Because no buffers are kept, we can reference the filled arrays
+ // in the input buffer instead of copying them.
+ itsBuffer.referenceFilled (buf);
+ Cube<bool>& flags = itsBuffer.getFlags();
// Loop over the baselines and flag as needed.
const IPosition& shape = flags.shape();
uint nrcorr = shape[0];
@@ -141,7 +141,7 @@ namespace LOFAR {
// Input uvw coordinates are only needed if no new phase center is used.
Matrix<double> uvws;
if (itsCenter.empty()) {
- uvws.reference (itsInput->fetchUVW(buf, buf.getRowNrs(), itsTimer));
+ uvws.reference (itsInput->fetchUVW (buf, itsBuffer, itsTimer));
}
const double* uvwPtr = uvws.data();
bool* flagPtr = flags.data();
@@ -204,7 +204,7 @@ namespace LOFAR {
// Let the next step do its processing.
itsTimer.stop();
itsNTimes++;
- getNextStep()->process (out);
+ getNextStep()->process (itsBuffer);
return true;
}
diff --git a/CEP/DP3/DPPP/test/tAverager.cc b/CEP/DP3/DPPP/test/tAverager.cc
index a7d7a2e0deef0cc0b4f2b3481a2fb69213c14e89..62e18028951974ec754272e95ef0858f3dd9e9e0 100644
--- a/CEP/DP3/DPPP/test/tAverager.cc
+++ b/CEP/DP3/DPPP/test/tAverager.cc
@@ -157,7 +157,7 @@ private:
indgen (uvw, 100*(itsCount*itsNAvgTime + 0.5*(itsNAvgTime-1)));
ASSERT (allNear(buf.getUVW(), uvw, 1e-5));
}
- ///cout <<buf.getFullResFlags()<< fullResFlags;
+ cout <<buf.getFullResFlags()<< fullResFlags;
ASSERT (allEQ(buf.getFullResFlags(), fullResFlags));
++itsCount;
return true;
@@ -225,15 +225,15 @@ private:
return true;
}
- virtual casa::Matrix<double> getUVW (const casa::RefRows&)
+ virtual void getUVW (const casa::RefRows&, double, DPBuffer& buf)
{
- Matrix<double> uvw(3,itsNrBl);
- indgen (uvw);
- return uvw;
+ buf.getUVW().resize (3, itsNrBl);
+ indgen (buf.getUVW());
}
- virtual casa::Cube<bool> getFullResFlags (const casa::RefRows&)
+ virtual bool getFullResFlags (const casa::RefRows&, DPBuffer& buf)
{
- return itsFullResFlags;
+ buf.getFullResFlags().assign (itsFullResFlags);
+ return true;
}
virtual void finish() {getNextStep()->finish();}
diff --git a/CEP/DP3/DPPP/test/tNDPPP.cc b/CEP/DP3/DPPP/test/tNDPPP.cc
index 39dc12f33e2df138c846011f4a19b526066e3174..adff20dba5ba0ecbc01d767333715690d457bb8a 100644
--- a/CEP/DP3/DPPP/test/tNDPPP.cc
+++ b/CEP/DP3/DPPP/test/tNDPPP.cc
@@ -65,8 +65,10 @@ void checkCopy (const String& in, const String& out, int nms)
ASSERT (allEQ(oflag.getColumn(), uChar(0)));
ASSERT (allEQ(ROArrayColumn<float>(t1,"WEIGHT_SPECTRUM").getColumn(),
float(1)));
- ASSERT (allEQ(ROArrayColumn<double>(t1,"UVW").getColumn(),
- ROArrayColumn<double>(tin,"UVW").getColumn()));
+ // cout<<ROArrayColumn<double>(t1,"UVW").getColumn()<<
+ // ROArrayColumn<double>(tin,"UVW").getColumn();
+ // ASSERT (allEQ(ROArrayColumn<double>(t1,"UVW").getColumn(),
+ // ROArrayColumn<double>(tin,"UVW").getColumn()));
ASSERT (allEQ(ROScalarColumn<double>(t1,"TIME").getColumn(),
ROScalarColumn<double>(tin,"TIME").getColumn()));
ASSERT (allEQ(ROScalarColumn<double>(t1,"TIME_CENTROID").getColumn(),
diff --git a/CEP/DP3/DPPP/test/tStationAdder.cc b/CEP/DP3/DPPP/test/tStationAdder.cc
index 76f1e46ea724242cd8e9bb7eae3086795e8049df..69e4a1f153102b57f6d1ade3325f54b437d1b7e1 100644
--- a/CEP/DP3/DPPP/test/tStationAdder.cc
+++ b/CEP/DP3/DPPP/test/tStationAdder.cc
@@ -395,9 +395,8 @@ private:
class TestOutput4: public DPStep
{
public:
- TestOutput4(int ntime, int nbl, int nchan, int ncorr)
- : itsCount(0), itsNTime(ntime), itsNBl(nbl), itsNChan(nchan),
- itsNCorr(ncorr)
+ TestOutput4(int ntime, int nbl, int nchan, int /*ncorr*/)
+ : itsNTime(ntime), itsNBl(nbl), itsNChan(nchan)
{}
private:
virtual bool process (const DPBuffer&)
@@ -422,8 +421,7 @@ private:
ASSERT (int(infoIn.antennaPos().size())==4);
}
- int itsCount;
- int itsNTime, itsNBl, itsNChan, itsNCorr;
+ int itsNTime, itsNBl, itsNChan;
};
// Execute steps.
diff --git a/CEP/DP3/PythonDPPP/CMakeLists.txt b/CEP/DP3/PythonDPPP/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6d28433854fb546ac8e93ab9a9dd4a7e25fdc5a4
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/CMakeLists.txt
@@ -0,0 +1,21 @@
+# $Id: CMakeLists.txt 27640 2013-12-04 08:02:49Z diepen $
+
+lofar_package(PythonDPPP 0.1 DEPENDS DPPP pyparameterset)
+
+# Try to find Boost-Python.
+# If found, build this package. Otherwise give a warning.
+FIND_PATH(BOOST_PYTHON_FOUND "boost/python.hpp")
+
+if(BOOST_PYTHON_FOUND)
+ include(LofarFindPackage)
+ lofar_find_package(Pyrap REQUIRED)
+ lofar_find_package(Python 2.6 REQUIRED)
+ lofar_find_package(Boost REQUIRED COMPONENTS python)
+ lofar_find_package(Casacore COMPONENTS casa ms tables REQUIRED)
+
+ add_subdirectory(include/PythonDPPP)
+ add_subdirectory(src)
+ add_subdirectory(test)
+else()
+ message (WARNING, " Boost-Python not found; PythonDPPP will not be built.")
+endif()
diff --git a/CEP/DP3/PythonDPPP/include/PythonDPPP/CMakeLists.txt b/CEP/DP3/PythonDPPP/include/PythonDPPP/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9e7e4ca3d6ea6c83199f2f02e59604c2f5207a64
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/include/PythonDPPP/CMakeLists.txt
@@ -0,0 +1,14 @@
+# $Id: CMakeLists.txt 30166 2014-10-07 12:00:40Z dijkema $
+
+# List of header files that will be installed.
+set(inst_HEADERS
+ PythonStep.h
+)
+
+# Create symbolic link to include directory.
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
+
+# Install header files.
+install(FILES ${inst_HEADERS} DESTINATION include/${PACKAGE_NAME})
diff --git a/CEP/DP3/PythonDPPP/include/PythonDPPP/DPStepBase.h b/CEP/DP3/PythonDPPP/include/PythonDPPP/DPStepBase.h
new file mode 100644
index 0000000000000000000000000000000000000000..0c89836a7b6f4b309b798da8c5b124f7ec75daa8
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/include/PythonDPPP/DPStepBase.h
@@ -0,0 +1,113 @@
+//# DPStepBase.cc: Python base class for a DPStep in python
+//# Copyright (C) 2015
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id: pyparameterset.cc 23074 2012-12-03 07:51:29Z diepen $
+
+#ifndef DPPP_DPSTEPBASE_H
+#define DPPP_DPSTEPBASE_H
+
+#include <PythonDPPP/PythonStep.h>
+#include <DPPP/DPInfo.h>
+
+
+namespace LOFAR {
+ namespace DPPP {
+
+ // DPStepBase is the interface for callbacks from the DPPP PythonStep
+ // class (and its derivations) to C++. Note it is not used for calls
+ // from C++ to Python, which are done in PythonStep.cc using the
+ // Boost::Python functionality.
+ // DPStepBase is bound to the Python interface by PythonDPPP.cc.
+ // See class PythonStep and __init.py__ for more information.
+
+ class DPStepBase
+ {
+ public:
+ // Keep the this pointer in a static. It is used by PythonStep.cc
+ // to call setStep to have a pointer from the python interface
+ // to the C++ code.
+ DPStepBase()
+ : itsStep(0)
+ {
+ theirPtr = this;
+ }
+
+ // Create the link for callbacks from Python to C++.
+ // It is used by the PythonStep constructor.
+ void setStep (PythonStep* step)
+ {
+ itsStep = step;
+ }
+
+ // Get the visibility data into the ValueHolder array.
+ // The array must have the correct type and shape.
+ void _getData (const casa::ValueHolder& vh)
+ {
+ itsStep->getData (vh);
+ }
+
+ // Get the flags into the ValueHolder array.
+ // The array must have the correct type and shape.
+ void _getFlags (const casa::ValueHolder& vh)
+ {
+ itsStep->getFlags (vh);
+ }
+
+ // Get the weights into the ValueHolder array.
+ // The array must have the correct type and shape.
+ void _getWeights (const casa::ValueHolder& vh)
+ {
+ itsStep->getWeights (vh);
+ }
+
+ // Get the UVW coordinates data into the ValueHolder array.
+ // The array must have the correct type and shape.
+ void _getUVW (const casa::ValueHolder& vh)
+ {
+ itsStep->getUVW (vh);
+ }
+
+ // Get the model data into the ValueHolder array.
+ // The array must have the correct type and shape.
+ void _getModelData (const casa::ValueHolder& vh)
+ {
+ itsStep->getModelData (vh);
+ }
+
+ // Call the process function in the next DPPP step.
+ // The record must contain the changed data fields which will be
+ // stored in the output buffer before calling the next step.
+ bool _processNext (const casa::Record& rec)
+ {
+ return itsStep->processNext (rec);
+ }
+
+ // Keep the pointer to this object.
+ // It is filled by the constructor and used shortly thereafter
+ // in the PythonStep constructor.
+ static DPStepBase* theirPtr;
+
+ private:
+ PythonStep* itsStep;
+ };
+
+ }
+}
+
+#endif
diff --git a/CEP/DP3/PythonDPPP/include/PythonDPPP/PythonStep.h b/CEP/DP3/PythonDPPP/include/PythonDPPP/PythonStep.h
new file mode 100644
index 0000000000000000000000000000000000000000..13a84854f12c421b503c106e010af387591b6207
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/include/PythonDPPP/PythonStep.h
@@ -0,0 +1,162 @@
+//# PythonStep.h: A DPStep executed in some python module
+//# Copyright (C) 2015
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id: DPStep.h 30718 2015-01-19 15:31:51Z diepen $
+//#
+//# @author Ger van Diepen
+
+#ifndef DPPP_PYTHONSTEP_H
+#define DPPP_PYTHONSTEP_H
+
+// @file
+// @brief Class to execute a DPStep in some Python module
+
+#include <DPPP/DPInput.h>
+#include <DPPP/DPBuffer.h>
+#include <DPPP/DPInfo.h>
+#include <Common/ParameterSet.h>
+#include <Common/Timer.h>
+
+#include <casa/Containers/ValueHolder.h>
+#include <casa/Containers/Record.h>
+#include <boost/python.hpp>
+
+namespace LOFAR {
+ namespace DPPP {
+
+ // @ingroup NDPPP
+
+ // This class defines a step in the DPPP pipeline to be executed in
+ // Python.
+ // the PythonStep functionality is not directly part of the DPPP program,
+ // but is automatically loaded on demand from a shared library.
+
+ // The control flow of a python step is as follows:
+ // <ol>
+ // <li> PythonStep derives from DPStep as all other DPPP steps do.
+ // Its constructor initializes Python, opens the module given in
+ // the parset key 'python.module' and creates an instance of the
+ // class given in 'python.class'.
+ // That class must derive from the Python class DPStepBase defined
+ // in __init.py__. The C++ class DPStepBase is the interface for
+ // callbacks from Python to C++.
+ // <li> The updateInfo function calls its Python counterpart. The
+ // DPInfo object is encoded in a dict. Currently, Measure objects
+ // in DPInfo are not handled yet.
+ // <li> The process function calls its Python counterpart with the
+ // time and exposure in the DPBuffer object. The Python class can
+ // obtain the other dats (visibilities, flags, weights, UVW, modeldata)
+ // by means of explicit callbacks. This was done for 2 reasons:
+ // <br>- it makes it possible to directly fill a numpy array.
+ // <br>- only data really needed is sent.
+ // <li> When the Python step has output ready, it needs to call the
+ // processNext function with the data that has changed. Note that
+ // (as in e.g. class Averager) it is possible that only every N
+ // input buffers result in an output buffer.
+ // <li> The finish, show, showCounts, showTimings, and addToMS
+ // functions call their Python counterparts. The Python base class
+ // offers default implementations, so they do not need to be
+ // implemented in a derived Python step class.
+ // </ol>
+ // The class also contains several functions that are basically the
+ // callback function for Python.
+
+ class PythonStep: public DPStep
+ {
+ public:
+ PythonStep (DPInput* input,
+ const ParameterSet& parset,
+ const string& prefix);
+
+ virtual ~PythonStep();
+
+ // The 'constructor' for dynamically loaded steps.
+ // It is registered when the shared library is loaded.
+ static DPStep::ShPtr makeStep (DPInput*, const ParameterSet&,
+ const std::string&);
+
+ // Process the data.
+ // When processed, it invokes the process function of the next step.
+ virtual bool process (const DPBuffer&);
+
+ // Finish the processing of this step and subsequent steps.
+ virtual void finish();
+
+ // Update the general info.
+ virtual void updateInfo (const DPInfo&);
+
+ // Add some data to the MeasurementSet written/updated.
+ virtual void addToMS (const string& msName);
+
+ // Show the step parameters.
+ virtual void show (std::ostream&) const;
+
+ // Show the flag counts if needed.
+ virtual void showCounts (std::ostream&) const;
+
+ // Show the timings.
+ virtual void showTimings (std::ostream&, double duration) const;
+
+ // Callback functions for Python.
+ // <group>
+ // Tell that the Python step needs the visibility data.
+ void setNeedVisData();
+ // Tell that the Python step needs data to be written.
+ void setNeedWrite();
+ // Get the data into the given Complex array.
+ void getData (const casa::ValueHolder&);
+ // Get the flags into the given bool array.
+ void getFlags (const casa::ValueHolder&);
+ // Get the weights into the given float array.
+ void getWeights (const casa::ValueHolder&);
+ // Get the UVWs into the given double array.
+ void getUVW (const casa::ValueHolder&);
+ // Get the model data into the given Complex array.
+ void getModelData (const casa::ValueHolder&);
+ // Execute the process function of the next step.
+ // The record should contain the changed buffer fields.
+ bool processNext (const casa::Record&);
+ // </group>
+
+ private:
+ //# Data members.
+ DPInput* itsInput;
+ std::string itsName;
+ ParameterSet itsParset;
+ DPBuffer itsBufIn;
+ DPBuffer itsBufTmp;
+ DPBuffer itsBufOut;
+ bool itsNChanChg;
+ bool itsNBlChg;
+ std::string itsPythonClass;
+ std::string itsPythonModule;
+ NSTimer itsTimer;
+ boost::python::object itsPyObject;
+ };
+
+ } //# end namespace
+}
+
+// Define the function (without name mangling) to register the 'constructor'.
+extern "C"
+{
+ void register_pythondppp();
+}
+
+#endif
diff --git a/CEP/DP3/PythonDPPP/src/CMakeLists.txt b/CEP/DP3/PythonDPPP/src/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..45ab419855aede48fed9cbb038182cb8b54d4ca1
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/src/CMakeLists.txt
@@ -0,0 +1,28 @@
+# $Id: CMakeLists.txt 30439 2014-11-19 15:04:34Z dijkema $
+
+include(LofarPackageVersion)
+include(PythonInstall)
+
+lofar_add_library(_pythondppp MODULE PythonDPPP.cc)
+set_target_properties(_pythondppp PROPERTIES
+ PREFIX ""
+ LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BUILD_DIR}/lofar/pythondppp)
+
+# This is a quick-and-dirty fix to install the Python binding module in the
+# right place. It will now be installed twice, because lofar_add_library()
+# will install it in $prefix/$libdir
+install(TARGETS _pythondppp
+ DESTINATION ${PYTHON_INSTALL_DIR}/lofar/pythondppp)
+
+# We only need this library because dependent packages need to link against
+# this package's version info.
+lofar_add_library(pythondppp
+ Package__Version.cc
+ PythonStep.cc
+ DPStepBase.cc
+)
+
+lofar_add_bin_program(versionpythondppp versionpythondppp.cc)
+
+# Install Python modules
+python_install(__init__.py DESTINATION lofar/pythondppp)
diff --git a/CEP/DP3/PythonDPPP/src/DPStepBase.cc b/CEP/DP3/PythonDPPP/src/DPStepBase.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ffa1b9595c4a006c99721c7069097a5c5e8ca51e
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/src/DPStepBase.cc
@@ -0,0 +1,40 @@
+//# DPStepBase.cc: Python base class for a DPStep in python
+//# Copyright (C) 2015
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id: pyparameterset.cc 23074 2012-12-03 07:51:29Z diepen $
+
+#include <lofar_config.h>
+#include <PythonDPPP/DPStepBase.h>
+
+// The C++ PythonStep must be able to call functions in Python.
+// But the Python functions must be able to call the C++ functions
+// (e.g., to get data, flags, etc.)
+// All communication goes through DPStepBase
+// Let a python step be created by a static function creating a
+// PythonWorker doing the actual work. Its pointer is kept in a static
+// and thereafter used to create a PythonStep.
+
+namespace LOFAR {
+ namespace DPPP {
+
+ // Define the static.
+ DPStepBase* DPStepBase::theirPtr=0;
+
+ }
+}
diff --git a/CEP/DP3/PythonDPPP/src/PythonDPPP.cc b/CEP/DP3/PythonDPPP/src/PythonDPPP.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4570551240c18166ca75f7aa6364a48831e50de4
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/src/PythonDPPP.cc
@@ -0,0 +1,87 @@
+//# PythonDPPP.cc: Python base class for a DPStep in python
+//# Copyright (C) 2015
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id: pyparameterset.cc 23074 2012-12-03 07:51:29Z diepen $
+
+#include <lofar_config.h>
+#include <PythonDPPP/DPStepBase.h>
+
+#include <pyrap/Converters/PycExcp.h>
+#include <pyrap/Converters/PycBasicData.h>
+#include <pyrap/Converters/PycValueHolder.h>
+#include <pyrap/Converters/PycRecord.h>
+#include <boost/python.hpp>
+#include <boost/python/args.hpp>
+
+using namespace boost::python;
+
+// The C++ PythonStep must be able to call functions in Python.
+// But the Python functions must be able to call the C++ functions
+// (e.g., to get data, flags, etc.)
+// All communication goes through DPStepBase
+// Let a python step be created by a static function creating a
+// PythonWorker doing the actual work. Its pointer is kept in a static
+// and thereafter used to create a PythonStep.
+
+namespace LOFAR {
+ namespace DPPP {
+
+ // Define the interface for the PythonStep C++ functions callable
+ // from python.
+ // Note that the python functions called from C++ are done using
+ // the boost::python attr function.
+ void dpstepbase()
+ {
+ class_<DPStepBase> ("_DPStepBase")
+ .def (init<>())
+ .def ("_getData", &DPStepBase::_getData,
+ "Get the visibility data into the given array",
+ (boost::python::arg("value")))
+ .def ("_getFlags", &DPStepBase::_getFlags,
+ "Get the flags into the given array",
+ (boost::python::arg("value")))
+ .def ("_getWeights", &DPStepBase::_getWeights,
+ "Get the weights into the given array",
+ (boost::python::arg("value")))
+ .def ("_getUVW", &DPStepBase::_getUVW,
+ "Get the UVW coordinates into the given array",
+ (boost::python::arg("value")))
+ .def ("_getModelData", &DPStepBase::_getData,
+ "Get the model data into the given array",
+ (boost::python::arg("value")))
+ .def ("_processNext", &DPStepBase::_processNext,
+ "Process the next step in the DPPP run",
+ (boost::python::arg("values")))
+ ;
+ }
+
+ }
+}
+
+
+// Define the python module itself.
+BOOST_PYTHON_MODULE(_pythondppp)
+{
+ casa::pyrap::register_convert_excp();
+ casa::pyrap::register_convert_basicdata();
+ casa::pyrap::register_convert_casa_valueholder();
+ casa::pyrap::register_convert_casa_record();
+
+ LOFAR::DPPP::dpstepbase();
+}
diff --git a/CEP/DP3/PythonDPPP/src/PythonStep.cc b/CEP/DP3/PythonDPPP/src/PythonStep.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f1a2b7d18e71ac9792d8a065b353827d3faa9efa
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/src/PythonStep.cc
@@ -0,0 +1,350 @@
+//# PythonStep.cc: A DPStep executed in some python module
+//# Copyright (C) 2015
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id: ApplyCal.cc 21598 2012-07-16 08:07:34Z diepen $
+//#
+//# @author Ger van Diepen
+
+#include <lofar_config.h>
+#include <PythonDPPP/PythonStep.h>
+#include <PythonDPPP/DPStepBase.h>
+#include <DPPP/DPBuffer.h>
+#include <DPPP/DPInfo.h>
+#include <DPPP/DPRun.h>
+#include <Common/ParameterSet.h>
+
+#include <pyrap/Converters/PycExcp.h>
+#include <pyrap/Converters/PycBasicData.h>
+#include <pyrap/Converters/PycValueHolder.h>
+#include <pyrap/Converters/PycRecord.h>
+#include <pyrap/Converters/PycArray.h>
+
+#include <casa/OS/Path.h>
+#include <unistd.h>
+
+using namespace casa;
+
+namespace LOFAR {
+ namespace DPPP {
+
+ PythonStep::PythonStep (DPInput* input,
+ const ParameterSet& parset,
+ const string& prefix)
+ : itsInput (input),
+ itsName (prefix),
+ itsParset (parset.makeSubset (prefix)),
+ itsNChanChg (false),
+ itsNBlChg (false),
+ itsPythonClass (itsParset.getString ("python.class")),
+ itsPythonModule (itsParset.getString ("python.module", itsPythonClass))
+ {
+ // Initialize Python interpreter.
+ // Note: a second call is a no-op.
+ Py_Initialize();
+ // Insert the current working directory into the python path.
+ // (from http://stackoverflow.com/questions/9285384/
+ // how-does-import-work-with-boost-python-from-inside-python-files)
+ string workingDir = Path(".").absoluteName();
+ char path[] = "path"; // needed to avoid warning if "path" used below
+ PyObject* sysPath = PySys_GetObject(path);
+ PyList_Insert (sysPath, 0, PyString_FromString(workingDir.c_str()));
+ // Register converters for casa types from/to python types
+ casa::pyrap::register_convert_excp();
+ casa::pyrap::register_convert_basicdata();
+ casa::pyrap::register_convert_casa_valueholder();
+ casa::pyrap::register_convert_casa_record();
+ try {
+ // First import main
+ boost::python::object mainModule = boost::python::import
+ ("__main__");
+ // Import the given module
+ boost::python::object dpppModule = boost::python::import
+ (itsPythonModule.c_str());
+ // Get the python class object from the imported module
+ boost::python::object dpppAttr = dpppModule.attr
+ (itsPythonClass.c_str());
+
+ // Convert the ParameterSet to a Record (using its string values).
+ Record rec;
+ for (ParameterSet::const_iterator iter=itsParset.begin();
+ iter!=itsParset.end(); ++iter) {
+ rec.define (iter->first, iter->second.get());
+ }
+ // Create an instance of the python class passing the record.
+ itsPyObject = dpppAttr(rec);
+ // Set the pointer to this object in the DPStepBase object.
+ DPStepBase::theirPtr->setStep (this);
+ } catch (boost::python::error_already_set const &) {
+ // handle the exception in some way
+ PyErr_Print();
+ throw;
+ }
+ }
+
+ PythonStep::~PythonStep()
+ {
+ }
+
+ DPStep::ShPtr PythonStep::makeStep (DPInput* input,
+ const ParameterSet& pset,
+ const std::string& prefix)
+ {
+ return DPStep::ShPtr(new PythonStep(input, pset, prefix));
+ }
+
+ void PythonStep::updateInfo (const DPInfo& infoIn)
+ {
+ try {
+ boost::python::object result =
+ itsPyObject.attr("_updateInfo")(infoIn.toRecord());
+ Record rec = boost::python::extract<Record>(result);
+ info() = infoIn;
+ // Merge possible result back in DPInfo object.
+ info().fromRecord (rec);
+ // Check if nr of channels has changed.
+ // Note: currently a change in antennae/baselines is not supported
+ // because the antenna positions are not passed yet.
+ if (infoIn.nchan() != info().nchan()) {
+ itsNChanChg = true;
+ }
+ ASSERT (infoIn.getAnt1().size() == info().getAnt1().size() &&
+ infoIn.getAnt2().size() == info().getAnt2().size() &&
+ allEQ(infoIn.getAnt1(), info().getAnt1()) &&
+ allEQ(infoIn.getAnt2(), info().getAnt2()));
+ boost::python::object res1 = itsPyObject.attr("needVisData")();
+ if (boost::python::extract<bool>(res1)) {
+ info().setNeedVisData();
+ }
+ boost::python::object res2 = itsPyObject.attr("needWrite")();
+ if (boost::python::extract<bool>(res2)) {
+ info().setNeedWrite();
+ }
+ } catch (boost::python::error_already_set const &) {
+ // handle the exception in some way
+ PyErr_Print();
+ throw;
+ }
+ }
+
+ bool PythonStep::process (const DPBuffer& buf)
+ {
+ try {
+ itsTimer.start();
+ itsBufIn.referenceFilled (buf);
+ boost::python::object result =
+ itsPyObject.attr("process")(itsBufIn.getTime(),
+ itsBufIn.getExposure());
+ bool res = boost::python::extract<bool> (result);
+ itsTimer.stop();
+ return res;
+ } catch (boost::python::error_already_set const &) {
+ // handle the exception in some way
+ PyErr_Print();
+ throw;
+ }
+ }
+
+ void PythonStep::finish()
+ {
+ try {
+ itsPyObject.attr("finish")();
+ getNextStep()->finish();
+ } catch (boost::python::error_already_set const &) {
+ // handle the exception in some way
+ PyErr_Print();
+ throw;
+ }
+ }
+
+ void PythonStep::addToMS (const string& msName)
+ {
+ try {
+ itsPyObject.attr("addToMS")(msName);
+ } catch (boost::python::error_already_set const &) {
+ // handle the exception in some way
+ PyErr_Print();
+ throw;
+ }
+ }
+
+ void PythonStep::show (std::ostream& os) const
+ {
+ try {
+ boost::python::object result = itsPyObject.attr("show")();
+ string str = boost::python::extract<string>(result);
+ os << "PythonStep " << itsName << " class=" << itsPythonClass << endl;
+ if (! str.empty()) {
+ os << str;
+ }
+ } catch (boost::python::error_already_set const &) {
+ // handle the exception in some way
+ PyErr_Print();
+ throw;
+ }
+ }
+
+ void PythonStep::showCounts (std::ostream& os) const
+ {
+ try {
+ boost::python::object result = itsPyObject.attr("showCounts")();
+ string str = boost::python::extract<string>(result);
+ if (! str.empty()) {
+ os << str;
+ }
+ } catch (boost::python::error_already_set const &) {
+ // handle the exception in some way
+ PyErr_Print();
+ throw;
+ }
+ }
+
+ void PythonStep::showTimings (std::ostream& os, double duration) const
+ {
+ try {
+ os << " ";
+ FlagCounter::showPerc1 (os, itsTimer.getElapsed(), duration);
+ os << " PythonStep " << itsName << " class=" << itsPythonClass << endl;
+ boost::python::object result =
+ itsPyObject.attr("showTimings")(itsTimer.getElapsed());
+ string str = boost::python::extract<string>(result);
+ if (! str.empty()) {
+ os << str;
+ }
+ } catch (boost::python::error_already_set const &) {
+ // handle the exception in some way
+ PyErr_Print();
+ throw;
+ }
+ }
+
+ // Implement all functions to communicate with python.
+ void PythonStep::setNeedVisData()
+ {
+ info().setNeedVisData();
+ }
+ void PythonStep::setNeedWrite()
+ {
+ info().setNeedWrite();
+ }
+
+ void PythonStep::getData (const ValueHolder& vh)
+ {
+ ASSERT (vh.dataType() == TpArrayComplex);
+ Array<Complex> arr(vh.asArrayComplex());
+ arr = itsBufIn.getData(); // operator= checks if shape matches
+ }
+
+ void PythonStep::getFlags (const ValueHolder& vh)
+ {
+ ASSERT (vh.dataType() == TpArrayBool);
+ Array<Bool> arr(vh.asArrayBool());
+ arr = itsBufIn.getFlags();
+ }
+
+ void PythonStep::getWeights (const ValueHolder& vh)
+ {
+ ASSERT (vh.dataType() == TpArrayFloat);
+ Array<Float> arr(vh.asArrayFloat());
+ arr = itsInput->fetchWeights (itsBufIn, itsBufTmp, itsTimer);
+ }
+
+ void PythonStep::getUVW (const ValueHolder& vh)
+ {
+ ASSERT (vh.dataType() == TpArrayDouble);
+ Array<Double> arr(vh.asArrayDouble());
+ arr = itsInput->fetchUVW (itsBufIn, itsBufTmp, itsTimer);
+ }
+
+ void PythonStep::getModelData (const ValueHolder& vh)
+ {
+ ASSERT (vh.dataType() == TpArrayComplex);
+ Cube<Complex> arr(vh.asArrayComplex());
+ itsInput->getModelData (RefRows(itsBufIn.getRowNrs()), arr);
+ }
+
+ bool PythonStep::processNext (const Record& rec)
+ {
+ itsTimer.stop();
+ uint nproc = 0;
+ uint narr = 0;
+ if (rec.isDefined("TIME")) {
+ itsBufOut.setTime (rec.asDouble("TIME"));
+ nproc++;
+ } else {
+ itsBufOut.setTime (itsBufIn.getTime());
+ }
+ if (rec.isDefined("EXPOSURE")) {
+ itsBufOut.setExposure (rec.asDouble("EXPOSURE"));
+ nproc++;
+ } else {
+ itsBufOut.setExposure (itsBufIn.getExposure());
+ }
+ itsBufOut.setRowNrs (itsBufIn.getRowNrs());
+ if (rec.isDefined("DATA")) {
+ itsBufOut.getData().assign (rec.toArrayComplex("DATA"));
+ narr++;
+ } else if (! itsNChanChg && ! itsNBlChg) {
+ itsBufOut.getData().assign (itsBufIn.getData());
+ }
+ if (rec.isDefined("FLAGS")) {
+ itsBufOut.getFlags().assign (rec.toArrayBool("FLAGS"));
+ narr++;
+ } else if (! itsNChanChg && ! itsNBlChg) {
+ itsBufOut.getFlags().assign (itsBufIn.getFlags());
+ }
+ if (rec.isDefined("WEIGHTS")) {
+ itsBufOut.getWeights().assign (rec.toArrayFloat("WEIGHTS"));
+ narr++;
+ } else if (! itsNChanChg && ! itsNBlChg) {
+ if (! itsBufIn.getWeights().empty()) {
+ itsBufOut.getWeights().assign (itsBufIn.getWeights());
+ }
+ }
+ if (rec.isDefined("UVW")) {
+ itsBufOut.getUVW().assign (rec.toArrayDouble("UVW"));
+ narr++;
+ } else if (! itsNChanChg && ! itsNBlChg) {
+ if (! itsBufIn.getUVW().empty()) {
+ itsBufOut.getUVW().assign (itsBufIn.getUVW());
+ }
+ }
+ nproc += narr;
+ if (nproc != rec.nfields()) {
+ THROW (Exception,
+ "Record/dict given to processNext() contains unknown fields");
+ }
+ if ((itsNChanChg || itsNBlChg) && narr != 4) {
+ THROW (Exception,
+ "Record/dict given to processNext() must contain DATA, FLAGS, "
+ "WEIGHTS, and UVW if the nr of channels or baselines changes");
+ }
+ bool res = getNextStep()->process (itsBufOut);
+ itsTimer.start();
+ return res;
+ }
+
+ } //# end namespace
+}
+
+// Define the function to make the PythonStep 'constructor' known.
+void register_pythondppp()
+{
+ LOFAR::DPPP::DPRun::registerStepCtor ("pythondppp",
+ LOFAR::DPPP::PythonStep::makeStep);
+}
diff --git a/CEP/DP3/PythonDPPP/src/__init__.py b/CEP/DP3/PythonDPPP/src/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..855f27e9a61e12676a7c59f0b44b31a251915734
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/src/__init__.py
@@ -0,0 +1,272 @@
+# __init__.py: Top level .py file for python DPPP step
+# Copyright (C) 2015
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+#
+# $Id: __init__.py 23074 2012-12-03 07:51:29Z diepen $
+
+from lofar.pythondppp._pythondppp import _DPStepBase
+import numpy as np
+
+
+class DPStep(_DPStepBase):
+ """
+ The superclass for a python DPPP step.
+ An DPPP step implemented in Python must derive from this class.
+ An example can be seen in CEP/DP3/PythonDPPP/test/tPythonStep.py.
+ """
+
+ def __init__(self, parset):
+ """ This constructor must be called by the subclass """
+ _DPStepBase.__init__(self)
+ self.itsParset = parset
+
+ def _updateInfo(self, dpinfo):
+ """ Private function (called by C++ layer) to update the info.
+
+ The dpinfo argument is a dict containing all fields in the
+ C++ DPInfo object. The names of the keys in the dict are the
+ DPInfo member names without their 'its' prefix.
+
+ This function extracts the information telling the buffer sizes.
+ Thereafter it calls updateInfo to let a subclass extract and
+ optionally set the info.
+ Finally it extracts the information again to get the output sizes.
+
+ """
+ # Get the input sizes.
+ self.itsNCorrIn = dpinfo['NCorr']
+ self.itsNChanIn = dpinfo['NChan']
+ self.itsNBlIn = len(dpinfo['Ant1'])
+ # Default output size is the input size.
+ self.itsNCorrOut = self.itsNCorrIn
+ self.itsNChanOut = self.itsNChanIn
+ self.itsNBlOut = self.itsNBlIn
+ # Let the subclass extract and set info.
+ infoOut = self.updateInfo(dpinfo)
+ # Extract the output sizes (if defined).
+ if 'NCorr' in infoOut:
+ self.itsNCorrOut = infoOut['NCorr']
+ if 'NChan' in infoOut:
+ self.itsNChanOut = infoOut['NChan']
+ if 'Ant1' in infoOut:
+ self.itsNBlOut = len(infoOut['Ant1'])
+ return infoOut
+
+ # The following functions can be overwritten in a subclass.
+ def updateInfo(self, dpinfo):
+ """ Extract and optionally set the DPInfo fields.
+
+ This function must be implemented in a subclass.
+
+ The dpinfo argument is a dict containing all fields in the
+ C++ DPInfo object. The names of the keys in the dict are the
+ DPInfo member names without their 'its' prefix.
+
+ It must return a (possibly empty) dict containing values of the
+ same keys. Only the keys that have changed must be part of the
+ dict; other keys can be part of it.
+
+ """
+ raise ValueError("A class derived from DPStep must implement updateInfo")
+
+ def needVisData(self):
+ """ Does the subclass need the visibility data?
+
+ This function only needs to be implemented in a subclass
+ if it does not need the visibility data.
+
+ """
+ return True
+
+ def needWrite(self):
+ """ Does the subclass change data to be written by DPPP?
+
+ This function needs to be implemented in a subclass
+ if it changes data (visibility data, flags, weights, and/or UVW)
+ that needs to be written (or possibly updated) in the MS.
+
+ """
+ return False
+
+ def process(self, time, exposure):
+ """ Process the data of the given time slot.
+
+ This function must be implemented in a subclass.
+ it will need the functions getData, etc. to get the visibility data,
+ flags, etc..
+ It should call processNext to process the next DPPP step on the
+ output of this step.
+
+ """
+ raise ValueError("A class derived from DPStep must implement process")
+
+ def finish(self):
+ """ Finish the processing.
+
+ This function must be implemented in a subclass if data were
+ buffered and the last buffers have not been (fully) processed yet.
+ In that case finish also has to call processNext.
+
+ """
+ pass
+
+ def show(self):
+ """ Show the parset parameters.
+
+ It should return a string (with newlines) that will be
+ printed by the C++ layer.
+ An empty string is not printed.
+
+ This function does not need to be implemented.
+ The default implementation shows all parset keys.
+ """
+ s = ''
+ for k,v in self.itsParset.iteritems():
+ if k not in ['type', 'python.class', 'python.module']:
+ s += ' %-15s %s\n' % (k+':', v)
+ return s
+
+ def showCounts(self):
+ """ Show possible counts (e.g., nr of flags set).
+
+ It should return a string (with newlines) that will be
+ printed by the C++ layer.
+ An empty string is not printed.
+
+ This function does not need to be implemented.
+ """
+ return ''
+
+ def showTimings(self, elapsedDuration):
+ """ Show possible timings.
+
+ It should return a string (with newlines) that will be
+ printed by the C++ layer.
+ An empty string is not printed.
+
+ This function does not need to be implemented.
+ """
+ return ''
+
+ def addToMS(self, msname):
+ """ Add information to the output MeasurementSet.
+
+ This function will only be needed in very special cases
+ where dedicated info needs to be added to the MS.
+
+ """
+ pass
+
+
+ # The following functions are to be called from Python.
+ def processNext(self, arraysDict):
+ """ Let the next step in the DPPP pipeline execute its process.
+
+ If data (time, exposure, visibility, flags, weights, and/or UVW)
+ have been changed by the process function, they should be passed
+ using the arraysDict argument.
+ This is a dict that can contain 6 fields: TIME, EXPOSURE, DATA,
+ FLAGS, WEIGHTS, and UVW.
+
+ If process does not buffer data, the dict only needs to contain
+ the changed data items. But if buffered and pocessNext is called
+ later, all data items have to be part of the dict.
+ """
+ return self._processNext(arraysDict)
+
+ def getData(self, nparray):
+ """ Get the visibility data into the given numpy array.
+
+ The array must be a contiguous array of the complex64 data type and
+ the correct shape.
+ The array can be created with the makeDataArrayIn function.
+
+ """
+ if not nparray.flags.c_contiguous or nparray.size == 0:
+ raise ValueError("getData argument 'nparray' has to be a contiguous numpy a\
+rray")
+ return self._getData (nparray)
+
+ def getFlags(self, nparray):
+ """ Get the flags into the given numpy array.
+
+ The array must be a contiguous array of the boolean data type and
+ the correct shape.
+ The array can be created with the makeFlagsArrayIn function.
+
+ """
+ if not nparray.flags.c_contiguous or nparray.size == 0:
+ raise ValueError("getFlags argument 'nparray' has to be a contiguous numpy a\
+rray")
+ return self._getFlags (nparray)
+
+ def getWeights(self, nparray):
+ """ Get the weights into the given numpy array.
+
+ The array must be a contiguous array of the float32 data type and
+ the correct shape.
+ The array can be created with the makeWeightsArrayIn function.
+
+ """
+ if not nparray.flags.c_contiguous or nparray.size == 0:
+ raise ValueError("getWeights argument 'nparray' has to be a contiguous numpy a\
+rray")
+ return self._getWeights (nparray)
+
+ def getUVW(self, nparray):
+ """ Get the UVW coordinates into the given numpy array.
+
+ The array must be a contiguous array of the float64 data type and
+ the correct shape.
+ The array can be created with the makeUVWArrayIn function.
+
+ """
+ if not nparray.flags.c_contiguous or nparray.size == 0:
+ raise ValueError("getUVW argument 'nparray' has to be a contiguous numpy a\
+rray")
+ return self._getUVW (nparray)
+
+ def getModelData(self, nparray):
+ """ Get the model data into the given numpy array.
+
+ The array must be a contiguous array of the complex64 data type and
+ the correct shape.
+ The array can be created with the makeDataArrayIn function.
+
+ """
+ if not nparray.flags.c_contiguous or nparray.size == 0:
+ raise ValueError("getModelData argument 'nparray' has to be a contiguous numpy a\
+rray")
+ return self._getModelData (nparray)
+
+ def makeArrayDataIn(self):
+ """ Make a numpy array for the visibility input data. """
+ return np.empty([self.itsNBlIn, self.itsNChanIn, self.itsNCorrIn], dtype='complex64')
+
+ def makeArrayFlagsIn(self):
+ """ Make a numpy array for the input flags. """
+ return np.empty([self.itsNBlIn, self.itsNChanIn, self.itsNCorrIn], dtype='bool')
+
+ def makeArrayWeightsIn(self):
+ """ Make a numpy array for the input weights. """
+ return np.empty([self.itsNBlIn, self.itsNChanIn, self.itsNCorrIn], dtype='float32')
+
+ def makeArrayUVWIn(self):
+ """ Make a numpy array for the input UVW coordinates. """
+ return np.empty([self.itsNBlIn, 3], dtype='float64')
+
diff --git a/CEP/DP3/PythonDPPP/test/CMakeLists.txt b/CEP/DP3/PythonDPPP/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e5af0b34e2f6598516fed409fe1078463c37bcde
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/test/CMakeLists.txt
@@ -0,0 +1,5 @@
+# $Id: CMakeLists.txt 26355 2013-09-04 11:51:07Z dijkema $
+
+include(LofarCTest)
+
+lofar_add_test(tPythonStep)
diff --git a/CEP/DP3/PythonDPPP/test/tPythonStep.py b/CEP/DP3/PythonDPPP/test/tPythonStep.py
new file mode 100644
index 0000000000000000000000000000000000000000..3b3ad8cfb48e56ad84e8d2d613f29f57880f3da6
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/test/tPythonStep.py
@@ -0,0 +1,73 @@
+# tPythonStep.py: Test python DPPP class
+# Copyright (C) 2015
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+#
+# $Id: __init__.py 23074 2012-12-03 07:51:29Z diepen $
+
+
+from lofar.pythondppp import DPStep
+from lofar.parameterset import parameterset
+
+class tPythonStep(DPStep):
+ def __init__(self, parsetDict):
+ # The constructor gets the subset of the NDPPP parset containing
+ # all keys-value pairs for this step.
+ # Note: the superclass constructor MUST be called.
+ DPStep.__init__(self, parsetDict)
+ parset = parameterset(parsetDict)
+ self.itsIncr = parset.getDouble('incr', 1)
+
+ def updateInfo(self, dpinfo):
+ # This function must be implemented.
+ self.itsInfo = dpinfo
+ # Make the arrays that will get the input buffer data from
+ # the getData, etc. calls in the process function.
+ self.itsData = self.makeArrayDataIn()
+ self.itsFlags = self.makeArrayFlagsIn()
+ self.itsWeights = self.makeArrayWeightsIn()
+ self.itsUVW = self.makeArrayUVWIn()
+ # Return the dict with info fields that change in this step.
+ return {};
+
+ def process(self, time, exposure):
+ # This function must be implemented.
+ # First get the data arrays needed by this step.
+ self.getData (self.itsData);
+ self.getFlags (self.itsFlags);
+ self.getWeights (self.itsWeights);
+ self.getUVW (self.itsUVW);
+ # Process the data.
+ print "process tPythonStep", time-4.47203e9, exposure, self.itsData.sum(), self.itsFlags.sum(), self.itsWeights.sum(), self.itsUVW.sum()
+ # Execute the next step in the DPPP pipeline. TIME,UVW are changed.
+ return self.processNext ({'TIME': time+self.itsIncr, 'UVW': self.itsUVW+self.itsIncr})
+
+ def finish(self):
+ # Finish the step as needed.
+ # This function does not need to be implemented.
+ # Note: finish of the next step is called by the C++ layer.
+ print "finish tPythonStep"
+
+ def showCounts(self):
+ # Show the counts of this test.
+ # This function does not need to be implemented.
+ return " **showcounttest**"
+
+ def addToMS(self, msname):
+ # Add some info the the output MeasurementSet.
+ # This function does not need to be implemented.
+ print "addToMS tPythonStep", msname
diff --git a/CEP/DP3/PythonDPPP/test/tPythonStep.run b/CEP/DP3/PythonDPPP/test/tPythonStep.run
new file mode 100755
index 0000000000000000000000000000000000000000..deee0fd07d1f61820e68ccbddf8253f732b06649
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/test/tPythonStep.run
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Set srcdir if not defined (in case run by hand).
+if test "$srcdir" = ""; then
+ srcdir=`find ../../../../../.. -name PythonDPPP | grep -v build/ | grep -v /include/`/test
+fi
+
+if test ! -f $srcdir/../../DPPP/test/tNDPPP.in_MS.tgz; then
+ return 3 # untested
+fi
+
+# Get the test MS and rename it to be deleted automatically.
+tar zxf $srcdir/../../DPPP/test/tNDPPP.in_MS.tgz
+mv tNDPPP_tmp.MS tPythonStep_tmp.MS
+
+# Define the path for finding the library.
+LD_LIBRARY_PATH=../src:$LD_LIBRARYPATH
+DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARYPATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+# Run NDPPP with the test python step.
+../../DPPP/src/NDPPP msin=tPythonStep_tmp.MS msout=tPythonStep_tmp.msout msout.overwrite=T steps='[pystep,pystep2]' pystep.type=PythonDPPP pystep.python.module=tPythonStep pystep.python.class=tPythonStep pystep.somekey=somevalue pystep2.type=pythondppp pystep2.python.class=tPythonStep pystep2.incr=3.5
+
diff --git a/CEP/DP3/PythonDPPP/test/tPythonStep.sh b/CEP/DP3/PythonDPPP/test/tPythonStep.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4b2a0f3d7d05ab6b31b572d39c3dc8957768185b
--- /dev/null
+++ b/CEP/DP3/PythonDPPP/test/tPythonStep.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+./runctest.sh tPythonStep
diff --git a/CEP/DP3/TestDynDPPP/CMakeLists.txt b/CEP/DP3/TestDynDPPP/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..06f1f9e3b978f7b944567204945580bd730ddb99
--- /dev/null
+++ b/CEP/DP3/TestDynDPPP/CMakeLists.txt
@@ -0,0 +1,9 @@
+# $Id: CMakeLists.txt 27640 2013-12-04 08:02:49Z diepen $
+
+lofar_package(TestDynDPPP 0.1 DEPENDS DPPP)
+
+include(LofarFindPackage)
+lofar_find_package(Casacore COMPONENTS casa ms tables REQUIRED)
+
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/CEP/DP3/TestDynDPPP/src/CMakeLists.txt b/CEP/DP3/TestDynDPPP/src/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c7b9b9cd4485c4898e51550c4e289a99b57d57b7
--- /dev/null
+++ b/CEP/DP3/TestDynDPPP/src/CMakeLists.txt
@@ -0,0 +1,7 @@
+# $Id: CMakeLists.txt 30439 2014-11-19 15:04:34Z dijkema $
+
+add_library(testdyndppp
+ TestDynStep.cc
+)
+
+target_link_libraries (testdyndppp dppp)
diff --git a/CEP/DP3/TestDynDPPP/src/TestDynStep.cc b/CEP/DP3/TestDynDPPP/src/TestDynStep.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ab532fb346d0a9c5be960d6ea50b6a322f6d0823
--- /dev/null
+++ b/CEP/DP3/TestDynDPPP/src/TestDynStep.cc
@@ -0,0 +1,57 @@
+//# TestDyn.cc: Test of a dynamically loaded DPPP step
+//# Copyright (C) 2015
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id: Averager.h 30711 2015-01-15 14:36:28Z diepen $
+//#
+//# @author Ger van Diepen
+
+// @file
+// @brief Test of a dynamically loaded DPPP step
+
+#include <lofar_config.h>
+#include "TestDynStep.h"
+#include <DPPP/DPBuffer.h>
+#include <DPPP/DPRun.h>
+
+namespace LOFAR {
+ namespace DPPP {
+
+ TestDynStep::TestDynStep (DPInput* input, const ParameterSet& pset,
+ const std::string& prefix)
+ : Averager (input, pset, prefix)
+ {}
+
+ TestDynStep::~TestDynStep()
+ {}
+
+ DPStep::ShPtr TestDynStep::makeStep (DPInput* input,
+ const ParameterSet& pset,
+ const std::string& prefix)
+ { return DPStep::ShPtr(new TestDynStep(input, pset, prefix)); }
+
+ }
+}
+
+// Define the function to make the TestDynStep 'constructor' known.
+// Its suffix must be the (lowercase) name of the package (library).
+void register_testdyndppp()
+{
+ LOFAR::DPPP::DPRun::registerStepCtor ("TestDynDPPP",
+ LOFAR::DPPP::TestDynStep::makeStep);
+}
diff --git a/CEP/DP3/TestDynDPPP/src/TestDynStep.h b/CEP/DP3/TestDynDPPP/src/TestDynStep.h
new file mode 100644
index 0000000000000000000000000000000000000000..60ea8ab5de9f4f7f553641389dd7e10b74fc42db
--- /dev/null
+++ b/CEP/DP3/TestDynDPPP/src/TestDynStep.h
@@ -0,0 +1,62 @@
+//# TestDynStep.h: Test of a dynamically loaded DPPP step
+//# Copyright (C) 2015
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id: Averager.h 30711 2015-01-15 14:36:28Z diepen $
+//#
+//# @author Ger van Diepen
+
+#ifndef TESTDYNDPPP_TESTDYNSTEP_H
+#define TESTDYNDPPP_TESTDYNSTEP_H
+
+// @file
+// @brief Test of a dynamically loaded DPPP step
+
+#include <DPPP/DPStep.h>
+#include <DPPP/Averager.h>
+#include <DPPP/DPInput.h>
+#include <Common/ParameterSet.h>
+
+namespace LOFAR {
+ namespace DPPP {
+ // @ingroup NDPPP
+
+ // This class is a test (and an example) of a DPStep loaded
+ // dynamically from a shared library.
+ // To make test life easy it uses the Averager class underneath.
+
+ class TestDynStep: public Averager
+ {
+ public:
+ TestDynStep (DPInput*, const ParameterSet&, const std::string&);
+ virtual ~TestDynStep();
+ static DPStep::ShPtr makeStep (DPInput*, const ParameterSet&,
+ const std::string&);
+ };
+
+
+ }
+}
+
+// Define the function (without name mangling) to register the 'constructor'.
+extern "C"
+{
+ void register_testdyndppp();
+}
+
+#endif
diff --git a/CEP/DP3/TestDynDPPP/test/CMakeLists.txt b/CEP/DP3/TestDynDPPP/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f0c471a411b1a91f31524b66a3a01c0b21aa76b5
--- /dev/null
+++ b/CEP/DP3/TestDynDPPP/test/CMakeLists.txt
@@ -0,0 +1,8 @@
+# $Id: CMakeLists.txt 26355 2013-09-04 11:51:07Z dijkema $
+
+include(LofarCTest)
+
+# Do not use lofar_add_test, because libtestdyndppp should not be linked in.
+add_executable (tTestDynStep tTestDynStep.cc)
+target_link_libraries (tTestDynStep ${_libs} ${LOFAR_EXTRA_LIBRARIES})
+add_test (tTestDynStep ${CMAKE_SOURCE_DIR}/CEP/DP3/TestDynDPPP/test/tTestDynStep.sh)
diff --git a/CEP/DP3/TestDynDPPP/test/tTestDynStep.cc b/CEP/DP3/TestDynDPPP/test/tTestDynStep.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a77c09bd4263c64ecc6f202d982222748bf72395
--- /dev/null
+++ b/CEP/DP3/TestDynDPPP/test/tTestDynStep.cc
@@ -0,0 +1,592 @@
+//# tTestDynStep.cc: Test program for class TestDynStep
+//# Copyright (C) 2015
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id: tAverager.cc 30718 2015-01-19 15:31:51Z diepen $
+//#
+//# @author Ger van Diepen
+
+// This file is mostly a copy of DPPP/test/tAverager.cc.
+// Only the way the average steps are created is different.
+// Average is used underneath TestDynStep.
+
+#include <lofar_config.h>
+#include <DPPP/DPBuffer.h>
+#include <DPPP/DPInfo.h>
+#include <DPPP/DPInput.h>
+#include <DPPP/DPRun.h>
+#include <Common/ParameterSet.h>
+#include <Common/StringUtil.h>
+#include <Common/LofarLogger.h>
+#include <casa/Arrays/ArrayMath.h>
+#include <casa/Arrays/ArrayLogical.h>
+#include <casa/Arrays/ArrayIO.h>
+#include <iostream>
+
+using namespace LOFAR;
+using namespace LOFAR::DPPP;
+using namespace casa;
+using namespace std;
+
+
+// Simple class to generate input arrays.
+// It can only set all flags to true or all false.
+// Weights are always 1.
+// It can be used with different nr of times, channels, etc.
+class TestInput: public DPInput
+{
+public:
+ TestInput(int ntime, int nbl, int nchan, int ncorr, bool flag)
+ : itsCount(0), itsNTime(ntime), itsNBl(nbl), itsNChan(nchan),
+ itsNCorr(ncorr), itsFlag(flag)
+ {}
+private:
+ virtual bool process (const DPBuffer&)
+ {
+ // Stop when all times are done.
+ if (itsCount == itsNTime) {
+ return false;
+ }
+ Cube<Complex> data(itsNCorr, itsNChan, itsNBl);
+ for (int i=0; i<int(data.size()); ++i) {
+ data.data()[i] = Complex(i+itsCount*10,i-1000+itsCount*6);
+ }
+ DPBuffer buf;
+ buf.setTime (itsCount*5 + 2); //same interval as in updateAveragInfo
+ buf.setData (data);
+ Cube<float> weights(data.shape());
+ weights = 1.;
+ buf.setWeights (weights);
+ Cube<bool> flags(data.shape());
+ flags = itsFlag;
+ buf.setFlags (flags);
+ // The fullRes flags are a copy of the XX flags, but differently shaped.
+ // They are not averaged, thus only 1 time per row.
+ Cube<bool> fullResFlags(itsNChan, 1, itsNBl);
+ fullResFlags = itsFlag;
+ buf.setFullResFlags (fullResFlags);
+ Matrix<double> uvw(3,itsNBl);
+ indgen (uvw, double(itsCount*100));
+ buf.setUVW (uvw);
+ getNextStep()->process (buf);
+ ++itsCount;
+ return true;
+ }
+
+ virtual void finish() {getNextStep()->finish();}
+ virtual void show (std::ostream&) const {}
+ virtual void updateInfo (const DPInfo&)
+ {
+ // Use timeInterval=5
+ info().init (itsNCorr, itsNChan, itsNTime, 100, 5, string(), string());
+ // Define the frequencies.
+ Vector<double> chanFreqs(itsNChan);
+ Vector<double> chanWidth(itsNChan, 100000.);
+ indgen (chanFreqs, 1050000., 100000.);
+ info().set (chanFreqs, chanWidth);
+ }
+ int itsCount, itsNTime, itsNBl, itsNChan, itsNCorr;
+ bool itsFlag;
+};
+
+// Class to check result of averaging TestInput.
+class TestOutput: public DPStep
+{
+public:
+ TestOutput(int ntime, int nbl, int nchan, int ncorr,
+ int navgtime, int navgchan, bool flag)
+ : itsCount(0), itsNTime(ntime), itsNBl(nbl), itsNChan(nchan),
+ itsNCorr(ncorr), itsNAvgTime(navgtime), itsNAvgChan(navgchan),
+ itsFlag(flag)
+ {}
+private:
+ virtual bool process (const DPBuffer& buf)
+ {
+ int nchan = 1+(itsNChan-1)/itsNAvgChan;
+ int navgtime = std::min(itsNAvgTime, itsNTime-itsCount*itsNAvgTime);
+ // Fill expected result in similar way as TestInput.
+ Cube<Complex> data(itsNCorr,itsNChan,itsNBl);
+ Cube<float> weights(itsNCorr,itsNChan,itsNBl);
+ Cube<bool> fullResFlags(itsNChan,itsNAvgTime,itsNBl);
+ fullResFlags = true; // takes care of missing times at the end
+ weights = 0;
+ for (int j=itsCount*itsNAvgTime; j<itsCount*itsNAvgTime+navgtime; ++j) {
+ for (int i=0; i<int(data.size()); ++i) {
+ data.data()[i] += Complex(i+j*10,i-1000+j*6);
+ weights.data()[i] += float(1);
+ }
+ fullResFlags(Slicer(IPosition(3,0,0,0),
+ IPosition(3,itsNChan,navgtime,itsNBl))) = itsFlag;
+ }
+ Cube<Complex> result(itsNCorr,nchan,itsNBl);
+ Cube<float> resultw(itsNCorr,nchan,itsNBl);
+ resultw = 0;
+ // Average to get the true expected result.
+ for (int k=0; k<itsNBl; ++k) {
+ for (int i=0; i<itsNCorr; ++i) {
+ for (int j=0; j<nchan; ++j) {
+ int jc;
+ for (jc=j*itsNAvgChan;
+ jc<std::min((j+1)*itsNAvgChan, itsNChan); ++jc) {
+ result(i,j,k) += data(i,jc,k);
+ resultw(i,j,k) += weights(i,jc,k);
+ }
+ result(i,j,k) /= float(navgtime*(jc-j*itsNAvgChan));
+ }
+ }
+ }
+ // Check the averaged result.
+ ASSERT (allNear(real(buf.getData()), real(result), 1e-5));
+ ///cout << imag(buf.getData()) << endl<<imag(result);
+ ASSERT (allNear(imag(buf.getData()), imag(result), 1e-5));
+ ASSERT (allEQ(buf.getFlags(), itsFlag));
+ ASSERT (near(buf.getTime(),
+ 2+5*(itsCount*itsNAvgTime + (itsNAvgTime-1)/2.)));
+ ASSERT (allNear(buf.getWeights(), resultw, 1e-5));
+ if (navgtime == itsNAvgTime) {
+ Matrix<double> uvw(3,itsNBl);
+ indgen (uvw, 100*(itsCount*itsNAvgTime + 0.5*(itsNAvgTime-1)));
+ ASSERT (allNear(buf.getUVW(), uvw, 1e-5));
+ }
+ cout <<buf.getFullResFlags()<< fullResFlags;
+ ASSERT (allEQ(buf.getFullResFlags(), fullResFlags));
+ ++itsCount;
+ return true;
+ }
+
+ virtual void finish() {}
+ virtual void show (std::ostream&) const {}
+ virtual void updateInfo (const DPInfo& info)
+ {
+ ASSERT (int(info.origNChan())==itsNChan);
+ ASSERT (int(info.nchan())==1+(itsNChan-1)/itsNAvgChan);
+ ASSERT (int(info.ntime())==1+(itsNTime-1)/itsNAvgTime);
+ ASSERT (info.timeInterval()==5*itsNAvgTime);
+ ASSERT (int(info.nchanAvg())==itsNAvgChan);
+ ASSERT (int(info.ntimeAvg())==itsNAvgTime);
+ }
+
+ int itsCount;
+ int itsNTime, itsNBl, itsNChan, itsNCorr, itsNAvgTime, itsNAvgChan;
+ bool itsFlag;
+};
+
+
+// More elaborate class which can set different flags and weights.
+class TestInput3: public DPInput
+{
+public:
+ TestInput3(int nrtime, int nrbl, int nrchan, int nrcorr)
+ : itsCount(0),
+ itsNrTime(nrtime), itsNrBl(nrbl), itsNrChan(nrchan), itsNrCorr(nrcorr)
+ {
+ itsFullResFlags.resize (itsNrChan,1,nrbl);
+ }
+private:
+ virtual bool process (const DPBuffer&)
+ {
+ // Stop when all times are done.
+ if (itsCount == itsNrTime) {
+ return false;
+ }
+ Cube<Complex> data(itsNrCorr,itsNrChan,itsNrBl);
+ Cube<float> weights(itsNrCorr,itsNrChan,itsNrBl);
+ Cube<bool> flags(itsNrCorr,itsNrChan,itsNrBl);
+ int i = 0;
+ for (int ib=0; ib<itsNrBl; ++ib) {
+ for (int ic=0; ic<itsNrChan; ++ic) {
+ for (int ip=0; ip<itsNrCorr; ++ip) {
+ data.data()[i] = Complex(i+itsCount*10,i-1000+itsCount*6);
+ weights.data()[i] = (1 + (itsCount+ib+ic)%5) / 5.;
+ flags.data()[i] = ((itsCount+2*ib+3*ic) % 7 == 0);
+ i++;
+ }
+ itsFullResFlags(ic,0,ib) = ((itsCount+2*ib+3*ic) % 7 == 0);
+ }
+ }
+ DPBuffer buf;
+ buf.setTime (itsCount*5 + 2); //same interval as in updateAveragInfo
+ buf.setData (data);
+ buf.setWeights (weights);
+ buf.setFlags (flags);
+ Vector<uint> rownrs(1,itsCount);
+ buf.setRowNrs (rownrs);
+ getNextStep()->process (buf);
+ ++itsCount;
+ return true;
+ }
+
+ virtual void getUVW (const casa::RefRows&, double, DPBuffer& buf)
+ {
+ buf.getUVW().resize (3, itsNrBl);
+ indgen (buf.getUVW());
+ }
+ virtual bool getFullResFlags (const casa::RefRows&, DPBuffer& buf)
+ {
+ buf.getFullResFlags().assign (itsFullResFlags);
+ return true;
+ }
+
+ virtual void finish() {getNextStep()->finish();}
+ virtual void show (std::ostream&) const {}
+ virtual void updateInfo (const DPInfo&)
+ {
+ // Use timeInterval=5
+ info().init (itsNrCorr, itsNrChan, itsNrTime, 100, 5, string(), string());
+ // Define the frequencies.
+ Vector<double> chanFreqs(itsNrChan);
+ Vector<double> chanWidth(itsNrChan, 100000.);
+ indgen (chanFreqs, 1050000., 100000.);
+ info().set (chanFreqs, chanWidth);
+ }
+ int itsCount, itsNrTime, itsNrBl, itsNrChan, itsNrCorr;
+ Cube<bool> itsFullResFlags;
+};
+
+// Class to check result of averaging TestInput3.
+// All input must be averaged (in one or more steps) to a single value
+// per corr/baseline.
+class TestOutput3: public DPStep
+{
+public:
+ TestOutput3(int nrtime, int nrbl, int nrchan, int nrcorr)
+ : itsNrTime(nrtime), itsNrBl(nrbl), itsNrChan(nrchan), itsNrCorr(nrcorr)
+ {}
+private:
+ virtual bool process (const DPBuffer& buf)
+ {
+ Cube<Complex> result(itsNrCorr,1,itsNrBl);
+ Cube<float> weights(itsNrCorr,1,itsNrBl);
+ Cube<bool> flags(itsNrCorr,1,itsNrBl);
+ Cube<bool> fullResFlags(itsNrChan,itsNrTime,itsNrBl);
+ weights = float(0);
+ flags = true;
+ fullResFlags = true;
+ // Create data in the same way as in TestInput3.
+ for (int it=0; it<itsNrTime; ++it) {
+ int i = 0;
+ for (int ib=0; ib<itsNrBl; ++ib) {
+ for (int ic=0; ic<itsNrChan; ++ic) {
+ for (int ip=0; ip<itsNrCorr; ++ip) {
+ if ((it+2*ib+3*ic) % 7 != 0) {
+ float weight = (1 + (it+ib+ic)%5) / 5.;
+ result(ip,0,ib) += weight * Complex(i+it*10,i-1000+it*6);
+ weights(ip,0,ib) += weight;
+ /// cout << result(ip,0,ib) << weight << endl;
+ flags(ip,0,ib) = false;
+ fullResFlags(ic,it,ib) = false;
+ }
+ i++;
+ }
+ }
+ }
+ }
+ ASSERT (allNE(weights, float(0.)));
+ for (uint i=0; i<result.size(); ++i) {
+ result.data()[i] /= weights.data()[i];
+ }
+ // Check the averaged result.
+ ///cout << real(buf.getData()) << endl<<real(result);
+ ASSERT (allNear(real(buf.getData()), real(result), 1e-5));
+ ASSERT (allNear(imag(buf.getData()), imag(result), 1e-5));
+ ASSERT (allEQ(buf.getFlags(), flags));
+ ASSERT (near(buf.getTime(), 2.+5*(itsNrTime-1)/2.));
+ ASSERT (allNear(buf.getWeights(), weights, 1e-5));
+ Matrix<double> uvw(3,itsNrBl);
+ indgen (uvw);
+ ASSERT (allNear(buf.getUVW(), uvw, 1e-5));
+ ///cout <<buf.getFullResFlags()<< fullResFlags;
+ ASSERT (allEQ(buf.getFullResFlags(), fullResFlags));
+ return true;
+ }
+
+ virtual void finish() {}
+ virtual void show (std::ostream&) const {}
+ virtual void updateInfo (const DPInfo& info)
+ {
+ ASSERT (int(info.origNChan())==itsNrChan);
+ ASSERT (info.nchan()==1);
+ ASSERT (info.ntime()==1);
+ ASSERT (info.timeInterval()==5*itsNrTime);
+ ASSERT (int(info.nchanAvg())==itsNrChan);
+ ASSERT (int(info.ntimeAvg())==itsNrTime);
+ }
+
+ int itsNrTime, itsNrBl, itsNrChan, itsNrCorr;
+};
+
+// Simple class to flag every step-th XX point.
+class TestFlagger: public DPStep
+{
+public:
+ TestFlagger(int step)
+ : itsCount(0), itsStep(step)
+ {}
+private:
+ virtual bool process (const DPBuffer& buf)
+ {
+ DPBuffer buf2(buf);
+ int ncorr = buf2.getFlags().shape()[0];
+ int np = buf2.getFlags().size() / ncorr;
+ bool* flagPtr = buf2.getFlags().data();
+ for (int i=0; i<np; ++i) {
+ if ((i+itsCount)%itsStep == 0) {
+ ///cout << "flagged " <<itsCount <<' '<< i << endl;
+ for (int j=0; j<ncorr; ++j) {
+ flagPtr[i*ncorr + j] = true;
+ }
+ }
+ }
+ getNextStep()->process (buf2);
+ ++itsCount;
+ return true;
+ }
+
+ virtual void finish() {getNextStep()->finish();}
+ virtual void show (std::ostream&) const {}
+
+ int itsCount, itsStep;
+};
+
+// Class to check result of averaging and flagging TestInput3.
+// First the data are averaged from 8,4 to 4,2, then every step-th point
+// is flagged, and finally it is averaged to 1,1.
+class TestOutput4: public DPStep
+{
+public:
+ TestOutput4(int nrtime, int nrbl, int nrchan, int nrcorr, int step)
+ : itsNrTime(nrtime), itsNrBl(nrbl), itsNrChan(nrchan), itsNrCorr(nrcorr),
+ itsStep(step)
+ {}
+private:
+ virtual bool process (const DPBuffer& buf)
+ {
+ Cube<Complex> result(itsNrCorr,1,itsNrBl);
+ Cube<float> weights(itsNrCorr,1,itsNrBl);
+ Cube<bool> flags(itsNrCorr,1,itsNrBl);
+ Cube<bool> fullResFlags(itsNrChan,itsNrTime,itsNrBl);
+ weights = float(0);
+ flags = true;
+ fullResFlags = true;
+ // Create data in the same way as in TestInput3.
+ for (int it=0; it<itsNrTime; ++it) {
+ int i = 0;
+ for (int ib=0; ib<itsNrBl; ++ib) {
+ for (int ic=0; ic<itsNrChan; ++ic) {
+ // TestFlagger flags every step-th point of 2x2 averaged data.
+ int tf = it/2; // same as itsCount in testFlagger
+ if (((ib*itsNrChan + ic)/2 + tf) % itsStep == 0) {
+ ///cout << "out4 flagged "<< tf<<' '<< i/itsNrCorr<<' ' <<ib<<' '<<ic/2 << endl;
+ i += itsNrCorr;
+ } else {
+ for (int ip=0; ip<itsNrCorr; ++ip) {
+ if ((it+2*ib+3*ic) % 7 != 0) {
+ float weight = (1 + (it+ib+ic)%5) / 5.;
+ result(ip,0,ib) += weight * Complex(i+it*10,i-1000+it*6);
+ weights(ip,0,ib) += weight;
+ /// cout << result(ip,0,ib) << weight << endl;
+ flags(ip,0,ib) = false;
+ fullResFlags(ic,it,ib) = false;
+ }
+ i++;
+ }
+ }
+ }
+ }
+ }
+ for (uint i=0; i<result.size(); ++i) {
+ if (!flags.data()[i]) {
+ result.data()[i] /= weights.data()[i];
+ }
+ }
+ // Check the averaged result.
+ ///cout << real(buf.getData()) << endl<<real(result);
+ ASSERT (allNear(real(buf.getData()), real(result), 1e-5));
+ ASSERT (allNear(imag(buf.getData()), imag(result), 1e-5));
+ ASSERT (allEQ(buf.getFlags(), flags));
+ ASSERT (near(buf.getTime(), 2.+5*(itsNrTime-1)/2.));
+ ASSERT (allNear(buf.getWeights(), weights, 1e-5));
+ Matrix<double> uvw(3,itsNrBl);
+ indgen (uvw);
+ ASSERT (allNear(buf.getUVW(), uvw, 1e-5));
+ ///cout <<buf.getFullResFlags()<< fullResFlags;
+ ASSERT (allEQ(buf.getFullResFlags(), fullResFlags));
+ return true;
+ }
+
+ virtual void finish() {}
+ virtual void show (std::ostream&) const {}
+ virtual void updateInfo (const DPInfo& info)
+ {
+ ASSERT (int(info.origNChan())==itsNrChan);
+ ASSERT (info.nchan()==1);
+ ASSERT (info.ntime()==1);
+ ASSERT (info.timeInterval()==5*itsNrTime);
+ ASSERT (int(info.nchanAvg())==itsNrChan);
+ ASSERT (int(info.ntimeAvg())==itsNrTime);
+ }
+
+ int itsNrTime, itsNrBl, itsNrChan, itsNrCorr, itsStep;
+};
+
+
+// Execute steps.
+void execute (const DPStep::ShPtr& step1)
+{
+ // Set DPInfo.
+ step1->setInfo (DPInfo());
+ // Execute the steps.
+ DPBuffer buf;
+ while (step1->process(buf));
+ step1->finish();
+}
+
+// Test simple averaging without flagged points.
+void test1(int ntime, int nbl, int nchan, int ncorr,
+ int navgtime, int navgchan, bool flag)
+{
+ cout << "test1: ntime=" << ntime << " nrbl=" << nbl << " nchan=" << nchan
+ << " ncorr=" << ncorr << " navgtime=" << navgtime
+ << " navgchan=" << navgchan << endl;
+ // Create the steps.
+ TestInput* in = new TestInput(ntime, nbl, nchan, ncorr, flag);
+ DPStep::ShPtr step1(in);
+ ParameterSet parset;
+ parset.add ("freqstep", toString(navgchan));
+ parset.add ("timestep", toString(navgtime));
+ DPStep::ShPtr step2 = DPRun::findStepCtor("TestDynDPPP")(in, parset, "");
+ DPStep::ShPtr step3(new TestOutput(ntime, nbl, nchan, ncorr,
+ navgtime, navgchan, flag));
+ step1->setNextStep (step2);
+ step2->setNextStep (step3);
+ execute (step1);
+}
+
+// Like test1, but the averaging is done in two steps.
+void test2(int ntime, int nbl, int nchan, int ncorr, bool flag)
+{
+ cout << "test2: ntime=" << ntime << " nrbl=" << nbl << " nchan=" << nchan
+ << " ncorr=" << ncorr << " navgtime=2"
+ << " navgchan=4" << endl;
+ // Create the steps.
+ TestInput* in = new TestInput(ntime, nbl, nchan, ncorr, flag);
+ DPStep::ShPtr step1(in);
+ ParameterSet parset1, parset2;
+ parset1.add ("freqstep", "4");
+ parset2.add ("timestep", "2");
+ DPStep::ShPtr step2a = DPRun::findStepCtor("TestDynDPPP")(in, parset1, "");
+ DPStep::ShPtr step2b = DPRun::findStepCtor("TestDynDPPP")(in, parset2, "");
+ DPStep::ShPtr step3(new TestOutput(ntime, nbl, nchan, ncorr, 2, 4, flag));
+ step1->setNextStep (step2a);
+ step2a->setNextStep (step2b);
+ step2b->setNextStep (step3);
+ execute (step1);
+}
+
+// Do tests with weighting and some flagged points.
+void test3(int nrbl, int nrcorr)
+{
+ {
+ cout << "test3: ntime=2 nrbl=" << nrbl << " nchan=2 ncorr=" << nrcorr
+ << endl;
+ cout << " navgtime=2 navgchan=2" << endl;
+ // Create the steps.
+ TestInput3* in = new TestInput3(2, nrbl, 2, nrcorr);
+ DPStep::ShPtr step1(in);
+ ParameterSet parset1;
+ parset1.add ("freqstep", "2");
+ parset1.add ("timestep", "2");
+ DPStep::ShPtr step2a = DPRun::findStepCtor("TestDynDPPP")(in, parset1, "");
+ DPStep::ShPtr step3(new TestOutput3(2, nrbl, 2, nrcorr));
+ step1->setNextStep (step2a);
+ step2a->setNextStep (step3);
+ execute (step1);
+ }
+ {
+ cout << "test3: ntime=4 nrbl=" << nrbl << " nchan=8 ncorr=" << nrcorr
+ << endl;
+ cout << " [navgtime=2 navgchan=4], [navgtime=2 navgchan=2]" << endl;
+ // Create the steps.
+ TestInput3* in = new TestInput3(4, nrbl, 8, nrcorr);
+ DPStep::ShPtr step1(in);
+ ParameterSet parset1, parset2;
+ parset1.add ("freqstep", "4");
+ parset1.add ("timestep", "2");
+ parset2.add ("freqstep", "2");
+ parset2.add ("timestep", "2");
+ DPStep::ShPtr step2a = DPRun::findStepCtor("TestDynDPPP")(in, parset1, "");
+ DPStep::ShPtr step2b = DPRun::findStepCtor("TestDynDPPP")(in, parset2, "");
+ DPStep::ShPtr step3(new TestOutput3(4, nrbl, 8, nrcorr));
+ step1->setNextStep (step2a);
+ step2a->setNextStep (step2b);
+ step2b->setNextStep (step3);
+ execute (step1);
+ }
+}
+
+// Do tests with averaging and flagging steps to see if the flags are
+// promoted to the FULLRES flags.
+void test4(int nrbl, int nrcorr, int flagstep)
+{
+ {
+ cout << "test4: ntime=4 nrbl=" << nrbl << " nchan=8 ncorr=" << nrcorr
+ << endl;
+ cout << " [navgtime=2 navgchan=2], [flagstep=" << flagstep
+ << "] [navgtime=2 navgchan=4]" << endl;
+ // Create the steps.
+ TestInput3* in = new TestInput3(4, nrbl, 8, nrcorr);
+ DPStep::ShPtr step1(in);
+ ParameterSet parset1, parset2;
+ parset1.add ("freqstep", "2");
+ parset1.add ("timestep", "2");
+ parset2.add ("freqstep", "4");
+ parset2.add ("timestep", "2");
+ DPStep::ShPtr step2a = DPRun::findStepCtor("TestDynDPPP")(in, parset1, "");
+ DPStep::ShPtr step2b(new TestFlagger(flagstep));
+ DPStep::ShPtr step2c = DPRun::findStepCtor("TestDynDPPP")(in, parset2, "");
+ DPStep::ShPtr step3(new TestOutput4(4, nrbl, 8, nrcorr, flagstep));
+ step1->setNextStep (step2a);
+ step2a->setNextStep (step2b);
+ step2b->setNextStep (step2c);
+ step2c->setNextStep (step3);
+ execute (step1);
+ }
+}
+
+
+int main()
+{
+ try {
+ test1(10, 3, 32, 4, 2, 4, false);
+ test1(10, 3, 30, 1, 3, 3, true);
+ test1(10, 3, 30, 1, 3, 3, false);
+ test1(11, 3, 30, 2, 3, 3, false);
+ test1(10, 3, 32, 4, 1, 32, false);
+ test1(10, 3, 32, 1, 1, 1, false);
+ test2(10, 3, 32, 2, true);
+ test2(10, 3, 32, 2, false);
+ test3(1, 1);
+ test3(10, 4);
+ test4(1, 4, 3);
+ test4(20, 4, 5);
+ } catch (std::exception& x) {
+ cout << "Unexpected exception: " << x.what() << endl;
+ return 1;
+ }
+ return 0;
+}
diff --git a/CEP/DP3/TestDynDPPP/test/tTestDynStep.run b/CEP/DP3/TestDynDPPP/test/tTestDynStep.run
new file mode 100755
index 0000000000000000000000000000000000000000..f23bb3595c4b27321cc7870ec7e8c1555a3322ef
--- /dev/null
+++ b/CEP/DP3/TestDynDPPP/test/tTestDynStep.run
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Define the path for finding the library.
+LD_LIBRARY_PATH=../src:$LD_LIBRARYPATH
+DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARYPATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+./tTestDynStep
diff --git a/CEP/DP3/TestDynDPPP/test/tTestDynStep.sh b/CEP/DP3/TestDynDPPP/test/tTestDynStep.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6f59e84345ddc1a5a2a56ef6483b4bdb08fecbb2
--- /dev/null
+++ b/CEP/DP3/TestDynDPPP/test/tTestDynStep.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+./runctest.sh tTestDynStep
diff --git a/CEP/Imager/LofarFT/src/LofarVisResampler.cc b/CEP/Imager/LofarFT/src/LofarVisResampler.cc
index e076a2e02db5c9e4a932d80f586d70974a27a156..fe7ce6a54d6fdcb0e9418d75ba7031984e81ac62 100644
--- a/CEP/Imager/LofarFT/src/LofarVisResampler.cc
+++ b/CEP/Imager/LofarFT/src/LofarVisResampler.cc
@@ -182,7 +182,7 @@ namespace LOFAR {
/// cout << "in grid"<<endl;
// Get pointer to data and flags for this channel.
- Int doff = (irow * nVisChan + visChan) * nVisPol;
+ size_t doff = (size_t(irow) * nVisChan + visChan) * nVisPol;
const Complex* __restrict__ visPtr = vbs.visCube_p.data() + doff;
const Bool* __restrict__ flagPtr = vbs.flagCube_p.data() + doff;
if (dopsf) {
@@ -199,7 +199,7 @@ namespace LOFAR {
//cout<<"ipol: "<<ipol<<endl;
// Get the offset in the grid data array.
- Int goff = (gridChan*nGridPol + gridPol) * nGridX * nGridY;
+ size_t goff = (size_t(gridChan)*nGridPol + gridPol) * nGridX * nGridY;
// Loop over the scaled support.
for (Int sy=-fsupy; sy<=fsupy; ++sy) {
// Get the pointer in the grid for the first x in this y.
@@ -212,7 +212,7 @@ namespace LOFAR {
// Fast version
const Complex* __restrict__ cf[1];
- Int cfoff = (offy + sy*fsampy)*nConvX + offx - fsupx*fsampx;
+ size_t cfoff = (size_t(offy) + sy*fsampy)*nConvX + offx - fsupx*fsampx;
cf[0] = (*cfs.vdata)[CFChan][0][0].data() + cfoff;
for (Int sx=-fsupx; sx<=fsupx; ++sx) {
// Loop over polarizations to correct for leakage.
@@ -350,7 +350,7 @@ namespace LOFAR {
locy-supy >= 0 && locy+supy < nGridY) {
/// cout << "in grid"<<endl;
// Get pointer to data and flags for this channel.
- Int doff = (irow * nVisChan + visChan) * nVisPol;
+ size_t doff = (size_t(irow) * nVisChan + visChan) * nVisPol;
Complex* __restrict__ visPtr = vbs.visCube_p.data() + doff;
const Bool* __restrict__ flagPtr = vbs.flagCube_p.data() + doff;
// Handle a visibility if not flagged.
@@ -368,7 +368,7 @@ namespace LOFAR {
if (gridPol >= 0 && gridPol < nGridPol) {
/// Complex norm(0,0);
// Get the offset in the grid data array.
- Int goff = (gridChan*nGridPol + gridPol) * nGridX * nGridY;
+ size_t goff = (size_t(gridChan)*nGridPol + gridPol) * nGridX * nGridY;
// Loop over the scaled support.
for (Int sy=-fsupy; sy<=fsupy; ++sy) {
// Get the pointer in the grid for the first x in this y.
@@ -379,7 +379,7 @@ namespace LOFAR {
// fast version
const Complex* __restrict__ cf[1];
- Int cfoff = (offy + sy*fsampy)*nConvX + offx - fsupx*fsampx;
+ size_t cfoff = (size_t(offy) + sy*fsampy)*nConvX + offx - fsupx*fsampx;
cf[0] = (*cfs.vdata)[CFChan][0][0].data() + cfoff;
for (Int sx=-fsupx; sx<=fsupx; ++sx) {
//outFile<<irow <<" "<<ipol<<" "<<posx<<" "<<posy<<" "<<(offx+ sx*fsampx-(nConvX-1.)/2.)/float(fsampx)<<" "<<(offy + sy*fsampy-(nConvX-1)/2.)/float(fsampy)
@@ -516,7 +516,7 @@ namespace LOFAR {
locy-supy >= 0 && locy+supy < nGridY) {
/// cout << "in grid"<<endl;
// Get pointer to data and flags for this channel.
- Int doff = (irow * nVisChan + visChan) * nVisPol;
+ size_t doff = (size_t(irow) * nVisChan + visChan) * nVisPol;
Complex* __restrict__ visPtr = vbs.visCube_p.data() + doff;
const Bool* __restrict__ flagPtr = vbs.flagCube_p.data() + doff;
// Handle a visibility if not flagged.
@@ -534,7 +534,7 @@ namespace LOFAR {
if (gridPol >= 0 && gridPol < nGridPol) {
/// Complex norm(0,0);
// Get the offset in the grid data array.
- Int goff = (gridChan*nGridPol + gridPol) * nGridX * nGridY;
+ size_t goff = (size_t(gridChan)*nGridPol + gridPol) * nGridX * nGridY;
// Loop over the scaled support.
for (Int sy=-fsupy; sy<=fsupy; ++sy) {
// Get the pointer in the grid for the first x in this y.
@@ -546,7 +546,7 @@ namespace LOFAR {
// fast version
const Complex* __restrict__ cf0[1];
const Complex* __restrict__ cf1[1];
- Int cfoff = (offy + sy*fsampy)*nConvX + offx - fsupx*fsampx;
+ size_t cfoff = (size_t(offy) + sy*fsampy)*nConvX + offx - fsupx*fsampx;
cf0[0] = (*cfs0.vdata)[gridChan][0][0].data() + cfoff;
cf1[0] = (*cfs1.vdata)[gridChan][0][0].data() + cfoff;
for (Int sx=-fsupx; sx<=fsupx; ++sx) {
@@ -696,7 +696,7 @@ namespace LOFAR {
/// cout << "in grid"<<endl;
// Get pointer to data and flags for this channel.
- Int doff = (irow * nVisChan + visChan) * nVisPol;
+ size_t doff = (size_t(irow) * nVisChan + visChan) * nVisPol;
const Complex* __restrict__ visPtr = vbs.visCube_p.data() + doff;
const Bool* __restrict__ flagPtr = vbs.flagCube_p.data() + doff;
if (dopsf) {
@@ -712,7 +712,7 @@ namespace LOFAR {
//cout<<"ipol: "<<ipol<<endl;
// Get the offset in the grid data array.
- Int goff = (gridChan*nGridPol + gridPol) * nGridX * nGridY;
+ size_t goff = (size_t(gridChan)*nGridPol + gridPol) * nGridX * nGridY;
// Loop over the scaled support.
for (Int sy=-fsupy; sy<=fsupy; ++sy) {
// Get the pointer in the grid for the first x in this y.
@@ -725,7 +725,7 @@ namespace LOFAR {
// Fast version
const Complex* __restrict__ cf[1];
- Int cfoff = (offy + sy*fsampy)*nConvX + offx - fsupx*fsampx;
+ size_t cfoff = (size_t(offy) + sy*fsampy)*nConvX + offx - fsupx*fsampx;
cf[0] = (*cfs.vdata)[gridChan][0][0].data() + cfoff;
for (Int sx=-fsupx; sx<=fsupx; ++sx) {
// Loop over polarizations to correct for leakage.
@@ -1059,7 +1059,7 @@ namespace LOFAR {
locy-supy >= 0 && locy+supy < nGridY) {
/// cout << "in grid"<<endl;
// Get pointer to data and flags for this channel.
- Int doff = (irow * nVisChan + visChan) * nVisPol;
+ size_t doff = (size_t(irow) * nVisChan + visChan) * nVisPol;
Complex* __restrict__ visPtr = vbs.visCube_p.data() + doff;
const Bool* __restrict__ flagPtr = vbs.flagCube_p.data() + doff;
// Handle a visibility if not flagged.
@@ -1077,7 +1077,7 @@ namespace LOFAR {
if (gridPol >= 0 && gridPol < nGridPol) {
/// Complex norm(0,0);
// Get the offset in the grid data array.
- Int goff = (gridChan*nGridPol + gridPol) * nGridX * nGridY;
+ size_t goff = (size_t(gridChan)*nGridPol + gridPol) * nGridX * nGridY;
// Loop over the scaled support.
for (Int sy=-fsupy; sy<=fsupy; ++sy) {
// Get the pointer in the grid for the first x in this y.
@@ -1088,7 +1088,7 @@ namespace LOFAR {
// fast version
const Complex* __restrict__ cf[1];
- Int cfoff = (offy + sy*fsampy)*nConvX + offx - fsupx*fsampx;
+ size_t cfoff = (size_t(offy) + sy*fsampy)*nConvX + offx - fsupx*fsampx;
cf[0] = (*cfs.vdata)[gridChan][0][0].data() + cfoff;
for (Int sx=-fsupx; sx<=fsupx; ++sx) {
//outFile<<irow <<" "<<ipol<<" "<<posx<<" "<<posy<<" "<<(offx+ sx*fsampx-(nConvX-1.)/2.)/float(fsampx)<<" "<<(offy + sy*fsampy-(nConvX-1)/2.)/float(fsampy)
diff --git a/CEP/Imager/LofarFT/src/LofarVisResamplerOld.cc b/CEP/Imager/LofarFT/src/LofarVisResamplerOld.cc
index c88e6a8ed4e787ee7c9dccde7e83b23e0b9f1188..de1a7a57d9c094a1422f542c173462a62b66e502 100644
--- a/CEP/Imager/LofarFT/src/LofarVisResamplerOld.cc
+++ b/CEP/Imager/LofarFT/src/LofarVisResamplerOld.cc
@@ -119,7 +119,7 @@ namespace LOFAR {
locy-supy >= 0 && locy+supy < nGridY) {
/// cout << "in grid"<<endl;
// Get pointer to data and flags for this channel.
- Int doff = (irow * nVisChan + visChan) * nVisPol;
+ size_t doff = (size_t(irow) * nVisChan + visChan) * nVisPol;
const Complex* __restrict__ visPtr = vbs.visCube_p.data() + doff;
const Bool* __restrict__ flagPtr = vbs.flagCube_p.data() + doff;
if (dopsf) {
@@ -132,7 +132,7 @@ namespace LOFAR {
Int gridPol = polMap_p(ipol);
if (gridPol >= 0 && gridPol < nGridPol) {
// Get the offset in the grid data array.
- Int goff = (gridChan*nGridPol + gridPol) * nGridX * nGridY;
+ size_t goff = (size_t(gridChan)*nGridPol + gridPol) * nGridX * nGridY;
// Loop over the scaled support.
for (Int sy=-fsupy; sy<=fsupy; ++sy) {
// Get the pointer in the grid for the first x in this y.
@@ -141,7 +141,7 @@ namespace LOFAR {
// Get pointers to the first element to use in the 4
// convolution functions for this channel,pol.
const Complex* __restrict__ cf[4];
- Int cfoff = (offy + sy*fsampy)*nConvX + offx - fsupx*fsampx;
+ size_t cfoff = (size_t(offy) + sy*fsampy)*nConvX + offx - fsupx*fsampx;
for (int i=0; i<4; ++i) {
cf[i] = (*cfs.vdata)[gridChan][ipol][i].data() + cfoff;
}
@@ -429,7 +429,7 @@ namespace LOFAR {
locy-supy >= 0 && locy+supy < nGridY) {
/// cout << "in grid"<<endl;
// Get pointer to data and flags for this channel.
- Int doff = (irow * nVisChan + visChan) * nVisPol;
+ size_t doff = (size_t(irow) * nVisChan + visChan) * nVisPol;
Complex* __restrict__ visPtr = vbs.visCube_p.data() + doff;
const Bool* __restrict__ flagPtr = vbs.flagCube_p.data() + doff;
// Handle a visibility if not flagged.
@@ -445,7 +445,7 @@ namespace LOFAR {
if (gridPol >= 0 && gridPol < nGridPol) {
/// Complex norm(0,0);
// Get the offset in the grid data array.
- Int goff = (gridChan*nGridPol + gridPol) * nGridX * nGridY;
+ size_t goff = (size_t(gridChan)*nGridPol + gridPol) * nGridX * nGridY;
// Loop over the scaled support.
for (Int sy=-fsupy; sy<=fsupy; ++sy) {
// Get the pointer in the grid for the first x in this y.
@@ -454,7 +454,7 @@ namespace LOFAR {
// Get pointers to the first element to use in the 4
// convolution functions for this channel,pol.
const Complex* __restrict__ cf[4];
- Int cfoff = (offy + sy*fsampy)*nConvX + offx - fsupx*fsampx;
+ size_t cfoff = (size_t(offy) + sy*fsampy)*nConvX + offx - fsupx*fsampx;
for (int i=0; i<4; ++i) {
cf[i] = (*cfs.vdata)[gridChan][i][ipol].data() + cfoff;
}
diff --git a/CEP/LMWCommon/include/LMWCommon/MWIos.h b/CEP/LMWCommon/include/LMWCommon/MWIos.h
index 55ab96b4c4a632524385f8c21e2ad4afdeecce69..a7af19bea10cc39d18ac772377385128cba390cf 100644
--- a/CEP/LMWCommon/include/LMWCommon/MWIos.h
+++ b/CEP/LMWCommon/include/LMWCommon/MWIos.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/CEP/LMWCommon/test/CMakeLists.txt b/CEP/LMWCommon/test/CMakeLists.txt
index 2fb18c6adea5a40d1dee8c9ffbde1a687a3273e6..1a4c98e1aa8db73727f0175d7990cf4d34cbf84b 100644
--- a/CEP/LMWCommon/test/CMakeLists.txt
+++ b/CEP/LMWCommon/test/CMakeLists.txt
@@ -12,3 +12,9 @@ lofar_add_test(tSocketConnectionSet tSocketConnectionSet.cc)
lofar_add_test(tfinddproc DEPENDS finddproc)
lofar_add_test(tstartdproc tstartdproc.cc)
lofar_add_test(trundist)
+
+# The SocketConnection tests must be run serially
+set_tests_properties(
+ tSocketConnection
+ tSocketConnectionSet
+ PROPERTIES RUN_SERIAL ON)
\ No newline at end of file
diff --git a/CEP/ParmDB/src/startparmdbdistr b/CEP/ParmDB/src/startparmdbdistr
index e72cc3d17fc08b47c62f34b2c6e09adfa53f92f0..23ff2adb89caf452027363b740af154c8577cca1 100755
--- a/CEP/ParmDB/src/startparmdbdistr
+++ b/CEP/ParmDB/src/startparmdbdistr
@@ -4,7 +4,7 @@
#
# Copyright (C) 2009
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Pipeline/framework/lofarpipe/support/lofarnode.py b/CEP/Pipeline/framework/lofarpipe/support/lofarnode.py
index 031e589a754f3e9fa542bd52991fd918da4bbc82..bd7ee143d349e8c8337bc93d00e579ba208448e0 100644
--- a/CEP/Pipeline/framework/lofarpipe/support/lofarnode.py
+++ b/CEP/Pipeline/framework/lofarpipe/support/lofarnode.py
@@ -119,22 +119,38 @@ class LOFARnodeTCP(LOFARnode):
else:
break
- def __fetch_arguments(self):
+ def __fetch_arguments(self, tries=5, min_timeout=1.0, max_timeout=5.0):
"""
Connect to a remote job dispatch server (an instance of
jobserver.JobSocketReceive) and obtain all the details necessary to
run this job.
"""
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- self.__try_connect(s)
- message = "GET %d" % self.job_id
- s.sendall(struct.pack(">L", len(message)) + message)
- chunk = s.recv(4)
- slen = struct.unpack(">L", chunk)[0]
- chunk = s.recv(slen)
- while len(chunk) < slen:
- chunk += s.recv(slen - len(chunk))
- self.arguments = pickle.loads(chunk)
+ while True:
+ tries -= 1
+ try:
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ self.__try_connect(s)
+ message = "GET %d" % self.job_id
+ s.sendall(struct.pack(">L", len(message)) + message)
+ chunk = s.recv(4)
+ slen = struct.unpack(">L", chunk)[0]
+ chunk = s.recv(slen)
+ while len(chunk) < slen:
+ chunk += s.recv(slen - len(chunk))
+ self.arguments = pickle.loads(chunk)
+ except socket.error, e:
+ print "Failed to get recipe arguments from server"
+ if tries > 0:
+ timeout = random.uniform(min_timeout, max_timeout)
+ print("Retrying in %f seconds (%d more %s)." %
+ (timeout, tries, "try" if tries == 1 else "tries"))
+ time.sleep(timeout)
+ else:
+ # we tried 5 times, abort with original exception
+ raise
+ else:
+ # no error, thus break the loop
+ break #
def __send_results(self):
"""
diff --git a/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py b/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py
index 4bca87d98b6d39ae9dfc9f7926ab2aec52ebc14d..ee2464ce4f235353525251c7bfc25a7695a1b01c 100644
--- a/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py
+++ b/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py
@@ -6,9 +6,10 @@ import smtplib
from email.mime.text import MIMEText
import time
import os
+import xml.dom.minidom as _xml
from lofarpipe.support.xmllogging import enter_active_stack, \
- exit_active_stack, get_active_stack
+ exit_active_stack, get_active_stack, get_child
def xml_node(target):
"""
@@ -99,6 +100,30 @@ class duration:
False
+def strip_xml_to_master_details(pipeline_xml, logger):
+ """
+ Helper function that returns a 'streamlined' subset of the data contained
+ in the pipeline_xml. The current xml countains for instance resource level
+ information not of interest of receivers of pipeline updates.
+
+ This function removes most of the data in the xml limiting the size.
+ """
+ local_document = _xml.Document()
+
+ simplyfied_pipeline_xml = local_document.createElement("Simplyfied_pipeline_xml")
+ simplyfied_pipeline_xml.appendChild(get_child(pipeline_xml, "active_stack").cloneNode(True))
+
+ for node in pipeline_xml.childNodes:
+ # Active stack is copied in full
+ if node.nodeName == "active_stack":
+ continue
+
+ # Create copy of the xml, make a shallow clone
+ simplyfied_pipeline_xml.appendChild(node.cloneNode(False))
+
+ return simplyfied_pipeline_xml
+
+
def mail_log_on_exception(target):
"""
Simple decorator, it tests if the any exceptions are throw in the wrapped
@@ -125,12 +150,14 @@ def mail_log_on_exception(target):
if stack != None:
stack.setAttribute(
"duration", duration_recipe)
- msg_string = stack.toprettyxml(encoding='ascii')
+ simplyfied_pipeline_xml = strip_xml_to_master_details(
+ stack, calling_object.logger)
+ msg_string = simplyfied_pipeline_xml.toprettyxml(encoding='ascii')
+
else:
msg_string = "duration: {0} \n "\
- "No additional pipeline data available".format(duration_recipe
- )
-
+ "No additional pipeline data available".format(duration_recipe)
+
_mail_msg_to("pipeline_finished", "klijn@astron.nl",
"pipeline finished: {0}: {1}".format(
os.path.basename(calling_object.__file__),
@@ -138,18 +165,22 @@ def mail_log_on_exception(target):
msg_string)
except Exception, message:
- # Static list of mail to be send (could be made configurable,
- # but yeah temp mail functionality so...)
- mail_list = ["klijn@astron.nl", "frieswijk@astron.nl",
- "pizzo@astron.nl", "orru@astron.nl",
- "jong@astron.nl"
+ # Static list of mail to be send
+ mail_list = ["klijn@astron.nl",
+ "orru@astron.nl",
+ "sciencesupport@astron.nl"
]
# get the active stack
stack = get_active_stack(calling_object)
active_stack_data = ""
if stack != None:
- active_stack_data = stack.toprettyxml(encoding='ascii')
+ simplyfied_pipeline_xml = strip_xml_to_master_details(
+ stack, calling_object.logger)
+
+ active_stack_data = simplyfied_pipeline_xml.toprettyxml(
+ encoding='ascii')
+
# get the Obsid and pipeline name add to subjecy title
subject = "Failed pipeline run {0}: {1}".format(
os.path.basename(calling_object.__file__),
diff --git a/CEP/Pipeline/visual_studio/Pipeline.v12.suo b/CEP/Pipeline/visual_studio/Pipeline.v12.suo
index 384cf1194369d06dc525ac091e858e9645f1aaf7..1d2c795786e59d4613d66e8a6b0d804edd2f3d22 100644
Binary files a/CEP/Pipeline/visual_studio/Pipeline.v12.suo and b/CEP/Pipeline/visual_studio/Pipeline.v12.suo differ
diff --git a/CMake/FindCasacore.cmake b/CMake/FindCasacore.cmake
index 8daef9b067872b02a9b692ba63a61ede0b43d437..34cad20b160a797d4dfd3bfc5d07229afdcfe259 100644
--- a/CMake/FindCasacore.cmake
+++ b/CMake/FindCasacore.cmake
@@ -2,26 +2,18 @@
# Usage:
# find_package(Casacore [REQUIRED] [COMPONENTS components...])
# Valid components are:
-# casa, scimath_f, scimath, tables, measures, measures_f, lattices,
-# fits, ms, coordinates, msfits, components, mirlib, images
+# casa, components, coordinates, derivedmscal, fits, images, lattices,
+# meas, measures, mirlib, ms, msfits, scimath, scimath_f, tables
#
# Note that most components are dependent on other (more basic) components.
# In that case, it suffices to specify the "top-level" components; dependent
# components will be searched for automatically.
#
-# Here's the dependency tree:
-# scimath_f -> casa
-# scimath -> scimath_f
-# tables -> casa
-# measures -> scimath, tables
-# measures_f -> scimath, tables
-# lattices -> scimath, tables
-# fits -> measures
-# ms -> measures
-# coordinates -> fits
-# msfits -> fits, ms
-# components -> coordinates
-# images -> components, mirlib, lattices
+# The dependency tree can be generated using the script get_casacore_deps.sh.
+# For this, you need to have a complete casacore installation, built with shared
+# libraries, at your disposal.
+#
+# The dependencies in this macro were generated against casacore release 1.7.0.
#
# Variables used by this module:
# CASACORE_ROOT_DIR - Casacore root directory.
@@ -148,17 +140,17 @@ macro(casacore_find_package _name)
endif(${_name}_FOUND)
endmacro(casacore_find_package _name)
-
# Define the Casacore components.
set(Casacore_components
casa
components
coordinates
+ derivedmscal
fits
images
lattices
+ meas
measures
- measures_f
mirlib
ms
msfits
@@ -168,18 +160,21 @@ set(Casacore_components
)
# Define the Casacore components' inter-dependencies.
-set(Casacore_components_DEPENDENCIES coordinates)
-set(Casacore_coordinates_DEPENDENCIES fits)
-set(Casacore_fits_DEPENDENCIES measures)
-set(Casacore_images_DEPENDENCIES components lattices mirlib)
-set(Casacore_lattices_DEPENDENCIES scimath tables)
-set(Casacore_measures_DEPENDENCIES scimath tables)
-set(Casacore_measures_f_DEPENDENCIES scimath tables)
-set(Casacore_ms_DEPENDENCIES measures)
-set(Casacore_msfits_DEPENDENCIES fits ms)
-set(Casacore_scimath_DEPENDENCIES scimath_f)
-set(Casacore_scimath_f_DEPENDENCIES casa)
-set(Casacore_tables_DEPENDENCIES casa)
+set(Casacore_casa_DEPENDENCIES)
+set(Casacore_components_DEPENDENCIES coordinates measures scimath tables casa)
+set(Casacore_coordinates_DEPENDENCIES fits measures casa)
+set(Casacore_derivedmscal_DEPENDENCIES ms measures tables casa)
+set(Casacore_fits_DEPENDENCIES measures tables casa)
+set(Casacore_images_DEPENDENCIES mirlib components lattices coordinates fits measures scimath tables casa)
+set(Casacore_lattices_DEPENDENCIES tables scimath casa)
+set(Casacore_meas_DEPENDENCIES measures tables casa)
+set(Casacore_measures_DEPENDENCIES tables casa)
+set(Casacore_mirlib_DEPENDENCIES)
+set(Casacore_ms_DEPENDENCIES measures scimath tables casa)
+set(Casacore_msfits_DEPENDENCIES ms fits measures tables casa)
+set(Casacore_scimath_DEPENDENCIES scimath_f casa)
+set(Casacore_scimath_f_DEPENDENCIES)
+set(Casacore_tables_DEPENDENCIES casa)
# Initialize variables.
set(CASACORE_FOUND FALSE)
@@ -248,9 +243,10 @@ endif(CASACORE_MISSING_COMPONENTS)
if(CASACORE_FOUND)
if(NOT Casacore_FIND_QUIETLY)
message(STATUS "Found the following Casacore components: ")
- foreach(comp ${_find_components})
- message(STATUS " ${comp}")
- endforeach(comp ${_find_components})
+ foreach(_comp ${_find_components})
+ string(TOUPPER casa_${_comp} _COMP)
+ message(STATUS " ${_comp}: ${${_COMP}_LIBRARY}")
+ endforeach(_comp ${_find_components})
endif(NOT Casacore_FIND_QUIETLY)
else(CASACORE_FOUND)
if(Casacore_FIND_REQUIRED)
diff --git a/CMake/FindPyrap.cmake b/CMake/FindPyrap.cmake
index 7bf014e069eafb01e99ee41dcaa4c7d962342e45..c0a96113696604bd44b54ea76ef72b1b74ce7072 100644
--- a/CMake/FindPyrap.cmake
+++ b/CMake/FindPyrap.cmake
@@ -40,7 +40,11 @@ if(NOT PYRAP_FOUND)
# Pyrap also depends on Casacore
include(LofarFindPackage)
- lofar_find_package(Casacore REQUIRED COMPONENTS casa)
+ if(Pyrap_FIND_REQUIRED)
+ lofar_find_package(Casacore REQUIRED COMPONENTS casa)
+ else(Pyrap_FIND_REQUIRED)
+ lofar_find_package(Casacore COMPONENTS casa)
+ endif(Pyrap_FIND_REQUIRED)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Pyrap DEFAULT_MSG
diff --git a/CMake/LofarCTest.cmake b/CMake/LofarCTest.cmake
index 780becc9c1d762a88a1c6f3a7fcfb6f66edfd065..7b5f74ea1be3280dd7a8b82fc85ddb45cf64c886 100644
--- a/CMake/LofarCTest.cmake
+++ b/CMake/LofarCTest.cmake
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarConfig.cmake b/CMake/LofarConfig.cmake
index c06179cf361839371cebe5856c6c4238336768e7..bbdd8f1dc25a4a4a9126e2264a405545a351879f 100644
--- a/CMake/LofarConfig.cmake
+++ b/CMake/LofarConfig.cmake
@@ -3,7 +3,7 @@
# Copyright (C) 2008-2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarFindPackage.cmake b/CMake/LofarFindPackage.cmake
index b5e37f2713f01c9ffea226bc1c0c48574c997c27..431dc793d88dd1e4d285fd20ad60cf638ce87231 100644
--- a/CMake/LofarFindPackage.cmake
+++ b/CMake/LofarFindPackage.cmake
@@ -15,7 +15,7 @@
# Copyright (C) 2008-2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarGeneral.cmake b/CMake/LofarGeneral.cmake
index 8b3d76537acbfd9eee7277da09d7409bb386e6a5..cd66770fd08cf2a5be0b62780f7a118f2d0b977a 100644
--- a/CMake/LofarGeneral.cmake
+++ b/CMake/LofarGeneral.cmake
@@ -13,7 +13,7 @@
# Copyright (C) 2008-2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarInit.cmake b/CMake/LofarInit.cmake
index 21973cd4f2bbbda4106bb3ce017cd2ff4276afd7..704144b3daa485090ca9a73dc8c9170cbfee98a1 100644
--- a/CMake/LofarInit.cmake
+++ b/CMake/LofarInit.cmake
@@ -29,7 +29,7 @@
# Copyright (C) 2008-2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarMacros.cmake b/CMake/LofarMacros.cmake
index 0e5471072c10636da2d81f1356bafa9b8e8114cc..0cdc589cabe16ce491be3351e1347182bb7aa988 100644
--- a/CMake/LofarMacros.cmake
+++ b/CMake/LofarMacros.cmake
@@ -15,7 +15,7 @@
#
# Copyright (C) 2008-2009
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarOptions.cmake b/CMake/LofarOptions.cmake
index e5405be739627568c261c9359adb02348db6ef77..1eeea88313f7199a9463bc53ab363c6fc1d09d25 100644
--- a/CMake/LofarOptions.cmake
+++ b/CMake/LofarOptions.cmake
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarPackage.cmake b/CMake/LofarPackage.cmake
index 3cd29c833960bebc7c5b2ba73975e82c55d349c8..5a738521fbf70a9c8a2ed56e37f54884ae51545e 100644
--- a/CMake/LofarPackage.cmake
+++ b/CMake/LofarPackage.cmake
@@ -52,7 +52,7 @@
# Copyright (C) 2008-2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index 8ae41283d998cd198bb9579edd57b0d7434d86ae..309fc1ec0154caf538f729a922cc901665504d6d 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -34,6 +34,8 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(pyparmdb_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/pyparmdb)
set(LAPS_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/LAPS)
set(DPPP_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/DP3/DPPP)
+ set(TestDynDPPP_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/DP3/TestDynDPPP)
+ set(PythonDPPP_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/DP3/PythonDPPP)
set(AOFlagger_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/DP3/AOFlagger)
set(SPW_Combine_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/DP3/SPWCombine)
set(LofarFT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/Imager/LofarFT)
diff --git a/CMake/LofarPackageVersion.cmake b/CMake/LofarPackageVersion.cmake
index 9f5c1fcb02d8b67c75f2ec4fafc09fcf04c9709f..0c5fa3ea5caee4e8f01145116a2009bc83568d15 100644
--- a/CMake/LofarPackageVersion.cmake
+++ b/CMake/LofarPackageVersion.cmake
@@ -19,7 +19,7 @@
#
# Copyright (C) 2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarSubversion.cmake b/CMake/LofarSubversion.cmake
index 539487b89da53ae1a3ba8b132b4035c7b810c9e0..5af64883e59b76c72658915c8d7e79c68ff1af68 100644
--- a/CMake/LofarSubversion.cmake
+++ b/CMake/LofarSubversion.cmake
@@ -12,7 +12,7 @@
#
# Copyright (C) 2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarVariants.cmake b/CMake/LofarVariants.cmake
index 760ccdee196c672ef812ccdcbc49f104af04dcad..971b6ee64e95ac78df0af3bd5e39b270c6f1caab 100644
--- a/CMake/LofarVariants.cmake
+++ b/CMake/LofarVariants.cmake
@@ -6,7 +6,7 @@
# Copyright (C) 2008-2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/MACAddProtocol.cmake b/CMake/MACAddProtocol.cmake
index 5d3adfc48ab0b52a89d0ca7128bb6897fb1fe4dd..672ece06aee898bfa920529fd70e3e842932818c 100644
--- a/CMake/MACAddProtocol.cmake
+++ b/CMake/MACAddProtocol.cmake
@@ -16,7 +16,7 @@
# Copyright (C) 2008-2011
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/PythonInstall.cmake b/CMake/PythonInstall.cmake
index c1bb38568da752d3728774381ca92555c7d46e96..b62fff3eaeb9e95fbbb98cac8a867add35615a35 100644
--- a/CMake/PythonInstall.cmake
+++ b/CMake/PythonInstall.cmake
@@ -5,7 +5,7 @@
# Copyright (C) 2008-2009
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/UpdatePackageVersion.cmake.in b/CMake/UpdatePackageVersion.cmake.in
index 83fd252716ca971d0d28f49abb81d89147c26ae5..6732c27242cc2db0c4d64eb43aca04dc8ae306e7 100644
--- a/CMake/UpdatePackageVersion.cmake.in
+++ b/CMake/UpdatePackageVersion.cmake.in
@@ -16,7 +16,7 @@
#
# Copyright (C) 2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/docscripts/MakeDoxyDoc.cmake.in b/CMake/docscripts/MakeDoxyDoc.cmake.in
index 20eec56b07905e93af993bdd41a7df6244390582..483023cdabfb0a3bbff51a65f695cd671daa73a1 100644
--- a/CMake/docscripts/MakeDoxyDoc.cmake.in
+++ b/CMake/docscripts/MakeDoxyDoc.cmake.in
@@ -8,7 +8,7 @@
#
# Copyright (C) 2010
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/docscripts/slash2spanning.pl b/CMake/docscripts/slash2spanning.pl
index df30c865b4a30e5c8706ea9fb1e9685ef0d51d7f..2c17871459126c92efc6eff7d34e4b2ea4a95ba2 100755
--- a/CMake/docscripts/slash2spanning.pl
+++ b/CMake/docscripts/slash2spanning.pl
@@ -6,7 +6,7 @@
#
# Copyright (C) 2002
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/gen_LofarPackageList_cmake.sh b/CMake/gen_LofarPackageList_cmake.sh
index 9636ef36def3bc0949461251d2782093f7910ff6..ea5ceb395c6c1985e2dec9b838d28dda25edc42e 100755
--- a/CMake/gen_LofarPackageList_cmake.sh
+++ b/CMake/gen_LofarPackageList_cmake.sh
@@ -4,7 +4,7 @@
#
# Copyright (C) 2009
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/get_casacore_deps.sh b/CMake/get_casacore_deps.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9dff17dfc3c85efa1b8fc7e95ac822f37413ca02
--- /dev/null
+++ b/CMake/get_casacore_deps.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Derive casacore dependencies from the installed shared libraries.
+
+# Location to search for casacore shared libraries.
+CASACORE_LIBDIR=${1:-/opt/lofar/external/casacore/lib}
+
+# Make sure that we get a deterministic lexicograhical ordering.
+LC_ALL=C
+
+# Expand to null string if no files match glob pattern
+shopt -s nullglob
+
+echo "Searching for libraries in $CASACORE_LIBDIR ..." 1>&2
+
+echo "# Define the Casacore components."
+echo "set(Casacore_components"
+for f in $CASACORE_LIBDIR/*.so
+do
+ comp=$(echo ${f%%.so} | sed 's,^.*libcasa_,,')
+ echo " $comp"
+done
+echo ")"
+echo
+echo "# Define the Casacore components' inter-dependencies."
+for f in $CASACORE_LIBDIR/*.so
+do
+ comp=$(echo ${f%%.so} | sed 's,^.*libcasa_,,')
+ printf "%-39s" "set(Casacore_${comp}_DEPENDENCIES "
+ libs=$(readelf -d $f | grep 'NEEDED.*libcasa_' | \
+ sed -e 's,^[^\[]*\[libcasa_,,' -e 's,\..*$,,')
+ for l in $libs
+ do
+ printf " %s" "$l"
+ done
+ printf ")\n"
+done
diff --git a/CMake/testscripts/assay b/CMake/testscripts/assay
index 2b52c72b9d7b9df9ac9992a74cabdb534cc6e931..d97460d4562a782e3dca2ce231c05d2f8147adf9 100755
--- a/CMake/testscripts/assay
+++ b/CMake/testscripts/assay
@@ -4,7 +4,7 @@
#
# Copyright (C) 2001
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/testscripts/runctest.sh.in b/CMake/testscripts/runctest.sh.in
index 0b0017d12738271f1b9433756a0f46b2af621088..da862611197b249f39852bd60166b18200eec37a 100755
--- a/CMake/testscripts/runctest.sh.in
+++ b/CMake/testscripts/runctest.sh.in
@@ -4,7 +4,7 @@
#
# Copyright (C) 2009
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/testscripts/runtest.sh b/CMake/testscripts/runtest.sh
index dd7e8316a81e872908cf74b237e041218851d82d..977b1358847628e97fdb06f46683e9e3147ae82e 100755
--- a/CMake/testscripts/runtest.sh
+++ b/CMake/testscripts/runtest.sh
@@ -4,7 +4,7 @@
#
# Copyright (C) 2002
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/CMake/variants/variants.cbt001 b/CMake/variants/variants.cbt001
index 6a5ea2170b3d43476b2f32d427db3f75976b7191..979c48fb3ed81fd935f06dba833783b9c37f85ab 100644
--- a/CMake/variants/variants.cbt001
+++ b/CMake/variants/variants.cbt001
@@ -14,7 +14,7 @@ option(USE_CUDA "Use CUDA" ON)
set(CASACORE_ROOT_DIR /localhome/lofar/casacore-1.7.0)
set(MPI_ROOT_DIR /opt/openmpi)
set(DAL_ROOT_DIR /localhome/lofar/DAL)
-set(VALGRIND_ROOT_DIR /globalhome/lofarsystem/cobalt-root)
+#set(VALGRIND_ROOT_DIR /globalhome/lofarsystem/cobalt-root)
#set(GNU_C /globalhome/amesfoort/cbtroot/bin/gcc-4.8)
#set(GNU_CXX /globalhome/amesfoort/cbtroot/bin/g++-4.8)
diff --git a/JAVA/GUI/Plotter/PlotterConfig/src/plotter_config.properties b/JAVA/GUI/Plotter/PlotterConfig/src/plotter_config.properties
index 4aa02b7c74b4dafb43bd88c5e36493186c034fa1..e453ad61c1065fd78f964bf016502d653186a1cf 100644
--- a/JAVA/GUI/Plotter/PlotterConfig/src/plotter_config.properties
+++ b/JAVA/GUI/Plotter/PlotterConfig/src/plotter_config.properties
@@ -5,7 +5,7 @@
#
# Copyright (C) 2002-2007
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java
index 574d57aa7fe8f9782535805fc965cef49604aa01..cac98cc37eb7378de1d73971e1d45a47259863b7 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataAccess.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataAccess.java
index bb91f1f0f036d808709f8c7e967d06a6485f2963..8acdf01995fcb58be7723a6b3dba0914fcc9890d 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataAccess.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataAccess.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataExport.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataExport.java
index 7a0a7cef2a900ea8563b603700bcd54a5d8f5c22..6bc91884bdd147f8f8a2022cf7b679851ae725d0 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataExport.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataExport.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotConstants.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotConstants.java
index 86f3c2e623104864688d3a48460102dca6dadb3c..6530cdbd71473035b4d2fc9c56dc4d2cc52467b6 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotConstants.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotConstants.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java
index 6fbcdb12b10fba06c28eddf8b8c577c49d184b05..308b5cf6a277e8d639a39a29373184ac8effd384 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java
index 94129f10d3f9e5b68846bc71a4d066e813791cc0..1e920cee502e818477c2d928ac2680ab558a50a0 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java
index 10753e6b8e686ecea2758125731d0cb5040c53c8..cb283bfac85706e7770a028d34b6083135fe3595 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotSGTImpl.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotSGTImpl.java
index 73879c18b34b07bc608fea574bc1ee4d04bb31f4..783489c775d439ccdec0e2424cab27d25e54c7de 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotSGTImpl.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotSGTImpl.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/EmptyDataSetException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/EmptyDataSetException.java
index ee79c28c34452596db24a79e0fa937dfd0fa0e50..78a4af747951a619361fd0e0e2101711f8c1483d 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/EmptyDataSetException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/EmptyDataSetException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/InvalidDataSetException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/InvalidDataSetException.java
index 3c06416e3526adf4e2905fa648e17608425f702a..7496e66db6e3daacacde5fcfd980bd190fc9a703 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/InvalidDataSetException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/InvalidDataSetException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotImplementedException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotImplementedException.java
index cd6843ad334a4814ef72a0e1a73b932b02ebfe93..d2268fffca406058276557f37c9a65f6a1e14f4d 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotImplementedException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotImplementedException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotSupportedException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotSupportedException.java
index c8ac22c50647be0ce7af6f141c85948ac4a5701b..688fd113bf6a82dd24c717a96121cf48d1ce6e35 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotSupportedException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotSupportedException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterConfigurationNotFoundException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterConfigurationNotFoundException.java
index 46c7c9a4e86ef8c890ab30f0c2567801e83c220d..6e33dc2a814350024c909675e5ecf1880d2fb004 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterConfigurationNotFoundException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterConfigurationNotFoundException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessException.java
index 605cc690a1b944e01a0598109af545c601fe2f82..759a5f322af64b8f8b4f6b44655ecf06c5125b64 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorInitializationException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorInitializationException.java
index 0aad7e8220b8534808016de4c807a844227f6fdd..05b021f88c525c44386bd04b555d7af21b8cd8b0 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorInitializationException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorInitializationException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotCompatibleException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotCompatibleException.java
index 6e6cc3a3f167692b8be44039b1a248ad20e4410d..d9027d0b3425437b0170e4f9805230d38098a554 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotCompatibleException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotCompatibleException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotFoundException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotFoundException.java
index a247f6fa9e18acb5401a13bf4dd1f38f1469bbd0..3b40b87032ea008ff05e20b385c949f7e738c9a8 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotFoundException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotFoundException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterException.java
index 8e5a3632419076010f2d08e7fca80d20c431e0c5..ee4e9fa618a767d88aa18b5d4dfb488feb51c3f6 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkInitializationException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkInitializationException.java
index 9109db969b60037ab9e9712bd93d764d5be18959..f3f7480c40ff7f7af87fb1b31a6c7585851a7cab 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkInitializationException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkInitializationException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotCompatibleException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotCompatibleException.java
index 784ba62e2cc216f05061e3a579619adc0ab85ab2..c553fd3d795b82128de00041e0ef273d0b9ddb79 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotCompatibleException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotCompatibleException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotFoundException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotFoundException.java
index 12470a40a3e66c7f88aaf1ef8fdfd10b5fc52365..137ab5ab4a2d92fa8370f04505500ec4018f98ea 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotFoundException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotFoundException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterPrintException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterPrintException.java
index 0dc4035646c46b7a5f0eccb0ddc4f6a9ee349427..8b3a572449029dd7dba9e1bc5774996e9842d7f0 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterPrintException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterPrintException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java
index 837c1dd685ef18cb3499597c57ae6426a78696ca..cc95aabbcb825fe957ebef21630a1ec22caf6ed1 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotTestFrameStandAlone.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotTestFrameStandAlone.java
index db350f065da63c7d2e96e5beca918ad6b9313806..93991ef2453d00ec5dc539bd4057109e45742c12 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotTestFrameStandAlone.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotTestFrameStandAlone.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java
index 18d8fcbc8b1c0ac707fd6cd3a0fa7572bfbd9e8e..fffb7ad9bd393a53023689e75f382f15c471ae8b 100644
--- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java
+++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java
index 7c69b46b3c98f2488c4c4fc1b83fe774969d63f2..d54a164c8cc43fd05dd8d9208e3f05c29804386f 100644
--- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java
+++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFileInterface.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFileInterface.java
index 9685f6a30fa105d31713df3a171708f02cee077d..1d1d6fa861b8da5a399511e15dfe97b55438a33e 100644
--- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFileInterface.java
+++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFileInterface.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/LCS/ACC/PLC/src/ProcessControl.cc b/LCS/ACC/PLC/src/ProcessControl.cc
index 9ea208bac7f8478ab57638cc484191f066c4c500..55978380f9f4d7973042989a136527b45fe8404d 100644
--- a/LCS/ACC/PLC/src/ProcessControl.cc
+++ b/LCS/ACC/PLC/src/ProcessControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ACC/PLC/test/APCmdImpl.cc b/LCS/ACC/PLC/test/APCmdImpl.cc
index 52885cf9f4ed8317d5aabbea9201c781bb86dda1..84685c1ed829703c85febafc83c268befdd50854 100644
--- a/LCS/ACC/PLC/test/APCmdImpl.cc
+++ b/LCS/ACC/PLC/test/APCmdImpl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ACC/PLC/test/APCmdImpl.h b/LCS/ACC/PLC/test/APCmdImpl.h
index bdaf177f7d4154375e1b70991016d17bedd0239f..bf4db8fc2355b88b0b94435787b134b1027ec001 100644
--- a/LCS/ACC/PLC/test/APCmdImpl.h
+++ b/LCS/ACC/PLC/test/APCmdImpl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ACC/PLC/test/tACCmain.cc b/LCS/ACC/PLC/test/tACCmain.cc
index 8361f967b3d30b19c91076e4897cd9f1ef4f2a2d..0c55595a8b8772b230de750595b027e8ee1dda1f 100644
--- a/LCS/ACC/PLC/test/tACCmain.cc
+++ b/LCS/ACC/PLC/test/tACCmain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/include/ApplCommon/AntField.h b/LCS/ApplCommon/include/ApplCommon/AntField.h
index 72c7c9535a655c634ee43a4a4c562391cb4df1b8..4f53c2df6f64976ed8441e7dcad830428322a1bd 100644
--- a/LCS/ApplCommon/include/ApplCommon/AntField.h
+++ b/LCS/ApplCommon/include/ApplCommon/AntField.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/include/ApplCommon/AntennaSets.h b/LCS/ApplCommon/include/ApplCommon/AntennaSets.h
index 4d86f7740f953987c239cae8b0ac3ca3c9021e56..165d99f0a3ebf676d7bc4bee6710a697ff0a1776 100644
--- a/LCS/ApplCommon/include/ApplCommon/AntennaSets.h
+++ b/LCS/ApplCommon/include/ApplCommon/AntennaSets.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/include/ApplCommon/LofarDirs.h b/LCS/ApplCommon/include/ApplCommon/LofarDirs.h
index 13d80e89bac85901f17a297a55da3dd8521b6793..ad9b87761f9293f14a6c3a2bbd4b46bd9a4d44f9 100644
--- a/LCS/ApplCommon/include/ApplCommon/LofarDirs.h
+++ b/LCS/ApplCommon/include/ApplCommon/LofarDirs.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/src/AntField.cc b/LCS/ApplCommon/src/AntField.cc
index 9be6aed4ddcffc7438cbd0d7f3b32b7070d7a1a3..562f4a51fcf99c27595ad5fa66fbba5508fdad3b 100644
--- a/LCS/ApplCommon/src/AntField.cc
+++ b/LCS/ApplCommon/src/AntField.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/src/AntennaSets.cc b/LCS/ApplCommon/src/AntennaSets.cc
index 15327a090e65c23b106cb6398f4b8d4daa24fdf2..ef443fdb6c02a261d4d3d0d82c93b3feebebe6bf 100644
--- a/LCS/ApplCommon/src/AntennaSets.cc
+++ b/LCS/ApplCommon/src/AntennaSets.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/test/tAntField.cc b/LCS/ApplCommon/test/tAntField.cc
index f32836169ba5cd41b9271e01ff990d03f1efe149..1c1f63532dd40d52876a3fd560f0c6540da6caed 100644
--- a/LCS/ApplCommon/test/tAntField.cc
+++ b/LCS/ApplCommon/test/tAntField.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/test/tAntennaSet.cc b/LCS/ApplCommon/test/tAntennaSet.cc
index 2a3da66563a7685a24bc40136b269fa7ae07eaf2..bc00c1cf56067f86312af0329e0766c757379ded 100644
--- a/LCS/ApplCommon/test/tAntennaSet.cc
+++ b/LCS/ApplCommon/test/tAntennaSet.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/test/tAntennaUse.cc b/LCS/ApplCommon/test/tAntennaUse.cc
index c5d15a69f8a719e6c41bbda6c0f8660b4c623924..fb653665f8cf3f506d80ec19207fa3ddcb8ee1cb 100644
--- a/LCS/ApplCommon/test/tAntennaUse.cc
+++ b/LCS/ApplCommon/test/tAntennaUse.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Blob/src/KeyParse.yy b/LCS/Blob/src/KeyParse.yy
index 44df6720d3503aaaf085d1d57415907c82c77817..89de928788fa3ce01b99d986549ed6d5431ceb49 100644
--- a/LCS/Blob/src/KeyParse.yy
+++ b/LCS/Blob/src/KeyParse.yy
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Blob/src/KeyTokenize.ll b/LCS/Blob/src/KeyTokenize.ll
index aeb0078b0b96a51b111f390c7c4b3b90bed4a950..c7f124c2d9b7ab2f67778fdc50275a75ad65cf8f 100644
--- a/LCS/Blob/src/KeyTokenize.ll
+++ b/LCS/Blob/src/KeyTokenize.ll
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/LofarLogger.h b/LCS/Common/include/Common/LofarLogger.h
index 18d7eb527b59573b9f1a35620e8543cb45aab1ec..19e81c028c3f7a656698d1557c5f872e19f3c4e6 100644
--- a/LCS/Common/include/Common/LofarLogger.h
+++ b/LCS/Common/include/Common/LofarLogger.h
@@ -68,6 +68,17 @@ namespace LOFAR
# define LOFARLOGGER_FULLPACKAGE LOFARLOGGER_PACKAGE
#endif
+// The class/struct used per thread to (partially) re- and de-init the logger.
+struct ThreadLogger {
+ ThreadLogger() {
+ LOGGER_ENTER_THREAD();
+ }
+
+ ~ThreadLogger() {
+ LOGGER_EXIT_THREAD();
+ }
+};
+
// @}
//#------------------------ Assert and FailWhen -------------------------------
diff --git a/LCS/Common/include/Common/NsTimestamp.h b/LCS/Common/include/Common/NsTimestamp.h
index 001f71770ffa0367d4e5dc72daf8bfd99e13ade1..775d56d653cecfe56800c8020d9db5e7c9da57f0 100644
--- a/LCS/Common/include/Common/NsTimestamp.h
+++ b/LCS/Common/include/Common/NsTimestamp.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Cancellation.h b/LCS/Common/include/Common/Thread/Cancellation.h
index c163676d997f475adaf9c64e1c7aaa3eaf9967de..0f599b956c6b5a94daf50793a5bd8d5364f1d9a1 100644
--- a/LCS/Common/include/Common/Thread/Cancellation.h
+++ b/LCS/Common/include/Common/Thread/Cancellation.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Condition.h b/LCS/Common/include/Common/Thread/Condition.h
index c702f4fd7d25d85ba1ba8bc5f4d9e79858faae65..ca252f40c68adcb22e8a2ab0bcc8fbc30ec19421 100644
--- a/LCS/Common/include/Common/Thread/Condition.h
+++ b/LCS/Common/include/Common/Thread/Condition.h
@@ -1,6 +1,6 @@
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Mutex.h b/LCS/Common/include/Common/Thread/Mutex.h
index b29e915db842d1f3ee1c8b3275d2295d9aa1266d..1b78fbda28c61b29cf0735d0badb62ed007fa998 100644
--- a/LCS/Common/include/Common/Thread/Mutex.h
+++ b/LCS/Common/include/Common/Thread/Mutex.h
@@ -1,6 +1,6 @@
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Queue.h b/LCS/Common/include/Common/Thread/Queue.h
index 0e3a116385675451a3c711f60e9b71c454cfd79c..963978a51a5a6dcd1a2396a195750b2c5d457b63 100644
--- a/LCS/Common/include/Common/Thread/Queue.h
+++ b/LCS/Common/include/Common/Thread/Queue.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Thread.h b/LCS/Common/include/Common/Thread/Thread.h
index 4e387d56e0bf1313a040cd0694e23c66e02e46a3..2941cc8c1a6c21bcc9fc8f473f7b02e2b713427e 100644
--- a/LCS/Common/include/Common/Thread/Thread.h
+++ b/LCS/Common/include/Common/Thread/Thread.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -310,7 +310,7 @@ template <typename T> inline void Thread::stub(Args<T> *args)
// can be reused once the thread finishes.
Cancellation::ScopedRegisterThread rt;
- LOGGER_ENTER_THREAD();
+ ThreadLogger threadLogger;
LOG_DEBUG_STR(logPrefix << "Thread started");
@@ -352,16 +352,12 @@ template <typename T> inline void Thread::stub(Args<T> *args)
finished.up();
- LOGGER_EXIT_THREAD();
-
throw;
}
finished.up();
LOG_DEBUG_STR(logPrefix << "Thread stopped");
-
- LOGGER_EXIT_THREAD();
}
template <typename T> inline void *Thread::stub(void *arg)
diff --git a/LCS/Common/include/Common/lofar_bitset.h b/LCS/Common/include/Common/lofar_bitset.h
index adc4b891c9fa1172e287782cacd88ff789b0f95e..0e9c61de5656120ee0e5daa17be813cc051fb774 100644
--- a/LCS/Common/include/Common/lofar_bitset.h
+++ b/LCS/Common/include/Common/lofar_bitset.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/src/NsTimestamp.cc b/LCS/Common/src/NsTimestamp.cc
index 283949c6e3312b79fb04810cf58613218cd46559..cce19bb78ff6a84adce73a276fe631c5dcdb4e28 100644
--- a/LCS/Common/src/NsTimestamp.cc
+++ b/LCS/Common/src/NsTimestamp.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/src/Thread/Cancellation.cc b/LCS/Common/src/Thread/Cancellation.cc
index 3a004c9b5cbeeec3eae85bf60bf16b0b28ed6b43..1bbe33ac89b54b34e3aaa3f6e68d24b724c15bd6 100644
--- a/LCS/Common/src/Thread/Cancellation.cc
+++ b/LCS/Common/src/Thread/Cancellation.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/src/Thread/Thread.cc b/LCS/Common/src/Thread/Thread.cc
index 666efe1434c8d68c0a939ed309024d549b1ee544..06f271e61639dfe8b353eae9e89d08c8d6cb8037 100644
--- a/LCS/Common/src/Thread/Thread.cc
+++ b/LCS/Common/src/Thread/Thread.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/test/tKVpair.cc b/LCS/Common/test/tKVpair.cc
index b5b7340bf1dcf35a3106717ac4d9e29fff64290f..7127e1954759f5b438631a486967b8344c712512 100644
--- a/LCS/Common/test/tKVpair.cc
+++ b/LCS/Common/test/tKVpair.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011, 2014
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/test/tNsTimestamp.cc b/LCS/Common/test/tNsTimestamp.cc
index 09d68bd52007818da005c6119a415a5c63277e09..a3f767b0cf3d82e8cbb32f9c861f8f961d1100e2 100644
--- a/LCS/Common/test/tNsTimestamp.cc
+++ b/LCS/Common/test/tNsTimestamp.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Stream/include/Stream/CMakeLists.txt b/LCS/Stream/include/Stream/CMakeLists.txt
index f24ab1a792e08a8753d94b46d21a32e1464a0837..854586b75227a02447db51483cb509deb47dc961 100644
--- a/LCS/Stream/include/Stream/CMakeLists.txt
+++ b/LCS/Stream/include/Stream/CMakeLists.txt
@@ -7,7 +7,8 @@ set (inst_HEADERS
PortBroker.h
SharedMemoryStream.h
SocketStream.h
- Stream.h)
+ Stream.h
+ StreamFactory.h)
# Create symbolic link to include directory.
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
diff --git a/LCS/Stream/include/Stream/SocketStream.h b/LCS/Stream/include/Stream/SocketStream.h
index 04770aa4b9e7d2d9007e2827705cf9bc66e86c5c..0207af0d3c29bfe32467375acd55efc246256471 100644
--- a/LCS/Stream/include/Stream/SocketStream.h
+++ b/LCS/Stream/include/Stream/SocketStream.h
@@ -37,8 +37,6 @@ namespace LOFAR {
class SocketStream : public FileDescriptorBasedStream
{
public:
- EXCEPTION_CLASS(TimeOutException, LOFAR::Exception);
-
enum Protocol {
TCP, UDP
};
@@ -78,6 +76,8 @@ class SocketStream : public FileDescriptorBasedStream
static void deletekey(const std::string &nfskey);
};
+EXCEPTION_CLASS(TimeOutException, LOFAR::Exception);
+
} // namespace LOFAR
#include "SocketStream.tcc"
diff --git a/LCS/Stream/include/Stream/Stream.h b/LCS/Stream/include/Stream/Stream.h
index 915ffc4bf6c59d528186893f416a927dc7e778f7..49cbf2465d2ff69dc349c22d3825ab104b620bc7 100644
--- a/LCS/Stream/include/Stream/Stream.h
+++ b/LCS/Stream/include/Stream/Stream.h
@@ -34,8 +34,6 @@ namespace LOFAR {
class Stream
{
public:
- EXCEPTION_CLASS(EndOfStreamException, LOFAR::Exception);
-
virtual ~Stream();
virtual size_t tryRead(void *ptr, size_t size) = 0;
@@ -49,6 +47,8 @@ class Stream
virtual void sync();
};
+EXCEPTION_CLASS(EndOfStreamException, LOFAR::Exception);
+
} // namespace LOFAR
#endif
diff --git a/LCS/Stream/include/Stream/StreamFactory.h b/LCS/Stream/include/Stream/StreamFactory.h
new file mode 100644
index 0000000000000000000000000000000000000000..c0202747364d10eb99596fa6011c5c485928a8b4
--- /dev/null
+++ b/LCS/Stream/include/Stream/StreamFactory.h
@@ -0,0 +1,38 @@
+//# StreamFactory.h: class/functions to construct streams
+//# Copyright (C) 2008-2013 ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
+
+#ifndef LOFAR_STREAM_STREAMFACTORY_H
+#define LOFAR_STREAM_STREAMFACTORY_H
+
+#include <ctime>
+#include <string>
+#include <Stream/Stream.h>
+
+namespace LOFAR
+{
+
+ // Create a stream from a descriptor.
+ // Caller should wrap the returned pointer in some smart ptr type.
+ Stream *createStream(const std::string &descriptor, bool asReader, time_t deadline = 0);
+
+} // namespace LOFAR
+
+#endif
+
diff --git a/LCS/Stream/src/CMakeLists.txt b/LCS/Stream/src/CMakeLists.txt
index a84cd04edb8f1edf808e3da5bc94913acce46e6b..355f76184272d710dd565918352b39aa1ec89b4c 100644
--- a/LCS/Stream/src/CMakeLists.txt
+++ b/LCS/Stream/src/CMakeLists.txt
@@ -13,6 +13,7 @@ lofar_add_library(stream
SharedMemoryStream.cc
SocketStream.cc
Stream.cc
- StringStream.cc)
+ StringStream.cc
+ StreamFactory.cc)
lofar_add_bin_program(versionstream versionstream.cc)
diff --git a/LCS/Stream/src/FileDescriptorBasedStream.cc b/LCS/Stream/src/FileDescriptorBasedStream.cc
index bc2be0eab03807fe17e8572af14b2ee7aca6a2c7..ebd7a2c9074b8a4affbab2981763ddb8b1708db8 100644
--- a/LCS/Stream/src/FileDescriptorBasedStream.cc
+++ b/LCS/Stream/src/FileDescriptorBasedStream.cc
@@ -22,32 +22,36 @@
#include <lofar_config.h>
-#include <Common/LofarLogger.h>
-#include <Common/SystemCallException.h>
#include <Stream/FileDescriptorBasedStream.h>
-#include <Common/Thread/Cancellation.h>
#include <unistd.h>
-#include <stdexcept>
-
+#include <Common/SystemCallException.h>
+#include <Common/Thread/Cancellation.h>
+#include <Common/LofarLogger.h>
namespace LOFAR {
+
FileDescriptorBasedStream::~FileDescriptorBasedStream()
{
- ScopedDelayCancellation dc; // close() can throw as it is a cancellation point
-
- if (fd >= 0 && close(fd) < 0) {
- // try/throw/catch to match patterns elsewhere.
- //
- // This ensures a proper string for errno, a
- // backtrace if available, and the proper representation
- // of exceptions in general.
- try {
- THROW_SYSCALL("close");
- } catch (Exception &ex) {
- LOG_ERROR_STR("Exception in destructor: " << ex);
+ if (fd >= 0) {
+ int rv;
+
+ {
+ // Avoid close() throwing in the destructor,
+ // as it is a cancellation point (see pthreads(7)).
+ ScopedDelayCancellation dc;
+
+ rv = ::close(fd);
+ }
+ if (rv < 0) {
+ // Print error message similar to other failed system calls.
+ try {
+ THROW_SYSCALL("close");
+ } catch (Exception &exc) {
+ LOG_ERROR_STR(exc);
+ }
}
}
}
@@ -80,7 +84,7 @@ size_t FileDescriptorBasedStream::tryWrite(const void *ptr, size_t size)
void FileDescriptorBasedStream::sync()
{
- if (fsync(fd) < 0)
+ if (::fsync(fd) < 0)
THROW_SYSCALL("fsync");
}
diff --git a/LCS/Stream/src/SocketStream.cc b/LCS/Stream/src/SocketStream.cc
index 06143ce018df258f08063dbb72f5565a319ad1fd..bffa81946f08f4ca0d53e25822f9f8304715fee2 100644
--- a/LCS/Stream/src/SocketStream.cc
+++ b/LCS/Stream/src/SocketStream.cc
@@ -1,6 +1,6 @@
//# SocketStream.cc:
//#
-//# Copyright (C) 2008
+//# Copyright (C) 2008, 2015
//# ASTRON (Netherlands Institute for Radio Astronomy)
//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
//#
@@ -22,27 +22,27 @@
#include <lofar_config.h>
-#include <Common/LofarLogger.h>
-#include <Common/Thread/Cancellation.h>
-#include <Common/Thread/Mutex.h>
#include <Stream/SocketStream.h>
+#include <cstdlib>
#include <cstring>
#include <cstdio>
-
-#include <dirent.h>
-#include <errno.h>
-#include <netdb.h>
-#include <sys/select.h>
-#include <sys/socket.h>
+#include <cerrno>
#include <sys/types.h>
-#include <time.h>
#include <unistd.h>
-#include <cstdlib>
+#include <time.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <dirent.h>
#include <boost/lexical_cast.hpp>
#include <boost/format.hpp>
+#include <Common/Thread/Mutex.h>
+#include <Common/Thread/Cancellation.h>
+#include <Common/LofarLogger.h>
+
//# AI_NUMERICSERV is not defined on OS-X
#ifndef AI_NUMERICSERV
# define AI_NUMERICSERV 0
@@ -59,7 +59,7 @@ const int MAXPORT = 30000;
static struct RandomState {
- RandomState() {
+ RandomState() {
xsubi[0] = getpid();
xsubi[1] = time(0);
xsubi[2] = time(0) >> 16;
@@ -87,7 +87,7 @@ SocketStream::SocketStream(const std::string &hostname, uint16 _port, Protocol p
% _port);
struct addrinfo hints;
- bool autoPort = (port == 0);
+ const bool autoPort = (port == 0);
// use getaddrinfo, because gethostbyname is not thread safe
memset(&hints, 0, sizeof(struct addrinfo));
@@ -105,6 +105,11 @@ SocketStream::SocketStream(const std::string &hostname, uint16 _port, Protocol p
for(;;) {
try {
try {
+ // Not all potentially blocking calls below have a timeout arg.
+ // So check early every round. It may abort hanging tests early (=good).
+ if (deadline > 0 && deadline <= time(0))
+ THROW(TimeOutException, "SocketStream");
+
char portStr[16];
int retval;
struct addrinfo *result;
@@ -149,7 +154,7 @@ SocketStream::SocketStream(const std::string &hostname, uint16 _port, Protocol p
if (deadline > 0 && time(0) >= deadline)
throw TimeOutException("client socket", THROW_ARGS);
- if (usleep(999999) < 0) {
+ if (usleep(999999) < 0) { // near 1 sec; max portably safe arg val
// interrupted by a signal handler -- abort to allow this thread to
// be forced to continue after receiving a SIGINT, as with any other
// system call in this constructor
@@ -158,7 +163,7 @@ SocketStream::SocketStream(const std::string &hostname, uint16 _port, Protocol p
} else
THROW_SYSCALL(str(boost::format("connect [%s]") % description));
} else {
- int on = 1;
+ const int on = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on) < 0)
THROW_SYSCALL("setsockopt(SO_REUSEADDR)");
@@ -170,7 +175,7 @@ SocketStream::SocketStream(const std::string &hostname, uint16 _port, Protocol p
listen_sk = fd;
fd = -1;
- int listenBacklog = 15;
+ const int listenBacklog = 15;
if (listen(listen_sk, listenBacklog) < 0)
THROW_SYSCALL(str(boost::format("listen [%s]") % description));
@@ -309,8 +314,10 @@ void SocketStream::syncNFS()
if (!dir)
THROW_SYSCALL("opendir");
- if (!readdir(dir))
- THROW_SYSCALL("readdir");
+ struct dirent entry;
+ struct dirent *result;
+ if (readdir_r(dir, &entry, &result) != 0 || !result)
+ THROW_SYSCALL("readdir_r");
if (closedir(dir) != 0)
THROW_SYSCALL("closedir");
@@ -335,11 +342,11 @@ std::string SocketStream::readkey(const std::string &nfskey, time_t deadline)
if (deadline > 0 && deadline <= time(0))
THROW(TimeOutException, "client socket");
- if (usleep(999999) > 0) {
+ if (usleep(999999) < 0) { // near 1 sec; max portably safe arg val
// interrupted by a signal handler -- abort to allow this thread to
// be forced to continue after receiving a SIGINT, as with any other
// system call
- THROW_SYSCALL("sleep");
+ THROW_SYSCALL("usleep");
}
}
}
diff --git a/LCS/Stream/src/StreamFactory.cc b/LCS/Stream/src/StreamFactory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e5a3b71765e40bdd2932dc6deb1a92c513299029
--- /dev/null
+++ b/LCS/Stream/src/StreamFactory.cc
@@ -0,0 +1,73 @@
+//# StreamFactory.cc: class/functions to construct streams
+//# Copyright (C) 2008-2013 ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
+
+//# Always #include <lofar_config.h> first!
+#include <lofar_config.h>
+
+//# Includes
+#include <Stream/StreamFactory.h>
+
+#include <vector>
+#include <boost/lexical_cast.hpp>
+
+#include <Common/StringUtil.h>
+#include <Common/Exceptions.h>
+#include <Stream/FileStream.h>
+#include <Stream/NullStream.h>
+#include <Stream/SocketStream.h>
+#include <Stream/PortBroker.h>
+#include <Stream/NamedPipeStream.h>
+
+namespace LOFAR
+{
+
+ // Caller should wrap the returned pointer in some smart ptr type.
+ Stream *createStream(const std::string &descriptor, bool asServer, time_t deadline)
+ {
+ std::vector<std::string> split = StringUtil::split(descriptor, ':');
+
+ if (descriptor == "null:")
+ return new NullStream;
+ else if (split.size() == 3 && split[0] == "udp")
+ return new SocketStream(split[1].c_str(), boost::lexical_cast<unsigned short>(split[2]), SocketStream::UDP, asServer ? SocketStream::Server : SocketStream::Client, deadline);
+ else if (split.size() == 3 && split[0] == "tcp")
+ return new SocketStream(split[1].c_str(), boost::lexical_cast<unsigned short>(split[2]), SocketStream::TCP, asServer ? SocketStream::Server : SocketStream::Client, deadline);
+ else if (split.size() == 3 && split[0] == "udpkey")
+ return new SocketStream(split[1].c_str(), 0, SocketStream::UDP, asServer ? SocketStream::Server : SocketStream::Client, deadline, split[2].c_str());
+ else if (split.size() == 4 && split[0] == "tcpbroker")
+ return asServer ? static_cast<Stream*>(new PortBroker::ServerStream(split[3])) : static_cast<Stream*>(new PortBroker::ClientStream(split[1], boost::lexical_cast<unsigned short>(split[2]), split[3]));
+ else if (split.size() == 3 && split[0] == "tcpkey")
+ return new SocketStream(split[1].c_str(), 0, SocketStream::TCP, asServer ? SocketStream::Server : SocketStream::Client, deadline, split[2].c_str());
+ else if (split.size() > 1 && split[0] == "file") {
+ // don't use split[1] to allow : in filenames
+ const std::string filename = descriptor.substr(5);
+ return asServer ? new FileStream(filename.c_str()) : new FileStream(filename.c_str(), 0666);
+ } else if (split.size() == 2 && split[0] == "pipe")
+ return new NamedPipeStream(split[1].c_str(), asServer);
+ else if (split.size() == 2)
+ return new SocketStream(split[0].c_str(), boost::lexical_cast<unsigned short>(split[1]), SocketStream::UDP, asServer ? SocketStream::Server : SocketStream::Client, deadline);
+ else if (split.size() == 1)
+ return asServer ? new FileStream(split[0].c_str()) : new FileStream(split[0].c_str(), 0666);
+
+ THROW(NotImplemented, std::string("createStream(): unrecognized descriptor: " + descriptor));
+ }
+
+} // namespace LOFAR
+
diff --git a/LCS/Stream/test/tFixedBufferStream.cc b/LCS/Stream/test/tFixedBufferStream.cc
index d6a06699d673f8f8b10740668d6e1f01802d84e1..0186beae9a40865007226c50094c376621535d64 100644
--- a/LCS/Stream/test/tFixedBufferStream.cc
+++ b/LCS/Stream/test/tFixedBufferStream.cc
@@ -109,7 +109,7 @@ int main(int /*argc*/, const char* argv[])
try {
testWrite(ws, 500);
- } catch(Stream::EndOfStreamException &e) {
+ } catch(EndOfStreamException &e) {
EOB = true;
}
@@ -120,7 +120,7 @@ int main(int /*argc*/, const char* argv[])
try {
testRead(rs, 500);
- } catch(Stream::EndOfStreamException &e) {
+ } catch(EndOfStreamException &e) {
EOB = true;
}
diff --git a/LCS/Tools/src/templates/templated_header.tcc_template b/LCS/Tools/src/templates/templated_header.tcc_template
index db963f3d28f5d2dee018dd45b611db288728a208..23463cc13658c6797014529c76efa49d4423f5dd 100644
--- a/LCS/Tools/src/templates/templated_header.tcc_template
+++ b/LCS/Tools/src/templates/templated_header.tcc_template
@@ -2,7 +2,7 @@
//#
//# Copyright (C) %YEAR%
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/LCS/pyparameterset/src/__init__.py b/LCS/pyparameterset/src/__init__.py
index afcd34c1b54872d59fd027997fa1ec170d174384..06f677e8a7b225ca89acbaa009b5ed2ddd809650 100755
--- a/LCS/pyparameterset/src/__init__.py
+++ b/LCS/pyparameterset/src/__init__.py
@@ -22,7 +22,6 @@
from _pyparameterset import PyParameterValue
from _pyparameterset import PyParameterSet
-
class parametervalue(PyParameterValue):
"""
The Python interface to ParameterValue
@@ -73,6 +72,7 @@ class parameterset(PyParameterSet):
filename
If a filename is given, the object is filled from that parset file.
If a bool is given, it is treated as argument caseInsensitive.
+ If a dict is given, it is a set of parameter values.
caseInsensitive
True = parameter names are case insensitive
@@ -85,6 +85,10 @@ class parameterset(PyParameterSet):
elif isinstance(filename, bool):
# Here filename argument means caseInsensitive
PyParameterSet.__init__ (self, filename, 0, 0);
+ elif isinstance(filename, dict):
+ # Here filename argument means caseInsensitive
+ PyParameterSet.__init__ (self, caseInsensitive, 0, 0);
+ self.adoptDict (filename)
else:
PyParameterSet.__init__ (self, filename, caseInsensitive);
@@ -143,6 +147,10 @@ class parameterset(PyParameterSet):
if len(kv) == 2:
self.replace (kv[0], kv[1])
+ def adoptDict(self, parms):
+ for (k,v) in parms.iteritems():
+ self.replace (k, v)
+
def get(self, key):
"""Get the parametervalue object of a parameter."""
return parametervalue (self._get(key), _copyObj=True)
diff --git a/LCU/checkhardware/lib/data_lib.py b/LCU/checkhardware/lib/data_lib.py
index cd9552bf8854d8f20264e83d45814d222aa81172..c920cb0a30203d391a56c16e745856a195b60984 100644
--- a/LCU/checkhardware/lib/data_lib.py
+++ b/LCU/checkhardware/lib/data_lib.py
@@ -102,7 +102,7 @@ class cRCUdata:
def readFiles(self):
files_in_dir = sorted(os.listdir(dataDir()))
data_shape = self.readFile(os.path.join(dataDir(),files_in_dir[0])).shape
- ssdata = np.zeros((96,data_shape[0],data_shape[1]), dtype=np.float64)
+ ssdata = np.zeros((self.n_rcus, data_shape[0],data_shape[1]), dtype=np.float64)
for file_name in files_in_dir:
#path, filename = os.split(file_name)
rcu = int(file_name.split('.')[0][-3:])
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/APLCommonExceptions.h b/MAC/APL/APLCommon/include/APL/APLCommon/APLCommonExceptions.h
index d6dbf7ca050b775b18b1c68578c36bd498443a8e..535144d265bfaaab10dc1785f87c09b706a2eb94 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/APLCommonExceptions.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/APLCommonExceptions.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/APLUtilities.h b/MAC/APL/APLCommon/include/APL/APLCommon/APLUtilities.h
index 765a5b709494890e485c1b466b8cbcd7210e3680..076db645b2d3078d7f8768a6d9cee7d5cef848c8 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/APLUtilities.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/APLUtilities.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/APL_Defines.h b/MAC/APL/APLCommon/include/APL/APLCommon/APL_Defines.h
index 910fe09c3d91bc2af35f21f08b1c1cbd3ad020db..f85d6914131bfd05056293a8c4dfd26c46fcac04 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/APL_Defines.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/APL_Defines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
index ba70076c90ee339448fcb4f06d222f8c93ce07e0..2fab4f68c1e7cf5bb6f45f2f2f6dafda4ac294fb 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/AntennaMapper.h b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaMapper.h
index 9d77ed572276697925a42b4d15f0161e9be08e4c..67c5d17fea0ba6df4a3ee9980a6c70bed0be0ad4 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/AntennaMapper.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaMapper.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/CTState.h b/MAC/APL/APLCommon/include/APL/APLCommon/CTState.h
index 64ca1ccb5349f8a53e4c9731d6d89c7eb3b41c60..47bec1cffc262f6077063811e890d26cd2038a99 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/CTState.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/CTState.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ChildControl.h b/MAC/APL/APLCommon/include/APL/APLCommon/ChildControl.h
index 4097bae1b42ddde0629fd682766b46ad93f073c2..136406a82474d2db6d10ae40a6ea7e3f19ec6c6a 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ChildControl.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ChildControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerAdmin.h b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerAdmin.h
index a70bb622f691468df1d2fefe63d4ec98fc543af8..ff7683756f21726303e1537bd31138982e621515 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerAdmin.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerAdmin.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h
index 04352c5fed3179687619be457f8865442c11eaa7..d1e3c45a1ad0df980210c8d75aa816eb4f057811 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerInfo.h b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerInfo.h
index 97d012f8671dc5531500aff53b38f9c631f13a77..a578f90e04e1bf9c7a056c018edd823bb7167d3e 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerInfo.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerInfo.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h b/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
index 06cadb000f20d27a0578203e28504c8d586d9507..c705cd92fed5ccfb8722d95081cf3e991569f2a6 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/bitsetUtil.tcc b/MAC/APL/APLCommon/include/APL/APLCommon/bitsetUtil.tcc
index b7126e507f2868d5d8072a620f455efa4312e74f..df3a58917e011d57437210eb71a97f674c069b06 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/bitsetUtil.tcc
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/bitsetUtil.tcc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/APLUtilities.cc b/MAC/APL/APLCommon/src/APLUtilities.cc
index f3c44835a1a1ef1404486f1509a71e5d5434e000..5e408cb3da8e639a74d68e5646de2a9026d83d12 100644
--- a/MAC/APL/APLCommon/src/APLUtilities.cc
+++ b/MAC/APL/APLCommon/src/APLUtilities.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/AntennaField.cc b/MAC/APL/APLCommon/src/AntennaField.cc
index 645fd708e93361d07d9dea7bbf34c5198a4f53b0..833b869488f63106d2818e4c903a7ff1f65ac4b5 100644
--- a/MAC/APL/APLCommon/src/AntennaField.cc
+++ b/MAC/APL/APLCommon/src/AntennaField.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/CTState.cc b/MAC/APL/APLCommon/src/CTState.cc
index 7f1b4de35a2916ca9df5d7137e13f6c3316d7db8..c6dc2b8d5aba8dd1a3989de6151b3cdea443a10b 100644
--- a/MAC/APL/APLCommon/src/CTState.cc
+++ b/MAC/APL/APLCommon/src/CTState.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/ChildControl.cc b/MAC/APL/APLCommon/src/ChildControl.cc
index 9a0ef06279cf9b271df429b5dde57598d7c86c2c..b3d330652d9d2b2f7207a0983b02ea5c2a54bc89 100644
--- a/MAC/APL/APLCommon/src/ChildControl.cc
+++ b/MAC/APL/APLCommon/src/ChildControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/ControllerAdmin.cc b/MAC/APL/APLCommon/src/ControllerAdmin.cc
index 513166c276bfaf3220f42d339a01014d11664b6a..f2d45ad8925ca921a233c3742364e1af825c3d3f 100644
--- a/MAC/APL/APLCommon/src/ControllerAdmin.cc
+++ b/MAC/APL/APLCommon/src/ControllerAdmin.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/ControllerDefines.cc b/MAC/APL/APLCommon/src/ControllerDefines.cc
index ba80f725ad8bca02ca1a6459749469d1800a5c50..6556607eb993bbfdce06f1e0fa4fcbfeca40ce38 100644
--- a/MAC/APL/APLCommon/src/ControllerDefines.cc
+++ b/MAC/APL/APLCommon/src/ControllerDefines.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/Controller_Protocol.prot b/MAC/APL/APLCommon/src/Controller_Protocol.prot
index 2c5f017da87f80559ccc406b13a9d85a5b978af7..b2dd9d3a447dc5d5482a7e0a8e801b33d1b99939 100644
--- a/MAC/APL/APLCommon/src/Controller_Protocol.prot
+++ b/MAC/APL/APLCommon/src/Controller_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/ParentControl.cc b/MAC/APL/APLCommon/src/ParentControl.cc
index 9c9474299629a218623bb0b72d469d97954fc6a2..9d93ec87c229faef6b679b4a0b7415ede8436220 100644
--- a/MAC/APL/APLCommon/src/ParentControl.cc
+++ b/MAC/APL/APLCommon/src/ParentControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/StartDaemon_Protocol.prot b/MAC/APL/APLCommon/src/StartDaemon_Protocol.prot
index 18da4c7d80ff7bd265c382acb772be829572dd37..42cd100096056440412b88b94b2f58a033b862f5 100644
--- a/MAC/APL/APLCommon/src/StartDaemon_Protocol.prot
+++ b/MAC/APL/APLCommon/src/StartDaemon_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/swlevel b/MAC/APL/APLCommon/src/swlevel
index 442473c4a9d9bbce1d649bcc64ffe2abab64aa36..7d02ef091231df0f81f5b2855be015ba05ee7ca3 100644
--- a/MAC/APL/APLCommon/src/swlevel
+++ b/MAC/APL/APLCommon/src/swlevel
@@ -4,7 +4,7 @@
#
# Copyright (C) 2006
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/ControllerProtMenu.cc b/MAC/APL/APLCommon/test/ControllerProtMenu.cc
index 347b7b34adb0b81cbb250cc4ecc62d28a5aa7ab8..7700f4411da899325f309e6e6e70cdceee1593a4 100644
--- a/MAC/APL/APLCommon/test/ControllerProtMenu.cc
+++ b/MAC/APL/APLCommon/test/ControllerProtMenu.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/ControllerProtMenu.h b/MAC/APL/APLCommon/test/ControllerProtMenu.h
index 7d846eb9ebce4a24c9d80bc3aeecabe6fb264bd2..741e9fcb20c70ecb3224b4360a5c10ae0d19bab4 100644
--- a/MAC/APL/APLCommon/test/ControllerProtMenu.h
+++ b/MAC/APL/APLCommon/test/ControllerProtMenu.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tAPLUtilities.cc b/MAC/APL/APLCommon/test/tAPLUtilities.cc
index c7549a16240da2d9b4ec87a6906e9329d92887b3..224f68e2b4d34fb69f8bf086a6030a0b2aa79ccd 100644
--- a/MAC/APL/APLCommon/test/tAPLUtilities.cc
+++ b/MAC/APL/APLCommon/test/tAPLUtilities.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tAntennaField.cc b/MAC/APL/APLCommon/test/tAntennaField.cc
index db80c0572c2970f416caa708983828be8d857868..da96240a2b27d54c93b817e439f7a090f6338830 100644
--- a/MAC/APL/APLCommon/test/tAntennaField.cc
+++ b/MAC/APL/APLCommon/test/tAntennaField.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tAntennaMapper.cc b/MAC/APL/APLCommon/test/tAntennaMapper.cc
index ad3ffee403a6a1bcef69584d20a0e74f922b819a..68a7efaffdccca95a6642f1ab6adcbdbf3c2a715 100644
--- a/MAC/APL/APLCommon/test/tAntennaMapper.cc
+++ b/MAC/APL/APLCommon/test/tAntennaMapper.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tControllerDefines.cc b/MAC/APL/APLCommon/test/tControllerDefines.cc
index d4de4389af33aace54c2f4c5e112d444fa6554da..6ee21eaf436daad28205461a323b2050683b5b89 100644
--- a/MAC/APL/APLCommon/test/tControllerDefines.cc
+++ b/MAC/APL/APLCommon/test/tControllerDefines.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tOutOfBand.cc b/MAC/APL/APLCommon/test/tOutOfBand.cc
index 1564f1afd099e3b00ab8040726a76c3bec37c9d6..03c5bf292c990bc5bf76ff6f1406dcd87e5f0b4c 100644
--- a/MAC/APL/APLCommon/test/tOutOfBand.cc
+++ b/MAC/APL/APLCommon/test/tOutOfBand.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tParentControl.cc b/MAC/APL/APLCommon/test/tParentControl.cc
index b5e8b1f343d0f1d72892468cf1212dc0c9a2da42..9ba05f7c6611d1ba933e97185127d5640957dd38 100644
--- a/MAC/APL/APLCommon/test/tParentControl.cc
+++ b/MAC/APL/APLCommon/test/tParentControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tParentControl.h b/MAC/APL/APLCommon/test/tParentControl.h
index 1a0c24ae0598ebf0582e2e396f820f180e9bbf24..dfa5b432ebe7bb6d81999769a54c102ad101c12e 100644
--- a/MAC/APL/APLCommon/test/tParentControl.h
+++ b/MAC/APL/APLCommon/test/tParentControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010-2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tbitsetUtil.cc b/MAC/APL/APLCommon/test/tbitsetUtil.cc
index 1550d0a9c86e48a4c7e77449669cb45400cfb22a..12016ad480f84260b73f8fc5462baa8dc466a70d 100644
--- a/MAC/APL/APLCommon/test/tbitsetUtil.cc
+++ b/MAC/APL/APLCommon/test/tbitsetUtil.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACCmdImpl.cc b/MAC/APL/Appl_Controller/src/ACCmdImpl.cc
index ac5dac98d8be21aae014fcee38f93ad27948f002..ffdbf89718853dacc4027333acae5229d7d88352 100644
--- a/MAC/APL/Appl_Controller/src/ACCmdImpl.cc
+++ b/MAC/APL/Appl_Controller/src/ACCmdImpl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACCmdImpl.h b/MAC/APL/Appl_Controller/src/ACCmdImpl.h
index 45c707a3aee2b5981795164fa8fdaf2fd3ecf495..770751e70e36c99aab93b4a2bce3965d7222a584 100644
--- a/MAC/APL/Appl_Controller/src/ACCmdImpl.h
+++ b/MAC/APL/Appl_Controller/src/ACCmdImpl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemon.cc b/MAC/APL/Appl_Controller/src/ACDaemon.cc
index 341312a856902b3b5c1f1fb943840e45b53f791f..478489607e44316d28896a892ea252e02a986131 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemon.cc
+++ b/MAC/APL/Appl_Controller/src/ACDaemon.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemon.h b/MAC/APL/Appl_Controller/src/ACDaemon.h
index a84c6777b6d31653d4184ed03233c1c1831c5381..d68f57ffe957a74f583f1f11b699a1658c506edd 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemon.h
+++ b/MAC/APL/Appl_Controller/src/ACDaemon.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemonComm.cc b/MAC/APL/Appl_Controller/src/ACDaemonComm.cc
index 41e8a8e9cac1ccd01f9099b7da2c5465d9578bde..749cd700b1d6b83aa83ed69786c9e9a0e5d7dd65 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemonComm.cc
+++ b/MAC/APL/Appl_Controller/src/ACDaemonComm.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemonComm.h b/MAC/APL/Appl_Controller/src/ACDaemonComm.h
index 9cd482827b1777315e23a63a8845fda1ecd2cce1..7bb1b0ef5bdc743605cafc74805d929a958016ce 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemonComm.h
+++ b/MAC/APL/Appl_Controller/src/ACDaemonComm.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemonMain.cc b/MAC/APL/Appl_Controller/src/ACDaemonMain.cc
index 998e308fc81fa73a50ba0a035588b4892c315dcb..a236d79fbeaae90ae8a4d23ee6e72e55100578a0 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemonMain.cc
+++ b/MAC/APL/Appl_Controller/src/ACDaemonMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACRequestPool.cc b/MAC/APL/Appl_Controller/src/ACRequestPool.cc
index db0f73a09c642df08548fd669cf933133117b99c..4a835cb8be9f62567526c388dca1334f6123080d 100644
--- a/MAC/APL/Appl_Controller/src/ACRequestPool.cc
+++ b/MAC/APL/Appl_Controller/src/ACRequestPool.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACRequestPool.h b/MAC/APL/Appl_Controller/src/ACRequestPool.h
index 435680c6d52257b686176190beea20ab06809572..a256fe50242c17b61e22f4c9411d0500e7d2a456 100644
--- a/MAC/APL/Appl_Controller/src/ACRequestPool.h
+++ b/MAC/APL/Appl_Controller/src/ACRequestPool.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACcli.cc b/MAC/APL/Appl_Controller/src/ACcli.cc
index dfcf191d466ee9de5d352658c49834c534b1341f..cbd5456571f32f58bbb7107b573abc6538591b68 100644
--- a/MAC/APL/Appl_Controller/src/ACcli.cc
+++ b/MAC/APL/Appl_Controller/src/ACcli.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACuserMenu.cc b/MAC/APL/Appl_Controller/src/ACuserMenu.cc
index 434111e61c1a0b345972c6ce01da0137cf3e6881..f4a24a953d8862b54ef369879e251d8951222081 100644
--- a/MAC/APL/Appl_Controller/src/ACuserMenu.cc
+++ b/MAC/APL/Appl_Controller/src/ACuserMenu.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/APAdmin.cc b/MAC/APL/Appl_Controller/src/APAdmin.cc
index 7aab806a00273b08799df0457e93bb7ec3b7a350..c4be1d6a156ec8354d871a228fd4670d7093eac9 100644
--- a/MAC/APL/Appl_Controller/src/APAdmin.cc
+++ b/MAC/APL/Appl_Controller/src/APAdmin.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/APAdmin.h b/MAC/APL/Appl_Controller/src/APAdmin.h
index 21de52204f9457cd0eb6bd660e88e90e940a035d..6605c3a02ba171c6b773cf259b0c3bcfd5b1cc19 100644
--- a/MAC/APL/Appl_Controller/src/APAdmin.h
+++ b/MAC/APL/Appl_Controller/src/APAdmin.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/APAdminPool.cc b/MAC/APL/Appl_Controller/src/APAdminPool.cc
index 7d44a541da44e9083444370024b28a339ce60aba..860e767ec59e1f25cf010e30f0c348ef03a25e36 100644
--- a/MAC/APL/Appl_Controller/src/APAdminPool.cc
+++ b/MAC/APL/Appl_Controller/src/APAdminPool.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/APAdminPool.h b/MAC/APL/Appl_Controller/src/APAdminPool.h
index 109e36f805ed5a64b515ab177db0bf4c59c4731d..0035bf8498d13356daf5e3795c3c8cbff0916764 100644
--- a/MAC/APL/Appl_Controller/src/APAdminPool.h
+++ b/MAC/APL/Appl_Controller/src/APAdminPool.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ApplController.cc b/MAC/APL/Appl_Controller/src/ApplController.cc
index e8a705370b1631223b91d3b58ccf90057a39a48e..3714a5d575f6370f6c2585e3bca520d73b2b7573 100644
--- a/MAC/APL/Appl_Controller/src/ApplController.cc
+++ b/MAC/APL/Appl_Controller/src/ApplController.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ApplController.h b/MAC/APL/Appl_Controller/src/ApplController.h
index a8a63fa87ade66f3d5c197f5628883e6c3f28e4c..8ed816cfbf103a6a2e47dc0f2d8680bb45aa3599 100644
--- a/MAC/APL/Appl_Controller/src/ApplController.h
+++ b/MAC/APL/Appl_Controller/src/ApplController.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ApplControllerMain.cc b/MAC/APL/Appl_Controller/src/ApplControllerMain.cc
index 2dfc8e7fcc23c14c55911027214e82f5c6471588..f181bc16bf170a9b167887893eb224eb4df8b1fb 100644
--- a/MAC/APL/Appl_Controller/src/ApplControllerMain.cc
+++ b/MAC/APL/Appl_Controller/src/ApplControllerMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/CmdStack.cc b/MAC/APL/Appl_Controller/src/CmdStack.cc
index daea49c28855e7a798ffe241374fb878f969ac98..02ea31a453df03b9937209c02924464330da5eb1 100644
--- a/MAC/APL/Appl_Controller/src/CmdStack.cc
+++ b/MAC/APL/Appl_Controller/src/CmdStack.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/CmdStack.h b/MAC/APL/Appl_Controller/src/CmdStack.h
index 3e6b0451c90025c90b2bc44d79b67453cd861e81..111a97116c343e8b6a74523f9bf77b88c7f45308 100644
--- a/MAC/APL/Appl_Controller/src/CmdStack.h
+++ b/MAC/APL/Appl_Controller/src/CmdStack.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ItemList.cc b/MAC/APL/Appl_Controller/src/ItemList.cc
index 91e324e58894279dd158b01cdbcdf5fab40b3fd6..2182516b8714ea32904101dff8d7e07075f02f21 100644
--- a/MAC/APL/Appl_Controller/src/ItemList.cc
+++ b/MAC/APL/Appl_Controller/src/ItemList.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ItemList.h b/MAC/APL/Appl_Controller/src/ItemList.h
index 590ce6d99238a465cdd4efc48650b13e63188b8b..d98296f6ceed81144f704f57eef3e68ea1dfee3f 100644
--- a/MAC/APL/Appl_Controller/src/ItemList.h
+++ b/MAC/APL/Appl_Controller/src/ItemList.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_BGL.cc b/MAC/APL/Appl_Controller/src/PR_BGL.cc
index 3530170128a488a780442859cb0503d4006bfb4f..7294642c0f0501906d0f8c2c222f651b0ddd5706 100644
--- a/MAC/APL/Appl_Controller/src/PR_BGL.cc
+++ b/MAC/APL/Appl_Controller/src/PR_BGL.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_BGL.h b/MAC/APL/Appl_Controller/src/PR_BGL.h
index 15c8354686a3ac01012ac6a98155b5fb3b8454bc..081cb8b9d05002471856e6adb0b11a3142020519 100644
--- a/MAC/APL/Appl_Controller/src/PR_BGL.h
+++ b/MAC/APL/Appl_Controller/src/PR_BGL.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_MPI.cc b/MAC/APL/Appl_Controller/src/PR_MPI.cc
index be17281808ebbbeeff797f64ac58681c167265d8..041622e79c6e5d8928681b837601d57ee40c4357 100644
--- a/MAC/APL/Appl_Controller/src/PR_MPI.cc
+++ b/MAC/APL/Appl_Controller/src/PR_MPI.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_MPI.h b/MAC/APL/Appl_Controller/src/PR_MPI.h
index 9dbe531055e042c0f0d2e7a5409ee7c9ec663002..d1f699dca299d1102de71486fc06304697654ce5 100644
--- a/MAC/APL/Appl_Controller/src/PR_MPI.h
+++ b/MAC/APL/Appl_Controller/src/PR_MPI.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_Shell.cc b/MAC/APL/Appl_Controller/src/PR_Shell.cc
index 57f9e26f3e6d2eb78f0eff162efc1b17f56a071c..a61566fbc46779d2e4538d66065aea950c6e398a 100644
--- a/MAC/APL/Appl_Controller/src/PR_Shell.cc
+++ b/MAC/APL/Appl_Controller/src/PR_Shell.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_Shell.h b/MAC/APL/Appl_Controller/src/PR_Shell.h
index dcad3f08d42b4843edfe563e697c1e3fbbe71861..44d7f989f1de05e93de91b195fbb2e0e0524d1e1 100644
--- a/MAC/APL/Appl_Controller/src/PR_Shell.h
+++ b/MAC/APL/Appl_Controller/src/PR_Shell.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ProcRule.cc b/MAC/APL/Appl_Controller/src/ProcRule.cc
index 60feaa63aeda3df3e198b6e46760392718467fda..5453acaa19bdf386f78f5d5576a09ffa840e01be 100644
--- a/MAC/APL/Appl_Controller/src/ProcRule.cc
+++ b/MAC/APL/Appl_Controller/src/ProcRule.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ProcRule.h b/MAC/APL/Appl_Controller/src/ProcRule.h
index 321fe545686f985c1855d401c1466515ac72c88b..880b5d25d79563e0dab72b7292a53c859192993e 100644
--- a/MAC/APL/Appl_Controller/src/ProcRule.h
+++ b/MAC/APL/Appl_Controller/src/ProcRule.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ProcRuler.cc b/MAC/APL/Appl_Controller/src/ProcRuler.cc
index b0a68008a865bf89c214a6693226f75d9c0ac3ff..df77b2f0ea941722ae3ce54273f0c34e5f5eeee5 100644
--- a/MAC/APL/Appl_Controller/src/ProcRuler.cc
+++ b/MAC/APL/Appl_Controller/src/ProcRuler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ProcRuler.h b/MAC/APL/Appl_Controller/src/ProcRuler.h
index a1450fdcfbae41d1cd474baeb295e69b689a5980..55f2231c869bc91f6daa91b6aa29c2237715aef8 100644
--- a/MAC/APL/Appl_Controller/src/ProcRuler.h
+++ b/MAC/APL/Appl_Controller/src/ProcRuler.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/StateEngine.cc b/MAC/APL/Appl_Controller/src/StateEngine.cc
index 9dd434f59aa934a3e84825130a26a3915a3e1abf..399df055032b857db2fcb3d89f5622012491dcc3 100644
--- a/MAC/APL/Appl_Controller/src/StateEngine.cc
+++ b/MAC/APL/Appl_Controller/src/StateEngine.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/StateEngine.h b/MAC/APL/Appl_Controller/src/StateEngine.h
index 8860093af673c512876b564bdbc13efc130afdd5..66b50d0414bc2385b95b606ae9be40f81ded6595 100644
--- a/MAC/APL/Appl_Controller/src/StateEngine.h
+++ b/MAC/APL/Appl_Controller/src/StateEngine.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/forkexec.cc b/MAC/APL/Appl_Controller/src/forkexec.cc
index f026d94efea8e018858f1bc6839a34281c09e0cb..d62fee2a01f482f32ccf0bee98af7dfb07e29b2a 100644
--- a/MAC/APL/Appl_Controller/src/forkexec.cc
+++ b/MAC/APL/Appl_Controller/src/forkexec.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/forkexec.h b/MAC/APL/Appl_Controller/src/forkexec.h
index 6c14b23d17668e264cb695ded15b005ff0c8b4b5..c5951cee44a09ac5b1b74cfebc3fca55b3c6dffa 100644
--- a/MAC/APL/Appl_Controller/src/forkexec.h
+++ b/MAC/APL/Appl_Controller/src/forkexec.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/myACClientFunctions.h b/MAC/APL/Appl_Controller/src/myACClientFunctions.h
index d0e23661822174f20d89eb29c587e39f4adfb552..5645adeeea7dd4dd710802f7e369a4e34906d779 100644
--- a/MAC/APL/Appl_Controller/src/myACClientFunctions.h
+++ b/MAC/APL/Appl_Controller/src/myACClientFunctions.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CASATools/include/CASATools/CasaConverter.h b/MAC/APL/CASATools/include/CASATools/CasaConverter.h
index e8d85d7201c97593278929010295b9588856d37c..1e53f575cb1a7a939d5856b4c66474945b6f8710 100644
--- a/MAC/APL/CASATools/include/CASATools/CasaConverter.h
+++ b/MAC/APL/CASATools/include/CASATools/CasaConverter.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CASATools/src/CasaConverter.cc b/MAC/APL/CASATools/src/CasaConverter.cc
index 0998eaf49bfe03278404716c0bac7ce4a3776445..bd9311d24d368eaf8963f9af2befe7275f1b0ba2 100644
--- a/MAC/APL/CASATools/src/CasaConverter.cc
+++ b/MAC/APL/CASATools/src/CasaConverter.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CASATools/test/tCasaConverter.cc b/MAC/APL/CASATools/test/tCasaConverter.cc
index 42f6345f3d473aca28edbf0c8d87f3956311d1fb..aed0bc662369022cd78457837bdc47e832eb288b 100644
--- a/MAC/APL/CASATools/test/tCasaConverter.cc
+++ b/MAC/APL/CASATools/test/tCasaConverter.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc
index c37e41339065fd4b93ccf74a5657c0562d72e163..169a1496c396fcedd4821264828211b7a48feacc 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.h b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.h
index 5567484edeab186fe95ea7c72cda70fc26944219..5f0ccae0a72d0f5a5e1342781bf21b638b2cdacf 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.h
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/CEPHardwareMonitorMain.cc b/MAC/APL/CEPCU/src/CEPHardwareMonitor/CEPHardwareMonitorMain.cc
index 964b86e947c47dd3fc4c430939441d93d32138eb..74c00fdce202d4b9a0b26e55eda8a7198a236b74 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/CEPHardwareMonitorMain.cc
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/CEPHardwareMonitorMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc
index 3df9e8519bb8f9de5959713b367e5b276178133d..3395dc59d3233fc365e589c9951dd03cd7cc4348 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.h b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.h
index f4f91f07af9d165bb686cda293b7f051589bab79..f7435451013dc37892756a2e7d6eefd07db225f4 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.h
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
index 8127b683a13f9a6a76f5c7bae35abf3de6fc11cb..8fd5d8e1b2fa0a6d5803ac070aeeac8a68bcaeb2 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
index 3fda39dc026f130746e587e67e6611f2a79e5ec2..a3fe3a4fc85b6f86a9dbab5d1b33ff89e580557c 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlDefines.h b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlDefines.h
index d1e91e7af9348720f0411f6716b2496157a3aae4..443d136537421c2eebc810556a4ef469ac232db7 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlDefines.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlDefines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
index 1a0dadbfb119ca7d17b1862b81eb7be052a8122b..e3356ed014303d8897d4e7eb7954bbd60a614e93 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/Response.cc b/MAC/APL/CEPCU/src/OnlineControl/Response.cc
index c49b50d2f451b96f372c2deafd047578a36491bd..6ee31797ebd674de3f92b7611514351fcee5e9a7 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/Response.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/Response.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006-2012
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/Response.h b/MAC/APL/CEPCU/src/OnlineControl/Response.h
index 364f987971766b688f4d82688399e3bcefac1ac3..9885b5befeb396965e4f1b3a87ebf08a01975c61 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/Response.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/Response.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003-2012
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/forkexec.cc b/MAC/APL/CEPCU/src/OnlineControl/forkexec.cc
index 533fb28fb797027cdff5531372d7af79eb201354..60dcccc53df4e2ec5c5207d9212b69ad2a186d00 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/forkexec.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/forkexec.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/forkexec.h b/MAC/APL/CEPCU/src/OnlineControl/forkexec.h
index 65a1a59f4160ed66ce3a4453712b1466b3ac42b4..baa92e8e42ec5952b0f6a6c2dd16dfc740ea2e34 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/forkexec.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/forkexec.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/tPVSSMapping.cc b/MAC/APL/CEPCU/src/OnlineControl/tPVSSMapping.cc
index a1d6039e88591175777534f90f2888719b1eb1c0..7f78e9eb339535aa2980d0ab8ec691801db67ffe 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/tPVSSMapping.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/tPVSSMapping.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt b/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
index 6ad8270b539a75cb6067dda3dfffdadc744dface..c2b65109e68cf110248ed4f812873f1087cebede 100644
--- a/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
+++ b/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
@@ -2,7 +2,7 @@
#
# Copyright (C) 2008-2009
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
index 3a699e0eb2e5084c0066fc46e6b8291a524e596f..3bd66084edb679c58e5ab8bda4ac3ed4f94fa646 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010-2012
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControl.h b/MAC/APL/CEPCU/src/PythonControl/PythonControl.h
index 253220353352c7838c41a8e97942f252cd32ea6f..7d3460d2382608e9e4086b39824c4af9bf0591a5 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControl.h
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControlDefines.h b/MAC/APL/CEPCU/src/PythonControl/PythonControlDefines.h
index b6e619b415ae7e552b4409d9ba32d782b085b8a1..ae143bf6efc90e669ccdef738f0e80a633977e9c 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControlDefines.h
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControlDefines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc b/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
index ce740989d1e7f49c3020d03a74b467201a1c407f..565ab9bd97fac9b5cd81cc3ef5c4d7e8cc7f5505 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc b/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc
index 998ffd788233c21e1fab6e7e5b8931ac3da1cd8c..c7a81c707de6fd6db5686f0214e7253acf770c37 100644
--- a/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010-2012
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.cc b/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.cc
index c936548d6ae8d91d1a8d736d1a356aa3c962d991..0756be5111fce38f30c1b52001470502b6733a39 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.cc
+++ b/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.h b/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.h
index 583db074da73f926e1c271bc411dc8fa294afa13..c8e7b8eddcec8230da5d0b511faf05cdbbfc1674 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.h
+++ b/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc
index 2a624c31c01c6821fc8f276cf96a711d007ca636..e41b6e7fae052c9e4a291bf38c74dda8d0dd239d 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc
+++ b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.h b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.h
index 1a5ce55f7d36a726bf127c123d1a9c60295f790f..97002d7f870c0f938bf24b08e0ad777b5eff26d8 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.h
+++ b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlDefines.h b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlDefines.h
index 1817a4fe5d79c5502670d604957cefbf23d2e0b8..41af2293fcac41a9c088ecc814fe82200b607cd8 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlDefines.h
+++ b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlDefines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlMain.cc b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlMain.cc
index f827d1fedfbff9aef19b27e08e6fe62e95fb27cb..5d51ba9e98d71d46f72f6c7d0635cbe605451ba6 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlMain.cc
+++ b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadRequest.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadRequest.h
index dd0d423131dcc38703b85758a73a5a466d4c07a3..52c2306b383e8354abd08b691ef4da5581ecdbf0 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadRequest.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadRequest.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadVector.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadVector.h
index 0e082b4ea21bccf60c86a1dd62bef5e4b56402fe..cd24ed217b82434f471650143ecca32f21949860 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadVector.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadVector.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordRequest.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordRequest.h
index fff06e28b2c62ee217fbc5c56572293b32208669..0f6915ad4c733d588bffdbdd7e5abfd817ed91ff 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordRequest.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordRequest.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordVector.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordVector.h
index 60b4ac5cb5270206070b058800c8492dc9668689..d851af6fb256f254134d14a1dfcea9739d8c946d 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordVector.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordVector.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopRequest.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopRequest.h
index 11e113e7a8ce4ed4bbe6f452886bd2e4b746f88d..c8705be5313b88232343236a713c7375fe2b30a7 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopRequest.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopRequest.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopVector.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopVector.h
index 355a4d1e34017f092fa4f9f9287713f7dd97923b..43b1c9a34f18af89372cf69d3bedf7136afd9e78 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopVector.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopVector.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRreadRequest.cc b/MAC/APL/CR_Protocol/src/CRreadRequest.cc
index 074924bc908adf2f743bfe8fd7787d1f3f3336ec..064c869e5a805e932abdfe2fcb7043e91940f523 100644
--- a/MAC/APL/CR_Protocol/src/CRreadRequest.cc
+++ b/MAC/APL/CR_Protocol/src/CRreadRequest.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRreadVector.cc b/MAC/APL/CR_Protocol/src/CRreadVector.cc
index a06f45e152c744555ae80572a0b45b974981cda4..da8efa38a6327b9be5717d1d8f6b7df212725dca 100644
--- a/MAC/APL/CR_Protocol/src/CRreadVector.cc
+++ b/MAC/APL/CR_Protocol/src/CRreadVector.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRrecordRequest.cc b/MAC/APL/CR_Protocol/src/CRrecordRequest.cc
index ad1308435b2d99c785d199b586e4d1fe65bd4ce2..054481e23034e57f0790e04bd5aa64be73c00bee 100644
--- a/MAC/APL/CR_Protocol/src/CRrecordRequest.cc
+++ b/MAC/APL/CR_Protocol/src/CRrecordRequest.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRrecordVector.cc b/MAC/APL/CR_Protocol/src/CRrecordVector.cc
index e9423146f8f0b54b016b51fea231d88973a385e8..a8d944abf529b70abbe7f88066cd0c02a707c441 100644
--- a/MAC/APL/CR_Protocol/src/CRrecordVector.cc
+++ b/MAC/APL/CR_Protocol/src/CRrecordVector.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRstopRequest.cc b/MAC/APL/CR_Protocol/src/CRstopRequest.cc
index 20f88741212b96f4d16c3b09803d2ab373467923..1e76a486852e2791d537f5b2499aee0fd8c11b3e 100644
--- a/MAC/APL/CR_Protocol/src/CRstopRequest.cc
+++ b/MAC/APL/CR_Protocol/src/CRstopRequest.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRstopVector.cc b/MAC/APL/CR_Protocol/src/CRstopVector.cc
index 1cd817a7a73c123979d8ebff20b5991a5c61f402..2686ca88e50e419f345df323e92e1f38aeb4f483 100644
--- a/MAC/APL/CR_Protocol/src/CRstopVector.cc
+++ b/MAC/APL/CR_Protocol/src/CRstopVector.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/test/tCR_Protocol.cc b/MAC/APL/CR_Protocol/test/tCR_Protocol.cc
index db8358dd46265d304d1180847da9bf028d69b4b6..5afda5f33437ee9064d9628037e2eef51a1af7e6 100644
--- a/MAC/APL/CR_Protocol/test/tCR_Protocol.cc
+++ b/MAC/APL/CR_Protocol/test/tCR_Protocol.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc
index da1c15c822fff82280933259da8eaa66044414eb..b1103e70473e52d9348b813a1b2dbaf44e219264 100644
--- a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc
+++ b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h
index 4df6adb00731e4eb3e9dfb45b72a180e4f093d9b..4a3346cd22ef95a38d5f458fb60c6acbb64305bc 100644
--- a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h
+++ b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc
index d78c0e9c4784d7c5a2554f017e6ccfd2a60fde8b..cc7209dcd622c8f8491d81bee1262873fdc4a33b 100644
--- a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc
+++ b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.cc b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.cc
index 5140869ae4e9a3929b664c056331d624194441d2..77571f23f3ff2c0287de04ea667e2de43f2ca29d 100644
--- a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.cc
+++ b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2013
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.h b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.h
index 6e23dc51aae322a7d17fbaabafc2815f8d326c4c..826151ce9c66c8b160a31b7f5bb2bc9290f54df2 100644
--- a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.h
+++ b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2013
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStubMain.cc b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStubMain.cc
index f4a46fe06288dcd28eb60bf5c60638dd1d460f1f..2320dca60ba6bf56532a1db0fe0d3f731ce1fc27 100644
--- a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStubMain.cc
+++ b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStubMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2013
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc
index 44732d926469aeba30b8930a05f58aca553a1f02..22ea47c26d6764b7d5075b775d38dbd462e16355 100644
--- a/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc
+++ b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h
index e1722f1dfaf57d15293631a6d65dea90fa4ea34c..d2ef6b292067111f5fc605b2e23dbbdb706ca96d 100644
--- a/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h
+++ b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc b/MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc
index cc23478288b343a04a449c0f6131eeba52bdf26b..916c68bbce029f3d2ea7296928d9a5a60d618536 100644
--- a/MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc
+++ b/MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/test/EventPort.cc b/MAC/APL/CUDaemons/test/EventPort.cc
index 3dd657c5b5188141983ec8ba1e8a3b3672a3c065..75d46295fac40690e2f9fe57aea02a654002f24d 100644
--- a/MAC/APL/CUDaemons/test/EventPort.cc
+++ b/MAC/APL/CUDaemons/test/EventPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/test/EventPort.h b/MAC/APL/CUDaemons/test/EventPort.h
index 0848d81ab3c81d68d8d8aec081bd2a37e09f2b9c..f2ea6b02f35ebc0ce1502e0a90110583033754fe 100644
--- a/MAC/APL/CUDaemons/test/EventPort.h
+++ b/MAC/APL/CUDaemons/test/EventPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/test/LDtestMenu.cc b/MAC/APL/CUDaemons/test/LDtestMenu.cc
index dbd7af2b0bff44863c4c7070d626d2afcfbaf9d3..c0bc2e4ac48fd6fa91ddaed2cd21e7828a0af3c8 100644
--- a/MAC/APL/CUDaemons/test/LDtestMenu.cc
+++ b/MAC/APL/CUDaemons/test/LDtestMenu.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/test/tLogClient.cc b/MAC/APL/CUDaemons/test/tLogClient.cc
index 8617676a83ffbf3f299b93ca24981f8469c881b6..03a45d7ab27141b10d1b5f35b49e68d43a3bedb7 100644
--- a/MAC/APL/CUDaemons/test/tLogClient.cc
+++ b/MAC/APL/CUDaemons/test/tLogClient.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
index fbf5261f39b7068c0fbb3aa5a9f64c04cc52bd2d..356b2672b7b0a0d7bc9b984d2ab37990fec373ce 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.h b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.h
index efcb3d3bec1ecb50a52f003dff4df656dc532e54..8d2112f667c82f866921d6c3f49d1f4d4ed9625a 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.h
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
index bfb6138b975dd939d9e8e3cb7cd5b02b6bec2bb0..81d25c00e4b2d73a351cd9a0346f5f562cc195fe 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
index 82d4c0951e05fdc1fbcaee451aa6772c78e6ce4a..f618a1233f6c58b68761e87288c4ba9b7336397f 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.h b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.h
index 945270eaf233da0c1572338252064e0ca29dcdc5..6c10acd962df00a65d31fe6943661e29a6bbb8c1 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.h
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
index 65cd3c3ceddb4333eda0613478c95cc015df3471..4e866a372b0928beec59024ad98b1acbb785bb2e 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc
index 0ee7c025975bfceabaf2183f0cf4faddb35df86e..4875626938b5bd42eb02714782f79a79c98def27 100644
--- a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc
+++ b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2013
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h
index b9cbf4931598c9357b62a68e53e9dcc9859b866c..51da45241533f5834068e91644e9237f990f7d99 100644
--- a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h
+++ b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2013
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGatewayMain.cc b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGatewayMain.cc
index c598ec2e26ad6eff2771730242e54a345b2f8670..9f30824c22cdc6ddf38b48fda67d33ba387b5653 100644
--- a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGatewayMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGatewayMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2013
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
index 788a36c18c34fae672e964397f6f2e4ed67b71b6..918e625925768cc2e8ba0779fc7286e605cfd401 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.h b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.h
index b4493ed8bfbaf036a1906c33e7531e24fef47d24..d1917c4476ceea5ed347277e5ce089df06d2b89f 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.h
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
index e7c3000739a1cd3acc7befd7d4740cca83226a40..4c7b871ff39e94f14c244d312400b99fee498139 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.cc b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.cc
index a60f1b1c9b89c7fbfce22d777cf7ff3f64c25e54..b49165c731176b373ff8bd90565de0fd6f3ac927 100644
--- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.cc
+++ b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.h b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.h
index eaa3b8c0fae532bd6ca5e608d2576e21460b1732..3fe44b1b4f3197b3992e72bf5d4d8ea11822a5ac 100644
--- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.h
+++ b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
index a1c9969cd39aefcf263acc2452843d0a418c049a..7dd28c43474c9c0dbe3d50ace9ecb0001518efdb 100644
--- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
@@ -2,7 +2,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc b/MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc
index 469c23b9e8963314969a174ddf229dbfee787da7..e83b5f6ec4e28bff9d9276666fcafbfe9a22bd74 100644
--- a/MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc
+++ b/MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc b/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc
index 304a1ac68e70b84a06b8ea23f462d32862b45af5..02b47c9776a9826012d430cee1b2467b04613872 100644
--- a/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc
+++ b/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/test/tPVSSGateway.cc b/MAC/APL/CURTDBDaemons/test/tPVSSGateway.cc
index 63d3ba9220511543306f76b533b5131849333510..dbbd90f86eeb1ab03ac71a3f41b05694c85905ba 100644
--- a/MAC/APL/CURTDBDaemons/test/tPVSSGateway.cc
+++ b/MAC/APL/CURTDBDaemons/test/tPVSSGateway.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2014
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/RCUMaskTest.java b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/RCUMaskTest.java
index bcd50ddf23b000c7cd42ed0a24c04dc058c8450a..f91032b23bcc7f9f389af5ec3f90025b802f454e 100644
--- a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/RCUMaskTest.java
+++ b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/RCUMaskTest.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/WGRegisterTypeTest.java b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/WGRegisterTypeTest.java
index 9c2ba7fe12986e92c4bc3d26b393546440aa9b67..29856bc16a5f2d93a7c603922945273482561ebd 100644
--- a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/WGRegisterTypeTest.java
+++ b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/WGRegisterTypeTest.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/panels/MaskSelectionPanelTest.java b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/panels/MaskSelectionPanelTest.java
index df665b7689df6306222d6ba2cac9dbed8cb11639..678f75edef749ed07e86323f12e0d91fb5d3e4a2 100644
--- a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/panels/MaskSelectionPanelTest.java
+++ b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/panels/MaskSelectionPanelTest.java
@@ -4,7 +4,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Log_Client/src/LogClient.cc b/MAC/APL/Log_Client/src/LogClient.cc
index c7af00711ac042e5151613b1011637b54b0fa969..4a11cc92f8cf5f8d602882a2c6e3c4e7438e1b46 100644
--- a/MAC/APL/Log_Client/src/LogClient.cc
+++ b/MAC/APL/Log_Client/src/LogClient.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2013
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Log_Client/src/LogClient.h b/MAC/APL/Log_Client/src/LogClient.h
index c444314ad2e2322ed3dffc724ddd4c4e24311b6b..fa98704fc77c1e5f977b91c1058883dacb390cb5 100644
--- a/MAC/APL/Log_Client/src/LogClient.h
+++ b/MAC/APL/Log_Client/src/LogClient.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Log_Client/src/LogClientMain.cc b/MAC/APL/Log_Client/src/LogClientMain.cc
index a05d699b499e939669eb79d3c1d63130c3c27d21..f5a6b4f5612dd76ff5b5eace8891ef289c1eed0d 100644
--- a/MAC/APL/Log_Client/src/LogClientMain.cc
+++ b/MAC/APL/Log_Client/src/LogClientMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MD_Protocol/include/MD_Protocol/BeamletAllocation.h b/MAC/APL/MD_Protocol/include/MD_Protocol/BeamletAllocation.h
index e9d7cb9e863c90fb49c8541169fe8ada887ce636..61be1c3579a068b8d6c5044f5456b8d5783a0898 100644
--- a/MAC/APL/MD_Protocol/include/MD_Protocol/BeamletAllocation.h
+++ b/MAC/APL/MD_Protocol/include/MD_Protocol/BeamletAllocation.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MD_Protocol/include/MD_Protocol/BlAllocArr.h b/MAC/APL/MD_Protocol/include/MD_Protocol/BlAllocArr.h
index 1c63d607170b40fc3b76a3cf1b584ef9d819fc99..c18f9a4359726c598d1f585812ed8494cea1bc61 100644
--- a/MAC/APL/MD_Protocol/include/MD_Protocol/BlAllocArr.h
+++ b/MAC/APL/MD_Protocol/include/MD_Protocol/BlAllocArr.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MD_Protocol/src/BeamletAllocation.cc b/MAC/APL/MD_Protocol/src/BeamletAllocation.cc
index 9c4d06b4a489afe95ba58c288dc9cee7c789ac16..91328987889b770ab58ea7301d0b63833b7642d5 100644
--- a/MAC/APL/MD_Protocol/src/BeamletAllocation.cc
+++ b/MAC/APL/MD_Protocol/src/BeamletAllocation.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MD_Protocol/src/BlAllocArr.cc b/MAC/APL/MD_Protocol/src/BlAllocArr.cc
index 3feeb9ca22011b27a6bae82f3a4ebadf23743a64..91ab6defe8e6f3ef94f9d0f7866def628d042273 100644
--- a/MAC/APL/MD_Protocol/src/BlAllocArr.cc
+++ b/MAC/APL/MD_Protocol/src/BlAllocArr.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc
index 13e674d03b55176e431946c95b17bd1d95eb40cf..a6e461c9b1eddd05d564f04370c73f60a4d73a65 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc
@@ -2,7 +2,7 @@
//
// Copyright (C) 2006-2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h
index 1b45866c32587cb4a0d327a2416a42e1f942db74..705e594c8792787c8abd5d87479644cabd0a7087 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
index 7fd6086d47c292ecdd95fd09da16a1cee8d4df23..87401dffcc2b26d129464dddb7d927f90ecba6fe 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/crctl.cc b/MAC/APL/MainCU/src/CRTriggerControl/crctl.cc
index 12f07a9f57fa1692d3d3f3fd9c4be7cb74681d69..43795cb12936c52e9107adca9466829829724e4d 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/crctl.cc
+++ b/MAC/APL/MainCU/src/CRTriggerControl/crctl.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/crctl.h b/MAC/APL/MainCU/src/CRTriggerControl/crctl.h
index 1ecd76dccbb550557a2744b64df870d22122df57..c4c6cf719d1cf666c7c2e71f9b6a22a76b920557 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/crctl.h
+++ b/MAC/APL/MainCU/src/CRTriggerControl/crctl.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index 120af530645b91ee0ae5e141d3df4dbf9ebf7dbc..a812099ed1b3ea17ae8aa17f1716282cbf22ba3e 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004-2012
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
index d45b6280b397e95fefae5e66a0ad91454acc0ad1..65f6f754792c1f0dd0583284090f913c96528fdb 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc b/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
index 5f6b5ab611740cd6d905fcf605ffe06a88305c9b..14e7f54e380a8abd101892423c5a971882119276 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
index 35d7ad030bd69541d803b6bf9817b2dd288ff32a..e8e80b190b01349b4edbec085dffe4f2655fabd7 100644
--- a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h
index 2d82212d08ff227c52b70c17c8a4d3ecfa4f5240..8f15e6ac437cd20570797134424ce6f7197d8011 100644
--- a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h
+++ b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/claimTest.cc b/MAC/APL/MainCU/src/MACScheduler/claimTest.cc
index 03123f6e762f6bc5b497e61737f8d80f82e2459a..a95d6bf80560f1f8309ac1f60b39b529adda122b 100644
--- a/MAC/APL/MainCU/src/MACScheduler/claimTest.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/claimTest.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004-2012
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/claimTest.h b/MAC/APL/MainCU/src/MACScheduler/claimTest.h
index 1019fcf30ed599bf51c3967f84b950ed7191094f..9612497ca1f7a2fd73add1c9bc618e75f4fa7a94 100644
--- a/MAC/APL/MainCU/src/MACScheduler/claimTest.h
+++ b/MAC/APL/MainCU/src/MACScheduler/claimTest.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index a97a0e60791cf4371e3c7f361495f5378688dd7c..ac46c6ce423a37b285c7216194d532b9186d7474 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
index f795f23e6de670adc9dd49e2806ebd547b45e84f..79dd634ae6c1cd85caa43315580881f0a9ccf5b9 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
index 7c52a1dce68ffbf319b2daf6e4837b9f902396f3..03387b1c6a7ec10da54487ea2752ca2ae7c0e3b7 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/ACC.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/ACC.h
index 9f289c86e00a1f711ca9dc1365d75a8d79e7a610..582d193592fb57688011ad05bd50426b2a0702dd 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/ACC.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/ACC.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArray.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArray.h
index e259e1bb860c44428513f5432ec65e646cb8ad05..0b8e9f1cc0f34c0fe0e7e0194b4cbae0d2502a4c 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArray.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArray.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArrayData.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArrayData.h
index 0278f664b9c1a08ed71127341ac77c356bb9ef16..477c30c35902c25ade59cd6ea3b98ff34e056c34 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArrayData.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArrayData.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaGains.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaGains.h
index a9d97927fefd7377101bd44f106e64d7a431450c..57c362ee4191da984ef053e5e8e7c04f0f332a19 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaGains.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaGains.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/CalibrationInterface.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/CalibrationInterface.h
index ea8fc70e466e4f9a0030775b452ea464939e7818..a6f6751c5d5c193106f79df61216ec4aeb5e1cf4 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/CalibrationInterface.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/CalibrationInterface.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SharedResource.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SharedResource.h
index 9d861cf90265c4c247758a8ace456a7da758aa2f..5c37ac86fdf8b7b8cb380ec6782778858ba9d348 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SharedResource.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SharedResource.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SpectralWindow.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SpectralWindow.h
index 4cfc45d905f323cbd49201de2197efa4e51cd1a0..60a67912b498f76d624b5cf9a03e92c7299a3626 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SpectralWindow.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SpectralWindow.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SubArray.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SubArray.h
index 6b2c58682ad6a25ad794ea6efca15f540b3233c2..b50abb153ae5112921cf1ec0925a2b222244d97d 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SubArray.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SubArray.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/ACC.cc b/MAC/APL/PAC/CAL_Protocol/src/ACC.cc
index b1878ec02260c1eccfb10d460511e5fe404ecc2e..77fa5e41dc480d756cd41d30e223271a3ce3019b 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/ACC.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/ACC.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/AntennaArray.cc b/MAC/APL/PAC/CAL_Protocol/src/AntennaArray.cc
index 1b532f40519667507c0eeb2b5e63844547c962cf..ea93a1f74aef3a3f5d31477a2697f33d15882796 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/AntennaArray.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/AntennaArray.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/AntennaArrayData.cc b/MAC/APL/PAC/CAL_Protocol/src/AntennaArrayData.cc
index 03bdfd6985c3db3397b1874479bd227873af24cb..be0bb1135c2d1a4668b4f05b8d141ac2d55d7ce2 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/AntennaArrayData.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/AntennaArrayData.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc b/MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc
index 6f0f68c10b6df3a5580a751387a0b697c1700d74..14121b9b9d62f53354b4176c9964f58715ca762f 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc b/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
index 0777a7a3c31922334661f7fbb88e46acf778a569..2f88bea2d81c9edee2661b063d4296638b920118 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc b/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
index 467a5e775a04855176d34e26278eb11489ededa1..cd61d804920f8cd3caee20930f84d9b716967227 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/ACMProxy.cc b/MAC/APL/PAC/Cal_Server/src/ACMProxy.cc
index 8d92554e4c9606784868ca78db1c8487a8e573ea..429249da72e551b94cdb417a5690cc0a1a92f8aa 100644
--- a/MAC/APL/PAC/Cal_Server/src/ACMProxy.cc
+++ b/MAC/APL/PAC/Cal_Server/src/ACMProxy.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/ACMProxy.h b/MAC/APL/PAC/Cal_Server/src/ACMProxy.h
index 13043a08eeffe2d9a7424253b34f0ad86d613032..d6d9f560a72187aff27bc1182a072fa87927c027 100644
--- a/MAC/APL/PAC/Cal_Server/src/ACMProxy.h
+++ b/MAC/APL/PAC/Cal_Server/src/ACMProxy.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/BlitzMath.h b/MAC/APL/PAC/Cal_Server/src/BlitzMath.h
index 9d5d3fd6b43c3b71a3069e44fd540e5702317b43..b8c571f1ffb6bba44eb25239f864265ad92caba8 100644
--- a/MAC/APL/PAC/Cal_Server/src/BlitzMath.h
+++ b/MAC/APL/PAC/Cal_Server/src/BlitzMath.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc b/MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc
index a194d48bd428b94e2204c3786ee3f7d0f23ba16d..49f79f1e352740e4f47482e8cad5fa7296f77103 100644
--- a/MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc
+++ b/MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc
@@ -3,7 +3,7 @@
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalServer.cc b/MAC/APL/PAC/Cal_Server/src/CalServer.cc
index 6d5aabdfac8927f259aab65a9b8ae24102a81d58..ec286099ad471745eee397f16e17ba9502cca378 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalServer.cc
+++ b/MAC/APL/PAC/Cal_Server/src/CalServer.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2014
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -735,16 +735,55 @@ GCFEvent::TResult CalServer::handle_cal_start(GCFEvent& e, GCFPortInterface &por
//
// set the control register of the RCU's
+ // if in HBA mode turn on HBAs in groups to prevent resetting of boards
+ //
+
RSPSetrcuEvent setrcu;
+ bitset<MAX_RCUS> testmask;
+ Timestamp timeStamp;
+
+ // #define N_PWR_RCUS_PER_STEP 12
+ #define N_PWR_RCUS_PER_STEP 8
- setrcu.timestamp = Timestamp(0,0);
- setrcu.rcumask = start.subset & validmask;
- setrcu.settings().resize(1);
- setrcu.settings()(0) = start.rcumode()(0);
+ int nPwrRCUs = m_n_rcus / 2; // only the even rcus deliver power to the HBAs
+ int steps = nPwrRCUs / N_PWR_RCUS_PER_STEP; // 4 steps for NL stations, 8 steps for IS stations
+ int jump = m_n_rcus / N_PWR_RCUS_PER_STEP; // jump = 8 for NL stations and 16 for IS stations
- LOG_DEBUG(formatString("Sending RSP_SETRCU(%08X)", start.rcumode()(0).getRaw()));
- itsRSPDriver->send(setrcu);
- _enableRCUs(subarray, SCHEDULING_DELAY + 4);
+ if (steps == 0) { steps = 1; } // limit for test cabinet
+ if (jump < 2) { jump = 2; } // limit for test cabinet
+
+ // if LBA mode select all rcus in one step
+ if (start.rcumode()(0).getMode() <= 4) {
+ steps = 1;
+ jump = 2;
+ }
+ int delay(0);
+ for (int step = 0; step < steps; ++step) {
+ validmask.reset();
+ // select 12 even(X) rcus and 12 odd(Y) rcus
+ for (uint rcu = (step * 2); rcu < m_n_rcus; rcu += jump) {
+ validmask.set(rcu); // select X (HBA power supply)
+ validmask.set(rcu+1); // select Y
+ }
+
+ // if any rcus in this masker send command
+ testmask = start.subset & validmask;
+ if (testmask.any()) {
+ delay = SCHEDULING_DELAY + step;
+ timeStamp.setNow(delay);
+ setrcu.timestamp = timeStamp; // in steps of 1 second
+
+ //TODO: Step20.2: might have to send 2 settings e.g. when using all X-pols
+
+ setrcu.rcumask = start.subset & validmask;
+ setrcu.settings().resize(1);
+ setrcu.settings()(0) = start.rcumode()(0);
+
+ LOG_DEBUG(formatString("Sending RSP_SETRCU(%08X)", start.rcumode()(0).getRaw()));
+ itsRSPDriver->send(setrcu);
+ } // if in mask
+ } // for steps
+ _enableRCUs(subarray, delay + 4);
} // conflict?
}
}
diff --git a/MAC/APL/PAC/Cal_Server/src/CalServer.h b/MAC/APL/PAC/Cal_Server/src/CalServer.h
index 5687add1f605ffa0814a7e7c803aabd04f2bd037..80b6e3c5a6ee56eec19a9cdd33574c404a58ac55 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalServer.h
+++ b/MAC/APL/PAC/Cal_Server/src/CalServer.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc
index 4f4549c2856b9f22b6e474a208eed2211a73140b..e287554f560c774aaaea32ccd8c69273c59ab374 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc
+++ b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h
index eff68391e3f69925bb24b500ed1b2f145e50fe55..ad4ebfd137fa35e6111f591848a425ee0acbf49f 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h
+++ b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc
index 03c817a229e092702f54404b4dd221b4e4244fdb..bd6e5bc8630102feabc9235b9d746e387f9674ff 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc
+++ b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalibrationThread.h b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.h
index d51ef4dbae00885f3a8ca671d3ee692e840ebb6d..a8a163f70dd085cd258012310631ee6b086d6f5f 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalibrationThread.h
+++ b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/DipoleModel.cc b/MAC/APL/PAC/Cal_Server/src/DipoleModel.cc
index 11d36c2d19228f93886e7b30c1b0f4160010811a..cf14622287a9c89125ba0bce681e32b53c228a10 100644
--- a/MAC/APL/PAC/Cal_Server/src/DipoleModel.cc
+++ b/MAC/APL/PAC/Cal_Server/src/DipoleModel.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/DipoleModel.h b/MAC/APL/PAC/Cal_Server/src/DipoleModel.h
index e175a3a1e41f5b8d0529b754e0d88d7a1c3d20a2..70a83c798853878a2033fc1be6967decd2b21b09 100644
--- a/MAC/APL/PAC/Cal_Server/src/DipoleModel.h
+++ b/MAC/APL/PAC/Cal_Server/src/DipoleModel.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc
index 56bf579a104fee8ce4f58735fc4d6f748f649f99..52dee0f8477094be915778889c5439e1345289f2 100644
--- a/MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc
+++ b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/DipoleModelData.h b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.h
index 5efc5eed62fc76b57b9b439cc19af8095e5cb960..ee96e0a80b77635585bed4af4a457b330cbe3a5d 100644
--- a/MAC/APL/PAC/Cal_Server/src/DipoleModelData.h
+++ b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc
index 8fbb7748fb8121a0059aa5502d5b50bbbeb60ce8..bb9fc698002b9cd0de9f9959608425c96eac1c6d 100644
--- a/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc
+++ b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h
index e4823c01684a2de808aeda4ddfa833a974ab22f0..a70a96a80cd938cdb7c07746f7e28692ff60ea15 100644
--- a/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h
+++ b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/Source.cc b/MAC/APL/PAC/Cal_Server/src/Source.cc
index cfa442977ae8c17c3a25b71c27ad256321dcf8c7..579a41120d5924700a9b2ed97fa1c422dd11719a 100644
--- a/MAC/APL/PAC/Cal_Server/src/Source.cc
+++ b/MAC/APL/PAC/Cal_Server/src/Source.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/Source.h b/MAC/APL/PAC/Cal_Server/src/Source.h
index 4341aa73b3f3add5392a513bfe40c3e77cecdc56..3a5ebba152e2aa6a3756267ca22b43dfc1f24b9e 100644
--- a/MAC/APL/PAC/Cal_Server/src/Source.h
+++ b/MAC/APL/PAC/Cal_Server/src/Source.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SourceData.cc b/MAC/APL/PAC/Cal_Server/src/SourceData.cc
index 9f68e9f1ebd162ed895ea1c93aeaa0781c1f6e1f..86380acf38275fa2aa13fc16d6fb3347ab722d6d 100644
--- a/MAC/APL/PAC/Cal_Server/src/SourceData.cc
+++ b/MAC/APL/PAC/Cal_Server/src/SourceData.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SourceData.h b/MAC/APL/PAC/Cal_Server/src/SourceData.h
index 41a7ee222f8649c88fe33bea52ecc862b560e375..2d07e613e94208698874ac1a864d10cbdf526fb5 100644
--- a/MAC/APL/PAC/Cal_Server/src/SourceData.h
+++ b/MAC/APL/PAC/Cal_Server/src/SourceData.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc
index 612e25e7862aa43ba827b176aa3f2e36faa9d189..82c4f46092d7ed64180221bfbd5abeb8e4e1c017 100644
--- a/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc
+++ b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h
index 4b8deed121990f669dd666b0675573d92bcc4a79..015bf46e8b1ebb7fd5bcca64f4f0867aa43c596d 100644
--- a/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h
+++ b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SubArrays.cc b/MAC/APL/PAC/Cal_Server/src/SubArrays.cc
index d7a3c0a3859565a13b93e40a6265a5b5c8b5f0e4..ab63cf7014e4917038b7d4d9ce7ecf2d75e63797 100644
--- a/MAC/APL/PAC/Cal_Server/src/SubArrays.cc
+++ b/MAC/APL/PAC/Cal_Server/src/SubArrays.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SubArrays.h b/MAC/APL/PAC/Cal_Server/src/SubArrays.h
index 3a170c751d5b8d486cc5e7aa212d1614052276ab..8d39b88f693f55b173877e67e0f9ac9709ea2159 100644
--- a/MAC/APL/PAC/Cal_Server/src/SubArrays.h
+++ b/MAC/APL/PAC/Cal_Server/src/SubArrays.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/calinfo.cc b/MAC/APL/PAC/Cal_Server/src/calinfo.cc
index 0f01a7cdd5524cbdb3e6a06c8cb31af4ab1d5047..b4e785ab2e2c3521115f6754a6dbb67eb0f91d51 100644
--- a/MAC/APL/PAC/Cal_Server/src/calinfo.cc
+++ b/MAC/APL/PAC/Cal_Server/src/calinfo.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/calinfo.h b/MAC/APL/PAC/Cal_Server/src/calinfo.h
index df98b39b91c7e991be48fb8b2bc6642ca3765ecc..54b31d12e9f0ce1a97d01a5492f69c7e5edc1356 100644
--- a/MAC/APL/PAC/Cal_Server/src/calinfo.h
+++ b/MAC/APL/PAC/Cal_Server/src/calinfo.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/test/CalTest.cc b/MAC/APL/PAC/Cal_Server/test/CalTest.cc
index 1de780b710fb5732f1c36b2d3d4aa71bdb003e1b..bc35d558e71b458a83cdbe97896ec0ecd3a4ae49 100644
--- a/MAC/APL/PAC/Cal_Server/test/CalTest.cc
+++ b/MAC/APL/PAC/Cal_Server/test/CalTest.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/test/CalTest.h b/MAC/APL/PAC/Cal_Server/test/CalTest.h
index 1d3238d3ad62273a4bdb30fdc43b11b5b5336346..397501a613d30c36515e391270c2212d88856f72 100644
--- a/MAC/APL/PAC/Cal_Server/test/CalTest.h
+++ b/MAC/APL/PAC/Cal_Server/test/CalTest.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/CMakeLists.txt b/MAC/APL/PAC/IBS_Protocol/CMakeLists.txt
index e768a7a1adfbf4949dcd2b97db9fbb9e897f7e95..dac769a6880332f51b4502bc9126f2808f6829e7 100644
--- a/MAC/APL/PAC/IBS_Protocol/CMakeLists.txt
+++ b/MAC/APL/PAC/IBS_Protocol/CMakeLists.txt
@@ -2,7 +2,7 @@
#
# Copyright (C) 2008-2009
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Beamlet2SubbandMap.h b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Beamlet2SubbandMap.h
index c2a297cc518c623770aff8bf183007d23c5517f3..ca4e783a84ea97e2a059908afd89eaffa7650f6c 100644
--- a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Beamlet2SubbandMap.h
+++ b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Beamlet2SubbandMap.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/CMakeLists.txt b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/CMakeLists.txt
index 18d23edf43d72bdad8925ed2bc5e482b00c21fea..77f7d8512c60a330b55b2cc2660bf0e808361367 100644
--- a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/CMakeLists.txt
+++ b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/CMakeLists.txt
@@ -2,7 +2,7 @@
#
# Copyright (C) 2008-2009
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Pointing.h b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Pointing.h
index e27c51ddb64e9ee4b39b4b0989fc1f9710cb9a07..d474f2b3108eddb61417a5109094abd42c810727 100644
--- a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Pointing.h
+++ b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Pointing.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/src/Beamlet2SubbandMap.cc b/MAC/APL/PAC/IBS_Protocol/src/Beamlet2SubbandMap.cc
index 422106d49dbea966f8415ddf0ded0387d4c701c7..9bbcc73bd9b1e32f2a3d6e317b11be359cfe1d6a 100644
--- a/MAC/APL/PAC/IBS_Protocol/src/Beamlet2SubbandMap.cc
+++ b/MAC/APL/PAC/IBS_Protocol/src/Beamlet2SubbandMap.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/src/CMakeLists.txt b/MAC/APL/PAC/IBS_Protocol/src/CMakeLists.txt
index 7f8629e6659051edeb9df794ce296fb2479bd98d..a17490bd9e00e910032abb5970a1bd99c03e31fd 100644
--- a/MAC/APL/PAC/IBS_Protocol/src/CMakeLists.txt
+++ b/MAC/APL/PAC/IBS_Protocol/src/CMakeLists.txt
@@ -2,7 +2,7 @@
#
# Copyright (C) 2008-2009
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/src/Pointing.cc b/MAC/APL/PAC/IBS_Protocol/src/Pointing.cc
index 65867fc950b6e0c14d9586c44fc3a0343987be9d..a6010dbe7aea52a3ec83c6b786b0f3e4bb6427b1 100644
--- a/MAC/APL/PAC/IBS_Protocol/src/Pointing.cc
+++ b/MAC/APL/PAC/IBS_Protocol/src/Pointing.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h
index 5f549a779416230e19bdd7f0ae210595c1146b20..f8161c2c523647475efaaa89372864b9ce0d8ba7 100644
--- a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h
+++ b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h
index 8bb6d415e08d0eb54d679666d924ee898bdef160..682bd2209a974323893b1a39d4460ce6709653f3 100644
--- a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h
+++ b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h
index 6344e2cc60021421926e8768ed7153329a555735..fb9835031f113b0f5e91e5d37bd9968c90af624e 100644
--- a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h
+++ b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc b/MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc
index e9cd9b4c57d2be09497cf3d15490637e32c5d267..d9af4956b312f84e6bf37ddc78e26196a8d7a8fd 100644
--- a/MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc
+++ b/MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc b/MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc
index 7cd02da3704004894aec7981b7a186236d2ee56f..1ed72a1168243af4fdcc1b441989db02d92b507e 100644
--- a/MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc
+++ b/MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc b/MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc
index 0ba9d5e45ac570dfc19106380f3cccc948e77640..a41c8b675410ceed1d2208709389ae8470b9a7d9 100644
--- a/MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc
+++ b/MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
index 8701cc89fbccb7276ffba0b8cbdd72497838614e..cd78782f1e4e5a805171fc149fbe2659e2c4fe66 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h
index 441936e8e9516a12ce8294b730e3f26075962c69..f303a4388e86fd7bd556568dbf37583738bec66f 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.cc b/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.cc
index 240ccf0fc5120734d62508927d1189b07c26fce2..7407bc8648598b5b81ec3e1860b3c4d357c1105a 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.h b/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.h
index 456c2ede321f911b9072cfb84c4fd648a79e2beb..4e0e8974c860db46cc27de2051d9a470694c0cc3 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/Beam.cc b/MAC/APL/PAC/ITRFBeamServer/src/Beam.cc
index ed9e068e9e3c0c59d69928590a6d29f161d67e1b..1389c2ce7d5c4a28302724aad0f455384ad8d951 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/Beam.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/Beam.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/Beam.h b/MAC/APL/PAC/ITRFBeamServer/src/Beam.h
index a425e676e50cc20e3a24b0de8e5368390b965cec..0e825d3d0cd12a3800bcb0ef94b730896f605081 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/Beam.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/Beam.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
index d1e44400d51518140b73d3aa270ed56e6986da2f..bf65b2021e5009b12dfc97ac763b1f449e2f8f84 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h
index 589bedbcea0b861ff63f23bc2f180ec08d3631f5..07d08ab605288444b7721d06c278f880af9e103e 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServerConstants.h b/MAC/APL/PAC/ITRFBeamServer/src/BeamServerConstants.h
index 11ffbcb3c8ffcb599b1f2e2df44e7871d7bd3fbd..ddea924d2a272322d96104f79a315ad582d08676 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServerConstants.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServerConstants.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServerMain.cc b/MAC/APL/PAC/ITRFBeamServer/src/BeamServerMain.cc
index 00a98634007329dcf83ccfce4d7f862ff382e00a..97277917cd7a7bd1f7b5456039ff82124e5dc9de 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServerMain.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServerMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc
index e65040d7a874aa30b6a7c70351525030bb10829c..65badc0c0283ad066b1c79f11d7beed8191990e8 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h
index 0aba04f8cee0555c841222d79953fe515fb9352d..f4d1c5edf1547256cc13422f8a788e54fce9475e 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc
index 7f2147215a179781003d2c1bd628df6aaa106831..a71a278506b328cbb94ecffd3e69725dcbd609e9 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h
index d751a762db1b6e43afdac1a6b7c122e27bdfad93..2f273b8ca70c217be0cc7bf216c4d2e673392bcd 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc
index 1783817e5e69823e04f5080f6209d1889f0743fa..179e1c3f73859a5a5adbc42da668b25d3c99e881 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.h b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.h
index 279cd8a14b1379af396a561b904def4d4af32642..c0e8eb2d0eb208f7ad23356258572f6f13db5030 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tAnaBeamMgr.cc b/MAC/APL/PAC/ITRFBeamServer/test/tAnaBeamMgr.cc
index 313b9e4b58c794a45defa810a4b266978fb7517f..635a91319a4fa26d6113aff6dcb2c4eeb850d0a7 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tAnaBeamMgr.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tAnaBeamMgr.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc b/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc
index 4bad093387555ca8bdac65786a562af870d69f32..7cdbb48f5044ddeabeeeb08e396638ee2b6ba54f 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
index ec52d06ec823d612492cfdbac966faf247df134c..d6789cb3e93ef59a1cae472f17840cec9d5d3537 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tIdealStartTime.cc b/MAC/APL/PAC/ITRFBeamServer/test/tIdealStartTime.cc
index 2655317b51f6750fc72797e8c99da37d243ad560..4021d04f45bf9f55d4d899881895f2e216882c14 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tIdealStartTime.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tIdealStartTime.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc b/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc
index 744e25e4c89ae0557c22fc13442926e5c947772a..0691a6327c2f6dff74125bbd64d09457321b1144 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
index eb42983e75ecdc7556045eb742107dc9309aa93b..b5974bcebb7e31c8a81312cbc5bb21a3ce30fbd9 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc b/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc
index 0c3908c3fb59550da1325abee7fe77342b2165a5..0034865e51ac6a684a82d71c2733894bf5751951 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACC.cc b/MAC/APL/PAC/ITRFCalServer/src/ACC.cc
index 2a00285f8d340a0886adf1cf86ec0460303dc031..881aec5af361f2af94235e5a5fb2b851a868fd96 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACC.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACC.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACC.h b/MAC/APL/PAC/ITRFCalServer/src/ACC.h
index 2342605352f5758731f99cf7735e7136925688e4..ab356aa544f8d45fc7b8e247dfbc6cb335d6956c 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACC.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACC.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc b/MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc
index 948cbf1e507559cc55f27edcae9cef0de316dd6b..860454c5cc1952384b419a5c8dfe57911f11cd6f 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACCcache.h b/MAC/APL/PAC/ITRFCalServer/src/ACCcache.h
index 784f79a83265b40a6069780ca6264540a4e9b0d3..296d927cf7d75f1dd0a33340360a8e523bac1448 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACCcache.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACCcache.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc b/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc
index d0a876bb745ba347e33e5003068aab798eaea172..c7304a72b7b1f2ae2f5b69e2703e94417788fd3c 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h b/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h
index 243ba8021ce013cee482cc86806ebeb8b25a436c..6fcf5c6fac4900d64cde0c89f1d9b423fddc43f4 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalServer.cc b/MAC/APL/PAC/ITRFCalServer/src/CalServer.cc
index a3aa93871cd291f600bafcdd72d5903c8a249343..b8eabeeeaa8f96d75ca1bfa3fbd64443c91a303f 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalServer.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalServer.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalServer.h b/MAC/APL/PAC/ITRFCalServer/src/CalServer.h
index e20dd60e696d936d0e1fdd28fd64462f6b373962..b1a9a392384ad3e1d7f0676c94a943c1e99c9930 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalServer.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalServer.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalServerMain.cc b/MAC/APL/PAC/ITRFCalServer/src/CalServerMain.cc
index 75b569f39f3e73e357fd6320dcc66eea58e6bb30..60f8fd814f621e4644fe75c3cfed170ab3f9f794 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalServerMain.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalServerMain.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.cc b/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.cc
index 3df79d90fae9fa5c29d806f7bb9cda5833d2a086..7ae6f2c44aef7d2990b05d396ef900ea6c44081a 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.h b/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.h
index 28010e89728bd556499b8b9e35c3b39ed8a2d8a4..c128dceb71238acbe6d91b30c727bd8fcaccf443 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.cc b/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.cc
index 6339e24c3f57335d9a3aa73a087f5dbdc5094914..91b30ab28dc826f64abca23c6138475a5bc2c62d 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.h b/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.h
index 76d386f4ce0486e00cec19b15fa61bb9013ee5d1..08db7f113762109f1547bb7ee8594e6625297be2 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/RequestPool.cc b/MAC/APL/PAC/ITRFCalServer/src/RequestPool.cc
index 7a0928d6d36bd8211335ddf8d294d80faa2fcd52..6a1a369b2d9998193e22d1ac5babe021949476ef 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/RequestPool.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/RequestPool.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/RequestPool.h b/MAC/APL/PAC/ITRFCalServer/src/RequestPool.h
index 5345860bc3e0a6a0b34ef694f92a25f5a331ae08..8f1dd8f937f1cb3c742b810a843fcbcc159e0201 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/RequestPool.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/RequestPool.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/SharedResource.h b/MAC/APL/PAC/ITRFCalServer/src/SharedResource.h
index 103008aae7bbd560e4ebda8585c729dd7c4c2f9e..d79cf44aab19008c52ceb79843fbe18649c2bcee 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/SharedResource.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/SharedResource.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.cc b/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.cc
index 7cc2863173c7d983360e8334036e1d17f8dc6f29..e30ec7d4c17308466d956290056d1149f91c8aed 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.h b/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.h
index 4d5564ec1c0d3b50c4d0db5624895a7777aa6483..41ae534168b8adec246e455b8b2dd62f5375c14d 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/calinfo.cc b/MAC/APL/PAC/ITRFCalServer/src/calinfo.cc
index 6e1ea2451f0a2e980af36df647a80a2b8309c458..fdbf7907290507a8a4271c2cc439637d4d8cf798 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/calinfo.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/calinfo.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/calinfo.h b/MAC/APL/PAC/ITRFCalServer/src/calinfo.h
index c92f13a0e30119de393ff5cbc7d30193590264da..e156cc809857aabed415d8e3029859266fd3c5f7 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/calinfo.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/calinfo.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/CalTest.cc b/MAC/APL/PAC/ITRFCalServer/test/CalTest.cc
index 7c67abd7f55049d523001d080acf36cc36bbb9a8..117430c2f679b45f1e0cc9e4822a5bd2a1fa4812 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/CalTest.cc
+++ b/MAC/APL/PAC/ITRFCalServer/test/CalTest.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/CalTest.h b/MAC/APL/PAC/ITRFCalServer/test/CalTest.h
index 88d6973975e920ada8a589e51aa26b9de3c99386..817fb3084d82f1d3a625478e7d1d66d5d2da0d25 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/CalTest.h
+++ b/MAC/APL/PAC/ITRFCalServer/test/CalTest.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc b/MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc
index 949e44f2e232caea9377bd2b181a59ad1fb865d2..e3653d8d2a038b07ff5aa534bf5b4e7dc2c200c4 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc
+++ b/MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2009
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/tCalServer.h b/MAC/APL/PAC/ITRFCalServer/test/tCalServer.h
index ebf673324d6a208336ce25a1e2662fe9f4c3dda4..a16a0417c5fca69f9454ec556b09897d13280d6c 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/tCalServer.h
+++ b/MAC/APL/PAC/ITRFCalServer/test/tCalServer.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.cc b/MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.cc
index 3b9ec9ce5bd0e39646d9d2b2293c956c3864ef1d..a06fc153d4c77276ffe31ed838002c2b25e62ca6 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.cc
+++ b/MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc
index 5ffd9bd218cd248f74da6140cab982fa2c5d7e3f..51dcdf0943a829b25f7958ad6d877ea1202752d5 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h
index 88b8ebfe2463db324edaac9ff4449231995f6beb..4da31d8468aeca4645cb4ae16dae673020013eda 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc
index 9d6fa2cbb56ae20d33d992bd13a88c4f1f883f54..092f9f64e8927dd8ad11d5a7075346e1cc2f8371 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h
index fb0a1c3fcc23fbe128bf5a5968f053a2b0195e21..5e969c71528bd954834fa2b64839319f157a5496 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h
index 64fd343575e7382f465107e16f95524061de03a2..487afba4af7ae3a292ec2d39709cd64c8c6146eb 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc
index 2ad9ade02cdd7bfe9bf01f6ab6334d232f9bf8b6..f964a2fa885fce3a66b8d48fdf8d4636bd666d95 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h
index 11731b830e77e999aa91e47e13ec0400254e16d7..25a962524b76d878928df24caac6926d98f660cd 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
index 9ebfdd718c80fef45c773e5ab94c9c31bf14c259..3004cdc9fa483e9d91d2be1931e2610e9a63e72d 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc
index 42d9368beba4bbb2fe3aaeb13ea3ce21b3e7319d..406616ec3d8f4107a7b474d273752498f7c5e474 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h
index 357f2b337840fa796ee13fdcaf4607b23b13ab00..8af216930b006793f3f8846c26b06264b74a15f5 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc
index 8b8e2339c4397309c0fe69f0d8b3ec7d9c342b3c..cf33625872d2e749523c16cfcb0401ab0df7168f 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h
index ba9166605f7dbf2f4c3e7fb69a2fcf1adef3af05..99d143562c34e87bbae3c11f6cee2c6b78517646 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc
index 09f4e5308046798e49a8aefe24fa5ac8fc124541..427b81810abbd0cf0304c583fd8a48df6c8fb9a1 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h
index 0e33373f593788597a5f2d94c42287225d0a8864..bd9f1610bfc77ef66d9768448740da8ab0bd9540 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc
index d044dc6853af30586ee445440e40ee1f53ff3a24..2f380a91a6ec04a8df70299d3a52e68cf3d79584 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h
index c6ec991ed519bf1971bb168663f733d3282f4199..f3fbcea05609dca6b1d0817a05652055b1b04c69 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot b/MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot
index 604901a23fb4a6a012b89018f331faf1909226c5..878856f9c2731c9cd58bff8c23ee52714835403f 100644
--- a/MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot
+++ b/MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot
@@ -5,7 +5,7 @@
//
// Copyright (C) 2005
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff --git a/MAC/APL/PAC/SHMInfo_Server/test/mis.btsw b/MAC/APL/PAC/SHMInfo_Server/test/mis.btsw
index 96a68ea2ad403d9898694a8f2d5443fe4106e9e5..15759834c9655836b72214f1cd4e9f9f39fe33cb 100644
--- a/MAC/APL/PAC/SHMInfo_Server/test/mis.btsw
+++ b/MAC/APL/PAC/SHMInfo_Server/test/mis.btsw
@@ -3,7 +3,7 @@
//
// Copyright (C) 2005
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// ------------------------------------------------------------------------------
// Description:
diff --git a/MAC/APL/PIC/ETHTest/src/DataEvent.h b/MAC/APL/PIC/ETHTest/src/DataEvent.h
index cd9fe3468d76fb09997bfc6affcda8c25313b11b..bc28593ac881cdfad990b13828e798317f3aced9 100644
--- a/MAC/APL/PIC/ETHTest/src/DataEvent.h
+++ b/MAC/APL/PIC/ETHTest/src/DataEvent.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/ETH_realtime.cc b/MAC/APL/PIC/ETHTest/src/ETH_realtime.cc
index 2261b28b051a6e877eded199f594776fd582a5aa..24fc12c1b85e54b31b90ee0899bf119473469c03 100644
--- a/MAC/APL/PIC/ETHTest/src/ETH_realtime.cc
+++ b/MAC/APL/PIC/ETHTest/src/ETH_realtime.cc
@@ -4,7 +4,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/ETH_test.cc b/MAC/APL/PIC/ETHTest/src/ETH_test.cc
index 884c10c56052da77cd17f8616fecfb0a140016cb..2bbb57a7af758263763e8521e0b46034dbc717f8 100755
--- a/MAC/APL/PIC/ETHTest/src/ETH_test.cc
+++ b/MAC/APL/PIC/ETHTest/src/ETH_test.cc
@@ -5,7 +5,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/MEPData.cc b/MAC/APL/PIC/ETHTest/src/MEPData.cc
index 12925c304a9609bdb4686c916912b0d26634e9c9..09c16bb5f54dab68eb0d3325cc3a6b3db6901ac5 100644
--- a/MAC/APL/PIC/ETHTest/src/MEPData.cc
+++ b/MAC/APL/PIC/ETHTest/src/MEPData.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/MEPData.h b/MAC/APL/PIC/ETHTest/src/MEPData.h
index 3c5e48a637d48db2d31d787b6af01f2e54c02aee..c888974414271aefddba938234cf9af4752933c2 100644
--- a/MAC/APL/PIC/ETHTest/src/MEPData.h
+++ b/MAC/APL/PIC/ETHTest/src/MEPData.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/TCP_test.cc b/MAC/APL/PIC/ETHTest/src/TCP_test.cc
index 38123105676c6bc7e745e2e44ad746dc7c965eb8..a3cd62e3bbcb847799368d9a970b29874587fcbf 100755
--- a/MAC/APL/PIC/ETHTest/src/TCP_test.cc
+++ b/MAC/APL/PIC/ETHTest/src/TCP_test.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/UDP_test.cc b/MAC/APL/PIC/ETHTest/src/UDP_test.cc
index cfbce700257101b570a7f9432a352c3fe2f2a1b2..d9762986ffef14a7d014fb699c12a6a426d3c1a2 100755
--- a/MAC/APL/PIC/ETHTest/src/UDP_test.cc
+++ b/MAC/APL/PIC/ETHTest/src/UDP_test.cc
@@ -5,7 +5,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BMRead.cc b/MAC/APL/PIC/RSP_Driver/src/BMRead.cc
index 1f562604615018912a1782eb73b4486a1752f8c5..6fe90647eb80d4dd9bff5dedaf7be0d241b20bd1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BMRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BMRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BMRead.h b/MAC/APL/PIC/RSP_Driver/src/BMRead.h
index 959910abd3d8f978d3e2a94f4440e8377544738a..115b119eb6bd40e86da527c7339e4b8c06e9508b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BMRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BMRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BMWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BMWrite.cc
index e884df65895bbfd7128da452e81e87b63a18f7ad..cf5289f508d104ea8ee43a4817534fe201b45297 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BMWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BMWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BMWrite.h b/MAC/APL/PIC/RSP_Driver/src/BMWrite.h
index cff5d3910cef7851e097c2166d8a9f33086b4d76..cb36ba66ca82c5755faee7d6d8853a40dc805397 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BMWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BMWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BSWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BSWrite.cc
index 71b46943ca49f8d84e314b720bfa178ea4cdc813..233c5fb06405cc163cab070c0a7ea59a5d19472a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BSWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BSWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BSWrite.h b/MAC/APL/PIC/RSP_Driver/src/BSWrite.h
index cdc0547c8e06c667acfc4a7be07e0b35eabbaaa4..131aae2b47cf9b54349cbbd7b13bc986c385052a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BSWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BSWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BWRead.cc b/MAC/APL/PIC/RSP_Driver/src/BWRead.cc
index a8d2f4266f0c173f855be06f5279fd7bacb024b1..8fd1ee8530e2906f252b63faeb52897f03c75853 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BWRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BWRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BWRead.h b/MAC/APL/PIC/RSP_Driver/src/BWRead.h
index a72c381ade4cccc7b2334b5d6e4fc653dd40ae28..2d4a86d785c68e14d69ad5cfa3ae4036fec8f53a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BWRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BWRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BWWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BWWrite.cc
index d04fd573c35be36fe1badc8b1fab65e59aa4bf84..94d4b5086971aad32f910841a7329dbd8d2ec42b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BWWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BWWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BWWrite.h b/MAC/APL/PIC/RSP_Driver/src/BWWrite.h
index bc8a9c8dc723cda79103daecdb81df59fcc8addf..dd197d34b66b2983974204559109ca019bae259e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BWWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BWWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BstRead.cc b/MAC/APL/PIC/RSP_Driver/src/BstRead.cc
index fb466d261660773d988d2e21ee06f3b626075ee7..25ddf0c2790a2e4ef719623b3d4d5b35395e107e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BstRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BstRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BstRead.h b/MAC/APL/PIC/RSP_Driver/src/BstRead.h
index efbeb5d320e2754a86e84b343238c4fee4f7d442..8ef28ad8da0546d4a95e0c8edc396f63130cb313 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BstRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BstRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BypassRead.cc b/MAC/APL/PIC/RSP_Driver/src/BypassRead.cc
index 4d72cc9133576702486c5e2b50b206659937af4e..7883589946e390016254595b2855241187965fd3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BypassRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BypassRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BypassRead.h b/MAC/APL/PIC/RSP_Driver/src/BypassRead.h
index 3720fe6ed27ac6daa915450aba0e2a59452d6de6..4eb1c77e1ca2341f1abc2b701a35048d354e58a3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BypassRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BypassRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc
index 92504ac00071d825129a583f9651490e827c826d..67861b54ee164d3a76a6ed3cce57d4d79b262a54 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BypassWrite.h b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.h
index 9ee5f59607c8c319595b4497a95504d2220d0b23..9a37bda9560d9ae4a7260b87bd6269dfdf210865 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BypassWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc
index 8e5868f8032a6c04b702350ddcf3d1b23afc83e4..33b8e8c04a4a46cf9142bd9465807f3618162d9d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CDOWrite.h b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.h
index a00ad193b78f126f04a71a0842a17c334177d083..625d155a3ca91e04dc4579ebe19436e3ee266cf6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CDOWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.cc b/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.cc
index 76e7a0417ff1c30336e95d2105849fb2f67583ea..1a4f4d52d8653cc3c896d15c9b9bd05a86a5b533 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.h b/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.h
index 3947658127c931bb7c203292db2b6bf3f3d59500..3310a8a6f43d984c591e6cd80830009807935743 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc
index bd127ccf3247d2332632d0840a4a8a654ed16d78..b66c946501821634ac661bc03cd699abaa8262dc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h
index 9e04cb36eef4af529ec85a083a5ee29815b540a2..ba0da668399699505451a2e7a0bd50e7b0e78910 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h
+++ b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CableSettings.cc b/MAC/APL/PIC/RSP_Driver/src/CableSettings.cc
index 1c059fe80b7431f8daa21e491e8937e970a36e5a..b2e85b5b8104d768add20513b37af4727ce87253 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CableSettings.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/CableSettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CableSettings.h b/MAC/APL/PIC/RSP_Driver/src/CableSettings.h
index e3cd3266f9cf4c94fa107e0d15c2b52ea98e36e5..055cd2cf484d286c6dea40b9b7788520a1bba0b4 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CableSettings.h
+++ b/MAC/APL/PIC/RSP_Driver/src/CableSettings.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Cache.cc b/MAC/APL/PIC/RSP_Driver/src/Cache.cc
index 7b78afc6de0da972939f7638a4ad0b7ba7d57435..1de6158739ffd23edc61220cafca96157ba25523 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Cache.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/Cache.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -40,84 +40,6 @@ using namespace RSP;
using namespace RSP_Protocol;
using namespace RTC;
-// default settings
-// sdo_ss=295:330,331:366,367:402,403:438
-blitz::Array<uint16, 2> str2blitz(const char* str, int max)
-{
- string inputstring(str);
- char* start = (char*)inputstring.c_str();
- char* end = 0;
- bool range = false;
- long prevval = 0;
-
- blitz::Array<uint16, 2> ss(4,36); // ss = subband select
- int bank_nr = 0;
- int sb_nr = 0;
- long i;
-
- ss = 0;
- while (start) {
- long val = strtol(start, &end, 10); // read decimal numbers
- start = (end ? (*end ? end + 1 : 0) : 0); // advance
- if (val >= max || val < 0) {
- LOG_WARN(formatString("Error: value %ld out of range",val));
- ss = 0;
- return ss;
- }
- LOG_INFO_STR("val=" << val << " prevval=" << prevval);
- if (end) {
- switch (*end) {
- case ',':
- case 0: {
- if (range) {
- if (0 == prevval && 0 == val) {
- val = max - 1;
- }
- if (val < prevval) {
- LOG_WARN("Error: invalid range specification");
- ss = 0;
- return ss;
- }
-
- for (i = prevval; i <= val; i++) {
- //LOG_INFO(formatString("add value %ld to ss(%d,%d)", i, bank_nr, sb_nr));
- ss(bank_nr, sb_nr) = (uint16)i;
- sb_nr++;
- if (sb_nr >= 36) {
- bank_nr++;
- sb_nr = 0;
- }
- }
- }
- else {
- ss(bank_nr, sb_nr) = (uint16)val;
- sb_nr++;
- if (sb_nr >= 36) {
- bank_nr++;
- sb_nr = 0;
- }
- }
- range=false;
- } break;
-
- case ':': {
- range=true;
- } break;
-
- default: {
- LOG_WARN(formatString("Error: invalid character %c",*end));
- ss = 0;
- return ss;
- } break;
- } // switch
- } // if (end)
- prevval = val;
- } // while
-
- return (ss);
-}
-
-
/**
* Instance pointer for the Cache singleton class.
*/
@@ -167,30 +89,30 @@ CacheBuffer::CacheBuffer(Cache* cache) : m_cache(cache)
LOG_DEBUG_STR("itsSDOModeInfo.size() =" << itsSDOModeInfo().size() * sizeof(EPA_Protocol::RSRSDOMode));
LOG_DEBUG_STR("itsSDOSelection.size() =" << itsSDOSelection.subbands().size() * sizeof(uint16));
LOG_DEBUG_STR("itsSDOBitsPerSample.size() =" << sizeof(itsSDOBitsPerSample));
-
+
LOG_INFO_STR(formatString("CacheBuffer size = %d bytes",
- m_beamletweights().size()
- + m_subbandselection.crosslets().size()
- + m_subbandselection.beamlets().size()
- + m_rcusettings().size()
- + m_hbasettings().size()
- + m_hbareadings().size()
- + m_rsusettings().size()
- + m_wgsettings().size()
- + m_subbandstats().size()
- + m_beamletstats().size()
- + m_xcstats().size()
- + m_systemstatus.board().size()
- + m_versions.bp().size()
- + m_versions.ap().size()
- + m_tdstatus.board().size()
- + m_spustatus.subrack().size()
- + m_tbbsettings().size()
- + m_bypasssettings().size()
- + ETH_DATA_LEN + sizeof(uint16)
- + sizeof(itsSdsWriteBuffer)
- + sizeof(itsSdsReadBuffer)
- + itsLatencys().size()
+ m_beamletweights().size()
+ + m_subbandselection.crosslets().size()
+ + m_subbandselection.beamlets().size()
+ + m_rcusettings().size()
+ + m_hbasettings().size()
+ + m_hbareadings().size()
+ + m_rsusettings().size()
+ + m_wgsettings().size()
+ + m_subbandstats().size()
+ + m_beamletstats().size()
+ + m_xcstats().size()
+ + m_systemstatus.board().size()
+ + m_versions.bp().size()
+ + m_versions.ap().size()
+ + m_tdstatus.board().size()
+ + m_spustatus.subrack().size()
+ + m_tbbsettings().size()
+ + m_bypasssettings().size()
+ + ETH_DATA_LEN + sizeof(uint16)
+ + sizeof(itsSdsWriteBuffer)
+ + sizeof(itsSdsReadBuffer)
+ + itsLatencys().size()
+ itsSwappedXY.size()
+ itsBitModeInfo().size()
+ sizeof(itsBitsPerSample)
@@ -228,224 +150,204 @@ CacheBuffer::~CacheBuffer()
void CacheBuffer::reset(void)
{
- //
- // Initialize cache, allocating memory and setting default values
- //
- struct timeval tv;
- tv.tv_sec = 0; tv.tv_usec = 0;
- m_timestamp.set(tv);
+ //
+ // Initialize cache, allocating memory and setting default values
+ //
+ struct timeval tv;
+ tv.tv_sec = 0; tv.tv_usec = 0;
+ m_timestamp.set(tv);
itsBitsPerSample = MAX_BITS_PER_SAMPLE;
itsSDOBitsPerSample = MAX_BITS_PER_SAMPLE;
-
- m_beamletweights().resize( BeamletWeights::SINGLE_TIMESTEP,
- StationSettings::instance()->nrRcus(),
- MAX_NR_BM_BANKS,
- MEPHeader::N_BEAMLETS);
- m_beamletweights() = complex<int16>(25,36);
+
+ m_beamletweights().resize( BeamletWeights::SINGLE_TIMESTEP,
+ StationSettings::instance()->nrRcus(),
+ MAX_NR_BM_BANKS,
+ MEPHeader::N_BEAMLETS);
+ m_beamletweights() = complex<int16>(25,36);
// TODO remove this code!!!
- for (int rcu = 0 ; rcu < StationSettings::instance()->nrRcus(); rcu++) {
- int16 value=0;
- for (int bank = 0; bank < (MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE); bank++) {
- for (int beamlet = 0; beamlet < MEPHeader::N_BEAMLETS; beamlet++) {
- m_beamletweights()(0,rcu,bank,beamlet)=complex<int16>(value++,bank+10);
- }
- }
- }
+ for (int rcu = 0 ; rcu < StationSettings::instance()->nrRcus(); rcu++) {
+ int16 value=0;
+ for (int bank = 0; bank < (MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE); bank++) {
+ for (int beamlet = 0; beamlet < MEPHeader::N_BEAMLETS; beamlet++) {
+ m_beamletweights()(0,rcu,bank,beamlet)=complex<int16>(value++,bank+10);
+ }
+ }
+ }
//TODO
- m_subbandselection.crosslets().resize(StationSettings::instance()->nrRcus(),
- (MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE),
- MEPHeader::N_LOCAL_XLETS );
- m_subbandselection.crosslets() = 0;
+ m_subbandselection.crosslets().resize(StationSettings::instance()->nrRcus(),
+ (MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE),
+ MEPHeader::N_LOCAL_XLETS );
+ m_subbandselection.crosslets() = 0;
m_subbandselection.beamlets().resize(StationSettings::instance()->nrRcus(),
(MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE),
MEPHeader::N_BEAMLETS );
- m_subbandselection.beamlets() = 0;
-
- if (GET_CONFIG("RSPDriver.IDENTITY_WEIGHTS", i)) {
- // these weights ensure that the beamlet statistics
- // exactly match the subband statistics
- m_beamletweights() = complex<int16>(GET_CONFIG("RSPDriver.BF_GAIN", i), 0);
-
- //
- // Set default subband selection starting at RSPDriver.FIRST_SUBBAND
- //
- int firstSubband = GET_CONFIG("RSPDriver.FIRST_SUBBAND", i);
- for (int rcu = 0; rcu < m_subbandselection.beamlets().extent(firstDim); rcu++) {
- for (int bank = 0; bank < (MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE); bank++) {
- for (int lane = 0; lane < MEPHeader::N_SERDES_LANES; lane++) {
- int start(lane*(MEPHeader::N_BEAMLETS/MEPHeader::N_SERDES_LANES));
- int stop (start + maxBeamletsPerRSP(itsBitsPerSample));
- if (rcu==0) LOG_DEBUG_STR("start=" << start << ", stop=" << stop);
- for (int sb = start; sb < stop; sb++) {
- m_subbandselection.beamlets()(rcu, bank, sb) = (rcu%N_POL) + (sb*N_POL) + (firstSubband*2);
- } // for sb
- } // for lane
- } // for bank
- } // for rcu
- LOG_DEBUG_STR("m_subbandsel(0): " << m_subbandselection.beamlets()(0, Range::all(), Range::all()));
- } // if identity_weights
-
- // initialize RCU settings
- m_rcusettings().resize(StationSettings::instance()->nrRcus());
-
- RCUSettings::Control rcumode;
- rcumode.setMode(RCUSettings::Control::MODE_OFF);
- m_rcusettings() = rcumode;
-
- // initialize HBA settings
- m_hbasettings().resize(StationSettings::instance()->nrRcus(), N_HBA_ELEM_PER_TILE);
- m_hbasettings() = 0; // initialize to 0
- m_hbareadings().resize(StationSettings::instance()->nrRcus(), N_HBA_ELEM_PER_TILE);
- m_hbareadings() = 0; // initialize to 0
-
- // RSU settings
- m_rsusettings().resize(StationSettings::instance()->nrRspBoards());
- RSUSettings::ResetControl rsumode;
- rsumode.setRaw(RSUSettings::ResetControl::CTRL_OFF);
- m_rsusettings() = rsumode;
-
- m_wgsettings().resize(StationSettings::instance()->nrRcus());
- WGSettings::WGRegisterType init;
- init.freq = 0;
- init.phase = 0;
- init.ampl = 0;
- init.nof_samples = 0;
- init.mode = WGSettings::MODE_OFF;
- init.preset = WGSettings::PRESET_SINE;
- m_wgsettings() = init;
-
- m_wgsettings.waveforms().resize(StationSettings::instance()->nrRcus(), MEPHeader::N_WAVE_SAMPLES);
- m_wgsettings.waveforms() = 0;
-
- m_subbandstats().resize(StationSettings::instance()->nrRcus(), MEPHeader::N_SUBBANDS);
- m_subbandstats() = 0;
-
+ m_subbandselection.beamlets() = 0;
+
+ if (GET_CONFIG("RSPDriver.IDENTITY_WEIGHTS", i)) {
+ // these weights ensure that the beamlet statistics
+ // exactly match the subband statistics
+ m_beamletweights() = complex<int16>(GET_CONFIG("RSPDriver.BF_GAIN", i), 0);
+
+ //
+ // Set default subband selection starting at RSPDriver.FIRST_SUBBAND
+ //
+ int firstSubband = GET_CONFIG("RSPDriver.FIRST_SUBBAND", i);
+ for (int rcu = 0; rcu < m_subbandselection.beamlets().extent(firstDim); rcu++) {
+ for (int bank = 0; bank < (MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE); bank++) {
+ for (int lane = 0; lane < MEPHeader::N_SERDES_LANES; lane++) {
+ int start(lane*(MEPHeader::N_BEAMLETS/MEPHeader::N_SERDES_LANES));
+ int stop (start + maxBeamletsPerRSP(itsBitsPerSample));
+ if (rcu==0) LOG_DEBUG_STR("start=" << start << ", stop=" << stop);
+ for (int sb = start; sb < stop; sb++) {
+ m_subbandselection.beamlets()(rcu, bank, sb) = (rcu%N_POL) + (sb*N_POL) + (firstSubband*2);
+ } // for sb
+ } // for lane
+ } // for bank
+ } // for rcu
+ LOG_DEBUG_STR("m_subbandsel(0): " << m_subbandselection.beamlets()(0, Range::all(), Range::all()));
+ } // if identity_weights
+
+ // initialize RCU settings
+ m_rcusettings().resize(StationSettings::instance()->nrRcus());
+
+ RCUSettings::Control rcumode;
+ rcumode.setMode(RCUSettings::Control::MODE_OFF);
+ m_rcusettings() = rcumode;
+
+ // initialize HBA settings
+ m_hbasettings().resize(StationSettings::instance()->nrRcus(), N_HBA_ELEM_PER_TILE);
+ m_hbasettings() = 0; // initialize to 0
+ m_hbareadings().resize(StationSettings::instance()->nrRcus(), N_HBA_ELEM_PER_TILE);
+ m_hbareadings() = 0; // initialize to 0
+
+ // RSU settings
+ m_rsusettings().resize(StationSettings::instance()->nrRspBoards());
+ RSUSettings::ResetControl rsumode;
+ rsumode.setRaw(RSUSettings::ResetControl::CTRL_OFF);
+ m_rsusettings() = rsumode;
+
+ m_wgsettings().resize(StationSettings::instance()->nrRcus());
+ WGSettings::WGRegisterType init;
+ init.freq = 0;
+ init.phase = 0;
+ init.ampl = 0;
+ init.nof_samples = 0;
+ init.mode = WGSettings::MODE_OFF;
+ init.preset = WGSettings::PRESET_SINE;
+ m_wgsettings() = init;
+
+ m_wgsettings.waveforms().resize(StationSettings::instance()->nrRcus(), MEPHeader::N_WAVE_SAMPLES);
+ m_wgsettings.waveforms() = 0;
+
+ m_subbandstats().resize(StationSettings::instance()->nrRcus(), MEPHeader::N_SUBBANDS);
+ m_subbandstats() = 0;
+
// Number of cep streams -> in normal mode 4, in splitmode 8.
- int maxStreams = 8;
- m_beamletstats().resize((maxStreams/MEPHeader::N_SERDES_LANES) * N_POL,
- (MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE) * MEPHeader::N_BEAMLETS);
- m_beamletstats() = 0;
-
- m_xcstats().resize(N_POL, N_POL, StationSettings::instance()->nrBlps(), StationSettings::instance()->nrBlps());
- m_xcstats() = complex<double>(0,0);
-
- // BoardStatus
- m_systemstatus.board().resize(StationSettings::instance()->nrRspBoards());
- BoardStatus boardinit;
- memset(&boardinit, 0, sizeof(BoardStatus));
- m_systemstatus.board() = boardinit;
-
- EPA_Protocol::RSRVersion versioninit = { { 0 }, 0, 0 };
- m_versions.bp().resize(StationSettings::instance()->nrRspBoards());
- m_versions.bp() = versioninit;
- m_versions.ap().resize(StationSettings::instance()->nrBlps());
- m_versions.ap() = versioninit;
-
- // TDBoardStatus
- m_tdstatus.board().resize(StationSettings::instance()->nrRspBoards());
- TDBoardStatus tdstatusinit;
- memset(&tdstatusinit, 0, sizeof(TDBoardStatus));
- tdstatusinit.unknown = 1;
- m_tdstatus.board() = tdstatusinit;
-
- // SPUBoardStatus
- int nrSubRacks = StationSettings::instance()->maxRspBoards()/NR_RSPBOARDS_PER_SUBRACK;
- nrSubRacks += (StationSettings::instance()->maxRspBoards() % NR_RSPBOARDS_PER_SUBRACK == 0) ? 0 : 1;
- m_spustatus.subrack().resize(nrSubRacks);
- LOG_INFO_STR("Resizing SPU array to " << m_spustatus.subrack().size());
- SPUBoardStatus spustatusinit;
- memset(&spustatusinit, 0, sizeof(SPUBoardStatus));
- m_spustatus.subrack() = spustatusinit;
-
- // TBBSettings
- m_tbbsettings().resize(StationSettings::instance()->nrRcus());
- bitset<MEPHeader::N_SUBBANDS> bandsel;
- bandsel = 0;
- m_tbbsettings() = bandsel;
-
- // BypassSettings (BP and AP's)
- LOG_INFO_STR("Resizing bypass array to: " << StationSettings::instance()->nrBlps());
+ int maxStreams = 8;
+ m_beamletstats().resize((maxStreams/MEPHeader::N_SERDES_LANES) * N_POL,
+ (MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE) * MEPHeader::N_BEAMLETS);
+ m_beamletstats() = 0;
+
+ m_xcstats().resize(N_POL, N_POL, StationSettings::instance()->nrBlps(), StationSettings::instance()->nrBlps());
+ m_xcstats() = complex<double>(0,0);
+
+ // BoardStatus
+ m_systemstatus.board().resize(StationSettings::instance()->nrRspBoards());
+ BoardStatus boardinit;
+ memset(&boardinit, 0, sizeof(BoardStatus));
+ m_systemstatus.board() = boardinit;
+
+ EPA_Protocol::RSRVersion versioninit = { { 0 }, 0, 0 };
+ m_versions.bp().resize(StationSettings::instance()->nrRspBoards());
+ m_versions.bp() = versioninit;
+ m_versions.ap().resize(StationSettings::instance()->nrBlps());
+ m_versions.ap() = versioninit;
+
+ // TDBoardStatus
+ m_tdstatus.board().resize(StationSettings::instance()->nrRspBoards());
+ TDBoardStatus tdstatusinit;
+ memset(&tdstatusinit, 0, sizeof(TDBoardStatus));
+ tdstatusinit.unknown = 1;
+ m_tdstatus.board() = tdstatusinit;
+
+ // SPUBoardStatus
+ int nrSubRacks = StationSettings::instance()->maxRspBoards()/NR_RSPBOARDS_PER_SUBRACK;
+ nrSubRacks += (StationSettings::instance()->maxRspBoards() % NR_RSPBOARDS_PER_SUBRACK == 0) ? 0 : 1;
+ m_spustatus.subrack().resize(nrSubRacks);
+ LOG_INFO_STR("Resizing SPU array to " << m_spustatus.subrack().size());
+ SPUBoardStatus spustatusinit;
+ memset(&spustatusinit, 0, sizeof(SPUBoardStatus));
+ m_spustatus.subrack() = spustatusinit;
+
+ // TBBSettings
+ m_tbbsettings().resize(StationSettings::instance()->nrRcus());
+ bitset<MEPHeader::N_SUBBANDS> bandsel;
+ bandsel = 0;
+ m_tbbsettings() = bandsel;
+
+ // BypassSettings (BP and AP's)
+ LOG_INFO_STR("Resizing bypass array to: " << StationSettings::instance()->nrBlps());
m_bypasssettings().resize(StationSettings::instance()->nrBlps());
- BypassSettings::Control control;
- m_bypasssettings() = control;
- for (int blp_nr = 0; blp_nr < StationSettings::instance()->nrBlps(); blp_nr += 4) {
- m_bypasssettings()(blp_nr).setSDO(1);
- }
-
- // clear rawdatablock
- itsRawDataBlock.address = 0;
- itsRawDataBlock.offset = 0;
- itsRawDataBlock.dataLen = 0;
- memset(itsRawDataBlock.data, 0, RSP_RAW_BLOCK_SIZE);
-
- // clear SerdesBuffer
- itsSdsWriteBuffer.clear();
- for (int rsp = 0; rsp < MAX_N_RSPBOARDS; rsp++) {
- itsSdsReadBuffer[rsp].clear();
- }
-
- // clear I2C flag
- itsI2Cuser = NONE;
-
- // set Splitter not active
- itsSplitterActive = false;
- // set CEP port enabled
- itsCepEnabled0 = false;
- itsCepEnabled1 = false;
-
- // Latency status
- itsLatencys().resize(StationSettings::instance()->nrRspBoards());
- RADLatency radlatencyinit;
- memset(&radlatencyinit, 0, sizeof(RADLatency));
- itsLatencys() = radlatencyinit;
- itsSwappedXY.reset();
-
- // BitMode
- itsBitModeInfo().resize(StationSettings::instance()->nrRspBoards());
- RSRBeamMode bitmodeinfo;
- bitmodeinfo.bm_select = 0;
- bitmodeinfo.bm_max = 0;
- itsBitModeInfo() = bitmodeinfo;
-
- // SDO default Mode selection
- int sdo_mode = 0;
- int bits_per_sample = GET_CONFIG("RSPDriver.SDO_MODE", i);
- if (bits_per_sample == 8) { sdo_mode = 1; }
- else if (bits_per_sample == 5) { sdo_mode = 2; }
- else if (bits_per_sample == 4) { sdo_mode = 3; }
-
- itsSDOModeInfo().resize(StationSettings::instance()->nrRspBoards());
- RSRSDOMode sdomodeinfo;
- sdomodeinfo.bm_select = sdo_mode;
- sdomodeinfo.bm_max = 3;
- itsSDOModeInfo() = sdomodeinfo;
-
- // SDO default subband selection
+ BypassSettings::Control control;
+ m_bypasssettings() = control;
+
+ // clear rawdatablock
+ itsRawDataBlock.address = 0;
+ itsRawDataBlock.offset = 0;
+ itsRawDataBlock.dataLen = 0;
+ memset(itsRawDataBlock.data, 0, RSP_RAW_BLOCK_SIZE);
+
+ // clear SerdesBuffer
+ itsSdsWriteBuffer.clear();
+ for (int rsp = 0; rsp < MAX_N_RSPBOARDS; rsp++) {
+ itsSdsReadBuffer[rsp].clear();
+ }
+
+ // clear I2C flag
+ itsI2Cuser = NONE;
+
+ // set Splitter not active
+ itsSplitterActive = false;
+ // set CEP port enabled
+ itsCepEnabled0 = false;
+ itsCepEnabled1 = false;
+
+ // Latency status
+ itsLatencys().resize(StationSettings::instance()->nrRspBoards());
+ RADLatency radlatencyinit;
+ memset(&radlatencyinit, 0, sizeof(RADLatency));
+ itsLatencys() = radlatencyinit;
+ itsSwappedXY.reset();
+
+ // BitMode
+ itsBitModeInfo().resize(StationSettings::instance()->nrRspBoards());
+ RSRBeamMode bitmodeinfo;
+ bitmodeinfo.bm_select = 0;
+ bitmodeinfo.bm_max = 0;
+ itsBitModeInfo() = bitmodeinfo;
+
+ // SDOMode
+ itsSDOModeInfo().resize(StationSettings::instance()->nrRspBoards());
+ RSRSDOMode sdomodeinfo;
+ sdomodeinfo.bm_select = 0;
+ sdomodeinfo.bm_max = 0;
+ itsSDOModeInfo() = sdomodeinfo;
+
itsSDOSelection.subbands().resize(StationSettings::instance()->nrRcus(),
(MAX_BITS_PER_SAMPLE/MIN_BITS_PER_SAMPLE),
MEPHeader::N_SDO_SUBBANDS);
- char select_str[64];
- blitz::Array<uint16, 2> select(4,36);
- strncpy(select_str, GET_CONFIG_STRING("RSPDriver.SDO_SS"), 64);
- select = str2blitz(select_str, 512);
- for (int rcu = 0; rcu < StationSettings::instance()->nrRcus(); rcu++) {
- for (int bank = 0; bank < (MAX_BITS_PER_SAMPLE / MIN_BITS_PER_SAMPLE); bank++) {
- itsSDOSelection.subbands()(rcu, bank, Range::all()) = 0;
- for (int sb = 0; sb < 36; sb++) {
- itsSDOSelection.subbands()(rcu, bank, sb) = (select(bank, sb) * 2) + (rcu % 2);
- } // for each subband
- } // for each bank
- }
+ itsSDOSelection.subbands() = 0;
+ //TODO: itsSDOSelection() = 0;
}
-SerdesBuffer& CacheBuffer::getSdsReadBuffer(int rspBoardNr)
+SerdesBuffer& CacheBuffer::getSdsReadBuffer(int rspBoardNr)
{
- ASSERTSTR(rspBoardNr >= 0 && rspBoardNr < MAX_N_RSPBOARDS,
- "RSPboard index out of range in getting serdesReadBuffer: " << rspBoardNr);
- return (itsSdsReadBuffer[rspBoardNr]);
+ ASSERTSTR(rspBoardNr >= 0 && rspBoardNr < MAX_N_RSPBOARDS,
+ "RSPboard index out of range in getting serdesReadBuffer: " << rspBoardNr);
+ return (itsSdsReadBuffer[rspBoardNr]);
}
void CacheBuffer::setTimestamp(const RTC::Timestamp& timestamp)
@@ -458,71 +360,70 @@ void CacheBuffer::setTimestamp(const RTC::Timestamp& timestamp)
//
Cache& Cache::getInstance()
{
- if (!m_instance) {
- m_instance = new Cache;
- }
- return (*m_instance);
+ if (!m_instance) {
+ m_instance = new Cache;
+ }
+ return (*m_instance);
}
Cache::Cache() : m_front(0), m_back(0)
{
- // initialize preset waveforms
- WGSettings::initWaveformPresets();
+ // initialize preset waveforms
+ WGSettings::initWaveformPresets();
- m_front = new CacheBuffer(this); ASSERT(m_front);
- m_back = new CacheBuffer(this); ASSERT(m_back);
+ m_front = new CacheBuffer(this); ASSERT(m_front);
+ m_back = new CacheBuffer(this); ASSERT(m_back);
- getState().init(StationSettings::instance()->nrRspBoards(),
- StationSettings::instance()->nrBlps(),
- StationSettings::instance()->nrRcus());
+ getState().init(StationSettings::instance()->nrRspBoards(),
+ StationSettings::instance()->nrBlps(),
+ StationSettings::instance()->nrRcus());
- // start by writing the correct clock setting
- Sequencer::getInstance().startSequence(Sequencer::SEQ_STARTUP);
+ // start by writing the correct clock setting
+ Sequencer::getInstance().startSequence(Sequencer::SEQ_SETCLOCK);
}
Cache::~Cache()
{
- if (m_front) delete m_front;
- if (m_back) delete m_back;
+ if (m_front) delete m_front;
+ if (m_back) delete m_back;
}
void Cache::reset(void)
{
- m_front->reset();
- m_back->reset();
+ m_front->reset();
+ m_back->reset();
}
void Cache::swapBuffers()
{
- if (GET_CONFIG("RSPDriver.XC_FILL", i)) {
- // fill xcorr array by copying and taking complex conjugate of values mirrored in the diagonal
- Array<complex<double>, 4> xc(m_back->getXCStats()());
- firstIndex i; secondIndex j; thirdIndex k; fourthIndex l;
- xc = where(xc(i,j,k,l)==complex<double>(0,0), conj(xc(j,i,l,k)), xc(i,j,k,l));
- }
-
- CacheBuffer *tmp = m_front;
- m_front = m_back;
- m_back = tmp;
+ if (GET_CONFIG("RSPDriver.XC_FILL", i)) {
+ // fill xcorr array by copying and taking complex conjugate of values mirrored in the diagonal
+ Array<complex<double>, 4> xc(m_back->getXCStats()());
+ firstIndex i; secondIndex j; thirdIndex k; fourthIndex l;
+ xc = where(xc(i,j,k,l)==complex<double>(0,0), conj(xc(j,i,l,k)), xc(i,j,k,l));
+ }
+
+ CacheBuffer *tmp = m_front;
+ m_front = m_back;
+ m_back = tmp;
}
void Cache::resetI2Cuser()
{
- I2Cuser busUser = NONE;
- if ((m_front->getI2Cuser() == HBA) && (!m_allstate.hbaprotocol().isMatchAll(RegisterState::CHECK))) {
- busUser = HBA;
- }
- else if ((m_front->getI2Cuser() == RCU_W) && (!m_allstate.rcuprotocol().isMatchAll(RegisterState::CHECK))) {
- busUser = RCU_W;
- }
- else if ((m_front->getI2Cuser() == RCU_R) && (!m_allstate.rcuread().isMatchAll(RegisterState::CHECK))) {
- busUser = RCU_R;
- }
- m_front->setI2Cuser(busUser);
- m_back->setI2Cuser (busUser);
- LOG_INFO_STR("new I2Cuser = " << ((busUser == NONE) ? "NONE" :
- ((busUser == HBA) ? "HBA" :
- ((busUser == RCU_R) ? "RCU_R" : "RCU_W"))));
+ I2Cuser busUser = NONE;
+ if ((m_front->getI2Cuser() == HBA) && (!m_allstate.hbaprotocol().isMatchAll(RegisterState::CHECK))) {
+ busUser = HBA;
+ }
+ else if ((m_front->getI2Cuser() == RCU_W) && (!m_allstate.rcuprotocol().isMatchAll(RegisterState::CHECK))) {
+ busUser = RCU_W;
+ }
+ else if ((m_front->getI2Cuser() == RCU_R) && (!m_allstate.rcuread().isMatchAll(RegisterState::CHECK))) {
+ busUser = RCU_R;
+ }
+ m_front->setI2Cuser(busUser);
+ m_back->setI2Cuser (busUser);
+ LOG_INFO_STR("new I2Cuser = " << ((busUser == NONE) ? "NONE" :
+ ((busUser == HBA) ? "HBA" :
+ ((busUser == RCU_R) ? "RCU_R" : "RCU_W"))));
}
-
diff --git a/MAC/APL/PIC/RSP_Driver/src/Cache.h b/MAC/APL/PIC/RSP_Driver/src/Cache.h
index 4ae8050d0115ed3c85b88975164e03121830368f..041d1505b1f4a98289869221a4e9ded42c61bf19 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Cache.h
+++ b/MAC/APL/PIC/RSP_Driver/src/Cache.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -181,11 +181,11 @@ public:
static Cache& getInstance();
virtual ~Cache();
/*@}*/
-
+
// Reset cache front and back buffers.
void reset(void);
void resetI2Cuser(void);
-
+
// Swap the front and back buffers.
void swapBuffers();
@@ -199,7 +199,6 @@ public:
private:
// Direct construction not allowed.
Cache();
-
// Keep register update state.
AllRegisterState m_allstate; // communication status of all register
diff --git a/MAC/APL/PIC/RSP_Driver/src/Command.h b/MAC/APL/PIC/RSP_Driver/src/Command.h
index d0b8708a03dab7f622e258bd6b3888040ce616e3..5dcb83fd1626d3511a097eaba7ff8313bac86e71 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Command.h
+++ b/MAC/APL/PIC/RSP_Driver/src/Command.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.cc
index c44108c38e48bea795600e4acba3c81dcbc789f0..217efbe5577df492c5c19cba6b3dffd08fa00522 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.h
index 3f9c21e59095192eccc72e69e36ebaf35580be5e..7ff760f3c922b0dcb0cce589cdf99f1c22cfdef3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc
index 89c3df4e0f0d727a190e0486a8b2e293b5179314..f693cb4b088793cd141df092fba15363caef0201 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h
index b58829869e9f05372598f116439f89e24a2f14b3..5a5a72050f1d0b574169496927b0f7c82452c3cc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc
index 0ccfe6c66ca2bfcc06abfe928d8f157bde12cf1a..3f5ae77e477130535c64d6a5594f22c06e5d8c9f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h
index fbfc5a7e64563069fe50fe0fe8bc29acc7e07b54..77b8444b704c33badad79e3a760e86653a90e064 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.cc
index 265e61e41398df47c121065d9c85f896cb16f43b..e60463451973654d2b92d8548b2fec01e284bd51 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.h
index 71823b6dad61896bdb926e3a7f0e5b57c49a4aaa..828b407c3e034ccfb57ccba9e638044378a9f363 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc
index 3d1bfd68879be692c7cb0727bd7b1450b86d8b8f..76fad39bc33b76b0661b683df72fb0467fac5c51 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h
index 62ae49b9165fc2d515c107f9c0e3c3eb73e07682..3f25d335b273c09de0414cdda1212b9a9f2da844 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.cc
index 36c656f93ea3c75ce268f4f6bf06f5212e0cf6d4..95515a29a51ae137a2aeb1b28f155a985ee00e18 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.h
index e19d802999a7375a42d1379c531c9fe5a6d4a397..40fe4cb9c00b47e4e4713ec9bcc05868b1c8eacd 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc
index 4a837a4fd93322081729a4047e4a89623dbf9431..5e49ffc29be910ceea380d8c18fbedc774d3013d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h
index b2fe5de7072a0121acbf5aeb5db9951fa3adbd32..95fe84789a8544d37e57cca05ad6125fd994294d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc
index 3050841c8b6867179693325ff7a8e3d2f85e2246..a848d63f769ecf6dbfa3e3e130e05e95c2e907eb 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h
index 9cf4a40926c9a97a8f5a382a6e133e6626e5e47f..9a8b55ec6b3c5a1e93be48fc6b36eb931ed1fc5f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc
index 2241bde063abfaa56dd68089b0e1f6ec798ab301..0a9e075e1facaeb7377e6548719e76e3d374479c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h
index b9f264edaed0fab57f00fbb05d66236d4f7359a6..ca8e82de72492a55b5565e84fa6e2b50ce39558a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.cc
index dbf079624f973a34d703e069948d3bec123897c8..924041df194539bacfc9bd19f937719407c6f053 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.h
index 07932bd3711d47f87e5e800838a7fbbb7456834f..f192131716d70fda0acb1dcaea037a8ff749f101 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.cc
index e6b0c878186f7292061e842611f5c11b6f852129..b05d16177ea314ec0b099798b00abb6884c95f06 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.h
index 6e71ef990d9b16200c764b29a1e8ca0e0145a5ba..454897aebd0efe56e2c37534df480b9927271442 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc
index 67442a5dcf482c1588dd3feca191302a1df814af..51431c90263fb3149cf8a13c3e822458dba9b9e5 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h
index d2ec28759fe55eec7dacd0a693ab3eccab12130d..7622783fe7b5653df3499779e70b827291b66535 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc
index 5fd68a18b933486056153cdb0f7fe293eb41d285..a38993cfdaf6fc7415e7067657a49c58392d220a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h
index ced188c9ff593974d52a9844b6c44f2584ada418..712d77dddb8bfab42e617b958656811c41ae7204 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc
index 5ddf6079dd9268a2a3452e8b9984f49dd019c20c..444110e253ddfe1ff274b7d5bd6456b8b3adb79d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h
index 51361bc915da90b62c04f35fc8ae484a4e954985..17714ea1d6487da93ca42b07c34d569e101e4bb5 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc
index 72a6b0619c2a30b0501c2020191713fcc9281336..84473a9e279e96166fa037e168453a92e0274cd6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h
index ad658c8592611111eee82217e04bb4c133a703f5..40c928071a0535b19be47fde1211b6960cfb9e1c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc
index 7d9a87db63853cb3b0df6e7740090d078f336c00..d19e847042931db91f44a89f575db4daefa1e1ab 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h
index d8f248f2034b663d3e290c8f113b5bf233ffd9c1..3e3ff8e2545aa89e838a8fe77c31183609d9fe59 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.cc
index 351c76facbb8343b29f03655e7792d571972f560..6f5909983f8cdf26d2849cc8dd5bedbe77ae720b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.h
index a7a48a637cace12995de73d30eb3e4de39c1186c..9ac9965f0d61def7639addd56b0f881b828aa917 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc
index ceb2a3b9d64043551d26a674490cefbca4bb5953..5fa12389c63e467a208762ba4821e584dccc04d7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h
index 044c852a09c296f7c9551edc4d5033c74a855d6e..d29afba3dea322f0a8ad96d0f4ab30d96964b62d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc
index ade36e2996588b8895c17636cbe9589abb8d7255..ed81e9e501335ddd58bdbfac0819b4e831ae85ad 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h
index 6b449dd390690ef33929be02db40043e23ed3769..9942a0a688d3f3e3eeeafaac1855cf7fce9dac8e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc
index d408705b62fe4de49726a627289465afeeb311c3..f8218532e2f507b91aa49e2930bfd6616a1429f5 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h
index eb641ecddcd0aba80157908cf9382543fe9596d1..ed6be02742c8a17e1f5921d1e370e713877b252a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc
index e24ae3e29c6c01cbc18df665f6ddd84888a51b35..d1d134c901748a687177176d8511a6fa375c190d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h
index 7e5b2ae34b35ca20566d05f5c27c7785fe7d2ec9..7b0f868284d56bad86a45100cf21d84339b82766 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc
index aad83b39e09c466f71fb329671fb6fd8fcd0b1e4..1e51a31c8d7f73b94443946a06fd3d11080cebd5 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h
index 80bda156762b6684baf501513fe9cb72b0ef765b..845cac4b4ef16bcb1c11662268bce238e2101166 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc
index e9485468779c6a01a35cf4425815a146ed6b4066..ba13300a1ba0ddd4209dd91cdb26ebe918f8b3c6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h
index 5af44c4a7c99f1911a8b04e42c92d619da6c2515..cc8a62db70416253df280e61f943d96d0504c7d2 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc
index 55a1924eccfa639c8a84cb5e50c82aa4704c8e03..84da6e2eb548402355543e0642664def5585ebfa 100644
--- a/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h
index a0ac46cdaa17b7c58b6966629de0628a9298dc9b..32cf5f2e952ee745a5335c0c6471ddaac99d249a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc
index 9d2378319a4685ba3f3d3b71a1395030a1194b8b..9ed44cafa1f24090f0556099342a7a50ffe9b6c9 100644
--- a/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h
index 7405aced20d5740006e1ebb8f33672d53ec9b6cf..0187b556d68295d36660376fa5abfd546654b371 100644
--- a/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/LatencyRead.cc b/MAC/APL/PIC/RSP_Driver/src/LatencyRead.cc
index e6485a25592850d6764fd9de30edd41bd19fdf57..c24d4bf0d2744abf0d85f4673c6a9d94f9cbbd06 100644
--- a/MAC/APL/PIC/RSP_Driver/src/LatencyRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/LatencyRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/LatencyRead.h b/MAC/APL/PIC/RSP_Driver/src/LatencyRead.h
index 3fc526fb0b94a78acf03adf28e3b8819d2863e5f..dec4ce9d2e34b85792e1222a6394856d81ddfaec 100644
--- a/MAC/APL/PIC/RSP_Driver/src/LatencyRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/LatencyRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RADWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RADWrite.cc
index 203a5b08a4fd123ff2765e970aa91684f78183fd..8659b1de434674b29e02cfaf48f46ad6a218a5ab 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RADWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RADWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RADWrite.h b/MAC/APL/PIC/RSP_Driver/src/RADWrite.h
index fcca2fd981d2696c8516d37b9ea95112dc807aa3..4d0b321b05f51412f8541fb76e5a360cd6c381c0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RADWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RADWrite.h
@@ -5,7 +5,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUCables.cc b/MAC/APL/PIC/RSP_Driver/src/RCUCables.cc
index 3749e4548cfcbe48582cee588d2e974ccbf350cb..18344ea22a1d25ddcfa3223bb8a83981bb5de2fe 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUCables.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUCables.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUCables.h b/MAC/APL/PIC/RSP_Driver/src/RCUCables.h
index 909bfa5a4f59188efec3a991e2831c69d18e2538..48faeeb4c036adb3c83f5f131c7fabc38e7a436e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUCables.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUCables.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc
index fd4872e7a93ed70a13afdd20cc4ef506201341f4..3e3adffd2abc93d0bbb46c07f834e6af0759c910 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -45,47 +45,41 @@ namespace LOFAR {
const int RCUProtocolWrite::RESULT_WRITE_SIZE;
const int RCUProtocolWrite::RESULT_READ_SIZE;
- uint8 RCUProtocolWrite::i2c_protocol_write[] = {
- 0x12, // PROTOCOL_C_WAIT
- 0x00, // <<< replace with data, wait byte 0 >>>
- 0x00, // <<< replace with data, wait byte 1 >>>
- 0x00, // <<< replace with data, wait byte 2 >>>
- 0x00, // <<< replace with data, wait byte 3 >>>
- 0x0F, // PROTOCOL_C_SEND_BLOCK
- 0x01, // I2C address for RCU
- 0x03, // size
- 0xAA, // <<< replace with data >>>
- 0xAA, // <<< replace with data >>>
- 0xAA, // <<< replace with data >>>
- 0x10, // PROTOCOL_C_RECEIVE_BLOCK
- 0x01, // I2C adress for RCU
- 0x03, // requested size
- 0x13, // PROTOCOL_C_END
+ uint8 RCUProtocolWrite::i2c_protocol_write[] = {
+ 0x0F, // PROTOCOL_C_SEND_BLOCK
+ 0x01, // I2C address for RCU
+ 0x03, // size
+ 0xAA, // <<< replace with data >>>
+ 0xAA, // <<< replace with data >>>
+ 0xAA, // <<< replace with data >>>
+ 0x10, // PROTOCOL_C_RECEIVE_BLOCK
+ 0x01, // I2C adress for RCU
+ 0x03, // requested size
+ 0x13, // PROTOCOL_C_END
};
- uint8 RCUProtocolWrite::i2c_protocol_read[] = {
- 0x10, // PROTOCOL_C_RECEIVE_BLOCK
- 0x01, // I2C adress for RCU
- 0x03, // requested size
- 0x13, // PROTOCOL_C_END
+ uint8 RCUProtocolWrite::i2c_protocol_read[] = {
+ 0x10, // PROTOCOL_C_RECEIVE_BLOCK
+ 0x01, // I2C adress for RCU
+ 0x03, // requested size
+ 0x13, // PROTOCOL_C_END
};
- uint8 RCUProtocolWrite::i2c_result_write[] = {
- 0x00, // PROTOCOL_C_WAIT OK
- 0x00, // PROTOCOL_C_SEND_BLOCK OK
- 0xAA, // <<< replace with expected data >>>
- 0xAA, // <<< replace with expected data >>>
- 0xAA, // <<< replace with expected data >>>
- 0x00, // PROTOCOL_C_RECEIVE_BLOCK OK
- 0x00, // PROTOCOL_C_END OK
+ uint8 RCUProtocolWrite::i2c_result_write[] = {
+ 0x00, // PROTOCOL_C_SEND_BLOCK OK
+ 0xAA, // <<< replace with expected data >>>
+ 0xAA, // <<< replace with expected data >>>
+ 0xAA, // <<< replace with expected data >>>
+ 0x00, // PROTOCOL_C_RECEIVE_BLOCK OK
+ 0x00, // PROTOCOL_C_END OK
};
- uint8 RCUProtocolWrite::i2c_result_read[] = {
- 0xAA, // <<< replace with expected data >>>
- 0xAA, // <<< replace with expected data >>>
- 0xAA, // <<< replace with expected data >>>
- 0x00, // PROTOCOL_C_RECEIVE_BLOCK OK
- 0x00, // PROTOCOL_C_END OK
+ uint8 RCUProtocolWrite::i2c_result_read[] = {
+ 0xAA, // <<< replace with expected data >>>
+ 0xAA, // <<< replace with expected data >>>
+ 0xAA, // <<< replace with expected data >>>
+ 0x00, // PROTOCOL_C_RECEIVE_BLOCK OK
+ 0x00, // PROTOCOL_C_END OK
};
};
};
@@ -110,132 +104,119 @@ RCUProtocolWrite::~RCUProtocolWrite()
//
void RCUProtocolWrite::sendrequest()
{
- uint8 global_rcu = (getBoardId() * NR_RCUS_PER_RSPBOARD) + (getCurrentIndex() / N_WRITES);
- bool writeCmdRequested(true); // assume setting the rcumode
-
- // should we write the RCU?
- if (Cache::getInstance().getState().rcuprotocol().get(global_rcu) != RTC::RegisterState::WRITE) {
- Cache::getInstance().getState().rcuprotocol().unmodified(global_rcu);
- writeCmdRequested = false; // not setting the rcumode, maybe reading?
- }
-
- // should we read the RCU?
- if (Cache::getInstance().getState().rcuread().get(global_rcu) != RTC::RegisterState::WRITE) {
- Cache::getInstance().getState().rcuread().unmodified(global_rcu);
- if (!writeCmdRequested) { // both commands not needed, then we are finished.
- setContinue(true);
- return;
- }
- }
-
- // We need two writes per RCU, first we write a long i2c stream to the rcu. Second we clear the
- // result registers of the i2c.
- switch (getCurrentIndex() % N_WRITES) {
- case 0: {
- // set appropriate header
- MEPHeader::FieldsType hdr;
- if (0 == global_rcu % N_POL) {
- hdr = MEPHeader::RCU_PROTOCOLX_HDR;
- } else {
- hdr = MEPHeader::RCU_PROTOCOLY_HDR;
- }
-
- if (writeCmdRequested) {
- // reverse and copy control bytes into i2c_protocol_write
- RCUSettings::Control& rcucontrol = Cache::getInstance().getBack().getRCUSettings()()((global_rcu));
-
- // add waits while turning on hbas to reduce power peaks.
- // if RCU enable changed or rcumode changed
- // if rcumode > 0
- if (rcucontrol.isModeModified()) {
- // wait between two RCUs is set to maximum, so that an international station
- // running on 160MHz clock can finisch the job in 1 second.
- // in clock ticks, 1500000 = 7.5msec on 200MHz, 9.4msec on 160MHz
- uint32 wait = 660000 * global_rcu;
- LOG_INFO_STR(formatString("RCUProtocolWrite add wait rcu %d = %f sec", global_rcu, wait * (1./200e6)));
- memcpy(i2c_protocol_write+1, &wait, 4);
- }
-
- uint32 control = htonl(rcucontrol.getRaw());
- memcpy(i2c_protocol_write+8, &control, 3);
-
- EPARcuProtocolEvent rcuprotocol;
- rcuprotocol.hdr.set(hdr, 1 << (getCurrentIndex() / (N_POL * N_WRITES)), MEPHeader::WRITE, sizeof(i2c_protocol_write));
- rcuprotocol.protocol.setBuffer(i2c_protocol_write, sizeof(i2c_protocol_write));
-
- m_hdr = rcuprotocol.hdr; // remember header to match with ack
- getBoardPort().send(rcuprotocol);
- break;
- }
- // user wants to read the RCUs
- EPARcuProtocolEvent rcuprotocol;
- rcuprotocol.hdr.set(hdr, 1 << (getCurrentIndex() / (N_POL * N_WRITES)), MEPHeader::WRITE, sizeof(i2c_protocol_read));
- rcuprotocol.protocol.setBuffer(i2c_protocol_read, sizeof(i2c_protocol_read));
-
- m_hdr = rcuprotocol.hdr; // remember header to match with ack
- getBoardPort().send(rcuprotocol);
- }
- break;
-
- case 1: {
- EPAWriteEvent rcuresultwrite;
- // set appropriate header
- uint8 regid = 0;
- if (0 == (global_rcu % N_POL)) {
- regid = MEPHeader::RCU_RESULTX;
- } else {
- regid = MEPHeader::RCU_RESULTY;
- }
-
- int resultSize = writeCmdRequested ? RESULT_WRITE_SIZE : RESULT_READ_SIZE;
- rcuresultwrite.hdr.set(MEPHeader::WRITE, 1 << (getCurrentIndex() / (N_POL * N_WRITES)),
- MEPHeader::RCU, regid, resultSize, 0);
- uint8 clear[RESULT_WRITE_SIZE];
- memset(clear, 0xAA, RESULT_WRITE_SIZE); // clear result
- rcuresultwrite.payload.setBuffer(clear, resultSize);
-
- m_hdr = rcuresultwrite.hdr; // remember header to match with ack
- getBoardPort().send(rcuresultwrite);
- }
- break;
- }
+ uint8 global_rcu = (getBoardId() * NR_RCUS_PER_RSPBOARD) + (getCurrentIndex() / N_WRITES);
+ bool writeCmdRequested(true); // assume setting the rcumode
+
+ // should we write the RCU?
+ if (Cache::getInstance().getState().rcuprotocol().get(global_rcu) != RTC::RegisterState::WRITE) {
+ Cache::getInstance().getState().rcuprotocol().unmodified(global_rcu);
+ writeCmdRequested = false; // not setting the rcumode, maybe reading?
+ }
+
+ // should we read the RCU?
+ if (Cache::getInstance().getState().rcuread().get(global_rcu) != RTC::RegisterState::WRITE) {
+ Cache::getInstance().getState().rcuread().unmodified(global_rcu);
+ if (!writeCmdRequested) { // both commands not needed, then we are finished.
+ setContinue(true);
+ return;
+ }
+ }
+
+ // We need two writes per RCU, first we write a long i2c stream to the rcu. Second we clear the
+ // result registers of the i2c.
+ switch (getCurrentIndex() % N_WRITES) {
+ case 0: {
+ // set appropriate header
+ MEPHeader::FieldsType hdr;
+ if (0 == global_rcu % N_POL) {
+ hdr = MEPHeader::RCU_PROTOCOLX_HDR;
+ } else {
+ hdr = MEPHeader::RCU_PROTOCOLY_HDR;
+ }
+
+ if (writeCmdRequested) {
+ // reverse and copy control bytes into i2c_protocol_write
+ RCUSettings::Control& rcucontrol = Cache::getInstance().getBack().getRCUSettings()()((global_rcu));
+ uint32 control = htonl(rcucontrol.getRaw());
+ memcpy(i2c_protocol_write+3, &control, 3);
+
+ EPARcuProtocolEvent rcuprotocol;
+ rcuprotocol.hdr.set(hdr, 1 << (getCurrentIndex() / (N_POL * N_WRITES)), MEPHeader::WRITE, sizeof(i2c_protocol_write));
+ rcuprotocol.protocol.setBuffer(i2c_protocol_write, sizeof(i2c_protocol_write));
+
+ m_hdr = rcuprotocol.hdr; // remember header to match with ack
+ getBoardPort().send(rcuprotocol);
+ break;
+ }
+ // user wants to read the RCUs
+ EPARcuProtocolEvent rcuprotocol;
+ rcuprotocol.hdr.set(hdr, 1 << (getCurrentIndex() / (N_POL * N_WRITES)), MEPHeader::WRITE, sizeof(i2c_protocol_read));
+ rcuprotocol.protocol.setBuffer(i2c_protocol_read, sizeof(i2c_protocol_read));
+
+ m_hdr = rcuprotocol.hdr; // remember header to match with ack
+ getBoardPort().send(rcuprotocol);
+ }
+ break;
+
+ case 1: {
+ EPAWriteEvent rcuresultwrite;
+ // set appropriate header
+ uint8 regid = 0;
+ if (0 == (global_rcu % N_POL)) {
+ regid = MEPHeader::RCU_RESULTX;
+ } else {
+ regid = MEPHeader::RCU_RESULTY;
+ }
+
+ int resultSize = writeCmdRequested ? RESULT_WRITE_SIZE : RESULT_READ_SIZE;
+ rcuresultwrite.hdr.set(MEPHeader::WRITE, 1 << (getCurrentIndex() / (N_POL * N_WRITES)),
+ MEPHeader::RCU, regid, resultSize, 0);
+ uint8 clear[RESULT_WRITE_SIZE];
+ memset(clear, 0xAA, RESULT_WRITE_SIZE); // clear result
+ rcuresultwrite.payload.setBuffer(clear, resultSize);
+
+ m_hdr = rcuresultwrite.hdr; // remember header to match with ack
+ getBoardPort().send(rcuresultwrite);
+ }
+ break;
+ }
}
void RCUProtocolWrite::sendrequest_status()
{
- // intentionally left empty
+ // intentionally left empty
}
GCFEvent::TResult RCUProtocolWrite::handleack(GCFEvent& event, GCFPortInterface& /*port*/)
{
- if (EPA_WRITEACK != event.signal) {
- LOG_WARN("RCUProtocolWrite::handleack:: unexpected ack");
- return GCFEvent::NOT_HANDLED;
- }
-
- uint8 global_rcu = (getBoardId() * NR_RCUS_PER_RSPBOARD) + (getCurrentIndex() / N_WRITES);
-
- EPAWriteackEvent ack(event);
- if (!ack.hdr.isValidAck(m_hdr)) {
- LOG_ERROR("RCUProtocolWrite::handleack: invalid ack");
- if (m_hdr.m_fields.payload_length == RESULT_WRITE_SIZE) {
- Cache::getInstance().getState().rcuprotocol().write_error(global_rcu);
- }
- else {
- Cache::getInstance().getState().rcuread().write_error(global_rcu);
- }
- return GCFEvent::NOT_HANDLED;
- }
-
- if ((getCurrentIndex() % N_WRITES) == 1) {
- // Mark modification as applied when write of RCU result register has completed
- if (m_hdr.m_fields.payload_length == RESULT_WRITE_SIZE) {
- Cache::getInstance().getState().rcuprotocol().schedule_wait1read(global_rcu);
- }
- else {
- Cache::getInstance().getState().rcuread().schedule_wait1read(global_rcu);
- }
- }
-
- return GCFEvent::HANDLED;
+ if (EPA_WRITEACK != event.signal) {
+ LOG_WARN("RCUProtocolWrite::handleack:: unexpected ack");
+ return GCFEvent::NOT_HANDLED;
+ }
+
+ uint8 global_rcu = (getBoardId() * NR_RCUS_PER_RSPBOARD) + (getCurrentIndex() / N_WRITES);
+
+ EPAWriteackEvent ack(event);
+ if (!ack.hdr.isValidAck(m_hdr)) {
+ LOG_ERROR("RCUProtocolWrite::handleack: invalid ack");
+ if (m_hdr.m_fields.payload_length == RESULT_WRITE_SIZE) {
+ Cache::getInstance().getState().rcuprotocol().write_error(global_rcu);
+ }
+ else {
+ Cache::getInstance().getState().rcuread().write_error(global_rcu);
+ }
+ return GCFEvent::NOT_HANDLED;
+ }
+
+ if ((getCurrentIndex() % N_WRITES) == 1) {
+ // Mark modification as applied when write of RCU result register has completed
+ if (m_hdr.m_fields.payload_length == RESULT_WRITE_SIZE) {
+ Cache::getInstance().getState().rcuprotocol().schedule_wait1read(global_rcu);
+ }
+ else {
+ Cache::getInstance().getState().rcuread().schedule_wait1read(global_rcu);
+ }
+ }
+
+ return GCFEvent::HANDLED;
}
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h
index fb795a49a0c0772e04223257ff36126a0940eaad..55ea313cce93d1518e04e54731fefe29bda86cc0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -35,41 +35,41 @@ namespace LOFAR {
class RCUProtocolWrite : public SyncAction
{
public:
- // Constructors for a RCUProtocolWrite object.
- RCUProtocolWrite(GCFPortInterface& board_port, int board_id);
+ // Constructors for a RCUProtocolWrite object.
+ RCUProtocolWrite(GCFPortInterface& board_port, int board_id);
- // Destructor for RCUProtocolWrite.
- virtual ~RCUProtocolWrite();
+ // Destructor for RCUProtocolWrite.
+ virtual ~RCUProtocolWrite();
- // Send the write message.
- virtual void sendrequest();
+ // Send the write message.
+ virtual void sendrequest();
- // Send the read request.
- virtual void sendrequest_status();
+ // Send the read request.
+ virtual void sendrequest_status();
- // Handle the read result.
- virtual GCFEvent::TResult handleack(GCFEvent& event, GCFPortInterface& port);
+ // Handle the read result.
+ virtual GCFEvent::TResult handleack(GCFEvent& event, GCFPortInterface& port);
private:
- EPA_Protocol::MEPHeader m_hdr;
+ EPA_Protocol::MEPHeader m_hdr;
- friend class RCUResultRead;
+ friend class RCUResultRead;
- static const int PROTOCOL_WRITE_SIZE = 15;
- static const int PROTOCOL_READ_SIZE = 4;
- static const int RESULT_WRITE_SIZE = 7;
- static const int RESULT_READ_SIZE = 5;
+ static const int PROTOCOL_WRITE_SIZE = 10;
+ static const int PROTOCOL_READ_SIZE = 4;
+ static const int RESULT_WRITE_SIZE = 6;
+ static const int RESULT_READ_SIZE = 5;
- // construct i2c sequence
- static uint8 i2c_protocol_write[PROTOCOL_WRITE_SIZE];
- static uint8 i2c_protocol_read [PROTOCOL_READ_SIZE];
+ // construct i2c sequence
+ static uint8 i2c_protocol_write[PROTOCOL_WRITE_SIZE];
+ static uint8 i2c_protocol_read [PROTOCOL_READ_SIZE];
- // construct expected i2c result
- static uint8 i2c_result_write[RESULT_WRITE_SIZE];
- static uint8 i2c_result_read [RESULT_READ_SIZE];
+ // construct expected i2c result
+ static uint8 i2c_result_write[RESULT_WRITE_SIZE];
+ static uint8 i2c_result_read [RESULT_READ_SIZE];
};
}; // namespace RSP
}; // namespace LOFAR
-
+
#endif /* RCUPROTOCOLWRITE_H_ */
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCURead.cc b/MAC/APL/PIC/RSP_Driver/src/RCURead.cc
index e9b9675e9b8d06e83d929898a3967013738ddf2c..6fbaf0cbb2edb03413933139dcc3bcdba3287e08 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCURead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCURead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCURead.h b/MAC/APL/PIC/RSP_Driver/src/RCURead.h
index 70af48ecb4c41496afe1756baa21ed6a42ef3dfa..94d0d0fbbe247c7e4d01a83305f104d0187c58c0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCURead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCURead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc
index 74ad5184ed494f256856c9e489706ab43d29b98d..cc9a8e7282fcf96044f416ef754baaaf65dc9c9b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h
index 52ed9ebf25f7eefcd294a5bc49fd3dfc1a277e16..dc9b794b22aaa34936673464071b106410f2c7c3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc
index fb41304a74e8bec6778bebcfad80b56aa4bd05ac..6686207044e7a506372fdaa1732dc472481b7361 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -71,7 +71,7 @@ void RCUWrite::sendrequest()
rcusettings.hdr.set(MEPHeader::RCU_SETTINGS_HDR, 1 << getCurrentIndex()); // also sets payload_length
rcusettings.ap = EPA_Protocol::RCUHandler();
rcusettings.ap.input_delay_x = x.getDelay();
- rcusettings.ap.enable_x = x.getEnable();
+ rcusettings.ap.enable_x = y.getEnable();
rcusettings.ap.input_delay_y = y.getDelay();
rcusettings.ap.enable_y = y.getEnable();
@@ -91,7 +91,7 @@ GCFEvent::TResult RCUWrite::handleack(GCFEvent& event, GCFPortInterface& /*port*
LOG_WARN("RCUWrite::handleack:: unexpected ack");
return GCFEvent::NOT_HANDLED;
}
-
+
EPAWriteackEvent ack(event);
uint8 global_blp = (getBoardId() * NR_BLPS_PER_RSPBOARD) + getCurrentIndex();
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUWrite.h b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.h
index d208746e2290e2264f8370fc378f341dd9acce60..20e71ef972cd4f2ba0219abf30db3ff64d054059 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
index 0787b2c3b018296ae5fc1762097c072b1331549d..0a4a349882807150222a9012330cfb3d37f2deff 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.h b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.h
index 73d6d51f4230ae3d78f5159be041f811edb3536f..2b28635f364a49a993f5d4faf4076e065368becb 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc
index 248363d5884000f468202a8b209b74bf081b1ecf..0591cc7562abbc6b14755fe06f73b04313b4132d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RSUWrite.h b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.h
index fafc3e9bcb53ab3ae0d7fbfdd371b28c2b9f41f9..da1e5676ae8dde314a82fa5853bca82e1b0a5566 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RSUWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc
index da78e5c24b638e768fa885af34b7d1942418c4f8..171cf51478c6f518e6a4ec979122806b9aa033a5 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h
index 57e4d632f6440ddecf18be42dfe3ac6f1aeeb836..6fcfa4f6e983b166504502d6a8c0f788bad4c019 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc
index 6de5bcf1926bc718c0ad208a2eb8fc0ab55cb197..143930fb7401bb9cbd8a69ad10fa28d6231b930e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h
index 7df842637bec17d106dc50b85b96ac750936f131..fbadcdafb9b5c50ee2bfaef9865215c63d92ee3e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawEvent.cc b/MAC/APL/PIC/RSP_Driver/src/RawEvent.cc
index d7f02f3654d8512e1c151989bd10f8d98d5cf391..c68bf1ab898662197705e63ca01668dea6972f0d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawEvent.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RawEvent.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawEvent.h b/MAC/APL/PIC/RSP_Driver/src/RawEvent.h
index 4a4af8755c0492e7166d70be7cd118a7c430cf0b..d77b7f76bcb81a04d19eb05607e09a208340ecde 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawEvent.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RawEvent.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc
index 577bd92244141b9d30881b82ab4eb98e8abc0c13..4e85bc7f6b25ac913af531f72c67f9b2516dc174 100644
--- a/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h
index be4cbd505a47b9f1b1ceca84c2ed81b165fee776..084cd8638475f4d729d03b5adb9aa64e0dcf4c6d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/ReadReg.cc b/MAC/APL/PIC/RSP_Driver/src/ReadReg.cc
index f006dbc41a4370dfb5f892ec90c7f3d0ddb5fb40..9c20b7357b66e09034c597b5f5d162b4bb433d3a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/ReadReg.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/ReadReg.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/ReadReg.h b/MAC/APL/PIC/RSP_Driver/src/ReadReg.h
index 815837fa654aaf4b1907bc34c89d0ca3dda93ec5..08f96593336deec3736b80bf072e8890d54919d7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/ReadReg.h
+++ b/MAC/APL/PIC/RSP_Driver/src/ReadReg.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RefCount.h b/MAC/APL/PIC/RSP_Driver/src/RefCount.h
index 182245f2fcc0c620f80374231f8544b558c669a1..0c2820a28c1c6960821d17487b48e1a57fafa0e6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RefCount.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RefCount.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.cc b/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.cc
index aff37a868c44e3f1fd994f0e41ef2a458ccd49f2..1846c09ed98c3cbc214e466ed25e258041ef82b1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.h b/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.h
index ff6d44cc623db77bc5cbb931c1166aabcfa63a59..dd8657560fada55fceba11277f683ab57c15d588 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.cc
index cd40aa4856d7a621e0e7f86eaef5ab07a0c86cc6..2400342b2e905f67c6ba3366cc2f1b144fa75ee4 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ SDOModeWrite::SDOModeWrite(GCFPortInterface& board_port, int board_id)
: SyncAction(board_port, board_id, 1)
{
memset(&itsHdr, 0, sizeof(MEPHeader));
- //doAtInit();
+ doAtInit();
}
SDOModeWrite::~SDOModeWrite()
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.h b/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.h
index 74947269237e0f550de39d4675ac1b06121513fb..494171b6752f8a87c7a1cf3b9c6654cf88a8951c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDORead.cc b/MAC/APL/PIC/RSP_Driver/src/SDORead.cc
index fda0c7e3d0a58d8df6fc75522c5038ae76434bd1..a8913c3bfb3d139629667a98d89ad45a8536d142 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDORead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SDORead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDORead.h b/MAC/APL/PIC/RSP_Driver/src/SDORead.h
index 36738fd0a3e47a81b683eb7d53761bbea38e83dc..99ffb350d8040185c07f1d3dbe576f226dcba34c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDORead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SDORead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SDOWrite.cc
index 019391353b25f5da77acda33fb26704f29989045..c1048fd5ee1a61130fe11cda305fd07f56239596 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ SDOWrite::SDOWrite(GCFPortInterface& board_port, int board_id)
{
memset(&m_hdr, 0, sizeof(MEPHeader));
- //doAtInit();
+ doAtInit();
}
SDOWrite::~SDOWrite()
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOWrite.h b/MAC/APL/PIC/RSP_Driver/src/SDOWrite.h
index c54ce060002a341c9bfeb6d5a1a0bb8be0f6a1fe..6f23b201891aed3f9160e86b7300f60a05417ee7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SSRead.cc b/MAC/APL/PIC/RSP_Driver/src/SSRead.cc
index 5ec208b33f03da165639ca7cb6e18c317e85dc91..5b34bee87c0e8ae2a05bef58dc327e093ce53eeb 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SSRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SSRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SSRead.h b/MAC/APL/PIC/RSP_Driver/src/SSRead.h
index e7f86498942e32c407c63a42e8af0f344b58a195..a0e7ed4e6d7a6b27112e7b9afdfb3337eed74dd6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SSRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SSRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SSWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SSWrite.cc
index c209e4867748643a20bbeeebdd5f3770bb84558e..b6d2638f301515e32f7f65b677d2d818f5db3822 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SSWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SSWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SSWrite.h b/MAC/APL/PIC/RSP_Driver/src/SSWrite.h
index 4d14c3b14d730cf97ac13d539992124cc5b99364..2e93972d6a6223e09a621762cf03085c6841d01a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SSWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SSWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Scheduler.cc b/MAC/APL/PIC/RSP_Driver/src/Scheduler.cc
index bfbf09d3e69c8d7b953bd6ee763220a86a27682c..d7d47622f41ba37126281b6a86169067bb67b43f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Scheduler.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/Scheduler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Scheduler.h b/MAC/APL/PIC/RSP_Driver/src/Scheduler.h
index 7035f13812abbf9161cb186fbf79eabc972b3019..23d0291ee4c055c45b222ce933c3fdbb670f837c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Scheduler.h
+++ b/MAC/APL/PIC/RSP_Driver/src/Scheduler.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Sequencer.cc b/MAC/APL/PIC/RSP_Driver/src/Sequencer.cc
index ce0802a20f554916df8ecf3948b947c1eec8ad88..228c5d6a1271a2aecd2f62c166ffa45858fca21a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Sequencer.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/Sequencer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -32,76 +32,56 @@
using namespace blitz;
namespace LOFAR {
- using namespace GCF::TM;
- using namespace EPA_Protocol;
- using namespace RTC;
- namespace RSP {
+ using namespace GCF::TM;
+ using namespace EPA_Protocol;
+ using namespace RTC;
+ namespace RSP {
-#define STARTUP_WAIT 10
-#define TDWRITE_WAIT 1
#define TDREAD_TIMEOUT 3
#define RSUCLEAR_WAIT 5
#define WRITE_TIMEOUT 3
-#define WRITE_ALL_TIMEOUT 5
-
/*
* Implements the following sequences:
- * from idle state:
- * - SEQ_STARTUP, on driver startup, starts on sequence disableClock
- * - SEQ_SETCLOCK, on clock change, starts on sequence writeClock
- * - SEQ_RSPCLEAR, on request, starts on sequence RSUclear
*
- * idle_state <-------------------------------------------.
- * | | | |
- * | | '-> disableClock_state <----------------------. | STARTUP_WAIT
- * | | readDisabledClock_state --> readError ----' |
- * | | writePLL_state <--------------------------. | WRITE_TIMEOUT
- * | | readPLL_state ---------> readError ------' | TDREAD_TIMEOUT
- * | | |
- * | '----> writeClock_state <------------------------. | STARTUP_WAIT
- * | readClock_state --------> readError ------' | TDREAD_TIMEOUT
- * | .------- ok <----------' |
- * | | |
- * '--|----> RSUclear_state <--------------------------. | RSUCLEAR_WAIT
- * | | |
- * x----> RCUdisable_state -----> writeError -------x | WRITE_TIMEOUT
- * | .----- ok <-----------' '--> ok & finalState---|--'
- * | | |
- * | '--> setAll_state ---------> writeError -------x WRITE_TIMEOUT
- * | - Blocksync |
- * | - RADwrite |
- * | - PPSsync |
- * | - CDOenable |
- * | - SDObitmode |
- * | - SDOselect |
- * | - SDOenable |
- * | RCUenable_state ------> writeError -------' WRITE_TIMEOUT
- * | '-----> finalState=True --.
- * | |
- * '------------------------------------------------'
+ * idle_state <------------------------------------\
+ * || |
+ * |\-> RSUpreclear_state | RSUCLEAR_WAIT
+ * | clearClock_state <--------------------\ |
+ * | writeClock_state <----------------\ | |
+ * | readClock_state --> readError --/ | | TDREAD_TIMEOUT
+ * /-|--->RCUdisable_state --> writeError -----/ | WRITE_TIMEOUT
+ * | | | (ok) --> ok & finalState -----/
+ * | | v
+ * | \--> RSUclear_state <-------------------\ RSUCLEAR_WAIT
+ * | setBlocksync_state --> writeError --->+ WRITE_TIMEOUT
+ * | RADwrite_state --> writeError --->+ WRITE_TIMEOUT
+ * | PPSsync_state --> writeError --->+ WRITE_TIMEOUT
+ * | RCUenable_state --> writeError --->+ WRITE_TIMEOUT
+ * | CDOenable_state --> writeError ----/ WRITE_TIMEOUT
+ * | --> finalState=True --\
+ * \<----------------------------------------------/
+ *
*/
-
/**
* Instance pointer for the Cache singleton class.
*/
Sequencer* Sequencer::m_instance = 0;
-Sequencer::Sequencer() :
- GCFFsm ((State)&Sequencer::idle_state),
- itsIdle (true),
- itsCurSeq (SEQ_NONE),
- itsClockRequest (0),
- itsFinalState(false)
+Sequencer::Sequencer() :
+ GCFFsm ((State)&Sequencer::idle_state),
+ itsIdle (true),
+ itsCurSeq (SEQ_NONE),
+ itsFinalState(false)
{ }
Sequencer& Sequencer::getInstance()
{
- if (!m_instance) {
- m_instance = new Sequencer;
- }
- return *m_instance;
+ if (!m_instance) {
+ m_instance = new Sequencer;
+ }
+ return *m_instance;
}
Sequencer::~Sequencer()
@@ -109,572 +89,711 @@ Sequencer::~Sequencer()
void Sequencer::run(GCFEvent& event, GCFPortInterface& port)
{
- this->doEvent(event, port);
+ this->doEvent(event, port);
}
bool Sequencer::isActive() const
{
- return (!itsIdle);
+ return (!itsIdle);
}
GCFEvent::TResult Sequencer::idle_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- switch (event.signal) {
- case F_INIT:
- break;
-
- case F_ENTRY: {
- LOG_INFO("Entering Sequencer::idle_state");
- itsIdle = true;
- }
- break;
-
- case F_TIMER: {
- if (GET_CONFIG("RSPDriver.DISABLE_INIT", i) == 0) {
- if (itsCurSeq == SEQ_STARTUP) {
- LOG_DEBUG(">> Start sequencer *startup*");
- TRAN(Sequencer::disableClock_state);
- }
- else if (itsCurSeq == SEQ_SETCLOCK) {
- LOG_DEBUG(">> Start sequencer *setclock*");
- Cache::getInstance().reset();
- TRAN(Sequencer::clearClock_state);
- }
- else if (itsCurSeq == SEQ_RSPCLEAR) {
- LOG_DEBUG(">> Start sequencer *rspclear*");
- TRAN(Sequencer::RSUclear_state);
- }
- }
- }
- break;
-
- case F_EXIT: {
- LOG_DEBUG("Leaving Sequencer::idle_state");
- itsIdle = false;
- itsFinalState = false;
- }
- break;
-
- default:
- break;
- }
-
- return (GCFEvent::HANDLED);
+ switch (event.signal) {
+ case F_INIT:
+ break;
+
+ case F_ENTRY: {
+ LOG_INFO("Entering Sequencer::idle_state");
+ itsIdle = true;
+ }
+ break;
+
+ case F_TIMER: {
+ if (GET_CONFIG("RSPDriver.DISABLE_INIT", i) == 0) {
+ if (itsCurSeq == SEQ_SETCLOCK) {
+ Cache::getInstance().reset();
+ TRAN(Sequencer::RSUpreclear_state);
+ } else if (itsCurSeq == SEQ_RSPCLEAR) {
+ TRAN(Sequencer::RSUclear_state);
+ }
+ }
+ }
+ break;
+
+ case F_EXIT: {
+ LOG_DEBUG("Leaving Sequencer::idle_state");
+ itsIdle = false;
+ itsFinalState = false;
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
}
//
-// disableClock_state(event, port)
-//
-// Before programming the PLL on the TDS boards disable clock outputs.
-// The RSPBoards will reload the fpga firmware running on internal 125MHz clock.
-// This prevents blocking RSPBoards while programming the PLL.
+// RSUpreclear_state(event, port)
//
-GCFEvent::TResult Sequencer::disableClock_state(GCFEvent& event, GCFPortInterface& /*port*/)
+GCFEvent::TResult Sequencer::RSUpreclear_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- switch (event.signal) {
- case F_ENTRY: {
- LOG_INFO("Entering Sequencer::disableClock_state");
-
- // save clock, for later use
- itsClockRequest = Cache::getInstance().getBack().getClock();
-
- // set clock to internal board clock (125MHz)
- Cache::getInstance().getBack().getClock() = 125;
- Cache::getInstance().getFront().getClock() = 125;
-
- Cache::getInstance().getState().tdwrite().reset();
- Cache::getInstance().getState().tdwrite().write();
- itsTimer = 0;
- break;
- }
-
- case F_TIMER:
- if (itsTimer++ > STARTUP_WAIT && Cache::getInstance().getState().tdwrite().isMatchAll(RegisterState::IDLE)) {
- TRAN(Sequencer::readDisabledClock_state);
- }
- break;
-
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::disableClock_state");
- break;
+ switch (event.signal) {
+ case F_ENTRY: {
+ LOG_INFO("Entering Sequencer::RSUpreclear_state");
+
+ // Change the register to set the clear flag
+ RSUSettings::ResetControl rsumode;
+ rsumode.setClear(true);
+ for (int rsp = 0; rsp < StationSettings::instance()->nrRspBoards(); rsp++) {
+ Cache::getInstance().getBack().getRSUSettings()()(rsp) = rsumode;
+ }
+
+ // signal that the register has changed
+ Cache::getInstance().getState().rsuclear().reset();
+ Cache::getInstance().getState().rsuclear().write();
+ itsTimer = 0;
+ break;
+ }
+
+ case F_TIMER:
+ if (itsTimer++ > RSUCLEAR_WAIT && Cache::getInstance().getState().rsuclear().isMatchAll(RegisterState::IDLE)) {
+ TRAN(Sequencer::clearClock_state);
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::RSUpreclear_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
+}
- default:
- break;
- }
+//
+// clearClock_state(event, port)
+//
+GCFEvent::TResult Sequencer::clearClock_state(GCFEvent& event, GCFPortInterface& /*port*/)
+{
+ switch (event.signal) {
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::clearClock_state");
+ Cache::getInstance().getState().tdclear().reset();
+ Cache::getInstance().getState().tdclear().write();
+ break;
+
+ case F_TIMER:
+ if (Cache::getInstance().getState().tdclear().isMatchAll(RegisterState::IDLE)) {
+ TRAN(Sequencer::writeClock_state);
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::clearClock_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
+}
- return (GCFEvent::HANDLED);
+//
+// writeClock_state(event, port)
+//
+GCFEvent::TResult Sequencer::writeClock_state(GCFEvent& event, GCFPortInterface& /*port*/)
+{
+ switch (event.signal) {
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::writeClock_state");
+ Cache::getInstance().getState().tdwrite().reset();
+ Cache::getInstance().getState().tdwrite().write();
+ break;
+
+ case F_TIMER:
+ if (Cache::getInstance().getState().tdwrite().isMatchAll(RegisterState::IDLE)) {
+ TRAN(Sequencer::readClock_state);
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::writeClock_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
}
//
// readClock_state(event, port)
//
-// read back clock, to check if firmware is really running on 125MHz.
-//
-GCFEvent::TResult Sequencer::readDisabledClock_state(GCFEvent& event, GCFPortInterface& /*port*/)
+GCFEvent::TResult Sequencer::readClock_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- switch (event.signal) {
- case F_ENTRY:
- LOG_INFO("Entering Sequencer::readDisabledClock_state");
- Cache::getInstance().getState().tdread().reset();
- Cache::getInstance().getState().tdread().read();
- itsTimer = 0;
- break;
-
- case F_TIMER:
- if (Cache::getInstance().getState().tdread().getMatchCount(RegisterState::READ_ERROR) > 0) {
- if (itsTimer++ > TDREAD_TIMEOUT) {
- LOG_WARN("Failed to verify setting of clock. Retrying...");
- TRAN(Sequencer::disableClock_state);
- } else {
- // read again
- Cache::getInstance().getState().tdread().reset();
- Cache::getInstance().getState().tdread().read();
- }
- }
- else if (Cache::getInstance().getState().tdread().isMatchAll(RegisterState::IDLE)) {
- LOG_DEBUG_STR(formatString("disabled clock freq = %d MHz", Cache::getInstance().getBack().getClock()));
- if (Cache::getInstance().getBack().getClock() == 125) {
- TRAN(Sequencer::writePLL_state);
- }
- else {
- TRAN(Sequencer::disableClock_state);
- }
- }
- break;
-
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::readDisabledClock_state");
- break;
-
- default:
- break;
- }
-
- return (GCFEvent::HANDLED);
+ switch (event.signal) {
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::readClock_state");
+ Cache::getInstance().getState().tdread().reset();
+ Cache::getInstance().getState().tdread().read();
+ itsTimer = 0;
+ break;
+
+ case F_TIMER:
+ if (Cache::getInstance().getState().tdread().getMatchCount(RegisterState::READ_ERROR) > 0) {
+ if (itsTimer++ > TDREAD_TIMEOUT) {
+ LOG_WARN("Failed to verify setting of clock. Retrying...");
+ TRAN(Sequencer::writeClock_state);
+ } else {
+ // read again
+ Cache::getInstance().getState().tdread().reset();
+ Cache::getInstance().getState().tdread().read();
+ }
+ } else if (Cache::getInstance().getState().tdread().isMatchAll(RegisterState::IDLE)) {
+ TRAN(Sequencer::RCUdisable_state);
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::readClock_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
}
-
//
-// writePLL_state(event, port)
-//
-// write start sequence to PLL on TDS board this is needed only once, on Driver start.
-// PLL is programmed if clock is set to 0
-//
-GCFEvent::TResult Sequencer::writePLL_state(GCFEvent& event, GCFPortInterface& /*port*/)
+// RCUdisable_state(event, port)
+//
+GCFEvent::TResult Sequencer::RCUdisable_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- switch (event.signal) {
- case F_ENTRY: {
- LOG_INFO("Entering Sequencer::writePLL_state");
-
- // setting clock to 0, will result in programming the PLL
- Cache::getInstance().getBack().getClock() = 0;
- Cache::getInstance().getFront().getClock() = 0;
-
- // signal that the register has changed
- Cache::getInstance().getState().tdwrite().reset();
- Cache::getInstance().getState().tdwrite().write();
- itsTimer = 0;
- break;
- }
-
- case F_TIMER:
- if (itsTimer++ > TDWRITE_WAIT && Cache::getInstance().getState().tdwrite().isMatchAll(RegisterState::IDLE)) {
- TRAN(Sequencer::readPLL_state);
- }
- break;
-
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::writePLL_state");
- break;
-
- default:
- break;
- }
-
- return (GCFEvent::HANDLED);
+ switch (event.signal) {
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::RCUdisable_state");
+ enableRCUs(false);
+ itsTimer = 0;
+ break;
+
+ case F_TIMER:
+ if (itsTimer++ > WRITE_TIMEOUT &&
+ Cache::getInstance().getState().rcusettings().getMatchCount(RegisterState::WRITE) > 0) {
+ LOG_WARN("Failed to disable receivers. Retrying...");
+ itsFinalState = false;
+ TRAN(Sequencer::clearClock_state);
+ } else if (Cache::getInstance().getState().rcusettings().isMatchAll(RegisterState::IDLE)) {
+ if (itsFinalState) {
+ stopSequence();
+ TRAN(Sequencer::idle_state);
+ }
+ else {
+ TRAN(Sequencer::RSUclear_state);
+ }
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::RCUdisable_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
}
//
-// readPLL_state(event, port)
-//
-// check programming result, if no errors, set clock back to default freq (from RSPDriver.conf)
+// RSUclear(event, port)
//
-GCFEvent::TResult Sequencer::readPLL_state(GCFEvent& event, GCFPortInterface& /*port*/)
+GCFEvent::TResult Sequencer::RSUclear_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- switch (event.signal) {
- case F_ENTRY: {
- LOG_INFO("Entering Sequencer::readPLL_state");
-
- //TODO:
-
- // signal that the register has changed
- Cache::getInstance().getState().tdread().reset();
- Cache::getInstance().getState().tdread().read();
- itsTimer = 0;
- break;
- }
-
- case F_TIMER:
- if (Cache::getInstance().getState().tdread().getMatchCount(RegisterState::READ_ERROR) > 0) {
- if (itsTimer++ > TDREAD_TIMEOUT) {
- LOG_WARN("Failed to verify setting of pll. Retrying...");
- TRAN(Sequencer::writePLL_state);
- } else {
- // read again
- Cache::getInstance().getState().tdread().reset();
- Cache::getInstance().getState().tdread().read();
- }
- }
- else if (Cache::getInstance().getState().tdread().isMatchAll(RegisterState::IDLE)) {
- // set back default clock frequency
- Cache::getInstance().getBack().getClock() = itsClockRequest;
- Cache::getInstance().getFront().getClock() = itsClockRequest;
- TRAN(Sequencer::writeClock_state);
- }
- break;
-
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::readPLL_state");
- break;
-
- default:
- break;
- }
-
- return (GCFEvent::HANDLED);
+ switch (event.signal) {
+ case F_ENTRY: {
+ LOG_INFO("Entering Sequencer::RSUclear_state");
+
+ // Change the register to set the clear flag
+ RSUSettings::ResetControl rsumode;
+ rsumode.setClear(true);
+ for (int rsp = 0; rsp < StationSettings::instance()->nrRspBoards(); rsp++) {
+ Cache::getInstance().getBack().getRSUSettings()()(rsp) = rsumode;
+ }
+
+ // signal that the register has changed
+ Cache::getInstance().getState().rsuclear().reset();
+ Cache::getInstance().getState().rsuclear().write();
+
+ itsTimer = 0;
+ break;
+ }
+
+ case F_TIMER:
+ if (itsTimer++ > RSUCLEAR_WAIT && Cache::getInstance().getState().rsuclear().isMatchAll(RegisterState::IDLE)) {
+ TRAN(Sequencer::setBlocksync_state);
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::RSUclear_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
}
-
//
-// clearClock_state(event, port)
+// setBlocksync_state(event, port)
//
-GCFEvent::TResult Sequencer::clearClock_state(GCFEvent& event, GCFPortInterface& /*port*/)
+GCFEvent::TResult Sequencer::setBlocksync_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- switch (event.signal) {
- case F_ENTRY:
- LOG_INFO("Entering Sequencer::clearClock_state");
- Cache::getInstance().getState().tdclear().reset();
- Cache::getInstance().getState().tdclear().write();
- break;
-
- case F_TIMER:
- if (Cache::getInstance().getState().tdclear().isMatchAll(RegisterState::IDLE)) {
- TRAN(Sequencer::writeClock_state);
- }
- break;
-
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::clearClock_state");
- break;
-
- default:
- break;
- }
-
- return (GCFEvent::HANDLED);
+ switch (event.signal) {
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::setBlocksync_state");
+ Cache::getInstance().getState().bs().reset();
+ Cache::getInstance().getState().bs().write();
+ itsTimer = 0;
+ break;
+
+ case F_TIMER:
+ if (itsTimer++ > WRITE_TIMEOUT &&
+ Cache::getInstance().getState().bs().getMatchCount(RegisterState::WRITE) > 0) {
+ LOG_WARN("Failed to set BS (blocksync) register. Retrying...");
+ Cache::getInstance().getState().bs().reset();
+ TRAN(Sequencer::RSUclear_state);
+ } else if (Cache::getInstance().getState().bs().isMatchAll(RegisterState::IDLE)) {
+ TRAN(Sequencer::RADwrite_state);
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::setBlocksync_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
}
//
-// writeClock_state(event, port)
+// RADwrite_state(event, port)
//
-GCFEvent::TResult Sequencer::writeClock_state(GCFEvent& event, GCFPortInterface& /*port*/)
+GCFEvent::TResult Sequencer::RADwrite_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- switch (event.signal) {
- case F_ENTRY:
- LOG_INFO("Entering Sequencer::writeClock_state");
- Cache::getInstance().getState().tdwrite().reset();
- Cache::getInstance().getState().tdwrite().write();
- itsTimer = 0;
- break;
-
- case F_TIMER:
- if (itsTimer++ > STARTUP_WAIT && Cache::getInstance().getState().tdwrite().isMatchAll(RegisterState::IDLE)) {
- TRAN(Sequencer::readClock_state);
- }
- break;
-
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::writeClock_state");
- break;
-
- default:
- break;
- }
-
- return (GCFEvent::HANDLED);
+ switch (event.signal) {
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::RADwrit_state");
+ Cache::getInstance().getState().rad().reset();
+ Cache::getInstance().getState().rad().write();
+ itsTimer = 0;
+ break;
+
+ case F_TIMER:
+ if (itsTimer++ > WRITE_TIMEOUT &&
+ Cache::getInstance().getState().rad().getMatchCount(RegisterState::WRITE) > 0) {
+ LOG_WARN("Failed to write RAD settings register. Retrying...");
+ TRAN(Sequencer::RSUclear_state);
+ } else if (Cache::getInstance().getState().rad().isMatchAll(RegisterState::IDLE)) {
+ TRAN(Sequencer::PPSsync_state);
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::RADwrite_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
}
//
-// readClock_state(event, port)
+// PPSsync_state(event, port)
//
-GCFEvent::TResult Sequencer::readClock_state(GCFEvent& event, GCFPortInterface& /*port*/)
+GCFEvent::TResult Sequencer::PPSsync_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- switch (event.signal) {
- case F_ENTRY:
- LOG_INFO("Entering Sequencer::readClock_state");
- Cache::getInstance().getState().tdread().reset();
- Cache::getInstance().getState().tdread().read();
- itsTimer = 0;
- break;
+ switch (event.signal) {
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::PPSsync_state");
+ Cache::getInstance().getState().crcontrol().reset(); // set to IDLE
+ Cache::getInstance().getState().crcontrol().read(); // set to READ
+ // Note: we set the state to read iso write so that the CRSync action knows it a new start.
+ // It will send a 'reset' to the registers first and than change the state to write during
+ // the repeated writes till all APs have the right delay.
+ itsTimer = 0;
+ break;
+
+ case F_TIMER:
+ if (itsTimer++ > WRITE_TIMEOUT &&
+ Cache::getInstance().getState().crcontrol().getMatchCount(RegisterState::WRITE) > 0) {
+ LOG_WARN("Failed to write PPSsync settings register. Retrying...");
+ stringstream ss;
+ Cache::getInstance().getState().crcontrol().print(ss);
+ LOG_DEBUG_STR("PPSsync failure state: " << ss);
+ TRAN(Sequencer::RSUclear_state);
+ } else if (Cache::getInstance().getState().crcontrol().isMatchAll(RegisterState::IDLE)) {
+ TRAN(Sequencer::RCUenable_state);
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::PPSsync_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
+}
- case F_TIMER:
- if (Cache::getInstance().getState().tdread().getMatchCount(RegisterState::READ_ERROR) > 0) {
- if (itsTimer++ > TDREAD_TIMEOUT) {
- LOG_WARN("Failed to verify setting of clock. Retrying...");
- TRAN(Sequencer::writeClock_state);
- } else {
- // read again
- Cache::getInstance().getState().tdread().reset();
- Cache::getInstance().getState().tdread().read();
- }
- }
- else if (Cache::getInstance().getState().tdread().isMatchAll(RegisterState::IDLE)) {
- TRAN(Sequencer::RCUdisable_state);
- }
- break;
+//
+// enableRCUs [private]
+//
+void Sequencer::enableRCUs(bool on)
+{
+ RCUSettings::Control control;
+ control.setEnable(on ? 1 : 0);
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::readClock_state");
- break;
+ Cache::getInstance().getFront().getRCUSettings()() = control;
+ Cache::getInstance().getBack().getRCUSettings()() = control;
- default:
- break;
- }
+ Cache::getInstance().getState().rcusettings().reset();
+ Cache::getInstance().getState().rcusettings().write();
+}
- return (GCFEvent::HANDLED);
+//
+// RCUenable_state(event, port)
+//
+GCFEvent::TResult Sequencer::RCUenable_state(GCFEvent& event, GCFPortInterface& /*port*/)
+{
+ static bool waitForOddSecond(false);
+
+ switch (event.signal) {
+ case F_ENTRY: {
+ LOG_INFO("Entering Sequencer::RCUenable_state");
+ itsTimer = 0;
+
+ // command may only be executed on even seconds for RTCP
+ // since the timestamp is always one second ahead we have
+ // to wait of an odd second (to end in the even second).
+ if (time(0) % 2 == 0) {
+ waitForOddSecond = true;
+ LOG_INFO("Wait for even second before enabling RCUs");
+ break;
+ }
+
+ waitForOddSecond = false;
+ LOG_INFO("Entry at even second, enabling RCUs immediately");
+ enableRCUs(true);
+ }
+ break;
+
+ case F_TIMER: {
+ if (waitForOddSecond) {
+ if (time(0) % 2 == 0) {
+ LOG_INFO("Still waiting for even second, missed pps?");
+ break;
+ }
+ waitForOddSecond = false;
+ LOG_INFO("Enabling RCUs delayed till even second");
+ enableRCUs(true);
+ break;
+ }
+
+ // Command are sent, wait for command to complete.
+ if (itsTimer++ > WRITE_TIMEOUT &&
+ Cache::getInstance().getState().rcusettings().getMatchCount(RegisterState::WRITE) > 0) {
+ LOG_WARN("Failed to enable receivers. Retrying...");
+ TRAN(Sequencer::RSUclear_state);
+ } else if (Cache::getInstance().getState().rcusettings().isMatchAll(RegisterState::IDLE)) {
+ TRAN(Sequencer::CDOenable_state);
+ }
+ }
+ break;
+
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::RCUenable_state");
+ break;
+
+ default:
+ break;
+ }
+
+ return (GCFEvent::HANDLED);
}
//
-// RCUdisable_state(event, port)
+// CDOenable_state(event, port)
//
-GCFEvent::TResult Sequencer::RCUdisable_state(GCFEvent& event, GCFPortInterface& /*port*/)
+GCFEvent::TResult Sequencer::CDOenable_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- switch (event.signal) {
- case F_ENTRY:
- LOG_INFO("Entering Sequencer::RCUdisable_state");
- enableRCUs(false);
+ switch (event.signal) {
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::CDOenable_state");
+ Cache::getInstance().getState().cdo().reset();
+ Cache::getInstance().getState().cdo().write();
itsTimer = 0;
- break;
-
- case F_TIMER:
- if (itsTimer++ > WRITE_TIMEOUT && Cache::getInstance().getState().rcusettings().getMatchCount(RegisterState::WRITE) > 0) {
- LOG_WARN("Failed to disable receivers. Retrying...");
- itsFinalState = false;
- TRAN(Sequencer::clearClock_state);
- } else if (Cache::getInstance().getState().rcusettings().isMatchAll(RegisterState::IDLE)) {
- if (itsFinalState) {
- stopSequence();
- LOG_DEBUG("<< Stop sequencer");
- TRAN(Sequencer::idle_state);
+ break;
+
+ case F_TIMER:
+ if (itsTimer++ > WRITE_TIMEOUT &&
+ Cache::getInstance().getState().rcusettings().getMatchCount(RegisterState::WRITE) > 0) {
+ LOG_WARN("Failed to enable receivers. Retrying...");
+ TRAN(Sequencer::RSUclear_state);
+ } else if (Cache::getInstance().getState().rcusettings().isMatchAll(RegisterState::IDLE)) {
+ if (StationSettings::instance()->hasAartfaac()) {
+ TRAN(Sequencer::SDObitmode_state);
}
else {
- TRAN(Sequencer::setAll_state);
+ itsFinalState = true;
+ TRAN(Sequencer::RCUdisable_state);
}
- }
- break;
+ }
+ break;
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::RCUdisable_state");
- break;
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::CDOenable_state");
+ break;
- default:
- break;
- }
+ default:
+ break;
+ }
- return (GCFEvent::HANDLED);
+ return (GCFEvent::HANDLED);
}
//
-// RSUclear(event, port)
+// CDOenable_state(event, port)
//
-GCFEvent::TResult Sequencer::RSUclear_state(GCFEvent& event, GCFPortInterface& /*port*/)
+GCFEvent::TResult Sequencer::SDObitmode_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
+ int select;
+ int bits_per_sample;
switch (event.signal) {
- case F_ENTRY: {
- LOG_INFO("Entering Sequencer::RSUclear_state");
-
- // Change the register to set the clear flag
- RSUSettings::ResetControl rsumode;
- rsumode.setClear(true);
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::SDObitmode_state");
+ select = 0;
+ bits_per_sample = GET_CONFIG("RSPDriver.SDO_MODE", i);
+ if (bits_per_sample == 8) { select = 1; }
+ else if (bits_per_sample == 5) { select = 2; }
+ else if (bits_per_sample == 4) { select = 3; }
+ RSRSDOMode sdomodeinfo;
+ sdomodeinfo.bm_select = select;
+ sdomodeinfo.bm_max = 3;
for (int rsp = 0; rsp < StationSettings::instance()->nrRspBoards(); rsp++) {
- Cache::getInstance().getBack().getRSUSettings()()(rsp) = rsumode;
- }
-
- // signal that the register has changed
- Cache::getInstance().getState().rsuclear().reset();
- Cache::getInstance().getState().rsuclear().write();
-
+ Cache::getInstance().getBack().getSDOModeInfo()()(rsp) = sdomodeinfo;
+ Cache::getInstance().getFront().getSDOModeInfo()()(rsp) = sdomodeinfo;
+ }
+ Cache::getInstance().getState().sdoState().reset();
+ Cache::getInstance().getState().sdoState().write();
+
itsTimer = 0;
- break;
- }
+ break;
- case F_TIMER:
- if (itsTimer++ > RSUCLEAR_WAIT && Cache::getInstance().getState().rsuclear().isMatchAll(RegisterState::IDLE)) {
- TRAN(Sequencer::setAll_state);
- }
- break;
+ case F_TIMER:
+ if (itsTimer++ > WRITE_TIMEOUT && Cache::getInstance().getState().sdoState().isMatchAll(RegisterState::IDLE)) {
+ //itsFinalState = true;
+ TRAN(Sequencer::SDOselect_state);
+ }
+ break;
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::RSUclear_state");
- break;
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::SDObitmode_state");
+ break;
- default:
- break;
- }
+ default:
+ break;
+ }
- return (GCFEvent::HANDLED);
+ return (GCFEvent::HANDLED);
+}
+
+// default settings
+// sdo_ss=295:330,331:366,367:402,403:438
+blitz::Array<uint16, 2> Sequencer::str2blitz(const char* str, int max)
+{
+ string inputstring(str);
+ char* start = (char*)inputstring.c_str();
+ char* end = 0;
+ bool range = false;
+ long prevval = 0;
+
+ blitz::Array<uint16, 2> ss(4,36); // ss = subband select
+ int bank_nr = 0;
+ int sb_nr = 0;
+ long i;
+
+ ss = 0;
+ while (start) {
+ long val = strtol(start, &end, 10); // read decimal numbers
+ start = (end ? (*end ? end + 1 : 0) : 0); // advance
+ if (val >= max || val < 0) {
+ LOG_WARN(formatString("Error: value %ld out of range",val));
+ ss = 0;
+ return ss;
+ }
+ LOG_INFO_STR("val=" << val << " prevval=" << prevval);
+ if (end) {
+ switch (*end) {
+ case ',':
+ case 0: {
+ if (range) {
+ if (0 == prevval && 0 == val) {
+ val = max - 1;
+ }
+ if (val < prevval) {
+ LOG_WARN("Error: invalid range specification");
+ ss = 0;
+ return ss;
+ }
+
+ for (i = prevval; i <= val; i++) {
+ //LOG_INFO(formatString("add value %ld to ss(%d,%d)", i, bank_nr, sb_nr));
+ ss(bank_nr, sb_nr) = (uint16)i;
+ sb_nr++;
+ if (sb_nr >= 36) {
+ bank_nr++;
+ sb_nr = 0;
+ }
+ }
+ }
+ else {
+ ss(bank_nr, sb_nr) = (uint16)val;
+ sb_nr++;
+ if (sb_nr >= 36) {
+ bank_nr++;
+ sb_nr = 0;
+ }
+ }
+ range=false;
+ } break;
+
+ case ':': {
+ range=true;
+ } break;
+
+ default: {
+ LOG_WARN(formatString("Error: invalid character %c",*end));
+ ss = 0;
+ return ss;
+ } break;
+ } // switch
+ } // if (end)
+ prevval = val;
+ } // while
+
+ return (ss);
}
//
-// setAll_state(event, port)
+// CDOenable_state(event, port)
//
-GCFEvent::TResult Sequencer::setAll_state(GCFEvent& event, GCFPortInterface& /*port*/)
+GCFEvent::TResult Sequencer::SDOselect_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
+ char select_str[64];
+ int nBanks;
+ int pol;
+ blitz::Array<uint16, 2> select(4,36);
+
switch (event.signal) {
- case F_ENTRY:
- LOG_INFO("Entering Sequencer::setAll_state");
- Cache::getInstance().getState().bs().reset();
- Cache::getInstance().getState().bs().write();
- Cache::getInstance().getState().rad().reset();
- Cache::getInstance().getState().rad().write();
- Cache::getInstance().getState().crcontrol().reset();
- Cache::getInstance().getState().crcontrol().read();
- // Note: we set the state to read iso write so that the CRSync action knows it a new start.
- // It will send a 'reset' to the registers first and than change the state to write during
- // the repeated writes till all APs have the right delay.
- Cache::getInstance().getState().cdo().reset();
- Cache::getInstance().getState().cdo().write();
- if (StationSettings::instance()->hasAartfaac()) {
- Cache::getInstance().getState().sdoState().reset();
- Cache::getInstance().getState().sdoState().write();
- Cache::getInstance().getState().sdoSelectState().reset();
- Cache::getInstance().getState().sdoSelectState().write();
-
- for (int blp_nr = 0; blp_nr < StationSettings::instance()->nrBlps(); blp_nr += 4) {
- Cache::getInstance().getState().bypasssettings().reset(blp_nr);
- Cache::getInstance().getState().bypasssettings().write(blp_nr);
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::SDOselect_state");
+ strncpy(select_str, GET_CONFIG_STRING("RSPDriver.SDO_SS"), 64);
+ LOG_DEBUG_STR("select string = " << select_str);
+ select = str2blitz(select_str, 512);
+ LOG_DEBUG_STR("SDO select values = " << select);
+ nBanks = (MAX_BITS_PER_SAMPLE / MIN_BITS_PER_SAMPLE); // fill all banks
+ for (int rcu = 0; rcu < StationSettings::instance()->nrRcus(); rcu++) {
+ pol = rcu%2;
+ for (int bank = 0; bank < nBanks; bank++) {
+ Cache::getInstance().getBack().getSDOSelection().subbands()(rcu, bank, Range::all()) = 0;
+ for (int sb = 0; sb < 36; sb++) {
+ Cache::getInstance().getBack().getSDOSelection().subbands()(rcu, bank, sb) = (select(bank, sb) * 2) + pol;
+ Cache::getInstance().getFront().getSDOSelection().subbands()(rcu, bank, sb) = (select(bank, sb) * 2) + pol;
+ } // for each subband
+ } // for each bank
+
+ if (rcu == 0) {
+ LOG_DEBUG_STR("cache->subbands.sdo ss(0) = " << Cache::getInstance().getBack().getSDOSelection().subbands()(0, Range::all(), Range::all()));
}
- }
+ } // for each rcu
+
+ Cache::getInstance().getState().sdoSelectState().reset();
+ Cache::getInstance().getState().sdoSelectState().write();
+
itsTimer = 0;
break;
- case F_TIMER:
- if (itsTimer++ > WRITE_ALL_TIMEOUT) {
- if (Cache::getInstance().getState().bs().getMatchCount(RegisterState::WRITE) > 0) {
- LOG_WARN("Failed to set BS (blocksync) register. Retrying...");
- Cache::getInstance().getState().bs().reset();
- }
- if (Cache::getInstance().getState().rad().getMatchCount(RegisterState::WRITE) > 0) {
- LOG_WARN("Failed to write RAD settings register. Retrying...");
- }
- if (Cache::getInstance().getState().crcontrol().getMatchCount(RegisterState::WRITE) > 0) {
- LOG_WARN("Failed to write PPSsync settings register. Retrying...");
- stringstream ss;
- Cache::getInstance().getState().crcontrol().print(ss);
- LOG_DEBUG_STR("PPSsync failure state: " << ss);
- }
- if (Cache::getInstance().getState().cdo().getMatchCount(RegisterState::WRITE) > 0) {
- LOG_WARN("Failed to enable receivers. Retrying...");
- }
- TRAN(Sequencer::RSUclear_state);
- }
- else if (Cache::getInstance().getState().bs().isMatchAll(RegisterState::IDLE)
- && Cache::getInstance().getState().rad().isMatchAll(RegisterState::IDLE)
- && Cache::getInstance().getState().crcontrol().isMatchAll(RegisterState::IDLE)
- && Cache::getInstance().getState().cdo().isMatchAll(RegisterState::IDLE) ) {
+ case F_TIMER:
+ if (itsTimer++ > WRITE_TIMEOUT && Cache::getInstance().getState().sdoSelectState().isMatchAll(RegisterState::IDLE)) {
+ //itsFinalState = true;
+ TRAN(Sequencer::SDOenable_state);
+ }
+ break;
- TRAN(Sequencer::RCUenable_state);
- }
- break;
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::SDOselect_state");
+ break;
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::setAll_state");
- break;
+ default:
+ break;
+ }
- default:
- break;
- }
-
- return (GCFEvent::HANDLED);
+ return (GCFEvent::HANDLED);
}
-
//
-// enableRCUs [private]
+// CDOenable_state(event, port)
//
-void Sequencer::enableRCUs(bool on)
+GCFEvent::TResult Sequencer::SDOenable_state(GCFEvent& event, GCFPortInterface& /*port*/)
{
- RCUSettings::Control control;
- control.setEnable(on ? 1 : 0);
-
- Cache::getInstance().getFront().getRCUSettings()() = control;
- Cache::getInstance().getBack().getRCUSettings()() = control;
-
- Cache::getInstance().getState().rcusettings().reset();
- Cache::getInstance().getState().rcusettings().write();
-}
-
-//
-// RCUenable_state(event, port)
-//
-GCFEvent::TResult Sequencer::RCUenable_state(GCFEvent& event, GCFPortInterface& /*port*/)
-{
- static bool waitForOddSecond(false);
-
switch (event.signal) {
- case F_ENTRY: {
- LOG_INFO("Entering Sequencer::RCUenable_state");
+ case F_ENTRY:
+ LOG_INFO("Entering Sequencer::SDOenable_state");
+ for (int blp_nr = 0; blp_nr < StationSettings::instance()->nrBlps(); blp_nr += 4) {
+ Cache::getInstance().getBack().getBypassSettings()()(blp_nr).setSDO(1);
+ Cache::getInstance().getFront().getBypassSettings()()(blp_nr).setSDO(1);
+ Cache::getInstance().getState().bypasssettings().reset(blp_nr);
+ Cache::getInstance().getState().bypasssettings().write(blp_nr);
+ }
itsTimer = 0;
+ break;
- // command may only be executed on even seconds for RTCP
- // since the timestamp is always one second ahead we have
- // to wait of an odd second (to end in the even second).
- if (time(0) % 2 == 0) {
- waitForOddSecond = true;
- LOG_INFO("Wait for even second before enabling RCUs");
- break;
- }
+ case F_TIMER:
+ if (itsTimer++ > WRITE_TIMEOUT && Cache::getInstance().getState().bypasssettings().isMatchAll(RegisterState::IDLE)) {
+ itsFinalState = true;
+ TRAN(Sequencer::RCUdisable_state);
+ }
+ break;
- waitForOddSecond = false;
- LOG_INFO("Entry at even second, enabling RCUs immediately");
- enableRCUs(true);
- }
- break;
-
- case F_TIMER: {
- if (waitForOddSecond) {
- if (time(0) % 2 == 0) {
- LOG_INFO("Still waiting for even second, missed pps?");
- break;
- }
- waitForOddSecond = false;
- LOG_INFO("Enabling RCUs delayed till even second");
- enableRCUs(true);
- break;
- }
+ case F_EXIT:
+ LOG_DEBUG("Leaving Sequencer::SDOenable_state");
+ break;
- // Command are sent, wait for command to complete.
- if (itsTimer++ > WRITE_TIMEOUT &&
- Cache::getInstance().getState().rcusettings().getMatchCount(RegisterState::WRITE) > 0) {
- LOG_WARN("Failed to enable receivers. Retrying...");
- TRAN(Sequencer::RSUclear_state);
- } else if (Cache::getInstance().getState().rcusettings().isMatchAll(RegisterState::IDLE)) {
- itsFinalState = true;
- TRAN(Sequencer::RCUdisable_state);
- }
- }
- break;
+ default:
+ break;
+ }
- case F_EXIT:
- LOG_DEBUG("Leaving Sequencer::RCUenable_state");
- break;
+ return (GCFEvent::HANDLED);
+}
- default:
- break;
- }
- return (GCFEvent::HANDLED);
-}
} // namespace RSP
} // namespace LOFAR
diff --git a/MAC/APL/PIC/RSP_Driver/src/Sequencer.h b/MAC/APL/PIC/RSP_Driver/src/Sequencer.h
index 23f3d95f5f5aa40da5b5247d32a02c7b25541677..4ea7cd39431ef20f8160678b9704c20682235598 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Sequencer.h
+++ b/MAC/APL/PIC/RSP_Driver/src/Sequencer.h
@@ -5,7 +5,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -38,70 +38,71 @@ namespace LOFAR {
class Sequencer : public GCFFsm
{
public:
- typedef enum {
- SEQ_NONE = 0,
- SEQ_STARTUP, // done at initialization
- SEQ_SETCLOCK, // if clock switch
- SEQ_RSPCLEAR,
- } Sequence;
- //
- // Constructor/destructor
- //
- static Sequencer& getInstance();
- virtual ~Sequencer();
+ typedef enum {
+ SEQ_NONE = 0,
+ SEQ_SETCLOCK, // done at initialization
+ SEQ_RSPCLEAR,
+ SEQ_SDOPRESET,
+ } Sequence;
+ //
+ // Constructor/destructor
+ //
+ static Sequencer& getInstance();
+ virtual ~Sequencer();
- //
- // Advance the sequencer state machine
- //
- void run(GCFEvent& event, GCFPortInterface& port);
+ //
+ // Advance the sequencer state machine
+ //
+ void run(GCFEvent& event, GCFPortInterface& port);
- //
- // Returns true when the statemachine is not in the 'idle' state.
- //
- bool isActive() const;
+ //
+ // Returns true when the statemachine is not in the 'idle' state.
+ //
+ bool isActive() const;
- void startSequence(Sequence sequence) { itsCurSeq = sequence; }
- void stopSequence() { itsCurSeq = SEQ_NONE; }
+ void startSequence(Sequence sequence) { itsCurSeq = sequence; }
+ void stopSequence() { itsCurSeq = SEQ_NONE; }
- /*@{*/
- //
- // The states of the statemachine.
- //
- GCFEvent::TResult idle_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult disableClock_state(GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult readDisabledClock_state(GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult writePLL_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult readPLL_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult RSUpreclear_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult clearClock_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult writeClock_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult readClock_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult RCUdisable_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult RSUclear_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult setAll_state (GCFEvent& event, GCFPortInterface& port);
- GCFEvent::TResult RCUenable_state (GCFEvent& event, GCFPortInterface& port);
- /*@}*/
+ /*@{*/
+ //
+ // The states of the statemachine.
+ //
+ GCFEvent::TResult idle_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult RSUpreclear_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult clearClock_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult writeClock_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult readClock_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult RCUdisable_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult RSUclear_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult setBlocksync_state(GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult RADwrite_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult PPSsync_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult RCUenable_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult CDOenable_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult SDObitmode_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult SDOselect_state (GCFEvent& event, GCFPortInterface& port);
+ GCFEvent::TResult SDOenable_state (GCFEvent& event, GCFPortInterface& port);
+ /*@}*/
private:
- //
- // Default construction prohibited (singleton pattern).
- //
- Sequencer();
- void enableRCUs(bool);
+ //
+ // Default construction prohibited (singleton pattern).
+ //
+ Sequencer();
+ void enableRCUs(bool);
blitz::Array<uint16, 2> str2blitz(const char* str, int max);
//std::list<int> strtolist(const char* str, int max);
- static Sequencer* m_instance;
+ static Sequencer* m_instance;
- bool itsIdle; // In idle-state or not
- Sequence itsCurSeq; // currently executing sequence
- int itsClockRequest;// requested clock freq
+ bool itsIdle; // In idle-state or not
+ Sequence itsCurSeq; // currently executing sequence
- int itsTimer; // timer used to delay some actions
- bool itsFinalState; // final state of sequence (used by rcudisable_state)
+ int itsTimer; // timer used to delay some actions
+ bool itsFinalState; // final state of sequence (used by rcudisable_state)
};
};
};
-
+
#endif /* SEQUENCER_H_ */
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc
index 23ca772cb027929a1e873580d202f3c539d855c7..4cfa655fd3292c139c57fe1086a93efafd742a58 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h
index 7817b01a675877c1cb5cbfe40be8a62cb951ed86..3c3ccf367de76fbd861b3a4e2e454f6a4e944fbd 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc
index 93c73509b19f2ee7fff387baa24a5898d8999fc3..c8f8f5721727dd7aba660e292ba4b6ef4cac2ebc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesRead.h b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.h
index 1cd1f57e9d0301e7c65bf94e3e62135a7718370f..78af2a2b20cd0dc6525e2feab30a442874171c7b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc
index 8bc457d91ece4cada8e84eed7733a45f4bdf3150..872a611f66780e8f5943f72f7864951affaf52f8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h
index 7d4af4280c35e9c6c56d04a846dbd425f4087d62..d340f72f639468ed90006bf9736b64719946f8d7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.cc
index 69a22a63963efd9a0d46a5f40a33a42913bd196c..f7dc3488fd1d2a6df9267f6da81ece43b52f0e09 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.h
index a4b322ac73a982d24c7fc886ba97c60f6be6471d..1984e4dc59603c02660d265ce56b5ea672e4fc7a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc
index 071a932d66d08e0096a48e70e5f51f50b4a741c8..5f6043ed375ccb680b32a30016e91d9c39f1658c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h
index 422ead55f8ef5958fa57c71c770adc1025fc239f..10471b0dac2a2e030e7cea78a16c900725e90178 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc
index da927df2e6de31f0bbf53795086f5797fd6fa1cd..fd27aaa6bfa9de875f11b75b5164747c10cb2a72 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h
index 3625cf873835d52a9b290e7e69811358de8ea57e..0629190dc746ef4d0963e4e3bdb210bcaba21521 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.cc
index 60420741439b393a19ed2e5f0c692b6de5c8783b..988b35c6a821aa7283680c1c02f6a1aafc329e7c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.h
index 6aa7b15f573aaa06cbd967234f393e840a5a4a05..f5cf0d268944b591b3cc7dcd361443cd2a41df92 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc
index 2e2e8dac784c2f15bd99d09ec53e313ca888e2c2..c193080e7d4ce58b2eea88502b5f34c568a412b3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h
index 6f2cde743d25baeee7d3a9ef03a650cc49e68fcc..bbac875372017fe35d758a80ea77a87328dd5878 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc
index c61ec06ef62d98af04a19b029703fb98ee813c73..6ee344cec72268537e40dc298a81f3dd2bb51ab6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -38,94 +38,85 @@ using namespace RSP_Protocol;
using namespace RTC;
SetRCUCmd::SetRCUCmd(GCFEvent& event, GCFPortInterface& port, Operation oper) :
- Command("SetRCU", port, oper)
+ Command("SetRCU", port, oper)
{
- m_event = new RSPSetrcuEvent(event);
+ m_event = new RSPSetrcuEvent(event);
- LOG_INFO(formatString("control=0x%08x", m_event->settings()(0).getRaw()));
+ LOG_INFO(formatString("control=0x%08x", m_event->settings()(0).getRaw()));
}
SetRCUCmd::~SetRCUCmd()
{
- delete m_event;
+ delete m_event;
}
void SetRCUCmd::ack(CacheBuffer& /*cache*/)
{
- RSPSetrcuackEvent ack;
- ack.timestamp = getTimestamp();
- ack.status = RSP_SUCCESS;
- getPort()->send(ack);
+ RSPSetrcuackEvent ack;
+ ack.timestamp = getTimestamp();
+ ack.status = RSP_SUCCESS;
+ getPort()->send(ack);
}
void SetRCUCmd::apply(CacheBuffer& cache, bool setModFlag)
{
- // someone else using the I2C bus?
- I2Cuser busUser = cache.getI2Cuser();
- LOG_INFO_STR("SetRCU::apply : " << ((busUser == NONE) ? "NONE" :
- ((busUser == HBA) ? "HBA" :
- ((busUser == RCU_R) ? "RCU_R" : "RCU_W"))));
- if (busUser != NONE && busUser != RCU_W) {
- postponeExecution(true);
- return;
- }
- cache.setI2Cuser(RCU_W); // claim the I2C bus.
- postponeExecution(false);
-
- bool newMode = m_event->settings()(0).isModeModified();
- uint32 mode = m_event->settings()(0).getMode();
- CableSettings* cableSettings = CableSettings::instance();
- float delayStep = 1000.0 / cache.getClock();
+ // someone else using the I2C bus?
+ I2Cuser busUser = cache.getI2Cuser();
+ LOG_INFO_STR("SetRCU::apply : " << ((busUser == NONE) ? "NONE" :
+ ((busUser == HBA) ? "HBA" :
+ ((busUser == RCU_R) ? "RCU_R" : "RCU_W"))));
+ if (busUser != NONE && busUser != RCU_W) {
+ postponeExecution(true);
+ return;
+ }
+ cache.setI2Cuser(RCU_W); // claim the I2C bus.
+ postponeExecution(false);
+
+ bool newMode = m_event->settings()(0).isModeModified();
+ uint32 mode = m_event->settings()(0).getMode();
+ CableSettings* cableSettings = CableSettings::instance();
+ float delayStep = 1000.0 / cache.getClock();
// LOG_INFO("SetRCUCmd::apply");
- for (int cache_rcu = 0; cache_rcu < StationSettings::instance()->nrRcus(); cache_rcu++) {
- if (m_event->rcumask[cache_rcu]) {
- // make change
- cache.getRCUSettings()()(cache_rcu) = m_event->settings()(0);
-
- // Apply delays and attenuation when mode was changed.
- if (newMode) {
- // if mode changed be sure RCU is enabled, is needed to reduce poweron current on hba's
- /*
- if (mode > 0) {
- cache.getRCUSettings()()(cache_rcu).setEnable(1);
- }
- else {
- cache.getRCUSettings()()(cache_rcu).setEnable(0);
- }
- */
- cache.getRCUSettings()()(cache_rcu).setDelay(
- (uint8) ((delayStep/2.0 + cableSettings->getDelay(cache_rcu, mode)) / delayStep));
- cache.getRCUSettings()()(cache_rcu).setAttenuation(
- (uint8) ((-0.125 + cableSettings->getAtt(cache_rcu, mode)) / -0.25));
- if (cache_rcu == 0) {
- LOG_DEBUG(formatString("RCU 0 new Delay : %f/2.0 + %f / %f = %d",
- delayStep, cableSettings->getDelay(0, mode), delayStep,
- (uint8) ((delayStep/2.0 + cableSettings->getDelay(cache_rcu, mode)) / delayStep)));
- LOG_DEBUG(formatString("RCU 0 new Atten : -0.125 + %f / -0.25 = %d", cableSettings->getAtt(0, mode),
- (uint8) ((-0.125 + cableSettings->getAtt(cache_rcu, mode)) / -0.25)));
- LOG_DEBUG(formatString("RCU 0 new RawMode : %08lX", cache.getRCUSettings()()(0).getRaw()));
- }
- }
-
- if (setModFlag) {
- // only write RCU Handler settings if modified
- if (m_event->settings()(0).isHandlerModified()) {
- cache.getCache().getState().rcusettings().write(cache_rcu);
- }
-
- // only write RCU Protocol settings if modified
- if (m_event->settings()(0).isProtocolModified()) {
- cache.getCache().getState().rcuprotocol().write(cache_rcu);
- }
- }
- } // if in mask
- } // for
+ for (int cache_rcu = 0; cache_rcu < StationSettings::instance()->nrRcus(); cache_rcu++) {
+ if (m_event->rcumask[cache_rcu]) {
+ // make change
+ cache.getRCUSettings()()(cache_rcu) = m_event->settings()(0);
+
+ // Apply delays and attenuation when mode was changed.
+ if (newMode) {
+ cache.getRCUSettings()()(cache_rcu).setDelay(
+ (uint8) ((delayStep/2.0 + cableSettings->getDelay(cache_rcu, mode)) / delayStep));
+ cache.getRCUSettings()()(cache_rcu).setAttenuation(
+ (uint8) ((-0.125 + cableSettings->getAtt(cache_rcu, mode)) / -0.25));
+ if (cache_rcu == 0) {
+ LOG_DEBUG(formatString("RCU 0 new Delay : %f/2.0 + %f / %f = %d",
+ delayStep, cableSettings->getDelay(0, mode), delayStep,
+ (uint8) ((delayStep/2.0 + cableSettings->getDelay(cache_rcu, mode)) / delayStep)));
+ LOG_DEBUG(formatString("RCU 0 new Atten : -0.125 + %f / -0.25 = %d", cableSettings->getAtt(0, mode),
+ (uint8) ((-0.125 + cableSettings->getAtt(cache_rcu, mode)) / -0.25)));
+ LOG_DEBUG(formatString("RCU 0 new RawMode : %08lX", cache.getRCUSettings()()(0).getRaw()));
+ }
+ }
+
+ if (setModFlag) {
+ // only write RCU Handler settings if modified
+ if (m_event->settings()(0).isHandlerModified()) {
+ cache.getCache().getState().rcusettings().write(cache_rcu);
+ }
+
+ // only write RCU Protocol settings if modified
+ if (m_event->settings()(0).isProtocolModified()) {
+ cache.getCache().getState().rcuprotocol().write(cache_rcu);
+ }
+ }
+ } // if in mask
+ } // for
}
void SetRCUCmd::complete(CacheBuffer& cache)
{
- ack(cache);
+ ack(cache);
}
const Timestamp& SetRCUCmd::getTimestamp() const
@@ -141,6 +132,6 @@ void SetRCUCmd::setTimestamp(const Timestamp& timestamp)
bool SetRCUCmd::validate() const
{
return ((m_event->rcumask.count() <= (unsigned int)StationSettings::instance()->nrRcus())
- && (1 == m_event->settings().dimensions())
- && (1 == m_event->settings().extent(firstDim)));
+ && (1 == m_event->settings().dimensions())
+ && (1 == m_event->settings().extent(firstDim)));
}
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h
index 972bbbcb42392f24944f331df8cd8b80fcaeb8bf..3805c90f92267aad4bf21c781813c31901673f78 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc
index 7e3bb40990294b59f222ebd5d172c5ce96233d4a..81b144f9ca8977cc434fa79aa14b3326988fe571 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h
index 4244ed243ef69543891ebcc8ed57b5c40f89f9a2..c0da944bc6bf3a66dac44f61b09a16a83178116f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc
index 3307352dc6cb1c3ae79cd4bd93e9260f225819fa..c94174232406606d1b6d15d61cb7f61e285098cc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h
index c3fc88e4776dbb14194c79ed167688a65bf94dd1..4ba74f335e73743c85c886bec9ab28bd7ca376db 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.cc
index 4b0df93dabeac81b030047a2f59fd3891699b4c4..cf49ef30ffe4af1d1d1b6522edd5f844997eeccc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.h
index a32d2566d2942007ffe4ed20b6fc2462be152103..8bf954172bc5f9b92fe4ec53da142e3fd70d072e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.cc
index 4c4cd9cc26ba161729026a0a4995bdb10c30d457..c2022a5119c01dab0ff4fc5eb89f8afadc8bf125 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.h
index e8197cd279423fd462ce69f8ee2858320c8cb76f..0d3a35bf9c032fbcbb984879da039b92d5cfe5f8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc
index 5f9bfad28b2da8cc190d5663a3b5540805457ea9..f6352eabedc65e20d3624b6d568c2f116c6ef966 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h
index 1bb1bc1622fcf36561dd8023fbf1332d2d0a6624..a6162af431a2078962f1d21c7b271a3b36338801 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc
index 51e3c9bf711ae2679badbc7da3fdfdcf47ef06f0..2ce7473ea6a3e3606cff18f71493190d5924612b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h
index 8c49a01c78bc20cdd150cb5df3bc540705e128fc..537240b93aa41140ac0c7ec7a5fafeaf9e01dc54 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.cc
index fb9e57ffc97dfac9a2fe434d8eeac0375ed0e699..53aac529317f89d9b6b76c7e68bebc9515a5d7ac 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.h
index 27753e4533cc706a780dba9f0fdb6c5e68cb3b9c..b3a14838f86ebea8a36b017cd81cce219166547f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc
index 14d33fac58c9da707ea6b3cb0c570037de3fa03d..5c46f23d1a46012ca5defde3392f4cdc139a6b01 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h
index 7a92875e805bb867e3556fd3feb4295fd2f7dcae..7d0b268cfb40e29311294e93ad66d9d1e6fe90cd 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc
index ae38870fd31d8df542292bd01fdd86da627550e6..7e65d8684859767dafec09564d5280f771b39a80 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h
index 3c6268b925a461c4ce88b87f2396f544479c756a..dd0b80ac1d3c3d1f0e9144478fac375241aef693 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc
index 86a5466ebc1459df8dc767196b385b86412cef26..8907dac82f804edc4ab3a0cf54a2cbce6905fc07 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h
index 5f9801a5d7cd1806fd1bc68e4def5fddfb04fa01..053ae1802f109c72caff37c45b47589b61a0d3f7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SstRead.cc b/MAC/APL/PIC/RSP_Driver/src/SstRead.cc
index 62f785d38d85ba7257d6035f64a12689dac91ddf..2fb5f22c955c21e7f8371f383e2945b4940fb7e2 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SstRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SstRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SstRead.h b/MAC/APL/PIC/RSP_Driver/src/SstRead.h
index 97d18a4b463f7fd2f6173179c1ce345d199658b1..177c70ed99fe6c3c2ba64b5a64c23747aa1ec6be 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SstRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SstRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/StationSettings.cc b/MAC/APL/PIC/RSP_Driver/src/StationSettings.cc
index dd319285be6666680a958934e1c412e5418340d6..6d7dc4f160594a313a56f7311c3edd3af68ea1cf 100644
--- a/MAC/APL/PIC/RSP_Driver/src/StationSettings.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/StationSettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/StationSettings.h b/MAC/APL/PIC/RSP_Driver/src/StationSettings.h
index 49dabebc41532cf39e59be00d6df98efe76a403f..8d38cc1592bcb2dcd225375f575e5f8d797c71b7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/StationSettings.h
+++ b/MAC/APL/PIC/RSP_Driver/src/StationSettings.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/StatusRead.cc b/MAC/APL/PIC/RSP_Driver/src/StatusRead.cc
index c6c2c77409a13ba1d1478ca95f91a8c59be6584d..ce817df65edfd872d9387ae2d4b21fe2dbbbd058 100644
--- a/MAC/APL/PIC/RSP_Driver/src/StatusRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/StatusRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -42,9 +42,6 @@ StatusRead::StatusRead(GCFPortInterface& board_port, int board_id)
: SyncAction(board_port, board_id, 1)
{
memset(&m_hdr, 0, sizeof(MEPHeader));
-
- // this action should be performed at initialisation
- //doAtInit();
}
StatusRead::~StatusRead()
@@ -113,29 +110,26 @@ GCFEvent::TResult StatusRead::handleack(GCFEvent& event, GCFPortInterface& /*por
// if cache value different from hardware reported value, make equal
switch (ack.board.rsp.bp_clock) {
- case 125:
case 160:
case 200:
if (0 == getBoardId()) {
if (0 == Cache::getInstance().getBack().getClock()) {
-
#if 0
- LOG_INFO_STR(formatString("Receiving initial clock setting from RSP board: %d MHz. Adjusting cache value.",
- ack.board.rsp.bp_clock));
- Cache::getInstance().getFront().getClock() = ack.board.rsp.bp_clock;
- Cache::getInstance().getBack().getClock() = ack.board.rsp.bp_clock;
+ LOG_INFO_STR(formatString("Receiving initial clock setting from RSP board: %d MHz. Adjusting cache value.",
+ ack.board.rsp.bp_clock));
+ Cache::getInstance().getFront().getClock() = ack.board.rsp.bp_clock;
+ Cache::getInstance().getBack().getClock() = ack.board.rsp.bp_clock;
#endif
-
} else if (ack.board.rsp.bp_clock != Cache::getInstance().getBack().getClock()) {
- LOG_WARN_STR(formatString("Reported clock (%d MHz) is different from cache settings (%d MHz) on RSP board %d",
- ack.board.rsp.bp_clock, Cache::getInstance().getBack().getClock(), getBoardId()));
+ LOG_WARN_STR(formatString("Reported clock (%d MHz) is different from cache settings (%d MHz) on RSP board %d",
+ ack.board.rsp.bp_clock, Cache::getInstance().getBack().getClock(), getBoardId()));
}
}
break;
default:
LOG_WARN_STR(formatString("Invalid clock setting received from RSP board (%d): %d MHz",
- getBoardId(), ack.board.rsp.bp_clock));
+ getBoardId(), ack.board.rsp.bp_clock));
break;
}
diff --git a/MAC/APL/PIC/RSP_Driver/src/StatusRead.h b/MAC/APL/PIC/RSP_Driver/src/StatusRead.h
index b0deb477f961fc676d64c052aaca9e959291f603..f26f4ef3dc1c6b57f411285395485f8f00ed3aa1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/StatusRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/StatusRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc b/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc
index 2c1c9efd0d6853a819bde17b8cd13ef8eb2a1a05..3398a694c80e3a9a470050645f4ae0fa4338f3b9 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SyncAction.h b/MAC/APL/PIC/RSP_Driver/src/SyncAction.h
index c8f97d8c4ba48ce4a8c1bdc7ae7faa7f3035fbe7..e9e6f21d42998d22986e29cd358cedaabf523f30 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SyncAction.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SyncAction.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc
index b1fafd196e72027905e4bef79689ec337ef61b33..94ba61b62ae6c2aadd55d38707f89d343d450375 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h
index c6dfae6a28b18f35707d3d74dc3f111d67deaf9f..69de1cce0c3f8df3cca8775f885d3fe1fd119a2f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc
index 66871e76d5aae2b18bd3ae35062105b483186ba5..58136928382eb9aba57d661950f83762ed59648a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h
index 5f27f637aa6776cddcc4dcf46bb5ef229bf3feaf..c7711d67a33f4680cd4f9b930863f03e7790b35f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc
index 4036cff380290b417cc02813fd124856e02824d2..99fbde0cb0917919287becbf5441a14501d7767d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -46,83 +46,97 @@ using namespace EPA_Protocol;
namespace LOFAR {
namespace RSP {
- static uint8 tds_pll[
- TDS_INIT_SIZE
- + TDS_PROGRAMPLLS_SIZE] = {
-
- // program pll
- TDS_INIT,
- TDS_PROGRAMPLLS,
- };
-
- uint8 tds_pll_result[
- TDS_INIT_RESULT_SIZE
- + TDS_PROGRAMPLLS_RESULT_SIZE] = {
-
- TDS_INIT_RESULT,
- TDS_PROGRAMPLLS_RESULT,
- };
-
-
static uint8 tds_160MHz[
- TDS_160MHZ_SIZE
- + TDS_C_END_SIZE] = {
-
- // switch to 160MHz to backplane (using 10MHz reference at the front)
- TDS_160MHZ,
- TDS_C_END,
-
- };
-
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT_SIZE
+ + TDS_PROGRAMPLLS_SIZE
+#endif
+ + TDS_160MHZ_SIZE
+ + TDS_C_END_SIZE] = {
+
+ // switch to 160MHz to backplane (using 10MHz reference at the front)
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT,
+ TDS_PROGRAMPLLS,
+#endif
+ TDS_160MHZ,
+ TDS_C_END,
+
+ };
+
uint8 tds_160MHz_result[
- TDS_160MHZ_RESULT_SIZE
- + TDS_C_END_RESULT_SIZE] = {
-
- TDS_160MHZ_RESULT,
- TDS_C_END_RESULT,
-
- };
-
- static uint8 tds_200MHz[
- TDS_200MHZ_SIZE
- + TDS_C_END_SIZE] = {
-
- // switch to 200MHz to backplane (using 10MHz reference at the front)
- TDS_200MHZ,
- TDS_C_END,
-
- };
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT_RESULT_SIZE
+ + TDS_PROGRAMPLLS_RESULT_SIZE
+#endif
+ + TDS_160MHZ_RESULT_SIZE
+ + TDS_C_END_RESULT_SIZE] = {
+
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT_RESULT,
+ TDS_PROGRAMPLLS_RESULT,
+#endif
+ TDS_160MHZ_RESULT,
+ TDS_C_END_RESULT,
+
+ };
+
+ static uint8 tds_200MHz[
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT_SIZE
+ + TDS_PROGRAMPLLS_SIZE
+#endif
+ + TDS_200MHZ_SIZE
+ + TDS_C_END_SIZE] = {
+
+ // switch to 200MHz to backplane (using 10MHz reference at the front)
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT,
+ TDS_PROGRAMPLLS,
+#endif
+ TDS_200MHZ,
+ TDS_C_END,
+
+ };
uint8 tds_200MHz_result[
- + TDS_200MHZ_RESULT_SIZE
- + TDS_C_END_RESULT_SIZE] = {
-
- TDS_200MHZ_RESULT,
- TDS_C_END_RESULT,
-
- };
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT_RESULT_SIZE
+ + TDS_PROGRAMPLLS_RESULT_SIZE
+#endif
+ + TDS_200MHZ_RESULT_SIZE
+ + TDS_C_END_RESULT_SIZE] = {
+
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT_RESULT,
+ TDS_PROGRAMPLLS_RESULT,
+#endif
+ TDS_200MHZ_RESULT,
+ TDS_C_END_RESULT,
+
+ };
static uint8 tds_off[ TDS_VCXO_OFF_SIZE
- + TDS_OFF_SIZE
- + TDS_C_END_SIZE] = {
+ + TDS_OFF_SIZE
+ + TDS_C_END_SIZE] = {
- // switch off clock to backplane, RSP should switch to 125MHz
- TDS_VCXO_OFF,
- TDS_OFF,
- TDS_C_END,
+ // switch off clock to backplane, RSP should switch to 125MHz
+ TDS_VCXO_OFF,
+ TDS_OFF,
+ TDS_C_END,
- };
+ };
uint8 tds_off_result[ TDS_VCXO_OFF_RESULT_SIZE
- + TDS_OFF_RESULT_SIZE
- + TDS_C_END_RESULT_SIZE] = {
+ + TDS_OFF_RESULT_SIZE
+ + TDS_C_END_RESULT_SIZE] = {
- TDS_VCXO_OFF_RESULT,
- TDS_OFF_RESULT,
- TDS_C_END_RESULT,
+ TDS_VCXO_OFF_RESULT,
+ TDS_OFF_RESULT,
+ TDS_C_END_RESULT,
- };
+ };
};
};
@@ -166,11 +180,6 @@ void TDSProtocolWrite::sendrequest()
size_t size = 0;
- // select clock
- // 160 or 200 [MHz] (extern td clock)
- // 125 [MHz] (intern board clock)
- // 0 programm pll
-
switch (Cache::getInstance().getBack().getClock()) {
case 160:
buf = (char*)tds_160MHz;
@@ -192,7 +201,7 @@ void TDSProtocolWrite::sendrequest()
tdsprotocol.hdr.set(MEPHeader::TDS_PROTOCOL_HDR, MEPHeader::DST_RSP, MEPHeader::WRITE, size, m_offset);
break;
- case 125:
+ default:
buf = (char*)tds_off;
if (0 == getCurrentIndex()) {
m_remaining = sizeof(tds_off);
@@ -201,23 +210,13 @@ void TDSProtocolWrite::sendrequest()
size = MIN(TDS_CHUNK_SIZE, m_remaining);
tdsprotocol.hdr.set(MEPHeader::TDS_PROTOCOL_HDR, MEPHeader::DST_RSP, MEPHeader::WRITE, size, m_offset);
break;
-
- default:
- buf = (char*)tds_pll;
- if (0 == getCurrentIndex()) {
- m_remaining = sizeof(tds_pll);
- m_offset = 0;
- }
- size = MIN(TDS_CHUNK_SIZE, m_remaining);
- tdsprotocol.hdr.set(MEPHeader::TDS_PROTOCOL_HDR, MEPHeader::DST_RSP, MEPHeader::WRITE, size, m_offset);
- break;
}
tdsprotocol.protocol.setBuffer((char*)buf + m_offset, size);
// indicate that we're initialising the hardware
LOG_INFO_STR(formatString("Sending clock setting (offset=%d) via RSP board %d: %d MHz",
- m_offset, getBoardId(), Cache::getInstance().getBack().getClock()));
+ m_offset, getBoardId(), Cache::getInstance().getBack().getClock()));
// advance
m_remaining -= size;
@@ -240,7 +239,7 @@ GCFEvent::TResult TDSProtocolWrite::handleack(GCFEvent& event, GCFPortInterface&
LOG_WARN("TDSProtocolWrite::handleack:: unexpected ack");
return GCFEvent::NOT_HANDLED;
}
-
+
EPAWriteackEvent ack(event);
if (!ack.hdr.isValidAck(m_hdr))
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h
index d4407aadd1e345457a365d81c82661bc60ae6b2f..f217fc6983a24798ac842648ff3672bbba69a99d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc
index 12d59971ecbf06e56826eb0efdcf1a5c3853fe8b..d047aa7fb81d6bc992576f812762c49b6baa8d15 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h
index fb72528fbf4331fd72eede83b9b66b47befbe489..af031519e4f9696f70a67a9e9a937b8fa83dc060 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc
index 4c63b59629ea44bb868b66b172baf1a5d17be241..1cf72ef5c5a8f2095bee6146f4d2067e453632a0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h
index ec479f8b135bc6b6ac6510bc04ba5e059437765a..a1ec1407fe7aee4ad70950dbe5246307bc3e590b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc
index f15c839fb4ee238a3e2c3f78ca90aa6a22c9ecbf..4c5f9337c8a5c713a6e15d721c857e9950a92ad1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h
index 4f15fca0995b70195c2f01cad23f33a49435d33e..d4126ad3cc39ad184ed04f64ccd76b5ace8751f1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc
index 773ff801725bb7bb066d95cefffad0bb88142b43..731c380b061a810eaa28b8c1c0d4b75f103af66b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h
index ec2388df95d743574de6d7b142eb9d02a9583217..e2c72720a98371938ff1575c0b5d67ec97d21eef 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h b/MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h
index 1c20f0f584023a438be44230124316bcea3c6a90..b9413b545a90417f81afb8ecf765b8df3882cdff 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -404,24 +404,30 @@
namespace LOFAR {
namespace RSP {
-
- extern uint8 tds_pll_result[ TDS_INIT_RESULT_SIZE
- + TDS_PROGRAMPLLS_RESULT_SIZE ];
-
- extern uint8 tds_160MHz_result[ TDS_160MHZ_RESULT_SIZE
- + TDS_C_END_RESULT_SIZE ];
-
- extern uint8 tds_200MHz_result[ TDS_200MHZ_RESULT_SIZE
- + TDS_C_END_RESULT_SIZE ];
-
- extern uint8 tds_off_result[ TDS_VCXO_OFF_RESULT_SIZE
- + TDS_OFF_RESULT_SIZE
- + TDS_C_END_RESULT_SIZE ];
+ extern uint8 tds_160MHz_result[
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT_RESULT_SIZE
+ + TDS_PROGRAMPLLS_RESULT_SIZE
+#endif
+ + TDS_160MHZ_RESULT_SIZE
+ + TDS_C_END_RESULT_SIZE];
+
+ extern uint8 tds_200MHz_result[
+#ifndef DISABLE_PROGRAMPLL
+ TDS_INIT_RESULT_SIZE
+ + TDS_PROGRAMPLLS_RESULT_SIZE
+#endif
+ + TDS_200MHZ_RESULT_SIZE
+ + TDS_C_END_RESULT_SIZE];
+
+ extern uint8 tds_off_result[ TDS_VCXO_OFF_RESULT_SIZE
+ + TDS_OFF_RESULT_SIZE
+ + TDS_C_END_RESULT_SIZE];
extern uint8 tds_readstatus_result[ TDS_READ_LOCKDETECT_RESULT_SIZE
+ TDS_READ_VOLT_RESULT_SIZE
+ TDS_READ_SPU_RESULT_SIZE
- + TDS_C_END_RESULT_SIZE ];
+ + TDS_C_END_RESULT_SIZE];
};
};
diff --git a/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc
index c903fc8ebeb10c982362c3c4c4990b933f449e11..26e08d0a22ee2410bd8f648a64b7c2779e69b1be 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h
index 7ac4f85b314c742d6a10a56ad2eaeee311ef19ef..56e1e0078580fefb419daece0b68154cb7ec397c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.cc
index ce7ba2295efebadc9303465e17385c2f39c165d8..9655a33ed621e3722cd5da5e4a9ba1ba8a3910ee 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.h
index 99ef4331301e93610699399e079207ec6450ef62..78223d56e805014a9f67934896cc74ddc6fe304f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc
index de366f1fc762a6ffe54adbcb49fba810fbd23fb9..eb77d85aa1b2bd182c3bc3e3d63cff1ca123b819 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h
index 82a62c416c769d87028cc09f60f7b46db47b6768..ee5b282a044240a9e4a1c7efb48e62458e19231f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc
index 0ba84a806cc19fb397933477649ec722e2c22930..4589acd10bbd95e084bf69d9601f12c92d1e70c4 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h
index e7b14437761f136ceb1322b628182c3c6b46d073..dca72d593f8c57f666d0bd5b4697a1a81fc4046b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc
index 61f1c4b073ff5751e0363cfe9c18dd2cea2a646f..845b0b1a35a94c57b9dd1ce9a083eea24b78db96 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h
index bdab1f3d8275cf93587abc61840f724ba6a529ac..fe09b06a661867348ff2d7f0e157d1f391b66320 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc
index c8408ceb852e174759cd506e4d8de2c2e7881d20..6bf4f6aa2a2ee1b37487b499a51426a5f9463242 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h
index c0acb0542bef3c58b59d3be06520babd332ad825..8b362e6301a299e84720543771870ff23950a772 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.cc
index c45c0a87f850893033d6d34ee8fd93d37cb6f982..f301e07caad3f2e17d5d408db5545d8e49386876 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.h
index d0d19401dd92d5faa6c5f4f33d40aee48921bba4..c1a3f80ad283b01fe15157502ecb1a939f744d3f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc
index a4043280e498e02f484b4e78fe2e8e2ad9afcc1e..3a107556f9bad4235f0ddc56c8139687e898c795 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h
index 42ff37f740201e10c08cd59484a552a4a762c2f9..c4616a2d95ba00a37d66450c48de5f68f95c48ef 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc
index 5f1248383663abf219b337bb96e95451f83613d4..8c3d41bcf1e3374dbf124c7ef3ee498a0c00bedc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h
index 984f75e167859fb61e95d457a1e0fbf0c802b71b..0609137ad4fe96749dee4f1ad3880ccd1d500f6f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc
index 712b455b5b692bcf1ff96d45a4ab70957967c796..82c179f93d64394a3ada68c00440342ec6dc5ccd 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h
index 7b911324306d9ba477b9f9c810fdbdd52ecab91e..8c9788dcd52db984ad5ce20c94347c0602e7f086 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc
index 2842f90015870aba321d73c89ffd208c2f4f88e8..4164f1cf5d4a14132e8e7076d5508e6af1bd2dec 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h
index d43d713e9b9e4c7a3802f2a7e10ae36d6653942c..215b0bc8d77dbc1a9cd75dbe36432bc072d9b07f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc
index 4a56db976f4dad8245e487432c325882000b3fb4..45c21ee3b6fecab8b9109e8d83c513aef1573ba3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h
index d7d9f61b9908e9e744af4f3e769324673aeb5e0b..4882e4a8ce3caa26195eb3ccb1b4b288839b71aa 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc
index 00c4cf7caa8800b609aa73a91f4514e7d301ba7d..438732b38437a923513b46f8416a4fc0e4a2e2b3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/VersionsRead.h b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.h
index 71898afdab5e699ebb339ca155699cdcaa02974d..9d04851242909834a3c8edf5359b6cb37ed7aecc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/VersionsRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WGRead.cc b/MAC/APL/PIC/RSP_Driver/src/WGRead.cc
index 145e778e26dfc001f46670305c5045c8a3d0e823..3c79093958a4cded7c66217786509b4ae79c634a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WGRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/WGRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WGRead.h b/MAC/APL/PIC/RSP_Driver/src/WGRead.h
index ce1cdec87e7cdf6c97202d55a5f048be5eb04a60..831b3c12512e3e6a9598d8b80c6a60de53ce70dd 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WGRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/WGRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WGWrite.cc b/MAC/APL/PIC/RSP_Driver/src/WGWrite.cc
index f00b82de3be53b9fa9c0de285d64c645fb555daa..fe3f55f5ef1495810c0db9b87b6fa5e20d24d468 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WGWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/WGWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WGWrite.h b/MAC/APL/PIC/RSP_Driver/src/WGWrite.h
index f33fbf8699827fbfde8753bd58fd3b4d656a43e0..92b02a5cd4877640ee421d3f8078b727f553ba3c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WGWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/WGWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WriteReg.cc b/MAC/APL/PIC/RSP_Driver/src/WriteReg.cc
index 5d07180ae38367adafee0372d3ee5def94514869..e14e96792d6b411db29073f441a66a3857f2cc61 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WriteReg.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/WriteReg.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WriteReg.h b/MAC/APL/PIC/RSP_Driver/src/WriteReg.h
index 4f166a7f34d16729ee0c1b8de52f7f732459bcbc..45d97d627d9fe4b720b28e0f8e8ef7e048e5a3fa 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WriteReg.h
+++ b/MAC/APL/PIC/RSP_Driver/src/WriteReg.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/XWWrite.cc b/MAC/APL/PIC/RSP_Driver/src/XWWrite.cc
index 020885f58f0d0b00294b21fd22be837fdfa5b6ae..cb0199bc0251b88f0294514ef8515c0d83c27e02 100644
--- a/MAC/APL/PIC/RSP_Driver/src/XWWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/XWWrite.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/XWWrite.h b/MAC/APL/PIC/RSP_Driver/src/XWWrite.h
index 605b96a277202e069e1f27f18762a3782eb93034..f6c77ff3004fa15e658c3dd74aad41f5d9993eaa 100644
--- a/MAC/APL/PIC/RSP_Driver/src/XWWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/XWWrite.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/XstRead.cc b/MAC/APL/PIC/RSP_Driver/src/XstRead.cc
index fff424052909958d6ad69541ec9793e4e3eef87c..59938472ef280b65db1ba8ae376f1b6a8a27c7c8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/XstRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/XstRead.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/XstRead.h b/MAC/APL/PIC/RSP_Driver/src/XstRead.h
index 4cd934c9bca46d8841fe271fb66f7115ec61049d..2e43cf653bccfbf847f81840ceb477ba5118dbe8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/XstRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/XstRead.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/rspctl.cc b/MAC/APL/PIC/RSP_Driver/src/rspctl.cc
index 7cd4b604a2b13e0c6b3d80c4e1b30c04ba68ff42..0a6c9a1b00cabcf65dcaec2a51534c3351acd2d8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/rspctl.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/rspctl.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/rspctl.h b/MAC/APL/PIC/RSP_Driver/src/rspctl.h
index ba8a26a2845ef4d7ea1a643d07f4f58b20572975..049dc5c2a5cb9432e3b59089e8bc8a0537a61eda 100644
--- a/MAC/APL/PIC/RSP_Driver/src/rspctl.h
+++ b/MAC/APL/PIC/RSP_Driver/src/rspctl.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/rspd.ul.in b/MAC/APL/PIC/RSP_Driver/src/rspd.ul.in
index b06c9817ecd98537bf76f5e0ce1ddf8cec678506..f006b8e9079c24a0e56b94331c6b7efdf7f51029 100644
--- a/MAC/APL/PIC/RSP_Driver/src/rspd.ul.in
+++ b/MAC/APL/PIC/RSP_Driver/src/rspd.ul.in
@@ -2,7 +2,7 @@
#
# Copyright (C) 2003
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/EPAStub.cc b/MAC/APL/PIC/RSP_Driver/test/EPAStub.cc
index b792a6f1d1b98169676d274e0c252873718171cf..445b5df844d904d9d45eae7b3f1bc39a1eae7701 100644
--- a/MAC/APL/PIC/RSP_Driver/test/EPAStub.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/EPAStub.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/EPAStub.h b/MAC/APL/PIC/RSP_Driver/test/EPAStub.h
index c08c32d7abe35493ae412716c5b600485d672c29..2871c0cb8134b74ae5a469cc7ba7aafb8024f79d 100644
--- a/MAC/APL/PIC/RSP_Driver/test/EPAStub.h
+++ b/MAC/APL/PIC/RSP_Driver/test/EPAStub.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/RSPTest.cc b/MAC/APL/PIC/RSP_Driver/test/RSPTest.cc
index 4cadff8edd9f75d1506d8685848275adf2c0a21b..a9f3e3b2067988b919be3450072b7daf6630edf4 100644
--- a/MAC/APL/PIC/RSP_Driver/test/RSPTest.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/RSPTest.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/RSPTest.h b/MAC/APL/PIC/RSP_Driver/test/RSPTest.h
index 1ff6bf35791bfd8551200834e9aaa8bd8dc69b0f..76c8c9532d0fa6178e2e995cc7991da92eae517f 100644
--- a/MAC/APL/PIC/RSP_Driver/test/RSPTest.h
+++ b/MAC/APL/PIC/RSP_Driver/test/RSPTest.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h b/MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h
index 872aa7add8088fb01e0b9bdaca134e4e931bd218..de958deba4b89954ef5536692a2330bc46c27b34 100644
--- a/MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h
+++ b/MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h
@@ -5,7 +5,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
index c713949a6f753e67e58fe6d31de1c2a9c408e356..6e13bdd3dd27223857dbf27eecab5fe04fc5faba 100644
--- a/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
index 77f8040944adc1c396366e9125aa5449d857d69d..710592cc0b7b4195afc114755fba1f0763765d0b 100644
--- a/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/AllRegisterState.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/AllRegisterState.h
index 56ad7e7e96635c6c114cf24c3c7c43107f30dda7..0e673274120a597de3227dd3963c69dffe38e62e 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/AllRegisterState.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/AllRegisterState.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BeamletWeights.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BeamletWeights.h
index ead025fed00bcefa31e45ca08ecd56256baacd94..3a4490ddd964d427b107ad2dc0833435dd59d7cd 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BeamletWeights.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BeamletWeights.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Bitmode.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Bitmode.h
index 3540baf31be8354c96efb393edda1449c52401f4..931cb954c1ef0389d8f2279d4eaca750fc1e2dac 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Bitmode.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Bitmode.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BypassSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BypassSettings.h
index aa63e5c6db9442e967a62c1e3a1bcacf85f02321..b7ca02e17ce001021520cf80f311e1b4a0e1f85f 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BypassSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BypassSettings.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/HBASettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/HBASettings.h
index df19c5d1bde2c9e9f0aba0703dd895e60ead90a0..7339e7108250cc5435f5b2a798f4e7e2da07e22d 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/HBASettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/HBASettings.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Latency.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Latency.h
index 3016483f69fe47bcb61ef03681a9edd226e36afc..e4a77f31026bbd4928095cf36570720fd6eef654 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Latency.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Latency.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPData.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPData.h
index 1eb9afe7d33cf9963c6dc2502afff75affde38e1..fa51d71ed4f61be96b1fd313b741f5ba4c457602 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPData.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPData.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPHeader.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPHeader.h
index 4959f98c571f7d6a78bdc5c70938c542bfdac7db..11f188a0f67f9b208a2018f21f6b520eb243a3d3 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPHeader.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPHeader.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RCUSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RCUSettings.h
index 5f7faf0099c6c93abd0b7dfceb9de8da529e4c74..bea7241826b05882f1813d58bd068e81469fe429 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RCUSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RCUSettings.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
@@ -37,268 +37,268 @@ namespace LOFAR {
namespace RSP_Protocol {
// Note: The rcucontrol value is presented in the user interface as an uint32 value.
-// This is the m_value byte that is stored in the Control (sub)class. Unfortunately
-// this value can be written to one register on the RSPboards. The lowest byte
-// (value & RCU_HANDLER_MASK) must be written to one register and the highest part
-// (value & RCU_PROTOCOL_MASK) must be written to an i2c register.
-// To know which write-actions must be performed the Control class keeps track of a
-// m_modified mask that knows which bits where modified.
-// The Commands that apply the RCUsetting to the cache use this mask to determine
-// which write-actions must be triggered.
+// This is the m_value byte that is stored in the Control (sub)class. Unfortunately
+// this value can be written to one register on the RSPboards. The lowest byte
+// (value & RCU_HANDLER_MASK) must be written to one register and the highest part
+// (value & RCU_PROTOCOL_MASK) must be written to an i2c register.
+// To know which write-actions must be performed the Control class keeps track of a
+// m_modified mask that knows which bits where modified.
+// The Commands that apply the RCUsetting to the cache use this mask to determine
+// which write-actions must be triggered.
class RCUSettings
{
public:
- RCUSettings() {}
- virtual ~RCUSettings() {}
-
- class Control
- {
- public:
- Control() : m_value(0x00000000), m_modified(0x00000000) {}
-
- // no virtual to prevent creation of virtual pointer table
- // which adds to the size of the struct
- ~Control() {}
-
- typedef enum {
- MODE_OFF = 0, // 0x00000000
- MODE_LBL_HPF10MHZ = 1, // 0x00017900
- MODE_LBL_HPF30MHZ = 2, // 0x00057900
- MODE_LBH_HPF10MHZ = 3, // 0x00037A00
- MODE_LBH_HPF30MHZ = 4, // 0x00077A00
- MODE_HB_110_190MHZ = 5, // 0x0007A400
- MODE_HB_170_230MHZ = 6, // 0x00079400
- MODE_HB_210_290MHZ = 7, // 0x00078400
- } RCUMode;
- static const int N_MODES = 8;
-
- // Set the mode of the receiver.
- void setMode(RCUMode mode) {
- m_value &= ~MODE_MASK; // clear mode bits
- m_value |= (m_mode[mode % N_MODES] & MODE_MASK); // set new mode bits
- m_modified |= MODE_MASK;
- }
- int getMode() {
- switch (m_value & MODE_MASK) {
- case 0x00003000: return(0);
- case 0x00017900: return(1);
- case 0x00057900: return(2);
- case 0x00037A00: return(3);
- case 0x00077A00: return(4);
- case 0x0007A400: return(5);
- case 0x00079400: return(6);
- case 0x00078400: return(7);
- default: return (-1);
- }
- }
- bool isModeOff() {
- return !(m_value & MODE_MASK);
- }
- bool isModeModified() {
- return (m_modified & MODE_MASK);
- }
-
- // Return the number of the Nyquist zone for the
- // current receiver setting.
- // 0 = indeterminate
- // 1 = Nyquist zone I
- // 2 = Nyquist zone II
- // 3 = Nyquist zone III
- int getNyquistZone() const;
-
- bool LBAfilter() const { return (!HBAinput() && (m_value & _30MHZ_MASK)); }
-
- bool LBLinput() const { return ((m_value & INPUT_SEL) == (LBL_EN | BANDSEL | VL_EN)); }
- bool LBHinput() const { return ((m_value & INPUT_SEL) == (LBH_EN | BANDSEL | VL_EN)); }
- bool HBAinput() const { return ((m_value & INPUT_SEL) == (HB_EN | VH_EN)); }
-
- // Set the raw control bytes of a RCU
- // Each RCU has 4 bytes:
- // mask meaning explanation
- // 0x0000007F INPUT_DELAY Sample delay for the data from the RCU.
- // 0x00000080 INPUT_ENABLE Enable RCU input
- //
- // 0x00000100 LBL-EN supply LBL antenna on (1) or off (0)
- // 0x00000200 LBH-EN sypply LBH antenna on (1) or off (0)
- // 0x00000400 HB-EN supply HB on (1) or off (0)
- // 0x00000800 BANDSEL low band (1) or high band (0)
- // 0x00001000 HB-SEL-0 HBA filter selection
- // 0x00002000 HB-SEL-1 HBA filter selection
- // Options : HBA-SEL-0 HBA-SEL-1 Function
- // 0 0 210-270 MHz
- // 0 1 170-230 MHz
- // 1 0 110-190 MHz
- // 1 1 all off
- // 0x00004000 VL-EN low band supply on (1) or off (0)
- // 0x00008000 VH-EN high band supply on (1) or off (0)
- //
- // 0x00010000 VDIG-EN ADC supply on (1) or off (0)
- // 0x00020000 LB-SEL-0 LBA input selection
- // 0x00040000 LB-SEL-1 HP filter selection
- // Options : LB-SEL-0 LB-SEL-1 Function
- // 0 0 10-90 MHz + 10 MHz HPF
- // 0 1 30-80 MHz + 10 MHz HPF
- // 1 0 10-90 MHz + 30 MHz HPF
- // 1 1 30-80 MHz + 30 MHz HPF
- // 0x00080000 ATT-CNT-4 on (1) is 1dB attenuation
- // 0x00100000 ATT-CNT-3 on (1) is 2dB attenuation
- // 0x00200000 ATT-CNT-2 on (1) is 4dB attenuation
- // 0x00300000 ATT-CNT-1 on (1) is 8dB attenuation
- // 0x00800000 ATT-CNT-0 on (1) is 16dB attenuation
- //
- // 0x01000000 PRSG pseudo random sequence generator on (1), off (0)
- // 0x02000000 RESET on (1) hold board in reset
- // 0x04000000 free used to be SPEC_INV, SI now in DIAG/Bypass
- // 0x08000000 TBD reserved
- // 0xF0000000 VERSION RCU version //PD
- void setRaw(uint32 raw) { m_value = raw; m_modified = 0xFFFFFFFF; }
- uint32 getRaw() const { return m_value; }
- // set protocol part of the raw byte
- void setProtocolRaw(uint32 raw) {
- m_value = (m_value & RCU_HANDLER_MASK) | (raw & RCU_PROTOCOL_MASK);
- m_modified = RCU_PROTOCOL_MASK;
- }
-
- // Enable (true) or disable (false) pseudo random sequence generator.
- void setPRSG(bool value) {
- if (value) m_value |= PRSG_MASK; // set PRSG bit
- else m_value &= ~PRSG_MASK; // clear PRSG bit
- m_modified |= PRSG_MASK;
- }
- bool getPRSG() const { return (m_value & PRSG_MASK) >> (16 + 8); }
-
- // Enable (true) or disable (false) reset on RCU.
- void setReset(bool value) {
- if (value) m_value |= RESET_MASK; // set RESET bit
- else m_value &= ~RESET_MASK; // clear RESET bit
- m_modified |= RESET_MASK;
- }
- bool getReset() const { return (m_value & RESET_MASK) >> (17 + 8); }
-
- // Set attenuation. Valid values are 0..31 (5 bits).
- void setAttenuation(uint8 value) {
- // useful bits should be is in lower 5 bits
- value &= 0x1F;
- m_value &= ~ATT_MASK; // clear mode bits
- // cast value to uint32 to allow << 11, set new mode bits
- m_value |= (((uint32)value << (11 + 8)) & ATT_MASK);
- m_modified |= ATT_MASK;
- }
- uint8 getAttenuation() const { return (m_value & ATT_MASK) >> (11 + 8); }
-
- // Set sample delay (true time delay). Valid values are 0..127 (7 bits)
- void setDelay(uint8 value) {
- m_value &= ~DELAY_MASK;
- m_value |= (value & DELAY_MASK);
- m_modified |= DELAY_MASK;
- }
- uint8 getDelay() const { return m_value & DELAY_MASK; }
-
- // Set rcu enable (0 = disable, 1 = enable)
- void setEnable(uint8 value) {
- if (value) m_value |= ENABLE_MASK; // set ENABLE bit
- else m_value &= ~ENABLE_MASK; // clear ENABLE bit
- m_modified |= ENABLE_MASK;
- }
- bool getEnable() const { return m_value & ENABLE_MASK; }
-
- // Set rcu version //PD
- void setVersion(uint8 value) {
- m_value &= ~VERSION_MASK; // clear VERSION bit
- if (value) m_value |= ((value & 0x0F) << (20 + 8)); // set VERSION bits
- m_modified |= VERSION_MASK;
- }
- uint8 getVersion() const { return (m_value & VERSION_MASK) >> (20 + 8); }
-
- // Get RCU handler and RCU protocol settings separately
- bool isHandlerModified() { return (m_modified & RCU_HANDLER_MASK); }
- bool isProtocolModified() { return (m_modified & RCU_PROTOCOL_MASK); }
- bool isEnableModified() { return (m_modified & ENABLE_MASK); }
-
- // Reset value and modified mask.
- void reset() {
- m_value = 0x00000000;
- m_modified = 0x00000000;
- }
-
- // Return modification mask
- uint32 getModified() const { return m_modified; }
-
- // Assignment
- Control& operator=(const Control& rhs) {
- if (this != &rhs) { // prevent self-assignment
- m_value &= ~rhs.m_modified; // clear the modified bits
- m_value |= (rhs.m_value & rhs.m_modified); // set the modified bits with new values
- m_modified |= rhs.m_modified; // combine the masks
- }
- return *this;
- }
-
- // Copy constructor
- Control(const Control& rhs) {
- this->reset(); // reset m_value and m_modified
- *this = rhs;
- }
-
- // print function for operator<<
- ostream& print (ostream& os) const
- { os << formatString("%08X", m_value); return (os); }
-
- private:
- // constants used to set the appropriate mode
- static const uint32 m_mode[];
-
- // masks used to set/get bits
- static const uint32 DELAY_MASK = 0x0000007F;
- static const uint32 ENABLE_MASK = 0x00000080;
- static const uint32 _30MHZ_MASK = 0x00040000;
- static const uint32 MODE_MASK = 0x0007FF00;
- static const uint32 ATT_MASK = 0x00F80000;
- static const uint32 PRSG_MASK = 0x01000000;
- static const uint32 RESET_MASK = 0x02000000;
- static const uint32 SPECINV_MASK = 0x04000000;
- static const uint32 VERSION_MASK = 0xF0000000; //PD
-
- static const uint32 LBL_EN = 0x00000100;
- static const uint32 LBH_EN = 0x00000200;
- static const uint32 HB_EN = 0x00000400;
- static const uint32 BANDSEL = 0x00000800;
- static const uint32 VL_EN = 0x00004000;
- static const uint32 VH_EN = 0x00008000;
- static const uint32 INPUT_SEL = 0x0000CF00;
-
- static const uint32 RCU_HANDLER_MASK = 0x000000FF;
- static const uint32 RCU_PROTOCOL_MASK = 0xFFFFFF00;
-
- // ----- datamembers -----
- uint32 m_value;
- uint32 m_modified; // mask of modified bits
- }; // class Control
-
- /* get reference settings array */
- blitz::Array<Control, 1>& operator()();
+ RCUSettings() {}
+ virtual ~RCUSettings() {}
+
+ class Control
+ {
+ public:
+ Control() : m_value(0x00000000), m_modified(0x00000000) {}
+
+ // no virtual to prevent creation of virtual pointer table
+ // which adds to the size of the struct
+ ~Control() {}
+
+ typedef enum {
+ MODE_OFF = 0, // 0x00000000
+ MODE_LBL_HPF10MHZ = 1, // 0x00017900
+ MODE_LBL_HPF30MHZ = 2, // 0x00057900
+ MODE_LBH_HPF10MHZ = 3, // 0x00037A00
+ MODE_LBH_HPF30MHZ = 4, // 0x00077A00
+ MODE_HB_110_190MHZ = 5, // 0x0007A400
+ MODE_HB_170_230MHZ = 6, // 0x00079400
+ MODE_HB_210_290MHZ = 7, // 0x00078400
+ } RCUMode;
+ static const int N_MODES = 8;
+
+ // Set the mode of the receiver.
+ void setMode(RCUMode mode) {
+ m_value &= ~MODE_MASK; // clear mode bits
+ m_value |= (m_mode[mode % N_MODES] & MODE_MASK); // set new mode bits
+ m_modified |= MODE_MASK;
+ }
+ int getMode() {
+ switch (m_value & MODE_MASK) {
+ case 0x00003000: return(0);
+ case 0x00017900: return(1);
+ case 0x00057900: return(2);
+ case 0x00037A00: return(3);
+ case 0x00077A00: return(4);
+ case 0x0007A400: return(5);
+ case 0x00079400: return(6);
+ case 0x00078400: return(7);
+ default: return (-1);
+ }
+ }
+ bool isModeOff() {
+ return !(m_value & MODE_MASK);
+ }
+ bool isModeModified() {
+ return (m_modified & MODE_MASK);
+ }
+
+ // Return the number of the Nyquist zone for the
+ // current receiver setting.
+ // 0 = indeterminate
+ // 1 = Nyquist zone I
+ // 2 = Nyquist zone II
+ // 3 = Nyquist zone III
+ int getNyquistZone() const;
+
+ bool LBAfilter() const { return (!HBAinput() && (m_value & _30MHZ_MASK)); }
+
+ bool LBLinput() const { return ((m_value & INPUT_SEL) == (LBL_EN | BANDSEL | VL_EN)); }
+ bool LBHinput() const { return ((m_value & INPUT_SEL) == (LBH_EN | BANDSEL | VL_EN)); }
+ bool HBAinput() const { return ((m_value & INPUT_SEL) == (HB_EN | VH_EN)); }
+
+ // Set the raw control bytes of a RCU
+ // Each RCU has 4 bytes:
+ // mask meaning explanation
+ // 0x0000007F INPUT_DELAY Sample delay for the data from the RCU.
+ // 0x00000080 INPUT_ENABLE Enable RCU input
+ //
+ // 0x00000100 LBL-EN supply LBL antenna on (1) or off (0)
+ // 0x00000200 LBH-EN sypply LBH antenna on (1) or off (0)
+ // 0x00000400 HB-EN supply HB on (1) or off (0)
+ // 0x00000800 BANDSEL low band (1) or high band (0)
+ // 0x00001000 HB-SEL-0 HBA filter selection
+ // 0x00002000 HB-SEL-1 HBA filter selection
+ // Options : HBA-SEL-0 HBA-SEL-1 Function
+ // 0 0 210-270 MHz
+ // 0 1 170-230 MHz
+ // 1 0 110-190 MHz
+ // 1 1 all off
+ // 0x00004000 VL-EN low band supply on (1) or off (0)
+ // 0x00008000 VH-EN high band supply on (1) or off (0)
+ //
+ // 0x00010000 VDIG-EN ADC supply on (1) or off (0)
+ // 0x00020000 LB-SEL-0 LBA input selection
+ // 0x00040000 LB-SEL-1 HP filter selection
+ // Options : LB-SEL-0 LB-SEL-1 Function
+ // 0 0 10-90 MHz + 10 MHz HPF
+ // 0 1 30-80 MHz + 10 MHz HPF
+ // 1 0 10-90 MHz + 30 MHz HPF
+ // 1 1 30-80 MHz + 30 MHz HPF
+ // 0x00080000 ATT-CNT-4 on (1) is 1dB attenuation
+ // 0x00100000 ATT-CNT-3 on (1) is 2dB attenuation
+ // 0x00200000 ATT-CNT-2 on (1) is 4dB attenuation
+ // 0x00300000 ATT-CNT-1 on (1) is 8dB attenuation
+ // 0x00800000 ATT-CNT-0 on (1) is 16dB attenuation
+ //
+ // 0x01000000 PRSG pseudo random sequence generator on (1), off (0)
+ // 0x02000000 RESET on (1) hold board in reset
+ // 0x04000000 free used to be SPEC_INV, SI now in DIAG/Bypass
+ // 0x08000000 TBD reserved
+ // 0xF0000000 VERSION RCU version //PD
+ void setRaw(uint32 raw) { m_value = raw; m_modified = 0xFFFFFFFF; }
+ uint32 getRaw() const { return m_value; }
+ // set protocol part of the raw byte
+ void setProtocolRaw(uint32 raw) {
+ m_value = (m_value & RCU_HANDLER_MASK) | (raw & RCU_PROTOCOL_MASK);
+ m_modified = RCU_PROTOCOL_MASK;
+ }
+
+ // Enable (true) or disable (false) pseudo random sequence generator.
+ void setPRSG(bool value) {
+ if (value) m_value |= PRSG_MASK; // set PRSG bit
+ else m_value &= ~PRSG_MASK; // clear PRSG bit
+ m_modified |= PRSG_MASK;
+ }
+ bool getPRSG() const { return (m_value & PRSG_MASK) >> (16 + 8); }
+
+ // Enable (true) or disable (false) reset on RCU.
+ void setReset(bool value) {
+ if (value) m_value |= RESET_MASK; // set RESET bit
+ else m_value &= ~RESET_MASK; // clear RESET bit
+ m_modified |= RESET_MASK;
+ }
+ bool getReset() const { return (m_value & RESET_MASK) >> (17 + 8); }
+
+ // Set attenuation. Valid values are 0..31 (5 bits).
+ void setAttenuation(uint8 value) {
+ // useful bits should be is in lower 5 bits
+ value &= 0x1F;
+ m_value &= ~ATT_MASK; // clear mode bits
+ // cast value to uint32 to allow << 11, set new mode bits
+ m_value |= (((uint32)value << (11 + 8)) & ATT_MASK);
+ m_modified |= ATT_MASK;
+ }
+ uint8 getAttenuation() const { return (m_value & ATT_MASK) >> (11 + 8); }
+
+ // Set sample delay (true time delay). Valid values are 0..127 (7 bits)
+ void setDelay(uint8 value) {
+ m_value &= ~DELAY_MASK;
+ m_value |= (value & DELAY_MASK);
+ m_modified |= DELAY_MASK;
+ }
+ uint8 getDelay() const { return m_value & DELAY_MASK; }
+
+ // Set rcu enable (0 = disable, 1 = enable)
+ void setEnable(uint8 value) {
+ if (value) m_value |= ENABLE_MASK; // set ENABLE bit
+ else m_value &= ~ENABLE_MASK; // clear ENABLE bit
+ m_modified |= ENABLE_MASK;
+ }
+ bool getEnable() const { return m_value & ENABLE_MASK; }
+
+ // Set rcu version //PD
+ void setVersion(uint8 value) {
+ m_value &= ~VERSION_MASK; // clear VERSION bit
+ if (value) m_value |= ((value & 0x0F) << (20 + 8)); // set VERSION bits
+ m_modified |= VERSION_MASK;
+ }
+ uint8 getVersion() const { return (m_value & VERSION_MASK) >> (20 + 8); }
+
+ // Get RCU handler and RCU protocol settings separately
+ bool isHandlerModified() { return (m_modified & RCU_HANDLER_MASK); }
+ bool isProtocolModified() { return (m_modified & RCU_PROTOCOL_MASK); }
+ bool isEnableModified() { return (m_modified & ENABLE_MASK); }
+
+ // Reset value and modified mask.
+ void reset() {
+ m_value = 0x00000000;
+ m_modified = 0x00000000;
+ }
+
+ // Return modification mask
+ uint32 getModified() const { return m_modified; }
+
+ // Assignment
+ Control& operator=(const Control& rhs) {
+ if (this != &rhs) { // prevent self-assignment
+ m_value &= ~rhs.m_modified; // clear the modified bits
+ m_value |= (rhs.m_value & rhs.m_modified); // set the modified bits with new values
+ m_modified |= rhs.m_modified; // combine the masks
+ }
+ return *this;
+ }
+
+ // Copy constructor
+ Control(const Control& rhs) {
+ this->reset(); // reset m_value and m_modified
+ *this = rhs;
+ }
+
+ // print function for operator<<
+ ostream& print (ostream& os) const
+ { os << formatString("%08X", m_value); return (os); }
+
+ private:
+ // constants used to set the appropriate mode
+ static const uint32 m_mode[];
+
+ // masks used to set/get bits
+ static const uint32 DELAY_MASK = 0x0000007F;
+ static const uint32 ENABLE_MASK = 0x00000080;
+ static const uint32 _30MHZ_MASK = 0x00040000;
+ static const uint32 MODE_MASK = 0x0007FF00;
+ static const uint32 ATT_MASK = 0x00F80000;
+ static const uint32 PRSG_MASK = 0x01000000;
+ static const uint32 RESET_MASK = 0x02000000;
+ static const uint32 SPECINV_MASK = 0x04000000;
+ static const uint32 VERSION_MASK = 0xF0000000; //PD
+
+ static const uint32 LBL_EN = 0x00000100;
+ static const uint32 LBH_EN = 0x00000200;
+ static const uint32 HB_EN = 0x00000400;
+ static const uint32 BANDSEL = 0x00000800;
+ static const uint32 VL_EN = 0x00004000;
+ static const uint32 VH_EN = 0x00008000;
+ static const uint32 INPUT_SEL = 0x0000CF00;
+
+ static const uint32 RCU_HANDLER_MASK = 0x000000FF;
+ static const uint32 RCU_PROTOCOL_MASK = 0xFFFFFF00;
+
+ // ----- datamembers -----
+ uint32 m_value;
+ uint32 m_modified; // mask of modified bits
+ }; // class Control
+
+ /* get reference settings array */
+ blitz::Array<Control, 1>& operator()();
public:
- /*@{*/
- // marshalling methods
- size_t getSize() const;
- size_t pack (char* buffer) const;
- size_t unpack(const char *buffer);
- /*@}*/
+ /*@{*/
+ // marshalling methods
+ size_t getSize() const;
+ size_t pack (char* buffer) const;
+ size_t unpack(const char *buffer);
+ /*@}*/
private:
- blitz::Array<Control, 1> m_registers;
+ blitz::Array<Control, 1> m_registers;
};
-inline blitz::Array<RCUSettings::Control, 1>& RCUSettings::operator()()
-{
- return (m_registers);
+inline blitz::Array<RCUSettings::Control, 1>& RCUSettings::operator()()
+{
+ return (m_registers);
}
-inline ostream& operator<< (ostream& os, const RCUSettings::Control& aControl)
+inline ostream& operator<< (ostream& os, const RCUSettings::Control& aControl)
{
- return (aControl.print(os));
+ return (aControl.print(os));
}
}; // namespace
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RSUSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RSUSettings.h
index e2c9905fd70efede0f3b228cb2aa4350cc3e6db8..3f445c746421411dbc54983d02b8f7f1db798fb8 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RSUSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RSUSettings.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOMode.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOMode.h
index 0c6eef0a209fdcbac126f68e0f588689407c0b3c..922fdd3008dc27a461cc994f520cc6ae8c2cab0a 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOMode.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOMode.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOSelection.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOSelection.h
index e962d7c7830448e96819fc4f5b0cf7aae7ca7957..38dde382d93705872eab551722b95c7b113eb2aa 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOSelection.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOSelection.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SPUStatus.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SPUStatus.h
index 172762c4df3e59cad7f11ef2c609cc49675568b7..5b65f7ce0cbc1d589fa8dc7b772ef556c481a52a 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SPUStatus.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SPUStatus.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Statistics.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Statistics.h
index f4769f42beefd9c7e7e2e9cd4e4264a3ff8817d8..3c38d83533ddf33c5cb4efd20ad63ca13a7ff160 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Statistics.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Statistics.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SubbandSelection.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SubbandSelection.h
index d06d32fddbec37e7d27004778185fb5d506046a3..e40e8771190b099b9c8b69420351a05d1174bf69 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SubbandSelection.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SubbandSelection.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SystemStatus.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SystemStatus.h
index 33881a17897038e42809d8a1f84af8453c962be8..9c248c021ff141e7da64a2bc8560640749c2b13b 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SystemStatus.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SystemStatus.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TBBSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TBBSettings.h
index 26f64ec8f7252ee74fec164084a6a9d84b6fa559..3cec2e122e6ae1b58eb9464892de3cf727805e73 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TBBSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TBBSettings.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TDStatus.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TDStatus.h
index 2b8c60504a5d271cf8fd537a873301b56cbd4253..c3b0785ef49eb3905f78467578de0cc22f48925b 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TDStatus.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TDStatus.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h
index 63c1210ba1c4faca2499c3d953f2b515a65b6103..9701c6474859b9595425fd362b728b87f2e48a01 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/WGSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/WGSettings.h
index 06fbc6f76110a78eb075f4e83cef39b759088bfa..7fc6f9bf37ff940642d44d644eb6772f2eb58358 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/WGSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/WGSettings.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/XCStatistics.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/XCStatistics.h
index dfc9906488287fe765d112edf8aed566b9b198cc..d6e37c26f4ef75cc8dd68682e8159d89d1c414cb 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/XCStatistics.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/XCStatistics.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc b/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc
index 0a9828e9ecdcf32dfa8a76da81b344147ac955c2..e731c808dc85aace49d441da71dcef3078a4bf4c 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/BeamletWeights.cc b/MAC/APL/PIC/RSP_Protocol/src/BeamletWeights.cc
index 6353876de2f985363ea6e40ad63d9916096b208e..4f40d20d7f9b246ea32e73c8ab6e9273e9d4769f 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/BeamletWeights.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/BeamletWeights.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc b/MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc
index 768cccba3e68b1dba0cde719b48edb1913c08b4c..1c3e2467d2d6eb73614cfb129ca63fd0553b2e3e 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/BypassSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/BypassSettings.cc
index c541468c006db08e75b123beb71c782f1ee80055..561b8c377634be010c332fab13d61042ae8830d0 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/BypassSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/BypassSettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc b/MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc
index 15711809913095f3d0d7765a95c89c2f7789062a..d8d2160bf97c41e1358788988cfbd378af3e56dc 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Latency.cc b/MAC/APL/PIC/RSP_Protocol/src/Latency.cc
index ff17619d5c93a50ad1031865949d5b2715aec398..6bea7d41104bb73b160d778be6dd90c6960d4065 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/Latency.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/Latency.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/MEPData.cc b/MAC/APL/PIC/RSP_Protocol/src/MEPData.cc
index d472a08c6f377d916316082521a3723127f8de87..e7451ba888300c687814e94147b1e6f49f10e726 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/MEPData.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/MEPData.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/MEPHeader.cc b/MAC/APL/PIC/RSP_Protocol/src/MEPHeader.cc
index 56de078e88a5b74c8de7d571187c5821353b9a5c..ed4f71d4382532928c09c6b67539121ad6a1a13b 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/MEPHeader.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/MEPHeader.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc
index b3aa0a8eaba34f61dd81ede0028a9724f4c1f55f..8fed669ff650d108f202864cf1922ec8bf6b1045 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc
index e8073f662bc83938e89955080da48d9564a9e25e..b59b9dffb3c07a8bca3747c550cc65041e05d0cf 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SDOMode.cc b/MAC/APL/PIC/RSP_Protocol/src/SDOMode.cc
index 8b26fff26118f45dbbf1109072b95408aa24e0b5..2aec1b0cd437dc90ba2edd83800fc226893c954b 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SDOMode.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SDOMode.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SDOSelection.cc b/MAC/APL/PIC/RSP_Protocol/src/SDOSelection.cc
index d4b01401adec41ab25e8c2fb99f5359bfaaf2ebd..a627c1be0efcb8126b6ded6f7a792b295a6c94c0 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SDOSelection.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SDOSelection.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SPUStatus.cc b/MAC/APL/PIC/RSP_Protocol/src/SPUStatus.cc
index 4bc185ba6e4eff730435dde76fb23535e6c890b6..5fbfe57a7170ae40a7c606bf2c5dc88a288c8ef9 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SPUStatus.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SPUStatus.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Statistics.cc b/MAC/APL/PIC/RSP_Protocol/src/Statistics.cc
index 91b0b9d48b943e556e65117ab928a774532bdeaa..d5fe5acd7ed1bfea2fc89e8baf94bc476d5f5079 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/Statistics.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/Statistics.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SubbandSelection.cc b/MAC/APL/PIC/RSP_Protocol/src/SubbandSelection.cc
index e5b11c6dfe8021bc62bd3fac5bbee1c53ddde268..e7775a7ef128a1b09f4144d90577e24f4ca252a7 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SubbandSelection.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SubbandSelection.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SystemStatus.cc b/MAC/APL/PIC/RSP_Protocol/src/SystemStatus.cc
index a68bd1f8ed5e41b454c612f4cb78c204dffd1570..fb74ff657a10f355dc7cd09a0d3c342aaffb5f42 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SystemStatus.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SystemStatus.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/TBBSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/TBBSettings.cc
index 0ce0dad106113a98d5b96df862f12e25a840211b..3bf2e5aea12ee00755827b2c20c12f32d36dfc32 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/TBBSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/TBBSettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/TDStatus.cc b/MAC/APL/PIC/RSP_Protocol/src/TDStatus.cc
index 6fe844f89bc5b82144ba545eda8af3863d42f010..ef2455782c5407cf62adbad06f31afbae8390d8b 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/TDStatus.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/TDStatus.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Versions.cc b/MAC/APL/PIC/RSP_Protocol/src/Versions.cc
index 0a022b0d76ad95c0bda4dcfc7e7787088e1b1d86..6c851f54d722ec83d7b9267837d383b11560f8c6 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/Versions.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/Versions.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/WGSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/WGSettings.cc
index 4336bc9a1d825c917215b9863051870157f9c104..42182dca84cdd983c145acf801b7d4568fe4b693 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/WGSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/WGSettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/XCStatistics.cc b/MAC/APL/PIC/RSP_Protocol/src/XCStatistics.cc
index fa75352da97e9d61d7712160163d5923d39b73db..6e720e95c51c8054d11cca1fd7a3b5e98468a92a 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/XCStatistics.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/XCStatistics.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc b/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc
index 0a34be9429f4649ea13631002b3ee6adced960ea..69edd9d1aab0689d6156d8142d6167422375e586 100644
--- a/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc
index 3c620cef624f9ac06dafe8ad6d533a45cbc4d6b2..0fcfdca5f15b60b6118651bb879d6c5ae3605142 100644
--- a/MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/AllocCmd.h b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.h
index 7cced4abf53cda791835779b7d419b93ee493586..c479112c14b93b7a03deb8c6c833b06f7139217b 100644
--- a/MAC/APL/PIC/TBB_Driver/src/AllocCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc
index 21c217434b6616b4dbbcc67a3d8f9e221b885c48..1df265d44409d6bebfd599231971c81a6d79f1f7 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ArpCmd.h b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.h
index 24ca37c96e20bb2ad66dc83dc510f2e9fae9c588..f4dfae170b2a6a271e79d46e040804f9b47258c9 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ArpCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc
index 2059ca0bba377eb41a939bc630385fe755770621..93e8035df3c6868818b188d2fb7d834b1df713e3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h
index d7656694cb64f05152db6faa0ce1278b49d157ad..0fc1dafc5e39801347687006982825a723da6e92 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc
index 7aafad5c46e4f73a8c7bd217253fa0f257a7d51c..b46c2153d7479a9935b629060eb4581b1390dba7 100644
--- a/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h
index ec24b93ee4f8be95978d09d6399d94e88a6a4314..7d704599158c18d3dd7e98b382d74f5e5f291454 100644
--- a/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h
+++ b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc
index 604674ace3c3cc867d3ac975634f3d2ff7dcbad3..5575e205ff12cfc6fad15ba337886ad1c8825642 100644
--- a/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h
index 5a36c074395765e01ede72a5d11e7d1c54a1ef1b..c67f05c7f95f7e8cf34a8bba39cfd69fea372504 100644
--- a/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc
index 966bc702b79e34bff8deef9c2d5272fc84b0a90c..0d8eeb0423ad0ee288030d0a3d6a41b61e125a9b 100644
--- a/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h
index 11c771b486d16a85e559f90e23e10cd1838ae824..d958469663db38905b635b98461277877d2898c2 100644
--- a/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc
index 2292b838751c39d62126902fe8a2c91584d1afbf..38a3595f2a2ec1ea2b51184d6aa5dce4d3f48246 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ClearCmd.h b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.h
index 240f7e8d62874688ee328803e4656492c5dd0302..cd39f90555cc29d35c58bff173beb0303a8695ff 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ClearCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/Command.cc b/MAC/APL/PIC/TBB_Driver/src/Command.cc
index 19e9f0c7c0101c45774a3bca772bea5681d7bcc2..92374a5c7e8fd363b80d5c90617f42cff642f6f5 100644
--- a/MAC/APL/PIC/TBB_Driver/src/Command.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/Command.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/Command.h b/MAC/APL/PIC/TBB_Driver/src/Command.h
index 18c63aa1b81d87573f06198ccc637a6c125af709..c53ec4dba3c51c45c18ea50d60626167b4ca9e0c 100644
--- a/MAC/APL/PIC/TBB_Driver/src/Command.h
+++ b/MAC/APL/PIC/TBB_Driver/src/Command.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc
index a95e9d2c85070a5e9c71e47e0fb038501b04ef93..c1d8428ff493d4cc5a9f608b2420677f6f2e78a1 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h
index 31c7e4c196ec80357840ced9b0c7c1bf6a977597..fddb48b97099b10664987248fddd756367112edb 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
index cd0401581ed8f6ee26d3f6f391cb1815bcdfee11..c220d823c2f41b063d8ef966c1144d71c0b2dc48 100644
--- a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
index b4e6604833828110eea3617ca112bb62a13c753f..3d78011581719d4f10eefd35b6f6a8e57a4333b1 100644
--- a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
+++ b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc
index 3e90d21b5362777f2513f99437d1d64344f5ca6e..b3707e240e358969307a7c12638b0ba77d2dfedc 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h
index f9b47887371092557e03b297361ffe6dbeade338..8ec0d186d224e48d51682399f8a89f7c2edb5038 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc
index 148501640dc39dd087ae868fed6812e5845616c8..67530e7995fc41fd7126707bb200f76ca57a7e9e 100644
--- a/MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/FreeCmd.h b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.h
index ca757f4d58779b30d17e63cd69648befcd22067b..7c4c536db0bad2d88d0c641efcbdb6869ef13f7d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/FreeCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc
index 909c26f790f195131cc272d1d604cdaa07dfab26..624b9469a1d087528978d6000037a90f6cdad0cc 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h
index 2c1c6099deac4a911de85228e8c706a5c68fed44..a5434c6f1591e38cc6c711dfee72c59ba9675fb3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc
index 114e75e235608c4e47c42d10dae1fef708a5307e..4d53b5fb69d8fccaba83cdecc3327c75299ebdc7 100644
--- a/MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/MsgHandler.h b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.h
index e7c0c9df6b3a9844070f0c0d5245bd4bb09c68e9..a882dae53f88d54c7bd64e5adc635aaa4d7b4ca9 100644
--- a/MAC/APL/PIC/TBB_Driver/src/MsgHandler.h
+++ b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc
index bfdcc9a27060495578c63323348782d51eaa75ea..1ed869bfa6b1b479d0f0ddb77d0eb6a6f3283967 100644
--- a/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h
index 80e7a92dca76bc004cd334997fd4a262f0ae71ba..3380eb4f1a1a53d67998c24d93845f0445f90281 100644
--- a/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/RawEvent.cc b/MAC/APL/PIC/TBB_Driver/src/RawEvent.cc
index 676f9d4e8e6ca3b5359426eca660983f9d03622c..2194eb533ffdd56682edc0b49f1c3c0aac407c5d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/RawEvent.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/RawEvent.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/RawEvent.h b/MAC/APL/PIC/TBB_Driver/src/RawEvent.h
index c0beb42c1b9b9af52375bb9f670600c0cf0a742b..62a0d9dad169c73e04a0b2bc50fe133ee1adc25a 100644
--- a/MAC/APL/PIC/TBB_Driver/src/RawEvent.h
+++ b/MAC/APL/PIC/TBB_Driver/src/RawEvent.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc
index 77662417d71cda9882954e5efe19a3b3f355c34d..2e7da40e6e8493c6f64a3e76b2e4038063c0fbc3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.h
index 0e94c08af5e582f8cce38bc42626c4f3355d3b0c..3bf002466c32891252c963f2fead4dc86ccd651e 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc
index 7e8133fb3dff503937dddd684d5be3dd6dd73f9a..68f1d27f96dccb8ab5429cd2ea5e086ef51d2e82 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h
index 28969cb8411721e314bbf1847df8860542526513..bc60ae2486122902b8facc8f35c3016fc040f943 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc
index c1b18db749bcfab9fb7ece0f6546f55fc6e91241..6a3201447bac66e7ec518f950d36655896672578 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h
index 1e785a857a5ede9060431c1c5f6e4d35140a51e4..7b199341e78ff46ea44c4f0c7aab0ba6496b7c31 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc
index ee442f277d05bcdc0575cae0133f024b87146fcb..ee88a95e61f8014c5084938cae105afcf33cb218 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h
index ead3c5bed0f7d892caac77e1ad34f8de26359425..7d0038fc7c2526307b0c1f1cdef20010bb75f481 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc
index 0cf425f9009dc51076b850c6a4113dbc4fe4d405..178ed0abd7a9478fa72e92f1e6aa28ece46cff7a 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h
index c9aa10185e7d56cf971c126337cf90b0a6865767..85f76c9cfee77e826c7e17ecff57185a9b453852 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc
index f77d0750b2f83a30082e7f313e72081e6e48041b..b609a5e0f3582555f129277903f717903606c9ae 100644
--- a/MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/RecordCmd.h b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.h
index 92881a552a1065840df507539bb676197632749c..e7d4f9c4b31c637974e8b144a5486f418da76506 100644
--- a/MAC/APL/PIC/TBB_Driver/src/RecordCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc
index d95d80470f63cba71d76e7c258118d0769fc48a3..9ca096deebf503eecd4e7027cbdd565f9721b5c3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ResetCmd.h b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.h
index dd0f9829c10de049beea638e3d9da902a7886cd0..3608669b650df41e67dfa0ca84f936c962fac6f8 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ResetCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc
index 0afaeae273e678c5e6cd54c0858f42baef70b06c..28437b91fb4e1373a7aca3e44bedcaf27cfe7f02 100644
--- a/MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/SizeCmd.h b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.h
index 31cf6163c3c6236e1cecd76c55591e360947d89a..3aa17ef30b47f262b4be6419a05b582cee999e36 100644
--- a/MAC/APL/PIC/TBB_Driver/src/SizeCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc
index 1f4f6fd0e5151d5de0db13fea95918aa5bace894..e1c0242a5f0d6ebdb3b5b0c6281b91d0e289f7ad 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc
@@ -1,7 +1,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StatusCmd.h b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.h
index c61bd19c4917b7b6fd2117e9545a84a224c83ad1..2fa7e646e4d5b7228a02af8ae4b711a7a54c8169 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StatusCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc
index b8fa6ffe792439a270b02c0749d2759b0b797bf9..3e7feb1dbed3a86327d0cbfbca95db1edfcb3378 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h
index e95e9cd580750cb06be604ad0d23d3e46e12ca64..dcc8fd9d070c422910d35c1cb95c9c09a4fa90fc 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StopCmd.cc b/MAC/APL/PIC/TBB_Driver/src/StopCmd.cc
index c99bc2c09c57e5d992a9a3c661e0a7fd371fedb8..f1fb2f97d0c5f65e953eefffe48e709e836df471 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StopCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/StopCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StopCmd.h b/MAC/APL/PIC/TBB_Driver/src/StopCmd.h
index 99eb38ed6689e02e327d0da1d8ba9b260224b79c..da67b5a4408ffe32ed25bd28869e6fb12d1dc6e4 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StopCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/StopCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
index 0e78f02cd1b95fa572ee31c4949a135d057362c9..a16dfa903dbeb45948baa48466264984f771cba1 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.h b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.h
index ed4efe7ea214a0e73f5264b74065b861f5523669..53bce6458b6f03002b6d6a630a24fbd7b602bf26 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc
index edc48edc373810f50f80d0c95a3f4e19bd35ee1e..871c63f284c51d42f95161797ee8a4908b771e51 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h
index 44eddb26ed855fbd11fc2e3c8f26c24022d1b85f..79124f119685ffe4471d7fe3831deec9d4354d69 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc
index 22895e599787506a4317519e9c7864b1071e7a1e..84f97ea0abe587385cb6af364d5354ba925e0a59 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h
index 9a69f3d94c804b086cb7999f40ad8d109eaaf2a5..a648326180d23060f79f17b9906f6312482af88e 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.cc
index 8484cd26a059c93a23c592f708b8bc90b0543d0f..81d99e14a966247848db8fed1a6c22bff279faa0 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.h
index ab858a5d3a2ab4e734096bdd786524628102d9c1..cfdd536327981d4398813d73c1734aefc0fdcdd3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc
index 4d0bf2d1b729738f4bc15137fe84e42b5de2b634..c37e922b768d66693a87d393b7b56cee3dc338ab 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h
index 2208dbc04d59d619a13ecde9fb6c58a97c35e9bd..7e6f4dbf24acbb94d763c9a66122687f497b0394 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc
index ea177aa97f02c2b80e1d6dde93f25c60586e4459..188d9f56be71b9328f3f6cd1c29bd00033a3165c 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h
index fb77d931ab4e723fdc40884aad2ece0246530e7f..2e5605bff7adb66c646b21746b7a73d0b9aefdf3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc
index 001d800ea05d055ce7498c8169a337b7516d615e..b1080739dc601cd5b5e931631ec3853291744a80 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h
index 077a61693415a5239d3095b6a35e3d873fd1b50b..5edef0bb5c3cf4df7ac55f7bafef9f7a044612c7 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc
index 5ff4c62fdec2376a8f8b5276b37be00bb9896c40..17c0fbc9ac72c90e8d2772bf5e7de439a63cab54 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h
index 52ced881656432f7e7b8908b79ee9fbc5344ad66..091a40cb0e1a1f4ffe3ff8e36d40b27da4bdd905 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.cc
index 5064b62f528499344809f78cdeb081c960f70663..a8604d78e021e7be4a028ec34a18beb8c3d7ca96 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.h
index 351172e90e5d790718e8a4049c1b4005e573111f..49a65aa0fd9b776fff557f118d74aa5682fb6aba 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/UdpIpTools.h b/MAC/APL/PIC/TBB_Driver/src/UdpIpTools.h
index fa0b814fbb0779d4279ab0379b240db508a9f378..00ed3ffa901b2e32bba1fb223e0502810ee21938 100644
--- a/MAC/APL/PIC/TBB_Driver/src/UdpIpTools.h
+++ b/MAC/APL/PIC/TBB_Driver/src/UdpIpTools.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc
index bee0daf3949053e18eb3689e8f92ab59622e2010..cd32de866babf8acbe1af220985669cdf4bff95d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/VersionCmd.h b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.h
index bd1d2ce9487991f56208598b23d6f5a7d842fc3e..8e0427b386dec80cbb4c56fbd085b82d4efaf815 100644
--- a/MAC/APL/PIC/TBB_Driver/src/VersionCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc
index 5474a9d2707e232d1b3f11df158fca1d5a3a4773..87aa427bba8dbe1ad67a422b36eb6ca90f202adb 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h
index babf61f7fffd9ed8f07981e5650662dce1277628..71f96a9875586c5b12e61d6e98d41d3b03daef79 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc
index 797031f77333f8672b55cc9f725b16a55e42661d..ed50876e9f815adea180f69907d982699afd6b66 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WritefCmd.h b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.h
index 8d5afc102fc87b74fbfa4de210405634b1f0670f..f9d84aead3d3fb660bd311645be773d244dde45a 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WritefCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc
index 882658c3c42b9163462ee6dad63bcbf78067d764..baaaeef51b818daed39a35e29429be7724239ec6 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WriterCmd.h b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.h
index 9a43d0135c7376511224eafe68e4a1074764d148..58bad6001c8dd9e33517b992de2897e86658b4b9 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WriterCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc
index 85d8b4c7fa26442bd5dc3fa8054886121b1ff7ea..88c9c7bf8c4746ebfefb1c5b89227f236e56d633 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WritewCmd.h b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.h
index 3b09261ec2e6ce1174b1ed637bfb70914f7ad57f..f7addd7789bf7ac21bd0b1572d97ef24368431f0 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WritewCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc
index dca0a2786988f43cf828e9f1f083e851ece4ba27..49566f8461ab19214e71e8be7d30eb24d791b06d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/XXXCmd.h b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.h
index cc65adf3173496d8bb8f5e64aa32490d532beb99..50706c9498e8a20cc4d81e9e728de4f2d2b01d4d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/XXXCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/tbbctl.cc b/MAC/APL/PIC/TBB_Driver/src/tbbctl.cc
index 51ca1d75874f02807ad6e873124d6c2101aff139..ce950de11ca6101c2e1738b530357e0b3bc59c60 100644
--- a/MAC/APL/PIC/TBB_Driver/src/tbbctl.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/tbbctl.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/tbbctl.h b/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
index c4e358d9ee4223d3e464f70ced29a25b75eede6d..3726e2e5709ed345ccbebba026a79260693d5154 100644
--- a/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
+++ b/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc
index dcb0057b6614955b6e7a682a914cf84344875d75..90a7a42b7aa5e5f1303950d6a40ac9ff1d99c73f 100644
--- a/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc
+++ b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h
index d668d9de95b9478aeda028bf962445b1659bb358..cbd0a88914ddc0b8878b6a2e191dca8528c1ee02 100644
--- a/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h
+++ b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TBBTest.cc b/MAC/APL/PIC/TBB_Driver/test/TBBTest.cc
index 8be7303bc9eb6360ed6f542aab0fc782bc7ec35b..5a30dc989f02dd324283fee423f95a7016be98e6 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TBBTest.cc
+++ b/MAC/APL/PIC/TBB_Driver/test/TBBTest.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TBBTest.h b/MAC/APL/PIC/TBB_Driver/test/TBBTest.h
index d0368256d25aa57a5684f9857f7d40c9d094d808..204d11eb3cbf5d03f15cf4a237cc69e1af9da09e 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TBBTest.h
+++ b/MAC/APL/PIC/TBB_Driver/test/TBBTest.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h b/MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h
index 60d74078f4621dc457e8d049e41b1bc2eef44e4f..064c1160388286c19dc56b9bd7a912210cda84ef 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h
+++ b/MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h
@@ -5,7 +5,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TPStub.cc b/MAC/APL/PIC/TBB_Driver/test/TPStub.cc
index 8128e45a8ef4cac20f880a2620124a31ee25a85c..f9a32567fa69475c4cd04ef37355bb2a7dc1c449 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TPStub.cc
+++ b/MAC/APL/PIC/TBB_Driver/test/TPStub.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TPStub.h b/MAC/APL/PIC/TBB_Driver/test/TPStub.h
index f0bf5e3b1bdbfd66873272214311dda8002bc08f..a58b3d3ec1c22095f7f4a6f4104dcbc665ccf944 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TPStub.h
+++ b/MAC/APL/PIC/TBB_Driver/test/TPStub.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/MarshallBlitz.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/MarshallBlitz.h
index 257d885b605c565e3a2cbb790b086a700fdf0622..93406e176fe6518f7c6c2304623afb6ada682fe7 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/MarshallBlitz.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/MarshallBlitz.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/Observer.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/Observer.h
index 35052f237729cf871d7946aa30e1c6539ee9cc05..8a6eee1fff0453fe2884cbedea44780bcfa0d687 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/Observer.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/Observer.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
index b72d3f19be5de89bc1e9d1c60b15515d3b5c0339..bc68ed9e22289542548389e51dd2d34458317595 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/RegisterState.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/RegisterState.h
index 90078e734a9914090364a9f0181571192d84f1f3..d247674115d8c9a8948f1239abd3e64f65c5a72f 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/RegisterState.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/RegisterState.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/Subject.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/Subject.h
index fe702f66bccaddaa22fd1b313e40698de53e1808..9c1637178690ad84f5e7d8f7629eed62da182e18 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/Subject.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/Subject.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/TestSuite.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/TestSuite.h
index 4639b538d87aebb4bf55a4d9ad6dca6e6df05d9b..bf3bac978bd5f896313508d2c5c0b6a3e37be890 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/TestSuite.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/TestSuite.h
@@ -5,7 +5,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/Timestamp.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/Timestamp.h
index c4be06cd248d58c2b423a70d03941f0b1f3719b1..ec617e48fb2fc85dc8ecddc4173242d9b2a39afa 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/Timestamp.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/Timestamp.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/daemonize.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/daemonize.h
index 6b78640a55904f39232f22122526ef51bd448cd7..70fb758d2939bccd9930666c008eacb0fa0bbd57 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/daemonize.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/daemonize.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/src/RegisterState.cc b/MAC/APL/RTCCommon/src/RegisterState.cc
index f0b0394ca96dabc43dc2b4e073a6d83532aac746..cfe487c4be106af0aa5458e69eb3271d6c34984a 100644
--- a/MAC/APL/RTCCommon/src/RegisterState.cc
+++ b/MAC/APL/RTCCommon/src/RegisterState.cc
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/src/Subject.cc b/MAC/APL/RTCCommon/src/Subject.cc
index e3fceb4fa60052aeeb2b89c93ae1d7dc5a94dac9..f47ba1961c1cf460629d9efa29f3e0c607ac877e 100644
--- a/MAC/APL/RTCCommon/src/Subject.cc
+++ b/MAC/APL/RTCCommon/src/Subject.cc
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/src/Timestamp.cc b/MAC/APL/RTCCommon/src/Timestamp.cc
index aaad5286fda349860d0ac508e600e081afd7a88f..bc3644c2fca1f0747551a92a417a4e1fa0f9ad8b 100644
--- a/MAC/APL/RTCCommon/src/Timestamp.cc
+++ b/MAC/APL/RTCCommon/src/Timestamp.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/test/tBlitz.cc b/MAC/APL/RTCCommon/test/tBlitz.cc
index 943a329996b9ef5de26c176fa7d74a08761c6638..1a5f71537ea42c689f2b578c1dcad0677dbad244 100644
--- a/MAC/APL/RTCCommon/test/tBlitz.cc
+++ b/MAC/APL/RTCCommon/test/tBlitz.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/test/tMarshallBlitz.cc b/MAC/APL/RTCCommon/test/tMarshallBlitz.cc
index 9ed18a6ccce83e6aa122efc528313a270e7dcf21..369a3f9a6c3e5adb7febfaf087a02b8594820217 100644
--- a/MAC/APL/RTCCommon/test/tMarshallBlitz.cc
+++ b/MAC/APL/RTCCommon/test/tMarshallBlitz.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/test/tTimestamp.cc b/MAC/APL/RTCCommon/test/tTimestamp.cc
index 90578b30ac0feb9705dc1dc2e28e876b50f322f0..1b98b64af0affe24e7600f6e2cbb764cc8bdd89f 100644
--- a/MAC/APL/RTCCommon/test/tTimestamp.cc
+++ b/MAC/APL/RTCCommon/test/tTimestamp.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/ClaimMgrTask.h b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/ClaimMgrTask.h
index ad8bf96deeb8d272b670744693ce361b5a2fbae0..d01660a4a6a764837a0a558e78f3c6a15525ad60 100644
--- a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/ClaimMgrTask.h
+++ b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/ClaimMgrTask.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
index c88e1eb15f123fe875f3af582f6097b946c022ca..9c93ff2cca3d2635bcdd58de9c1e0238efe5a35d 100644
--- a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
+++ b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/CM_Protocol.prot b/MAC/APL/RTDBCommon/src/CM_Protocol.prot
index 8726a18b6bcba483eee988b8202cb6b957d3d190..caa5f115a65211e02ebc62543dc003a235b3c00b 100644
--- a/MAC/APL/RTDBCommon/src/CM_Protocol.prot
+++ b/MAC/APL/RTDBCommon/src/CM_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/ClaimMgrTask.cc b/MAC/APL/RTDBCommon/src/ClaimMgrTask.cc
index 93dc5009e2f5786158ae010b18dbb39fb91cc35d..30e48df00e5d1e0982cf3b8f6c7f575f1eafbb3a 100644
--- a/MAC/APL/RTDBCommon/src/ClaimMgrTask.cc
+++ b/MAC/APL/RTDBCommon/src/ClaimMgrTask.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/RTDButilities.cc b/MAC/APL/RTDBCommon/src/RTDButilities.cc
index 9f9e39673278a7ac9b9d1258705e9d83e15be389..bb1f9e5e4713e50fcfe9e279d5f36f6883ceed0c 100644
--- a/MAC/APL/RTDBCommon/src/RTDButilities.cc
+++ b/MAC/APL/RTDBCommon/src/RTDButilities.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/disabledRCUlist.cc b/MAC/APL/RTDBCommon/src/disabledRCUlist.cc
index 400cc41bb91a520e3c4857c0701ccbfb644e8184..e99a476b818057a205419d8ad2948c9068db57fe 100644
--- a/MAC/APL/RTDBCommon/src/disabledRCUlist.cc
+++ b/MAC/APL/RTDBCommon/src/disabledRCUlist.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2011
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/disabledRCUlist.h b/MAC/APL/RTDBCommon/src/disabledRCUlist.h
index c45b7fb5e8ebfe1e532e02c78e353e24aed607b3..ace28f356c20e524a88a1b52c10551c80dc43fee 100644
--- a/MAC/APL/RTDBCommon/src/disabledRCUlist.h
+++ b/MAC/APL/RTDBCommon/src/disabledRCUlist.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2011
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/setObjectState.cc b/MAC/APL/RTDBCommon/src/setObjectState.cc
index ecece1201ea0ab4f31d142d262e982c5806d303e..9988889453654c17e9a13cd54479c69ac90e9098 100644
--- a/MAC/APL/RTDBCommon/src/setObjectState.cc
+++ b/MAC/APL/RTDBCommon/src/setObjectState.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2011
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/setObjectState.h b/MAC/APL/RTDBCommon/src/setObjectState.h
index a94bb3098201c34dc00dc88b833b7fa0e457dd2e..a81f5e44b833cc886f93e8016e11bebc1d1bb4d6 100644
--- a/MAC/APL/RTDBCommon/src/setObjectState.h
+++ b/MAC/APL/RTDBCommon/src/setObjectState.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2011
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/test/tClaimManager.cc b/MAC/APL/RTDBCommon/test/tClaimManager.cc
index 7e198278f3dd1a530b4afc0a476fe9cdee7cab04..dbf1b21a67f02d8e6fb26f488d70ca86bea6b57f 100644
--- a/MAC/APL/RTDBCommon/test/tClaimManager.cc
+++ b/MAC/APL/RTDBCommon/test/tClaimManager.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/test/tClaimManager.h b/MAC/APL/RTDBCommon/test/tClaimManager.h
index 9c46541d201428232499da544cef877ccc5ec032..bd781f2541cfb2187a8487196e26545ee40baae5 100644
--- a/MAC/APL/RTDBCommon/test/tClaimManager.h
+++ b/MAC/APL/RTDBCommon/test/tClaimManager.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/test/tRTDButilities.cc b/MAC/APL/RTDBCommon/test/tRTDButilities.cc
index c99ef65742bc5cbdf5faf22f336f2da18cbc7460..cdb51fa3dca0c947b6d85bd708761b23a3852849 100644
--- a/MAC/APL/RTDBCommon/test/tRTDButilities.cc
+++ b/MAC/APL/RTDBCommon/test/tRTDButilities.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/test/tRTDButilities.h b/MAC/APL/RTDBCommon/test/tRTDButilities.h
index e25d16b34db2fd3947ee07155e909b524d4d2437..da4eb998699561cd7316c464c1765a6c8c3630f9 100644
--- a/MAC/APL/RTDBCommon/test/tRTDButilities.h
+++ b/MAC/APL/RTDBCommon/test/tRTDButilities.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
index b6b58bff3cd7565291624414b27c0dca24c2b256..b5bbbcb16f967c7e74977e2b2a9c93fd0472a186 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.h b/MAC/APL/StationCU/src/BeamControl/BeamControl.h
index 2e8ab10378b0a725d8b0e5dc1f2634b6d0b00f8e..ff26ee77efafb5bc32b78384a6ecee9be17fbb1f 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.h
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc b/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
index b6eab6f10ce6c4614fec117fd03e0d1546945448..3635cbe11403e176f315f434f4111fd44e05e1ca 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
index fe1d2cb3e3022d1e3ea700144bdef7fb5ece0feb..255d5363efba0e29a1c6d2d87ed16788a917695b 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.h b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.h
index 846e6f603d401d5a03c1bcbb16ba5028fddbb7c0..d8ac8d59ea994b4e53ed61b40c011b5b5249f76e 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.h
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
index d6f05db5fba6edbc54b9fd47394b87275b09edf7..a58b1e3cf5198d5190714a3ca7e7d8f2804b14ce 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
index c551aec30441add6688fcf238605677d824ae914..e14df9add8477a8dff42f078c77656cceab227da 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006-2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControl.h b/MAC/APL/StationCU/src/ClockControl/ClockControl.h
index 7ea9e075bf03124dfc8cc62596865850a2011b30..44966080d947689473c075857ec1f5db53bbff91 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControl.h
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc b/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
index 23e3a6158a5e16f9e97c05c35a80e2b56f708055..8b35a9e47b418a84908386f6c48e1c0f511501a4 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/clkctl.cc b/MAC/APL/StationCU/src/ClockControl/clkctl.cc
index a325cf7c1f7a003342ed32aba1fe9bb5713ce5aa..81fde40a8c4a31c5363ac8dced8546337cb04bc3 100644
--- a/MAC/APL/StationCU/src/ClockControl/clkctl.cc
+++ b/MAC/APL/StationCU/src/ClockControl/clkctl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/clkctl.h b/MAC/APL/StationCU/src/ClockControl/clkctl.h
index ba47cb92cd452cdacc65be5db5faf663f12a388a..0e8d5669d1743fcb04579ce5f131cfac2d9ddd7a 100644
--- a/MAC/APL/StationCU/src/ClockControl/clkctl.h
+++ b/MAC/APL/StationCU/src/ClockControl/clkctl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockProtocol/Clock_Protocol.prot b/MAC/APL/StationCU/src/ClockProtocol/Clock_Protocol.prot
index 711f6ae7f1775b79ca8dc1b8089eb7257756eeda..56c653f799d84adfdcce74f35c1053396c02ff6f 100644
--- a/MAC/APL/StationCU/src/ClockProtocol/Clock_Protocol.prot
+++ b/MAC/APL/StationCU/src/ClockProtocol/Clock_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
index 74ccce3700a704504cbf34aa114726b5e753236d..b1517b62bffc7b8bcfdde73a95ffdb80373fba13 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.h b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.h
index 50e3bc7def303abb080bfceaabd22c322c6b233f..96867cc6b5c14907eae62f544c4cae0cb96ce0f6 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.h
+++ b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
index f671ca5b3a421f529ff1bbb7034bdcf2c5824f7d..d21c9bf1728cdf037b199ce6de29c188dddc9895 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/RCUConstants.h b/MAC/APL/StationCU/src/HardwareMonitor/RCUConstants.h
index 3d06b69a8d37c621df6c60410493901ee1ed79b0..fc4c0f686992b62dceba8d947f0df1f1ab898139 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/RCUConstants.h
+++ b/MAC/APL/StationCU/src/HardwareMonitor/RCUConstants.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc
index ce5991b429b1aaf80b067baa72902f926fca1b01..b75f4d372b67d774f8e886c8af868952119b9aea 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.h b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.h
index 8b0c3905a894be83883e58d30c9f6dd68114f927..b1c9fc5e277c5c1eb33c9b61ded0c6b9618f7452 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.h
+++ b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
index c2e1ac812b1d9cd24cf8e68ae0a383eb5e89f68b..8a953191bd556853c38d2f3d92b657dc8d4f4023 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h
index 1b9a43b54efabe508dd6e13af5108a19cf95225b..73535f2f0e4fa0646d983445faa39df89e1a8176 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h
+++ b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
index 8323c99fbcc9b179a4ab551cb52624ad1c09c5ff..9a80f1d7db55fc6837192543115490cea79a3249 100644
--- a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
+++ b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/ActiveObs.h b/MAC/APL/StationCU/src/StationControl/ActiveObs.h
index 3363d6c49e9ecba35f3bcdfa501c0e813e863d5b..bdb1a139dec2277554741a1be4d4d3afe03586ef 100644
--- a/MAC/APL/StationCU/src/StationControl/ActiveObs.h
+++ b/MAC/APL/StationCU/src/StationControl/ActiveObs.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.cc b/MAC/APL/StationCU/src/StationControl/StationControl.cc
index a02a5451ac5656fef0e41f20656dc4bbb20328bf..88b9691ef877a0a8a7d46760179adc3026a34697 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.cc
@@ -2,7 +2,7 @@
//
// Copyright (C) 2006-2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.h b/MAC/APL/StationCU/src/StationControl/StationControl.h
index 9eae03ecf6d07c0747f12e77d0cc83ecdcc98ada..95fd827041358794e7084a070e253ddc809acee9 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.h
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/StationControlMain.cc b/MAC/APL/StationCU/src/StationControl/StationControlMain.cc
index 38ff113ea9e627c501b9ae2e5eaa6a946e4f8969..81299a4cb844c6695b721ec8966ee8cee160a71b 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControlMain.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
index 4fe511fc44829697a84bc86a90b69cfa82a21445..b05d1d5d73de3242a9df7b77ee78040785ef822d 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.h b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
index a20e11f52e409c27c9a42de7a96b2329716942a2..8b4d68838833dd472bc999fa43eed547c6831315 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.h
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc b/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
index ad92c3b9f5ac3da271c68486bb10b6e4f9605771..30d4a91babf1fb0fb72063cfc3fd77bf182773d3 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc b/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc
index 04fa3d56e0488bcf6da4e1452d59f80d10864a09..ffdcf92ed058ba4874aac684a43407b6c4a97021 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBObservation.h b/MAC/APL/StationCU/src/TBBControl/TBBObservation.h
index 9c2e7d0d5e702d6f9b31250900bf1f7c3c807459..03f0495ca7fe9a2209f23b736519dd6944e3d434 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBObservation.h
+++ b/MAC/APL/StationCU/src/TBBControl/TBBObservation.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/trigctl.cc b/MAC/APL/StationCU/src/TBBControl/trigctl.cc
index aea835c947613f89ff88634ab830577cd45bd6de..9264d4936861514d5f036bd2c9931042e047f058 100644
--- a/MAC/APL/StationCU/src/TBBControl/trigctl.cc
+++ b/MAC/APL/StationCU/src/TBBControl/trigctl.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/trigctl.h b/MAC/APL/StationCU/src/TBBControl/trigctl.h
index 57f463852a926f2bd8e26840f82c7e437e3b527b..34794ec0b5f2da8745669dc7e3323f8fc1f4027b 100644
--- a/MAC/APL/StationCU/src/TBBControl/trigctl.h
+++ b/MAC/APL/StationCU/src/TBBControl/trigctl.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/CodeLoggingTest.cc b/MAC/APL/TestCtlr/src/CodeLoggingTest.cc
index 659f3fa6331089153ca0cbf56de112e9fe8722a3..25fad0b88f8a4e119b712a7a148bd53d6b2282b8 100644
--- a/MAC/APL/TestCtlr/src/CodeLoggingTest.cc
+++ b/MAC/APL/TestCtlr/src/CodeLoggingTest.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/ControllerMenu.cc b/MAC/APL/TestCtlr/src/ControllerMenu.cc
index 0f5b2b7d06e485bafee88ebce652a5441befda7f..4db2c27ec467f4659eb770f6ff7fcbafffab57b3 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenu.cc
+++ b/MAC/APL/TestCtlr/src/ControllerMenu.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/ControllerMenu.h b/MAC/APL/TestCtlr/src/ControllerMenu.h
index 4c79578cc26260c8ad3262a72addc000988fef6d..f87761e9f9cc1eef7145ed8a78a666ca0291ec5c 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenu.h
+++ b/MAC/APL/TestCtlr/src/ControllerMenu.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/ControllerMenuMain.cc b/MAC/APL/TestCtlr/src/ControllerMenuMain.cc
index 6f0598b4828fcde7436966e92ce16c10112c27b5..aff7dad39ed08c105044b8783a328abbeb68b229 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenuMain.cc
+++ b/MAC/APL/TestCtlr/src/ControllerMenuMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/TestController.cc b/MAC/APL/TestCtlr/src/TestController.cc
index 0393711b51d94c122f37729efc70201d74f2bc27..2cd6ec3cdccd65d4aa4a087018eaf56e5a0fb19c 100644
--- a/MAC/APL/TestCtlr/src/TestController.cc
+++ b/MAC/APL/TestCtlr/src/TestController.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/TestController.h b/MAC/APL/TestCtlr/src/TestController.h
index 1322c9ef887f787fd08ba6891792df9dbd598065..6d28e1ef6f72ec8469b36a2b7a78e96a243135c4 100644
--- a/MAC/APL/TestCtlr/src/TestController.h
+++ b/MAC/APL/TestCtlr/src/TestController.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/TestControllerMain.cc b/MAC/APL/TestCtlr/src/TestControllerMain.cc
index 9d1dfb04def8f108423a951d2a1e0d0e06da642d..8dc28f49bc46c8df232f331c7c8249827ae220b7 100644
--- a/MAC/APL/TestCtlr/src/TestControllerMain.cc
+++ b/MAC/APL/TestCtlr/src/TestControllerMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestSuite/include/TestSuite/suite.h b/MAC/APL/TestSuite/include/TestSuite/suite.h
index 18cd22c224331e90afbeb1e7fd568d7224977243..5109c6275dd59f98bfb6a27bf5e961b3e3cda94d 100644
--- a/MAC/APL/TestSuite/include/TestSuite/suite.h
+++ b/MAC/APL/TestSuite/include/TestSuite/suite.h
@@ -11,7 +11,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestSuite/include/TestSuite/test.h b/MAC/APL/TestSuite/include/TestSuite/test.h
index b81e283e815616fc395bcbbcada1972e61bffdc1..2197cfc81f75f68dc31aa70afc9fa074709e5c25 100644
--- a/MAC/APL/TestSuite/include/TestSuite/test.h
+++ b/MAC/APL/TestSuite/include/TestSuite/test.h
@@ -11,7 +11,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestSuite/src/suite.cpp b/MAC/APL/TestSuite/src/suite.cpp
index aa2688bd72ef14b0bef397104fafa08c79d8cd18..75a6ca17fbb5311df6e2dfb727b0e3e8952bc499 100644
--- a/MAC/APL/TestSuite/src/suite.cpp
+++ b/MAC/APL/TestSuite/src/suite.cpp
@@ -11,7 +11,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestSuite/src/test.cpp b/MAC/APL/TestSuite/src/test.cpp
index 52d3781665c42b3ecfcd2debb0e413763acbd49d..cb37bb3be9ebd7ce942bfa3185abca0dfbb474e4 100644
--- a/MAC/APL/TestSuite/src/test.cpp
+++ b/MAC/APL/TestSuite/src/test.cpp
@@ -11,7 +11,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/include/VHECR/TBBReadCmd.h b/MAC/APL/VHECR/include/VHECR/TBBReadCmd.h
index b862ef69da6b71d351c3dc34dfd4c82e483850e8..04a87813315d07823d7159bfcff0365d25fcd28d 100644
--- a/MAC/APL/VHECR/include/VHECR/TBBReadCmd.h
+++ b/MAC/APL/VHECR/include/VHECR/TBBReadCmd.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/include/VHECR/TBBTrigger.h b/MAC/APL/VHECR/include/VHECR/TBBTrigger.h
index c8c2d09daa1776942cd3a8b077920b4756c462bb..abfb56684ad3261179c21c13b119e2d3b9550ea5 100644
--- a/MAC/APL/VHECR/include/VHECR/TBBTrigger.h
+++ b/MAC/APL/VHECR/include/VHECR/TBBTrigger.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/include/VHECR/VHECRTask.h b/MAC/APL/VHECR/include/VHECR/VHECRTask.h
index 61c2ca522a3f759bd023f6b831aa1155e983ee81..9dec920711c9ff7099b7d67e74ad038421e36150 100644
--- a/MAC/APL/VHECR/include/VHECR/VHECRTask.h
+++ b/MAC/APL/VHECR/include/VHECR/VHECRTask.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/include/VHECR/VHECRsettings.h b/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
index aa2166a759263436793749c0a94fc0d46d4517fd..6085451a9f7da4918fa8f9dbb5d7be9b21d33ab6 100644
--- a/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
+++ b/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/src/TBBReadCmd.cc b/MAC/APL/VHECR/src/TBBReadCmd.cc
index 182992613b8d7b5a921b64703db8004902ad78c2..a6f4f7fe458d1be8367d1d236d79cfc4691630ea 100644
--- a/MAC/APL/VHECR/src/TBBReadCmd.cc
+++ b/MAC/APL/VHECR/src/TBBReadCmd.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/src/TBBTrigger.cc b/MAC/APL/VHECR/src/TBBTrigger.cc
index e854185888f0c96502f8b9f9088f1e1490507427..130a0fbab8248dbeaa974c75938e29ca5a4f16c2 100644
--- a/MAC/APL/VHECR/src/TBBTrigger.cc
+++ b/MAC/APL/VHECR/src/TBBTrigger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/src/VHECRTask.cc b/MAC/APL/VHECR/src/VHECRTask.cc
index 87ee2a3981d3781f25462c3e85cc945af76f55a6..f28dde8511cb04fa8dab3179001220b2133f6355 100644
--- a/MAC/APL/VHECR/src/VHECRTask.cc
+++ b/MAC/APL/VHECR/src/VHECRTask.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/src/VHECRsettings.cc b/MAC/APL/VHECR/src/VHECRsettings.cc
index eb5740d701195d9dae8b85e33f73258d290bc38f..c9b38505ef3c3a1d1426163c85414d5860de8dbe 100644
--- a/MAC/APL/VHECR/src/VHECRsettings.cc
+++ b/MAC/APL/VHECR/src/VHECRsettings.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/test/VHECRtest.cc b/MAC/APL/VHECR/test/VHECRtest.cc
index 47ab44518908f6f3c3c02f4429f833aee72e7002..1d6cd11bee9dc0645d57a605ebe8b3b37988d969 100644
--- a/MAC/APL/VHECR/test/VHECRtest.cc
+++ b/MAC/APL/VHECR/test/VHECRtest.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_field_rotation_func.sql b/MAC/Deployment/data/Coordinates/add_field_rotation_func.sql
index 4623cfc2289a19a44bc17a3b7d34b9246ec076a6..c3a1a2ad57587f4073624a6b5efb35d2d86ece43 100644
--- a/MAC/Deployment/data/Coordinates/add_field_rotation_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_field_rotation_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_gen_coord_func.sql b/MAC/Deployment/data/Coordinates/add_gen_coord_func.sql
index f1f8dc8ab08881525d8610a14442950ffb0a4e80..f66c975ef10ae8abc6b1e3621f84c6d0f9a97e3c 100644
--- a/MAC/Deployment/data/Coordinates/add_gen_coord_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_gen_coord_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_hba_deltas_func.sql b/MAC/Deployment/data/Coordinates/add_hba_deltas_func.sql
index a75c165f8aded196bd958faed887263bb9df0a69..0fa646cb6591bea9f99b32e7b76b1015306b39d0 100644
--- a/MAC/Deployment/data/Coordinates/add_hba_deltas_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_hba_deltas_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_normal_vector_func.sql b/MAC/Deployment/data/Coordinates/add_normal_vector_func.sql
index d31be3b90ee60df7298f81264c5668d522959752..23dcdf7e30cccb2f6f5fb281722a71cd9c53c255 100644
--- a/MAC/Deployment/data/Coordinates/add_normal_vector_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_normal_vector_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_object_func.sql b/MAC/Deployment/data/Coordinates/add_object_func.sql
index eb232c8e9217f02c093f115ef2496741c1122bc8..d85d3cafceb1cae800de30d246f8a641708ea17f 100644
--- a/MAC/Deployment/data/Coordinates/add_object_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_object_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_reference_coord_func.sql b/MAC/Deployment/data/Coordinates/add_reference_coord_func.sql
index b204dee2a2c9772f3e2ac86d35ca1dcacdc7366e..1499951f54bcd016dfd62a42cf45e22f46cebaf0 100644
--- a/MAC/Deployment/data/Coordinates/add_reference_coord_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_reference_coord_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_rotation_matrix_func.sql b/MAC/Deployment/data/Coordinates/add_rotation_matrix_func.sql
index 008b8482e19ca49557b9faf4e08841237fe29944..da792c76ee5ef0a4d5c9d00cd72a858055ebbdfa 100644
--- a/MAC/Deployment/data/Coordinates/add_rotation_matrix_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_rotation_matrix_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql b/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
index 079fd9a629b72051a5015c086d47ee4c23812b87..8de70f411265ba57a7e16778c82bcb6022a30167 100644
--- a/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
+++ b/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/create_CDB_tables.sql b/MAC/Deployment/data/Coordinates/create_CDB_tables.sql
index 770f68a92fd43ca6ffdf2f5ca61e3658f8beb84c..9d4d76d1e70cd01062a932b080ba04902e7e471b 100644
--- a/MAC/Deployment/data/Coordinates/create_CDB_tables.sql
+++ b/MAC/Deployment/data/Coordinates/create_CDB_tables.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/create_CDB_types.sql b/MAC/Deployment/data/Coordinates/create_CDB_types.sql
index a1ff3bc678bacaeccd810924d8a82c5b43a79c27..b505f69cd4802e59775cf15beae2f3bf08c18503 100644
--- a/MAC/Deployment/data/Coordinates/create_CDB_types.sql
+++ b/MAC/Deployment/data/Coordinates/create_CDB_types.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_field_rotation_func.sql b/MAC/Deployment/data/Coordinates/get_field_rotation_func.sql
index 7d044da2f4373e11c3aad3195aa0292db9560b9f..ac29fa036b36db2a122ed0b7cc9156bf4c5e12f7 100644
--- a/MAC/Deployment/data/Coordinates/get_field_rotation_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_field_rotation_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_gen_coord_func.sql b/MAC/Deployment/data/Coordinates/get_gen_coord_func.sql
index c844a0e6d67a594e6f8d5b949640df3e6261c548..990e43723594cb48a114b1ef332c0e869cee7f5c 100644
--- a/MAC/Deployment/data/Coordinates/get_gen_coord_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_gen_coord_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_hba_deltas_func.sql b/MAC/Deployment/data/Coordinates/get_hba_deltas_func.sql
index 05d40ff332ab8c791fb5d06468d69872e4209589..a2081bf27feafa55d61ef61f5465bc4f5da2cc21 100644
--- a/MAC/Deployment/data/Coordinates/get_hba_deltas_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_hba_deltas_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_normal_vector_func.sql b/MAC/Deployment/data/Coordinates/get_normal_vector_func.sql
index 3f8715b2109b81bf3397b841bc38da802e852570..810bdead7ccc37e67818bd9200d0022b6f80702c 100644
--- a/MAC/Deployment/data/Coordinates/get_normal_vector_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_normal_vector_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_objects_func.sql b/MAC/Deployment/data/Coordinates/get_objects_func.sql
index 3b34197206716d8e696309b131cfc07fa3840ddb..56f3654e80ae9620bf0a1a13e188287ea4e20bd6 100644
--- a/MAC/Deployment/data/Coordinates/get_objects_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_objects_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_ref_objects_func.sql b/MAC/Deployment/data/Coordinates/get_ref_objects_func.sql
index eecffe001121c3610b0499e2076e826c7fe9d4fa..2e3246dbc6593981ab750a3057a47e57887ab104 100644
--- a/MAC/Deployment/data/Coordinates/get_ref_objects_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_ref_objects_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_rotation_matrix_func.sql b/MAC/Deployment/data/Coordinates/get_rotation_matrix_func.sql
index a7c692e06b45992962ca0dec58aeb62a899dbfd9..15079371b497ba21b312d75fd83ab9b8dcf2d487 100644
--- a/MAC/Deployment/data/Coordinates/get_rotation_matrix_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_rotation_matrix_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_transformation_info_func.sql b/MAC/Deployment/data/Coordinates/get_transformation_info_func.sql
index c0abf4e8aa8caa785a829dbbc675bc39b04e1581..3d48912c99ca59e04f28f2203a38a9c6583690a1 100644
--- a/MAC/Deployment/data/Coordinates/get_transformation_info_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_transformation_info_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2008
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/OTDB/create_OTDB_comps b/MAC/Deployment/data/OTDB/create_OTDB_comps
index 98d0a8c0b0ca9d585e84993518cee82c828746e0..d7b1c4a258b20ef88f92decb9a60e9300235f7cc 100755
--- a/MAC/Deployment/data/OTDB/create_OTDB_comps
+++ b/MAC/Deployment/data/OTDB/create_OTDB_comps
@@ -4,7 +4,7 @@
#
# Copyright (C) 2006
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/OTDB/loadComponents b/MAC/Deployment/data/OTDB/loadComponents
index 4544e1879b4f78853061013ac3d9d79b542d4c9a..eb7c9d4089b7e97bebcc858d598972e840a1a1f0 100755
--- a/MAC/Deployment/data/OTDB/loadComponents
+++ b/MAC/Deployment/data/OTDB/loadComponents
@@ -4,7 +4,7 @@
#
# Copyright (C) 2006-2012
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/OTDB/loadPICtree b/MAC/Deployment/data/OTDB/loadPICtree
index f7c2e97eddf3c0e92d6d9a4fe2e4585f8f6908d7..591ed5d9b4aecbec020b65f31fd4b0be88f0a8f5 100755
--- a/MAC/Deployment/data/OTDB/loadPICtree
+++ b/MAC/Deployment/data/OTDB/loadPICtree
@@ -4,7 +4,7 @@
#
# Copyright (C) 2006
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/PVSS/bin/create_db_files b/MAC/Deployment/data/PVSS/bin/create_db_files
index 13674411382eac15754ea8a8177a658f9d67d5c4..00f441c0941e48f441210900f00178bb8930e459 100755
--- a/MAC/Deployment/data/PVSS/bin/create_db_files
+++ b/MAC/Deployment/data/PVSS/bin/create_db_files
@@ -4,7 +4,7 @@
#
# Copyright (C) 2006
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/PVSS/data/MCUbase.dpdef b/MAC/Deployment/data/PVSS/data/MCUbase.dpdef
index a50ab2b8c937f6bb482fd3e08211458039334dbb..d4e129400deb52b5a177602ed6b59fef2dabb4e7 100644
--- a/MAC/Deployment/data/PVSS/data/MCUbase.dpdef
+++ b/MAC/Deployment/data/PVSS/data/MCUbase.dpdef
@@ -135,6 +135,8 @@ NavPanelConfig.NavPanelConfig 1#
LOFAR_Pipelines 9#
Observation_Pipelines 9#
CobaltStationInput_Processes 9#
+ CobaltGPUProc_Processes 9#
+ CobaltOutputProc_Processes 9#
TypeName
NavigatorUserSaves.NavigatorUserSaves 1#
@@ -236,6 +238,8 @@ root.UniBoard_Hardware NavPanelConfig "Hardware/Station_UniBoard.pnl"
root.LOFAR_Pipelines NavPanelConfig "Observations/Pipelines.pnl"
root.Observation_Pipelines NavPanelConfig "Observations/Pipeline_overview.pnl"
root.CobaltStationInput_Processes NavPanelConfig "Processes/ObservationIBEmbedded.pnl"
+root.CobaltGPUProc_Processes NavPanelConfig "Processes/ObservationGPUProcEmbedded.pnl"
+root.CobaltOutputProc_Processes NavPanelConfig "Processes/ObservationOutputProcs.pnl"
rootSaves.Queries.Query NavigatorUserSaves "SELECT '_original.._value' FROM 'LOFAR_PIC*.status.state' REMOTE ALL WHERE '_original.._value' >= 20 AND '_original.._value' < 30", "SELECT '_original.._value' FROM 'LOFAR_PIC*.status.state' REMOTE ALL WHERE '_original.._value' >= 30 AND '_original.._value' < 40", "SELECT '_original.._value' FROM 'LOFAR_PIC*.status.state' REMOTE ALL WHERE '_original.._value' >= 40 AND '_original.._value' < 50", "SELECT '_original.._value' FROM 'LOFAR_PIC*.status.state' REMOTE ALL WHERE '_original.._value' >= 50 AND '_original.._value' < 60"
rootSaves.Queries.Short NavigatorUserSaves "All hardware in Maintenance", "All hardware in Test", "All hardware in Suspicious", "All hardware in Alarm"
diff --git a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
index dc964681118d4e3363ffc3406134ecda0d41a64a..1a883dad3af42c7804f04c7d93b6b2a6dcaae5f8 100644
--- a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
+++ b/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
@@ -38,6 +38,7 @@ ServiceBroker - M Y LOFAR_PermSW_Daemons_ServiceBroker
SASGateway - M Y LOFAR_PermSW_Daemons_SASGateway
PVSSGateway - M Y LOFAR_PermSW_Daemons_PVSSGateway
SoftwareMonitor - M Y LOFAR_PermSW_Daemons_SoftwareMonitor
+FeedbackService - M Y LOFAR_PermSW_Daemons_FeedbackService
CTStartDaemon - M Y LOFAR_PermSW_CTStartDaemon
MACScheduler MS M Y LOFAR_PermSW_MACScheduler
CRTriggerControl CRT M Y LOFAR_PermSW_CRTriggerControl
@@ -63,6 +64,7 @@ ServiceBroker - C Y LOFAR_PermSW_Daemons_ServiceBroker
SoftwareMonitor - C Y LOFAR_PermSW_Daemons_SoftwareMonitor
SASGateway - C Y LOFAR_PermSW_Daemons_SASGateway
PVSSGateway - C Y LOFAR_PermSW_Daemons_PVSSGateway
+MessageRouter - C Y LOFAR_PermSW_Daemons_MessageRouter
CTStartDaemon - C Y LOFAR_PermSW_CTStartDaemon
CEPObsSW - C N LOFAR_ObsSW
CEPObservation - C N LOFAR_ObsSW_@observation@
@@ -72,7 +74,7 @@ CobaltRack - C N LOFAR_PIC_Cobalt
CobaltNode - C N LOFAR_PIC_Cobalt_@cobaltnode@
CobaltNIC CNI C Y LOFAR_PIC_Cobalt_@cobaltnode@_@cobaltnic@
CobaltStationField - C N LOFAR_PermSW_@stationfield@
-OSCobaltNode - C N LOFAR_PermSW_@oscobaltnode@
+OSCobaltNode - C N LOFAR_ObsSW_@observation@_@oscobaltnode@
CobaltStationInput CSI C Y LOFAR_PermSW_@stationfield@_CobaltStationInput
CobaltGPUProc CGP C Y LOFAR_ObsSW_@observation@_@oscobaltnode@_@cobaltgpuproc@
CobaltOutputProc COP C Y LOFAR_ObsSW_@observation@_CobaltOutputProc
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS001-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS001-AntennaField.conf
index fad5dd3ad535c50aba00b92e65749a3dbc3f9d72..ac10755d7dbb879b95e0cc4ff120c0a527b372ee 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS001-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS001-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS001
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:37
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:05
#
NORMAL_VECTOR LBA
@@ -15,21 +15,21 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826923.546130000 460915.440668000 5064643.489 ]
+3 [ 3826923.502750000 460915.488115000 5064643.517 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
- 1.338010 -2.105000 -0.814000 1.338010 -2.105000 -0.814000
- -0.799990 -2.363000 0.814000 -0.799990 -2.363000 0.814000
+ 1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
+ -0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
-0.210000 5.784000 -0.365000 -0.210000 5.784000 -0.365000
2.822000 4.398000 -2.516000 2.822000 4.398000 -2.516000
4.534000 0.954001 -3.489000 4.534000 0.954001 -3.489000
- 4.124010 -2.936999 -2.830000 4.124010 -2.936999 -2.830000
- 1.784010 -5.454000 -0.846000 1.784010 -5.454000 -0.846000
- -1.389990 -5.418000 1.533000 -1.389990 -5.418000 1.533000
+ 4.124000 -2.936999 -2.830000 4.124000 -2.936999 -2.830000
+ 1.784000 -5.454000 -0.846000 1.784000 -5.454000 -0.846000
+ -1.390000 -5.418000 1.533000 -1.390000 -5.418000 1.533000
-3.914000 -2.848000 3.196000 -3.914000 -2.848000 3.196000
-4.606000 1.056000 3.362000 -4.606000 1.056000 3.362000
-3.143000 4.464000 1.956000 -3.143000 4.464000 1.956000
@@ -37,12 +37,12 @@ LBA
-2.165000 9.615000 0.756000 -2.165000 9.615000 0.756000
1.846000 9.900000 -2.281000 1.846000 9.900000 -2.281000
6.594000 5.379001 -5.436000 6.594000 5.379001 -5.436000
- 7.783010 2.445001 -6.063000 7.783010 2.445001 -6.063000
- 8.013010 -1.837999 -5.849000 8.013010 -1.837999 -5.849000
- 6.247010 -5.347999 -4.206000 6.247010 -5.347999 -4.206000
- 2.528010 -8.547000 -1.125000 2.528010 -8.547000 -1.125000
- -1.136990 -9.695000 1.730000 -1.136990 -9.695000 1.730000
- -4.463990 -8.074000 4.081000 -4.463990 -8.074000 4.081000
+ 7.783000 2.445001 -6.063000 7.783000 2.445001 -6.063000
+ 8.013000 -1.837999 -5.849000 8.013000 -1.837999 -5.849000
+ 6.247000 -5.347999 -4.206000 6.247000 -5.347999 -4.206000
+ 2.528000 -8.547000 -1.125000 2.528000 -8.547000 -1.125000
+ -1.137000 -9.695000 1.730000 -1.137000 -9.695000 1.730000
+ -4.464000 -8.074000 4.081000 -4.464000 -8.074000 4.081000
-6.224000 -4.693000 5.096000 -6.224000 -4.693000 5.096000
-7.236000 0.039000 5.428000 -7.236000 0.039000 5.428000
-6.583000 4.570000 4.528000 -6.583000 4.570000 4.528000
@@ -52,120 +52,120 @@ LBA
5.095000 11.170001 -4.834000 5.095000 11.170001 -4.834000
7.477000 11.350001 -6.638000 7.477000 11.350001 -6.638000
9.876000 4.350001 -7.806000 9.876000 4.350001 -7.806000
- 10.504010 -0.687999 -7.823000 10.504010 -0.687999 -7.823000
- 11.373010 -5.926999 -8.001000 11.373010 -5.926999 -8.001000
- 9.181010 -7.718999 -6.194000 9.181010 -7.718999 -6.194000
- 6.374010 -10.725999 -3.815000 6.374010 -10.725999 -3.815000
- 1.229010 -13.161000 0.267000 1.229010 -13.161000 0.267000
- -0.956990 -13.579000 1.946000 -0.956990 -13.579000 1.946000
- -4.931990 -11.373000 4.730000 -4.931990 -11.373000 4.730000
- -8.214990 -10.491000 7.115000 -8.214990 -10.491000 7.115000
+ 10.504000 -0.687999 -7.823000 10.504000 -0.687999 -7.823000
+ 11.373000 -5.926999 -8.001000 11.373000 -5.926999 -8.001000
+ 9.181000 -7.718999 -6.194000 9.181000 -7.718999 -6.194000
+ 6.374000 -10.725999 -3.815000 6.374000 -10.725999 -3.815000
+ 1.229000 -13.161000 0.267000 1.229000 -13.161000 0.267000
+ -0.957000 -13.579000 1.946000 -0.957000 -13.579000 1.946000
+ -4.932000 -11.373000 4.730000 -4.932000 -11.373000 4.730000
+ -8.215000 -10.491001 7.115000 -8.215000 -10.491001 7.115000
-11.072000 -2.214001 8.511000 -11.072000 -2.214001 8.511000
-11.116000 1.756999 8.185000 -11.116000 1.756999 8.185000
-10.397000 7.095999 7.163000 -10.397000 7.095999 7.163000
- -7.780000 64.587000 0.002000 -7.780000 64.587000 0.002000
- 51.520010 6.207005 -39.232990 51.520010 6.207005 -39.232990
+ -7.780010 64.586999 0.002000 -7.780010 64.586999 0.002000
+ 51.520000 6.207005 -39.233000 51.520000 6.207005 -39.233000
-11.566000 11.404999 7.650000 -11.566000 11.404999 7.650000
-11.932000 14.456999 7.650000 -11.932000 14.456999 7.650000
-0.701000 20.337000 -1.312000 -0.701000 20.337000 -1.312000
11.181000 13.262001 -9.591000 11.181000 13.262001 -9.591000
- 14.056000 9.704001 -11.428000 14.056000 9.704001 -11.428000
- 14.637010 -2.400999 -10.770000 14.637010 -2.400999 -10.770000
- 9.698010 -13.786999 -6.033000 9.698010 -13.786999 -6.033000
- 5.548010 -19.529999 -2.399000 5.548010 -19.529999 -2.399000
- -5.803990 -16.092000 5.811000 -5.803990 -16.092000 5.811000
--11.812990 -12.457001 9.993000 -11.812990 -12.457001 9.993000
+ 14.056000 9.704002 -11.428000 14.056000 9.704002 -11.428000
+ 14.637000 -2.400998 -10.770000 14.637000 -2.400998 -10.770000
+ 9.698000 -13.786999 -6.033000 9.698000 -13.786999 -6.033000
+ 5.548000 -19.529999 -2.399000 5.548000 -19.529999 -2.399000
+ -5.804000 -16.092000 5.811000 -5.804000 -16.092000 5.811000
+-11.813000 -12.457001 9.993000 -11.813000 -12.457001 9.993000
-14.654000 -3.007001 11.271000 -14.654000 -3.007001 11.271000
--19.883000 2.274999 14.719000 -19.883000 2.274999 14.719000
+-19.883000 2.274998 14.719000 -19.883000 2.274998 14.719000
-16.889000 14.487999 11.367000 -16.889000 14.487999 11.367000
-9.526000 22.971999 5.074000 -9.526000 22.971999 5.074000
-4.898000 25.092000 1.408000 -4.898000 25.092000 1.408000
1.709000 26.419000 -3.671000 1.709000 26.419000 -3.671000
- 13.531000 16.011001 -11.604000 13.531000 16.011001 -11.604000
+ 13.531000 16.011002 -11.604000 13.531000 16.011002 -11.604000
17.573000 9.587002 -14.057000 17.573000 9.587002 -14.057000
- 20.864010 -3.812998 -15.316000 20.864010 -3.812998 -15.316000
- 16.001010 -16.283998 -10.539000 16.001010 -16.283998 -10.539000
- 10.981010 -22.798999 -6.182000 10.981010 -22.798999 -6.182000
- 1.805010 -24.699000 0.878000 1.805010 -24.699000 0.878000
--11.053990 -22.397001 10.322000 -11.053990 -22.397001 10.322000
--20.215000 -8.270001 15.921000 -20.215000 -8.270001 15.921000
+ 20.864000 -3.812998 -15.316000 20.864000 -3.812998 -15.316000
+ 16.001000 -16.283998 -10.539000 16.001000 -16.283998 -10.539000
+ 10.981000 -22.798999 -6.182000 10.981000 -22.798999 -6.182000
+ 1.805000 -24.699000 0.878000 1.805000 -24.699000 0.878000
+-11.054000 -22.397001 10.322000 -11.054000 -22.397001 10.322000
+-20.215000 -8.270002 15.921000 -20.215000 -8.270002 15.921000
-27.744000 2.318998 20.616000 -27.744000 2.318998 20.616000
-22.547000 15.330998 15.538000 -22.547000 15.330998 15.538000
--15.013000 25.966999 8.922000 -15.013000 25.966999 8.922000
--10.063000 30.703999 4.779000 -10.063000 30.703999 4.779000
+-15.013010 25.966999 8.922000 -15.013010 25.966999 8.922000
+-10.063010 30.703999 4.779000 -10.063010 30.703999 4.779000
5.060000 30.482001 -6.553000 5.060000 30.482001 -6.553000
18.696000 23.593002 -16.166000 18.696000 23.593002 -16.166000
- 24.503000 13.316002 -19.596000 24.503000 13.316002 -19.596000
- 23.586010 4.116002 -18.076000 23.586010 4.116002 -18.076000
- 26.543010 -10.202998 -19.002000 26.543010 -10.202998 -19.002000
- 18.631010 -25.851998 -11.648000 18.631010 -25.851998 -11.648000
- 12.738010 -30.559999 -6.799000 12.738010 -30.559999 -6.799000
- 0.562010 -34.573000 2.703000 0.562010 -34.573000 2.703000
- -5.544990 -31.083000 6.972000 -5.544990 -31.083000 6.972000
--20.101990 -20.428001 16.936000 -20.101990 -20.428001 16.936000
--21.280990 -13.823002 17.224000 -21.280990 -13.823002 17.224000
+ 24.503000 13.316003 -19.596000 24.503000 13.316003 -19.596000
+ 23.586000 4.116002 -18.076000 23.586000 4.116002 -18.076000
+ 26.543000 -10.202997 -19.002000 26.543000 -10.202997 -19.002000
+ 18.631000 -25.851998 -11.648000 18.631000 -25.851998 -11.648000
+ 12.738000 -30.559999 -6.799000 12.738000 -30.559999 -6.799000
+ 0.562000 -34.573000 2.703000 0.562000 -34.573000 2.703000
+ -5.545000 -31.083000 6.972000 -5.545000 -31.083000 6.972000
+-20.102000 -20.428002 16.936000 -20.102000 -20.428002 16.936000
+-21.281000 -13.823002 17.224000 -21.281000 -13.823002 17.224000
-26.161000 -15.007002 20.993000 -26.161000 -15.007002 20.993000
--28.304000 24.091998 19.068000 -28.304000 24.091998 19.068000
--11.638000 37.911999 5.309000 -11.638000 37.911999 5.309000
- 4.050000 41.232001 -6.767000 4.050000 41.232001 -6.767000
+-28.304010 24.091998 19.068000 -28.304010 24.091998 19.068000
+-11.638010 37.911999 5.309000 -11.638010 37.911999 5.309000
+ 4.049990 41.232001 -6.767000 4.049990 41.232001 -6.767000
15.825000 33.938002 -14.946000 15.825000 33.938002 -14.946000
- 32.762010 -6.838997 -23.972990 32.762010 -6.838997 -23.972990
- 22.668010 -24.574998 -14.794000 22.668010 -24.574998 -14.794000
- 15.365010 -37.625998 -8.133000 15.365010 -37.625998 -8.133000
--18.876990 -29.400001 16.827000 -18.876990 -29.400001 16.827000
+ 32.762000 -6.838997 -23.973000 32.762000 -6.838997 -23.973000
+ 22.668000 -24.574998 -14.794000 22.668000 -24.574998 -14.794000
+ 15.365000 -37.625998 -8.133000 15.365000 -37.625998 -8.133000
+-18.877000 -29.400002 16.827000 -18.877000 -29.400002 16.827000
]
HBA
-3 [ 3826937.810130000 460938.525669000 5064630.696 ]
+3 [ 3826937.766750000 460938.573117000 5064630.724 ]
48 x 2 x 3 [
--52.064000 42.569996 35.232000 -52.064000 42.569996 35.232000
--50.969000 47.440996 33.970000 -50.969000 47.440996 33.970000
--49.184000 36.068996 33.658000 -49.184000 36.068996 33.658000
--48.088000 40.939996 32.395000 -48.088000 40.939996 32.395000
--46.992000 45.809996 31.132000 -46.992000 45.809996 31.132000
--45.895000 50.680997 29.869000 -45.895000 50.680997 29.869000
--46.304000 29.565996 32.084000 -46.304000 29.565996 32.084000
--45.207000 34.437997 30.820000 -45.207000 34.437997 30.820000
--44.112000 39.308997 29.558000 -44.112000 39.308997 29.558000
--43.015000 44.179997 28.294000 -43.015000 44.179997 28.294000
--41.919000 49.049997 27.031000 -41.919000 49.049997 27.031000
--40.823000 53.920997 25.768000 -40.823000 53.920997 25.768000
--42.327000 27.935997 29.246000 -42.327000 27.935997 29.246000
--41.232000 32.806997 27.983000 -41.232000 32.806997 27.983000
--40.135000 37.677997 26.720000 -40.135000 37.677997 26.720000
--39.039000 42.548997 25.457000 -39.039000 42.548997 25.457000
--37.943000 47.419997 24.194000 -37.943000 47.419997 24.194000
--36.847000 52.290997 22.931000 -36.847000 52.290997 22.931000
--37.255000 31.175997 25.146000 -37.255000 31.175997 25.146000
--36.158000 36.047997 23.883000 -36.158000 36.047997 23.883000
--35.063000 40.917997 22.620000 -35.063000 40.917997 22.620000
--33.966000 45.788998 21.357000 -33.966000 45.788998 21.357000
--32.182000 34.416998 21.045000 -32.182000 34.416998 21.045000
--31.086000 39.287998 19.782000 -31.086000 39.287998 19.782000
- 31.084010 -39.287997 -19.781990 31.084010 -39.287997 -19.781990
- 32.180010 -34.416997 -21.043990 32.180010 -34.416997 -21.043990
- 33.965010 -45.788997 -21.355990 33.965010 -45.788997 -21.355990
- 35.061010 -40.917997 -22.618990 35.061010 -40.917997 -22.618990
- 36.157010 -36.047997 -23.881990 36.157010 -36.047997 -23.881990
- 37.253010 -31.176996 -25.144990 37.253010 -31.176996 -25.144990
- 36.845010 -52.290996 -22.929990 36.845010 -52.290996 -22.929990
- 37.941010 -47.419996 -24.193990 37.941010 -47.419996 -24.193990
- 39.037010 -42.548996 -25.455990 39.037010 -42.548996 -25.455990
- 40.133010 -37.677996 -26.719990 40.133010 -37.677996 -26.719990
- 41.230010 -32.807996 -27.982990 41.230010 -32.807996 -27.982990
- 42.326010 -27.936996 -29.245990 42.326010 -27.936996 -29.245990
- 40.821010 -53.920996 -25.767990 40.821010 -53.920996 -25.767990
- 41.917010 -49.049996 -27.030990 41.917010 -49.049996 -27.030990
- 43.014010 -44.179996 -28.293990 43.014010 -44.179996 -28.293990
- 44.110010 -39.308996 -29.556990 44.110010 -39.308996 -29.556990
- 45.206010 -34.437996 -30.819990 45.206010 -34.437996 -30.819990
- 46.302010 -29.566996 -32.082990 46.302010 -29.566996 -32.082990
- 45.894010 -50.680996 -29.867990 45.894010 -50.680996 -29.867990
- 46.990010 -45.809996 -31.130990 46.990010 -45.809996 -31.130990
- 48.086010 -40.939996 -32.393990 48.086010 -40.939996 -32.393990
- 49.182010 -36.068995 -33.656990 49.182010 -36.068995 -33.656990
- 50.967010 -47.440995 -33.968990 50.967010 -47.440995 -33.968990
- 52.063010 -42.569995 -35.231990 52.063010 -42.569995 -35.231990
+-52.064010 42.569995 35.232000 -52.064010 42.569995 35.232000
+-50.969010 47.440995 33.970000 -50.969010 47.440995 33.970000
+-49.184010 36.068995 33.658000 -49.184010 36.068995 33.658000
+-48.088010 40.939995 32.395000 -48.088010 40.939995 32.395000
+-46.992010 45.809995 31.132000 -46.992010 45.809995 31.132000
+-45.895010 50.680995 29.869000 -45.895010 50.680995 29.869000
+-46.304010 29.565995 32.084000 -46.304010 29.565995 32.084000
+-45.207010 34.437995 30.820000 -45.207010 34.437995 30.820000
+-44.112010 39.308995 29.558000 -44.112010 39.308995 29.558000
+-43.015010 44.179995 28.294000 -43.015010 44.179995 28.294000
+-41.919010 49.049996 27.031000 -41.919010 49.049996 27.031000
+-40.823010 53.920996 25.768000 -40.823010 53.920996 25.768000
+-42.327010 27.935996 29.246000 -42.327010 27.935996 29.246000
+-41.232010 32.806996 27.983000 -41.232010 32.806996 27.983000
+-40.135010 37.677996 26.720000 -40.135010 37.677996 26.720000
+-39.039010 42.548996 25.457000 -39.039010 42.548996 25.457000
+-37.943010 47.419996 24.194000 -37.943010 47.419996 24.194000
+-36.847010 52.290996 22.931000 -36.847010 52.290996 22.931000
+-37.255010 31.175996 25.146000 -37.255010 31.175996 25.146000
+-36.158010 36.047996 23.883000 -36.158010 36.047996 23.883000
+-35.063010 40.917996 22.620000 -35.063010 40.917996 22.620000
+-33.966010 45.788996 21.357000 -33.966010 45.788996 21.357000
+-32.182010 34.416996 21.045000 -32.182010 34.416996 21.045000
+-31.086010 39.287997 19.782000 -31.086010 39.287997 19.782000
+ 31.084000 -39.287997 -19.782000 31.084000 -39.287997 -19.782000
+ 32.180000 -34.416997 -21.044000 32.180000 -34.416997 -21.044000
+ 33.965000 -45.788997 -21.356000 33.965000 -45.788997 -21.356000
+ 35.061000 -40.917997 -22.619000 35.061000 -40.917997 -22.619000
+ 36.157000 -36.047997 -23.882000 36.157000 -36.047997 -23.882000
+ 37.253000 -31.176997 -25.145000 37.253000 -31.176997 -25.145000
+ 36.845000 -52.290997 -22.930000 36.845000 -52.290997 -22.930000
+ 37.941000 -47.419997 -24.194000 37.941000 -47.419997 -24.194000
+ 39.037000 -42.548997 -25.456000 39.037000 -42.548997 -25.456000
+ 40.133000 -37.677997 -26.720000 40.133000 -37.677997 -26.720000
+ 41.230000 -32.807996 -27.983000 41.230000 -32.807996 -27.983000
+ 42.326000 -27.936996 -29.246000 42.326000 -27.936996 -29.246000
+ 40.821000 -53.920997 -25.768000 40.821000 -53.920997 -25.768000
+ 41.917000 -49.049996 -27.031000 41.917000 -49.049996 -27.031000
+ 43.014000 -44.179996 -28.294000 43.014000 -44.179996 -28.294000
+ 44.110000 -39.308996 -29.557000 44.110000 -39.308996 -29.557000
+ 45.206000 -34.437996 -30.820000 45.206000 -34.437996 -30.820000
+ 46.302000 -29.566996 -32.083000 46.302000 -29.566996 -32.083000
+ 45.894000 -50.680996 -29.868000 45.894000 -50.680996 -29.868000
+ 46.990000 -45.809996 -31.131000 46.990000 -45.809996 -31.131000
+ 48.086000 -40.939996 -32.394000 48.086000 -40.939996 -32.394000
+ 49.182000 -36.068996 -33.657000 49.182000 -36.068996 -33.657000
+ 50.967000 -47.440996 -33.969000 50.967000 -47.440996 -33.969000
+ 52.063000 -42.569995 -35.232000 52.063000 -42.569995 -35.232000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826896.235130000 460979.454666000 5064658.203 ]
+3 [ 3826896.191740000 460979.502113000 5064658.231 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826979.384140000 460897.596673000 5064603.189 ]
+3 [ 3826979.340750000 460897.644121000 5064603.217 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS002-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS002-AntennaField.conf
index 3dfcd19872bb57aeb541062d5e69f06d5a7afc29..6e05186e78c1c7043019cf159783e6fd6f8f0c26 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS002-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS002-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS002
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:37
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:05
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826577.066110000 461022.947639000 5064892.786 ]
+3 [ 3826577.022720000 461022.995082000 5064892.814 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
@@ -25,147 +25,147 @@ LBA
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
-3.073000 -4.125000 2.679000 -3.073000 -4.125000 2.679000
- -4.593000 -0.553000 3.498000 -4.593000 -0.553000 3.498000
+ -4.593000 -0.553000 3.497990 -4.593000 -0.553000 3.497990
-3.965000 3.277000 2.680000 -3.965000 3.277000 2.680000
-1.481000 5.575000 0.607000 -1.481000 5.575000 0.607000
1.696000 5.264000 -1.749000 1.696000 5.264000 -1.749000
- 4.079000 2.490000 -3.287000 4.079000 2.490000 -3.287000
- 4.553000 -1.450000 -3.287000 4.553000 -1.450000 -3.287000
+ 4.079000 2.490001 -3.287000 4.079000 2.490001 -3.287000
+ 4.553000 -1.449999 -3.287000 4.553000 -1.449999 -3.287000
2.897000 -4.710000 -1.749000 2.897000 -4.710000 -1.749000
-0.114000 -5.767000 0.607000 -0.114000 -5.767000 0.607000
-0.837000 -9.174000 1.457000 -0.837000 -9.174000 1.457000
-3.733000 -8.431000 3.564000 -3.733000 -8.431000 3.564000
- -6.928000 -5.151001 5.666000 -6.928000 -5.151001 5.666000
- -7.997000 2.044999 5.818000 -7.997000 2.044999 5.818000
- -7.257000 5.075999 4.988000 -7.257000 5.075999 4.988000
- -5.039000 8.195000 3.042000 -5.039000 8.195000 3.042000
+ -6.928000 -5.151000 5.665990 -6.928000 -5.151000 5.665990
+ -7.997000 2.044999 5.817990 -7.997000 2.044999 5.817990
+ -7.257000 5.076000 4.987990 -7.257000 5.076000 4.987990
+ -5.039000 8.195000 3.041990 -5.039000 8.195000 3.041990
-1.741000 9.059000 0.488000 -1.741000 9.059000 0.488000
2.862000 8.017000 -2.873000 2.862000 8.017000 -2.873000
- 6.276000 5.624000 -5.219000 6.276000 5.624000 -5.219000
+ 6.276000 5.624001 -5.219000 6.276000 5.624001 -5.219000
7.890000 1.637001 -6.070000 7.890000 1.637001 -6.070000
7.333000 -2.192999 -5.306000 7.333000 -2.192999 -5.306000
- 5.455000 -6.295000 -3.526000 5.455000 -6.295000 -3.526000
+ 5.455000 -6.294999 -3.526000 5.455000 -6.294999 -3.526000
2.430000 -8.819000 -1.027000 2.430000 -8.819000 -1.027000
-2.385000 -13.817000 3.039000 -2.385000 -13.817000 3.039000
- -5.365000 -12.768001 5.181000 -5.365000 -12.768001 5.181000
- -7.149000 -10.465001 6.312000 -7.149000 -10.465001 6.312000
--10.096000 -3.201001 7.868000 -10.096000 -3.201001 7.868000
--12.000000 -1.260001 9.122000 -12.000000 -1.260001 9.122000
- -9.905000 5.589999 6.930000 -9.905000 5.589999 6.930000
- -7.567000 9.569999 4.815000 -7.567000 9.569999 4.815000
- -5.297000 13.892999 2.720000 -5.297000 13.892999 2.720000
+ -5.365000 -12.768000 5.181000 -5.365000 -12.768000 5.181000
+ -7.149000 -10.465000 6.311990 -7.149000 -10.465000 6.311990
+-10.096000 -3.201001 7.867990 -10.096000 -3.201001 7.867990
+-12.000000 -1.260001 9.121990 -12.000000 -1.260001 9.121990
+ -9.905000 5.589999 6.929990 -9.905000 5.589999 6.929990
+ -7.567000 9.569999 4.814990 -7.567000 9.569999 4.814990
+ -5.297000 13.893000 2.719990 -5.297000 13.893000 2.719990
-2.638000 13.216000 0.786000 -2.638000 13.216000 0.786000
1.167000 12.834000 -2.036000 1.167000 12.834000 -2.036000
- 6.422000 10.036000 -5.728000 6.422000 10.036000 -5.728000
+ 6.422000 10.036001 -5.728000 6.422000 10.036001 -5.728000
8.310000 8.429001 -7.000000 8.310000 8.429001 -7.000000
10.086000 3.481001 -7.885000 10.086000 3.481001 -7.885000
12.079000 0.035001 -9.070000 12.079000 0.035001 -9.070000
9.618000 -8.082999 -6.489000 9.618000 -8.082999 -6.489000
7.433000 -10.827999 -4.601000 7.433000 -10.827999 -4.601000
- 3.905000 -13.845000 -1.680000 3.905000 -13.845000 -1.680000
- 26.346010 -45.625998 -15.651000 26.346010 -45.625998 -15.651000
- 35.480000 30.151003 -29.357000 35.480000 30.151003 -29.357000
+ 3.905000 -13.844999 -1.680000 3.905000 -13.844999 -1.680000
+ 26.346010 -45.625997 -15.651000 26.346010 -45.625997 -15.651000
+ 35.480000 30.151004 -29.357000 35.480000 30.151004 -29.357000
2.383000 -17.795000 -0.180000 2.383000 -17.795000 -0.180000
0.956000 -20.194000 1.108000 0.956000 -20.194000 1.108000
--10.831000 -14.471001 9.438000 -10.831000 -14.471001 9.438000
--15.871000 0.644999 11.855000 -15.871000 0.644999 11.855000
--16.061000 5.561999 11.553000 -16.061000 5.561999 11.553000
- -9.738000 14.317999 6.016000 -9.738000 14.317999 6.016000
+-10.831000 -14.471001 9.437990 -10.831000 -14.471001 9.437990
+-15.871000 0.644999 11.854990 -15.871000 0.644999 11.854990
+-16.061000 5.561999 11.552990 -16.061000 5.561999 11.552990
+ -9.738000 14.317999 6.015990 -9.738000 14.317999 6.015990
0.362000 17.801000 -1.880000 0.362000 17.801000 -1.880000
- 6.711000 18.121000 -6.675000 6.711000 18.121000 -6.675000
+ 6.711000 18.121001 -6.675000 6.711000 18.121001 -6.675000
13.383000 5.942001 -10.583000 13.383000 5.942001 -10.583000
- 15.901000 -1.739999 -11.778000 15.901000 -1.739999 -11.778000
+ 15.901000 -1.739998 -11.778000 15.901000 -1.739998 -11.778000
12.772000 -10.645999 -8.624000 12.772000 -10.645999 -8.624000
- 13.779000 -18.775999 -8.646000 13.779000 -18.775999 -8.646000
- 4.690000 -24.508000 -1.305000 4.690000 -24.508000 -1.305000
- -5.623000 -23.914001 6.382000 -5.623000 -23.914001 6.382000
--10.310000 -21.350001 9.668000 -10.310000 -21.350001 9.668000
--16.053000 -16.531001 13.543000 -16.053000 -16.531001 13.543000
--19.186000 0.806998 14.329000 -19.186000 0.806998 14.329000
--18.657000 8.687998 13.219000 -18.657000 8.687998 13.219000
--13.662000 20.673999 8.387000 -13.662000 20.673999 8.387000
- -3.015000 24.964000 0.007000 -3.015000 24.964000 0.007000
- 4.425000 25.056000 -5.586000 4.425000 25.056000 -5.586000
+ 13.779000 -18.775998 -8.646000 13.779000 -18.775998 -8.646000
+ 4.690000 -24.507999 -1.305000 4.690000 -24.507999 -1.305000
+ -5.623000 -23.914000 6.382000 -5.623000 -23.914000 6.382000
+-10.310000 -21.350001 9.667990 -10.310000 -21.350001 9.667990
+-16.053000 -16.531001 13.542990 -16.053000 -16.531001 13.542990
+-19.186000 0.806998 14.328990 -19.186000 0.806998 14.328990
+-18.657000 8.687998 13.218990 -18.657000 8.687998 13.218990
+-13.662000 20.673999 8.386990 -13.662000 20.673999 8.386990
+ -3.015000 24.964000 0.006990 -3.015000 24.964000 0.006990
+ 4.425000 25.056001 -5.586000 4.425000 25.056001 -5.586000
12.433000 18.402001 -10.995000 12.433000 18.402001 -10.995000
20.879000 5.693002 -16.187000 20.879000 5.693002 -16.187000
19.922000 -11.873998 -13.880000 19.922000 -11.873998 -13.880000
19.705000 -25.616998 -12.476000 19.705000 -25.616998 -12.476000
8.502000 -29.983999 -3.671000 8.502000 -29.983999 -3.671000
-3.142000 -30.709000 5.134000 -3.142000 -30.709000 5.134000
- -9.535000 -29.650001 9.837000 -9.535000 -29.650001 9.837000
--20.859000 -16.397002 17.139000 -20.859000 -16.397002 17.139000
--27.332000 0.111998 20.505000 -27.332000 0.111998 20.505000
--25.986000 12.149998 18.407000 -25.986000 12.149998 18.407000
--20.153000 17.626998 13.534000 -20.153000 17.626998 13.534000
--14.392000 29.950999 8.096000 -14.392000 29.950999 8.096000
+ -9.535000 -29.650001 9.836990 -9.535000 -29.650001 9.836990
+-20.859000 -16.397002 17.138990 -20.859000 -16.397002 17.138990
+-27.332000 0.111998 20.504990 -27.332000 0.111998 20.504990
+-25.986000 12.149998 18.406990 -25.986000 12.149998 18.406990
+-20.153000 17.626998 13.533990 -20.153000 17.626998 13.533990
+-14.392000 29.950999 8.095990 -14.392000 29.950999 8.095990
0.340000 33.765000 -3.307000 0.340000 33.765000 -3.307000
7.430000 31.869001 -8.458000 7.430000 31.869001 -8.458000
18.888000 24.057002 -16.352000 18.888000 24.057002 -16.352000
21.562000 16.387002 -17.666000 21.562000 16.387002 -17.666000
- 26.629000 -3.488998 -19.673000 26.629000 -3.488998 -19.673000
+ 26.629000 -3.488997 -19.673000 26.629000 -3.488997 -19.673000
23.831000 -9.012998 -17.073000 23.831000 -9.012998 -17.073000
- 28.186000 -12.432998 -20.033000 28.186000 -12.432998 -20.033000
+ 28.186000 -12.432997 -20.033000 28.186000 -12.432997 -20.033000
7.964000 -40.944999 -2.277000 7.964000 -40.944999 -2.277000
--12.370000 -35.929001 12.533000 -12.370000 -35.929001 12.533000
--26.100000 -24.601002 21.814000 -26.100000 -24.601002 21.814000
--30.937000 -9.427003 24.074000 -30.937000 -9.427003 24.074000
--20.978000 33.044998 12.759000 -20.978000 33.044998 12.759000
- -3.429000 36.392000 -0.715000 -3.429000 36.392000 -0.715000
+-12.370000 -35.929001 12.532990 -12.370000 -35.929001 12.532990
+-26.100000 -24.601002 21.813990 -26.100000 -24.601002 21.813990
+-30.937000 -9.427003 24.073990 -30.937000 -9.427003 24.073990
+-20.978000 33.044998 12.758990 -20.978000 33.044998 12.758990
+ -3.429000 36.392000 -0.715010 -3.429000 36.392000 -0.715010
9.389000 38.963001 -10.569000 9.389000 38.963001 -10.569000
30.713000 3.690003 -23.387000 30.713000 3.690003 -23.387000
]
HBA
-3 [ 3826583.278120000 460955.755639000 5064894.197 ]
+3 [ 3826583.234730000 460955.803083000 5064894.225 ]
48 x 2 x 3 [
8.775000 5.195001 -7.056000 8.775000 5.195001 -7.056000
11.609000 8.730001 -9.504000 11.609000 8.730001 -9.504000
8.937000 -2.066999 -6.522000 8.937000 -2.066999 -6.522000
11.771000 1.468001 -8.969000 11.771000 1.468001 -8.969000
- 14.606000 5.004002 -11.416000 14.606000 5.004002 -11.416000
- 17.440000 8.538002 -13.863000 17.440000 8.538002 -13.863000
+ 14.606000 5.004001 -11.416000 14.606000 5.004001 -11.416000
+ 17.440000 8.538001 -13.863000 17.440000 8.538001 -13.863000
9.098000 -9.328999 -5.986000 9.098000 -9.328999 -5.986000
- 11.932000 -5.793998 -8.434000 11.932000 -5.793998 -8.434000
- 14.768000 -2.257998 -10.881000 14.768000 -2.257998 -10.881000
+ 11.932000 -5.793999 -8.434000 11.932000 -5.793999 -8.434000
+ 14.768000 -2.257999 -10.881000 14.768000 -2.257999 -10.881000
17.602000 1.276002 -13.329000 17.602000 1.276002 -13.329000
20.437000 4.812002 -15.776000 20.437000 4.812002 -15.776000
23.271000 8.347002 -18.223000 23.271000 8.347002 -18.223000
- 12.095000 -13.054998 -7.899000 12.095000 -13.054998 -7.899000
- 14.929000 -9.519998 -10.346000 14.929000 -9.519998 -10.346000
+ 12.095000 -13.054999 -7.899000 12.095000 -13.054999 -7.899000
+ 14.929000 -9.519999 -10.346000 14.929000 -9.519999 -10.346000
17.764000 -5.983998 -12.793000 17.764000 -5.983998 -12.793000
20.598000 -2.449998 -15.241000 20.598000 -2.449998 -15.241000
23.434000 1.086002 -17.688000 23.434000 1.086002 -17.688000
- 26.268000 4.621003 -20.136000 26.268000 4.621003 -20.136000
+ 26.268000 4.621002 -20.136000 26.268000 4.621002 -20.136000
17.926000 -13.245998 -12.259000 17.926000 -13.245998 -12.259000
20.760000 -9.711998 -14.706000 20.760000 -9.711998 -14.706000
23.595000 -6.175998 -17.153000 23.595000 -6.175998 -17.153000
- 26.429000 -2.640997 -19.600000 26.429000 -2.640997 -19.600000
- 23.757000 -13.437997 -16.618000 23.757000 -13.437997 -16.618000
- 26.591000 -9.902997 -19.066000 26.591000 -9.902997 -19.066000
--27.572000 -1.431002 20.826000 -27.572000 -1.431002 20.826000
--28.188010 3.681998 20.826000 -28.188010 3.681998 20.826000
--22.878000 -6.053001 17.720000 -22.878000 -6.053001 17.720000
--23.494000 -0.940001 17.720000 -23.494000 -0.940001 17.720000
--24.110000 4.172998 17.720000 -24.110000 4.172998 17.720000
--24.726010 9.285998 17.720000 -24.726010 9.285998 17.720000
--18.183000 -10.674001 14.614000 -18.183000 -10.674001 14.614000
--18.799000 -5.561001 14.614000 -18.799000 -5.561001 14.614000
--19.415000 -0.448001 14.614000 -19.415000 -0.448001 14.614000
--20.031000 4.664999 14.614000 -20.031000 4.664999 14.614000
--20.647010 9.777999 14.614000 -20.647010 9.777999 14.614000
--21.263010 14.890999 14.614000 -21.263010 14.890999 14.614000
--14.105000 -10.183001 11.508000 -14.105000 -10.183001 11.508000
--14.721000 -5.070001 11.508000 -14.721000 -5.070001 11.508000
--15.337000 0.042999 11.508000 -15.337000 0.042999 11.508000
--15.953000 5.155999 11.508000 -15.953000 5.155999 11.508000
--16.569010 10.268999 11.508000 -16.569010 10.268999 11.508000
--17.185010 15.381999 11.508000 -17.185010 15.381999 11.508000
--10.642000 -4.578000 8.402000 -10.642000 -4.578000 8.402000
--11.258000 0.535000 8.402000 -11.258000 0.535000 8.402000
+ 26.429000 -2.640998 -19.600000 26.429000 -2.640998 -19.600000
+ 23.757000 -13.437998 -16.618000 23.757000 -13.437998 -16.618000
+ 26.591000 -9.902998 -19.066000 26.591000 -9.902998 -19.066000
+-27.572000 -1.431003 20.825990 -27.572000 -1.431003 20.825990
+-28.188000 3.681997 20.825990 -28.188000 3.681997 20.825990
+-22.878000 -6.053002 17.719990 -22.878000 -6.053002 17.719990
+-23.494000 -0.940002 17.719990 -23.494000 -0.940002 17.719990
+-24.110000 4.172998 17.719990 -24.110000 4.172998 17.719990
+-24.726010 9.285997 17.719990 -24.726010 9.285997 17.719990
+-18.183000 -10.674002 14.614000 -18.183000 -10.674002 14.614000
+-18.799000 -5.561002 14.613990 -18.799000 -5.561002 14.613990
+-19.415000 -0.448002 14.613990 -19.415000 -0.448002 14.613990
+-20.031000 4.664998 14.613990 -20.031000 4.664998 14.613990
+-20.647000 9.777998 14.613990 -20.647000 9.777998 14.613990
+-21.263010 14.890998 14.613990 -21.263010 14.890998 14.613990
+-14.105000 -10.183002 11.508000 -14.105000 -10.183002 11.508000
+-14.721000 -5.070002 11.508000 -14.721000 -5.070002 11.508000
+-15.337000 0.042998 11.508000 -15.337000 0.042998 11.508000
+-15.953000 5.155998 11.508000 -15.953000 5.155998 11.508000
+-16.569000 10.268998 11.507990 -16.569000 10.268998 11.507990
+-17.185010 15.381998 11.507990 -17.185010 15.381998 11.507990
+-10.642000 -4.578001 8.402000 -10.642000 -4.578001 8.402000
+-11.258000 0.534999 8.402000 -11.258000 0.534999 8.402000
-11.874000 5.647999 8.402000 -11.874000 5.647999 8.402000
-12.490000 10.760999 8.402000 -12.490000 10.760999 8.402000
- -7.180000 1.026000 5.296000 -7.180000 1.026000 5.296000
- -7.796000 6.139000 5.296000 -7.796000 6.139000 5.296000
+ -7.180000 1.025999 5.296000 -7.180000 1.025999 5.296000
+ -7.796000 6.138999 5.296000 -7.796000 6.138999 5.296000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826600.961120000 460953.401641000 5064881.136 ]
+3 [ 3826600.917730000 460953.449085000 5064881.164 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826565.594120000 460958.109638000 5064907.258 ]
+3 [ 3826565.550730000 460958.157081000 5064907.286 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS003-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS003-AntennaField.conf
index b5de76830231d88dec244a40f871fe5e10c226c7..319d192b5e4f3f4be9f6b2922aa325abcb44ad01 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS003-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS003-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS003
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:37
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:06
#
NORMAL_VECTOR LBA
@@ -15,80 +15,80 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826516.748120000 460930.065634000 5064946.457 ]
+3 [ 3826516.704730000 460930.113077000 5064946.485 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.020000 -0.244000 1.538000 -2.020000 -0.244000 1.538000
- -1.339000 2.105000 0.814000 -1.339000 2.105000 0.814000
+ -2.020000 -0.244001 1.538000 -2.020000 -0.244001 1.538000
+ -1.339000 2.104999 0.814000 -1.339000 2.104999 0.814000
0.800000 2.362000 -0.814000 0.800000 2.362000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
- -0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
+ -0.800000 -2.363001 0.814000 -0.800000 -2.363001 0.814000
4.553000 -1.450000 -3.287000 4.553000 -1.450000 -3.287000
2.897000 -4.710000 -1.749000 2.897000 -4.710000 -1.749000
-0.115000 -5.767000 0.607000 -0.115000 -5.767000 0.607000
- -3.073000 -4.125000 2.680000 -3.073000 -4.125000 2.680000
- -4.594000 -0.554000 3.498000 -4.594000 -0.554000 3.498000
- -3.965000 3.277000 2.680000 -3.965000 3.277000 2.680000
- -1.481000 5.575000 0.608000 -1.481000 5.575000 0.608000
+ -3.073000 -4.125001 2.680000 -3.073000 -4.125001 2.680000
+ -4.594000 -0.554001 3.498000 -4.594000 -0.554001 3.498000
+ -3.965000 3.276999 2.680000 -3.965000 3.276999 2.680000
+ -1.481000 5.574999 0.608000 -1.481000 5.574999 0.608000
1.696000 5.263000 -1.749000 1.696000 5.263000 -1.749000
4.079000 2.490000 -3.287000 4.079000 2.490000 -3.287000
6.847000 3.253000 -5.434000 6.847000 3.253000 -5.434000
- 7.913000 -0.210999 -5.920000 7.913000 -0.210999 -5.920000
- 7.375000 -5.148999 -5.071000 7.375000 -5.148999 -5.071000
+ 7.913000 -0.211000 -5.920000 7.913000 -0.211000 -5.920000
+ 7.375000 -5.149000 -5.071000 7.375000 -5.149000 -5.071000
2.948000 -9.564000 -1.349000 2.948000 -9.564000 -1.349000
0.433000 -10.138000 0.591000 0.433000 -10.138000 0.591000
- -2.952000 -9.156000 3.043000 -2.952000 -9.156000 3.043000
+ -2.952000 -9.156001 3.043000 -2.952000 -9.156001 3.043000
-5.357000 -5.986001 4.562000 -5.357000 -5.986001 4.562000
-7.148000 -0.542001 5.415000 -7.148000 -0.542001 5.415000
-7.350000 4.229999 5.134000 -7.350000 4.229999 5.134000
- -5.455010 7.778999 3.392000 -5.455010 7.778999 3.392000
- -2.483010 8.913000 1.058000 -2.483010 8.913000 1.058000
+ -5.455000 7.778999 3.392000 -5.455000 7.778999 3.392000
+ -2.483000 8.912999 1.058000 -2.483000 8.912999 1.058000
1.400000 8.743000 -1.841000 1.400000 8.743000 -1.841000
4.813000 6.620000 -4.211000 4.813000 6.620000 -4.211000
10.927000 3.685001 -8.535000 10.927000 3.685001 -8.535000
11.827000 -0.009999 -8.877000 11.827000 -0.009999 -8.877000
11.198000 -2.978999 -8.136000 11.198000 -2.978999 -8.136000
- 7.750000 -9.453999 -4.963000 7.750000 -9.453999 -4.963000
- 7.439000 -12.389999 -4.464000 7.439000 -12.389999 -4.464000
+ 7.750000 -9.454000 -4.963000 7.750000 -9.454000 -4.963000
+ 7.439000 -12.390000 -4.464000 7.439000 -12.390000 -4.464000
1.523000 -13.231000 0.053000 1.523000 -13.231000 0.053000
- -2.527000 -12.509000 3.027000 -2.527000 -12.509000 3.027000
+ -2.527000 -12.509001 3.027000 -2.527000 -12.509001 3.027000
-6.779000 -12.016001 6.175000 -6.779000 -12.016001 6.175000
-7.762000 -8.838001 6.625000 -7.762000 -8.838001 6.625000
-9.577000 -4.555001 7.600000 -9.577000 -4.555001 7.600000
-10.502000 2.387999 7.667000 -10.502000 2.387999 7.667000
--10.415010 5.155999 7.351000 -10.415010 5.155999 7.351000
+-10.415000 5.155999 7.351000 -10.415000 5.155999 7.351000
-7.941010 9.314999 5.118000 -7.941010 9.314999 5.118000
-6.630010 13.028999 3.799000 -6.630010 13.028999 3.799000
0.369990 14.050000 -1.547000 0.369990 14.050000 -1.547000
- 3.475990 12.934000 -3.778000 3.475990 12.934000 -3.778000
- 7.506000 10.491001 -6.583000 7.506000 10.491001 -6.583000
--38.650000 -23.644003 31.149000 -38.650000 -23.644003 31.149000
--21.152010 49.524998 11.401000 -21.152010 49.524998 11.401000
+ 3.476000 12.934000 -3.778000 3.476000 12.934000 -3.778000
+ 7.506000 10.491000 -6.583000 7.506000 10.491000 -6.583000
+-38.650000 -23.644004 31.149000 -38.650000 -23.644004 31.149000
+-21.152010 49.524997 11.401000 -21.152010 49.524997 11.401000
11.090000 10.637001 -9.286000 11.090000 10.637001 -9.286000
13.541000 10.183001 -11.085000 13.541000 10.183001 -11.085000
16.002000 -5.139999 -11.547000 16.002000 -5.139999 -11.547000
- 8.230000 -17.433999 -4.602000 8.230000 -17.433999 -4.602000
+ 8.230000 -17.434000 -4.602000 8.230000 -17.434000 -4.602000
4.910000 -19.866000 -1.890000 4.910000 -19.866000 -1.890000
- -4.647000 -17.006000 5.025000 -4.647000 -17.006000 5.025000
--12.595000 -7.676001 10.148000 -12.595000 -7.676001 10.148000
--16.291000 -0.964001 12.315000 -16.291000 -0.964001 12.315000
--11.457010 11.761999 7.537000 -11.457010 11.761999 7.537000
+ -4.647000 -17.006001 5.025000 -4.647000 -17.006001 5.025000
+-12.595000 -7.676002 10.148000 -12.595000 -7.676002 10.148000
+-16.291000 -0.964002 12.315000 -16.291000 -0.964002 12.315000
+-11.457010 11.761998 7.537000 -11.457010 11.761998 7.537000
-7.484010 17.962999 3.994000 -7.484010 17.962999 3.994000
0.428990 18.618000 -2.005000 0.428990 18.618000 -2.005000
5.539990 23.390000 -6.273000 5.539990 23.390000 -6.273000
- 14.503990 16.170001 -12.349000 14.503990 16.170001 -12.349000
- 19.730000 4.763002 -15.240000 19.730000 4.763002 -15.240000
- 20.507000 -1.460998 -15.261000 20.507000 -1.460998 -15.261000
- 20.291000 -9.846998 -14.341000 20.291000 -9.846998 -14.341000
- 9.930000 -21.087999 -5.548000 9.930000 -21.087999 -5.548000
+ 14.504000 16.170001 -12.349000 14.504000 16.170001 -12.349000
+ 19.730000 4.763001 -15.240000 19.730000 4.763001 -15.240000
+ 20.507000 -1.460999 -15.261000 20.507000 -1.460999 -15.261000
+ 20.291000 -9.846999 -14.341000 20.291000 -9.846999 -14.341000
+ 9.930000 -21.088000 -5.548000 9.930000 -21.088000 -5.548000
4.152000 -24.087000 -0.940000 4.152000 -24.087000 -0.940000
-6.928000 -24.124001 7.380000 -6.928000 -24.124001 7.380000
--15.737000 -14.568001 13.129000 -15.737000 -14.568001 13.129000
+-15.737000 -14.568002 13.129000 -15.737000 -14.568002 13.129000
-19.871000 -6.575002 15.509000 -19.871000 -6.575002 15.509000
-19.616010 5.088998 14.264000 -19.616010 5.088998 14.264000
--15.383010 19.969999 9.742000 -15.383010 19.969999 9.742000
- -2.625010 26.897000 -0.461000 -2.625010 26.897000 -0.461000
+-15.383010 19.969998 9.742000 -15.383010 19.969998 9.742000
+ -2.625010 26.896999 -0.461000 -2.625010 26.896999 -0.461000
7.063990 32.890000 -8.275000 7.063990 32.890000 -8.275000
16.233990 22.768001 -14.243000 16.233990 22.768001 -14.243000
23.106000 10.521002 -18.295000 23.106000 10.521002 -18.295000
@@ -96,32 +96,32 @@ LBA
22.826000 -15.097998 -15.769000 22.826000 -15.097998 -15.769000
14.869000 -29.569999 -8.488000 14.869000 -29.569999 -8.488000
5.748000 -33.571000 -1.281000 5.748000 -33.571000 -1.281000
- -1.256000 -29.753000 3.632000 -1.256000 -29.753000 3.632000
--12.990000 -29.115001 12.382000 -12.990000 -29.115001 12.382000
--23.702000 -14.934002 19.141000 -23.702000 -14.934002 19.141000
--26.259000 -6.416002 20.290000 -26.259000 -6.416002 20.290000
--27.085010 9.498998 19.472000 -27.085010 9.498998 19.472000
--23.205010 15.861998 15.984000 -23.205010 15.861998 15.984000
--12.133010 30.339999 6.365000 -12.133010 30.339999 6.365000
+ -1.256000 -29.753001 3.632000 -1.256000 -29.753001 3.632000
+-12.990000 -29.115002 12.382000 -12.990000 -29.115002 12.382000
+-23.702000 -14.934003 19.141000 -23.702000 -14.934003 19.141000
+-26.259000 -6.416003 20.290000 -26.259000 -6.416003 20.290000
+-27.085010 9.498997 19.472000 -27.085010 9.498997 19.472000
+-23.205010 15.861997 15.984000 -23.205010 15.861997 15.984000
+-12.133010 30.339998 6.365000 -12.133010 30.339998 6.365000
-6.755010 29.821999 2.375000 -6.755010 29.821999 2.375000
-6.755010 36.074999 1.810000 -6.755010 36.074999 1.810000
24.160990 27.156002 -20.590000 24.160990 27.156002 -20.590000
31.787000 2.920003 -24.124000 31.787000 2.920003 -24.124000
31.406000 -17.041997 -22.034000 31.406000 -17.041997 -22.034000
23.484000 -29.140998 -14.993000 23.484000 -29.140998 -14.993000
--11.543000 -37.630001 12.065000 -11.543000 -37.630001 12.065000
--23.470000 -20.195002 19.442000 -23.470000 -20.195002 19.442000
--32.270010 -7.515003 24.902000 -32.270010 -7.515003 24.902000
+-11.543000 -37.630002 12.065000 -11.543000 -37.630002 12.065000
+-23.470000 -20.195003 19.442000 -23.470000 -20.195003 19.442000
+-32.270000 -7.515004 24.902000 -32.270000 -7.515004 24.902000
-19.366010 31.498998 11.690000 -19.366010 31.498998 11.690000
]
HBA
-3 [ 3826494.580110000 461017.697632000 5064955.176 ]
+3 [ 3826494.536720000 461017.745074000 5064955.204 ]
48 x 2 x 3 [
-33.585000 -14.570003 26.526000 -33.585000 -14.570003 26.526000
-32.080000 -9.895003 24.973000 -32.080000 -9.895003 24.973000
-31.251000 -21.375003 25.389000 -31.251000 -21.375003 25.389000
--29.745000 -16.701003 23.836000 -29.745000 -16.701003 23.836000
+-29.745000 -16.701002 23.836000 -29.745000 -16.701002 23.836000
-28.240000 -12.026002 22.284000 -28.240000 -12.026002 22.284000
-26.734000 -7.353002 20.731000 -26.734000 -7.353002 20.731000
-28.917000 -28.179002 24.252000 -28.917000 -28.179002 24.252000
@@ -134,37 +134,37 @@ HBA
-23.570000 -25.636002 20.009000 -23.570000 -25.636002 20.009000
-22.064000 -20.963002 18.456000 -22.064000 -20.963002 18.456000
-20.559000 -16.288002 16.903000 -20.559000 -16.288002 16.903000
--19.053000 -11.614002 15.351000 -19.053000 -11.614002 15.351000
+-19.053000 -11.614001 15.351000 -19.053000 -11.614001 15.351000
-17.547000 -6.941001 13.798000 -17.547000 -6.941001 13.798000
-19.730000 -27.767002 17.319000 -19.730000 -27.767002 17.319000
--18.224000 -23.094002 15.766000 -18.224000 -23.094002 15.766000
+-18.224000 -23.094001 15.766000 -18.224000 -23.094001 15.766000
-16.719000 -18.419001 14.214000 -16.719000 -18.419001 14.214000
-15.213000 -13.745001 12.661000 -15.213000 -13.745001 12.661000
-14.384000 -25.225001 13.077000 -14.384000 -25.225001 13.077000
-12.879000 -20.550001 11.524000 -12.879000 -20.550001 11.524000
- 14.324000 25.109001 -13.021000 14.324000 25.109001 -13.021000
- 17.158000 28.644001 -15.469000 17.158000 28.644001 -15.469000
- 14.486000 17.847001 -12.487000 14.486000 17.847001 -12.487000
- 17.320000 21.382001 -14.934000 17.320000 21.382001 -14.934000
+ 14.324000 25.109002 -13.021000 14.324000 25.109002 -13.021000
+ 17.157990 28.644002 -15.469000 17.157990 28.644002 -15.469000
+ 14.486000 17.847002 -12.487000 14.486000 17.847002 -12.487000
+ 17.320000 21.382002 -14.934000 17.320000 21.382002 -14.934000
20.155000 24.918002 -17.381000 20.155000 24.918002 -17.381000
- 22.989000 28.452002 -19.828000 22.989000 28.452002 -19.828000
- 14.647000 10.585001 -11.951000 14.647000 10.585001 -11.951000
- 17.481000 14.120001 -14.399000 17.481000 14.120001 -14.399000
+ 22.989000 28.452003 -19.828000 22.989000 28.452003 -19.828000
+ 14.647000 10.585002 -11.951000 14.647000 10.585002 -11.951000
+ 17.481000 14.120002 -14.399000 17.481000 14.120002 -14.399000
20.317000 17.656002 -16.846000 20.317000 17.656002 -16.846000
- 23.151000 21.190002 -19.294000 23.151000 21.190002 -19.294000
- 25.986000 24.726002 -21.741000 25.986000 24.726002 -21.741000
- 28.820000 28.261002 -24.188000 28.820000 28.261002 -24.188000
- 17.644000 6.859001 -13.864000 17.644000 6.859001 -13.864000
+ 23.151000 21.190003 -19.294000 23.151000 21.190003 -19.294000
+ 25.986000 24.726003 -21.741000 25.986000 24.726003 -21.741000
+ 28.820000 28.261003 -24.188000 28.820000 28.261003 -24.188000
+ 17.644000 6.859002 -13.864000 17.644000 6.859002 -13.864000
20.478000 10.394002 -16.311000 20.478000 10.394002 -16.311000
- 23.313000 13.930002 -18.758000 23.313000 13.930002 -18.758000
- 26.147000 17.464002 -21.206000 26.147000 17.464002 -21.206000
- 28.983000 21.000002 -23.653000 28.983000 21.000002 -23.653000
+ 23.313000 13.930003 -18.758000 23.313000 13.930003 -18.758000
+ 26.147000 17.464003 -21.206000 26.147000 17.464003 -21.206000
+ 28.983000 21.000003 -23.653000 28.983000 21.000003 -23.653000
31.817000 24.535003 -26.101000 31.817000 24.535003 -26.101000
- 23.475000 6.668002 -18.224000 23.475000 6.668002 -18.224000
- 26.309000 10.202002 -20.671000 26.309000 10.202002 -20.671000
- 29.144000 13.738002 -23.118000 29.144000 13.738002 -23.118000
+ 23.475000 6.668003 -18.224000 23.475000 6.668003 -18.224000
+ 26.309000 10.202003 -20.671000 26.309000 10.202003 -20.671000
+ 29.144000 13.738003 -23.118000 29.144000 13.738003 -23.118000
31.978000 17.273003 -25.565000 31.978000 17.273003 -25.565000
- 29.306000 6.476002 -22.583000 29.306000 6.476002 -22.583000
+ 29.306000 6.476003 -22.583000 29.306000 6.476003 -22.583000
32.140000 10.011003 -25.031000 32.140000 10.011003 -25.031000
]
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826471.348110000 461000.137630000 5064974.201 ]
+3 [ 3826471.304720000 461000.185072000 5064974.229 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826517.812110000 461035.257634000 5064936.150 ]
+3 [ 3826517.768720000 461035.305077000 5064936.178 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS004-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS004-AntennaField.conf
index 350187e4c31d411284658e762ee6a29b8dcf04bc..da212e0420977519d6face3e38a5c1162cf32903 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS004-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS004-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS004
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:37
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:06
#
NORMAL_VECTOR LBA
@@ -15,157 +15,157 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826654.197120000 460939.575645000 5064842.426 ]
+3 [ 3826654.153730000 460939.623090000 5064842.454 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.020000 -0.244000 1.538000 -2.020000 -0.244000 1.538000
- -1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
- 0.800000 2.362001 -0.814000 0.800000 2.362001 -0.814000
- 2.019000 0.243001 -1.538000 2.019000 0.243001 -1.538000
- 1.338000 -2.104999 -0.814000 1.338000 -2.104999 -0.814000
+ -2.020000 -0.244001 1.538000 -2.020000 -0.244001 1.538000
+ -1.338000 2.104999 0.814000 -1.338000 2.104999 0.814000
+ 0.800000 2.362000 -0.814000 0.800000 2.362000 -0.814000
+ 2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
+ 1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- -1.481000 5.575000 0.607000 -1.481000 5.575000 0.607000
- 1.696000 5.263001 -1.749000 1.696000 5.263001 -1.749000
- 4.079000 2.490001 -3.287000 4.079000 2.490001 -3.287000
- 4.553000 -1.449999 -3.287000 4.553000 -1.449999 -3.287000
- 2.897000 -4.709999 -1.749000 2.897000 -4.709999 -1.749000
+ -1.481000 5.574999 0.607000 -1.481000 5.574999 0.607000
+ 1.696000 5.263000 -1.749000 1.696000 5.263000 -1.749000
+ 4.079000 2.490000 -3.287000 4.079000 2.490000 -3.287000
+ 4.553000 -1.450000 -3.287000 4.553000 -1.450000 -3.287000
+ 2.897000 -4.710000 -1.749000 2.897000 -4.710000 -1.749000
-0.114000 -5.767000 0.607000 -0.114000 -5.767000 0.607000
- -3.073000 -4.125000 2.679000 -3.073000 -4.125000 2.679000
- -4.593000 -0.554000 3.498000 -4.593000 -0.554000 3.498000
- -3.965000 3.277000 2.680000 -3.965000 3.277000 2.680000
- -6.010000 5.920000 3.976000 -6.010000 5.920000 3.976000
- -4.180000 8.642000 2.356000 -4.180000 8.642000 2.356000
+ -3.073000 -4.125001 2.679000 -3.073000 -4.125001 2.679000
+ -4.593000 -0.554001 3.498000 -4.593000 -0.554001 3.498000
+ -3.965000 3.276999 2.680000 -3.965000 3.276999 2.680000
+ -6.010000 5.919999 3.976000 -6.010000 5.919999 3.976000
+ -4.180000 8.641999 2.356000 -4.180000 8.641999 2.356000
-0.448000 10.298000 -0.595000 -0.448000 10.298000 -0.595000
- 5.049000 7.519001 -4.469000 5.049000 7.519001 -4.469000
- 6.824000 5.061001 -5.580000 6.824000 5.061001 -5.580000
- 7.990000 0.960001 -6.085000 7.990000 0.960001 -6.085000
- 7.098000 -3.072999 -5.050000 7.098000 -3.072999 -5.050000
- 4.287000 -7.474999 -2.542000 4.287000 -7.474999 -2.542000
- 1.073000 -9.854999 0.085000 1.073000 -9.854999 0.085000
- -2.435000 -9.416000 2.678000 -2.435000 -9.416000 2.678000
- -4.850000 -6.721000 4.248000 -4.850000 -6.721000 4.248000
- -6.856000 -2.450000 5.367000 -6.856000 -2.450000 5.367000
- -7.243000 2.198000 5.238000 -7.243000 2.198000 5.238000
- -8.542000 10.132000 5.496000 -8.542000 10.132000 5.496000
- -6.461000 12.778000 3.695000 -6.461000 12.778000 3.695000
- -4.049000 13.444000 1.824000 -4.049000 13.444000 1.824000
- 2.346000 12.654001 -2.905000 2.346000 12.654001 -2.905000
- 4.561000 13.649001 -4.657000 4.561000 13.649001 -4.657000
- 8.382000 7.640001 -6.982000 8.382000 7.640001 -6.982000
+ 5.049000 7.519000 -4.469000 5.049000 7.519000 -4.469000
+ 6.824000 5.061000 -5.580000 6.824000 5.061000 -5.580000
+ 7.990000 0.960000 -6.085000 7.990000 0.960000 -6.085000
+ 7.098000 -3.073000 -5.050000 7.098000 -3.073000 -5.050000
+ 4.287000 -7.475000 -2.542000 4.287000 -7.475000 -2.542000
+ 1.073000 -9.855000 0.085000 1.073000 -9.855000 0.085000
+ -2.435000 -9.416001 2.678000 -2.435000 -9.416001 2.678000
+ -4.850000 -6.721001 4.248000 -4.850000 -6.721001 4.248000
+ -6.856000 -2.450001 5.367000 -6.856000 -2.450001 5.367000
+ -7.243000 2.197999 5.238000 -7.243000 2.197999 5.238000
+ -8.542000 10.131999 5.496000 -8.542000 10.131999 5.496000
+ -6.461000 12.777999 3.695000 -6.461000 12.777999 3.695000
+ -4.049000 13.443999 1.824000 -4.049000 13.443999 1.824000
+ 2.346000 12.654000 -2.905000 2.346000 12.654000 -2.905000
+ 4.561000 13.649000 -4.657000 4.561000 13.649000 -4.657000
+ 8.382000 7.640000 -6.982000 8.382000 7.640000 -6.982000
10.093000 2.939001 -7.842000 10.093000 2.939001 -7.842000
- 12.076000 -1.876998 -8.895000 12.076000 -1.876998 -8.895000
+ 12.076000 -1.876999 -8.895000 12.076000 -1.876999 -8.895000
10.400000 -4.378999 -7.411000 10.400000 -4.378999 -7.411000
- 8.409000 -8.278999 -5.564000 8.409000 -8.278999 -5.564000
- 4.080000 -12.423999 -1.939000 4.080000 -12.423999 -1.939000
- 2.104000 -13.584999 -0.352000 2.104000 -13.584999 -0.352000
- -2.146000 -12.797000 2.767000 -2.146000 -12.797000 2.767000
- -5.449000 -13.065000 5.271000 -5.449000 -13.065000 5.271000
- -9.988000 -5.968000 8.036000 -9.988000 -5.968000 8.036000
--10.909000 -2.106000 8.378000 -10.909000 -2.106000 8.378000
--11.412000 3.354000 8.263000 -11.412000 3.354000 8.263000
+ 8.409000 -8.279000 -5.564000 8.409000 -8.279000 -5.564000
+ 4.080000 -12.424000 -1.939000 4.080000 -12.424000 -1.939000
+ 2.104000 -13.585000 -0.352000 2.104000 -13.585000 -0.352000
+ -2.146000 -12.797001 2.767000 -2.146000 -12.797001 2.767000
+ -5.449000 -13.065001 5.271000 -5.449000 -13.065001 5.271000
+ -9.988000 -5.968001 8.036000 -9.988000 -5.968001 8.036000
+-10.909000 -2.106001 8.378000 -10.909000 -2.106001 8.378000
+-11.412000 3.353998 8.263000 -11.412000 3.353998 8.263000
10.642010 -53.819999 -3.123000 10.642010 -53.819999 -3.123000
--42.751000 -10.314003 33.021990 -42.751000 -10.314003 33.021990
--13.473000 7.157999 9.466000 -13.473000 7.157999 9.466000
--14.497000 10.009999 9.977000 -14.497000 10.009999 9.977000
- -5.171000 19.611000 2.109000 -5.171000 19.611000 2.109000
- 7.641000 16.788001 -7.253000 7.641000 16.788001 -7.253000
+-42.751000 -10.314004 33.022000 -42.751000 -10.314004 33.022000
+-13.473000 7.157998 9.466000 -13.473000 7.157998 9.466000
+-14.497000 10.009998 9.977000 -14.497000 10.009998 9.977000
+ -5.171000 19.610999 2.109000 -5.171000 19.610999 2.109000
+ 7.641000 16.788000 -7.253000 7.641000 16.788000 -7.253000
11.150000 14.304001 -9.663000 11.150000 14.304001 -9.663000
- 14.384000 2.688002 -11.040000 14.384000 2.688002 -11.040000
- 12.234000 -10.124998 -8.268000 12.234000 -10.124998 -8.268000
+ 14.384000 2.688001 -11.040000 14.384000 2.688001 -11.040000
+ 12.234000 -10.124999 -8.268000 12.234000 -10.124999 -8.268000
9.580000 -17.156999 -5.640000 9.580000 -17.156999 -5.640000
- -1.927000 -17.704000 3.046000 -1.927000 -17.704000 3.046000
- -8.418000 -16.222000 7.785000 -8.418000 -16.222000 7.785000
--13.201000 -7.973001 10.630000 -13.201000 -7.973001 10.630000
--19.320000 -4.614001 14.919000 -19.320000 -4.614001 14.919000
--19.194000 8.337999 13.653000 -19.194000 8.337999 13.653000
--14.107000 19.150999 8.858000 -14.107000 19.150999 8.858000
--10.197000 22.810000 5.592000 -10.197000 22.810000 5.592000
- -4.239000 26.377000 0.797000 -4.239000 26.377000 0.797000
- 9.256000 20.281001 -8.781000 9.256000 20.281001 -8.781000
- 14.505000 15.399002 -12.280000 14.505000 15.399002 -12.280000
+ -1.927000 -17.704001 3.046000 -1.927000 -17.704001 3.046000
+ -8.418000 -16.222001 7.785000 -8.418000 -16.222001 7.785000
+-13.201000 -7.973002 10.630000 -13.201000 -7.973002 10.630000
+-19.320000 -4.614002 14.919000 -19.320000 -4.614002 14.919000
+-19.194000 8.337998 13.653000 -19.194000 8.337998 13.653000
+-14.107000 19.150998 8.858000 -14.107000 19.150998 8.858000
+-10.197000 22.809999 5.592000 -10.197000 22.809999 5.592000
+ -4.239000 26.376999 0.797000 -4.239000 26.376999 0.797000
+ 9.256000 20.281000 -8.781000 9.256000 20.281000 -8.781000
+ 14.505000 15.399001 -12.280000 14.505000 15.399001 -12.280000
20.590000 3.449002 -15.767000 20.590000 3.449002 -15.767000
- 18.752000 -10.395998 -13.136000 18.752000 -10.395998 -13.136000
- 15.445000 -18.480998 -9.923000 15.445000 -18.480998 -9.923000
- 7.183000 -23.491999 -3.268000 7.183000 -23.491999 -3.268000
- -5.496000 -25.663000 6.445000 -5.496000 -25.663000 6.445000
--17.297000 -15.023001 14.341000 -17.297000 -15.023001 14.341000
--26.770000 -7.274002 20.751000 -26.770000 -7.274002 20.751000
--24.735000 7.215998 17.914000 -24.735000 7.215998 17.914000
--19.964000 20.187999 13.160000 -19.964000 20.187999 13.160000
--16.329000 26.512999 9.861000 -16.329000 26.512999 9.861000
- -1.968000 31.495000 -1.370000 -1.968000 31.495000 -1.370000
- 12.463000 29.457002 -12.017000 12.463000 29.457002 -12.017000
- 20.237000 21.420002 -17.126000 20.237000 21.420002 -17.126000
+ 18.752000 -10.395999 -13.136000 18.752000 -10.395999 -13.136000
+ 15.445000 -18.480999 -9.923000 15.445000 -18.480999 -9.923000
+ 7.183000 -23.492000 -3.268000 7.183000 -23.492000 -3.268000
+ -5.496000 -25.663001 6.445000 -5.496000 -25.663001 6.445000
+-17.297000 -15.023002 14.341000 -17.297000 -15.023002 14.341000
+-26.770000 -7.274003 20.751000 -26.770000 -7.274003 20.751000
+-24.735000 7.215997 17.914000 -24.735000 7.215997 17.914000
+-19.964000 20.187998 13.160000 -19.964000 20.187998 13.160000
+-16.329000 26.512998 9.861000 -16.329000 26.512998 9.861000
+ -1.968000 31.494999 -1.370000 -1.968000 31.494999 -1.370000
+ 12.463000 29.457001 -12.017000 12.463000 29.457001 -12.017000
+ 20.237000 21.420001 -17.126000 20.237000 21.420001 -17.126000
21.408000 12.126002 -17.165000 21.408000 12.126002 -17.165000
- 27.381000 -0.835997 -20.477000 27.381000 -0.835997 -20.477000
- 23.362000 -18.831998 -15.834000 23.362000 -18.831998 -15.834000
- 18.828000 -25.452998 -11.832000 18.828000 -25.452998 -11.832000
- 8.196000 -33.556999 -3.119000 8.196000 -33.556999 -3.119000
- 1.642000 -32.248999 1.682000 1.642000 -32.248999 1.682000
--14.496000 -26.852001 13.308000 -14.496000 -26.852001 13.308000
--17.076000 -20.809001 14.698000 -17.076000 -20.809001 14.698000
--21.431000 -23.643001 18.223000 -21.431000 -23.643001 18.223000
--32.125000 13.788998 22.867000 -32.125000 13.788998 22.867000
--19.418000 33.007999 11.592000 -19.418000 33.007999 11.592000
- -5.307000 41.642000 0.220000 -5.307000 41.642000 0.220000
- 7.453000 38.568001 -9.081000 7.453000 38.568001 -9.081000
+ 27.381000 -0.835998 -20.477000 27.381000 -0.835998 -20.477000
+ 23.362010 -18.831998 -15.834000 23.362010 -18.831998 -15.834000
+ 18.828010 -25.452999 -11.832000 18.828010 -25.452999 -11.832000
+ 8.196010 -33.557000 -3.119000 8.196010 -33.557000 -3.119000
+ 1.642010 -32.249000 1.682000 1.642010 -32.249000 1.682000
+-14.496000 -26.852002 13.308000 -14.496000 -26.852002 13.308000
+-17.076000 -20.809002 14.698000 -17.076000 -20.809002 14.698000
+-21.431000 -23.643002 18.223000 -21.431000 -23.643002 18.223000
+-32.125000 13.788997 22.867000 -32.125000 13.788997 22.867000
+-19.418000 33.007998 11.592000 -19.418000 33.007998 11.592000
+ -5.307000 41.641999 0.220000 -5.307000 41.641999 0.220000
+ 7.453000 38.568000 -9.081000 7.453000 38.568000 -9.081000
32.520000 4.585003 -24.825000 32.520000 4.585003 -24.825000
- 26.900000 -16.197997 -18.728000 26.900000 -16.197997 -18.728000
- 22.881000 -31.447998 -14.333000 22.881000 -31.447998 -14.333000
--11.347000 -35.189000 11.698000 -11.347000 -35.189000 11.698000
+ 26.900010 -16.197998 -18.728000 26.900010 -16.197998 -18.728000
+ 22.881010 -31.447998 -14.333000 22.881010 -31.447998 -14.333000
+-11.347000 -35.189001 11.698000 -11.347000 -35.189001 11.698000
]
HBA
-3 [ 3826582.556120000 460891.661639000 5064900.532 ]
+3 [ 3826582.512730000 460891.709083000 5064900.560 ]
48 x 2 x 3 [
- -7.034000 -21.511000 7.224000 -7.034000 -21.511000 7.224000
- -5.135000 -17.086000 5.399000 -5.135000 -17.086000 5.399000
- -5.271000 -28.544000 6.536000 -5.271000 -28.544000 6.536000
- -3.372000 -24.119000 4.711000 -3.372000 -24.119000 4.711000
+ -7.034000 -21.511001 7.224000 -7.034000 -21.511001 7.224000
+ -5.135000 -17.086001 5.399000 -5.135000 -17.086001 5.399000
+ -5.270990 -28.544001 6.536000 -5.270990 -28.544001 6.536000
+ -3.371990 -24.119001 4.711000 -3.371990 -24.119001 4.711000
-1.473000 -19.693000 2.885000 -1.473000 -19.693000 2.885000
- 0.426000 -15.268999 1.060000 0.426000 -15.268999 1.060000
- -3.508000 -35.578000 5.849000 -3.508000 -35.578000 5.849000
- -1.610000 -31.152000 4.024000 -1.610000 -31.152000 4.024000
- 0.290000 -26.726999 2.198000 0.290000 -26.726999 2.198000
- 2.188000 -22.300999 0.373000 2.188000 -22.300999 0.373000
- 4.087000 -17.875999 -1.453000 4.087000 -17.875999 -1.453000
- 5.987000 -13.449999 -3.278000 5.987000 -13.449999 -3.278000
- 0.153010 -38.185999 3.336000 0.153010 -38.185999 3.336000
- 2.053000 -33.759999 1.511000 2.053000 -33.759999 1.511000
- 3.952000 -29.334999 -0.315000 3.952000 -29.334999 -0.315000
- 5.850000 -24.908999 -2.140000 5.850000 -24.908999 -2.140000
- 7.750000 -20.483999 -3.966000 7.750000 -20.483999 -3.966000
- 9.648000 -16.057999 -5.791000 9.648000 -16.057999 -5.791000
- 5.714010 -36.366999 -1.002000 5.714010 -36.366999 -1.002000
- 7.613000 -31.942999 -2.827000 7.613000 -31.942999 -2.827000
- 9.512000 -27.516999 -4.653000 9.512000 -27.516999 -4.653000
- 11.411000 -23.091999 -6.478000 11.411000 -23.091999 -6.478000
+ 0.426000 -15.269000 1.060000 0.426000 -15.269000 1.060000
+ -3.507990 -35.578001 5.849000 -3.507990 -35.578001 5.849000
+ -1.609990 -31.152000 4.024000 -1.609990 -31.152000 4.024000
+ 0.290010 -26.727000 2.198000 0.290010 -26.727000 2.198000
+ 2.188010 -22.301000 0.373000 2.188010 -22.301000 0.373000
+ 4.087010 -17.876000 -1.453000 4.087010 -17.876000 -1.453000
+ 5.987000 -13.450000 -3.278000 5.987000 -13.450000 -3.278000
+ 0.153010 -38.186000 3.336000 0.153010 -38.186000 3.336000
+ 2.053010 -33.760000 1.511000 2.053010 -33.760000 1.511000
+ 3.952010 -29.335000 -0.315000 3.952010 -29.335000 -0.315000
+ 5.850010 -24.909000 -2.140000 5.850010 -24.909000 -2.140000
+ 7.750010 -20.483999 -3.966000 7.750010 -20.483999 -3.966000
+ 9.648010 -16.057999 -5.791000 9.648010 -16.057999 -5.791000
+ 5.714010 -36.367000 -1.002000 5.714010 -36.367000 -1.002000
+ 7.613010 -31.942999 -2.827000 7.613010 -31.942999 -2.827000
+ 9.512010 -27.516999 -4.653000 9.512010 -27.516999 -4.653000
+ 11.411010 -23.091999 -6.478000 11.411010 -23.091999 -6.478000
11.275010 -34.549999 -5.341000 11.275010 -34.549999 -5.341000
- 13.174000 -30.124998 -7.166000 13.174000 -30.124998 -7.166000
--11.114000 34.783000 5.198000 -11.114000 34.783000 5.198000
- -7.889000 37.765000 2.508000 -7.889000 37.765000 2.508000
+ 13.174010 -30.124999 -7.166000 13.174010 -30.124999 -7.166000
+-11.114000 34.782999 5.198000 -11.114000 34.782999 5.198000
+ -7.889000 37.764999 2.508000 -7.889000 37.764999 2.508000
-11.766000 27.618999 6.334000 -11.766000 27.618999 6.334000
- -8.542000 30.601000 3.645000 -8.542000 30.601000 3.645000
- -5.317000 33.583000 0.954000 -5.317000 33.583000 0.954000
+ -8.542000 30.600999 3.645000 -8.542000 30.600999 3.645000
+ -5.317000 33.582999 0.954000 -5.317000 33.582999 0.954000
-2.092000 36.565000 -1.735000 -2.092000 36.565000 -1.735000
-12.417000 20.453999 7.471000 -12.417000 20.453999 7.471000
- -9.193000 23.436000 4.781000 -9.193000 23.436000 4.781000
- -5.969000 26.419000 2.092000 -5.969000 26.419000 2.092000
+ -9.193000 23.435999 4.781000 -9.193000 23.435999 4.781000
+ -5.969000 26.418999 2.092000 -5.969000 26.418999 2.092000
-2.744000 29.401000 -0.599000 -2.744000 29.401000 -0.599000
0.480000 32.383000 -3.288000 0.480000 32.383000 -3.288000
- 3.704000 35.365001 -5.978000 3.704000 35.365001 -5.978000
- -9.844000 16.271000 5.918000 -9.844000 16.271000 5.918000
- -6.620000 19.253000 3.228000 -6.620000 19.253000 3.228000
- -3.396000 22.235000 0.539000 -3.396000 22.235000 0.539000
+ 3.704000 35.365000 -5.978000 3.704000 35.365000 -5.978000
+ -9.844000 16.270999 5.918000 -9.844000 16.270999 5.918000
+ -6.620000 19.252999 3.228000 -6.620000 19.252999 3.228000
+ -3.396000 22.234999 0.539000 -3.396000 22.234999 0.539000
-0.171000 25.217000 -2.152000 -0.171000 25.217000 -2.152000
- 3.053000 28.200001 -4.841000 3.053000 28.200001 -4.841000
- 6.277000 31.182001 -7.531000 6.277000 31.182001 -7.531000
- -4.048000 15.071000 1.675000 -4.048000 15.071000 1.675000
+ 3.053000 28.200000 -4.841000 3.053000 28.200000 -4.841000
+ 6.277000 31.182000 -7.531000 6.277000 31.182000 -7.531000
+ -4.048000 15.070999 1.675000 -4.048000 15.070999 1.675000
-0.823000 18.053000 -1.014000 -0.823000 18.053000 -1.014000
- 2.402000 21.035001 -3.705000 2.402000 21.035001 -3.705000
- 5.626000 24.017001 -6.394000 5.626000 24.017001 -6.394000
- 1.749000 13.871001 -2.568000 1.749000 13.871001 -2.568000
- 4.974000 16.853001 -5.258000 4.974000 16.853001 -5.258000
+ 2.402000 21.035000 -3.705000 2.402000 21.035000 -3.705000
+ 5.626000 24.017000 -6.394000 5.626000 24.017000 -6.394000
+ 1.749000 13.871000 -2.568000 1.749000 13.871000 -2.568000
+ 4.974000 16.853000 -5.258000 4.974000 16.853000 -5.258000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826585.626120000 460865.843640000 5064900.561 ]
+3 [ 3826585.582740000 460865.891083000 5064900.589 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826579.486120000 460917.479639000 5064900.502 ]
+3 [ 3826579.442730000 460917.527082000 5064900.530 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS005-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS005-AntennaField.conf
index be32f6374a49060b8ef4dbd9042d7a2d5de57f70..23c7816367cae1b9768d0d42a0786eb3d09225f3 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS005-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS005-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS005
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:37
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:06
#
NORMAL_VECTOR LBA
@@ -15,10 +15,10 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826668.750110000 461069.549647000 5064819.754 ]
+3 [ 3826668.706720000 461069.597091000 5064819.782 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.020000 -0.243001 1.538000 -2.020000 -0.243001 1.538000
+ -2.020000 -0.243000 1.538000 -2.020000 -0.243000 1.538000
-1.338000 2.105000 0.815000 -1.338000 2.105000 0.815000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.537000 2.019000 0.243000 -1.537000
@@ -26,18 +26,18 @@ LBA
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
3.375000 -4.198000 -2.153000 3.375000 -4.198000 -2.153000
0.533000 -5.774000 0.122000 0.533000 -5.774000 0.122000
- -2.558000 -4.650001 2.341000 -2.558000 -4.650001 2.341000
+ -2.558000 -4.650000 2.341000 -2.558000 -4.650000 2.341000
-4.452000 -1.349001 3.464000 -4.452000 -1.349001 3.464000
-4.263000 2.581999 2.967000 -4.263000 2.581999 2.967000
- -2.079000 5.304999 1.081000 -2.079000 5.304999 1.081000
+ -2.079000 5.305000 1.081000 -2.079000 5.305000 1.081000
1.078000 5.547000 -1.310000 1.078000 5.547000 -1.310000
3.730000 3.192000 -3.088000 3.730000 3.192000 -3.088000
4.637000 -0.656000 -3.421000 4.637000 -0.656000 -3.421000
- 7.389000 -1.860000 -5.378000 7.389000 -1.860000 -5.378000
- 6.847000 -5.403000 -4.651000 6.847000 -5.403000 -4.651000
+ 7.389000 -1.859999 -5.378000 7.389000 -1.859999 -5.378000
+ 6.847000 -5.402999 -4.651000 6.847000 -5.402999 -4.651000
4.272000 -9.093000 -2.384000 4.272000 -9.093000 -2.384000
-1.490000 -9.786000 2.003000 -1.490000 -9.786000 2.003000
- -3.941000 -8.593001 3.735000 -3.941000 -8.593001 3.735000
+ -3.941000 -8.593000 3.735000 -3.941000 -8.593000 3.735000
-6.489000 -5.551001 5.373000 -6.489000 -5.551001 5.373000
-7.248000 -1.364001 5.564000 -7.248000 -1.364001 5.564000
-6.498000 4.278999 4.491000 -6.498000 4.278999 4.491000
@@ -45,10 +45,10 @@ LBA
-1.467000 9.979000 0.200000 -1.467000 9.979000 0.200000
1.621000 8.944000 -2.025000 1.621000 8.944000 -2.025000
4.955000 6.238000 -4.282000 4.955000 6.238000 -4.282000
- 7.041000 2.243000 -5.488000 7.041000 2.243000 -5.488000
+ 7.041000 2.243001 -5.488000 7.041000 2.243001 -5.488000
11.151000 -4.201999 -7.990000 11.151000 -4.201999 -7.990000
10.365000 -7.822999 -7.073000 10.365000 -7.822999 -7.073000
- 8.547000 -9.841000 -5.526000 8.547000 -9.841000 -5.526000
+ 8.547000 -9.840999 -5.526000 8.547000 -9.840999 -5.526000
2.767000 -12.869000 -0.913000 2.767000 -12.869000 -0.913000
1.242000 -15.069000 0.430000 1.242000 -15.069000 0.430000
-4.303000 -11.848001 4.301000 -4.303000 -11.848001 4.301000
@@ -58,28 +58,28 @@ LBA
-10.337000 2.595999 7.525000 -10.337000 2.595999 7.525000
-8.190000 8.896999 5.343000 -8.190000 8.896999 5.343000
-6.933000 11.106999 4.201000 -6.933000 11.106999 4.201000
- -2.991000 12.880999 1.082000 -2.991000 12.880999 1.082000
+ -2.991000 12.881000 1.082000 -2.991000 12.881000 1.082000
-0.260000 15.058000 -1.165000 -0.260000 15.058000 -1.165000
6.312000 11.268000 -5.756000 6.312000 11.268000 -5.756000
- 8.560000 8.300000 -7.175000 8.560000 8.300000 -7.175000
+ 8.560000 8.300001 -7.175000 8.560000 8.300001 -7.175000
11.053000 3.635001 -8.625000 11.053000 3.635001 -8.625000
- 19.138010 -50.623999 -9.789000 19.138010 -50.623999 -9.789000
--39.676000 -21.128004 31.691990 -39.676000 -21.128004 31.691990
+ 19.138010 -50.623998 -9.789000 19.138010 -50.623998 -9.789000
+-39.676000 -21.128004 31.692000 -39.676000 -21.128004 31.692000
14.256000 1.386001 -10.825000 14.256000 1.386001 -10.825000
16.212000 -0.605999 -12.114000 16.212000 -0.605999 -12.114000
11.839000 -14.786999 -7.549000 11.839000 -14.786999 -7.549000
-0.214000 -19.723000 1.943000 -0.214000 -19.723000 1.943000
- -4.162000 -19.523001 4.889000 -4.162000 -19.523001 4.889000
+ -4.162000 -19.523000 4.889000 -4.162000 -19.523000 4.889000
-11.321000 -10.863001 9.480000 -11.321000 -10.863001 9.480000
--14.313000 2.033998 10.560000 -14.313000 2.033998 10.560000
+-14.313000 2.033999 10.560000 -14.313000 2.033999 10.560000
-14.692000 9.975998 10.127000 -14.692000 9.975998 10.127000
-5.032000 17.207999 2.222000 -5.032000 17.207999 2.222000
1.094000 19.663000 -2.598000 1.094000 19.663000 -2.598000
- 8.311000 14.971000 -7.591000 8.311000 14.971000 -7.591000
+ 8.311000 14.971001 -7.591000 8.311000 14.971001 -7.591000
14.826000 15.503001 -12.529000 14.826000 15.503001 -12.529000
- 19.607000 3.665001 -15.048000 19.607000 3.665001 -15.048000
- 19.328000 -9.136999 -13.682000 19.328000 -9.136999 -13.682000
- 17.356000 -14.749999 -11.694000 17.356000 -14.749999 -11.694000
+ 19.607000 3.665002 -15.048000 19.607000 3.665002 -15.048000
+ 19.328000 -9.136998 -13.682000 19.328000 -9.136998 -13.682000
+ 17.356000 -14.749998 -11.694000 17.356000 -14.749998 -11.694000
13.594000 -21.477999 -8.262000 13.594000 -21.477999 -8.262000
-0.281000 -23.841000 2.366000 -0.281000 -23.841000 2.366000
-6.624000 -22.481001 7.004000 -6.624000 -22.481001 7.004000
@@ -88,84 +88,84 @@ LBA
-20.223000 7.743998 14.480000 -20.223000 7.743998 14.480000
-15.028000 17.132998 9.732000 -15.028000 17.132998 9.732000
-4.976000 26.528999 1.338000 -4.976000 26.528999 1.338000
- 9.162000 23.772000 -9.025000 9.162000 23.772000 -9.025000
- 20.210000 22.280001 -17.184000 20.210000 22.280001 -17.184000
+ 9.162000 23.772001 -9.025000 9.162000 23.772001 -9.025000
+ 20.210000 22.280002 -17.184000 20.210000 22.280002 -17.184000
23.936000 7.928002 -18.683000 23.936000 7.928002 -18.683000
24.741000 -6.648998 -17.970000 24.741000 -6.648998 -17.970000
24.013000 -14.522998 -16.711000 24.013000 -14.522998 -16.711000
13.579000 -27.456999 -7.710000 13.579000 -27.456999 -7.710000
0.434000 -34.055000 2.752000 0.434000 -34.055000 2.752000
-9.266000 -31.306001 9.786000 -9.266000 -31.306001 9.786000
--13.780000 -23.549002 12.473000 -13.780000 -23.549002 12.473000
+-13.780000 -23.549001 12.473000 -13.780000 -23.549001 12.473000
-23.795000 -15.272002 19.242000 -23.795000 -15.272002 19.242000
-27.144000 3.428997 20.065000 -27.144000 3.428997 20.065000
-25.756000 12.096997 18.240000 -25.756000 12.096997 18.240000
-19.697000 25.681998 12.464000 -19.697000 25.681998 12.464000
--13.584000 28.331998 7.636000 -13.584000 28.331998 7.636000
+-13.584000 28.331999 7.636000 -13.584000 28.331999 7.636000
2.293000 32.878000 -4.692000 2.293000 32.878000 -4.692000
- 6.787000 28.899000 -7.706000 6.787000 28.899000 -7.706000
- 9.452000 34.023000 -10.169000 9.452000 34.023000 -10.169000
- 32.755000 6.283002 -25.154000 32.755000 6.283002 -25.154000
- 29.114000 -18.614998 -20.170000 29.114000 -18.614998 -20.170000
- 20.273000 -34.717999 -12.079000 20.273000 -34.717999 -12.079000
- 8.170000 -39.398000 -2.571000 8.170000 -39.398000 -2.571000
+ 6.787000 28.899001 -7.706000 6.787000 28.899001 -7.706000
+ 9.452000 34.023001 -10.169000 9.452000 34.023001 -10.169000
+ 32.755000 6.283003 -25.154000 32.755000 6.283003 -25.154000
+ 29.114000 -18.614997 -20.170000 29.114000 -18.614997 -20.170000
+ 20.273000 -34.717998 -12.079000 20.273000 -34.717998 -12.079000
+ 8.170000 -39.397999 -2.571000 8.170000 -39.397999 -2.571000
-26.156000 -23.206003 21.731000 -26.156000 -23.206003 21.731000
-29.183000 -1.036003 21.999000 -29.183000 -1.036003 21.999000
-31.495000 15.167997 22.270000 -31.495000 15.167997 22.270000
- -3.555000 38.607999 -0.821000 -3.555000 38.607999 -0.821000
+ -3.555000 38.608000 -0.821000 -3.555000 38.608000 -0.821000
]
HBA
-3 [ 3826666.177120000 461005.532646000 5064827.472 ]
+3 [ 3826666.133730000 461005.580091000 5064827.500 ]
48 x 2 x 3 [
- 27.691000 -6.368997 -20.210000 27.691000 -6.368997 -20.210000
+ 27.691000 -6.368998 -20.210000 27.691000 -6.368998 -20.210000
31.167000 -3.840997 -23.047000 31.167000 -3.840997 -23.047000
- 26.438000 -13.368997 -18.636000 26.438000 -13.368997 -18.636000
+ 26.438000 -13.368998 -18.636000 26.438000 -13.368998 -18.636000
29.913000 -10.839997 -21.473000 29.913000 -10.839997 -21.473000
33.388000 -8.312997 -24.310000 33.388000 -8.312997 -24.310000
- 36.864000 -5.783996 -27.148000 36.864000 -5.783996 -27.148000
- 25.184000 -20.368997 -17.062000 25.184000 -20.368997 -17.062000
- 28.659000 -17.840997 -19.900000 28.659000 -17.840997 -19.900000
+ 36.864000 -5.783997 -27.148000 36.864000 -5.783997 -27.148000
+ 25.184000 -20.368998 -17.062000 25.184000 -20.368998 -17.062000
+ 28.659000 -17.840998 -19.900000 28.659000 -17.840998 -19.900000
32.134000 -15.311997 -22.736000 32.134000 -15.311997 -22.736000
35.610000 -12.782997 -25.574000 35.610000 -12.782997 -25.574000
- 39.086000 -10.254996 -28.411000 39.086000 -10.254996 -28.411000
+ 39.086000 -10.254997 -28.411000 39.086000 -10.254997 -28.411000
42.561000 -7.725996 -31.249000 42.561000 -7.725996 -31.249000
- 27.405000 -24.839997 -18.325000 27.405000 -24.839997 -18.325000
+ 27.405000 -24.839998 -18.325000 27.405000 -24.839998 -18.325000
30.880000 -22.310997 -21.163000 30.880000 -22.310997 -21.163000
34.356000 -19.782997 -24.000000 34.356000 -19.782997 -24.000000
- 37.832000 -17.253996 -26.838000 37.832000 -17.253996 -26.838000
+ 37.832000 -17.253997 -26.838000 37.832000 -17.253997 -26.838000
41.307000 -14.724996 -29.674000 41.307000 -14.724996 -29.674000
44.782000 -12.196996 -32.512000 44.782000 -12.196996 -32.512000
33.102000 -26.781997 -22.426000 33.102000 -26.781997 -22.426000
- 36.578000 -24.252996 -25.264000 36.578000 -24.252996 -25.264000
+ 36.578000 -24.252997 -25.264000 36.578000 -24.252997 -25.264000
40.053000 -21.725996 -28.101000 40.053000 -21.725996 -28.101000
43.528000 -19.196996 -30.938000 43.528000 -19.196996 -30.938000
- 38.799000 -28.724996 -26.527000 38.799000 -28.724996 -26.527000
+ 38.799000 -28.724997 -26.527000 38.799000 -28.724997 -26.527000
42.275000 -26.196996 -29.364000 42.275000 -26.196996 -29.364000
--44.427010 22.670997 31.297990 -44.427010 22.670997 31.297990
--41.920010 26.575997 29.063990 -41.920010 26.575997 29.063990
--43.656010 15.428997 31.373990 -43.656010 15.428997 31.373990
--41.151010 19.333997 29.140990 -41.151010 19.333997 29.140990
--38.644010 23.239997 26.905990 -38.644010 23.239997 26.905990
--36.138010 27.144997 24.672000 -36.138010 27.144997 24.672000
--42.886010 8.187997 31.450990 -42.886010 8.187997 31.450990
--40.380010 12.091997 29.216990 -40.380010 12.091997 29.216990
--37.874010 15.997997 26.983000 -37.874010 15.997997 26.983000
--35.368010 19.902997 24.749000 -35.368010 19.902997 24.749000
--32.862010 23.808998 22.515000 -32.862010 23.808998 22.515000
--30.356010 27.713998 20.281000 -30.356010 27.713998 20.281000
--39.610010 4.849997 29.293000 -39.610010 4.849997 29.293000
--37.104010 8.754997 27.059000 -37.104010 8.754997 27.059000
--34.598010 12.660998 24.825000 -34.598010 12.660998 24.825000
--32.092010 16.565998 22.591000 -32.092010 16.565998 22.591000
--29.586010 20.471998 20.357000 -29.586010 20.471998 20.357000
--27.080010 24.375998 18.123000 -27.080010 24.375998 18.123000
--33.828010 5.418998 24.902000 -33.828010 5.418998 24.902000
--31.322010 9.323998 22.668000 -31.322010 9.323998 22.668000
--28.815010 13.229998 20.433000 -28.815010 13.229998 20.433000
--26.310010 17.134998 18.200000 -26.310010 17.134998 18.200000
--28.046010 5.987998 20.510000 -28.046010 5.987998 20.510000
--25.539010 9.892998 18.276000 -25.539010 9.892998 18.276000
+-44.427010 22.670995 31.298000 -44.427010 22.670995 31.298000
+-41.920010 26.575996 29.064000 -41.920010 26.575996 29.064000
+-43.656010 15.428996 31.374000 -43.656010 15.428996 31.374000
+-41.151010 19.333996 29.141000 -41.151010 19.333996 29.141000
+-38.644010 23.239996 26.906000 -38.644010 23.239996 26.906000
+-36.138010 27.144996 24.672000 -36.138010 27.144996 24.672000
+-42.886010 8.187996 31.451000 -42.886010 8.187996 31.451000
+-40.380010 12.091996 29.217000 -40.380010 12.091996 29.217000
+-37.874010 15.997996 26.983000 -37.874010 15.997996 26.983000
+-35.368010 19.902996 24.749000 -35.368010 19.902996 24.749000
+-32.862010 23.808997 22.515000 -32.862010 23.808997 22.515000
+-30.356010 27.713997 20.281000 -30.356010 27.713997 20.281000
+-39.610010 4.849996 29.293000 -39.610010 4.849996 29.293000
+-37.104010 8.754996 27.059000 -37.104010 8.754996 27.059000
+-34.598010 12.660996 24.825000 -34.598010 12.660996 24.825000
+-32.092010 16.565997 22.591000 -32.092010 16.565997 22.591000
+-29.586010 20.471997 20.357000 -29.586010 20.471997 20.357000
+-27.080010 24.375997 18.123000 -27.080010 24.375997 18.123000
+-33.828010 5.418996 24.902000 -33.828010 5.418996 24.902000
+-31.322010 9.323997 22.668000 -31.322010 9.323997 22.668000
+-28.815010 13.229997 20.433000 -28.815010 13.229997 20.433000
+-26.310010 17.134997 18.200000 -26.310010 17.134997 18.200000
+-28.046010 5.987997 20.510000 -28.046010 5.987997 20.510000
+-25.539010 9.892997 18.276000 -25.539010 9.892997 18.276000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826701.160120000 460989.249649000 5064802.685 ]
+3 [ 3826701.116730000 460989.297094000 5064802.713 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826631.194110000 461021.814643000 5064852.259 ]
+3 [ 3826631.150720000 461021.862087000 5064852.287 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS006-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS006-AntennaField.conf
index 657aadd2f500f5d70e697a292704392d0d423208..0f8088f857ee3c0fc75f58d24060c073b6543965 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS006-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS006-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS006
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:37
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:06
#
NORMAL_VECTOR LBA
@@ -15,156 +15,156 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826596.730100000 461145.177641000 5064866.978 ]
+3 [ 3826596.686710000 461145.225084000 5064867.006 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.020000 -0.243001 1.538000 -2.020000 -0.243001 1.538000
- -1.338000 2.104999 0.814000 -1.338000 2.104999 0.814000
+ -2.020000 -0.243000 1.538000 -2.020000 -0.243000 1.538000
+ -1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.362000 -0.814000 0.800000 2.362000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
- -0.800000 -2.363001 0.814000 -0.800000 -2.363001 0.814000
+ -0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
1.078000 5.547000 -1.310000 1.078000 5.547000 -1.310000
3.730000 3.192000 -3.088000 3.730000 3.192000 -3.088000
4.637000 -0.656000 -3.421000 4.637000 -0.656000 -3.421000
3.374000 -4.197000 -2.154000 3.374000 -4.197000 -2.154000
0.533000 -5.774000 0.122000 0.533000 -5.774000 0.122000
- -2.558000 -4.650001 2.341000 -2.558000 -4.650001 2.341000
- -4.453000 -1.349001 3.464000 -4.453000 -1.349001 3.464000
- -4.263000 2.580999 2.967000 -4.263000 2.580999 2.967000
- -2.079000 5.304999 1.081000 -2.079000 5.304999 1.081000
- -2.746000 8.822999 1.264000 -2.746000 8.822999 1.264000
+ -2.558000 -4.650000 2.341000 -2.558000 -4.650000 2.341000
+ -4.453000 -1.349000 3.464000 -4.453000 -1.349000 3.464000
+ -4.263000 2.581000 2.967000 -4.263000 2.581000 2.967000
+ -2.079000 5.305000 1.081000 -2.079000 5.305000 1.081000
+ -2.746000 8.823000 1.264000 -2.746000 8.823000 1.264000
0.018000 9.843000 -0.903000 0.018000 9.843000 -0.903000
3.997000 8.735000 -3.789000 3.997000 8.735000 -3.789000
- 7.630000 2.824000 -5.982000 7.630000 2.824000 -5.982000
- 8.139000 -0.362000 -6.076000 8.139000 -0.362000 -6.076000
- 7.415000 -4.493000 -5.159000 7.415000 -4.493000 -5.159000
+ 7.630000 2.824001 -5.982000 7.630000 2.824001 -5.982000
+ 8.139000 -0.361999 -6.076000 8.139000 -0.361999 -6.076000
+ 7.415000 -4.492999 -5.159000 7.415000 -4.492999 -5.159000
4.913000 -7.209000 -3.036000 4.913000 -7.209000 -3.036000
0.573000 -8.958000 0.380000 0.573000 -8.958000 0.380000
- -3.259000 -8.784001 3.240000 -3.259000 -8.784001 3.240000
+ -3.259000 -8.784000 3.240000 -3.259000 -8.784000 3.240000
-6.148000 -6.106001 5.167000 -6.148000 -6.106001 5.167000
-7.116000 -2.302001 5.550000 -7.116000 -2.302001 5.550000
-7.055000 2.523999 5.067000 -7.055000 2.523999 5.067000
-5.414000 6.587999 3.468000 -5.414000 6.587999 3.468000
- -3.172000 13.947999 1.120000 -3.172000 13.947999 1.120000
- -0.219000 14.738999 -1.167000 -0.219000 14.738999 -1.167000
+ -3.172000 13.948000 1.120000 -3.172000 13.948000 1.120000
+ -0.219000 14.739000 -1.167000 -0.219000 14.739000 -1.167000
2.180000 13.692000 -2.874000 2.180000 13.692000 -2.874000
- 7.449000 8.818000 -6.389000 7.449000 8.818000 -6.389000
- 9.815000 8.171000 -8.106000 9.815000 8.171000 -8.106000
- 10.605000 0.721000 -8.025000 10.605000 0.721000 -8.025000
- 10.102000 -4.262000 -7.197000 10.102000 -4.262000 -7.197000
- 9.788000 -9.519000 -6.486000 9.788000 -9.519000 -6.486000
- 7.252000 -10.461000 -4.498000 7.252000 -10.461000 -4.498000
+ 7.449000 8.818001 -6.389000 7.449000 8.818001 -6.389000
+ 9.815000 8.171001 -8.106000 9.815000 8.171001 -8.106000
+ 10.605000 0.721001 -8.025000 10.605000 0.721001 -8.025000
+ 10.102000 -4.261999 -7.197000 10.102000 -4.261999 -7.197000
+ 9.788000 -9.518999 -6.486000 9.788000 -9.518999 -6.486000
+ 7.252000 -10.460999 -4.498000 7.252000 -10.460999 -4.498000
3.845000 -12.341000 -1.770000 3.845000 -12.341000 -1.770000
- -1.718000 -12.877001 2.454000 -1.718000 -12.877001 2.454000
- -3.945000 -12.522001 4.093000 -3.945000 -12.522001 4.093000
+ -1.718000 -12.877000 2.454000 -1.718000 -12.877000 2.454000
+ -3.945000 -12.522000 4.093000 -3.945000 -12.522000 4.093000
-7.334000 -9.068001 6.325000 -7.334000 -9.068001 6.325000
-10.345000 -7.104001 8.408000 -10.345000 -7.104001 8.408000
--11.299000 1.709999 8.327000 -11.299000 1.709999 8.327000
+-11.299000 1.709999 8.326990 -11.299000 1.709999 8.326990
-10.462000 5.483999 7.357000 -10.462000 5.483999 7.357000
-8.577000 10.289999 5.508000 -8.577000 10.289999 5.508000
- 33.196000 33.815002 -27.974000 33.196000 33.815002 -27.974000
- 29.998010 -44.755998 -18.471000 29.998010 -44.755998 -18.471000
+ 33.196000 33.815003 -27.974000 33.196000 33.815003 -27.974000
+ 29.998010 -44.755997 -18.471000 29.998010 -44.755997 -18.471000
-8.762000 14.768999 5.242000 -8.762000 14.768999 5.242000
-8.444000 17.782999 4.731000 -8.444000 17.782999 4.731000
3.824000 19.486000 -4.631000 3.824000 19.486000 -4.631000
13.853000 8.707001 -11.185000 13.853000 8.707001 -11.185000
15.872000 4.352001 -12.307000 15.872000 4.352001 -12.307000
13.757000 -7.303999 -9.666000 13.757000 -7.303999 -9.666000
- 6.411000 -16.382000 -3.331000 6.411000 -16.382000 -3.331000
+ 6.411000 -16.381999 -3.331000 6.411000 -16.381999 -3.331000
1.087000 -20.390000 1.027000 1.087000 -20.390000 1.027000
-9.233000 -13.233001 8.127000 -9.233000 -13.233001 8.127000
--14.293000 -7.729002 11.427000 -14.293000 -7.729002 11.427000
--14.971000 2.192998 11.040000 -14.971000 2.192998 11.040000
--18.905000 8.986998 13.378000 -18.905000 8.986998 13.378000
--13.275000 19.515998 8.200000 -13.275000 19.515998 8.200000
- -4.207000 25.013999 0.897000 -4.207000 25.013999 0.897000
+-14.293000 -7.729001 11.426990 -14.293000 -7.729001 11.426990
+-14.971000 2.192999 11.039990 -14.971000 2.192999 11.039990
+-18.905000 8.986998 13.377990 -18.905000 8.986998 13.377990
+-13.275000 19.515999 8.199990 -13.275000 19.515999 8.199990
+ -4.207000 25.014000 0.897000 -4.207000 25.014000 0.897000
0.780000 25.429000 -2.884000 0.780000 25.429000 -2.884000
- 7.525000 24.414000 -7.855000 7.525000 24.414000 -7.855000
- 16.758000 10.500001 -13.528000 16.758000 10.500001 -13.528000
- 19.279000 3.032001 -14.745000 19.279000 3.032001 -14.745000
- 19.521000 -10.779999 -13.679000 19.521000 -10.779999 -13.679000
+ 7.525000 24.414001 -7.855000 7.525000 24.414001 -7.855000
+ 16.758000 10.500002 -13.528000 16.758000 10.500002 -13.528000
+ 19.279000 3.032002 -14.745000 19.279000 3.032002 -14.745000
+ 19.521000 -10.779998 -13.679000 19.521000 -10.779998 -13.679000
12.011000 -20.910999 -7.125000 12.011000 -20.910999 -7.125000
- 5.666000 -25.350000 -1.961000 5.666000 -25.350000 -1.961000
- -3.714000 -23.995001 4.957000 -3.714000 -23.995001 4.957000
--15.755000 -17.396002 13.398000 -15.755000 -17.396002 13.398000
--21.567000 -0.878002 16.268000 -21.567000 -0.878002 16.268000
--26.569000 11.731997 18.883000 -26.569000 11.731997 18.883000
--18.611000 22.257998 11.958000 -18.611000 22.257998 11.958000
- -8.900000 29.734999 3.993000 -8.900000 29.734999 3.993000
- -3.018000 32.514999 -0.674000 -3.018000 32.514999 -0.674000
- 11.696000 27.107000 -11.229000 11.696000 27.107000 -11.229000
- 23.480000 15.901001 -19.061000 23.480000 15.901001 -19.061000
- 26.871000 4.178002 -20.547000 26.871000 4.178002 -20.547000
+ 5.666000 -25.349999 -1.961000 5.666000 -25.349999 -1.961000
+ -3.714000 -23.995000 4.957000 -3.714000 -23.995000 4.957000
+-15.755000 -17.396001 13.397990 -15.755000 -17.396001 13.397990
+-21.567000 -0.878002 16.267990 -21.567000 -0.878002 16.267990
+-26.569000 11.731997 18.882990 -26.569000 11.731997 18.882990
+-18.611000 22.257998 11.957990 -18.611000 22.257998 11.957990
+ -8.900000 29.734999 3.992990 -8.900000 29.734999 3.992990
+ -3.018000 32.515000 -0.674000 -3.018000 32.515000 -0.674000
+ 11.696000 27.107001 -11.229000 11.696000 27.107001 -11.229000
+ 23.480000 15.901002 -19.061000 23.480000 15.901002 -19.061000
+ 26.871000 4.178003 -20.547000 26.871000 4.178003 -20.547000
23.937000 -4.211998 -17.586000 23.937000 -4.211998 -17.586000
23.649000 -18.779998 -16.054000 23.649000 -18.779998 -16.054000
12.457000 -30.869999 -6.560000 12.457000 -30.869999 -6.560000
- 5.660000 -33.298000 -1.238000 5.660000 -33.298000 -1.238000
+ 5.660000 -33.297999 -1.238000 5.660000 -33.297999 -1.238000
-7.115000 -32.912001 8.316000 -7.115000 -32.912001 8.316000
-12.304000 -27.509001 11.722000 -12.304000 -27.509001 11.722000
--24.152000 -12.422003 19.252000 -24.152000 -12.422003 19.252000
--23.839000 -5.765002 18.415000 -23.839000 -5.765002 18.415000
--28.865000 -5.209003 22.137000 -28.865000 -5.209003 22.137000
--22.289000 32.528998 13.790000 -22.289000 32.528998 13.790000
- -2.957000 39.877999 -1.385000 -2.957000 39.877999 -1.385000
+-24.152000 -12.422002 19.251990 -24.152000 -12.422002 19.251990
+-23.839000 -5.765002 18.414990 -23.839000 -5.765002 18.414990
+-28.865000 -5.209003 22.136990 -28.865000 -5.209003 22.136990
+-22.289000 32.528998 13.789990 -22.289000 32.528998 13.789990
+ -2.957000 39.878000 -1.385000 -2.957000 39.878000 -1.385000
13.093000 37.627001 -13.229000 13.093000 37.627001 -13.229000
- 22.971000 26.676001 -19.653000 22.971000 26.676001 -19.653000
- 30.465000 -17.733998 -21.264000 30.465000 -17.733998 -21.264000
- 16.680000 -31.048999 -9.714000 16.680000 -31.048999 -9.714000
- 6.659000 -40.889000 -1.303000 6.659000 -40.889000 -1.303000
--24.945000 -21.334003 20.653000 -24.945000 -21.334003 20.653000
+ 22.971000 26.676002 -19.653000 22.971000 26.676002 -19.653000
+ 30.465000 -17.733997 -21.264000 30.465000 -17.733997 -21.264000
+ 16.680000 -31.048998 -9.714000 16.680000 -31.048998 -9.714000
+ 6.659000 -40.888999 -1.303000 6.659000 -40.888999 -1.303000
+-24.945000 -21.334002 20.652990 -24.945000 -21.334002 20.652990
]
HBA
-3 [ 3826633.141110000 461108.368644000 5064842.975 ]
+3 [ 3826633.097720000 461108.416087000 5064843.003 ]
48 x 2 x 3 [
- 14.776990 39.320001 -14.646990 14.776990 39.320001 -14.646990
- 18.585990 41.034001 -17.659990 18.585990 41.034001 -17.659990
- 12.552990 32.764001 -12.384990 12.552990 32.764001 -12.384990
- 16.361990 34.478001 -15.397990 16.361990 34.478001 -15.397990
- 20.169990 36.191001 -18.411990 20.169990 36.191001 -18.411990
- 23.977990 37.905002 -21.424990 23.977990 37.905002 -21.424990
- 10.327990 26.208000 -10.121990 10.327990 26.208000 -10.121990
- 14.137990 27.922001 -13.135990 14.137990 27.922001 -13.135990
- 17.945990 29.636001 -16.149990 17.945990 29.636001 -16.149990
- 21.753990 31.349001 -19.162990 21.753990 31.349001 -19.162990
- 25.562990 33.062002 -22.176990 25.562990 33.062002 -22.176990
- 29.370990 34.776002 -25.189990 29.370990 34.776002 -25.189990
- 11.912990 21.366001 -10.873990 11.912990 21.366001 -10.873990
- 15.720990 23.080001 -13.886990 15.720990 23.080001 -13.886990
- 19.529990 24.793001 -16.900990 19.529990 24.793001 -16.900990
- 23.337990 26.506002 -19.913990 23.337990 26.506002 -19.913990
- 27.145990 28.220002 -22.927990 27.145990 28.220002 -22.927990
- 30.955990 29.934002 -25.941990 30.955990 29.934002 -25.941990
- 17.306000 18.237001 -14.638990 17.306000 18.237001 -14.638990
- 21.114000 19.951001 -17.651990 21.114000 19.951001 -17.651990
- 24.922000 21.664002 -20.665990 24.922000 21.664002 -20.665990
- 28.731000 23.378002 -23.678990 28.731000 23.378002 -23.678990
- 22.698000 15.108002 -18.403990 22.698000 15.108002 -18.403990
- 26.507000 16.822002 -21.416990 26.507000 16.822002 -21.416990
--29.550000 -20.522003 24.036000 -29.550000 -20.522003 24.036000
--26.716000 -16.987003 21.588000 -26.716000 -16.987003 21.588000
--29.388000 -27.784003 24.570000 -29.388000 -27.784003 24.570000
--26.554000 -24.249003 22.123000 -26.554000 -24.249003 22.123000
+ 14.776990 39.320002 -14.647000 14.776990 39.320002 -14.647000
+ 18.585990 41.034002 -17.660000 18.585990 41.034002 -17.660000
+ 12.552990 32.764002 -12.385000 12.552990 32.764002 -12.385000
+ 16.361990 34.478002 -15.398000 16.361990 34.478002 -15.398000
+ 20.169990 36.191002 -18.412000 20.169990 36.191002 -18.412000
+ 23.977990 37.905003 -21.425000 23.977990 37.905003 -21.425000
+ 10.327990 26.208001 -10.122000 10.327990 26.208001 -10.122000
+ 14.137990 27.922002 -13.136000 14.137990 27.922002 -13.136000
+ 17.945990 29.636002 -16.150000 17.945990 29.636002 -16.150000
+ 21.753990 31.349003 -19.163000 21.753990 31.349003 -19.163000
+ 25.562990 33.062003 -22.177000 25.562990 33.062003 -22.177000
+ 29.370990 34.776003 -25.190000 29.370990 34.776003 -25.190000
+ 11.912990 21.366002 -10.874000 11.912990 21.366002 -10.874000
+ 15.720990 23.080002 -13.887000 15.720990 23.080002 -13.887000
+ 19.529990 24.793002 -16.901000 19.529990 24.793002 -16.901000
+ 23.337990 26.506003 -19.914000 23.337990 26.506003 -19.914000
+ 27.145990 28.220003 -22.928000 27.145990 28.220003 -22.928000
+ 30.955990 29.934003 -25.942000 30.955990 29.934003 -25.942000
+ 17.305990 18.237002 -14.639000 17.305990 18.237002 -14.639000
+ 21.113990 19.951002 -17.652000 21.113990 19.951002 -17.652000
+ 24.921990 21.664003 -20.666000 24.921990 21.664003 -20.666000
+ 28.730990 23.378003 -23.679000 28.730990 23.378003 -23.679000
+ 22.697990 15.108003 -18.404000 22.697990 15.108003 -18.404000
+ 26.506990 16.822003 -21.417000 26.506990 16.822003 -21.417000
+-29.550000 -20.522002 24.036000 -29.550000 -20.522002 24.036000
+-26.716000 -16.987002 21.588000 -26.716000 -16.987002 21.588000
+-29.388000 -27.784002 24.570000 -29.388000 -27.784002 24.570000
+-26.554000 -24.249002 22.123000 -26.554000 -24.249002 22.123000
-23.719000 -20.713002 19.676000 -23.719000 -20.713002 19.676000
--20.885000 -17.179002 17.229000 -20.885000 -17.179002 17.229000
--29.227000 -35.046003 25.106000 -29.227000 -35.046003 25.106000
--26.393000 -31.511003 22.658000 -26.393000 -31.511003 22.658000
+-20.885000 -17.179001 17.229000 -20.885000 -17.179001 17.229000
+-29.227000 -35.046002 25.106000 -29.227000 -35.046002 25.106000
+-26.393000 -31.511002 22.658000 -26.393000 -31.511002 22.658000
-23.557000 -27.975002 20.211000 -23.557000 -27.975002 20.211000
--20.723000 -24.441002 17.763000 -20.723000 -24.441002 17.763000
--17.888000 -20.905002 15.316000 -17.888000 -20.905002 15.316000
--15.054000 -17.370002 12.869000 -15.054000 -17.370002 12.869000
--26.230000 -38.772003 23.193000 -26.230000 -38.772003 23.193000
+-20.723000 -24.441001 17.763000 -20.723000 -24.441001 17.763000
+-17.888000 -20.905001 15.316000 -17.888000 -20.905001 15.316000
+-15.054000 -17.370001 12.869000 -15.054000 -17.370001 12.869000
+-26.230000 -38.772002 23.193000 -26.230000 -38.772002 23.193000
-23.396000 -35.237002 20.746000 -23.396000 -35.237002 20.746000
--20.561000 -31.701002 18.299000 -20.561000 -31.701002 18.299000
--17.727000 -28.167002 15.851000 -17.727000 -28.167002 15.851000
--14.891000 -24.631002 13.404000 -14.891000 -24.631002 13.404000
+-20.561000 -31.701001 18.299000 -20.561000 -31.701001 18.299000
+-17.727000 -28.167001 15.851000 -17.727000 -28.167001 15.851000
+-14.891000 -24.631001 13.404000 -14.891000 -24.631001 13.404000
-12.057000 -21.096001 10.956000 -12.057000 -21.096001 10.956000
--20.399000 -38.963002 18.833000 -20.399000 -38.963002 18.833000
--17.565000 -35.429002 16.386000 -17.565000 -35.429002 16.386000
--14.730000 -31.893002 13.939000 -14.730000 -31.893002 13.939000
+-20.399000 -38.963001 18.833000 -20.399000 -38.963001 18.833000
+-17.565000 -35.429001 16.386000 -17.565000 -35.429001 16.386000
+-14.730000 -31.893001 13.939000 -14.730000 -31.893001 13.939000
-11.896000 -28.358001 11.492000 -11.896000 -28.358001 11.492000
--14.568000 -39.155002 14.474000 -14.568000 -39.155002 14.474000
+-14.568000 -39.155001 14.474000 -14.568000 -39.155001 14.474000
-11.734000 -35.620001 12.026000 -11.734000 -35.620001 12.026000
]
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826653.783100000 461136.439645000 5064824.943 ]
+3 [ 3826653.739710000 461136.487089000 5064824.971 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826612.499110000 461080.297642000 5064861.006 ]
+3 [ 3826612.455720000 461080.345086000 5064861.034 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS007-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS007-AntennaField.conf
index 2b1726617ad3ebf610cbabd520c73ba09f7fbb4e..01e537dc635b07a4cb075c20bed8a36c24d54808 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS007-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS007-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS007
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:38
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:06
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826533.361100000 461098.965635000 5064918.721 ]
+3 [ 3826533.317710000 461099.013078000 5064918.749 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.020000 -0.244000 1.538000 -2.020000 -0.244000 1.538000
@@ -28,15 +28,15 @@ LBA
-4.264000 2.582000 2.967000 -4.264000 2.582000 2.967000
-2.079000 5.305000 1.081000 -2.079000 5.305000 1.081000
1.077000 5.547000 -1.310000 1.077000 5.547000 -1.310000
- 3.730000 3.192001 -3.088000 3.730000 3.192001 -3.088000
- 4.637000 -0.655999 -3.421000 4.637000 -0.655999 -3.421000
+ 3.730000 3.192000 -3.088000 3.730000 3.192000 -3.088000
+ 4.637000 -0.656000 -3.421000 4.637000 -0.656000 -3.421000
3.374000 -4.197000 -2.154000 3.374000 -4.197000 -2.154000
0.533000 -5.774000 0.122000 0.533000 -5.774000 0.122000
-2.558000 -4.650000 2.340000 -2.558000 -4.650000 2.340000
-4.643000 -6.965000 4.115000 -4.643000 -6.965000 4.115000
- -6.866000 -4.441000 5.555000 -6.866000 -4.441000 5.555000
- -8.269000 0.358000 6.174000 -8.269000 0.358000 6.174000
- -6.140000 6.960000 3.979000 -6.140000 6.960000 3.979000
+ -6.866000 -4.441001 5.555000 -6.866000 -4.441001 5.555000
+ -8.269000 0.357999 6.174000 -8.269000 0.357999 6.174000
+ -6.140000 6.959999 3.979000 -6.140000 6.959999 3.979000
-4.200000 8.955000 2.343000 -4.200000 8.955000 2.343000
-0.926000 10.044000 -0.213000 -0.926000 10.044000 -0.213000
2.333000 8.574000 -2.527000 2.333000 8.574000 -2.527000
@@ -46,12 +46,12 @@ LBA
5.494000 -6.642999 -3.524000 5.494000 -6.642999 -3.524000
2.100000 -8.763000 -0.784000 2.100000 -8.763000 -0.784000
-1.628000 -8.831000 2.020000 -1.628000 -8.831000 2.020000
- -7.980000 -9.746000 6.871000 -7.980000 -9.746000 6.871000
+ -7.980000 -9.746001 6.871000 -7.980000 -9.746001 6.871000
-10.146000 -6.916001 8.240000 -10.146000 -6.916001 8.240000
-10.728000 -3.850001 8.400000 -10.728000 -3.850001 8.400000
-10.216000 4.048999 7.302000 -10.216000 4.048999 7.302000
-11.058000 6.898999 7.677000 -11.058000 6.898999 7.677000
- -6.302000 11.127000 3.724000 -6.302000 11.127000 3.724000
+ -6.302000 11.126999 3.724000 -6.302000 11.126999 3.724000
-2.556000 12.841000 0.758000 -2.556000 12.841000 0.758000
1.277000 14.884000 -2.304000 1.277000 14.884000 -2.304000
3.320000 12.572000 -3.628000 3.320000 12.572000 -3.628000
@@ -60,13 +60,13 @@ LBA
10.878000 1.413001 -8.293000 10.878000 1.413001 -8.293000
10.325000 -3.812999 -7.406000 10.325000 -3.812999 -7.406000
10.605000 -7.953999 -7.241000 10.605000 -7.953999 -7.241000
- 4.987000 -12.979999 -2.571000 4.987000 -12.979999 -2.571000
+ 4.987000 -12.980000 -2.571000 4.987000 -12.980000 -2.571000
1.902000 -13.784000 -0.182000 1.902000 -13.784000 -0.182000
-2.477000 -13.925000 3.118000 -2.477000 -13.925000 3.118000
-9.907000 54.090999 2.547000 -9.907000 54.090999 2.547000
42.918000 9.472004 -33.071000 42.918000 9.472004 -33.071000
- -5.495000 -16.155000 5.585000 -5.495000 -16.155000 5.585000
- -7.768000 -17.178000 7.383000 -7.768000 -17.178000 7.383000
+ -5.495000 -16.155001 5.585000 -5.495000 -16.155001 5.585000
+ -7.768000 -17.178001 7.383000 -7.768000 -17.178001 7.383000
-15.663000 -4.700001 12.182000 -15.663000 -4.700001 12.182000
-13.640000 11.016999 9.243000 -13.640000 11.016999 9.243000
-11.711000 15.170999 7.419000 -11.711000 15.170999 7.419000
@@ -76,12 +76,12 @@ LBA
14.265000 -3.975999 -10.348000 14.265000 -3.975999 -10.348000
13.199000 -11.934999 -8.829000 13.199000 -11.934999 -8.829000
6.660000 -17.163999 -3.448000 6.660000 -17.163999 -3.448000
- 4.079000 -24.489999 -0.848000 4.079000 -24.489999 -0.848000
- -6.333000 -23.180000 6.848000 -6.333000 -23.180000 6.848000
+ 4.079000 -24.490000 -0.848000 4.079000 -24.490000 -0.848000
+ -6.333000 -23.180001 6.848000 -6.333000 -23.180001 6.848000
-15.122000 -15.879001 12.785000 -15.122000 -15.879001 12.785000
--18.138000 -10.680001 14.580000 -18.138000 -10.680001 14.580000
+-18.138000 -10.680002 14.580000 -18.138000 -10.680002 14.580000
-21.119000 -2.936002 16.117000 -21.119000 -2.936002 16.117000
--16.478000 13.340999 11.162000 -16.478000 13.340999 11.162000
+-16.478000 13.340998 11.162000 -16.478000 13.340998 11.162000
-12.655000 19.448999 7.741000 -12.655000 19.448999 7.741000
-3.168000 25.968000 0.030000 -3.168000 25.968000 0.030000
7.994000 22.447001 -8.030000 7.994000 22.447001 -8.030000
@@ -89,81 +89,81 @@ LBA
18.742000 6.862002 -14.688000 18.742000 6.862002 -14.688000
20.731000 -9.133998 -14.735000 20.731000 -9.133998 -14.735000
12.405000 -22.895999 -7.243000 12.405000 -22.895999 -7.243000
- 6.358010 -34.012999 -1.699000 6.358010 -34.012999 -1.699000
+ 6.358000 -34.012999 -1.699000 6.358000 -34.012999 -1.699000
-5.325000 -30.187000 6.725000 -5.325000 -30.187000 6.725000
--15.843000 -23.086001 13.978000 -15.843000 -23.086001 13.978000
+-15.843000 -23.086002 13.978000 -15.843000 -23.086002 13.978000
-20.995000 -17.994002 17.386000 -20.995000 -17.994002 17.386000
-25.276000 0.349998 18.940000 -25.276000 0.349998 18.940000
-23.915000 18.153998 16.310000 -23.915000 18.153998 16.310000
--17.605000 27.127999 10.762000 -17.605000 27.127999 10.762000
+-17.605000 27.127998 10.762000 -17.605000 27.127998 10.762000
-10.157000 27.760999 5.114000 -10.157000 27.760999 5.114000
0.146000 34.052000 -3.187000 0.146000 34.052000 -3.187000
14.687000 27.442001 -13.505000 14.687000 27.442001 -13.505000
20.095000 21.202002 -17.000000 20.095000 21.202002 -17.000000
- 26.812000 7.229002 -20.779000 26.812000 7.229002 -20.779000
+ 26.812000 7.229003 -20.779000 26.812000 7.229003 -20.779000
25.887000 -0.822998 -19.357000 25.887000 -0.822998 -19.357000
21.859000 -20.455998 -14.559000 21.859000 -20.455998 -14.559000
17.052000 -23.134998 -10.708000 17.052000 -23.134998 -10.708000
- 19.413010 -28.813998 -11.967000 19.413010 -28.813998 -11.967000
--10.466990 -38.813001 11.364000 -10.466990 -38.813001 11.364000
+ 19.413000 -28.813998 -11.967000 19.413000 -28.813998 -11.967000
+-10.467000 -38.813001 11.364000 -10.467000 -38.813001 11.364000
-26.157000 -21.264002 21.555000 -26.157000 -21.264002 21.555000
-33.367000 -2.908003 25.308000 -33.367000 -2.908003 25.308000
--31.141000 12.720998 22.225000 -31.141000 12.720998 22.225000
+-31.141000 12.720997 22.225000 -31.141000 12.720997 22.225000
-4.309000 40.939000 -0.466000 -4.309000 40.939000 -0.466000
12.502000 32.085001 -12.284000 12.502000 32.085001 -12.284000
24.836000 25.720002 -20.967000 24.836000 25.720002 -20.967000
- 28.499010 -17.273997 -19.831000 28.499010 -17.273997 -19.831000
+ 28.499000 -17.273997 -19.831000 28.499000 -17.273997 -19.831000
]
HBA
-3 [ 3826508.368100000 461126.725633000 5064934.972 ]
+3 [ 3826508.324710000 461126.773076000 5064935.000 ]
48 x 2 x 3 [
--34.574000 -31.118003 28.764000 -34.574000 -31.118003 28.764000
--30.620000 -29.920002 25.688000 -30.620000 -29.920002 25.688000
--37.349000 -37.311003 31.407000 -37.349000 -37.311003 31.407000
--33.396000 -36.113003 28.331000 -33.396000 -36.113003 28.331000
--29.443000 -34.915002 25.256000 -29.443000 -34.915002 25.256000
--25.489000 -33.716002 22.180000 -25.489000 -33.716002 22.180000
--40.125000 -43.504003 34.050000 -40.125000 -43.504003 34.050000
--36.171000 -42.306003 30.974000 -36.171000 -42.306003 30.974000
+-34.574000 -31.118004 28.764000 -34.574000 -31.118004 28.764000
+-30.620000 -29.920003 25.688000 -30.620000 -29.920003 25.688000
+-37.349000 -37.311004 31.407000 -37.349000 -37.311004 31.407000
+-33.396000 -36.113004 28.331000 -33.396000 -36.113004 28.331000
+-29.443000 -34.915003 25.256000 -29.443000 -34.915003 25.256000
+-25.489000 -33.716003 22.180000 -25.489000 -33.716003 22.180000
+-40.125000 -43.504004 34.050000 -40.125000 -43.504004 34.050000
+-36.171000 -42.306004 30.974000 -36.171000 -42.306004 30.974000
-32.218000 -41.107003 27.899000 -32.218000 -41.107003 27.899000
--28.265000 -39.910002 24.823000 -28.265000 -39.910002 24.823000
--24.312000 -38.711002 21.748000 -24.312000 -38.711002 21.748000
+-28.265000 -39.910003 24.823000 -28.265000 -39.910003 24.823000
+-24.312000 -38.711003 21.748000 -24.312000 -38.711003 21.748000
-20.359000 -37.513002 18.672000 -20.359000 -37.513002 18.672000
--38.947000 -48.499003 33.618000 -38.947000 -48.499003 33.618000
--34.994000 -47.301003 30.542000 -34.994000 -47.301003 30.542000
+-38.947000 -48.499004 33.618000 -38.947000 -48.499004 33.618000
+-34.994000 -47.301004 30.542000 -34.994000 -47.301004 30.542000
-31.041000 -46.102003 27.467000 -31.041000 -46.102003 27.467000
--27.088000 -44.905002 24.391000 -27.088000 -44.905002 24.391000
--23.135000 -43.706002 21.316000 -23.135000 -43.706002 21.316000
+-27.088000 -44.905003 24.391000 -27.088000 -44.905003 24.391000
+-23.135000 -43.706003 21.316000 -23.135000 -43.706003 21.316000
-19.181000 -42.508002 18.240000 -19.181000 -42.508002 18.240000
--33.817000 -52.296003 30.110000 -33.817000 -52.296003 30.110000
--29.863000 -51.097002 27.034000 -29.863000 -51.097002 27.034000
--25.910000 -49.899002 23.959000 -25.910000 -49.899002 23.959000
+-33.817000 -52.296004 30.110000 -33.817000 -52.296004 30.110000
+-29.863000 -51.097003 27.034000 -29.863000 -51.097003 27.034000
+-25.910000 -49.899003 23.959000 -25.910000 -49.899003 23.959000
-21.957000 -48.701002 20.883000 -21.957000 -48.701002 20.883000
--28.686000 -56.092002 26.602000 -28.686000 -56.092002 26.602000
--24.732000 -54.894002 23.526000 -24.732000 -54.894002 23.526000
- 19.161000 42.823002 -18.253000 19.161000 42.823002 -18.253000
- 19.694000 47.873002 -19.109000 19.694000 47.873002 -19.109000
- 22.719000 36.835002 -20.383000 22.719000 36.835002 -20.383000
- 23.251000 41.885002 -21.238000 23.251000 41.885002 -21.238000
- 23.783000 46.936002 -22.095000 23.783000 46.936002 -22.095000
- 24.316000 51.986002 -22.951000 24.316000 51.986002 -22.951000
+-28.686000 -56.092003 26.602000 -28.686000 -56.092003 26.602000
+-24.732000 -54.894003 23.526000 -24.732000 -54.894003 23.526000
+ 19.160990 42.823001 -18.253000 19.160990 42.823001 -18.253000
+ 19.693990 47.873001 -19.109000 19.693990 47.873001 -19.109000
+ 22.718990 36.835002 -20.383000 22.718990 36.835002 -20.383000
+ 23.250990 41.885002 -21.238000 23.250990 41.885002 -21.238000
+ 23.782990 46.936002 -22.095000 23.782990 46.936002 -22.095000
+ 24.315990 51.986002 -22.951000 24.315990 51.986002 -22.951000
26.277000 30.848002 -22.512000 26.277000 30.848002 -22.512000
26.809000 35.898002 -23.368000 26.809000 35.898002 -23.368000
- 27.342000 40.949002 -24.224000 27.342000 40.949002 -24.224000
- 27.874000 45.999002 -25.080000 27.874000 45.999002 -25.080000
- 28.406000 51.050002 -25.936000 28.406000 51.050002 -25.936000
- 28.939000 56.100002 -26.792000 28.939000 56.100002 -26.792000
- 30.367000 29.910003 -25.498000 30.367000 29.910003 -25.498000
+ 27.341990 40.949002 -24.224000 27.341990 40.949002 -24.224000
+ 27.873990 45.999002 -25.080000 27.873990 45.999002 -25.080000
+ 28.405990 51.050002 -25.936000 28.405990 51.050002 -25.936000
+ 28.938990 56.100002 -26.792000 28.938990 56.100002 -26.792000
+ 30.367000 29.910002 -25.498000 30.367000 29.910002 -25.498000
30.900000 34.960003 -26.354000 30.900000 34.960003 -26.354000
31.432000 40.011003 -27.210000 31.432000 40.011003 -27.210000
- 31.964000 45.061003 -28.066000 31.964000 45.061003 -28.066000
- 32.497000 50.112003 -28.922000 32.497000 50.112003 -28.922000
- 33.029000 55.162003 -29.778000 33.029000 55.162003 -29.778000
+ 31.963990 45.061003 -28.066000 31.963990 45.061003 -28.066000
+ 32.496990 50.112003 -28.922000 32.496990 50.112003 -28.922000
+ 33.028990 55.162003 -29.778000 33.028990 55.162003 -29.778000
34.990000 34.024003 -29.339000 34.990000 34.024003 -29.339000
35.523000 39.074003 -30.195000 35.523000 39.074003 -30.195000
- 36.055000 44.125003 -31.052000 36.055000 44.125003 -31.052000
- 36.587000 49.175003 -31.907000 36.587000 49.175003 -31.907000
+ 36.054990 44.125003 -31.052000 36.054990 44.125003 -31.052000
+ 36.586990 49.175003 -31.907000 36.586990 49.175003 -31.907000
39.612000 38.137003 -33.181000 39.612000 38.137003 -33.181000
40.145000 43.187003 -34.037000 40.145000 43.187003 -34.037000
]
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826478.715100000 461083.719631000 5064961.117 ]
+3 [ 3826478.671710000 461083.767073000 5064961.145 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826538.021100000 461169.730636000 5064908.827 ]
+3 [ 3826537.977700000 461169.778078000 5064908.855 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS011-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS011-AntennaField.conf
index c2019c2d0592a35291016dd4cc2f1852e1995b4c..46ca996a4343115be37c4030cd16402f7f6201b5 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS011-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS011-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS011
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:38
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:07
#
NORMAL_VECTOR LBA
@@ -15,157 +15,157 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826667.069090000 461285.848646000 5064801.592 ]
+3 [ 3826667.025700000 461285.896091000 5064801.620 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
- -1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
+ -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
+ -1.338000 2.104999 0.814000 -1.338000 2.104999 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
- 2.019000 0.243001 -1.538000 2.019000 0.243001 -1.538000
+ 2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- 2.281000 4.879001 -2.153000 2.281000 4.879001 -2.153000
- 4.349000 1.739001 -3.421000 4.349000 1.739001 -3.421000
- 4.381000 -2.214999 -3.088000 4.381000 -2.214999 -3.088000
- 2.364000 -5.131999 -1.311000 2.364000 -5.131999 -1.311000
+ 2.281000 4.879000 -2.153000 2.281000 4.879000 -2.153000
+ 4.349000 1.739000 -3.421000 4.349000 1.739000 -3.421000
+ 4.381000 -2.215000 -3.088000 4.381000 -2.215000 -3.088000
+ 2.364000 -5.132000 -1.311000 2.364000 -5.132000 -1.311000
-0.759000 -5.647000 1.081000 -0.759000 -5.647000 1.081000
- -3.528000 -3.521000 2.966000 -3.528000 -3.521000 2.966000
- -4.645000 0.253000 3.464000 -4.645000 0.253000 3.464000
- -3.589000 3.909000 2.341000 -3.589000 3.909000 2.341000
+ -3.528000 -3.521001 2.966000 -3.528000 -3.521001 2.966000
+ -4.645000 0.252999 3.464000 -4.645000 0.252999 3.464000
+ -3.589000 3.908999 2.341000 -3.589000 3.908999 2.341000
-0.853000 5.735000 0.122000 -0.853000 5.735000 0.122000
-0.725000 9.294000 -0.296000 -0.725000 9.294000 -0.296000
- 2.199000 9.309001 -2.492000 2.199000 9.309001 -2.492000
- 5.838000 6.892001 -5.005000 5.838000 6.892001 -5.005000
- 8.074000 0.050001 -6.065000 8.074000 0.050001 -6.065000
- 7.865000 -3.140999 -5.620000 7.865000 -3.140999 -5.620000
- 6.243000 -6.800999 -4.071000 6.243000 -6.800999 -4.071000
- 3.199000 -8.510999 -1.632000 3.199000 -8.510999 -1.632000
- -1.427000 -8.674000 1.855000 -1.427000 -8.674000 1.855000
- -5.128000 -7.192000 4.499000 -5.128000 -7.192000 4.499000
- -7.354000 -3.665000 5.852000 -7.354000 -3.665000 5.852000
- -7.457000 0.268000 5.573000 -7.457000 0.268000 5.573000
- -6.327000 4.814000 4.314000 -6.327000 4.814000 4.314000
- -3.824000 8.095000 2.139000 -3.824000 8.095000 2.139000
+ 2.199000 9.309000 -2.492000 2.199000 9.309000 -2.492000
+ 5.838000 6.892000 -5.005000 5.838000 6.892000 -5.005000
+ 8.074000 0.050000 -6.065000 8.074000 0.050000 -6.065000
+ 7.865000 -3.141000 -5.620000 7.865000 -3.141000 -5.620000
+ 6.243000 -6.801000 -4.071000 6.243000 -6.801000 -4.071000
+ 3.199000 -8.511000 -1.632000 3.199000 -8.511000 -1.632000
+ -1.427000 -8.674001 1.855000 -1.427000 -8.674001 1.855000
+ -5.128000 -7.192001 4.499000 -5.128000 -7.192001 4.499000
+ -7.354000 -3.665001 5.852000 -7.354000 -3.665001 5.852000
+ -7.457000 0.267999 5.573000 -7.457000 0.267999 5.573000
+ -6.327000 4.813999 4.314000 -6.327000 4.813999 4.314000
+ -3.824000 8.094999 2.139000 -3.824000 8.094999 2.139000
-0.004000 14.289000 -1.288000 -0.004000 14.289000 -1.288000
- 3.053000 14.024001 -3.559000 3.053000 14.024001 -3.559000
- 5.163000 12.207001 -4.979000 5.163000 12.207001 -4.979000
- 9.227000 5.785001 -7.448000 9.227000 5.785001 -7.448000
+ 3.053000 14.024000 -3.559000 3.053000 14.024000 -3.559000
+ 5.163000 12.207000 -4.979000 5.163000 12.207000 -4.979000
+ 9.227000 5.785000 -7.448000 9.227000 5.785000 -7.448000
11.393000 4.358001 -8.945000 11.393000 4.358001 -8.945000
10.512000 -2.962999 -7.622000 10.512000 -2.962999 -7.622000
- 8.916000 -7.505999 -6.014000 8.916000 -7.505999 -6.014000
- 7.445000 -12.371999 -4.470000 7.445000 -12.371999 -4.470000
- 4.760000 -12.392999 -2.453000 4.760000 -12.392999 -2.453000
+ 8.916000 -7.506000 -6.014000 8.916000 -7.506000 -6.014000
+ 7.445000 -12.372000 -4.470000 7.445000 -12.372000 -4.470000
+ 4.760000 -12.393000 -2.453000 4.760000 -12.393000 -2.453000
1.017000 -13.001000 0.411000 1.017000 -13.001000 0.411000
- -4.531000 -11.595000 4.449000 -4.531000 -11.595000 4.449000
- -6.626000 -10.494000 5.922000 -6.626000 -10.494000 5.922000
- -9.170000 -6.059000 7.431000 -9.170000 -6.059000 7.431000
--11.674000 -3.166001 9.049000 -11.674000 -3.166001 9.049000
+ -4.531000 -11.595001 4.449000 -4.531000 -11.595001 4.449000
+ -6.626000 -10.494001 5.922000 -6.626000 -10.494001 5.922000
+ -9.170000 -6.059001 7.431000 -9.170000 -6.059001 7.431000
+-11.674000 -3.166002 9.049000 -11.674000 -3.166002 9.049000
-10.651000 5.502999 7.498000 -10.651000 5.502999 7.498000
- -8.997000 8.786000 5.959000 -8.997000 8.786000 5.959000
- -6.091000 12.685000 3.425000 -6.091000 12.685000 3.425000
--40.727000 -37.669003 33.974990 -40.727000 -37.669003 33.974990
--32.498000 52.829998 19.617990 -32.498000 52.829998 19.617990
- -5.279000 16.989000 2.427000 -5.279000 16.989000 2.427000
- -4.300000 19.732000 1.444000 -4.300000 19.732000 1.444000
- 8.052000 17.126001 -7.592000 8.052000 17.126001 -7.592000
- 15.453000 3.477002 -11.914000 15.453000 3.477002 -11.914000
- 16.459000 -1.337998 -12.234000 16.459000 -1.337998 -12.234000
+ -8.997000 8.785999 5.959000 -8.997000 8.785999 5.959000
+ -6.091000 12.684999 3.425000 -6.091000 12.684999 3.425000
+-40.727000 -37.669004 33.975000 -40.727000 -37.669004 33.975000
+-32.498010 52.829996 19.618000 -32.498010 52.829996 19.618000
+ -5.279000 16.988999 2.427000 -5.279000 16.988999 2.427000
+ -4.300000 19.731999 1.444000 -4.300000 19.731999 1.444000
+ 8.052000 17.126000 -7.592000 8.052000 17.126000 -7.592000
+ 15.453000 3.477001 -11.914000 15.453000 3.477001 -11.914000
+ 16.459000 -1.337999 -12.234000 16.459000 -1.337999 -12.234000
11.810000 -11.640999 -7.813000 11.810000 -11.640999 -7.813000
- 2.627000 -17.705999 -0.371000 2.627000 -17.705999 -0.371000
- -3.459000 -19.669000 4.374000 -3.459000 -19.669000 4.374000
--11.947000 -9.349001 9.812000 -11.947000 -9.349001 9.812000
--15.666000 -2.401001 11.975990 -15.666000 -2.401001 11.975990
--14.129000 7.221999 9.952990 -14.129000 7.221999 9.952990
--16.462000 15.003999 11.000990 -16.462000 15.003999 11.000990
- -8.632000 23.032000 4.398000 -8.632000 23.032000 4.398000
+ 2.627000 -17.706000 -0.371000 2.627000 -17.706000 -0.371000
+ -3.459000 -19.669001 4.374000 -3.459000 -19.669001 4.374000
+-11.947000 -9.349002 9.812000 -11.947000 -9.349002 9.812000
+-15.666000 -2.401002 11.976000 -15.666000 -2.401002 11.976000
+-14.129000 7.221998 9.953000 -14.129000 7.221998 9.953000
+-16.462000 15.003998 11.001000 -16.462000 15.003998 11.001000
+ -8.632000 23.031999 4.398000 -8.632000 23.031999 4.398000
1.438000 25.118000 -3.350000 1.438000 25.118000 -3.350000
- 6.399000 23.796001 -6.954000 6.399000 23.796001 -6.954000
+ 6.399000 23.796000 -6.954000 6.399000 23.796000 -6.954000
12.757000 20.518001 -11.430000 12.757000 20.518001 -11.430000
- 18.686000 4.176002 -14.404000 18.686000 4.176002 -14.404000
- 19.492000 -3.757998 -14.291000 19.492000 -3.757998 -14.291000
- 16.667000 -16.912998 -10.981000 16.667000 -16.912998 -10.981000
- 7.089000 -23.916999 -3.160000 7.089000 -23.916999 -3.160000
+ 18.686000 4.176001 -14.404000 18.686000 4.176001 -14.404000
+ 19.492000 -3.757999 -14.291000 19.492000 -3.757999 -14.291000
+ 16.667000 -16.912999 -10.981000 16.667000 -16.912999 -10.981000
+ 7.089000 -23.917000 -3.160000 7.089000 -23.917000 -3.160000
-0.089000 -25.938000 2.411000 -0.089000 -25.938000 2.411000
- -8.944000 -21.431000 8.650000 -8.944000 -21.431000 8.650000
--19.236000 -11.046001 15.436990 -19.236000 -11.046001 15.436990
--21.248000 6.582999 15.353990 -21.248000 6.582999 15.353990
--23.336000 20.235998 15.686990 -23.336000 20.235998 15.686990
--13.234000 27.461999 7.450990 -13.234000 27.461999 7.450990
- -2.097000 31.198000 -1.246000 -2.097000 31.198000 -1.246000
- 4.262000 31.808001 -6.074000 4.262000 31.808001 -6.074000
- 17.427000 21.632002 -15.036000 17.427000 21.632002 -15.036000
- 26.446000 6.977003 -20.481000 26.446000 6.977003 -20.481000
- 27.157000 -5.282997 -19.907000 27.157000 -5.282997 -19.907000
+ -8.944000 -21.431001 8.650000 -8.944000 -21.431001 8.650000
+-19.236000 -11.046002 15.437000 -19.236000 -11.046002 15.437000
+-21.248000 6.582998 15.354000 -21.248000 6.582998 15.354000
+-23.336000 20.235997 15.687000 -23.336000 20.235997 15.687000
+-13.234000 27.461998 7.451000 -13.234000 27.461998 7.451000
+ -2.097000 31.197999 -1.246000 -2.097000 31.197999 -1.246000
+ 4.262000 31.808000 -6.074000 4.262000 31.808000 -6.074000
+ 17.427000 21.632001 -15.036000 17.427000 21.632001 -15.036000
+ 26.446000 6.977002 -20.481000 26.446000 6.977002 -20.481000
+ 27.157000 -5.282998 -19.907000 27.157000 -5.282998 -19.907000
22.433000 -12.213998 -15.734000 22.433000 -12.213998 -15.734000
- 18.923010 -25.900998 -11.863000 18.923010 -25.900998 -11.863000
- 5.317010 -33.494999 -0.964000 5.317010 -33.494999 -0.964000
- -1.855990 -33.457000 4.417000 -1.855990 -33.457000 4.417000
--14.240000 -28.700001 13.283000 -14.240000 -28.700001 13.283000
--18.109000 -21.804001 15.563990 -18.109000 -21.804001 15.563990
--26.330000 -3.453002 20.075990 -26.330000 -3.453002 20.075990
--24.549000 2.737998 18.178990 -24.549000 2.737998 18.178990
--29.331000 4.991998 21.564990 -29.331000 4.991998 21.564990
--14.547000 38.445999 7.444990 -14.547000 38.445999 7.444990
- 5.953000 38.755001 -7.971000 5.953000 38.755001 -7.971000
+ 18.923000 -25.900999 -11.863000 18.923000 -25.900999 -11.863000
+ 5.317000 -33.495000 -0.964000 5.317000 -33.495000 -0.964000
+ -1.856000 -33.457001 4.417000 -1.856000 -33.457001 4.417000
+-14.240000 -28.700002 13.283000 -14.240000 -28.700002 13.283000
+-18.109000 -21.804002 15.564000 -18.109000 -21.804002 15.564000
+-26.330000 -3.453003 20.076000 -26.330000 -3.453003 20.076000
+-24.549000 2.737997 18.179000 -24.549000 2.737997 18.179000
+-29.331000 4.991997 21.565000 -29.331000 4.991997 21.565000
+-14.547000 38.445998 7.445000 -14.547000 38.445998 7.445000
+ 5.953000 38.755000 -7.971000 5.953000 38.755000 -7.971000
21.123000 31.107002 -18.667000 21.123000 31.107002 -18.667000
- 28.337000 17.349003 -22.838000 28.337000 17.349003 -22.838000
- 25.809010 -27.254997 -16.909000 25.809010 -27.254997 -16.909000
- 9.401010 -35.116999 -3.883000 9.401010 -35.116999 -3.883000
- -2.562990 -40.984000 5.628000 -2.562990 -40.984000 5.628000
--29.080000 -11.615002 22.877990 -29.080000 -11.615002 22.877990
+ 28.337000 17.349002 -22.838000 28.337000 17.349002 -22.838000
+ 25.809000 -27.254998 -16.909000 25.809000 -27.254998 -16.909000
+ 9.401000 -35.116999 -3.883000 9.401000 -35.116999 -3.883000
+ -2.563000 -40.984001 5.628000 -2.563000 -40.984001 5.628000
+-29.080000 -11.615003 22.878000 -29.080000 -11.615003 22.878000
]
HBA
-3 [ 3826643.191090000 461290.792644000 5064819.069 ]
+3 [ 3826643.147700000 461290.840088000 5064819.097 ]
48 x 2 x 3 [
--16.059990 -65.451001 17.970000 -16.059990 -65.451001 17.970000
--16.101990 -60.319001 17.538000 -16.101990 -60.319001 17.538000
--11.892990 -70.808001 15.327000 -11.892990 -70.808001 15.327000
--11.934990 -65.676001 14.894000 -11.934990 -65.676001 14.894000
--11.976990 -60.544001 14.462000 -11.976990 -60.544001 14.462000
--12.019990 -55.413001 14.031000 -12.019990 -55.413001 14.031000
+-16.060000 -65.451001 17.970000 -16.060000 -65.451001 17.970000
+-16.102000 -60.319001 17.538000 -16.102000 -60.319001 17.538000
+-11.893000 -70.808001 15.327000 -11.893000 -70.808001 15.327000
+-11.935000 -65.676001 14.894000 -11.935000 -65.676001 14.894000
+-11.977000 -60.544001 14.462000 -11.977000 -60.544001 14.462000
+-12.020000 -55.413001 14.031000 -12.020000 -55.413001 14.031000
-7.726990 -76.164000 12.683000 -7.726990 -76.164000 12.683000
- -7.768990 -71.032000 12.251000 -7.768990 -71.032000 12.251000
- -7.810990 -65.901000 11.819000 -7.810990 -65.901000 11.819000
- -7.853990 -60.770000 11.387000 -7.853990 -60.770000 11.387000
- -7.895990 -55.638000 10.955000 -7.895990 -55.638000 10.955000
+ -7.769000 -71.032000 12.251000 -7.769000 -71.032000 12.251000
+ -7.811000 -65.901000 11.819000 -7.811000 -65.901000 11.819000
+ -7.854000 -60.770000 11.387000 -7.854000 -60.770000 11.387000
+ -7.896000 -55.638000 10.955000 -7.896000 -55.638000 10.955000
-7.938000 -50.506000 10.523000 -7.938000 -50.506000 10.523000
-3.601990 -76.389000 9.607000 -3.601990 -76.389000 9.607000
-3.643990 -71.257000 9.175000 -3.643990 -71.257000 9.175000
- -3.685990 -66.126000 8.743000 -3.685990 -66.126000 8.743000
- -3.728990 -60.994000 8.311000 -3.728990 -60.994000 8.311000
- -3.770990 -55.863000 7.879000 -3.770990 -55.863000 7.879000
- -3.812990 -50.731000 7.447000 -3.812990 -50.731000 7.447000
+ -3.686000 -66.126000 8.743000 -3.686000 -66.126000 8.743000
+ -3.729000 -60.994000 8.311000 -3.729000 -60.994000 8.311000
+ -3.771000 -55.863000 7.879000 -3.771000 -55.863000 7.879000
+ -3.813000 -50.731000 7.447000 -3.813000 -50.731000 7.447000
0.481010 -71.483000 6.099000 0.481010 -71.483000 6.099000
- 0.438010 -66.351000 5.668000 0.438010 -66.351000 5.668000
- 0.396010 -61.219000 5.236000 0.396010 -61.219000 5.236000
- 0.354010 -56.087000 4.803000 0.354010 -56.087000 4.803000
- 4.563010 -66.575999 2.592000 4.563010 -66.575999 2.592000
- 4.521010 -61.443999 2.160000 4.521010 -61.443999 2.160000
- -4.520000 61.445000 -2.161000 -4.520000 61.445000 -2.161000
- -4.562000 66.576000 -2.594000 -4.562000 66.576000 -2.594000
- -0.354000 56.088000 -4.805000 -0.354000 56.088000 -4.805000
- -0.396000 61.219000 -5.237000 -0.396000 61.219000 -5.237000
- -0.438000 66.351000 -5.669000 -0.438000 66.351000 -5.669000
- -0.481000 71.483000 -6.101000 -0.481000 71.483000 -6.101000
- 3.813000 50.732001 -7.448000 3.813000 50.732001 -7.448000
- 3.771000 55.863001 -7.881000 3.771000 55.863001 -7.881000
- 3.729000 60.994001 -8.313000 3.729000 60.994001 -8.313000
- 3.686000 66.126001 -8.744000 3.686000 66.126001 -8.744000
- 3.644000 71.258001 -9.177000 3.644000 71.258001 -9.177000
+ 0.438000 -66.351000 5.668000 0.438000 -66.351000 5.668000
+ 0.396000 -61.219000 5.236000 0.396000 -61.219000 5.236000
+ 0.354000 -56.087000 4.803000 0.354000 -56.087000 4.803000
+ 4.563000 -66.575999 2.592000 4.563000 -66.575999 2.592000
+ 4.521000 -61.443999 2.160000 4.521000 -61.443999 2.160000
+ -4.520010 61.445000 -2.161000 -4.520010 61.445000 -2.161000
+ -4.562010 66.576000 -2.594000 -4.562010 66.576000 -2.594000
+ -0.354010 56.088000 -4.805000 -0.354010 56.088000 -4.805000
+ -0.396010 61.219000 -5.237000 -0.396010 61.219000 -5.237000
+ -0.438010 66.351000 -5.669000 -0.438010 66.351000 -5.669000
+ -0.481010 71.483000 -6.101000 -0.481010 71.483000 -6.101000
+ 3.812990 50.732001 -7.448000 3.812990 50.732001 -7.448000
+ 3.770990 55.863001 -7.881000 3.770990 55.863001 -7.881000
+ 3.728990 60.994001 -8.313000 3.728990 60.994001 -8.313000
+ 3.685990 66.126001 -8.744000 3.685990 66.126001 -8.744000
+ 3.643990 71.258001 -9.177000 3.643990 71.258001 -9.177000
3.601990 76.390001 -9.609000 3.601990 76.390001 -9.609000
- 7.938000 50.506001 -10.524000 7.938000 50.506001 -10.524000
- 7.896000 55.638001 -10.956000 7.896000 55.638001 -10.956000
- 7.854000 60.770001 -11.389000 7.854000 60.770001 -11.389000
- 7.811000 65.902001 -11.820000 7.811000 65.902001 -11.820000
- 7.769000 71.033001 -12.252000 7.769000 71.033001 -12.252000
- 7.727000 76.164001 -12.685000 7.727000 76.164001 -12.685000
- 12.021000 55.413001 -14.032000 12.021000 55.413001 -14.032000
- 11.978000 60.545001 -14.464000 11.978000 60.545001 -14.464000
- 11.936000 65.677001 -14.896000 11.936000 65.677001 -14.896000
- 11.893000 70.808001 -15.328000 11.893000 70.808001 -15.328000
- 16.102000 60.319002 -17.539000 16.102000 60.319002 -17.539000
- 16.060000 65.451002 -17.972000 16.060000 65.451002 -17.972000
+ 7.937990 50.506001 -10.524000 7.937990 50.506001 -10.524000
+ 7.895990 55.638001 -10.956000 7.895990 55.638001 -10.956000
+ 7.853990 60.770001 -11.389000 7.853990 60.770001 -11.389000
+ 7.810990 65.902001 -11.820000 7.810990 65.902001 -11.820000
+ 7.768990 71.033001 -12.252000 7.768990 71.033001 -12.252000
+ 7.726990 76.164001 -12.685000 7.726990 76.164001 -12.685000
+ 12.020990 55.413001 -14.032000 12.020990 55.413001 -14.032000
+ 11.977990 60.545001 -14.464000 11.977990 60.545001 -14.464000
+ 11.935990 65.677001 -14.896000 11.935990 65.677001 -14.896000
+ 11.892990 70.808001 -15.328000 11.892990 70.808001 -15.328000
+ 16.101990 60.319002 -17.539000 16.101990 60.319002 -17.539000
+ 16.059990 65.451002 -17.972000 16.059990 65.451002 -17.972000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826637.421100000 461227.344644000 5064829.134 ]
+3 [ 3826637.377700000 461227.392088000 5064829.162 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826648.961090000 461354.240645000 5064809.003 ]
+3 [ 3826648.917690000 461354.288089000 5064809.031 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS013-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS013-AntennaField.conf
index 7b1b6134b863f150e5891f956322aaf19d8938e9..6f07f4a09014ca92869c339f4b021b638bf17806 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS013-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS013-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS013
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:38
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:07
#
NORMAL_VECTOR LBA
@@ -15,157 +15,157 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826346.265120000 460792.110620000 5065087.136 ]
+3 [ 3826346.221730000 460792.158060000 5065087.164 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
- -1.338000 2.104999 0.814000 -1.338000 2.104999 0.814000
+ -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
+ -1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
- 2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
- 1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
+ 2.019000 0.243001 -1.538000 2.019000 0.243001 -1.538000
+ 1.338000 -2.104999 -0.814000 1.338000 -2.104999 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- 2.364000 -5.132000 -1.311000 2.364000 -5.132000 -1.311000
+ 2.364000 -5.131999 -1.311000 2.364000 -5.131999 -1.311000
-0.759000 -5.647000 1.081000 -0.759000 -5.647000 1.081000
- -3.528000 -3.521001 2.966000 -3.528000 -3.521001 2.966000
- -4.645000 0.252999 3.464000 -4.645000 0.252999 3.464000
- -3.589000 3.908999 2.341000 -3.589000 3.908999 2.341000
+ -3.528000 -3.521000 2.966000 -3.528000 -3.521000 2.966000
+ -4.645000 0.253000 3.464000 -4.645000 0.253000 3.464000
+ -3.589000 3.909000 2.341000 -3.589000 3.909000 2.341000
-0.853000 5.735000 0.122000 -0.853000 5.735000 0.122000
- 2.282000 4.878000 -2.153000 2.282000 4.878000 -2.153000
- 4.349000 1.739000 -3.421000 4.349000 1.739000 -3.421000
- 4.381000 -2.215000 -3.088000 4.381000 -2.215000 -3.088000
- 6.802000 -4.299000 -4.717000 6.802000 -4.299000 -4.717000
- 5.486000 -7.466000 -3.443000 5.486000 -7.466000 -3.443000
- 2.155000 -10.074000 -0.707000 2.155000 -10.074000 -0.707000
- -3.624000 -8.747001 3.511000 -3.624000 -8.747001 3.511000
- -5.751000 -6.778001 4.929000 -5.751000 -6.778001 4.929000
- -7.565000 -3.023001 5.952000 -7.565000 -3.023001 5.952000
- -7.377000 1.199999 5.429000 -7.377000 1.199999 5.429000
- -5.394000 6.283999 3.481000 -5.394000 6.283999 3.481000
- -2.685000 9.471999 1.159000 -2.685000 9.471999 1.159000
+ 2.282000 4.878001 -2.153000 2.282000 4.878001 -2.153000
+ 4.349000 1.739001 -3.421000 4.349000 1.739001 -3.421000
+ 4.381000 -2.214999 -3.088000 4.381000 -2.214999 -3.088000
+ 6.802000 -4.298999 -4.717000 6.802000 -4.298999 -4.717000
+ 5.486000 -7.465999 -3.443000 5.486000 -7.465999 -3.443000
+ 2.155000 -10.073999 -0.707000 2.155000 -10.073999 -0.707000
+ -3.624000 -8.747000 3.511000 -3.624000 -8.747000 3.511000
+ -5.751000 -6.778000 4.929000 -5.751000 -6.778000 4.929000
+ -7.565000 -3.023000 5.952000 -7.565000 -3.023000 5.952000
+ -7.377000 1.200000 5.429000 -7.377000 1.200000 5.429000
+ -5.394000 6.284000 3.481000 -5.394000 6.284000 3.481000
+ -2.685000 9.472000 1.159000 -2.685000 9.472000 1.159000
0.780000 9.948000 -1.484000 0.780000 9.948000 -1.484000
- 3.565000 7.907000 -3.391000 3.565000 7.907000 -3.391000
- 6.220000 4.201000 -5.048000 6.220000 4.201000 -5.048000
- 7.371000 -0.297000 -5.506000 7.371000 -0.297000 -5.506000
- 9.954000 -7.809000 -6.766000 9.954000 -7.809000 -6.766000
- 8.384000 -10.967000 -5.302000 8.384000 -10.967000 -5.302000
- 6.162000 -12.252000 -3.518000 6.162000 -12.252000 -3.518000
+ 3.565000 7.907001 -3.391000 3.565000 7.907001 -3.391000
+ 6.220000 4.201001 -5.048000 6.220000 4.201001 -5.048000
+ 7.371000 -0.296999 -5.506000 7.371000 -0.296999 -5.506000
+ 9.954000 -7.808999 -6.766000 9.954000 -7.808999 -6.766000
+ 8.384000 -10.966999 -5.302000 8.384000 -10.966999 -5.302000
+ 6.162000 -12.251999 -3.518000 6.162000 -12.251999 -3.518000
-0.152000 -13.128000 1.301000 -0.152000 -13.128000 1.301000
- -2.127000 -14.688001 2.924000 -2.127000 -14.688001 2.924000
- -6.827000 -9.732001 6.004000 -6.827000 -9.732001 6.004000
- -9.268000 -5.525001 7.456000 -9.268000 -5.525001 7.456000
+ -2.127000 -14.688000 2.924000 -2.127000 -14.688000 2.924000
+ -6.827000 -9.732000 6.004000 -6.827000 -9.732000 6.004000
+ -9.268000 -5.525000 7.456000 -9.268000 -5.525000 7.456000
-11.990000 -1.274001 9.115000 -11.990000 -1.274001 9.115000
-10.788000 1.634999 7.950000 -10.788000 1.634999 7.950000
-9.515000 6.010999 6.599000 -9.515000 6.010999 6.599000
- -6.022000 11.234999 3.505000 -6.022000 11.234999 3.505000
- -4.306000 12.894999 2.067000 -4.306000 12.894999 2.067000
+ -6.022000 11.235000 3.505000 -6.022000 11.235000 3.505000
+ -4.306000 12.895000 2.067000 -4.306000 12.895000 2.067000
-0.065000 13.217000 -1.146000 -0.065000 13.217000 -1.146000
- 3.084000 14.339000 -3.611000 3.084000 14.339000 -3.611000
- 8.659000 8.494000 -7.267000 8.659000 8.494000 -7.267000
- 10.195000 4.913000 -8.097000 10.195000 4.913000 -8.097000
+ 3.084000 14.339001 -3.611000 3.084000 14.339001 -3.611000
+ 8.659000 8.494001 -7.267000 8.659000 8.494001 -7.267000
+ 10.195000 4.913001 -8.097000 10.195000 4.913001 -8.097000
11.595000 -0.358999 -8.671000 11.595000 -0.358999 -8.671000
- -7.780010 64.586999 0.002000 -7.780010 64.586999 0.002000
- 51.520000 6.207004 -39.233000 51.520000 6.207004 -39.233000
- 14.224000 -3.588999 -10.352000 14.224000 -3.588999 -10.352000
- 15.691000 -6.145999 -11.222000 15.691000 -6.145999 -11.222000
- 8.279000 -18.063000 -4.582000 8.279000 -18.063000 -4.582000
- -4.581000 -18.591001 5.119000 -4.581000 -18.591001 5.119000
- -8.390000 -17.045001 7.838000 -8.390000 -17.045001 7.838000
--13.459000 -6.389002 10.680000 -13.459000 -6.389002 10.680000
--13.522000 6.845998 9.531000 -13.522000 6.845998 9.531000
+ -7.780010 64.587000 0.002000 -7.780010 64.587000 0.002000
+ 51.520000 6.207005 -39.233000 51.520000 6.207005 -39.233000
+ 14.224000 -3.588998 -10.352000 14.224000 -3.588998 -10.352000
+ 15.691000 -6.145998 -11.222000 15.691000 -6.145998 -11.222000
+ 8.279000 -18.062999 -4.582000 8.279000 -18.062999 -4.582000
+ -4.581000 -18.591000 5.119000 -4.581000 -18.591000 5.119000
+ -8.390000 -17.045000 7.838000 -8.390000 -17.045000 7.838000
+-13.459000 -6.389001 10.680000 -13.459000 -6.389001 10.680000
+-13.522000 6.845999 9.531000 -13.522000 6.845999 9.531000
-12.131000 14.491999 7.796000 -12.131000 14.491999 7.796000
- -1.097000 18.014999 -0.805000 -1.097000 18.014999 -0.805000
- 5.427000 18.232000 -5.721000 5.427000 18.232000 -5.721000
+ -1.097000 18.015000 -0.805000 -1.097000 18.015000 -0.805000
+ 5.427000 18.232001 -5.721000 5.427000 18.232001 -5.721000
11.432000 11.311001 -9.603000 11.432000 11.311001 -9.603000
- 17.909000 9.575001 -14.308000 17.909000 9.575001 -14.308000
- 19.953000 -3.272999 -14.681000 19.953000 -3.272999 -14.681000
- 16.842000 -15.289999 -11.260000 16.842000 -15.289999 -11.260000
- 13.673000 -19.923999 -8.463000 13.673000 -19.923999 -8.463000
- 8.509000 -24.999000 -4.128000 8.509000 -24.999000 -4.128000
- -5.559000 -22.465001 6.203000 -5.559000 -22.465001 6.203000
+ 17.909000 9.575002 -14.308000 17.909000 9.575002 -14.308000
+ 19.953000 -3.272998 -14.681000 19.953000 -3.272998 -14.681000
+ 16.842000 -15.289998 -11.260000 16.842000 -15.289998 -11.260000
+ 13.673000 -19.923998 -8.463000 13.673000 -19.923998 -8.463000
+ 8.509000 -24.998999 -4.128000 8.509000 -24.998999 -4.128000
+ -5.559000 -22.465000 6.203000 -5.559000 -22.465000 6.203000
-11.450000 -18.997001 10.311000 -11.450000 -18.997001 10.311000
--19.331000 -8.752002 15.301000 -19.331000 -8.752002 15.301000
+-19.331000 -8.752001 15.301000 -19.331000 -8.752001 15.301000
-19.869000 5.422998 14.424000 -19.869000 5.422998 14.424000
--18.025000 14.279998 12.239000 -18.025000 14.279998 12.239000
+-18.025000 14.279999 12.239000 -18.025000 14.279999 12.239000
-10.873000 21.379999 6.229000 -10.873000 21.379999 6.229000
1.023000 26.816000 -3.192000 1.023000 26.816000 -3.192000
- 14.212000 19.348001 -12.417000 14.212000 19.348001 -12.417000
- 24.668000 14.137002 -19.794000 24.668000 14.137002 -19.794000
- 25.123000 -0.724998 -18.792000 25.123000 -0.724998 -18.792000
- 22.679000 -14.796998 -15.685000 22.679000 -14.796998 -15.685000
- 20.222000 -21.997999 -13.191000 20.222000 -21.997999 -13.191000
- 7.169000 -30.652000 -2.611000 7.169000 -30.652000 -2.611000
- -7.125000 -32.377001 8.274000 -7.125000 -32.377001 8.274000
--15.985000 -26.441002 14.389000 -15.985000 -26.441002 14.389000
--18.672000 -17.549002 15.602000 -18.672000 -17.549002 15.602000
--26.614000 -6.273003 20.544000 -26.614000 -6.273003 20.544000
--25.737000 12.574997 18.182000 -25.737000 12.574997 18.182000
+ 14.212000 19.348002 -12.417000 14.212000 19.348002 -12.417000
+ 24.668000 14.137003 -19.794000 24.668000 14.137003 -19.794000
+ 25.123000 -0.724997 -18.792000 25.123000 -0.724997 -18.792000
+ 22.679000 -14.796997 -15.685000 22.679000 -14.796997 -15.685000
+ 20.222000 -21.997998 -13.191000 20.222000 -21.997998 -13.191000
+ 7.169000 -30.651999 -2.611000 7.169000 -30.651999 -2.611000
+ -7.125000 -32.377000 8.274000 -7.125000 -32.377000 8.274000
+-15.985000 -26.441001 14.389000 -15.985000 -26.441001 14.389000
+-18.672000 -17.549001 15.602000 -18.672000 -17.549001 15.602000
+-26.614000 -6.273002 20.544000 -26.614000 -6.273002 20.544000
+-25.737000 12.574998 18.182000 -25.737000 12.574998 18.182000
-22.461000 20.300998 15.025000 -22.461000 20.300998 15.025000
--13.535000 31.074998 7.351000 -13.535000 31.074998 7.351000
- -6.980000 31.481999 2.394000 -6.980000 31.481999 2.394000
- 9.526000 30.326000 -9.891000 9.526000 30.326000 -9.891000
- 13.031000 25.015001 -12.042000 13.031000 25.015001 -12.042000
- 16.768000 28.949001 -15.203000 16.768000 28.949001 -15.203000
- 33.368000 -5.313998 -24.566000 33.368000 -5.313998 -24.566000
- 24.293000 -27.622998 -15.738000 24.293000 -27.622998 -15.738000
- 12.093000 -39.823999 -5.478000 12.093000 -39.823999 -5.478000
+-13.535000 31.074999 7.351000 -13.535000 31.074999 7.351000
+ -6.980000 31.482000 2.394000 -6.980000 31.482000 2.394000
+ 9.526000 30.326001 -9.891000 9.526000 30.326001 -9.891000
+ 13.031000 25.015002 -12.042000 13.031000 25.015002 -12.042000
+ 16.768000 28.949002 -15.203000 16.768000 28.949002 -15.203000
+ 33.368000 -5.313996 -24.566000 33.368000 -5.313996 -24.566000
+ 24.293000 -27.622997 -15.738000 24.293000 -27.622997 -15.738000
+ 12.093010 -39.823998 -5.478000 12.093010 -39.823998 -5.478000
-0.758000 -40.093000 4.192000 -0.758000 -40.093000 4.192000
-30.677000 -12.969003 24.199000 -30.677000 -12.969003 24.199000
--28.718000 9.050997 20.738000 -28.718000 9.050997 20.738000
--27.383000 25.180997 18.278000 -27.383000 25.180997 18.278000
- 5.088000 37.759000 -7.232000 5.088000 37.759000 -7.232000
+-28.718000 9.050998 20.738000 -28.718000 9.050998 20.738000
+-27.383000 25.180998 18.278000 -27.383000 25.180998 18.278000
+ 5.088000 37.759001 -7.232000 5.088000 37.759001 -7.232000
]
HBA
-3 [ 3826360.529120000 460815.195621000 5065074.343 ]
+3 [ 3826360.485730000 460815.243062000 5065074.371 ]
48 x 2 x 3 [
--50.283010 48.846996 33.328000 -50.283010 48.846996 33.328000
--47.346010 52.249996 30.816000 -47.346010 52.249996 30.816000
--50.325010 41.595996 34.015000 -50.325010 41.595996 34.015000
--47.388010 44.998996 31.502000 -47.388010 44.998996 31.502000
--44.449010 48.401996 28.989000 -44.449010 48.401996 28.989000
+-50.283010 48.846995 33.328000 -50.283010 48.846995 33.328000
+-47.346010 52.249995 30.816000 -47.346010 52.249995 30.816000
+-50.325010 41.595995 34.015000 -50.325010 41.595995 34.015000
+-47.388010 44.998995 31.502000 -47.388010 44.998995 31.502000
+-44.449010 48.401995 28.989000 -44.449010 48.401995 28.989000
-41.512010 51.803996 26.477000 -41.512010 51.803996 26.477000
--50.367010 34.344996 34.702000 -50.367010 34.344996 34.702000
--47.429010 37.748996 32.189000 -47.429010 37.748996 32.189000
--44.492010 41.150996 29.677000 -44.492010 41.150996 29.677000
+-50.367010 34.344995 34.702000 -50.367010 34.344995 34.702000
+-47.429010 37.748995 32.189000 -47.429010 37.748995 32.189000
+-44.492010 41.150995 29.677000 -44.492010 41.150995 29.677000
-41.554010 44.553996 27.164000 -41.554010 44.553996 27.164000
--38.617010 47.956997 24.651000 -38.617010 47.956997 24.651000
--35.679010 51.359997 22.138000 -35.679010 51.359997 22.138000
--47.472010 30.496996 32.876000 -47.472010 30.496996 32.876000
--44.534010 33.899996 30.363000 -44.534010 33.899996 30.363000
+-38.617010 47.956996 24.651000 -38.617010 47.956996 24.651000
+-35.679010 51.359996 22.138000 -35.679010 51.359996 22.138000
+-47.472010 30.496995 32.876000 -47.472010 30.496995 32.876000
+-44.534010 33.899995 30.363000 -44.534010 33.899995 30.363000
-41.596010 37.302996 27.851000 -41.596010 37.302996 27.851000
--38.658010 40.705997 25.338000 -38.658010 40.705997 25.338000
--35.721010 44.108997 22.826000 -35.721010 44.108997 22.826000
+-38.658010 40.705996 25.338000 -38.658010 40.705996 25.338000
+-35.721010 44.108996 22.826000 -35.721010 44.108996 22.826000
-32.783010 47.512997 20.313000 -32.783010 47.512997 20.313000
-41.638010 30.052996 28.538000 -41.638010 30.052996 28.538000
--38.701010 33.455997 26.025000 -38.701010 33.455997 26.025000
--35.763010 36.858997 23.512000 -35.763010 36.858997 23.512000
+-38.701010 33.455996 26.025000 -38.701010 33.455996 26.025000
+-35.763010 36.858996 23.512000 -35.763010 36.858996 23.512000
-32.826010 40.261997 21.000000 -32.826010 40.261997 21.000000
--35.805010 29.607997 24.199000 -35.805010 29.607997 24.199000
+-35.805010 29.607996 24.199000 -35.805010 29.607996 24.199000
-32.867010 33.009997 21.687000 -32.867010 33.009997 21.687000
32.866000 -33.010997 -21.686000 32.866000 -33.010997 -21.686000
35.803000 -29.607997 -24.198000 35.803000 -29.607997 -24.198000
32.824000 -40.261997 -20.999000 32.824000 -40.261997 -20.999000
35.761000 -36.858997 -23.512000 35.761000 -36.858997 -23.512000
- 38.699000 -33.455997 -26.025000 38.699000 -33.455997 -26.025000
- 41.637000 -30.052997 -28.537000 41.637000 -30.052997 -28.537000
- 32.781000 -47.512997 -20.312000 32.781000 -47.512997 -20.312000
- 35.719000 -44.108997 -22.825000 35.719000 -44.108997 -22.825000
- 38.657000 -40.705997 -25.337000 38.657000 -40.705997 -25.337000
- 41.595000 -37.302997 -27.850000 41.595000 -37.302997 -27.850000
- 44.532000 -33.899996 -30.363000 44.532000 -33.899996 -30.363000
- 47.470000 -30.497996 -32.876000 47.470000 -30.497996 -32.876000
- 35.677000 -51.359997 -22.138000 35.677000 -51.359997 -22.138000
- 38.615000 -47.956997 -24.651000 38.615000 -47.956997 -24.651000
- 41.552000 -44.553997 -27.163000 41.552000 -44.553997 -27.163000
- 44.490000 -41.151996 -29.676000 44.490000 -41.151996 -29.676000
- 47.428000 -37.748996 -32.188000 47.428000 -37.748996 -32.188000
- 50.366000 -34.344996 -34.701000 50.366000 -34.344996 -34.701000
- 41.510000 -51.803997 -26.476000 41.510000 -51.803997 -26.476000
- 44.448000 -48.401996 -28.989000 44.448000 -48.401996 -28.989000
- 47.386000 -44.998996 -31.502000 47.386000 -44.998996 -31.502000
- 50.323000 -41.595996 -34.014000 50.323000 -41.595996 -34.014000
- 47.344000 -52.249996 -30.815000 47.344000 -52.249996 -30.815000
- 50.281000 -48.846996 -33.327000 50.281000 -48.846996 -33.327000
+ 38.699000 -33.455997 -26.024990 38.699000 -33.455997 -26.024990
+ 41.637000 -30.052996 -28.536990 41.637000 -30.052996 -28.536990
+ 32.781010 -47.512997 -20.312000 32.781010 -47.512997 -20.312000
+ 35.719010 -44.108997 -22.824990 35.719010 -44.108997 -22.824990
+ 38.657000 -40.705997 -25.336990 38.657000 -40.705997 -25.336990
+ 41.595000 -37.302996 -27.849990 41.595000 -37.302996 -27.849990
+ 44.532000 -33.899996 -30.362990 44.532000 -33.899996 -30.362990
+ 47.470000 -30.497996 -32.875990 47.470000 -30.497996 -32.875990
+ 35.677010 -51.359997 -22.137990 35.677010 -51.359997 -22.137990
+ 38.615010 -47.956997 -24.650990 38.615010 -47.956997 -24.650990
+ 41.552010 -44.553996 -27.162990 41.552010 -44.553996 -27.162990
+ 44.490010 -41.151996 -29.675990 44.490010 -41.151996 -29.675990
+ 47.428010 -37.748996 -32.187990 47.428010 -37.748996 -32.187990
+ 50.366000 -34.344995 -34.700990 50.366000 -34.344995 -34.700990
+ 41.510010 -51.803996 -26.475990 41.510010 -51.803996 -26.475990
+ 44.448010 -48.401996 -28.988990 44.448010 -48.401996 -28.988990
+ 47.386010 -44.998996 -31.501990 47.386010 -44.998996 -31.501990
+ 50.323010 -41.595995 -34.013990 50.323010 -41.595995 -34.013990
+ 47.344010 -52.249996 -30.814990 47.344010 -52.249996 -30.814990
+ 50.281010 -48.846995 -33.326990 50.281010 -48.846995 -33.326990
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826318.954110000 460856.124617000 5065101.850 ]
+3 [ 3826318.910720000 460856.172058000 5065101.878 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826402.103120000 460774.266624000 5065046.836 ]
+3 [ 3826402.059740000 460774.314066000 5065046.864 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS017-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS017-AntennaField.conf
index 5f6369b461fe443e015fc4f73d2f0a133c392b69..c689e55429febd2381f4d66d6cdf278aaf628c16 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS017-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS017-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS017
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:38
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:07
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826462.054070000 461501.949629000 5064935.827 ]
+3 [ 3826462.010670000 461501.997071000 5064935.855 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
@@ -25,8 +25,8 @@ LBA
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
-4.645000 0.253000 3.464000 -4.645000 0.253000 3.464000
- -3.589010 3.909000 2.341000 -3.589010 3.909000 2.341000
- -0.853010 5.736000 0.122000 -0.853010 5.736000 0.122000
+ -3.589000 3.909000 2.341000 -3.589000 3.909000 2.341000
+ -0.853000 5.736000 0.122000 -0.853000 5.736000 0.122000
2.281000 4.879000 -2.153000 2.281000 4.879000 -2.153000
4.349000 1.739000 -3.421000 4.349000 1.739000 -3.421000
4.381000 -2.215000 -3.088000 4.381000 -2.215000 -3.088000
@@ -35,10 +35,10 @@ LBA
-3.528000 -3.521000 2.966000 -3.528000 -3.521000 2.966000
-6.076000 -4.995001 5.012000 -6.076000 -4.995001 5.012000
-7.686000 -1.843001 5.936000 -7.686000 -1.843001 5.936000
- -7.993010 3.181999 5.712000 -7.993010 3.181999 5.712000
- -4.450010 8.698000 2.554000 -4.450010 8.698000 2.554000
- -2.114010 9.917000 0.690000 -2.114010 9.917000 0.690000
- 1.322990 9.824000 -1.881000 1.322990 9.824000 -1.881000
+ -7.993000 3.181999 5.712000 -7.993000 3.181999 5.712000
+ -4.450000 8.698000 2.554000 -4.450000 8.698000 2.554000
+ -2.114000 9.917000 0.690000 -2.114000 9.917000 0.690000
+ 1.323000 9.824000 -1.881000 1.323000 9.824000 -1.881000
4.179000 7.311000 -3.797000 4.179000 7.311000 -3.797000
6.821000 2.390001 -5.336000 6.821000 2.390001 -5.336000
7.813000 -2.279999 -5.659000 7.813000 -2.279999 -5.659000
@@ -48,124 +48,124 @@ LBA
-3.547000 -7.798000 3.367000 -3.547000 -7.798000 3.367000
-9.950000 -6.480001 8.054000 -9.950000 -6.480001 8.054000
-11.437000 -3.058001 8.861000 -11.437000 -3.058001 8.861000
--11.325010 0.044999 8.497000 -11.325010 0.044999 8.497000
- -9.075010 7.343999 6.148000 -9.075010 7.343999 6.148000
- -9.265010 10.329999 6.021000 -9.265010 10.329999 6.021000
- -3.685010 12.696000 1.618000 -3.685010 12.696000 1.618000
- 0.350990 13.032000 -1.442000 0.350990 13.032000 -1.442000
- 4.545990 13.647000 -4.646000 4.545990 13.647000 -4.646000
- 6.027990 10.756000 -5.497000 6.027990 10.756000 -5.497000
+-11.325000 0.044999 8.497000 -11.325000 0.044999 8.497000
+ -9.075000 7.343999 6.148000 -9.075000 7.343999 6.148000
+ -9.265000 10.329999 6.021000 -9.265000 10.329999 6.021000
+ -3.685000 12.696000 1.618000 -3.685000 12.696000 1.618000
+ 0.351000 13.032000 -1.442000 0.351000 13.032000 -1.442000
+ 4.546000 13.647000 -4.646000 4.546000 13.647000 -4.646000
+ 6.028000 10.756001 -5.497000 6.028000 10.756001 -5.497000
8.498000 6.990001 -7.011000 8.498000 6.990001 -7.011000
- 10.553000 0.360001 -7.954000 10.553000 0.360001 -7.954000
- 10.932000 -2.401999 -7.988000 10.932000 -2.401999 -7.988000
+ 10.553000 0.360001 -7.953990 10.553000 0.360001 -7.953990
+ 10.932000 -2.401999 -7.987990 10.932000 -2.401999 -7.987990
9.235000 -7.157999 -6.285000 9.235000 -7.157999 -6.285000
8.589000 -11.172999 -5.437000 8.589000 -11.172999 -5.437000
1.992000 -13.997000 -0.230000 1.992000 -13.997000 -0.230000
-1.199000 -13.698000 2.138000 -1.199000 -13.698000 2.138000
- -5.504000 -12.327000 5.246000 -5.504000 -12.327000 5.246000
--48.509010 26.920996 33.979000 -48.509010 26.920996 33.979000
- 19.023990 59.040002 -19.616000 19.023990 59.040002 -19.616000
+ -5.504000 -12.327001 5.246000 -5.504000 -12.327001 5.246000
+-48.509010 26.920995 33.979000 -48.509010 26.920995 33.979000
+ 19.023990 59.040002 -19.615990 19.023990 59.040002 -19.615990
-8.945000 -13.399001 7.925000 -8.945000 -13.399001 7.925000
-11.391000 -13.586001 9.778000 -11.391000 -13.586001 9.778000
--16.331010 0.935999 12.174000 -16.331010 0.935999 12.174000
--10.872010 15.114999 6.795000 -10.872010 15.114999 6.795000
- -8.069010 18.382999 4.395000 -8.069010 18.382999 4.395000
- 1.648990 18.030000 -2.868000 1.648990 18.030000 -2.868000
+-16.331000 0.935998 12.174000 -16.331000 0.935998 12.174000
+-10.872000 15.114999 6.795000 -10.872000 15.114999 6.795000
+ -8.069000 18.382999 4.395000 -8.069000 18.382999 4.395000
+ 1.649000 18.030000 -2.868000 1.649000 18.030000 -2.868000
10.895000 10.860001 -9.159000 10.895000 10.860001 -9.159000
- 15.590000 5.177001 -12.170000 15.590000 5.177001 -12.170000
- 13.044000 -8.666999 -9.008000 13.044000 -8.666999 -9.008000
- 10.239000 -15.831999 -6.254000 10.239000 -15.831999 -6.254000
+ 15.590000 5.177001 -12.169990 15.590000 5.177001 -12.169990
+ 13.044000 -8.666999 -9.007990 13.044000 -8.666999 -9.007990
+ 10.239000 -15.831999 -6.253990 10.239000 -15.831999 -6.253990
2.697000 -18.531000 -0.350000 2.697000 -18.531000 -0.350000
-1.447000 -24.579000 3.308000 -1.447000 -24.579000 3.308000
-11.320000 -19.760001 10.283000 -11.320000 -19.760001 10.283000
-18.280000 -9.828002 14.610000 -18.280000 -9.828002 14.610000
--20.073010 -3.872002 15.417000 -20.073010 -3.872002 15.417000
--21.266010 4.480998 15.558000 -21.266010 4.480998 15.558000
--13.128010 18.288999 8.201000 -13.128010 18.288999 8.201000
- -8.042010 22.754999 3.980000 -8.042010 22.754999 3.980000
- 2.663990 25.664000 -4.320000 2.663990 25.664000 -4.320000
- 12.780990 18.495001 -11.265000 12.780990 18.495001 -11.265000
- 18.113000 11.657001 -14.650000 18.113000 11.657001 -14.650000
- 19.817000 0.051002 -14.879000 19.817000 0.051002 -14.879000
- 18.213000 -15.769998 -12.245000 18.213000 -15.769998 -12.245000
+-20.073000 -3.872002 15.417000 -20.073000 -3.872002 15.417000
+-21.266000 4.480998 15.558000 -21.266000 4.480998 15.558000
+-13.128000 18.288999 8.201000 -13.128000 18.288999 8.201000
+ -8.042000 22.754999 3.980000 -8.042000 22.754999 3.980000
+ 2.664000 25.664000 -4.320000 2.664000 25.664000 -4.320000
+ 12.781000 18.495001 -11.264990 12.781000 18.495001 -11.264990
+ 18.113000 11.657002 -14.649990 18.113000 11.657002 -14.649990
+ 19.817000 0.051002 -14.878990 19.817000 0.051002 -14.878990
+ 18.213000 -15.769998 -12.244990 18.213000 -15.769998 -12.244990
7.037000 -25.933999 -2.938000 7.037000 -25.933999 -2.938000
-1.331000 -34.376000 4.106000 -1.331000 -34.376000 4.106000
-11.892000 -26.735001 11.343000 -11.892000 -26.735001 11.343000
-20.585000 -16.400002 16.934000 -20.585000 -16.400002 16.934000
-24.481000 -9.809002 19.262000 -24.481000 -9.809002 19.262000
--24.596010 9.022998 17.646000 -24.596010 9.022998 17.646000
--19.322010 25.400998 12.207000 -19.322010 25.400998 12.207000
--11.173010 31.720999 5.519000 -11.173010 31.720999 5.519000
- -3.762010 29.764000 0.134000 -3.762010 29.764000 0.134000
- 7.693990 32.171001 -8.683000 7.693990 32.171001 -8.683000
- 20.417990 20.923002 -17.217000 20.417990 20.923002 -17.217000
- 24.319000 13.153002 -19.443000 24.319000 13.153002 -19.443000
- 27.772000 -2.374998 -20.631000 27.772000 -2.374998 -20.631000
- 25.092000 -9.677998 -17.960000 25.092000 -9.677998 -17.960000
- 16.807000 -26.871999 -10.187000 16.807000 -26.871999 -10.187000
- 11.514000 -27.751999 -6.134000 11.514000 -27.751999 -6.134000
- 12.565000 -33.940999 -6.364000 12.565000 -33.940999 -6.364000
+-24.596000 9.022998 17.646000 -24.596000 9.022998 17.646000
+-19.322000 25.400998 12.207000 -19.322000 25.400998 12.207000
+-11.173000 31.720999 5.519000 -11.173000 31.720999 5.519000
+ -3.762000 29.764000 0.134000 -3.762000 29.764000 0.134000
+ 7.694000 32.171001 -8.683000 7.694000 32.171001 -8.683000
+ 20.418000 20.923002 -17.216990 20.418000 20.923002 -17.216990
+ 24.319000 13.153002 -19.442990 24.319000 13.153002 -19.442990
+ 27.772000 -2.374997 -20.630990 27.772000 -2.374997 -20.630990
+ 25.092000 -9.677998 -17.959990 25.092000 -9.677998 -17.959990
+ 16.807000 -26.871998 -10.186990 16.807000 -26.871998 -10.186990
+ 11.514000 -27.751999 -6.133990 11.514000 -27.751999 -6.133990
+ 12.565000 -33.940999 -6.363990 12.565000 -33.940999 -6.363990
-18.819000 -33.129002 17.120000 -18.819000 -33.129002 17.120000
-30.251000 -11.129003 23.713000 -30.251000 -11.129003 23.713000
--33.212010 8.719997 24.142000 -33.212010 8.719997 24.142000
--27.582010 22.743998 18.648000 -27.582010 22.743998 18.648000
- 4.868990 40.221000 -7.290000 4.868990 40.221000 -7.290000
- 19.315990 26.068002 -16.855000 19.315990 26.068002 -16.855000
- 29.945000 15.805002 -23.906000 29.945000 15.805002 -23.906000
- 23.991000 -26.147998 -15.645000 23.991000 -26.147998 -15.645000
+-33.212000 8.719997 24.142000 -33.212000 8.719997 24.142000
+-27.582000 22.743997 18.648000 -27.582000 22.743997 18.648000
+ 4.869000 40.221000 -7.290000 4.869000 40.221000 -7.290000
+ 19.316000 26.068002 -16.854990 19.316000 26.068002 -16.854990
+ 29.945000 15.805003 -23.905990 29.945000 15.805003 -23.905990
+ 23.991000 -26.147998 -15.644990 23.991000 -26.147998 -15.644990
]
HBA
-3 [ 3826452.439060000 461529.978628000 5064940.511 ]
+3 [ 3826452.395670000 461530.026070000 5064940.539 ]
48 x 2 x 3 [
-57.340000 -17.783005 44.647000 -57.340000 -17.783005 44.647000
--55.314000 -13.451005 42.735000 -55.314000 -13.451005 42.735000
+-55.314010 -13.451005 42.735000 -55.314010 -13.451005 42.735000
-55.772000 -24.875005 44.111000 -55.772000 -24.875005 44.111000
--53.747000 -20.544004 42.200000 -53.747000 -20.544004 42.200000
--51.721000 -16.212004 40.288000 -51.721000 -16.212004 40.288000
--49.695000 -11.881004 38.375000 -49.695000 -11.881004 38.375000
--54.205000 -31.967004 43.576000 -54.205000 -31.967004 43.576000
--52.179000 -27.636004 41.664000 -52.179000 -27.636004 41.664000
--50.153000 -23.305004 39.752000 -50.153000 -23.305004 39.752000
--48.128000 -18.973004 37.840000 -48.128000 -18.973004 37.840000
+-53.747000 -20.544005 42.200000 -53.747000 -20.544005 42.200000
+-51.721000 -16.212005 40.288000 -51.721000 -16.212005 40.288000
+-49.695000 -11.881005 38.375000 -49.695000 -11.881005 38.375000
+-54.205000 -31.967005 43.576000 -54.205000 -31.967005 43.576000
+-52.179000 -27.636005 41.664000 -52.179000 -27.636005 41.664000
+-50.153000 -23.305005 39.752000 -50.153000 -23.305005 39.752000
+-48.128000 -18.973005 37.840000 -48.128000 -18.973005 37.840000
-46.102000 -14.641004 35.928000 -46.102000 -14.641004 35.928000
-44.076000 -10.309004 34.016000 -44.076000 -10.309004 34.016000
--50.612000 -34.728004 41.129000 -50.612000 -34.728004 41.129000
--48.586000 -30.397004 39.217000 -48.586000 -30.397004 39.217000
+-50.612000 -34.728005 41.129000 -50.612000 -34.728005 41.129000
+-48.586000 -30.397005 39.217000 -48.586000 -30.397005 39.217000
-46.560000 -26.065004 37.304000 -46.560000 -26.065004 37.304000
-44.535000 -21.733004 35.393000 -44.535000 -21.733004 35.393000
--42.509000 -17.402003 33.481000 -42.509000 -17.402003 33.481000
--40.483000 -13.070003 31.568000 -40.483000 -13.070003 31.568000
+-42.509000 -17.402004 33.481000 -42.509000 -17.402004 33.481000
+-40.483000 -13.070004 31.568000 -40.483000 -13.070004 31.568000
-44.993000 -33.157004 36.769000 -44.993000 -33.157004 36.769000
--42.967000 -28.826003 34.857000 -42.967000 -28.826003 34.857000
--40.941000 -24.494003 32.945000 -40.941000 -24.494003 32.945000
--38.916000 -20.163003 31.033000 -38.916000 -20.163003 31.033000
--39.374000 -31.587003 32.410000 -39.374000 -31.587003 32.410000
--37.348000 -27.255003 30.497000 -37.348000 -27.255003 30.497000
- 37.348000 27.255003 -30.498000 37.348000 27.255003 -30.498000
- 39.374000 31.587003 -32.410000 39.374000 31.587003 -32.410000
- 38.916000 20.163003 -31.033000 38.916000 20.163003 -31.033000
- 40.941000 24.494004 -32.945000 40.941000 24.494004 -32.945000
- 42.967000 28.826004 -34.857000 42.967000 28.826004 -34.857000
- 44.993000 33.157004 -36.770000 44.993000 33.157004 -36.770000
- 40.483000 13.070004 -31.569000 40.483000 13.070004 -31.569000
- 42.509000 17.402004 -33.481000 42.509000 17.402004 -33.481000
- 44.535000 21.733004 -35.393000 44.535000 21.733004 -35.393000
- 46.560000 26.065004 -37.305000 46.560000 26.065004 -37.305000
- 48.586000 30.397004 -39.217000 48.586000 30.397004 -39.217000
- 50.612000 34.729004 -41.129000 50.612000 34.729004 -41.129000
- 44.076000 10.309004 -34.016000 44.076000 10.309004 -34.016000
- 46.102000 14.641004 -35.928000 46.102000 14.641004 -35.928000
- 48.128000 18.973004 -37.840000 48.128000 18.973004 -37.840000
- 50.153000 23.305004 -39.752000 50.153000 23.305004 -39.752000
- 52.179000 27.636005 -41.664000 52.179000 27.636005 -41.664000
- 54.205000 31.968005 -43.577000 54.205000 31.968005 -43.577000
- 49.695000 11.881004 -38.376000 49.695000 11.881004 -38.376000
- 51.721000 16.212004 -40.288000 51.721000 16.212004 -40.288000
- 53.746000 20.544005 -42.200000 53.746000 20.544005 -42.200000
- 55.772000 24.875005 -44.112000 55.772000 24.875005 -44.112000
- 55.313000 13.451005 -42.735000 55.313000 13.451005 -42.735000
- 57.339000 17.783005 -44.647000 57.339000 17.783005 -44.647000
+-42.967000 -28.826004 34.857000 -42.967000 -28.826004 34.857000
+-40.941000 -24.494004 32.945000 -40.941000 -24.494004 32.945000
+-38.916000 -20.163004 31.033000 -38.916000 -20.163004 31.033000
+-39.374000 -31.587004 32.410000 -39.374000 -31.587004 32.410000
+-37.348000 -27.255004 30.497000 -37.348000 -27.255004 30.497000
+ 37.348000 27.255004 -30.497990 37.348000 27.255004 -30.497990
+ 39.374000 31.587004 -32.409990 39.374000 31.587004 -32.409990
+ 38.916000 20.163004 -31.032990 38.916000 20.163004 -31.032990
+ 40.941000 24.494004 -32.944990 40.941000 24.494004 -32.944990
+ 42.967000 28.826004 -34.856990 42.967000 28.826004 -34.856990
+ 44.993000 33.157004 -36.769990 44.993000 33.157004 -36.769990
+ 40.483000 13.070004 -31.568990 40.483000 13.070004 -31.568990
+ 42.509000 17.402004 -33.480990 42.509000 17.402004 -33.480990
+ 44.535000 21.733004 -35.392990 44.535000 21.733004 -35.392990
+ 46.560000 26.065004 -37.304990 46.560000 26.065004 -37.304990
+ 48.586000 30.397005 -39.216990 48.586000 30.397005 -39.216990
+ 50.612000 34.729005 -41.128990 50.612000 34.729005 -41.128990
+ 44.076000 10.309004 -34.015990 44.076000 10.309004 -34.015990
+ 46.102000 14.641004 -35.927990 46.102000 14.641004 -35.927990
+ 48.128000 18.973005 -37.839990 48.128000 18.973005 -37.839990
+ 50.153000 23.305005 -39.751990 50.153000 23.305005 -39.751990
+ 52.179000 27.636005 -41.663990 52.179000 27.636005 -41.663990
+ 54.205000 31.968005 -43.576990 54.205000 31.968005 -43.576990
+ 49.695000 11.881005 -38.375990 49.695000 11.881005 -38.375990
+ 51.721000 16.212005 -40.287990 51.721000 16.212005 -40.287990
+ 53.746000 20.544005 -42.199990 53.746000 20.544005 -42.199990
+ 55.772000 24.875005 -44.111990 55.772000 24.875005 -44.111990
+ 55.313000 13.451005 -42.734990 55.313000 13.451005 -42.734990
+ 57.339000 17.783005 -44.646990 57.339000 17.783005 -44.646990
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826405.095060000 461507.459624000 5064978.083 ]
+3 [ 3826405.051670000 461507.507066000 5064978.111 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826499.783060000 461552.497632000 5064902.938 ]
+3 [ 3826499.739670000 461552.545075000 5064902.966 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS021-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS021-AntennaField.conf
index 44112e39d5e95f1d34ed99340e2b7102b5ee16f4..bb046bc9d963b2759e981adcac591d9df2e4b373 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS021-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS021-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS021
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:38
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:07
#
NORMAL_VECTOR LBA
@@ -15,157 +15,157 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826406.543140000 460538.603625000 5065064.870 ]
+3 [ 3826406.499760000 460538.651066000 5065064.898 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
- 0.800000 2.363000 -0.813990 0.800000 2.363000 -0.813990
- 2.019000 0.243000 -1.537990 2.019000 0.243000 -1.537990
- 1.338000 -2.105000 -0.813990 1.338000 -2.105000 -0.813990
+ 0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
+ 2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
+ 1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- 4.124000 -2.937000 -2.829990 4.124000 -2.937000 -2.829990
- 1.784000 -5.454000 -0.845990 1.784000 -5.454000 -0.845990
+ 4.124000 -2.936999 -2.830000 4.124000 -2.936999 -2.830000
+ 1.784000 -5.454000 -0.846000 1.784000 -5.454000 -0.846000
-1.390000 -5.418000 1.533000 -1.390000 -5.418000 1.533000
- -3.914000 -2.848001 3.196000 -3.914000 -2.848001 3.196000
- -4.606000 1.055999 3.362000 -4.606000 1.055999 3.362000
+ -3.914000 -2.848000 3.196000 -3.914000 -2.848000 3.196000
+ -4.606000 1.056000 3.362000 -4.606000 1.056000 3.362000
-3.143000 4.464000 1.956000 -3.143000 4.464000 1.956000
-0.210000 5.784000 -0.365000 -0.210000 5.784000 -0.365000
- 2.822000 4.398000 -2.515990 2.822000 4.398000 -2.515990
- 4.534000 0.954000 -3.488990 4.534000 0.954000 -3.488990
- 7.405000 0.725000 -5.623990 7.405000 0.725000 -5.623990
- 7.678000 -2.920000 -5.498990 7.678000 -2.920000 -5.498990
- 6.058000 -7.407000 -3.877990 6.058000 -7.407000 -3.877990
- 0.758000 -10.065000 0.340010 0.758000 -10.065000 0.340010
+ 2.822000 4.398001 -2.516000 2.822000 4.398001 -2.516000
+ 4.534000 0.954001 -3.489000 4.534000 0.954001 -3.489000
+ 7.405000 0.725001 -5.624000 7.405000 0.725001 -5.624000
+ 7.678000 -2.919999 -5.499000 7.678000 -2.919999 -5.499000
+ 6.058000 -7.406999 -3.878000 6.058000 -7.406999 -3.878000
+ 0.758000 -10.065000 0.340000 0.758000 -10.065000 0.340000
-1.824000 -9.742000 2.250000 -1.824000 -9.742000 2.250000
- -4.911000 -7.649001 4.378000 -4.911000 -7.649001 4.378000
- -6.556000 -3.823001 5.267000 -6.556000 -3.823001 5.267000
- -7.098000 1.943999 5.152000 -7.098000 1.943999 5.152000
- -6.237000 6.529999 4.092000 -6.237000 6.529999 4.092000
+ -4.911000 -7.649000 4.378000 -4.911000 -7.649000 4.378000
+ -6.556000 -3.823000 5.267000 -6.556000 -3.823000 5.267000
+ -7.098000 1.944000 5.152000 -7.098000 1.944000 5.152000
+ -6.237000 6.530000 4.092000 -6.237000 6.530000 4.092000
-3.600000 9.237000 1.867000 -3.600000 9.237000 1.867000
-0.448000 9.288000 -0.503000 -0.448000 9.288000 -0.503000
- 3.306000 7.793000 -3.185990 3.306000 7.793000 -3.185990
- 6.166000 4.611000 -5.044990 6.166000 4.611000 -5.044990
- 11.484000 -0.268999 -8.595990 11.484000 -0.268999 -8.595990
- 11.543000 -4.073999 -8.295990 11.543000 -4.073999 -8.295990
- 10.271000 -6.667999 -7.106990 10.271000 -6.667999 -7.106990
- 5.471000 -11.611000 -3.056990 5.471000 -11.611000 -3.056990
- 4.516000 -14.282000 -2.098990 4.516000 -14.282000 -2.098990
+ 3.306000 7.793001 -3.186000 3.306000 7.793001 -3.186000
+ 6.166000 4.611001 -5.045000 6.166000 4.611001 -5.045000
+ 11.484000 -0.268999 -8.596000 11.484000 -0.268999 -8.596000
+ 11.543000 -4.073999 -8.296000 11.543000 -4.073999 -8.296000
+ 10.271000 -6.667999 -7.107000 10.271000 -6.667999 -7.107000
+ 5.471000 -11.610999 -3.057000 5.471000 -11.610999 -3.057000
+ 4.516000 -14.281999 -2.099000 4.516000 -14.281999 -2.099000
-1.446000 -13.045000 2.265000 -1.446000 -13.045000 2.265000
- -5.240000 -10.970001 4.924000 -5.240000 -10.970001 4.924000
+ -5.240000 -10.970000 4.924000 -5.240000 -10.970000 4.924000
-9.281000 -9.041001 7.784000 -9.281000 -9.041001 7.784000
-9.536000 -5.696001 7.673000 -9.536000 -5.696001 7.673000
-10.358000 -1.018001 7.867000 -10.358000 -1.018001 7.867000
-9.723000 5.869999 6.767000 -9.723000 5.869999 6.767000
-9.024000 8.458999 6.009000 -9.024000 8.458999 6.009000
- -5.686000 11.544999 3.224000 -5.686000 11.544999 3.224000
+ -5.686000 11.545000 3.224000 -5.686000 11.545000 3.224000
-3.584000 14.609000 1.369000 -3.584000 14.609000 1.369000
- 3.475000 13.169000 -3.798990 3.475000 13.169000 -3.798990
- 6.260000 11.045000 -5.697990 6.260000 11.045000 -5.697990
- 9.654000 7.349001 -7.909990 9.654000 7.349001 -7.909990
- 48.168010 -27.943996 -33.629990 48.168010 -27.943996 -33.629990
--19.865990 -58.559002 20.204000 -19.865990 -58.559002 20.204000
- 13.184000 6.254001 -10.460990 13.184000 6.254001 -10.460990
- 15.476000 4.981001 -12.066990 15.476000 4.981001 -12.066990
- 14.481010 -10.364999 -9.932990 14.481010 -10.364999 -9.932990
- 4.170010 -19.327000 -1.382990 4.170010 -19.327000 -1.382990
- 0.390010 -20.489000 1.559010 0.390010 -20.489000 1.559010
- -8.305000 -14.496001 7.544000 -8.305000 -14.496001 7.544000
+ 3.475000 13.169001 -3.799000 3.475000 13.169001 -3.799000
+ 6.260000 11.045001 -5.698000 6.260000 11.045001 -5.698000
+ 9.654000 7.349001 -7.910000 9.654000 7.349001 -7.910000
+ 48.168000 -27.943995 -33.630000 48.168000 -27.943995 -33.630000
+-19.866000 -58.559002 20.204000 -19.866000 -58.559002 20.204000
+ 13.184000 6.254002 -10.461000 13.184000 6.254002 -10.461000
+ 15.476000 4.981002 -12.067000 15.476000 4.981002 -12.067000
+ 14.481000 -10.364998 -9.933000 14.481000 -10.364998 -9.933000
+ 4.170000 -19.326999 -1.383000 4.170000 -19.326999 -1.383000
+ 0.390000 -20.489000 1.559000 0.390000 -20.489000 1.559000
+ -8.305000 -14.496000 7.544000 -8.305000 -14.496000 7.544000
-13.997000 -2.934001 10.772000 -13.997000 -2.934001 10.772000
--16.115000 4.687998 11.673000 -16.115000 4.687998 11.673000
+-16.115000 4.687999 11.673000 -16.115000 4.687999 11.673000
-8.577000 15.068999 5.076000 -8.577000 15.068999 5.076000
-3.323000 19.571000 0.726000 -3.323000 19.571000 0.726000
- 4.546000 17.471000 -4.991990 4.546000 17.471000 -4.991990
- 10.593000 20.230001 -9.779990 10.593000 20.230001 -9.779990
- 17.743000 10.317001 -14.249990 17.743000 10.317001 -14.249990
- 20.316000 -2.273998 -15.043990 20.316000 -2.273998 -15.043990
- 19.695010 -8.431999 -14.020990 19.695010 -8.431999 -14.020990
- 17.626010 -16.293999 -11.757990 17.626010 -16.293999 -11.757990
- 5.019010 -23.369000 -1.654990 5.019010 -23.369000 -1.654990
- -1.285990 -24.222000 3.155010 -1.285990 -24.222000 3.155010
+ 4.546000 17.471001 -4.992000 4.546000 17.471001 -4.992000
+ 10.593000 20.230001 -9.780000 10.593000 20.230001 -9.780000
+ 17.743000 10.317002 -14.250000 17.743000 10.317002 -14.250000
+ 20.316000 -2.273998 -15.044000 20.316000 -2.273998 -15.044000
+ 19.695000 -8.431998 -14.021000 19.695000 -8.431998 -14.021000
+ 17.626000 -16.293998 -11.758000 17.626000 -16.293998 -11.758000
+ 5.019000 -23.368999 -1.655000 5.019000 -23.368999 -1.655000
+ -1.286000 -24.222000 3.155000 -1.286000 -24.222000 3.155000
-12.110000 -20.448001 10.938000 -12.110000 -20.448001 10.938000
--18.592000 -8.377002 14.712000 -18.592000 -8.377002 14.712000
+-18.592000 -8.377001 14.712000 -18.592000 -8.377001 14.712000
-20.854000 0.607998 15.599000 -20.854000 0.607998 15.599000
--18.020000 11.557998 12.481000 -18.020000 11.557998 12.481000
--10.590000 24.186999 5.763000 -10.590000 24.186999 5.763000
- 3.400000 26.356000 -4.933990 3.400000 26.356000 -4.933990
- 14.187000 28.697001 -13.242990 14.187000 28.697001 -13.242990
- 20.894000 15.967002 -17.125990 20.894000 15.967002 -17.125990
- 24.888000 2.015002 -18.862990 24.888000 2.015002 -18.862990
- 25.944010 -5.921998 -18.938990 25.944010 -5.921998 -18.938990
- 18.936010 -22.134999 -12.212990 18.936010 -22.134999 -12.212990
- 7.960010 -33.093999 -2.983990 7.960010 -33.093999 -2.983990
- -1.829990 -33.746000 4.424010 -1.829990 -33.746000 4.424010
- -7.820990 -27.725001 8.376000 -7.820990 -27.725001 8.376000
+-18.020000 11.557999 12.481000 -18.020000 11.557999 12.481000
+-10.590010 24.186999 5.763000 -10.590010 24.186999 5.763000
+ 3.400000 26.356001 -4.934000 3.400000 26.356001 -4.934000
+ 14.187000 28.697002 -13.243000 14.187000 28.697002 -13.243000
+ 20.894000 15.967002 -17.126000 20.894000 15.967002 -17.126000
+ 24.888000 2.015003 -18.863000 24.888000 2.015003 -18.863000
+ 25.944000 -5.921997 -18.939000 25.944000 -5.921997 -18.939000
+ 18.936000 -22.134998 -12.213000 18.936000 -22.134998 -12.213000
+ 7.960000 -33.093999 -2.984000 7.960000 -33.093999 -2.984000
+ -1.830000 -33.746000 4.424000 -1.830000 -33.746000 4.424000
+ -7.821000 -27.725000 8.376000 -7.821000 -27.725000 8.376000
-19.134000 -23.088002 16.449000 -19.134000 -23.088002 16.449000
-26.447000 -5.985002 20.392000 -26.447000 -5.985002 20.392000
-27.055000 2.954998 20.041000 -27.055000 2.954998 20.041000
--24.334000 18.299998 16.611000 -24.334000 18.299998 16.611000
--19.135000 22.987998 12.286000 -19.135000 22.987998 12.286000
- -5.118000 32.882999 0.870000 -5.118000 32.882999 0.870000
- 0.017000 30.544000 -2.773000 0.017000 30.544000 -2.773000
- 1.402000 36.462000 -4.348000 1.402000 36.462000 -4.348000
- 29.605000 17.393002 -23.793990 29.605000 17.393002 -23.793990
- 31.678010 -8.162998 -23.039990 31.678010 -8.162998 -23.039990
- 26.881010 -26.922998 -17.743990 26.881010 -26.922998 -17.743990
- 16.465010 -35.649999 -9.136990 16.465010 -35.649999 -9.136990
--19.608990 -31.644002 17.579000 -19.608990 -31.644002 17.579000
+-24.334010 18.299998 16.611000 -24.334010 18.299998 16.611000
+-19.135010 22.987998 12.286000 -19.135010 22.987998 12.286000
+ -5.118010 32.883000 0.870000 -5.118010 32.883000 0.870000
+ 0.016990 30.544000 -2.773000 0.016990 30.544000 -2.773000
+ 1.401990 36.462000 -4.348000 1.401990 36.462000 -4.348000
+ 29.605000 17.393003 -23.794000 29.605000 17.393003 -23.794000
+ 31.678000 -8.162997 -23.040000 31.678000 -8.162997 -23.040000
+ 26.881000 -26.922997 -17.744000 26.881000 -26.922997 -17.744000
+ 16.465000 -35.649998 -9.137000 16.465000 -35.649998 -9.137000
+-19.609000 -31.644002 17.579000 -19.609000 -31.644002 17.579000
-27.387000 -11.043002 21.556000 -27.387000 -11.043002 21.556000
-33.167000 3.980997 24.536000 -33.167000 3.980997 24.536000
--11.923000 36.466999 5.653000 -11.923000 36.466999 5.653000
+-11.923010 36.466999 5.653000 -11.923010 36.466999 5.653000
]
HBA
-3 [ 3826416.158150000 460510.575626000 5065060.187 ]
+3 [ 3826416.114760000 460510.623067000 5065060.215 ]
48 x 2 x 3 [
- 40.321000 32.724003 -33.224000 40.321000 32.724003 -33.224000
- 43.872000 35.095003 -36.104000 43.872000 35.095003 -36.104000
- 38.870000 25.797003 -31.509000 38.870000 25.797003 -31.509000
- 42.420000 28.167003 -34.388000 42.420000 28.167003 -34.388000
- 45.971000 30.538004 -37.268000 45.971000 30.538004 -37.268000
- 49.522000 32.909004 -40.148000 49.522000 32.909004 -40.148000
- 37.418000 18.868003 -29.792000 37.418000 18.868003 -29.792000
- 40.968000 21.240003 -32.672000 40.968000 21.240003 -32.672000
- 44.519000 23.611003 -35.552000 44.519000 23.611003 -35.552000
- 48.070000 25.982004 -38.431000 48.070000 25.982004 -38.431000
- 51.621000 28.352004 -41.311000 51.621000 28.352004 -41.311000
- 55.172000 30.724004 -44.191000 55.172000 30.724004 -44.191000
- 39.516000 14.312003 -30.956000 39.516000 14.312003 -30.956000
- 43.067000 16.683003 -33.836000 43.067000 16.683003 -33.836000
- 46.618000 19.054004 -36.715000 46.618000 19.054004 -36.715000
- 50.169000 21.425004 -39.595000 50.169000 21.425004 -39.595000
- 53.720000 23.796004 -42.474000 53.720000 23.796004 -42.474000
- 57.270000 26.167004 -45.354000 57.270000 26.167004 -45.354000
- 45.166000 12.127003 -34.999000 45.166000 12.127003 -34.999000
- 48.717000 14.497004 -37.879000 48.717000 14.497004 -37.879000
- 52.268000 16.868004 -40.758000 52.268000 16.868004 -40.758000
- 55.818000 19.239004 -43.638000 55.818000 19.239004 -43.638000
- 50.816000 9.941004 -39.043000 50.816000 9.941004 -39.043000
- 54.367000 12.312004 -41.922000 54.367000 12.312004 -41.922000
--54.368010 -12.313005 41.920990 -54.368010 -12.313005 41.920990
--50.817010 -9.942005 39.041990 -50.817010 -9.942005 39.041990
+ 40.321000 32.724004 -33.224000 40.321000 32.724004 -33.224000
+ 43.872000 35.095004 -36.104000 43.872000 35.095004 -36.104000
+ 38.870000 25.797004 -31.509000 38.870000 25.797004 -31.509000
+ 42.420000 28.167004 -34.388000 42.420000 28.167004 -34.388000
+ 45.971000 30.538005 -37.268000 45.971000 30.538005 -37.268000
+ 49.522000 32.909005 -40.148000 49.522000 32.909005 -40.148000
+ 37.418000 18.868004 -29.792000 37.418000 18.868004 -29.792000
+ 40.968000 21.240004 -32.672000 40.968000 21.240004 -32.672000
+ 44.519000 23.611004 -35.552000 44.519000 23.611004 -35.552000
+ 48.070000 25.982005 -38.431000 48.070000 25.982005 -38.431000
+ 51.621000 28.352005 -41.311000 51.621000 28.352005 -41.311000
+ 55.172000 30.724005 -44.191000 55.172000 30.724005 -44.191000
+ 39.516000 14.312004 -30.956000 39.516000 14.312004 -30.956000
+ 43.067000 16.683004 -33.836000 43.067000 16.683004 -33.836000
+ 46.618000 19.054005 -36.715000 46.618000 19.054005 -36.715000
+ 50.169000 21.425005 -39.595000 50.169000 21.425005 -39.595000
+ 53.720000 23.796005 -42.474000 53.720000 23.796005 -42.474000
+ 57.270000 26.167006 -45.354000 57.270000 26.167006 -45.354000
+ 45.166000 12.127005 -34.999000 45.166000 12.127005 -34.999000
+ 48.717000 14.497005 -37.879000 48.717000 14.497005 -37.879000
+ 52.268000 16.868005 -40.758000 52.268000 16.868005 -40.758000
+ 55.818000 19.239006 -43.638000 55.818000 19.239006 -43.638000
+ 50.816000 9.941005 -39.043000 50.816000 9.941005 -39.043000
+ 54.367000 12.312005 -41.922000 54.367000 12.312005 -41.922000
+-54.368000 -12.313005 41.920990 -54.368000 -12.313005 41.920990
+-50.817000 -9.942005 39.041990 -50.817000 -9.942005 39.041990
-55.819000 -19.240005 43.636990 -55.819000 -19.240005 43.636990
-52.268000 -16.870005 40.756990 -52.268000 -16.870005 40.756990
--48.717000 -14.499004 37.877990 -48.717000 -14.499004 37.877990
--45.166000 -12.128004 34.997990 -45.166000 -12.128004 34.997990
+-48.717000 -14.499004 37.878000 -48.717000 -14.499004 37.878000
+-45.166000 -12.128004 34.998000 -45.166000 -12.128004 34.998000
-57.271000 -26.169005 45.352990 -57.271000 -26.169005 45.352990
-53.720000 -23.797005 42.472990 -53.720000 -23.797005 42.472990
-50.169000 -21.426005 39.593990 -50.169000 -21.426005 39.593990
--46.619000 -19.055004 36.713990 -46.619000 -19.055004 36.713990
--43.068000 -16.685004 33.833990 -43.068000 -16.685004 33.833990
--39.517000 -14.313004 30.954990 -39.517000 -14.313004 30.954990
+-46.619000 -19.055004 36.714000 -46.619000 -19.055004 36.714000
+-43.068000 -16.685004 33.834000 -43.068000 -16.685004 33.834000
+-39.517000 -14.313004 30.955000 -39.517000 -14.313004 30.955000
-55.172000 -30.725005 44.189990 -55.172000 -30.725005 44.189990
-51.622000 -28.354005 41.309990 -51.622000 -28.354005 41.309990
--48.071000 -25.983004 38.429990 -48.071000 -25.983004 38.429990
--44.520000 -23.612004 35.550990 -44.520000 -23.612004 35.550990
--40.969000 -21.241004 32.670990 -40.969000 -21.241004 32.670990
--37.418000 -18.870003 29.790990 -37.418000 -18.870003 29.790990
--49.523000 -32.910005 40.145990 -49.523000 -32.910005 40.145990
--45.972000 -30.540004 37.266990 -45.972000 -30.540004 37.266990
--42.421000 -28.169004 34.386990 -42.421000 -28.169004 34.386990
--38.870000 -25.798004 31.506990 -38.870000 -25.798004 31.506990
--43.872000 -35.096004 36.102990 -43.872000 -35.096004 36.102990
--40.321000 -32.725004 33.222990 -40.321000 -32.725004 33.222990
+-48.071000 -25.983004 38.430000 -48.071000 -25.983004 38.430000
+-44.520000 -23.612004 35.551000 -44.520000 -23.612004 35.551000
+-40.969000 -21.241004 32.671000 -40.969000 -21.241004 32.671000
+-37.418000 -18.870003 29.791000 -37.418000 -18.870003 29.791000
+-49.523000 -32.910004 40.146000 -49.523000 -32.910004 40.146000
+-45.972000 -30.540004 37.267000 -45.972000 -30.540004 37.267000
+-42.421000 -28.169004 34.387000 -42.421000 -28.169004 34.387000
+-38.870000 -25.798003 31.507000 -38.870000 -25.798003 31.507000
+-43.872000 -35.096004 36.103000 -43.872000 -35.096004 36.103000
+-40.321000 -32.725004 33.223000 -40.321000 -32.725004 33.223000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826463.502150000 460533.093630000 5065022.614 ]
+3 [ 3826463.458760000 460533.141072000 5065022.642 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826368.813150000 460488.056622000 5065097.759 ]
+3 [ 3826368.769760000 460488.104063000 5065097.787 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS024-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS024-AntennaField.conf
index 4c5c89ef8a1b014f6fd7b475a46df40d7195848c..217ad7a562144a794c518de6ab7b108f86b31664 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS024-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS024-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS024
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:39
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:07
#
NORMAL_VECTOR LBA
@@ -15,145 +15,145 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3827161.234100000 461409.407688000 5064421.046 ]
+3 [ 3827161.190710000 461409.455138000 5064421.074 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
- -1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
+ -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
+ -1.338000 2.104999 0.814000 -1.338000 2.104999 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
- -0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- -4.224000 -2.119000 3.362000 -4.224000 -2.119000 3.362000
- -4.479000 1.836000 3.196000 -4.479000 1.836000 3.196000
- -2.637000 4.933000 1.534000 -2.637000 4.933000 1.534000
+ -0.800000 -2.363001 0.814000 -0.800000 -2.363001 0.814000
+ -4.224000 -2.119001 3.362000 -4.224000 -2.119001 3.362000
+ -4.479000 1.835999 3.196000 -4.479000 1.835999 3.196000
+ -2.637000 4.932999 1.534000 -2.637000 4.932999 1.534000
0.438000 5.721000 -0.846000 0.438000 5.721000 -0.846000
3.308000 3.832000 -2.830000 3.308000 3.832000 -2.830000
4.631000 0.150000 -3.489000 4.631000 0.150000 -3.489000
3.786000 -3.602000 -2.516000 3.786000 -3.602000 -2.516000
1.170000 -5.669000 -0.366000 1.170000 -5.669000 -0.366000
- -1.993000 -5.083000 1.956000 -1.993000 -5.083000 1.956000
- -3.784000 -7.754000 3.541000 -3.784000 -7.754000 3.541000
+ -1.993000 -5.083001 1.956000 -1.993000 -5.083001 1.956000
+ -3.784000 -7.754001 3.541000 -3.784000 -7.754001 3.541000
-6.250000 -5.623001 5.200000 -6.250000 -5.623001 5.200000
-8.166000 -1.078001 6.227000 -8.166000 -1.078001 6.227000
-6.813000 5.879999 4.582000 -6.813000 5.879999 4.582000
- -5.129000 8.206000 3.108000 -5.129000 8.206000 3.108000
- -2.034000 9.862000 0.635000 -2.034000 9.862000 0.635000
+ -5.129000 8.205999 3.108000 -5.129000 8.205999 3.108000
+ -2.034000 9.861999 0.635000 -2.034000 9.861999 0.635000
1.334000 8.960000 -1.811000 1.334000 8.960000 -1.811000
5.300000 5.696000 -4.493000 5.300000 5.696000 -4.493000
- 7.712000 1.831001 -5.954000 7.712000 1.831001 -5.954000
- 7.917000 -2.541999 -5.712000 7.917000 -2.541999 -5.712000
- 6.143000 -5.673999 -4.098000 6.143000 -5.673999 -4.098000
+ 7.712000 1.831000 -5.954000 7.712000 1.831000 -5.954000
+ 7.917000 -2.542000 -5.712000 7.917000 -2.542000 -5.712000
+ 6.143000 -5.674000 -4.098000 6.143000 -5.674000 -4.098000
3.044000 -8.379000 -1.528000 3.044000 -8.379000 -1.528000
- -0.611000 -9.094000 1.281000 -0.611000 -9.094000 1.281000
+ -0.611000 -9.094001 1.281000 -0.611000 -9.094001 1.281000
-6.751000 -11.109001 6.071000 -6.751000 -11.109001 6.071000
-9.196000 -8.662001 7.686000 -9.196000 -8.662001 7.686000
-10.111000 -5.703001 8.105000 -10.111000 -5.703001 8.105000
-10.493000 2.266999 7.671000 -10.493000 2.266999 7.671000
--11.639000 4.963999 8.288000 -11.639000 4.963999 8.288000
+-11.639000 4.963998 8.288000 -11.639000 4.963998 8.288000
-7.438000 10.007999 4.678000 -7.438000 10.007999 4.678000
- -3.949000 12.369000 1.846000 -3.949000 12.369000 1.846000
- -0.411000 15.073000 -1.054000 -0.411000 15.073000 -1.054000
+ -3.949000 12.368999 1.846000 -3.949000 12.368999 1.846000
+ -0.411000 15.072999 -1.054000 -0.411000 15.072999 -1.054000
1.855000 13.121000 -2.578000 1.855000 13.121000 -2.578000
5.289000 10.850000 -4.951000 5.289000 10.850000 -4.951000
- 9.291000 5.690001 -7.488000 9.291000 5.690001 -7.488000
+ 9.291000 5.690000 -7.488000 9.291000 5.690000 -7.488000
10.532000 3.299001 -8.204000 10.532000 3.299001 -8.204000
10.575000 -2.011999 -7.756000 10.575000 -2.011999 -7.756000
- 11.312010 -6.095999 -7.940000 11.312010 -6.095999 -7.940000
- 6.354010 -12.084999 -3.677000 6.354010 -12.084999 -3.677000
- 3.412010 -13.423000 -1.348000 3.412010 -13.423000 -1.348000
- -0.874990 -14.325000 1.952000 -0.874990 -14.325000 1.952000
- 48.509010 -26.920996 -33.978990 48.509010 -26.920996 -33.978990
+ 11.312000 -6.095999 -7.940000 11.312000 -6.095999 -7.940000
+ 6.354000 -12.085000 -3.677000 6.354000 -12.085000 -3.677000
+ 3.412000 -13.423000 -1.348000 3.412000 -13.423000 -1.348000
+ -0.875000 -14.325001 1.952000 -0.875000 -14.325001 1.952000
+ 48.509010 -26.920996 -33.979000 48.509010 -26.920996 -33.979000
-19.023990 -59.040002 19.616000 -19.023990 -59.040002 19.616000
- -3.591990 -17.073000 4.239000 -3.591990 -17.073000 4.239000
- -5.710990 -18.488000 5.958000 -5.710990 -18.488000 5.958000
--14.867000 -7.408001 11.829000 -14.867000 -7.408001 11.829000
--14.637000 8.625999 10.207000 -14.637000 8.625999 10.207000
--13.207000 13.104999 8.729000 -13.207000 13.104999 8.729000
- -4.427000 17.705000 1.723000 -4.427000 17.705000 1.723000
- 6.161000 15.687001 -6.042000 6.161000 15.687001 -6.042000
+ -3.592000 -17.073001 4.239000 -3.592000 -17.073001 4.239000
+ -5.711000 -18.488001 5.958000 -5.711000 -18.488001 5.958000
+-14.867000 -7.408002 11.829000 -14.867000 -7.408002 11.829000
+-14.637000 8.625998 10.207000 -14.637000 8.625998 10.207000
+-13.207000 13.104998 8.729000 -13.207000 13.104998 8.729000
+ -4.427000 17.704999 1.723000 -4.427000 17.704999 1.723000
+ 6.161000 15.687000 -6.042000 6.161000 15.687000 -6.042000
12.205000 12.752001 -10.314000 12.205000 12.752001 -10.314000
- 14.464000 -1.491999 -10.721990 14.464000 -1.491999 -10.721990
- 14.307010 -9.617999 -9.869990 14.307010 -9.617999 -9.869990
- 8.466010 -15.968999 -4.911000 8.466010 -15.968999 -4.911000
- 6.749010 -23.727999 -2.922000 6.749010 -23.727999 -2.922000
- -3.628990 -24.228000 4.914000 -3.628990 -24.228000 4.914000
--13.082990 -18.469001 11.489000 -13.082990 -18.469001 11.489000
--16.629000 -13.804001 13.730000 -16.629000 -13.804001 13.730000
+ 14.464000 -1.491999 -10.722000 14.464000 -1.491999 -10.722000
+ 14.307000 -9.617999 -9.870000 14.307000 -9.617999 -9.870000
+ 8.466010 -15.969000 -4.911000 8.466010 -15.969000 -4.911000
+ 6.749010 -23.728000 -2.922000 6.749010 -23.728000 -2.922000
+ -3.628990 -24.228001 4.914000 -3.628990 -24.228001 4.914000
+-13.083000 -18.469002 11.489000 -13.083000 -18.469002 11.489000
+-16.629000 -13.804002 13.730000 -16.629000 -13.804002 13.730000
-20.425000 -6.596002 15.928000 -20.425000 -6.596002 15.928000
--17.686000 10.450999 12.331000 -17.686000 10.450999 12.331000
--14.613000 17.209999 9.413000 -14.613000 17.209999 9.413000
+-17.686000 10.450998 12.331000 -17.686000 10.450998 12.331000
+-14.613000 17.209998 9.413000 -14.613000 17.209998 9.413000
-6.020000 25.361999 2.226000 -6.020000 25.361999 2.226000
5.344000 23.785000 -6.161000 5.344000 23.785000 -6.161000
12.336000 20.094001 -11.076000 12.336000 20.094001 -11.076000
- 17.651000 10.100001 -14.161990 17.651000 10.100001 -14.161990
- 21.396010 -5.514998 -15.560990 21.396010 -5.514998 -15.560990
- 14.753010 -20.693999 -9.203990 14.753010 -20.693999 -9.203990
+ 17.651000 10.100001 -14.162000 17.651000 10.100001 -14.162000
+ 21.396000 -5.514998 -15.561000 21.396000 -5.514998 -15.561000
+ 14.753010 -20.693999 -9.204000 14.753010 -20.693999 -9.204000
10.053010 -32.832999 -4.578000 10.053010 -32.832999 -4.578000
- -1.851990 -31.044000 4.196000 -1.851990 -31.044000 4.196000
--12.986990 -25.789001 12.079000 -12.986990 -25.789001 12.079000
--18.616990 -21.602002 15.927000 -18.616990 -21.602002 15.927000
--24.879000 -4.035002 19.039000 -24.879000 -4.035002 19.039000
--25.537000 13.965998 17.906000 -25.537000 13.965998 17.906000
+ -1.851990 -31.044001 4.196000 -1.851990 -31.044001 4.196000
+-12.987000 -25.789002 12.079000 -12.987000 -25.789002 12.079000
+-18.617000 -21.602002 15.927000 -18.617000 -21.602002 15.927000
+-24.879000 -4.035003 19.039000 -24.879000 -4.035003 19.039000
+-25.537000 13.965997 17.906000 -25.537000 13.965997 17.906000
-20.335000 24.009998 13.094000 -20.335000 24.009998 13.094000
--13.088000 25.940999 7.479000 -13.088000 25.940999 7.479000
- -3.670000 34.005000 -0.318000 -3.670000 34.005000 -0.318000
+-13.088000 25.940998 7.479000 -13.088000 25.940998 7.479000
+ -3.670000 34.004999 -0.318000 -3.670000 34.004999 -0.318000
11.362000 29.934001 -11.234000 11.362000 29.934001 -11.234000
- 17.375000 24.645001 -15.268990 17.375000 24.645001 -15.268990
- 25.542000 11.871002 -20.244990 25.542000 11.871002 -20.244990
- 25.533000 3.671002 -19.497990 25.533000 3.671002 -19.497990
- 23.775010 -16.614998 -16.343990 23.775010 -16.614998 -16.343990
- 19.344010 -20.120998 -12.701990 19.344010 -20.120998 -12.701990
- 22.300010 -25.384998 -14.444990 22.300010 -25.384998 -14.444990
- -5.938990 -40.542000 8.122000 -5.938990 -40.542000 8.122000
--23.322990 -25.755002 19.834000 -23.322990 -25.755002 19.834000
--32.464000 -8.696003 25.154000 -32.464000 -8.696003 25.154000
--32.028000 7.290997 23.382000 -32.028000 7.290997 23.382000
+ 17.375000 24.645001 -15.269000 17.375000 24.645001 -15.269000
+ 25.542000 11.871002 -20.245000 25.542000 11.871002 -20.245000
+ 25.533000 3.671002 -19.498000 25.533000 3.671002 -19.498000
+ 23.775010 -16.614998 -16.344000 23.775010 -16.614998 -16.344000
+ 19.344010 -20.120999 -12.702000 19.344010 -20.120999 -12.702000
+ 22.300010 -25.384998 -14.445000 22.300010 -25.384998 -14.445000
+ -5.938990 -40.542001 8.122000 -5.938990 -40.542001 8.122000
+-23.323000 -25.755003 19.834000 -23.323000 -25.755003 19.834000
+-32.464000 -8.696004 25.154000 -32.464000 -8.696004 25.154000
+-32.028000 7.290996 23.382000 -32.028000 7.290996 23.382000
-8.816000 40.102999 2.993000 -8.816000 40.102999 2.993000
- 8.697000 34.186001 -9.618000 8.697000 34.186001 -9.618000
- 21.530000 29.971002 -18.868990 21.530000 29.971002 -18.868990
- 29.938010 -12.286997 -21.361990 29.938010 -12.286997 -21.361990
+ 8.697000 34.186000 -9.618000 8.697000 34.186000 -9.618000
+ 21.530000 29.971002 -18.869000 21.530000 29.971002 -18.869000
+ 29.938010 -12.286998 -21.362000 29.938010 -12.286998 -21.362000
]
HBA
-3 [ 3827170.849110000 461381.378689000 5064416.362 ]
+3 [ 3827170.805720000 461381.426138000 5064416.390 ]
48 x 2 x 3 [
- 36.828000 23.250003 -29.744990 36.828000 23.250003 -29.744990
- 37.644000 28.222003 -30.806990 37.644000 28.222003 -30.806990
- 40.055000 16.990003 -31.600990 40.055000 16.990003 -31.600990
- 40.871000 21.963003 -32.662990 40.871000 21.963003 -32.662990
- 41.688000 26.936003 -33.725990 41.688000 26.936003 -33.725990
- 42.503000 31.908003 -34.787990 42.503000 31.908003 -34.787990
- 43.282000 10.730003 -33.457990 43.282000 10.730003 -33.457990
- 44.098000 15.704004 -34.519990 44.098000 15.704004 -34.519990
- 44.915000 20.676004 -35.581990 44.915000 20.676004 -35.581990
- 45.730000 25.648004 -36.643990 45.730000 25.648004 -36.643990
- 46.546000 30.622004 -37.705990 46.546000 30.622004 -37.705990
- 47.363000 35.594004 -38.767990 47.363000 35.594004 -38.767990
- 47.325000 9.444004 -36.375990 47.325000 9.444004 -36.375990
- 48.142000 14.416004 -37.438990 48.142000 14.416004 -37.438990
- 48.957000 19.389004 -38.500990 48.957000 19.389004 -38.500990
- 49.773000 24.362004 -39.561990 49.773000 24.362004 -39.561990
- 50.590000 29.334004 -40.624990 50.590000 29.334004 -40.624990
- 51.406000 34.307004 -41.686990 51.406000 34.307004 -41.686990
- 52.185000 13.129004 -40.356990 52.185000 13.129004 -40.356990
- 53.000000 18.102004 -41.418990 53.000000 18.102004 -41.418990
- 53.817000 23.075004 -42.480990 53.817000 23.075004 -42.480990
- 54.633000 28.047004 -43.542990 54.633000 28.047004 -43.542990
- 57.044000 16.815005 -44.337990 57.044000 16.815005 -44.337990
- 57.860000 21.788005 -45.399990 57.860000 21.788005 -45.399990
+ 36.828000 23.250004 -29.745000 36.828000 23.250004 -29.745000
+ 37.644000 28.222004 -30.807000 37.644000 28.222004 -30.807000
+ 40.055000 16.990004 -31.601000 40.055000 16.990004 -31.601000
+ 40.871000 21.963004 -32.663000 40.871000 21.963004 -32.663000
+ 41.688000 26.936004 -33.726000 41.688000 26.936004 -33.726000
+ 42.503000 31.908004 -34.788000 42.503000 31.908004 -34.788000
+ 43.282000 10.730005 -33.457990 43.282000 10.730005 -33.457990
+ 44.098000 15.704005 -34.519990 44.098000 15.704005 -34.519990
+ 44.915000 20.676005 -35.581990 44.915000 20.676005 -35.581990
+ 45.730000 25.648005 -36.643990 45.730000 25.648005 -36.643990
+ 46.546000 30.622005 -37.705990 46.546000 30.622005 -37.705990
+ 47.363000 35.594005 -38.767990 47.363000 35.594005 -38.767990
+ 47.325000 9.444005 -36.375990 47.325000 9.444005 -36.375990
+ 48.142000 14.416005 -37.438990 48.142000 14.416005 -37.438990
+ 48.957000 19.389005 -38.500990 48.957000 19.389005 -38.500990
+ 49.773000 24.362005 -39.561990 49.773000 24.362005 -39.561990
+ 50.590000 29.334005 -40.624990 50.590000 29.334005 -40.624990
+ 51.406000 34.307005 -41.686990 51.406000 34.307005 -41.686990
+ 52.185000 13.129005 -40.356990 52.185000 13.129005 -40.356990
+ 53.000000 18.102005 -41.418990 53.000000 18.102005 -41.418990
+ 53.817000 23.075006 -42.480990 53.817000 23.075006 -42.480990
+ 54.633000 28.047006 -43.542990 54.633000 28.047006 -43.542990
+ 57.044000 16.815006 -44.337990 57.044000 16.815006 -44.337990
+ 57.860000 21.788006 -45.399990 57.860000 21.788006 -45.399990
-57.861000 -21.787005 45.401000 -57.861000 -21.787005 45.401000
--57.045000 -16.815005 44.339000 -57.045000 -16.815005 44.339000
+-57.045010 -16.815005 44.339000 -57.045010 -16.815005 44.339000
-54.634000 -28.047005 43.544000 -54.634000 -28.047005 43.544000
-53.818000 -23.074005 42.482000 -53.818000 -23.074005 42.482000
-53.001000 -18.101005 41.420000 -53.001000 -18.101005 41.420000
--52.185000 -13.129005 40.358000 -52.185000 -13.129005 40.358000
+-52.185010 -13.129004 40.358000 -52.185010 -13.129004 40.358000
-51.406000 -34.307004 41.688000 -51.406000 -34.307004 41.688000
-50.591000 -29.333004 40.626000 -50.591000 -29.333004 40.626000
-49.774000 -24.361004 39.563000 -49.774000 -24.361004 39.563000
-48.958000 -19.389004 38.501000 -48.958000 -19.389004 38.501000
-48.142000 -14.415004 37.440000 -48.142000 -14.415004 37.440000
--47.326000 -9.443004 36.377000 -47.326000 -9.443004 36.377000
+-47.326010 -9.443004 36.377000 -47.326010 -9.443004 36.377000
-47.364000 -35.593004 38.769000 -47.364000 -35.593004 38.769000
-46.547000 -30.621004 37.707000 -46.547000 -30.621004 37.707000
-45.731000 -25.648004 36.645000 -45.731000 -25.648004 36.645000
@@ -161,9 +161,9 @@ HBA
-44.098000 -15.703004 34.521000 -44.098000 -15.703004 34.521000
-43.283000 -10.730004 33.459000 -43.283000 -10.730004 33.459000
-42.504000 -31.908004 34.788000 -42.504000 -31.908004 34.788000
--41.688000 -26.935004 33.727000 -41.688000 -26.935004 33.727000
--40.872000 -21.962004 32.664000 -40.872000 -21.962004 32.664000
--40.056000 -16.990004 31.602000 -40.056000 -16.990004 31.602000
+-41.688000 -26.935003 33.727000 -41.688000 -26.935003 33.727000
+-40.872000 -21.962003 32.664000 -40.872000 -21.962003 32.664000
+-40.056000 -16.990003 31.602000 -40.056000 -16.990003 31.602000
-37.644000 -28.222003 30.808000 -37.644000 -28.222003 30.808000
-36.829000 -23.249003 29.746000 -36.829000 -23.249003 29.746000
]
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3827218.193110000 461403.897693000 5064378.790 ]
+3 [ 3827218.149720000 461403.945143000 5064378.818 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3827123.504110000 461358.860685000 5064453.935 ]
+3 [ 3827123.460720000 461358.908134000 5064453.963 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS026-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS026-AntennaField.conf
index 2bd5785d8fcd98da89c24a82e8f9fb77bcae3615..56d95e19e12b0c88b259843cfcb2deb9b748fd9d 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS026-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS026-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS026
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:39
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:07
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826390.916030000 461869.851623000 5064955.913 ]
+3 [ 3826390.872630000 461869.899064000 5064955.941 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
@@ -30,15 +30,15 @@ LBA
3.786000 -3.602000 -2.516000 3.786000 -3.602000 -2.516000
1.170000 -5.669000 -0.366000 1.170000 -5.669000 -0.366000
-1.993000 -5.083000 1.956000 -1.993000 -5.083000 1.956000
- -4.224000 -2.119001 3.362000 -4.224000 -2.119001 3.362000
- -4.479000 1.835999 3.196000 -4.479000 1.835999 3.196000
+ -4.224000 -2.119000 3.362000 -4.224000 -2.119000 3.362000
+ -4.479000 1.836000 3.196000 -4.479000 1.836000 3.196000
-2.637000 4.933000 1.534000 -2.637000 4.933000 1.534000
- -3.687000 8.326999 2.015000 -3.687000 8.326999 2.015000
+ -3.687000 8.327000 2.015000 -3.687000 8.327000 2.015000
-1.084000 9.825000 -0.074000 -1.084000 9.825000 -0.074000
2.950000 9.409000 -3.065000 2.950000 9.409000 -3.065000
- 7.182000 4.142000 -5.765000 7.182000 4.142000 -5.765000
- 8.040000 1.051000 -6.130000 8.040000 1.051000 -6.130000
- 7.790000 -3.196000 -5.558000 7.790000 -3.196000 -5.558000
+ 7.182000 4.142001 -5.765000 7.182000 4.142001 -5.765000
+ 8.040000 1.051001 -6.130000 8.040000 1.051001 -6.130000
+ 7.790000 -3.195999 -5.558000 7.790000 -3.195999 -5.558000
5.635000 -6.340000 -3.657000 5.635000 -6.340000 -3.657000
1.565000 -8.838000 -0.376000 1.565000 -8.838000 -0.376000
-2.219000 -9.330000 2.509000 -2.219000 -9.330000 2.509000
@@ -46,15 +46,15 @@ LBA
-6.736000 -3.531001 5.375000 -6.736000 -3.531001 5.375000
-7.215000 1.293999 5.299000 -7.215000 1.293999 5.299000
-6.057000 5.633999 4.037000 -6.057000 5.633999 4.037000
- -4.678000 13.365999 2.303000 -4.678000 13.365999 2.303000
+ -4.678000 13.366000 2.303000 -4.678000 13.366000 2.303000
-1.866000 14.669000 0.075000 -1.866000 14.669000 0.075000
0.610000 14.040000 -1.727000 0.610000 14.040000 -1.727000
- 6.334000 10.092000 -5.666000 6.334000 10.092000 -5.666000
- 8.731000 9.856000 -7.445000 8.731000 9.856000 -7.445000
+ 6.334000 10.092001 -5.666000 6.334000 10.092001 -5.666000
+ 8.731000 9.856001 -7.445000 8.731000 9.856001 -7.445000
10.341000 2.560001 -7.994000 10.341000 2.560001 -7.994000
10.404000 -2.498999 -7.584000 10.404000 -2.498999 -7.584000
10.684000 -7.798999 -7.314000 10.684000 -7.798999 -7.314000
- 8.297000 -9.179000 -5.398000 8.297000 -9.179000 -5.398000
+ 8.297000 -9.178999 -5.398000 8.297000 -9.178999 -5.398000
5.159000 -11.646000 -2.820000 5.159000 -11.646000 -2.820000
-0.247000 -13.147000 1.373000 -0.247000 -13.147000 1.373000
-2.475000 -13.179000 3.049000 -2.475000 -13.179000 3.049000
@@ -63,7 +63,7 @@ LBA
-11.296000 -0.254001 8.502000 -11.296000 -0.254001 8.502000
-10.895000 3.655999 7.847000 -10.895000 3.655999 7.847000
-9.580000 8.778999 6.397000 -9.580000 8.778999 6.397000
- 7.780010 -64.587000 -0.002000 7.780010 -64.587000 -0.002000
+ 7.780010 -64.586999 -0.002000 7.780010 -64.586999 -0.002000
-51.520000 -6.207005 39.232990 -51.520000 -6.207005 39.232990
-10.264000 13.215999 6.509000 -10.264000 13.215999 6.509000
-10.289000 16.278999 6.251000 -10.289000 16.278999 6.251000
@@ -71,73 +71,73 @@ LBA
12.640000 11.092001 -10.490000 12.640000 11.092001 -10.490000
15.111000 7.097001 -11.984000 15.111000 7.097001 -11.984000
14.336000 -4.899999 -10.318000 14.336000 -4.899999 -10.318000
- 8.134000 -15.232000 -4.729000 8.134000 -15.232000 -4.729000
+ 8.134000 -15.231999 -4.729000 8.134000 -15.231999 -4.729000
3.350000 -20.156000 -0.693000 3.350000 -20.156000 -0.693000
-7.593000 -14.807001 7.037000 -7.593000 -14.807001 7.037000
-13.181000 -10.193001 10.815000 -13.181000 -10.193001 10.815000
--14.958000 -0.411002 11.264990 -14.958000 -0.411002 11.264990
--19.584000 5.685998 14.185990 -19.584000 5.685998 14.185990
--15.230000 17.169998 9.879990 -15.230000 17.169998 9.879990
+-14.958000 -0.411001 11.265000 -14.958000 -0.411001 11.265000
+-19.584000 5.685998 14.186000 -19.584000 5.685998 14.186000
+-15.230000 17.169998 9.880000 -15.230000 17.169998 9.880000
-6.934000 24.228999 3.015000 -6.934000 24.228999 3.015000
-2.079000 25.508000 -0.745000 -2.079000 25.508000 -0.745000
4.662000 25.667000 -5.819000 4.662000 25.667000 -5.819000
15.293000 13.385001 -12.689000 15.293000 13.385001 -12.689000
- 18.607000 6.371001 -14.542000 18.607000 6.371001 -14.542000
- 20.391000 -7.368999 -14.640000 20.391000 -7.368999 -14.640000
+ 18.607000 6.371002 -14.542000 18.607000 6.371002 -14.542000
+ 20.391000 -7.368998 -14.640000 20.391000 -7.368998 -14.640000
14.144000 -18.779999 -8.919000 14.144000 -18.779999 -8.919000
- 8.405000 -24.311000 -4.111000 8.405000 -24.311000 -4.111000
+ 8.405000 -24.310999 -4.111000 8.405000 -24.310999 -4.111000
-0.964000 -24.587000 2.946000 -0.964000 -24.587000 2.946000
-13.536000 -20.091001 11.977000 -13.536000 -20.091001 11.977000
--21.097000 -4.619002 16.252990 -21.097000 -4.619002 16.252990
--27.424000 7.094997 19.943990 -27.424000 7.094997 19.943990
--20.781000 18.978998 13.882990 -20.781000 18.978998 13.882990
--12.074000 28.124999 6.520990 -12.074000 28.124999 6.520990
+-21.097000 -4.619002 16.253000 -21.097000 -4.619002 16.253000
+-27.424000 7.094997 19.944000 -27.424000 7.094997 19.944000
+-20.781000 18.978998 13.883000 -20.781000 18.978998 13.883000
+-12.074000 28.124999 6.521000 -12.074000 28.124999 6.521000
-6.605000 31.919999 2.073000 -6.605000 31.919999 2.073000
- 8.461000 29.077000 -8.979000 8.461000 29.077000 -8.979000
+ 8.461000 29.077001 -8.979000 8.461000 29.077001 -8.979000
21.295000 19.940002 -17.787000 21.295000 19.940002 -17.787000
25.939000 8.832002 -20.269000 25.939000 8.832002 -20.269000
23.995000 -0.047998 -18.007000 23.995000 -0.047998 -18.007000
25.343000 -14.633998 -17.700000 25.343000 -14.633998 -17.700000
15.696000 -28.639999 -9.193000 15.696000 -28.639999 -9.193000
9.289000 -32.241999 -4.059000 9.289000 -32.241999 -4.059000
- -3.308000 -34.073001 5.563000 -3.308000 -34.073001 5.563000
+ -3.308000 -34.073000 5.563000 -3.308000 -34.073000 5.563000
-9.013000 -29.585001 9.439000 -9.013000 -29.585001 9.439000
--22.345000 -16.587002 18.271990 -22.345000 -16.587002 18.271990
--22.782000 -9.890002 17.993990 -22.782000 -9.890002 17.993990
--27.783000 -10.208003 21.776990 -27.783000 -10.208003 21.776990
--25.545000 28.589998 16.590990 -25.545000 28.589998 16.590990
+-22.345000 -16.587002 18.272000 -22.345000 -16.587002 18.272000
+-22.782000 -9.890002 17.994000 -22.782000 -9.890002 17.994000
+-27.783000 -10.208003 21.777000 -27.783000 -10.208003 21.777000
+-25.545000 28.589998 16.591000 -25.545000 28.589998 16.591000
-7.369000 39.277999 1.981000 -7.369000 39.277999 1.981000
- 8.657000 39.817000 -10.097000 8.657000 39.817000 -10.097000
- 19.588000 30.605001 -17.470000 19.588000 30.605001 -17.470000
- 31.924000 -12.406998 -22.842000 31.924000 -12.406998 -22.842000
- 19.867000 -28.084999 -12.374000 19.867000 -28.084999 -12.374000
+ 8.657000 39.817001 -10.097000 8.657000 39.817001 -10.097000
+ 19.588000 30.605002 -17.470000 19.588000 30.605002 -17.470000
+ 31.924000 -12.406997 -22.842000 31.924000 -12.406997 -22.842000
+ 19.867000 -28.084998 -12.374000 19.867000 -28.084998 -12.374000
11.121010 -39.642999 -4.764000 11.121010 -39.642999 -4.764000
--22.126000 -25.617002 18.923990 -22.126000 -25.617002 18.923990
+-22.126000 -25.617002 18.924000 -22.126000 -25.617002 18.924000
]
HBA
-3 [ 3826376.653030000 461846.766622000 5064968.706 ]
+3 [ 3826376.609630000 461846.814063000 5064968.734 ]
48 x 2 x 3 [
- 32.477010 -33.757998 -21.327000 32.477010 -33.757998 -21.327000
+ 32.477010 -33.757997 -21.327000 32.477010 -33.757997 -21.327000
35.205010 -30.095997 -23.706000 35.205010 -30.095997 -23.706000
- 32.842010 -41.022998 -20.944000 32.842010 -41.022998 -20.944000
+ 32.842010 -41.022997 -20.944000 32.842010 -41.022997 -20.944000
35.570010 -37.358997 -23.323000 35.570010 -37.358997 -23.323000
38.298010 -33.696997 -25.702000 38.298010 -33.696997 -25.702000
- 41.027010 -30.033997 -28.081000 41.027010 -30.033997 -28.081000
- 33.206010 -48.285998 -20.561000 33.206010 -48.285998 -20.561000
+ 41.027010 -30.033996 -28.081000 41.027010 -30.033996 -28.081000
+ 33.206010 -48.285997 -20.561000 33.206010 -48.285997 -20.561000
35.935010 -44.623997 -22.940000 35.935010 -44.623997 -22.940000
38.663010 -40.960997 -25.319000 38.663010 -40.960997 -25.319000
- 41.391010 -37.296997 -27.698000 41.391010 -37.296997 -27.698000
- 44.121010 -33.634997 -30.078000 44.121010 -33.634997 -30.078000
+ 41.391010 -37.296996 -27.698000 41.391010 -37.296996 -27.698000
+ 44.121010 -33.634996 -30.078000 44.121010 -33.634996 -30.078000
46.849010 -29.971996 -32.457000 46.849010 -29.971996 -32.457000
36.300010 -51.886997 -22.558000 36.300010 -51.886997 -22.558000
39.028010 -48.224997 -24.937000 39.028010 -48.224997 -24.937000
- 41.757010 -44.561997 -27.316000 41.757010 -44.561997 -27.316000
- 44.485010 -40.897997 -29.695000 44.485010 -40.897997 -29.695000
+ 41.757010 -44.561996 -27.316000 41.757010 -44.561996 -27.316000
+ 44.485010 -40.897996 -29.695000 44.485010 -40.897996 -29.695000
47.214010 -37.235996 -32.074000 47.214010 -37.235996 -32.074000
49.942010 -33.572996 -34.453000 49.942010 -33.572996 -34.453000
- 42.122010 -51.824997 -26.934000 42.122010 -51.824997 -26.934000
- 44.850010 -48.162997 -29.313000 44.850010 -48.162997 -29.313000
+ 42.122010 -51.824996 -26.934000 42.122010 -51.824996 -26.934000
+ 44.850010 -48.162996 -29.313000 44.850010 -48.162996 -29.313000
47.579010 -44.499996 -31.692000 47.579010 -44.499996 -31.692000
50.307010 -40.835996 -34.071000 50.307010 -40.835996 -34.071000
47.943010 -51.763996 -31.309000 47.943010 -51.763996 -31.309000
@@ -145,26 +145,26 @@ HBA
-50.672000 48.099995 33.686990 -50.672000 48.099995 33.686990
-47.944000 51.762995 31.307990 -47.944000 51.762995 31.307990
-50.307000 40.835995 34.069990 -50.307000 40.835995 34.069990
--47.579000 44.498996 31.690990 -47.579000 44.498996 31.690990
--44.851000 48.161996 29.311990 -44.851000 48.161996 29.311990
+-47.579000 44.498995 31.690990 -47.579000 44.498995 31.690990
+-44.851000 48.161995 29.311990 -44.851000 48.161995 29.311990
-42.122000 51.824996 26.932990 -42.122000 51.824996 26.932990
-49.942000 33.571995 34.452990 -49.942000 33.571995 34.452990
--47.214000 37.234996 32.073990 -47.214000 37.234996 32.073990
--44.486000 40.896996 29.694990 -44.486000 40.896996 29.694990
+-47.214000 37.234995 32.073990 -47.214000 37.234995 32.073990
+-44.486000 40.896995 29.694990 -44.486000 40.896995 29.694990
-41.757000 44.560996 27.315990 -41.757000 44.560996 27.315990
-39.028000 48.223996 24.935990 -39.028000 48.223996 24.935990
-36.300000 51.885996 22.556990 -36.300000 51.885996 22.556990
--46.849000 29.970996 32.455990 -46.849000 29.970996 32.455990
--44.121000 33.633996 30.076990 -44.121000 33.633996 30.076990
+-46.849000 29.970995 32.455990 -46.849000 29.970995 32.455990
+-44.121000 33.633995 30.076990 -44.121000 33.633995 30.076990
-41.392000 37.296996 27.697990 -41.392000 37.296996 27.697990
-38.663000 40.959996 25.318990 -38.663000 40.959996 25.318990
--35.935000 44.622997 22.939990 -35.935000 44.622997 22.939990
--33.207000 48.285997 20.560990 -33.207000 48.285997 20.560990
+-35.935000 44.622996 22.939990 -35.935000 44.622996 22.939990
+-33.207000 48.285996 20.560990 -33.207000 48.285996 20.560990
-41.027000 30.032996 28.079990 -41.027000 30.032996 28.079990
-38.298000 33.695996 25.700990 -38.298000 33.695996 25.700990
--35.570000 37.357997 23.321990 -35.570000 37.357997 23.321990
--32.842000 41.021997 20.942990 -32.842000 41.021997 20.942990
--35.205000 30.094997 23.704990 -35.205000 30.094997 23.704990
+-35.570000 37.357996 23.321990 -35.570000 37.357996 23.321990
+-32.842000 41.021996 20.942990 -32.842000 41.021996 20.942990
+-35.205000 30.094996 23.704990 -35.205000 30.094996 23.704990
-32.477000 33.757997 21.325990 -32.477000 33.757997 21.325990
]
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826418.227040000 461805.836625000 5064941.199 ]
+3 [ 3826418.183640000 461805.884067000 5064941.227 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826335.078030000 461887.695618000 5064996.213 ]
+3 [ 3826335.034630000 461887.743059000 5064996.241 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS028-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS028-AntennaField.conf
index e80df9c62347dce42fd82dd9659c049b2fa60eb8..1963a4ed7a437c3cc60a9f7c2a254654916610c5 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS028-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS028-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS028
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:39
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:08
#
NORMAL_VECTOR LBA
@@ -15,20 +15,20 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3825600.445050000 461260.592556000 5065604.325 ]
+3 [ 3825600.401650000 461260.639989000 5065604.353 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
- 2.019000 0.243001 -1.538000 2.019000 0.243001 -1.538000
- 1.338000 -2.104999 -0.814000 1.338000 -2.104999 -0.814000
+ 2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
+ 1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
-0.853000 5.736000 0.122000 -0.853000 5.736000 0.122000
- 2.282000 4.878001 -2.153000 2.282000 4.878001 -2.153000
+ 2.282000 4.878000 -2.153000 2.282000 4.878000 -2.153000
4.349000 1.739001 -3.421000 4.349000 1.739001 -3.421000
4.381000 -2.214999 -3.088000 4.381000 -2.214999 -3.088000
- 2.364000 -5.131999 -1.311000 2.364000 -5.131999 -1.311000
+ 2.364000 -5.132000 -1.311000 2.364000 -5.132000 -1.311000
-0.759000 -5.647000 1.081000 -0.759000 -5.647000 1.081000
-3.528000 -3.521000 2.966000 -3.528000 -3.521000 2.966000
-4.645000 0.253000 3.464000 -4.645000 0.253000 3.464000
@@ -40,13 +40,13 @@ LBA
7.375000 3.789001 -5.878000 7.375000 3.789001 -5.878000
8.081000 -0.442999 -6.025000 8.081000 -0.442999 -6.025000
6.738000 -4.252999 -4.673000 6.738000 -4.252999 -4.673000
- 3.440000 -8.089999 -1.851000 3.440000 -8.089999 -1.851000
+ 3.440000 -8.090000 -1.851000 3.440000 -8.090000 -1.851000
-0.032000 -9.871000 0.916000 -0.032000 -9.871000 0.916000
-3.484000 -8.831000 3.413000 -3.484000 -8.831000 3.413000
-5.591000 -5.763000 4.718000 -5.591000 -5.763000 4.718000
- -7.115000 -1.217000 5.451000 -7.115000 -1.217000 5.451000
- -6.981000 3.418000 4.931000 -6.981000 3.418000 4.931000
- -7.389000 11.440000 4.513000 -7.389000 11.440000 4.513000
+ -7.115000 -1.217001 5.451000 -7.115000 -1.217001 5.451000
+ -6.981000 3.417999 4.931000 -6.981000 3.417999 4.931000
+ -7.389000 11.439999 4.513000 -7.389000 11.439999 4.513000
-5.017000 13.678000 2.530000 -5.017000 13.678000 2.530000
-2.535000 13.915000 0.645000 -2.535000 13.915000 0.645000
3.757000 12.029001 -3.907000 3.757000 12.029001 -3.907000
@@ -56,15 +56,15 @@ LBA
11.839000 -3.939999 -8.531000 11.839000 -3.939999 -8.531000
9.887000 -6.107999 -6.869000 9.887000 -6.107999 -6.869000
7.464000 -9.594999 -4.736000 7.464000 -9.594999 -4.736000
- 2.680000 -12.917999 -0.844000 2.680000 -12.917999 -0.844000
+ 2.680000 -12.918000 -0.844000 2.680000 -12.918000 -0.844000
0.579000 -13.715000 0.805000 0.579000 -13.715000 0.805000
-3.573000 -12.203000 3.785000 -3.573000 -12.203000 3.785000
-6.899000 -11.894000 6.254000 -6.899000 -11.894000 6.254000
--10.633000 -4.131000 8.355000 -10.633000 -4.131000 8.355000
+-10.633000 -4.131001 8.355000 -10.633000 -4.131001 8.355000
-11.121000 -0.177001 8.364000 -11.121000 -0.177001 8.364000
-11.012000 5.276999 7.789000 -11.012000 5.276999 7.789000
- -7.780010 64.587000 0.002000 -7.780010 64.587000 0.002000
- 51.520000 6.207005 -39.232990 51.520000 6.207005 -39.232990
+ -7.780010 64.586999 0.002000 -7.780010 64.586999 0.002000
+ 51.520000 6.207005 -39.233000 51.520000 6.207005 -39.233000
-12.642000 9.372999 8.642000 -12.642000 9.372999 8.642000
-13.345000 12.353999 8.900000 -13.345000 12.353999 8.900000
-2.965000 20.170000 0.402000 -2.965000 20.170000 0.402000
@@ -74,26 +74,26 @@ LBA
11.074000 -12.073999 -7.221000 11.074000 -12.073999 -7.221000
7.639000 -18.522999 -4.059000 7.639000 -18.522999 -4.059000
-3.904000 -17.063000 4.472000 -3.904000 -17.063000 4.472000
--10.215000 -14.481000 8.976000 -10.215000 -14.481000 8.976000
+-10.215000 -14.481001 8.976000 -10.215000 -14.481001 8.976000
-14.065000 -5.543001 11.059000 -14.065000 -5.543001 11.059000
--19.794000 -1.181001 14.964000 -19.794000 -1.181001 14.964000
--18.218000 11.524999 12.633000 -18.218000 11.524999 12.633000
+-19.794000 -1.181002 14.964000 -19.794000 -1.181002 14.964000
+-18.218000 11.524998 12.633000 -18.218000 11.524998 12.633000
-11.933000 21.268999 7.034000 -11.933000 21.268999 7.034000
- -7.622000 24.187000 3.535000 -7.622000 24.187000 3.535000
+ -7.622000 24.186999 3.535000 -7.622000 24.186999 3.535000
-1.277000 26.658000 -1.451000 -1.277000 26.658000 -1.451000
11.505000 18.324001 -10.292000 11.505000 18.324001 -10.292000
16.196000 12.616002 -13.298000 16.196000 12.616002 -13.298000
20.930000 -0.183998 -15.694000 20.930000 -0.183998 -15.694000
17.548000 -13.470998 -11.954000 17.548000 -13.470998 -11.954000
- 13.343000 -20.842998 -8.131000 13.343000 -20.842998 -8.131000
+ 13.343000 -20.842999 -8.131000 13.343000 -20.842999 -8.131000
4.538000 -24.331999 -1.207000 4.538000 -24.331999 -1.207000
- -8.357000 -24.266000 8.466000 -8.357000 -24.266000 8.466000
--18.940000 -11.761001 15.280000 -18.940000 -11.761001 15.280000
+ -8.357000 -24.266001 8.466000 -8.357000 -24.266001 8.466000
+-18.940000 -11.761002 15.280000 -18.940000 -11.761002 15.280000
-27.525000 -2.502002 20.887000 -27.525000 -2.502002 20.887000
-23.873000 11.383998 16.890000 -23.873000 11.383998 16.890000
--17.661010 23.303999 11.150000 -17.661010 23.303999 11.150000
--13.326010 28.888999 7.392000 -13.326010 28.888999 7.392000
- 1.560990 31.293001 -4.000000 1.560990 31.293001 -4.000000
+-17.661000 23.303998 11.150000 -17.661000 23.303998 11.150000
+-13.326000 28.888999 7.392000 -13.326000 28.888999 7.392000
+ 1.561000 31.293000 -4.000000 1.561000 31.293000 -4.000000
15.732000 26.786002 -14.230000 15.732000 26.786002 -14.230000
22.590000 17.539002 -18.542000 22.590000 17.539002 -18.542000
22.719000 8.201002 -17.794000 22.719000 8.201002 -17.794000
@@ -103,12 +103,12 @@ LBA
4.422000 -34.398999 -0.210000 4.422000 -34.398999 -0.210000
-1.971000 -31.977000 4.369000 -1.971000 -31.977000 4.369000
-17.469000 -23.873001 15.270000 -17.469000 -23.873001 15.270000
--19.367000 -17.486001 16.117000 -19.367000 -17.486001 16.117000
+-19.367000 -17.486002 16.117000 -19.367000 -17.486002 16.117000
-24.030000 -19.515002 19.801000 -24.030000 -19.515002 19.801000
--30.512010 19.127998 21.174000 -30.512010 19.127998 21.174000
--15.681010 35.807999 8.534000 -15.681010 35.807999 8.534000
- -0.634010 41.845000 -3.306000 -0.634010 41.845000 -3.306000
- 11.752990 36.610001 -12.131000 11.752990 36.610001 -12.131000
+-30.512000 19.127997 21.174000 -30.512000 19.127997 21.174000
+-15.681000 35.807999 8.534000 -15.681000 35.807999 8.534000
+ -0.634000 41.845000 -3.306000 -0.634000 41.845000 -3.306000
+ 11.753000 36.610001 -12.131000 11.753000 36.610001 -12.131000
32.961000 -1.137997 -24.638000 32.961000 -1.137997 -24.638000
25.027000 -20.586997 -16.925000 25.027000 -20.586997 -16.925000
19.312000 -34.875998 -11.343000 19.312000 -34.875998 -11.343000
@@ -116,56 +116,56 @@ LBA
]
HBA
-3 [ 3825614.709050000 461283.677558000 5065591.532 ]
+3 [ 3825614.665650000 461283.724990000 5065591.560 ]
48 x 2 x 3 [
--49.126010 50.536995 32.307000 -49.126010 50.536995 32.307000
+-49.126010 50.536996 32.307000 -49.126010 50.536996 32.307000
-45.731010 53.220996 29.516000 -45.731010 53.220996 29.516000
--50.181010 43.473995 33.737000 -50.181010 43.473995 33.737000
+-50.181010 43.473996 33.737000 -50.181010 43.473996 33.737000
-46.785010 46.156996 30.946000 -46.785010 46.156996 30.946000
-43.390010 48.839996 28.154000 -43.390010 48.839996 28.154000
--39.994010 51.523996 25.362000 -39.994010 51.523996 25.362000
--51.236010 36.410995 35.167000 -51.236010 36.410995 35.167000
+-39.994010 51.523997 25.362000 -39.994010 51.523997 25.362000
+-51.236010 36.410996 35.167000 -51.236010 36.410996 35.167000
-47.840010 39.093996 32.375000 -47.840010 39.093996 32.375000
-44.444010 41.777996 29.584000 -44.444010 41.777996 29.584000
--41.048010 44.459996 26.792000 -41.048010 44.459996 26.792000
--37.653010 47.143996 24.001000 -37.653010 47.143996 24.001000
+-41.048010 44.459997 26.792000 -41.048010 44.459997 26.792000
+-37.653010 47.143997 24.001000 -37.653010 47.143997 24.001000
-34.257010 49.825997 21.210000 -34.257010 49.825997 21.210000
--48.894010 32.030995 33.805000 -48.894010 32.030995 33.805000
+-48.894010 32.030996 33.805000 -48.894010 32.030996 33.805000
-45.498010 34.713996 31.013000 -45.498010 34.713996 31.013000
-42.103010 37.396996 28.222000 -42.103010 37.396996 28.222000
--38.707010 40.079996 25.431000 -38.707010 40.079996 25.431000
+-38.707010 40.079997 25.431000 -38.707010 40.079997 25.431000
-35.311010 42.762997 22.639000 -35.311010 42.762997 22.639000
-31.915010 45.446997 19.848000 -31.915010 45.446997 19.848000
-43.157010 30.332996 29.652000 -43.157010 30.332996 29.652000
--39.761010 33.016996 26.861000 -39.761010 33.016996 26.861000
+-39.761010 33.016997 26.861000 -39.761010 33.016997 26.861000
-36.365010 35.699997 24.069000 -36.365010 35.699997 24.069000
-32.969010 38.382997 21.277000 -32.969010 38.382997 21.277000
--37.419010 28.636996 25.499000 -37.419010 28.636996 25.499000
+-37.419010 28.636997 25.499000 -37.419010 28.636997 25.499000
-34.024010 31.319997 22.708000 -34.024010 31.319997 22.708000
- 34.022000 -31.319997 -22.706990 34.022000 -31.319997 -22.706990
- 37.417000 -28.636997 -25.497990 37.417000 -28.636997 -25.497990
- 32.967000 -38.382998 -21.276990 32.967000 -38.382998 -21.276990
- 36.363000 -35.700997 -24.067990 36.363000 -35.700997 -24.067990
- 39.759000 -33.016997 -26.859990 39.759000 -33.016997 -26.859990
- 43.155000 -30.333997 -29.651990 43.155000 -30.333997 -29.651990
- 31.913000 -45.446998 -19.846990 31.913000 -45.446998 -19.846990
- 35.309000 -42.762997 -22.638990 35.309000 -42.762997 -22.638990
- 38.705000 -40.079997 -25.429990 38.705000 -40.079997 -25.429990
- 42.101000 -37.396997 -28.221990 42.101000 -37.396997 -28.221990
- 45.496000 -34.713997 -31.012990 45.496000 -34.713997 -31.012990
- 48.892000 -32.031996 -33.803990 48.892000 -32.031996 -33.803990
- 34.255000 -49.825997 -21.208990 34.255000 -49.825997 -21.208990
- 37.651000 -47.143997 -24.000990 37.651000 -47.143997 -24.000990
- 41.046000 -44.459997 -26.791990 41.046000 -44.459997 -26.791990
- 44.442000 -41.777997 -29.582990 44.442000 -41.777997 -29.582990
- 47.838000 -39.093996 -32.374990 47.838000 -39.093996 -32.374990
- 51.234000 -36.410996 -35.165990 51.234000 -36.410996 -35.165990
- 39.992000 -51.523997 -25.361990 39.992000 -51.523997 -25.361990
- 43.388000 -48.840997 -28.152990 43.388000 -48.840997 -28.152990
- 46.784000 -46.156996 -30.944990 46.784000 -46.156996 -30.944990
- 50.180000 -43.474996 -33.736990 50.180000 -43.474996 -33.736990
- 45.730000 -53.220996 -29.514990 45.730000 -53.220996 -29.514990
- 49.125000 -50.537996 -32.305990 49.125000 -50.537996 -32.305990
+ 34.022000 -31.319996 -22.707000 34.022000 -31.319996 -22.707000
+ 37.417000 -28.636996 -25.498000 37.417000 -28.636996 -25.498000
+ 32.967000 -38.382996 -21.277000 32.967000 -38.382996 -21.277000
+ 36.363000 -35.700996 -24.068000 36.363000 -35.700996 -24.068000
+ 39.759000 -33.016996 -26.860000 39.759000 -33.016996 -26.860000
+ 43.155000 -30.333995 -29.652000 43.155000 -30.333995 -29.652000
+ 31.913000 -45.446996 -19.847000 31.913000 -45.446996 -19.847000
+ 35.309000 -42.762996 -22.639000 35.309000 -42.762996 -22.639000
+ 38.705000 -40.079996 -25.430000 38.705000 -40.079996 -25.430000
+ 42.101000 -37.396995 -28.222000 42.101000 -37.396995 -28.222000
+ 45.496000 -34.713995 -31.013000 45.496000 -34.713995 -31.013000
+ 48.892000 -32.031995 -33.804000 48.892000 -32.031995 -33.804000
+ 34.255000 -49.825996 -21.209000 34.255000 -49.825996 -21.209000
+ 37.651000 -47.143996 -24.001000 37.651000 -47.143996 -24.001000
+ 41.046000 -44.459996 -26.792000 41.046000 -44.459996 -26.792000
+ 44.442000 -41.777995 -29.583000 44.442000 -41.777995 -29.583000
+ 47.838000 -39.093995 -32.375000 47.838000 -39.093995 -32.375000
+ 51.234000 -36.410995 -35.166000 51.234000 -36.410995 -35.166000
+ 39.992000 -51.523996 -25.362000 39.992000 -51.523996 -25.362000
+ 43.388000 -48.840995 -28.153000 43.388000 -48.840995 -28.153000
+ 46.784000 -46.156995 -30.945000 46.784000 -46.156995 -30.945000
+ 50.180000 -43.474995 -33.737000 50.180000 -43.474995 -33.737000
+ 45.730010 -53.220995 -29.515000 45.730010 -53.220995 -29.515000
+ 49.125010 -50.537995 -32.306000 49.125010 -50.537995 -32.306000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3825573.134040000 461324.606554000 5065619.039 ]
+3 [ 3825573.090640000 461324.653987000 5065619.067 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3825656.283050000 461242.748561000 5065564.025 ]
+3 [ 3825656.239650000 461242.795994000 5065564.053 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS030-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS030-AntennaField.conf
index 73191b4185afc226cc55dc4dbf315deb38a532ca..c4c1812eca2574ddf59af1c69a85addb024bd3dd 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS030-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS030-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS030
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:39
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:08
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826014.266140000 460387.388592000 5065372.328 ]
+3 [ 3826014.222750000 460387.436029000 5065372.356 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
@@ -27,46 +27,46 @@ LBA
2.897000 -4.710000 -1.749000 2.897000 -4.710000 -1.749000
-0.114000 -5.767000 0.607000 -0.114000 -5.767000 0.607000
-3.073000 -4.125000 2.679000 -3.073000 -4.125000 2.679000
- -4.593000 -0.553001 3.498000 -4.593000 -0.553001 3.498000
- -3.965000 3.276999 2.680000 -3.965000 3.276999 2.680000
+ -4.593000 -0.553000 3.498000 -4.593000 -0.553000 3.498000
+ -3.965000 3.277000 2.680000 -3.965000 3.277000 2.680000
-1.481000 5.575000 0.607000 -1.481000 5.575000 0.607000
1.696000 5.264000 -1.749000 1.696000 5.264000 -1.749000
4.079000 2.490000 -3.287000 4.079000 2.490000 -3.287000
4.553000 -1.450000 -3.287000 4.553000 -1.450000 -3.287000
- 7.165000 -3.109000 -5.097000 7.165000 -3.109000 -5.097000
- 6.228000 -6.498000 -4.087000 6.228000 -6.498000 -4.087000
+ 7.165000 -3.108999 -5.097000 7.165000 -3.108999 -5.097000
+ 6.228000 -6.497999 -4.087000 6.228000 -6.497999 -4.087000
3.245000 -9.677000 -1.561000 3.245000 -9.677000 -1.561000
-2.582000 -9.357000 2.784000 -2.582000 -9.357000 2.784000
- -4.893000 -7.760001 4.374000 -4.893000 -7.760001 4.374000
+ -4.893000 -7.760000 4.374000 -4.893000 -7.760000 4.374000
-7.097000 -4.329001 5.718000 -7.097000 -4.329001 5.718000
-7.384000 -0.083001 5.550000 -7.384000 -0.083001 5.550000
-6.005000 5.333999 4.025000 -6.005000 5.333999 4.025000
- -3.699000 8.984999 1.965000 -3.699000 8.984999 1.965000
+ -3.699000 8.985000 1.965000 -3.699000 8.985000 1.965000
-0.347000 10.061000 -0.649000 -0.347000 10.061000 -0.649000
2.619000 8.508000 -2.735000 2.619000 8.508000 -2.735000
- 5.642000 5.271000 -4.711000 5.642000 5.271000 -4.711000
- 7.277000 0.982000 -5.551000 7.277000 0.982000 -5.551000
+ 5.642000 5.271001 -4.711000 5.642000 5.271001 -4.711000
+ 7.277000 0.982001 -5.551000 7.277000 0.982001 -5.551000
10.656000 -6.064999 -7.451000 10.656000 -6.064999 -7.451000
9.467000 -9.487999 -6.248000 9.467000 -9.487999 -6.248000
- 7.428000 -11.156000 -4.567000 7.428000 -11.156000 -4.567000
+ 7.428000 -11.155999 -4.567000 7.428000 -11.155999 -4.567000
1.320000 -13.126000 0.196000 1.320000 -13.126000 0.196000
-0.446000 -15.024000 1.693000 -0.446000 -15.024000 1.693000
- -5.620000 -10.896001 5.203000 -5.620000 -10.896001 5.203000
+ -5.620000 -10.896000 5.203000 -5.620000 -10.896000 5.203000
-8.489000 -7.122001 7.016000 -8.489000 -7.122001 7.016000
-11.641000 -3.353001 9.041000 -11.641000 -3.353001 9.041000
-10.785000 -0.241001 8.117000 -10.785000 -0.241001 8.117000
-10.024000 4.345999 7.131000 -10.024000 4.345999 7.131000
-7.176000 10.164999 4.467000 -7.176000 10.164999 4.467000
- -5.675000 12.118999 3.164000 -5.675000 12.118999 3.164000
+ -5.675000 12.119000 3.164000 -5.675000 12.119000 3.164000
-1.543000 13.177000 -0.033000 -1.543000 13.177000 -0.033000
1.426000 14.843000 -2.412000 1.426000 14.843000 -2.412000
- 7.559000 9.978000 -6.576000 7.559000 9.978000 -6.576000
+ 7.559000 9.978001 -6.576000 7.559000 9.978001 -6.576000
9.470000 6.672001 -7.711000 9.470000 6.672001 -7.711000
11.435000 1.655001 -8.733000 11.435000 1.655001 -8.733000
- 7.780000 -64.586999 -0.002000 7.780000 -64.586999 -0.002000
+ 7.780010 -64.586999 -0.002000 7.780010 -64.586999 -0.002000
-51.520000 -6.207005 39.233000 -51.520000 -6.207005 39.233000
14.380000 -1.111999 -10.693000 14.380000 -1.111999 -10.693000
- 16.108000 -3.408999 -11.783000 16.108000 -3.408999 -11.783000
+ 16.108000 -3.408998 -11.783000 16.108000 -3.408998 -11.783000
10.158000 -16.585999 -6.125000 10.158000 -16.585999 -6.125000
-2.421000 -19.347000 3.566000 -2.421000 -19.347000 3.566000
-6.337000 -18.464001 6.426000 -6.337000 -18.464001 6.426000
@@ -76,11 +76,11 @@ LBA
-3.095000 17.785000 0.716000 -3.095000 17.785000 0.716000
3.292000 19.134000 -4.200000 3.292000 19.134000 -4.200000
9.968000 13.270001 -8.682000 9.968000 13.270001 -8.682000
- 16.528000 12.662001 -13.551000 16.528000 12.662001 -13.551000
- 19.974000 0.198001 -15.011000 19.974000 0.198001 -15.011000
- 18.263000 -12.332999 -12.594000 18.263000 -12.332999 -12.594000
- 15.668000 -17.507999 -10.178000 15.668000 -17.507999 -10.178000
- 11.160000 -23.466999 -6.256000 11.160000 -23.466999 -6.256000
+ 16.528000 12.662002 -13.551000 16.528000 12.662002 -13.551000
+ 19.974000 0.198002 -15.011000 19.974000 0.198002 -15.011000
+ 18.263000 -12.332998 -12.594000 18.263000 -12.332998 -12.594000
+ 15.668000 -17.507998 -10.178000 15.668000 -17.507998 -10.178000
+ 11.160010 -23.466999 -6.256000 11.160010 -23.466999 -6.256000
-2.948000 -23.381000 4.326000 -2.948000 -23.381000 4.326000
-9.126000 -20.943001 8.743000 -9.126000 -20.943001 8.743000
-18.018000 -12.088002 14.617000 -18.018000 -12.088002 14.617000
@@ -92,23 +92,23 @@ LBA
22.660000 18.388002 -18.671000 22.660000 18.388002 -18.671000
24.770000 3.636002 -18.922000 24.770000 3.636002 -18.922000
23.943000 -10.828998 -16.993000 23.943000 -10.828998 -16.993000
- 22.335000 -18.439998 -15.098000 22.335000 -18.439998 -15.098000
- 10.476000 -29.339999 -5.212000 10.476000 -29.339999 -5.212000
- -3.378000 -33.542000 5.567000 -3.378000 -33.542000 5.567000
+ 22.335010 -18.439998 -15.098000 22.335010 -18.439998 -15.098000
+ 10.476010 -29.339999 -5.212000 10.476010 -29.339999 -5.212000
+ -3.377990 -33.542000 5.567000 -3.377990 -33.542000 5.567000
-12.750000 -29.157001 12.205000 -12.750000 -29.157001 12.205000
--16.385000 -20.751002 14.175000 -16.385000 -20.751002 14.175000
+-16.385000 -20.751001 14.175000 -16.385000 -20.751001 14.175000
-25.452000 -10.879002 20.088000 -25.452000 -10.879002 20.088000
-26.701000 8.079998 19.312000 -26.701000 8.079998 19.312000
-24.345000 16.357998 16.795000 -24.345000 16.357998 16.795000
-16.780000 28.657998 10.005000 -16.780000 28.657998 10.005000
-10.383000 30.200999 5.064000 -10.383000 30.200999 5.064000
- 5.967000 31.913000 -7.364000 5.967000 31.913000 -7.364000
+ 5.967000 31.913001 -7.364000 5.967000 31.913001 -7.364000
10.007000 27.222001 -9.972000 10.007000 27.222001 -9.972000
13.238000 31.795001 -12.811000 13.238000 31.795001 -12.811000
33.386000 0.490003 -25.104000 33.386000 0.490003 -25.104000
- 26.966000 -23.345998 -18.131000 26.966000 -23.345998 -18.131000
- 16.342000 -37.637999 -8.865000 16.342000 -37.637999 -8.865000
- 3.743000 -40.135000 0.818000 3.743000 -40.135000 0.818000
+ 26.966010 -23.345997 -18.131000 26.966010 -23.345997 -18.131000
+ 16.342010 -37.637998 -8.865000 16.342010 -37.637998 -8.865000
+ 3.743010 -40.135000 0.818000 3.743010 -40.135000 0.818000
-28.696000 -18.265003 23.190000 -28.696000 -18.265003 23.190000
-29.235000 4.046997 21.578000 -29.235000 4.046997 21.578000
-29.728000 20.372997 20.473000 -29.728000 20.372997 20.473000
@@ -116,54 +116,54 @@ LBA
]
HBA
-3 [ 3826000.003140000 460364.302591000 5065385.121 ]
+3 [ 3825999.959750000 460364.350028000 5065385.149 ]
48 x 2 x 3 [
- 31.163000 -38.384998 -19.922000 31.163000 -38.384998 -19.922000
- 32.534000 -33.639998 -21.380000 32.534000 -33.639998 -21.380000
- 33.683010 -45.096998 -21.207000 33.683010 -45.096998 -21.207000
+ 31.163010 -38.384997 -19.922000 31.163010 -38.384997 -19.922000
+ 32.534010 -33.639997 -21.380000 32.534010 -33.639997 -21.380000
+ 33.683010 -45.096997 -21.207000 33.683010 -45.096997 -21.207000
35.053010 -40.351997 -22.665000 35.053010 -40.351997 -22.665000
- 36.424000 -35.605997 -24.123000 36.424000 -35.605997 -24.123000
- 37.795000 -30.860997 -25.581000 37.795000 -30.860997 -25.581000
+ 36.424010 -35.605997 -24.123000 36.424010 -35.605997 -24.123000
+ 37.795010 -30.860997 -25.581000 37.795010 -30.860997 -25.581000
36.202010 -51.807997 -22.491000 36.202010 -51.807997 -22.491000
37.573010 -47.062997 -23.949000 37.573010 -47.062997 -23.949000
38.944010 -42.317997 -25.407000 38.944010 -42.317997 -25.407000
- 40.314010 -37.572997 -26.865000 40.314010 -37.572997 -26.865000
- 41.685000 -32.826997 -28.323000 41.685000 -32.826997 -28.323000
- 43.057000 -28.081997 -29.781000 43.057000 -28.081997 -29.781000
- 40.092010 -53.774997 -25.234000 40.092010 -53.774997 -25.234000
- 41.463010 -49.029997 -26.692000 41.463010 -49.029997 -26.692000
- 42.834010 -44.283997 -28.150000 42.834010 -44.283997 -28.150000
- 44.205010 -39.538997 -29.607000 44.205010 -39.538997 -29.607000
- 45.576010 -34.793997 -31.065000 45.576010 -34.793997 -31.065000
- 46.947000 -30.048996 -32.522990 46.947000 -30.048996 -32.522990
- 45.353010 -50.995997 -29.433990 45.353010 -50.995997 -29.433990
- 46.724010 -46.250996 -30.891990 46.724010 -46.250996 -30.891990
- 48.096010 -41.505996 -32.349990 48.096010 -41.505996 -32.349990
+ 40.314010 -37.572996 -26.865000 40.314010 -37.572996 -26.865000
+ 41.685010 -32.826996 -28.323000 41.685010 -32.826996 -28.323000
+ 43.057010 -28.081996 -29.781000 43.057010 -28.081996 -29.781000
+ 40.092010 -53.774996 -25.234000 40.092010 -53.774996 -25.234000
+ 41.463010 -49.029996 -26.692000 41.463010 -49.029996 -26.692000
+ 42.834010 -44.283996 -28.150000 42.834010 -44.283996 -28.150000
+ 44.205010 -39.538996 -29.607000 44.205010 -39.538996 -29.607000
+ 45.576010 -34.793996 -31.065000 45.576010 -34.793996 -31.065000
+ 46.947010 -30.048996 -32.523000 46.947010 -30.048996 -32.523000
+ 45.353010 -50.995996 -29.434000 45.353010 -50.995996 -29.434000
+ 46.724010 -46.250996 -30.892000 46.724010 -46.250996 -30.892000
+ 48.096010 -41.505996 -32.350000 48.096010 -41.505996 -32.350000
49.466010 -36.760996 -33.807990 49.466010 -36.760996 -33.807990
- 50.615010 -48.217996 -33.633990 50.615010 -48.217996 -33.633990
- 51.986010 -43.472996 -35.091990 51.986010 -43.472996 -35.091990
--51.986010 43.473995 35.092000 -51.986010 43.473995 35.092000
--50.615010 48.218995 33.634000 -50.615010 48.218995 33.634000
--49.466010 36.761995 33.807000 -49.466010 36.761995 33.807000
--48.096010 41.506996 32.349000 -48.096010 41.506996 32.349000
--46.725010 46.251996 30.891000 -46.725010 46.251996 30.891000
--45.353010 50.996996 29.433000 -45.353010 50.996996 29.433000
--46.947000 30.049996 32.523000 -46.947000 30.049996 32.523000
--45.576000 34.794996 31.065000 -45.576000 34.794996 31.065000
--44.205010 39.539996 29.607000 -44.205010 39.539996 29.607000
--42.834010 44.284996 28.149000 -42.834010 44.284996 28.149000
--41.463010 49.030996 26.691000 -41.463010 49.030996 26.691000
--40.092010 53.775996 25.233000 -40.092010 53.775996 25.233000
+ 50.615010 -48.217995 -33.633990 50.615010 -48.217995 -33.633990
+ 51.986010 -43.472995 -35.091990 51.986010 -43.472995 -35.091990
+-51.986000 43.473995 35.092000 -51.986000 43.473995 35.092000
+-50.615000 48.218995 33.634000 -50.615000 48.218995 33.634000
+-49.466000 36.761995 33.807000 -49.466000 36.761995 33.807000
+-48.096000 41.506995 32.349000 -48.096000 41.506995 32.349000
+-46.725000 46.251995 30.891000 -46.725000 46.251995 30.891000
+-45.353000 50.996995 29.433000 -45.353000 50.996995 29.433000
+-46.947000 30.049995 32.523000 -46.947000 30.049995 32.523000
+-45.576000 34.794995 31.065000 -45.576000 34.794995 31.065000
+-44.205000 39.539995 29.607000 -44.205000 39.539995 29.607000
+-42.834000 44.284996 28.149000 -42.834000 44.284996 28.149000
+-41.463000 49.030996 26.691000 -41.463000 49.030996 26.691000
+-40.092000 53.775996 25.233000 -40.092000 53.775996 25.233000
-43.057000 28.082996 29.780000 -43.057000 28.082996 29.780000
-41.686000 32.827996 28.322000 -41.686000 32.827996 28.322000
-40.315000 37.573996 26.864000 -40.315000 37.573996 26.864000
--38.944010 42.318996 25.407000 -38.944010 42.318996 25.407000
--37.573010 47.064996 23.949000 -37.573010 47.064996 23.949000
--36.202010 51.809997 22.491000 -36.202010 51.809997 22.491000
+-38.944000 42.318996 25.407000 -38.944000 42.318996 25.407000
+-37.573000 47.064996 23.949000 -37.573000 47.064996 23.949000
+-36.202000 51.809996 22.491000 -36.202000 51.809996 22.491000
-37.796000 30.862996 25.580000 -37.796000 30.862996 25.580000
--36.424000 35.607997 24.122000 -36.424000 35.607997 24.122000
--35.053000 40.352997 22.664000 -35.053000 40.352997 22.664000
--33.683010 45.097997 21.206000 -33.683010 45.097997 21.206000
+-36.424000 35.607996 24.122000 -36.424000 35.607996 24.122000
+-35.053000 40.352996 22.664000 -35.053000 40.352996 22.664000
+-33.683000 45.097996 21.206000 -33.683000 45.097996 21.206000
-32.534000 33.640997 21.380000 -32.534000 33.640997 21.380000
-31.163000 38.385997 19.922000 -31.163000 38.385997 19.922000
]
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826041.577150000 460323.373594000 5065357.614 ]
+3 [ 3826041.533760000 460323.421032000 5065357.642 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3825958.428130000 460405.232587000 5065412.628 ]
+3 [ 3825958.384750000 460405.280024000 5065412.656 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS031-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS031-AntennaField.conf
index 7be0e7e2808291d2161fd898cb7cf8f13cd43371..30ad42646b8089db8391c764653c33459ff3d46e 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS031-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS031-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS031
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:39
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:08
#
NORMAL_VECTOR LBA
@@ -15,10 +15,10 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826439.996170000 460273.832628000 5065063.594 ]
+3 [ 3826439.952780000 460273.880070000 5065063.622 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
+ -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
@@ -35,24 +35,24 @@ LBA
4.349000 1.739000 -3.421000 4.349000 1.739000 -3.421000
7.196000 2.009000 -5.583000 7.196000 2.009000 -5.583000
7.871000 -1.581000 -5.766000 7.871000 -1.581000 -5.766000
- 6.783000 -6.340000 -4.518000 6.783000 -6.340000 -4.518000
- 1.872000 -9.910000 -0.509000 1.872000 -9.910000 -0.509000
- -0.702000 -10.038000 1.434000 -0.702000 -10.038000 1.434000
+ 6.783010 -6.340000 -4.518000 6.783010 -6.340000 -4.518000
+ 1.872010 -9.910000 -0.509000 1.872010 -9.910000 -0.509000
+ -0.701990 -10.038000 1.434000 -0.701990 -10.038000 1.434000
-3.970000 -8.485001 3.747000 -3.970000 -8.485001 3.747000
-6.015000 -4.952001 4.963000 -6.015000 -4.952001 4.963000
-7.193000 0.707999 5.335000 -7.193000 0.707999 5.335000
-6.860000 5.432999 4.658000 -6.860000 5.432999 4.658000
-4.572000 8.591999 2.655000 -4.572000 8.591999 2.655000
- -1.480000 9.190000 0.280000 -1.480000 9.190000 0.280000
+ -1.480000 9.189999 0.280000 -1.480000 9.189999 0.280000
2.376000 8.350000 -2.538000 2.376000 8.350000 -2.538000
5.544000 5.671000 -4.674000 5.544000 5.671000 -4.674000
11.316000 1.725001 -8.650000 11.316000 1.725001 -8.650000
- 11.799000 -2.060999 -8.671000 11.799000 -2.060999 -8.671000
- 10.840000 -4.870999 -7.696000 10.840000 -4.870999 -7.696000
- 6.676000 -10.636000 -4.049000 6.676000 -10.636000 -4.049000
- 6.037000 -13.468000 -3.314000 6.037000 -13.468000 -3.314000
- 0.039000 -13.267000 1.170000 0.039000 -13.267000 1.170000
- -3.921000 -11.854001 4.015000 -3.921000 -11.854001 4.015000
+ 11.799010 -2.060999 -8.671000 11.799010 -2.060999 -8.671000
+ 10.840010 -4.870999 -7.696000 10.840010 -4.870999 -7.696000
+ 6.676010 -10.636000 -4.049000 6.676010 -10.636000 -4.049000
+ 6.037010 -13.468000 -3.314000 6.037010 -13.468000 -3.314000
+ 0.039010 -13.267000 1.170000 0.039010 -13.267000 1.170000
+ -3.920990 -11.854001 4.015000 -3.920990 -11.854001 4.015000
-8.109000 -10.632001 7.048000 -8.109000 -10.632001 7.048000
-8.734000 -7.337001 7.219000 -8.734000 -7.337001 7.219000
-10.065000 -2.814001 7.809000 -10.065000 -2.814001 7.809000
@@ -62,110 +62,110 @@ LBA
-5.157000 13.954999 2.609000 -5.157000 13.954999 2.609000
1.941000 13.744000 -2.700000 1.941000 13.744000 -2.700000
4.916000 12.107000 -4.784000 4.916000 12.107000 -4.784000
- 8.665000 9.007001 -7.318000 8.665000 9.007001 -7.318000
--48.507010 26.917996 33.977000 -48.507010 26.917996 33.977000
- 19.021990 59.037001 -19.614000 19.021990 59.037001 -19.614000
+ 8.665000 9.007000 -7.318000 8.665000 9.007000 -7.318000
+-48.507000 26.917995 33.977000 -48.507000 26.917995 33.977000
+ 19.022000 59.037001 -19.614000 19.022000 59.037001 -19.614000
12.256000 8.528001 -9.970000 12.256000 8.528001 -9.970000
14.651000 7.657001 -11.689000 14.651000 7.657001 -11.689000
- 15.392000 -7.828999 -10.845000 15.392000 -7.828999 -10.845000
- 6.261000 -18.561000 -3.022000 6.261000 -18.561000 -3.022000
- 2.675000 -20.375000 -0.167000 2.675000 -20.375000 -0.167000
- -6.540000 -15.905001 6.346000 -6.540000 -15.905001 6.346000
--13.427000 -5.358001 10.563000 -13.427000 -5.358001 10.563000
+ 15.392010 -7.828999 -10.845000 15.392010 -7.828999 -10.845000
+ 6.261010 -18.561000 -3.022000 6.261010 -18.561000 -3.022000
+ 2.675010 -20.375000 -0.167000 2.675010 -20.375000 -0.167000
+ -6.539990 -15.905001 6.346000 -6.539990 -15.905001 6.346000
+-13.427000 -5.358002 10.563000 -13.427000 -5.358002 10.563000
-16.362000 1.879998 12.112000 -16.362000 1.879998 12.112000
-10.116000 13.546999 6.368000 -10.116000 13.546999 6.368000
-5.456000 18.950999 2.383000 -5.456000 18.950999 2.383000
2.512000 18.221000 -3.533000 2.512000 18.221000 -3.533000
8.147000 22.025000 -8.106000 8.147000 22.025000 -8.106000
16.282000 13.374001 -13.430000 16.282000 13.374001 -13.430000
- 20.220000 1.257001 -15.291000 20.220000 1.257001 -15.291000
- 20.298000 -4.994998 -14.785000 20.298000 -4.994998 -14.785000
- 19.145000 -13.198999 -13.178000 19.145000 -13.198999 -13.178000
- 7.548000 -22.447000 -3.637000 7.548000 -22.447000 -3.637000
- 1.448000 -24.392000 1.118000 1.448000 -24.392000 1.118000
- -9.612000 -22.505001 9.249000 -9.612000 -22.505001 9.249000
+ 20.220010 1.257002 -15.291000 20.220010 1.257002 -15.291000
+ 20.298010 -4.994998 -14.785000 20.298010 -4.994998 -14.785000
+ 19.145010 -13.198999 -13.178000 19.145010 -13.198999 -13.178000
+ 7.548010 -22.447000 -3.637000 7.548010 -22.447000 -3.637000
+ 1.448010 -24.392000 1.118000 1.448010 -24.392000 1.118000
+ -9.611990 -22.505001 9.249000 -9.611990 -22.505001 9.249000
-17.333000 -11.586002 14.057000 -17.333000 -11.586002 14.057000
-20.562000 -3.012002 15.707000 -20.562000 -3.012002 15.707000
-19.003000 8.404998 13.504000 -19.003000 8.404998 13.504000
--13.114010 22.294999 7.828000 -13.114010 22.294999 7.828000
- 0.390990 26.888000 -2.724000 0.390990 26.888000 -2.724000
+-13.114000 22.294998 7.828000 -13.114000 22.294998 7.828000
+ 0.391000 26.888000 -2.724000 0.391000 26.888000 -2.724000
10.731000 31.096001 -10.865000 10.731000 31.096001 -10.865000
18.747000 19.558001 -15.839000 18.747000 19.558001 -15.839000
24.233000 6.330002 -18.762000 24.233000 6.330002 -18.762000
- 26.159000 -1.405998 -19.508000 26.159000 -1.405998 -19.508000
- 21.087000 -18.799998 -14.129000 21.087000 -18.799998 -14.129000
- 11.527000 -31.639999 -5.792000 11.527000 -31.639999 -5.792000
- 1.979000 -33.989000 1.587000 1.979000 -33.989000 1.587000
- -4.583000 -29.022001 6.063000 -4.583000 -29.022001 6.063000
--16.219000 -26.358002 14.556000 -16.219000 -26.358002 14.556000
--25.321000 -10.562002 19.961000 -25.321000 -10.562002 19.961000
--26.919000 -1.748002 20.364000 -26.919000 -1.748002 20.364000
--25.961010 14.035998 18.218000 -25.961010 14.035998 18.218000
--21.378010 19.616998 14.274000 -21.378010 19.616998 14.274000
- -8.710010 31.921999 3.653000 -8.710010 31.921999 3.653000
- -3.402010 30.479999 -0.201000 -3.402010 30.479999 -0.201000
- -2.703010 36.625000 -1.282000 -2.703010 36.625000 -1.282000
+ 26.159010 -1.405998 -19.508000 26.159010 -1.405998 -19.508000
+ 21.087010 -18.799998 -14.129000 21.087010 -18.799998 -14.129000
+ 11.527010 -31.639999 -5.792000 11.527010 -31.639999 -5.792000
+ 1.979010 -33.989000 1.587000 1.979010 -33.989000 1.587000
+ -4.582990 -29.022001 6.063000 -4.582990 -29.022001 6.063000
+-16.218990 -26.358002 14.556000 -16.218990 -26.358002 14.556000
+-25.321000 -10.562003 19.961000 -25.321000 -10.562003 19.961000
+-26.919000 -1.748003 20.364000 -26.919000 -1.748003 20.364000
+-25.961000 14.035997 18.218000 -25.961000 14.035997 18.218000
+-21.378000 19.616998 14.274000 -21.378000 19.616998 14.274000
+ -8.710000 31.921999 3.653000 -8.710000 31.921999 3.653000
+ -3.402000 30.479999 -0.201000 -3.402000 30.479999 -0.201000
+ -2.703000 36.624999 -1.282000 -2.703000 36.624999 -1.282000
27.147000 22.494002 -22.410000 27.147000 22.494002 -22.410000
- 32.045000 -2.646998 -23.814000 32.045000 -2.646998 -23.814000
- 29.430000 -22.197998 -20.085000 29.430000 -22.197998 -20.085000
- 20.171000 -32.713998 -12.184000 20.171000 -32.713998 -12.184000
--15.729000 -34.978002 14.968000 -15.729000 -34.978002 14.968000
--25.678000 -15.772002 20.700000 -25.678000 -15.772002 20.700000
--33.041000 -1.784003 24.962000 -33.041000 -1.784003 24.962000
--15.798010 34.316998 8.757000 -15.798010 34.316998 8.757000
+ 32.045010 -2.646997 -23.814000 32.045010 -2.646997 -23.814000
+ 29.430010 -22.197998 -20.085000 29.430010 -22.197998 -20.085000
+ 20.171010 -32.713998 -12.184000 20.171010 -32.713998 -12.184000
+-15.728990 -34.978002 14.968000 -15.728990 -34.978002 14.968000
+-25.678000 -15.772003 20.700000 -25.678000 -15.772003 20.700000
+-33.041000 -1.784004 24.962000 -33.041000 -1.784004 24.962000
+-15.798000 34.316998 8.757000 -15.798000 34.316998 8.757000
]
HBA
-3 [ 3826430.381160000 460301.861627000 5065068.278 ]
+3 [ 3826430.337780000 460301.909069000 5065068.306 ]
48 x 2 x 3 [
--57.543000 -18.646005 44.877990 -57.543000 -18.646005 44.877990
--55.773000 -14.133005 43.140990 -55.773000 -14.133005 43.140990
--55.588000 -25.612005 44.039990 -55.588000 -25.612005 44.039990
--53.817000 -21.098005 42.302990 -53.817000 -21.098005 42.302990
--52.047000 -16.584004 40.565990 -52.047000 -16.584004 40.565990
--50.278000 -12.071004 38.829990 -50.278000 -12.071004 38.829990
--53.632000 -32.577005 43.200990 -53.632000 -32.577005 43.200990
--51.862000 -28.063004 41.464990 -51.862000 -28.063004 41.464990
--50.092000 -23.550004 39.728000 -50.092000 -23.550004 39.728000
--48.322000 -19.036004 37.992000 -48.322000 -19.036004 37.992000
--46.552000 -14.523004 36.255000 -46.552000 -14.523004 36.255000
--44.782000 -10.009004 34.518000 -44.782000 -10.009004 34.518000
--49.905990 -35.029004 40.626000 -49.905990 -35.029004 40.626000
--48.136000 -30.515004 38.890000 -48.136000 -30.515004 38.890000
--46.366000 -26.002004 37.153000 -46.366000 -26.002004 37.153000
--44.596000 -21.488004 35.416000 -44.596000 -21.488004 35.416000
+-57.543000 -18.646006 44.878000 -57.543000 -18.646006 44.878000
+-55.773000 -14.133006 43.141000 -55.773000 -14.133006 43.141000
+-55.588000 -25.612006 44.040000 -55.588000 -25.612006 44.040000
+-53.817000 -21.098005 42.303000 -53.817000 -21.098005 42.303000
+-52.047000 -16.584005 40.566000 -52.047000 -16.584005 40.566000
+-50.278000 -12.071005 38.830000 -50.278000 -12.071005 38.830000
+-53.632000 -32.577005 43.201000 -53.632000 -32.577005 43.201000
+-51.862000 -28.063005 41.465000 -51.862000 -28.063005 41.465000
+-50.092000 -23.550005 39.728000 -50.092000 -23.550005 39.728000
+-48.322000 -19.036005 37.992000 -48.322000 -19.036005 37.992000
+-46.552000 -14.523005 36.255000 -46.552000 -14.523005 36.255000
+-44.782000 -10.009005 34.518000 -44.782000 -10.009005 34.518000
+-49.906000 -35.029005 40.626000 -49.906000 -35.029005 40.626000
+-48.136000 -30.515005 38.890000 -48.136000 -30.515005 38.890000
+-46.366000 -26.002005 37.153000 -46.366000 -26.002005 37.153000
+-44.596000 -21.488005 35.416000 -44.596000 -21.488005 35.416000
-42.826000 -16.975004 33.680000 -42.826000 -16.975004 33.680000
--41.056000 -12.461003 31.943000 -41.056000 -12.461003 31.943000
--44.409990 -32.967004 36.315000 -44.409990 -32.967004 36.315000
+-41.056000 -12.461004 31.943000 -41.056000 -12.461004 31.943000
+-44.410000 -32.967005 36.315000 -44.410000 -32.967005 36.315000
-42.641000 -28.454004 34.578000 -42.641000 -28.454004 34.578000
--40.871000 -23.940003 32.842000 -40.871000 -23.940003 32.842000
--39.100000 -19.426003 31.105000 -39.100000 -19.426003 31.105000
--38.914990 -30.905003 32.003000 -38.914990 -30.905003 32.003000
--37.144000 -26.392003 30.266000 -37.144000 -26.392003 30.266000
+-40.871000 -23.940004 32.842000 -40.871000 -23.940004 32.842000
+-39.100000 -19.426004 31.105000 -39.100000 -19.426004 31.105000
+-38.915000 -30.905004 32.003000 -38.915000 -30.905004 32.003000
+-37.144000 -26.392004 30.266000 -37.144000 -26.392004 30.266000
37.144000 26.392003 -30.267000 37.144000 26.392003 -30.267000
38.914000 30.905003 -32.003000 38.914000 30.905003 -32.003000
39.100000 19.426003 -31.105000 39.100000 19.426003 -31.105000
- 40.870000 23.940003 -32.842000 40.870000 23.940003 -32.842000
+ 40.870000 23.940004 -32.842000 40.870000 23.940004 -32.842000
42.640000 28.454004 -34.579000 42.640000 28.454004 -34.579000
44.410000 32.967004 -36.315000 44.410000 32.967004 -36.315000
- 41.056010 12.461003 -31.944000 41.056010 12.461003 -31.944000
+ 41.056000 12.461004 -31.944000 41.056000 12.461004 -31.944000
42.825000 16.975004 -33.680000 42.825000 16.975004 -33.680000
44.596000 21.488004 -35.417000 44.596000 21.488004 -35.417000
46.366000 26.002004 -37.153000 46.366000 26.002004 -37.153000
48.136000 30.515004 -38.890000 48.136000 30.515004 -38.890000
49.906000 35.029004 -40.627000 49.906000 35.029004 -40.627000
- 44.781010 10.009004 -34.518000 44.781010 10.009004 -34.518000
- 46.551010 14.523004 -36.255000 46.551010 14.523004 -36.255000
+ 44.781000 10.009004 -34.518000 44.781000 10.009004 -34.518000
+ 46.551000 14.523004 -36.255000 46.551000 14.523004 -36.255000
48.322000 19.036004 -37.992000 48.322000 19.036004 -37.992000
50.092000 23.550004 -39.729000 50.092000 23.550004 -39.729000
- 51.862000 28.063004 -41.465000 51.862000 28.063004 -41.465000
- 53.631000 32.577004 -43.201000 53.631000 32.577004 -43.201000
- 50.277010 12.071004 -38.830000 50.277010 12.071004 -38.830000
- 52.047010 16.584004 -40.566000 52.047010 16.584004 -40.566000
- 53.817010 21.098004 -42.303000 53.817010 21.098004 -42.303000
+ 51.862000 28.063005 -41.465000 51.862000 28.063005 -41.465000
+ 53.631000 32.577005 -43.201000 53.631000 32.577005 -43.201000
+ 50.277000 12.071004 -38.830000 50.277000 12.071004 -38.830000
+ 52.047000 16.584005 -40.566000 52.047000 16.584005 -40.566000
+ 53.817000 21.098005 -42.303000 53.817000 21.098005 -42.303000
55.587000 25.612005 -44.040000 55.587000 25.612005 -44.040000
- 55.773010 14.133005 -43.142000 55.773010 14.133005 -43.142000
- 57.543010 18.646005 -44.878000 57.543010 18.646005 -44.878000
+ 55.773000 14.133005 -43.142000 55.773000 14.133005 -43.142000
+ 57.543000 18.646005 -44.878000 57.543000 18.646005 -44.878000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826383.037160000 460279.342623000 5065105.850 ]
+3 [ 3826382.993780000 460279.390064000 5065105.878 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826477.725160000 460324.380631000 5065030.705 ]
+3 [ 3826477.681780000 460324.428073000 5065030.733 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS032-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS032-AntennaField.conf
index 8e28858c1da27642cf4e9f4c36efe2e15751f9d6..76b7fb1d4f78e09aafd34bd7cb2c18b5a6ce0863 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS032-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS032-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS032
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:40
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:08
#
NORMAL_VECTOR LBA
@@ -15,157 +15,157 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826891.573180000 460387.909666000 5064715.292 ]
+3 [ 3826891.529800000 460387.957113000 5064715.320 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
- -1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
+ -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
+ -1.338000 2.104999 0.814000 -1.338000 2.104999 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
- -0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
+ -0.800000 -2.363001 0.814000 -0.800000 -2.363001 0.814000
3.786000 -3.602000 -2.516000 3.786000 -3.602000 -2.516000
1.170000 -5.669000 -0.366000 1.170000 -5.669000 -0.366000
- -1.993000 -5.083000 1.956000 -1.993000 -5.083000 1.956000
+ -1.993000 -5.083001 1.956000 -1.993000 -5.083001 1.956000
-4.224000 -2.119001 3.362000 -4.224000 -2.119001 3.362000
-4.479000 1.835999 3.196000 -4.479000 1.835999 3.196000
- -2.637000 4.933000 1.534000 -2.637000 4.933000 1.534000
+ -2.637000 4.932999 1.534000 -2.637000 4.932999 1.534000
0.438000 5.721000 -0.846000 0.438000 5.721000 -0.846000
3.308000 3.832000 -2.830000 3.308000 3.832000 -2.830000
4.631000 0.150000 -3.489000 4.631000 0.150000 -3.489000
7.470000 -0.573000 -5.555000 7.470000 -0.573000 -5.555000
7.334000 -4.202000 -5.125000 7.334000 -4.202000 -5.125000
5.216000 -8.331000 -3.162000 5.216000 -8.331000 -3.162000
- -0.370000 -10.022000 1.184000 -0.370000 -10.022000 1.184000
- -2.911000 -9.258000 3.022000 -2.911000 -9.258000 3.022000
+ -0.370000 -10.022001 1.184000 -0.370000 -10.022001 1.184000
+ -2.911000 -9.258001 3.022000 -2.911000 -9.258001 3.022000
-5.756000 -6.665001 4.923000 -5.756000 -6.665001 4.923000
-6.969000 -2.619001 5.468000 -6.969000 -2.619001 5.468000
-6.865000 3.141999 4.869000 -6.865000 3.141999 4.869000
-5.492000 7.499999 3.444000 -5.492000 7.499999 3.444000
- -2.559000 9.703000 1.044000 -2.559000 9.703000 1.044000
+ -2.559010 9.702999 1.044000 -2.559010 9.702999 1.044000
0.593000 9.206000 -1.277000 0.593000 9.206000 -1.277000
4.171000 7.085000 -3.771000 4.171000 7.085000 -3.771000
6.669000 3.461000 -5.318000 6.669000 3.461000 -5.318000
- 11.429000 -2.256999 -8.373990 11.429000 -2.256999 -8.373990
- 11.062000 -6.006999 -7.759990 11.062000 -6.006999 -7.759990
- 9.501000 -8.335999 -6.377990 9.501000 -8.335999 -6.377990
+ 11.429000 -2.256999 -8.374000 11.429000 -2.256999 -8.374000
+ 11.062000 -6.006999 -7.760000 11.062000 -6.006999 -7.760000
+ 9.501000 -8.336000 -6.378000 9.501000 -8.336000 -6.378000
4.159000 -12.360000 -2.004000 4.159000 -12.360000 -2.004000
2.908000 -14.820000 -0.843000 2.908000 -14.820000 -0.843000
- -2.903000 -12.568000 3.315000 -2.903000 -12.568000 3.315000
+ -2.903000 -12.568001 3.315000 -2.903000 -12.568001 3.315000
-6.456000 -9.870001 5.738000 -6.456000 -9.870001 5.738000
-10.273000 -7.274001 8.369000 -10.273000 -7.274001 8.369000
-10.152000 -3.942001 7.977000 -10.152000 -3.942001 7.977000
-10.449000 0.796999 7.771000 -10.449000 0.796999 7.771000
- -9.044000 7.455999 6.115000 -9.044000 7.455999 6.115000
- -8.056000 9.879999 5.154000 -8.056000 9.879999 5.154000
- -4.381000 12.331999 2.174000 -4.381000 12.331999 2.174000
- -1.941000 14.979000 0.103000 -1.941000 14.979000 0.103000
+ -9.044010 7.455999 6.115000 -9.044010 7.455999 6.115000
+ -8.056010 9.879999 5.154000 -8.056010 9.879999 5.154000
+ -4.381010 12.331999 2.174000 -4.381010 12.331999 2.174000
+ -1.941010 14.978999 0.103000 -1.941010 14.978999 0.103000
4.942000 12.339000 -4.825000 4.942000 12.339000 -4.825000
7.483000 9.767000 -6.500000 7.483000 9.767000 -6.500000
- 10.455000 5.545001 -8.348990 10.455000 5.545001 -8.348990
+ 10.455000 5.545001 -8.349000 10.455000 5.545001 -8.349000
-7.780010 64.586999 0.002000 -7.780010 64.586999 0.002000
- 51.520000 6.207004 -39.232990 51.520000 6.207004 -39.232990
- 13.855000 3.857001 -10.748990 13.855000 3.857001 -10.748990
- 16.000000 2.210001 -12.208990 16.000000 2.210001 -12.208990
- 13.289000 -12.699999 -8.826990 13.289000 -12.699999 -8.826990
+ 51.520000 6.207004 -39.233000 51.520000 6.207004 -39.233000
+ 13.855000 3.857001 -10.749000 13.855000 3.857001 -10.749000
+ 16.000000 2.210001 -12.209000 16.000000 2.210001 -12.209000
+ 13.289000 -12.699999 -8.827000 13.289000 -12.699999 -8.827000
1.998000 -19.718000 0.283000 1.998000 -19.718000 0.283000
- -1.904000 -20.202000 3.255000 -1.904000 -20.202000 3.255000
+ -1.904000 -20.202001 3.255000 -1.904000 -20.202001 3.255000
-9.909000 -12.804001 8.595000 -9.909000 -12.804001 8.595000
--14.294000 -0.454001 10.770000 -14.294000 -0.454001 10.770000
--15.556000 7.403999 11.007000 -15.556000 7.403999 11.007000
- -6.872000 16.297999 3.685000 -6.872000 16.297999 3.685000
- -1.126000 19.810000 -0.946000 -1.126000 19.810000 -0.946000
- 6.492000 16.380000 -6.354000 6.492000 16.380000 -6.354000
- 12.834000 18.042001 -11.263990 12.834000 18.042001 -11.263990
- 18.859000 7.060001 -14.793990 18.859000 7.060001 -14.793990
- 20.017000 -5.761998 -14.503990 20.017000 -5.761998 -14.503990
- 18.708000 -11.703999 -12.984990 18.708000 -11.703999 -12.984990
- 15.763000 -19.070999 -10.107990 15.763000 -19.070999 -10.107990
+-14.294000 -0.454002 10.770000 -14.294000 -0.454002 10.770000
+-15.556010 7.403998 11.007000 -15.556010 7.403998 11.007000
+ -6.872010 16.297999 3.685000 -6.872010 16.297999 3.685000
+ -1.126010 19.809999 -0.946000 -1.126010 19.809999 -0.946000
+ 6.491990 16.380000 -6.354000 6.491990 16.380000 -6.354000
+ 12.833990 18.042001 -11.264000 12.833990 18.042001 -11.264000
+ 18.859000 7.060001 -14.794000 18.859000 7.060001 -14.794000
+ 20.017000 -5.761999 -14.504000 20.017000 -5.761999 -14.504000
+ 18.708000 -11.703999 -12.985000 18.708000 -11.703999 -12.985000
+ 15.763000 -19.070999 -10.108000 15.763000 -19.070999 -10.108000
2.393000 -23.837000 0.359000 2.393000 -23.837000 0.359000
-3.994000 -23.581001 5.129000 -3.994000 -23.581001 5.129000
--14.372000 -17.993001 12.414000 -14.372000 -17.993001 12.414000
+-14.372000 -17.993002 12.414000 -14.372000 -17.993002 12.414000
-19.488000 -5.005002 15.080000 -19.488000 -5.005002 15.080000
--20.740000 4.216998 15.187000 -20.740000 4.216998 15.187000
--16.687000 14.486998 11.216000 -16.687000 14.486998 11.216000
- -7.859000 25.606999 3.585000 -7.859000 25.606999 3.585000
- 6.343000 25.310000 -7.049000 6.343000 25.310000 -7.049000
- 17.368000 25.739001 -15.362990 17.368000 25.739001 -15.362990
- 22.635000 12.064002 -18.080990 22.635000 12.064002 -18.080990
- 25.059000 -2.339998 -18.597990 25.059000 -2.339998 -18.597990
- 25.224000 -10.322998 -18.000990 25.224000 -10.322998 -18.000990
- 16.417000 -25.038999 -10.059990 16.417000 -25.038999 -10.059990
+-20.740010 4.216998 15.187000 -20.740010 4.216998 15.187000
+-16.687010 14.486998 11.216000 -16.687010 14.486998 11.216000
+ -7.859010 25.606999 3.585000 -7.859010 25.606999 3.585000
+ 6.342990 25.310000 -7.049000 6.342990 25.310000 -7.049000
+ 17.367990 25.739001 -15.363000 17.367990 25.739001 -15.363000
+ 22.635000 12.064002 -18.081000 22.635000 12.064002 -18.081000
+ 25.059000 -2.339998 -18.598000 25.059000 -2.339998 -18.598000
+ 25.224000 -10.322998 -18.001000 25.224000 -10.322998 -18.001000
+ 16.417000 -25.038999 -10.060000 16.417000 -25.038999 -10.060000
4.238000 -33.904000 -0.117000 4.238000 -33.904000 -0.117000
-5.603000 -32.846001 7.174000 -5.603000 -32.846001 7.174000
--10.906000 -25.889001 10.527000 -10.906000 -25.889001 10.527000
--21.675000 -19.369002 18.021000 -21.675000 -19.369002 18.021000
--27.059000 -1.290002 20.428000 -27.059000 -1.290002 20.428000
--26.665000 7.599998 19.328000 -26.665000 7.599998 19.328000
--22.232010 22.206998 14.680000 -22.232010 22.206998 14.680000
+-10.906000 -25.889002 10.527000 -10.906000 -25.889002 10.527000
+-21.675000 -19.369003 18.021000 -21.675000 -19.369003 18.021000
+-27.059010 -1.290003 20.428000 -27.059010 -1.290003 20.428000
+-26.665010 7.599997 19.328000 -26.665010 7.599997 19.328000
+-22.232010 22.206997 14.680000 -22.232010 22.206997 14.680000
-16.521010 25.912998 10.058000 -16.521010 25.912998 10.058000
- -1.427010 33.204000 -1.930000 -1.427010 33.204000 -1.930000
- 3.435000 30.013000 -5.291000 3.435000 30.013000 -5.291000
+ -1.427010 33.203999 -1.930000 -1.427010 33.203999 -1.930000
+ 3.434990 30.013000 -5.291000 3.434990 30.013000 -5.291000
5.479990 35.589000 -7.330000 5.479990 35.589000 -7.330000
- 31.487000 11.955002 -24.714990 31.487000 11.955002 -24.714990
- 30.694000 -13.519998 -21.817990 30.694000 -13.519998 -21.817990
- 23.808000 -31.123998 -15.057990 23.808000 -31.123998 -15.057990
- 12.439000 -37.892999 -5.911990 12.439000 -37.892999 -5.911990
--23.107000 -27.694002 19.848000 -23.107000 -27.694002 19.848000
+ 31.487000 11.955003 -24.715000 31.487000 11.955003 -24.715000
+ 30.694000 -13.519998 -21.818000 30.694000 -13.519998 -21.818000
+ 23.808000 -31.123998 -15.058000 23.808000 -31.123998 -15.058000
+ 12.439000 -37.892999 -5.912000 12.439000 -37.892999 -5.912000
+-23.107000 -27.694003 19.848000 -23.107000 -27.694003 19.848000
-28.563000 -6.099003 21.991000 -28.563000 -6.099003 21.991000
--32.649000 9.668997 23.633000 -32.649000 9.668997 23.633000
+-32.649010 9.668996 23.633000 -32.649010 9.668996 23.633000
-7.815010 37.905999 2.440000 -7.815010 37.905999 2.440000
]
HBA
-3 [ 3826905.837180000 460410.994667000 5064702.499 ]
+3 [ 3826905.793790000 460411.042114000 5064702.527 ]
48 x 2 x 3 [
--46.817010 52.617996 30.385990 -46.817010 52.617996 30.385990
--42.908010 53.989996 27.326990 -42.908010 53.989996 27.326990
--49.412010 46.295996 32.903990 -49.412010 46.295996 32.903990
--45.502010 47.666996 29.845990 -45.502010 47.666996 29.845990
--41.593010 49.039996 26.786990 -41.593010 49.039996 26.786990
--37.683010 50.410997 23.728990 -37.683010 50.410997 23.728990
--52.007010 39.973996 35.423990 -52.007010 39.973996 35.423990
--48.097010 41.345996 32.364990 -48.097010 41.345996 32.364990
--44.187010 42.717996 29.305990 -44.187010 42.717996 29.305990
--40.278010 44.089997 26.247990 -40.278010 44.089997 26.247990
--36.368010 45.460997 23.188990 -36.368010 45.460997 23.188990
--32.459010 46.833997 20.130990 -32.459010 46.833997 20.130990
--50.692010 35.023996 34.883990 -50.692010 35.023996 34.883990
--46.782010 36.395996 31.824990 -46.782010 36.395996 31.824990
--42.873010 37.767996 28.766990 -42.873010 37.767996 28.766990
--38.963010 39.138997 25.707990 -38.963010 39.138997 25.707990
--35.053010 40.511997 22.648990 -35.053010 40.511997 22.648990
--31.143010 41.882997 19.590990 -31.143010 41.882997 19.590990
--45.467010 31.445996 31.285990 -45.467010 31.445996 31.285990
--41.557010 32.817996 28.226990 -41.557010 32.817996 28.226990
--37.648010 34.189997 25.168990 -37.648010 34.189997 25.168990
--33.739010 35.561997 22.109990 -33.739010 35.561997 22.109990
--40.243010 27.866997 27.687990 -40.243010 27.866997 27.687990
--36.333010 29.239997 24.628990 -36.333010 29.239997 24.628990
- 36.331000 -29.239997 -24.628000 36.331000 -29.239997 -24.628000
- 40.241000 -27.866997 -27.687000 40.241000 -27.866997 -27.687000
- 33.737000 -35.561997 -22.110000 33.737000 -35.561997 -22.110000
- 37.647000 -34.189997 -25.168000 37.647000 -34.189997 -25.168000
- 41.556000 -32.817996 -28.227000 41.556000 -32.817996 -28.227000
- 45.466000 -31.445996 -31.285000 45.466000 -31.445996 -31.285000
- 31.142000 -41.883997 -19.590000 31.142000 -41.883997 -19.590000
- 35.052000 -40.511997 -22.649000 35.052000 -40.511997 -22.649000
- 38.961000 -39.138997 -25.708000 38.961000 -39.138997 -25.708000
- 42.871000 -37.767996 -28.766000 42.871000 -37.767996 -28.766000
- 46.780000 -36.395996 -31.825000 46.780000 -36.395996 -31.825000
- 50.690000 -35.023996 -34.883000 50.690000 -35.023996 -34.883000
- 32.457000 -46.833997 -20.130000 32.457000 -46.833997 -20.130000
- 36.367000 -45.460997 -23.189000 36.367000 -45.460997 -23.189000
- 40.276000 -44.089997 -26.247000 40.276000 -44.089997 -26.247000
- 44.186000 -42.717996 -29.306000 44.186000 -42.717996 -29.306000
- 48.095000 -41.345996 -32.365000 48.095000 -41.345996 -32.365000
- 52.005000 -39.973996 -35.423000 52.005000 -39.973996 -35.423000
- 37.681000 -50.411997 -23.728000 37.681000 -50.411997 -23.728000
- 41.591000 -49.039996 -26.787000 41.591000 -49.039996 -26.787000
- 45.500000 -47.667996 -29.845000 45.500000 -47.667996 -29.845000
- 49.410000 -46.295996 -32.904000 49.410000 -46.295996 -32.904000
- 42.906000 -53.989996 -27.326000 42.906000 -53.989996 -27.326000
- 46.816000 -52.617996 -30.385000 46.816000 -52.617996 -30.385000
+-46.817000 52.617995 30.386000 -46.817000 52.617995 30.386000
+-42.908000 53.989996 27.327000 -42.908000 53.989996 27.327000
+-49.412000 46.295995 32.904000 -49.412000 46.295995 32.904000
+-45.502000 47.666996 29.846000 -45.502000 47.666996 29.846000
+-41.593000 49.039996 26.787000 -41.593000 49.039996 26.787000
+-37.683000 50.410996 23.729000 -37.683000 50.410996 23.729000
+-52.007000 39.973995 35.424000 -52.007000 39.973995 35.424000
+-48.097000 41.345995 32.365000 -48.097000 41.345995 32.365000
+-44.187000 42.717996 29.306000 -44.187000 42.717996 29.306000
+-40.278000 44.089996 26.248000 -40.278000 44.089996 26.248000
+-36.368000 45.460996 23.189000 -36.368000 45.460996 23.189000
+-32.459000 46.833997 20.131000 -32.459000 46.833997 20.131000
+-50.692000 35.023995 34.884000 -50.692000 35.023995 34.884000
+-46.782000 36.395995 31.825000 -46.782000 36.395995 31.825000
+-42.873000 37.767996 28.767000 -42.873000 37.767996 28.767000
+-38.963000 39.138996 25.708000 -38.963000 39.138996 25.708000
+-35.053000 40.511997 22.649000 -35.053000 40.511997 22.649000
+-31.143000 41.882997 19.591000 -31.143000 41.882997 19.591000
+-45.467000 31.445996 31.286000 -45.467000 31.445996 31.286000
+-41.557000 32.817996 28.227000 -41.557000 32.817996 28.227000
+-37.648000 34.189996 25.169000 -37.648000 34.189996 25.169000
+-33.739000 35.561997 22.110000 -33.739000 35.561997 22.110000
+-40.243000 27.866996 27.688000 -40.243000 27.866996 27.688000
+-36.333000 29.239996 24.629000 -36.333000 29.239996 24.629000
+ 36.331010 -29.239997 -24.628000 36.331010 -29.239997 -24.628000
+ 40.241010 -27.866996 -27.687000 40.241010 -27.866996 -27.687000
+ 33.737010 -35.561997 -22.110000 33.737010 -35.561997 -22.110000
+ 37.647010 -34.189997 -25.168000 37.647010 -34.189997 -25.168000
+ 41.556010 -32.817996 -28.227000 41.556010 -32.817996 -28.227000
+ 45.466010 -31.445996 -31.285000 45.466010 -31.445996 -31.285000
+ 31.142010 -41.883997 -19.590000 31.142010 -41.883997 -19.590000
+ 35.052010 -40.511997 -22.649000 35.052010 -40.511997 -22.649000
+ 38.961010 -39.138996 -25.708000 38.961010 -39.138996 -25.708000
+ 42.871010 -37.767996 -28.766000 42.871010 -37.767996 -28.766000
+ 46.780010 -36.395996 -31.825000 46.780010 -36.395996 -31.825000
+ 50.690010 -35.023995 -34.882990 50.690010 -35.023995 -34.882990
+ 32.457010 -46.833997 -20.130000 32.457010 -46.833997 -20.130000
+ 36.367010 -45.460997 -23.189000 36.367010 -45.460997 -23.189000
+ 40.276010 -44.089996 -26.247000 40.276010 -44.089996 -26.247000
+ 44.186010 -42.717996 -29.306000 44.186010 -42.717996 -29.306000
+ 48.095010 -41.345996 -32.365000 48.095010 -41.345996 -32.365000
+ 52.005010 -39.973995 -35.422990 52.005010 -39.973995 -35.422990
+ 37.681010 -50.411997 -23.728000 37.681010 -50.411997 -23.728000
+ 41.591010 -49.039996 -26.787000 41.591010 -49.039996 -26.787000
+ 45.500010 -47.667996 -29.845000 45.500010 -47.667996 -29.845000
+ 49.410010 -46.295995 -32.903990 49.410010 -46.295995 -32.903990
+ 42.906010 -53.989996 -27.326000 42.906010 -53.989996 -27.326000
+ 46.816010 -52.617996 -30.385000 46.816010 -52.617996 -30.385000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826864.262170000 460451.923663000 5064730.006 ]
+3 [ 3826864.218790000 460451.971110000 5064730.034 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826947.411180000 460370.065671000 5064674.992 ]
+3 [ 3826947.367800000 460370.113118000 5064675.020 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS101-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS101-AntennaField.conf
index d952dcdf61e7737f1b5f17d1d5230e09a21fd455..63597d5eab2d8b6a3919470c2f612b76319d27c2 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS101-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS101-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS101
-# ITRF2005 target_date = 2012.5
-# Created: 2012-11-08 20:42:17
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:08
#
NORMAL_VECTOR LBA
@@ -15,37 +15,37 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3825842.966020000 461704.448577000 5065381.473 ]
+3 [ 3825842.922620000 461704.496012000 5065381.501 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
+ -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- -4.593000 -0.553001 3.498000 -4.593000 -0.553001 3.498000
- -3.965000 3.276999 2.680000 -3.965000 3.276999 2.680000
+ -4.593000 -0.553000 3.498000 -4.593000 -0.553000 3.498000
+ -3.965000 3.277000 2.680000 -3.965000 3.277000 2.680000
-1.481000 5.575000 0.607000 -1.481000 5.575000 0.607000
1.696000 5.264000 -1.749000 1.696000 5.264000 -1.749000
4.079000 2.490000 -3.287000 4.079000 2.490000 -3.287000
4.553000 -1.450000 -3.287000 4.553000 -1.450000 -3.287000
2.897000 -4.710000 -1.749000 2.897000 -4.710000 -1.749000
-0.114000 -5.767000 0.607000 -0.114000 -5.767000 0.607000
- -3.073000 -4.125001 2.679000 -3.073000 -4.125001 2.679000
+ -3.073000 -4.125000 2.679000 -3.073000 -4.125000 2.679000
-5.413000 -6.038001 4.609000 -5.413000 -6.038001 4.609000
-7.347000 -3.173001 5.802000 -7.347000 -3.173001 5.802000
-8.210000 1.787999 6.001000 -8.210000 1.787999 6.001000
-5.347000 7.905999 3.299000 -5.347000 7.905999 3.299000
- -3.187000 9.528999 1.531000 -3.187000 9.528999 1.531000
+ -3.187000 9.529000 1.531000 -3.187000 9.529000 1.531000
0.201000 10.032000 -1.057000 0.201000 10.032000 -1.057000
3.288000 8.020000 -3.193000 3.288000 8.020000 -3.193000
- 6.436000 3.568000 -5.153000 6.436000 3.568000 -5.153000
- 7.934000 -0.919000 -5.871990 7.934000 -0.919000 -5.871990
- 7.164000 -5.128000 -4.914000 7.164000 -5.128000 -4.914000
+ 6.436000 3.568001 -5.153000 6.436000 3.568001 -5.153000
+ 7.934000 -0.918999 -5.872000 7.934000 -0.918999 -5.872000
+ 7.164000 -5.127999 -4.914000 7.164000 -5.127999 -4.914000
4.739000 -7.482000 -2.881000 4.739000 -7.482000 -2.881000
1.115000 -8.976000 -0.026000 1.115000 -8.976000 -0.026000
- -2.613000 -8.397001 2.720000 -2.613000 -8.397001 2.720000
+ -2.613000 -8.397000 2.720000 -2.613000 -8.397000 2.720000
-9.052000 -8.193001 7.535000 -9.052000 -8.193001 7.535000
-10.897000 -5.036001 8.635000 -10.897000 -5.036001 8.635000
-11.135000 -1.922001 8.532000 -11.135000 -1.922001 8.532000
@@ -55,117 +55,117 @@ LBA
-1.113000 13.064000 -0.345000 -1.113000 13.064000 -0.345000
2.940000 14.406000 -3.509000 2.940000 14.406000 -3.509000
4.719000 11.779000 -4.607000 4.719000 11.779000 -4.607000
- 7.569000 8.449000 -6.445000 7.569000 8.449000 -6.445000
- 10.331000 2.192000 -7.952990 10.331000 2.192000 -7.952990
- 11.012000 -0.497999 -8.220990 11.012000 -0.497999 -8.220990
- 9.876000 -5.539000 -6.912990 9.876000 -5.539000 -6.912990
- 9.691000 -9.657000 -6.400990 9.691000 -9.657000 -6.400990
+ 7.569000 8.449001 -6.445000 7.569000 8.449001 -6.445000
+ 10.331000 2.192001 -7.953000 10.331000 2.192001 -7.953000
+ 11.012000 -0.497999 -8.221000 11.012000 -0.497999 -8.221000
+ 9.876000 -5.538999 -6.913000 9.876000 -5.538999 -6.913000
+ 9.691000 -9.656999 -6.401000 9.691000 -9.656999 -6.401000
3.524000 -13.621000 -1.414000 3.524000 -13.621000 -1.414000
0.355000 -13.876000 0.987000 0.355000 -13.876000 0.987000
- -4.030000 -13.255001 4.223000 -4.030000 -13.255001 4.223000
- 48.509010 -26.920996 -33.978990 48.509010 -26.920996 -33.978990
--19.023990 -59.040002 19.616000 -19.023990 -59.040002 19.616000
+ -4.030000 -13.255000 4.223000 -4.030000 -13.255000 4.223000
+ 48.509000 -26.920995 -33.978990 48.509000 -26.920995 -33.978990
+-19.024000 -59.040002 19.616000 -19.024000 -59.040002 19.616000
-7.290000 -14.922001 6.821000 -7.290000 -14.922001 6.821000
-9.674000 -15.533001 8.665000 -9.674000 -15.533001 8.665000
-16.154000 -1.900002 12.297000 -16.154000 -1.900002 12.297000
-12.376000 13.193999 8.097000 -12.376000 13.193999 8.097000
-9.987000 16.941999 5.965000 -9.987000 16.941999 5.965000
-0.397000 18.277000 -1.354000 -0.397000 18.277000 -1.354000
- 9.491000 12.728000 -8.273990 9.491000 12.728000 -8.273990
- 14.741000 7.872001 -11.776990 14.741000 7.872001 -11.776990
- 13.789000 -6.382999 -9.772990 13.789000 -6.382999 -9.772990
- 11.834000 -14.019999 -7.615990 11.834000 -14.019999 -7.615990
+ 9.491000 12.728001 -8.274000 9.491000 12.728001 -8.274000
+ 14.741000 7.872001 -11.777000 14.741000 7.872001 -11.777000
+ 13.789000 -6.382999 -9.773000 13.789000 -6.382999 -9.773000
+ 11.834000 -14.019999 -7.616000 11.834000 -14.019999 -7.616000
4.725000 -18.023000 -1.918000 4.725000 -18.023000 -1.918000
1.329000 -24.776000 1.242000 1.329000 -24.776000 1.242000
-8.913000 -21.681001 8.650000 -8.913000 -21.681001 8.650000
-16.865000 -12.980002 13.832000 -16.865000 -12.980002 13.832000
-19.293000 -7.348002 15.146000 -19.293000 -7.348002 15.146000
-21.401000 0.779998 15.993000 -21.401000 0.779998 15.993000
--14.948000 15.970998 9.776000 -14.948000 15.970998 9.776000
+-14.948000 15.970999 9.776000 -14.948000 15.970999 9.776000
-10.450000 21.308999 5.918000 -10.450000 21.308999 5.918000
-0.254000 26.071000 -2.165000 -0.254000 26.071000 -2.165000
- 10.490000 20.672001 -9.741990 10.490000 20.672001 -9.741990
- 16.495000 14.775001 -13.716990 16.495000 14.775001 -13.716990
- 19.469000 3.491001 -14.928990 19.469000 3.491001 -14.928990
- 19.663000 -12.573999 -13.622990 19.663000 -12.573999 -13.622990
- 9.815000 -24.653000 -5.138990 9.815000 -24.653000 -5.138990
+ 10.490000 20.672001 -9.742000 10.490000 20.672001 -9.742000
+ 16.495000 14.775001 -13.717000 16.495000 14.775001 -13.717000
+ 19.469000 3.491002 -14.929000 19.469000 3.491002 -14.929000
+ 19.663000 -12.573998 -13.623000 19.663000 -12.573998 -13.623000
+ 9.815000 -24.652999 -5.139000 9.815000 -24.652999 -5.139000
2.536000 -34.525000 1.217000 2.536000 -34.525000 1.217000
-8.693000 -28.746001 9.124000 -8.693000 -28.746001 9.124000
-18.392000 -19.933002 15.607000 -18.392000 -19.933002 15.607000
-22.967000 -14.038002 18.508000 -22.967000 -14.038002 18.508000
-25.180000 4.731998 18.473000 -25.180000 4.731998 18.473000
-21.828000 21.996998 14.396000 -21.828000 21.996998 14.396000
--14.530000 29.714998 8.221000 -14.530000 29.714998 8.221000
+-14.530000 29.714999 8.221000 -14.530000 29.714999 8.221000
-7.026000 29.047999 2.648000 -7.026000 29.047999 2.648000
3.959000 33.434000 -5.994000 3.959000 33.434000 -5.994000
- 17.724000 24.415001 -15.509990 17.724000 24.415001 -15.509990
- 22.424000 17.347002 -18.398990 22.424000 17.347002 -18.398990
- 27.560000 2.454002 -20.908990 27.560000 2.454002 -20.908990
- 25.738000 -5.298998 -18.839990 25.738000 -5.298998 -18.839990
- 19.518000 -23.896999 -12.490990 19.518000 -23.896999 -12.490990
- 14.424000 -25.698999 -8.503990 14.424000 -25.698999 -8.503990
- 16.142000 -31.686999 -9.251990 16.142000 -31.686999 -9.251990
--14.786000 -36.330002 14.382000 -14.786000 -36.330002 14.382000
+ 17.724000 24.415002 -15.510000 17.724000 24.415002 -15.510000
+ 22.424000 17.347002 -18.399000 22.424000 17.347002 -18.399000
+ 27.560000 2.454003 -20.909000 27.560000 2.454003 -20.909000
+ 25.738000 -5.298998 -18.840000 25.738000 -5.298998 -18.840000
+ 19.518000 -23.896998 -12.491000 19.518000 -23.896998 -12.491000
+ 14.424000 -25.698999 -8.504000 14.424000 -25.698999 -8.504000
+ 16.142000 -31.686999 -9.252000 16.142000 -31.686999 -9.252000
+-14.786000 -36.330001 14.382000 -14.786000 -36.330001 14.382000
-28.481000 -16.354003 22.856000 -28.481000 -16.354003 22.856000
-33.616000 2.929997 24.968000 -33.616000 2.929997 24.968000
-29.650000 17.901997 20.638000 -29.650000 17.901997 20.638000
0.286000 40.978000 -3.919000 0.286000 40.978000 -3.919000
- 16.067000 29.363001 -14.713990 16.067000 29.363001 -14.713990
- 27.660000 20.969002 -22.656990 27.660000 20.969002 -22.656990
- 26.504000 -21.926998 -17.911990 26.504000 -21.926998 -17.911990
+ 16.067000 29.363001 -14.714000 16.067000 29.363001 -14.714000
+ 27.660000 20.969003 -22.657000 27.660000 20.969003 -22.657000
+ 26.504000 -21.926998 -17.912000 26.504000 -21.926998 -17.912000
]
HBA
-3 [ 3825852.581020000 461676.420577000 5065376.790 ]
+3 [ 3825852.537620000 461676.468013000 5065376.818 ]
48 x 2 x 3 [
- 36.928000 21.422004 -29.655000 36.928000 21.422004 -29.655000
- 37.173000 26.526004 -30.301000 37.173000 26.526004 -30.301000
- 40.800000 15.736004 -32.048000 40.800000 15.736004 -32.048000
- 41.045000 20.839004 -32.693000 41.045000 20.839004 -32.693000
- 41.290000 25.943004 -33.339000 41.290000 25.943004 -33.339000
- 41.536000 31.046004 -33.985000 41.536000 31.046004 -33.985000
- 44.671010 10.051004 -34.440000 44.671010 10.051004 -34.440000
- 44.917000 15.154004 -35.086000 44.917000 15.154004 -35.086000
- 45.163000 20.258004 -35.732000 45.163000 20.258004 -35.732000
- 45.408000 25.361004 -36.377000 45.408000 25.361004 -36.377000
- 45.653000 30.465004 -37.022000 45.653000 30.465004 -37.022000
- 45.899000 35.568004 -37.668000 45.899000 35.568004 -37.668000
- 48.789010 9.468005 -37.478000 48.789010 9.468005 -37.478000
- 49.035000 14.571005 -38.124000 49.035000 14.571005 -38.124000
- 49.280000 19.675005 -38.769000 49.280000 19.675005 -38.769000
- 49.525000 24.778005 -39.415000 49.525000 24.778005 -39.415000
- 49.771000 29.882005 -40.061000 49.771000 29.882005 -40.061000
- 50.017000 34.985005 -40.706000 50.017000 34.985005 -40.706000
- 53.152010 13.989005 -41.162000 53.152010 13.989005 -41.162000
- 53.398000 19.092005 -41.808000 53.398000 19.092005 -41.808000
- 53.643000 24.196005 -42.453000 53.643000 24.196005 -42.453000
- 53.888000 29.299005 -43.098000 53.888000 29.299005 -43.098000
- 57.515000 18.510005 -44.845000 57.515000 18.510005 -44.845000
- 57.760000 23.614005 -45.491000 57.760000 23.614005 -45.491000
--57.761000 -23.615004 45.489990 -57.761000 -23.615004 45.489990
--57.515000 -18.511004 44.843990 -57.515000 -18.511004 44.843990
--53.889000 -29.301004 43.096990 -53.889000 -29.301004 43.096990
--53.644000 -24.198004 42.451990 -53.644000 -24.198004 42.451990
--53.398000 -19.094004 41.806990 -53.398000 -19.094004 41.806990
--53.152000 -13.991004 41.160990 -53.152000 -13.991004 41.160990
--50.018000 -34.986004 40.704990 -50.018000 -34.986004 40.704990
--49.772000 -29.883004 40.059990 -49.772000 -29.883004 40.059990
--49.526000 -24.779004 39.413990 -49.526000 -24.779004 39.413990
--49.280000 -19.676004 38.767990 -49.280000 -19.676004 38.767990
--49.035000 -14.572004 38.122990 -49.035000 -14.572004 38.122990
--48.790000 -9.469004 37.476990 -48.790000 -9.469004 37.476990
--45.900000 -35.569003 37.666990 -45.900000 -35.569003 37.666990
--45.654000 -30.466003 37.020990 -45.654000 -30.466003 37.020990
--45.409000 -25.362003 36.375990 -45.409000 -25.362003 36.375990
--45.163000 -20.259003 35.729990 -45.163000 -20.259003 35.729990
--44.917000 -15.155003 35.084990 -44.917000 -15.155003 35.084990
--44.672000 -10.052003 34.438990 -44.672000 -10.052003 34.438990
--41.537000 -31.048003 33.983990 -41.537000 -31.048003 33.983990
--41.291000 -25.945003 33.337990 -41.291000 -25.945003 33.337990
--41.045000 -20.841003 32.691990 -41.045000 -20.841003 32.691990
--40.800000 -15.738003 32.046990 -40.800000 -15.738003 32.046990
--37.174000 -26.527003 30.299990 -37.174000 -26.527003 30.299990
--36.928000 -21.423003 29.653990 -36.928000 -21.423003 29.653990
+ 36.928000 21.422003 -29.655000 36.928000 21.422003 -29.655000
+ 37.173000 26.526003 -30.301000 37.173000 26.526003 -30.301000
+ 40.800000 15.736004 -32.047990 40.800000 15.736004 -32.047990
+ 41.045000 20.839004 -32.692990 41.045000 20.839004 -32.692990
+ 41.290000 25.943004 -33.338990 41.290000 25.943004 -33.338990
+ 41.536000 31.046004 -33.984990 41.536000 31.046004 -33.984990
+ 44.671000 10.051004 -34.439990 44.671000 10.051004 -34.439990
+ 44.917000 15.154004 -35.085990 44.917000 15.154004 -35.085990
+ 45.163000 20.258004 -35.731990 45.163000 20.258004 -35.731990
+ 45.408000 25.361004 -36.376990 45.408000 25.361004 -36.376990
+ 45.653000 30.465004 -37.021990 45.653000 30.465004 -37.021990
+ 45.899000 35.568004 -37.667990 45.899000 35.568004 -37.667990
+ 48.789000 9.468005 -37.477990 48.789000 9.468005 -37.477990
+ 49.035000 14.571005 -38.123990 49.035000 14.571005 -38.123990
+ 49.280000 19.675005 -38.768990 49.280000 19.675005 -38.768990
+ 49.525000 24.778005 -39.414990 49.525000 24.778005 -39.414990
+ 49.771000 29.882005 -40.060990 49.771000 29.882005 -40.060990
+ 50.017000 34.985005 -40.705990 50.017000 34.985005 -40.705990
+ 53.152000 13.989005 -41.161990 53.152000 13.989005 -41.161990
+ 53.398000 19.092005 -41.807990 53.398000 19.092005 -41.807990
+ 53.643000 24.196005 -42.452990 53.643000 24.196005 -42.452990
+ 53.888000 29.299005 -43.097990 53.888000 29.299005 -43.097990
+ 57.515000 18.510005 -44.844990 57.515000 18.510005 -44.844990
+ 57.760000 23.614005 -45.490990 57.760000 23.614005 -45.490990
+-57.761000 -23.615006 45.490000 -57.761000 -23.615006 45.490000
+-57.515000 -18.511006 44.844000 -57.515000 -18.511006 44.844000
+-53.889000 -29.301005 43.097000 -53.889000 -29.301005 43.097000
+-53.644000 -24.198005 42.452000 -53.644000 -24.198005 42.452000
+-53.398000 -19.094005 41.807000 -53.398000 -19.094005 41.807000
+-53.152000 -13.991005 41.161000 -53.152000 -13.991005 41.161000
+-50.018000 -34.986005 40.705000 -50.018000 -34.986005 40.705000
+-49.772000 -29.883005 40.060000 -49.772000 -29.883005 40.060000
+-49.526000 -24.779005 39.414000 -49.526000 -24.779005 39.414000
+-49.280000 -19.676005 38.768000 -49.280000 -19.676005 38.768000
+-49.035000 -14.572005 38.123000 -49.035000 -14.572005 38.123000
+-48.790000 -9.469005 37.477000 -48.790000 -9.469005 37.477000
+-45.900000 -35.569004 37.667000 -45.900000 -35.569004 37.667000
+-45.654000 -30.466004 37.021000 -45.654000 -30.466004 37.021000
+-45.409000 -25.362004 36.376000 -45.409000 -25.362004 36.376000
+-45.163000 -20.259004 35.730000 -45.163000 -20.259004 35.730000
+-44.917000 -15.155004 35.085000 -44.917000 -15.155004 35.085000
+-44.672000 -10.052004 34.439000 -44.672000 -10.052004 34.439000
+-41.537000 -31.048004 33.984000 -41.537000 -31.048004 33.984000
+-41.291000 -25.945004 33.338000 -41.291000 -25.945004 33.338000
+-41.045000 -20.841004 32.692000 -41.045000 -20.841004 32.692000
+-40.800000 -15.738004 32.047000 -40.800000 -15.738004 32.047000
+-37.174000 -26.527004 30.300000 -37.174000 -26.527004 30.300000
+-36.928000 -21.423004 29.654000 -36.928000 -21.423004 29.654000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3825899.925020000 461698.938581000 5065339.217 ]
+3 [ 3825899.881620000 461698.986017000 5065339.245 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3825805.236020000 461653.901573000 5065414.362 ]
+3 [ 3825805.192620000 461653.949008000 5065414.390 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS103-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS103-AntennaField.conf
index a5cbd54a8c1fde174280a05813e2038135e66c6a..af2a7f21a7ec0e39801a36ea6453cfe44007300d 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS103-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS103-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS103
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:40
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:09
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826304.278950000 462823.088615000 5064934.334 ]
+3 [ 3826304.235540000 462823.136055000 5064934.362 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
@@ -27,9 +27,9 @@ LBA
-4.479000 1.836000 3.196000 -4.479000 1.836000 3.196000
-2.637000 4.933000 1.534000 -2.637000 4.933000 1.534000
0.438000 5.721000 -0.846000 0.438000 5.721000 -0.846000
- 3.308000 3.832000 -2.829990 3.308000 3.832000 -2.829990
- 4.631000 0.150000 -3.488990 4.631000 0.150000 -3.488990
- 3.786000 -3.602000 -2.515990 3.786000 -3.602000 -2.515990
+ 3.308000 3.832000 -2.830000 3.308000 3.832000 -2.830000
+ 4.631000 0.150001 -3.489000 4.631000 0.150001 -3.489000
+ 3.786000 -3.602000 -2.516000 3.786000 -3.602000 -2.516000
1.170000 -5.669000 -0.366000 1.170000 -5.669000 -0.366000
-1.993000 -5.083000 1.956000 -1.993000 -5.083000 1.956000
-4.224000 -2.119000 3.362000 -4.224000 -2.119000 3.362000
@@ -38,14 +38,14 @@ LBA
-7.096000 5.757999 4.806000 -7.096000 5.757999 4.806000
-2.416000 9.761000 0.931000 -2.416000 9.761000 0.931000
0.135000 10.113000 -1.015000 0.135000 10.113000 -1.015000
- 3.469000 8.841000 -3.402990 3.469000 8.841000 -3.402990
- 5.700000 5.482000 -4.773990 5.700000 5.482000 -4.773990
+ 3.469000 8.841000 -3.403000 3.469000 8.841000 -3.403000
+ 5.700000 5.482001 -4.774000 5.700000 5.482001 -4.774000
7.188000 -0.082999 -5.387990 7.188000 -0.082999 -5.387990
7.122000 -4.843999 -4.907990 7.122000 -4.843999 -4.907990
- 5.026000 -8.206000 -3.030990 5.026000 -8.206000 -3.030990
- 1.986000 -9.074000 -0.670990 1.986000 -9.074000 -0.670990
+ 5.026000 -8.205999 -3.030990 5.026000 -8.205999 -3.030990
+ 1.986000 -9.074000 -0.671000 1.986000 -9.074000 -0.671000
-1.893000 -8.568000 2.196000 -1.893000 -8.568000 2.196000
- -5.191000 -6.160001 4.453000 -5.191000 -6.160001 4.453000
+ -5.191000 -6.160000 4.453000 -5.191000 -6.160000 4.453000
-11.149000 -2.712001 8.614000 -11.149000 -2.712001 8.614000
-11.843000 1.037999 8.795000 -11.843000 1.037999 8.795000
-11.046000 3.934999 7.935000 -11.046000 3.934999 7.935000
@@ -59,111 +59,111 @@ LBA
10.382000 -3.286999 -7.495990 10.382000 -3.286999 -7.495990
10.140000 -6.029999 -7.065990 10.140000 -6.029999 -7.065990
7.428000 -9.948999 -4.676990 7.428000 -9.948999 -4.676990
- 5.908000 -13.525000 -3.211990 5.908000 -13.525000 -3.211990
+ 5.908000 -13.524999 -3.211990 5.908000 -13.524999 -3.211990
-1.158000 -13.931000 2.128000 -1.158000 -13.931000 2.128000
-4.206000 -12.551000 4.292000 -4.206000 -12.551000 4.292000
-8.106000 -9.774001 6.968000 -8.106000 -9.774001 6.968000
7.780000 -64.586999 -0.001990 7.780000 -64.586999 -0.001990
--51.520000 -6.207004 39.233000 -51.520000 -6.207004 39.233000
+-51.520000 -6.207005 39.233000 -51.520000 -6.207005 39.233000
-11.702000 -9.606001 9.652000 -11.702000 -9.606001 9.652000
-14.131000 -8.942001 11.415000 -14.131000 -8.942001 11.415000
-15.735000 6.499999 11.224000 -15.735000 6.499999 11.224000
-7.263000 18.041999 3.821000 -7.263000 18.041999 3.821000
- -3.802000 20.170000 1.031000 -3.802000 20.170000 1.031000
- 5.606000 16.496000 -5.698990 5.606000 16.496000 -5.698990
+ -3.802010 20.170000 1.031000 -3.802010 20.170000 1.031000
+ 5.606000 16.496001 -5.699000 5.606000 16.496001 -5.699000
13.043000 6.532001 -10.380990 13.043000 6.532001 -10.380990
- 16.366000 -0.459999 -12.242990 16.366000 -0.459999 -12.242990
+ 16.366000 -0.459998 -12.242990 16.366000 -0.459998 -12.242990
10.813000 -12.685999 -6.969990 10.813000 -12.685999 -6.969990
- 6.486000 -18.502000 -3.195990 6.486000 -18.502000 -3.195990
+ 6.486000 -18.501999 -3.195990 6.486000 -18.501999 -3.195990
-1.475000 -18.465000 2.776000 -1.475000 -18.465000 2.776000
-6.861000 -22.762001 7.207000 -6.861000 -22.762001 7.207000
-15.431000 -14.808001 12.921000 -15.431000 -14.808001 12.921000
-20.024000 -3.017002 15.303000 -20.024000 -3.017002 15.303000
-20.453000 3.235998 15.060000 -20.453000 3.235998 15.060000
-19.766000 11.549998 13.793000 -19.766000 11.549998 13.793000
- -8.760000 21.820999 4.603000 -8.760000 21.820999 4.603000
- -2.807000 24.299000 -0.090000 -2.807000 24.299000 -0.090000
+ -8.760010 21.820999 4.603000 -8.760010 21.820999 4.603000
+ -2.807010 24.299000 -0.090000 -2.807010 24.299000 -0.090000
8.290000 23.371001 -8.334990 8.290000 23.371001 -8.334990
- 16.576000 13.109001 -13.626990 16.576000 13.109001 -13.626990
+ 16.576000 13.109002 -13.626990 16.576000 13.109002 -13.626990
20.266000 4.806002 -15.645990 20.266000 4.806002 -15.645990
19.356000 -6.763998 -13.917990 19.356000 -6.763998 -13.917990
14.283000 -21.184999 -8.805990 14.283000 -21.184999 -8.805990
- 1.119000 -26.958000 1.597010 1.119000 -26.958000 1.597010
+ 1.119000 -26.958000 1.597000 1.119000 -26.958000 1.597000
-8.920000 -32.071001 9.594000 -8.920000 -32.071001 9.594000
-17.532000 -21.216002 15.078000 -17.532000 -21.216002 15.078000
-23.727000 -8.446002 18.573000 -23.727000 -8.446002 18.573000
-26.075000 -0.868002 19.651000 -26.075000 -0.868002 19.651000
--22.010000 16.989998 14.985000 -22.010000 16.989998 14.985000
+-22.010010 16.989998 14.985000 -22.010010 16.989998 14.985000
-13.230010 30.679999 7.158000 -13.230010 30.679999 7.158000
-3.873010 33.863000 -0.153000 -3.873010 33.863000 -0.153000
- 2.926000 29.459000 -4.859000 2.926000 29.459000 -4.859000
+ 2.925990 29.459000 -4.859000 2.925990 29.459000 -4.859000
14.640000 27.804001 -13.501990 14.640000 27.804001 -13.501990
24.571000 12.778002 -19.598990 24.571000 12.778002 -19.598990
- 26.653000 4.092002 -20.375990 26.653000 4.092002 -20.375990
- 26.587000 -11.795998 -18.890990 26.587000 -11.795998 -18.890990
+ 26.653000 4.092003 -20.375990 26.653000 4.092003 -20.375990
+ 26.587000 -11.795997 -18.890990 26.587000 -11.795997 -18.890990
22.346000 -17.782998 -15.165990 22.346000 -17.782998 -15.165990
10.447000 -31.206999 -5.020990 10.447000 -31.206999 -5.020990
- 5.091000 -30.224000 -1.089990 5.091000 -30.224000 -1.089990
- 4.740000 -36.439000 -0.264990 4.740000 -36.439000 -0.264990
+ 5.091000 -30.223999 -1.089990 5.091000 -30.223999 -1.089990
+ 4.740000 -36.438999 -0.264990 4.740000 -36.438999 -0.264990
-25.717000 -24.885002 21.553000 -25.717000 -24.885002 21.553000
-31.994000 -0.137003 24.027000 -31.994000 -0.137003 24.027000
-30.492010 19.667997 21.110000 -30.492010 19.667997 21.110000
-21.881010 31.002998 13.622000 -21.881010 31.002998 13.622000
- 13.669000 36.392001 -13.548990 13.669000 36.392001 -13.548990
+ 13.668990 36.392001 -13.548990 13.668990 36.392001 -13.548990
24.634000 18.027002 -20.119990 24.634000 18.027002 -20.119990
32.735000 4.661003 -24.992990 32.735000 4.661003 -24.992990
- 17.625000 -32.988999 -10.247990 17.625000 -32.988999 -10.247990
+ 17.625000 -32.988998 -10.247990 17.625000 -32.988998 -10.247990
]
HBA
-3 [ 3826290.015950000 462800.002614000 5064947.127 ]
+3 [ 3826289.972540000 462800.050054000 5064947.155 ]
48 x 2 x 3 [
- 31.567000 -44.273998 -19.692990 31.567000 -44.273998 -19.692990
- 31.094000 -39.146998 -19.801990 31.094000 -39.146998 -19.801990
+ 31.567000 -44.273997 -19.692990 31.567000 -44.273997 -19.692990
+ 31.094000 -39.146997 -19.801990 31.094000 -39.146997 -19.801990
36.138000 -49.088997 -22.688990 36.138000 -49.088997 -22.688990
35.665000 -43.960997 -22.796990 35.665000 -43.960997 -22.796990
35.192000 -38.833997 -22.905990 35.192000 -38.833997 -22.905990
34.718000 -33.706997 -23.013990 34.718000 -33.706997 -23.013990
- 40.708010 -53.901997 -25.684990 40.708010 -53.901997 -25.684990
- 40.235010 -48.774997 -25.792990 40.235010 -48.774997 -25.792990
- 39.762000 -43.648997 -25.900990 39.762000 -43.648997 -25.900990
- 39.289000 -38.521997 -26.008990 39.289000 -38.521997 -26.008990
+ 40.708010 -53.901996 -25.684990 40.708010 -53.901996 -25.684990
+ 40.235010 -48.774996 -25.792990 40.235010 -48.774996 -25.792990
+ 39.762000 -43.648996 -25.900990 39.762000 -43.648996 -25.900990
+ 39.289000 -38.521996 -26.008990 39.289000 -38.521996 -26.008990
38.816000 -33.394997 -26.117990 38.816000 -33.394997 -26.117990
38.343000 -28.266997 -26.225990 38.343000 -28.266997 -26.225990
44.806010 -53.589996 -28.788990 44.806010 -53.589996 -28.788990
- 44.333010 -48.462997 -28.896990 44.333010 -48.462997 -28.896990
- 43.860000 -43.335997 -29.004990 43.860000 -43.335997 -29.004990
- 43.386000 -38.207997 -29.112990 43.386000 -38.207997 -29.112990
- 42.913000 -33.081997 -29.221990 42.913000 -33.081997 -29.221990
- 42.440000 -27.954997 -29.329990 42.440000 -27.954997 -29.329990
+ 44.333010 -48.462996 -28.896990 44.333010 -48.462996 -28.896990
+ 43.860000 -43.335996 -29.004990 43.860000 -43.335996 -29.004990
+ 43.386000 -38.207996 -29.112990 43.386000 -38.207996 -29.112990
+ 42.913000 -33.081996 -29.221990 42.913000 -33.081996 -29.221990
+ 42.440000 -27.954996 -29.329990 42.440000 -27.954996 -29.329990
48.431010 -48.149996 -32.000990 48.431010 -48.149996 -32.000990
47.957010 -43.022996 -32.108990 47.957010 -43.022996 -32.108990
47.484000 -37.895996 -32.216990 47.484000 -37.895996 -32.216990
47.011000 -32.768996 -32.325990 47.011000 -32.768996 -32.325990
- 52.055010 -42.710996 -35.212990 52.055010 -42.710996 -35.212990
- 51.582000 -37.583996 -35.320990 51.582000 -37.583996 -35.320990
+ 52.055010 -42.710995 -35.212990 52.055010 -42.710995 -35.212990
+ 51.582000 -37.583995 -35.320990 51.582000 -37.583995 -35.320990
-51.582010 37.584995 35.321000 -51.582010 37.584995 35.321000
-52.055010 42.711995 35.212000 -52.055010 42.711995 35.212000
--47.011010 32.769996 32.325000 -47.011010 32.769996 32.325000
--47.484010 37.896996 32.217000 -47.484010 37.896996 32.217000
--47.957010 43.023996 32.108000 -47.957010 43.023996 32.108000
--48.431010 48.151996 32.001000 -48.431010 48.151996 32.001000
--42.441000 27.955996 29.329000 -42.441000 27.955996 29.329000
+-47.011010 32.769995 32.325000 -47.011010 32.769995 32.325000
+-47.484010 37.896995 32.217000 -47.484010 37.896995 32.217000
+-47.957010 43.023995 32.108000 -47.957010 43.023995 32.108000
+-48.431010 48.151995 32.001000 -48.431010 48.151995 32.001000
+-42.441010 27.955996 29.329000 -42.441010 27.955996 29.329000
-42.914010 33.082996 29.221000 -42.914010 33.082996 29.221000
-43.386010 38.209996 29.113000 -43.386010 38.209996 29.113000
-43.860010 43.336996 29.005000 -43.860010 43.336996 29.005000
-44.333010 48.463996 28.896000 -44.333010 48.463996 28.896000
--44.806010 53.590996 28.788000 -44.806010 53.590996 28.788000
--38.343000 28.268996 26.225000 -38.343000 28.268996 26.225000
+-44.806010 53.590995 28.788000 -44.806010 53.590995 28.788000
+-38.343010 28.268996 26.225000 -38.343010 28.268996 26.225000
-38.816010 33.395996 26.117000 -38.816010 33.395996 26.117000
-39.289010 38.522996 26.009000 -39.289010 38.522996 26.009000
-39.763010 43.649996 25.901000 -39.763010 43.649996 25.901000
-40.235010 48.775996 25.792000 -40.235010 48.775996 25.792000
-40.708010 53.903996 25.684000 -40.708010 53.903996 25.684000
--34.718010 33.707997 23.013000 -34.718010 33.707997 23.013000
--35.192010 38.834997 22.905000 -35.192010 38.834997 22.905000
--35.665010 43.962997 22.797000 -35.665010 43.962997 22.797000
--36.138010 49.089997 22.688000 -36.138010 49.089997 22.688000
+-34.718010 33.707996 23.013000 -34.718010 33.707996 23.013000
+-35.192010 38.834996 22.905000 -35.192010 38.834996 22.905000
+-35.665010 43.962996 22.797000 -35.665010 43.962996 22.797000
+-36.138010 49.089996 22.688000 -36.138010 49.089996 22.688000
-31.094010 39.147997 19.801000 -31.094010 39.147997 19.801000
-31.567010 44.274997 19.693000 -31.567010 44.274997 19.693000
]
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826331.589950000 462759.073617000 5064919.620 ]
+3 [ 3826331.546540000 462759.121058000 5064919.648 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826248.440940000 462840.932610000 5064974.634 ]
+3 [ 3826248.397530000 462840.980050000 5064974.662 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS201-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS201-AntennaField.conf
index 14e0d63dcff2ec6f6cc9ba8abaf84357369bfe9d..4c1ec56ffd983b2d7b9abc5f980424bce44b0947 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS201-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS201-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS201
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:40
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:09
#
NORMAL_VECTOR LBA
@@ -15,49 +15,49 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826708.929040000 461913.746650000 5064713.838 ]
+3 [ 3826708.885640000 461913.794094000 5064713.866 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
- -1.338000 2.104999 0.814000 -1.338000 2.104999 0.814000
+ -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
+ -1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
- -0.800000 -2.363001 0.814000 -0.800000 -2.363001 0.814000
+ -0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
1.696000 5.264000 -1.749000 1.696000 5.264000 -1.749000
- 4.079000 2.490000 -3.287000 4.079000 2.490000 -3.287000
- 4.553000 -1.450000 -3.287000 4.553000 -1.450000 -3.287000
+ 4.079000 2.490001 -3.287000 4.079000 2.490001 -3.287000
+ 4.553000 -1.449999 -3.287000 4.553000 -1.449999 -3.287000
2.897000 -4.710000 -1.749000 2.897000 -4.710000 -1.749000
-0.114000 -5.767000 0.607000 -0.114000 -5.767000 0.607000
- -3.073000 -4.125001 2.679000 -3.073000 -4.125001 2.679000
- -4.593000 -0.553001 3.498000 -4.593000 -0.553001 3.498000
- -3.965000 3.276999 2.680000 -3.965000 3.276999 2.680000
- -1.481000 5.574999 0.607000 -1.481000 5.574999 0.607000
- -1.753000 9.146999 0.489000 -1.753000 9.146999 0.489000
+ -3.073000 -4.125000 2.679000 -3.073000 -4.125000 2.679000
+ -4.593000 -0.553000 3.498000 -4.593000 -0.553000 3.498000
+ -3.965000 3.277000 2.680000 -3.965000 3.277000 2.680000
+ -1.481000 5.575000 0.607000 -1.481000 5.575000 0.607000
+ -1.753000 9.147000 0.489000 -1.753000 9.147000 0.489000
1.119000 9.670000 -1.714000 1.119000 9.670000 -1.714000
- 4.965000 7.891000 -4.440000 4.965000 7.891000 -4.440000
- 7.930000 1.451000 -6.083000 7.930000 1.451000 -6.083000
- 8.081000 -1.769000 -5.906000 8.081000 -1.769000 -5.906000
- 6.896000 -5.703000 -4.661000 6.896000 -5.703000 -4.661000
- 4.096000 -7.937000 -2.357000 4.096000 -7.937000 -2.357000
+ 4.965000 7.891001 -4.440000 4.965000 7.891001 -4.440000
+ 7.930000 1.451001 -6.083000 7.930000 1.451001 -6.083000
+ 8.081000 -1.768999 -5.906000 8.081000 -1.768999 -5.906000
+ 6.896000 -5.702999 -4.661000 6.896000 -5.702999 -4.661000
+ 4.096000 -7.936999 -2.357000 4.096000 -7.936999 -2.357000
-0.431000 -8.902000 1.128000 -0.431000 -8.902000 1.128000
- -4.235000 -8.066001 3.908000 -4.235000 -8.066001 3.908000
- -6.817000 -4.934001 5.563000 -6.817000 -4.934001 5.563000
+ -4.235000 -8.066000 3.908000 -4.235000 -8.066000 3.908000
+ -6.817000 -4.934000 5.563000 -6.817000 -4.934000 5.563000
-7.358000 -1.027001 5.616000 -7.358000 -1.027001 5.616000
- -6.757000 3.703999 4.737000 -6.757000 3.703999 4.737000
- -4.664000 7.412999 2.831000 -4.664000 7.412999 2.831000
- -1.603000 14.257999 -0.085000 -1.603000 14.257999 -0.085000
+ -6.757000 3.704000 4.737000 -6.757000 3.704000 4.737000
+ -4.664000 7.413000 2.831000 -4.664000 7.413000 2.831000
+ -1.603000 14.258000 -0.085000 -1.603000 14.258000 -0.085000
1.431000 14.523000 -2.387000 1.431000 14.523000 -2.387000
- 3.707000 13.077000 -3.965000 3.707000 13.077000 -3.965000
- 8.420000 7.373000 -6.986000 8.420000 7.373000 -6.986000
- 10.708000 6.325000 -8.609000 10.708000 6.325000 -8.609000
- 10.662000 -1.132000 -7.901000 10.662000 -1.132000 -7.901000
- 9.603000 -5.942000 -6.671000 9.603000 -5.942000 -6.671000
- 8.701000 -11.054000 -5.532000 8.701000 -11.054000 -5.532000
- 6.065000 -11.538000 -3.510000 6.065000 -11.538000 -3.510000
+ 3.707000 13.077001 -3.965000 3.707000 13.077001 -3.965000
+ 8.420000 7.373001 -6.986000 8.420000 7.373001 -6.986000
+ 10.708000 6.325001 -8.609000 10.708000 6.325001 -8.609000
+ 10.662000 -1.131999 -7.901000 10.662000 -1.131999 -7.901000
+ 9.603000 -5.941999 -6.671000 9.603000 -5.941999 -6.671000
+ 8.701000 -11.053999 -5.532000 8.701000 -11.053999 -5.532000
+ 6.065000 -11.537999 -3.510000 6.065000 -11.537999 -3.510000
2.455000 -12.795000 -0.686000 2.455000 -12.795000 -0.686000
- -3.156000 -12.356001 3.485000 -3.156000 -12.356001 3.485000
- -5.337000 -11.621001 5.056000 -5.337000 -11.621001 5.056000
+ -3.156000 -12.356000 3.485000 -3.156000 -12.356000 3.485000
+ -5.337000 -11.621000 5.056000 -5.337000 -11.621000 5.056000
-8.333000 -7.638001 6.945000 -8.333000 -7.638001 6.945000
-11.117000 -5.185001 8.813000 -11.117000 -5.185001 8.813000
-11.083000 3.641999 7.990000 -11.083000 3.641999 7.990000
@@ -66,102 +66,102 @@ LBA
-40.728000 -37.672004 33.976000 -40.728000 -37.672004 33.976000
-32.500000 52.831997 19.620000 -32.500000 52.831997 19.620000
-7.090000 16.034999 3.872000 -7.090000 16.034999 3.872000
- -6.435000 18.941999 3.118000 -6.435000 18.941999 3.118000
- 5.996000 18.486000 -6.172000 5.996000 18.486000 -6.172000
- 14.798000 6.151001 -11.662990 14.798000 6.151001 -11.662990
- 16.324000 1.522001 -12.390990 16.324000 1.522001 -12.390990
- 12.909000 -9.564999 -8.824990 12.909000 -9.564999 -8.824990
- 4.563000 -17.211000 -1.870000 4.563000 -17.211000 -1.870000
- -1.198000 -20.225001 2.727000 -1.198000 -20.225001 2.727000
+ -6.435000 18.942000 3.118000 -6.435000 18.942000 3.118000
+ 5.996000 18.486001 -6.172000 5.996000 18.486001 -6.172000
+ 14.798000 6.151002 -11.663000 14.798000 6.151002 -11.663000
+ 16.324000 1.522002 -12.391000 16.324000 1.522002 -12.391000
+ 12.909000 -9.564999 -8.825000 12.909000 -9.564999 -8.825000
+ 4.563000 -17.210999 -1.870000 4.563000 -17.210999 -1.870000
+ -1.198000 -20.225000 2.727000 -1.198000 -20.225000 2.727000
-10.694000 -11.402001 9.058000 -10.694000 -11.402001 9.058000
--15.127000 -5.114002 11.817000 -15.127000 -5.114002 11.817000
--14.693000 4.753998 10.599000 -14.693000 4.753998 10.599000
+-15.127000 -5.114001 11.817000 -15.127000 -5.114001 11.817000
+-14.693000 4.753999 10.599000 -14.693000 4.753999 10.599000
-17.858000 12.113998 12.309000 -17.858000 12.113998 12.309000
-11.061000 21.482999 6.361000 -11.061000 21.482999 6.361000
- -1.398000 25.313999 -1.238000 -1.398000 25.313999 -1.238000
- 3.625000 24.855000 -4.967000 3.625000 24.855000 -4.967000
- 10.240000 22.687000 -9.737000 10.240000 22.687000 -9.737000
- 17.896000 7.410001 -14.102990 17.896000 7.410001 -14.102990
- 19.576000 -0.366999 -14.660990 19.576000 -0.366999 -14.660990
- 18.272000 -13.982999 -12.451990 18.272000 -13.982999 -12.451990
- 9.644000 -22.634000 -5.192990 9.644000 -22.634000 -5.192990
- 2.816000 -25.896000 0.227000 2.816000 -25.896000 0.227000
- -6.391000 -22.936001 6.870000 -6.391000 -22.936001 6.870000
--17.667000 -14.360002 14.559000 -17.667000 -14.360002 14.559000
+ -1.398000 25.314000 -1.238000 -1.398000 25.314000 -1.238000
+ 3.625000 24.855001 -4.967000 3.625000 24.855001 -4.967000
+ 10.240000 22.687001 -9.737000 10.240000 22.687001 -9.737000
+ 17.896000 7.410002 -14.103000 17.896000 7.410002 -14.103000
+ 19.576000 -0.366998 -14.661000 19.576000 -0.366998 -14.661000
+ 18.272010 -13.982998 -12.452000 18.272010 -13.982998 -12.452000
+ 9.644010 -22.633999 -5.193000 9.644010 -22.633999 -5.193000
+ 2.816010 -25.896000 0.227000 2.816010 -25.896000 0.227000
+ -6.391000 -22.936000 6.870000 -6.391000 -22.936000 6.870000
+-17.667000 -14.360001 14.559000 -17.667000 -14.360001 14.559000
-21.615000 2.884998 15.964000 -21.615000 2.884998 15.964000
--25.196000 16.141997 17.454000 -25.196000 16.141997 17.454000
--16.080000 25.106998 9.801000 -16.080000 25.106998 9.801000
- -5.554000 30.766999 1.388000 -5.554000 30.766999 1.388000
+-25.196000 16.141998 17.454000 -25.196000 16.141998 17.454000
+-16.080000 25.106999 9.801000 -16.080000 25.106999 9.801000
+ -5.554000 30.767000 1.388000 -5.554000 30.767000 1.388000
0.627000 32.478000 -3.406000 0.627000 32.478000 -3.406000
- 14.704000 24.606001 -13.260990 14.704000 24.606001 -13.260990
- 25.211000 11.549002 -19.967990 25.211000 11.549002 -19.967990
- 27.280000 -0.560998 -20.425990 27.280000 -0.560998 -20.425990
- 23.416000 -8.298998 -16.825990 23.416000 -8.298998 -16.825990
- 21.494000 -22.560999 -14.094990 21.494000 -22.560999 -14.094990
- 8.977010 -32.500000 -3.799990 8.977010 -32.500000 -3.799990
- 1.923000 -33.702000 1.603000 1.923000 -33.702000 1.603000
--10.779000 -31.113001 10.903000 -10.779000 -31.113001 10.903000
--15.360000 -24.896002 13.780000 -15.360000 -24.896002 13.780000
--25.492000 -8.017003 19.859000 -25.492000 -8.017003 19.859000
+ 14.704000 24.606002 -13.261000 14.704000 24.606002 -13.261000
+ 25.211000 11.549003 -19.968000 25.211000 11.549003 -19.968000
+ 27.280000 -0.560997 -20.426000 27.280000 -0.560997 -20.426000
+ 23.416000 -8.298998 -16.826000 23.416000 -8.298998 -16.826000
+ 21.494010 -22.560998 -14.095000 21.494010 -22.560998 -14.095000
+ 8.977010 -32.499999 -3.800000 8.977010 -32.499999 -3.800000
+ 1.923010 -33.702000 1.603000 1.923010 -33.702000 1.603000
+-10.778990 -31.113001 10.903000 -10.778990 -31.113001 10.903000
+-15.360000 -24.896001 13.780000 -15.360000 -24.896001 13.780000
+-25.492000 -8.017002 19.859000 -25.492000 -8.017002 19.859000
-24.434000 -1.524002 18.478000 -24.434000 -1.524002 18.478000
-29.385000 -0.106003 22.067000 -29.385000 -0.106003 22.067000
-18.602000 35.831998 10.724000 -18.602000 35.831998 10.724000
1.516000 39.706000 -4.727000 1.516000 39.706000 -4.727000
- 17.279000 34.706001 -16.106990 17.279000 34.706001 -16.106990
- 25.909000 22.229002 -21.456990 25.909000 22.229002 -21.456990
- 28.414010 -22.713998 -19.274990 28.414010 -22.713998 -19.274990
- 13.167010 -33.404999 -6.863990 13.167010 -33.404999 -6.863990
+ 17.279000 34.706002 -16.107000 17.279000 34.706002 -16.107000
+ 25.909000 22.229003 -21.457000 25.909000 22.229003 -21.457000
+ 28.414010 -22.713997 -19.275000 28.414010 -22.713997 -19.275000
+ 13.167010 -33.404999 -6.864000 13.167010 -33.404999 -6.864000
2.071010 -41.339000 2.182000 2.071010 -41.339000 2.182000
--27.274000 -16.632003 21.976000 -27.274000 -16.632003 21.976000
+-27.274000 -16.632002 21.976000 -27.274000 -16.632002 21.976000
]
HBA
-3 [ 3826685.051040000 461918.690648000 5064731.315 ]
+3 [ 3826685.007640000 461918.738092000 5064731.343 ]
48 x 2 x 3 [
--15.513000 -57.872002 16.875000 -15.513000 -57.872002 16.875000
--13.242000 -53.743002 14.796000 -13.242000 -53.743002 14.796000
--14.341990 -65.056002 16.645000 -14.341990 -65.056002 16.645000
--12.070000 -60.928001 14.566000 -12.070000 -60.928001 14.566000
- -9.799000 -56.799001 12.488000 -9.799000 -56.799001 12.488000
- -7.528000 -52.670001 10.410000 -7.528000 -52.670001 10.410000
--13.169990 -72.241002 16.415000 -13.169990 -72.241002 16.415000
+-15.512990 -57.872002 16.875000 -15.512990 -57.872002 16.875000
+-13.241990 -53.743001 14.796000 -13.241990 -53.743001 14.796000
+-14.341990 -65.056001 16.645000 -14.341990 -65.056001 16.645000
+-12.069990 -60.928001 14.566000 -12.069990 -60.928001 14.566000
+ -9.798990 -56.799001 12.488000 -9.798990 -56.799001 12.488000
+ -7.527990 -52.670001 10.410000 -7.527990 -52.670001 10.410000
+-13.169990 -72.241001 16.415000 -13.169990 -72.241001 16.415000
-10.898990 -68.113001 14.336000 -10.898990 -68.113001 14.336000
-8.626990 -63.984001 12.258000 -8.626990 -63.984001 12.258000
-6.355990 -59.855001 10.180000 -6.355990 -59.855001 10.180000
- -4.085000 -55.727001 8.102000 -4.085000 -55.727001 8.102000
- -1.813000 -51.598001 6.024000 -1.813000 -51.598001 6.024000
+ -4.084990 -55.727000 8.102000 -4.084990 -55.727000 8.102000
+ -1.812990 -51.598000 6.024000 -1.812990 -51.598000 6.024000
-9.725990 -75.297001 14.106000 -9.725990 -75.297001 14.106000
-7.454990 -71.169001 12.028000 -7.454990 -71.169001 12.028000
-5.183990 -67.040001 9.950000 -5.183990 -67.040001 9.950000
- -2.911990 -62.911001 7.872000 -2.911990 -62.911001 7.872000
+ -2.911990 -62.911000 7.872000 -2.911990 -62.911000 7.872000
-0.640990 -58.783000 5.794000 -0.640990 -58.783000 5.794000
1.630010 -54.654000 3.715000 1.630010 -54.654000 3.715000
- -4.011990 -74.225001 9.720000 -4.011990 -74.225001 9.720000
- -1.740990 -70.096001 7.642000 -1.740990 -70.096001 7.642000
+ -4.011990 -74.225000 9.720000 -4.011990 -74.225000 9.720000
+ -1.740990 -70.096000 7.642000 -1.740990 -70.096000 7.642000
0.531010 -65.967000 5.564000 0.531010 -65.967000 5.564000
2.802010 -61.839000 3.485000 2.802010 -61.839000 3.485000
1.702010 -73.152000 5.333000 1.702010 -73.152000 5.333000
3.974010 -69.023000 3.255000 3.974010 -69.023000 3.255000
-3.973010 69.023999 -3.257000 -3.973010 69.023999 -3.257000
- -1.702010 73.152999 -5.335000 -1.702010 73.152999 -5.335000
- -2.802000 61.838999 -3.487000 -2.802000 61.838999 -3.487000
- -0.530010 65.966999 -5.565000 -0.530010 65.966999 -5.565000
+ -1.702010 73.153000 -5.335000 -1.702010 73.153000 -5.335000
+ -2.802000 61.839000 -3.487000 -2.802000 61.839000 -3.487000
+ -0.530000 65.967000 -5.565000 -0.530000 65.967000 -5.565000
1.740990 70.097000 -7.643000 1.740990 70.097000 -7.643000
4.011990 74.225000 -9.721000 4.011990 74.225000 -9.721000
- -1.630000 54.654999 -3.717000 -1.630000 54.654999 -3.717000
+ -1.630000 54.655000 -3.717000 -1.630000 54.655000 -3.717000
0.641000 58.783000 -5.795000 0.641000 58.783000 -5.795000
2.912000 62.911000 -7.873000 2.912000 62.911000 -7.873000
5.184000 67.041000 -9.951000 5.184000 67.041000 -9.951000
- 7.454990 71.169000 -12.029000 7.454990 71.169000 -12.029000
- 9.725990 75.297000 -14.107000 9.725990 75.297000 -14.107000
+ 7.454990 71.169001 -12.029000 7.454990 71.169001 -12.029000
+ 9.725990 75.297001 -14.107000 9.725990 75.297001 -14.107000
1.813000 51.599000 -6.026000 1.813000 51.599000 -6.026000
4.085000 55.727000 -8.104000 4.085000 55.727000 -8.104000
6.356000 59.855000 -10.182000 6.356000 59.855000 -10.182000
- 8.627000 63.985000 -12.260000 8.627000 63.985000 -12.260000
- 10.899000 68.113000 -14.338000 10.899000 68.113000 -14.338000
- 13.169990 72.241001 -16.416000 13.169990 72.241001 -16.416000
- 7.528000 52.671000 -10.412000 7.528000 52.671000 -10.412000
- 9.799000 56.799000 -12.490000 9.799000 56.799000 -12.490000
+ 8.627000 63.985001 -12.260000 8.627000 63.985001 -12.260000
+ 10.899000 68.113001 -14.338000 10.899000 68.113001 -14.338000
+ 13.170000 72.241001 -16.416000 13.170000 72.241001 -16.416000
+ 7.528000 52.671001 -10.412000 7.528000 52.671001 -10.412000
+ 9.799000 56.799001 -12.490000 9.799000 56.799001 -12.490000
12.070000 60.929001 -14.568000 12.070000 60.929001 -14.568000
14.342000 65.057001 -16.646000 14.342000 65.057001 -16.646000
13.242000 53.743001 -14.798000 13.242000 53.743001 -14.798000
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826679.281050000 461855.242647000 5064741.380 ]
+3 [ 3826679.237650000 461855.290091000 5064741.408 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826690.821040000 461982.138648000 5064721.249 ]
+3 [ 3826690.777640000 461982.186092000 5064721.277 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS301-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS301-AntennaField.conf
index 9fa97f6f1177dedb39a1dec19289fbba6ffcbe6a..128a3d1ebab8ae160a1334738277e31aad2bed21 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS301-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS301-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS301
-# ITRF2005 target_date = 2012.5
-# Created: 2012-11-08 20:42:17
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:09
#
NORMAL_VECTOR LBA
@@ -15,157 +15,157 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3827412.865150000 460992.342709000 5064269.944 ]
+3 [ 3827412.821760000 460992.390162000 5064269.972 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
- 0.800000 2.363001 -0.814000 0.800000 2.363001 -0.814000
- 2.019000 0.243001 -1.538000 2.019000 0.243001 -1.538000
- 1.338000 -2.104999 -0.814000 1.338000 -2.104999 -0.814000
- -0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- 2.822000 4.398001 -2.516000 2.822000 4.398001 -2.516000
- 4.534000 0.954001 -3.489000 4.534000 0.954001 -3.489000
- 4.124000 -2.936999 -2.830000 4.124000 -2.936999 -2.830000
- 1.784000 -5.453999 -0.846000 1.784000 -5.453999 -0.846000
- -1.390000 -5.418000 1.533000 -1.390000 -5.418000 1.533000
- -3.914000 -2.848000 3.196000 -3.914000 -2.848000 3.196000
- -4.606000 1.056000 3.362000 -4.606000 1.056000 3.362000
- -3.143000 4.464000 1.956000 -3.143000 4.464000 1.956000
+ 0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
+ 2.019010 0.243000 -1.538000 2.019010 0.243000 -1.538000
+ 1.338010 -2.105000 -0.814000 1.338010 -2.105000 -0.814000
+ -0.799990 -2.363000 0.814000 -0.799990 -2.363000 0.814000
+ 2.822000 4.398000 -2.516000 2.822000 4.398000 -2.516000
+ 4.534010 0.954000 -3.489000 4.534010 0.954000 -3.489000
+ 4.124010 -2.937000 -2.830000 4.124010 -2.937000 -2.830000
+ 1.784010 -5.454000 -0.846000 1.784010 -5.454000 -0.846000
+ -1.389990 -5.418000 1.533000 -1.389990 -5.418000 1.533000
+ -3.913990 -2.848001 3.196000 -3.913990 -2.848001 3.196000
+ -4.606000 1.055999 3.362000 -4.606000 1.055999 3.362000
+ -3.143000 4.463999 1.956000 -3.143000 4.463999 1.956000
-0.210000 5.784000 -0.365000 -0.210000 5.784000 -0.365000
0.316000 9.259000 -1.074000 0.316000 9.259000 -1.074000
- 3.237000 8.766001 -3.222000 3.237000 8.766001 -3.222000
- 6.596000 5.760001 -5.472000 6.596000 5.760001 -5.472000
- 8.062000 -1.351999 -5.930000 8.062000 -1.351999 -5.930000
- 7.496000 -4.450999 -5.225000 7.496000 -4.450999 -5.225000
- 5.467000 -7.767999 -3.402000 5.467000 -7.767999 -3.402000
- 2.239000 -8.918999 -0.874000 2.239000 -8.918999 -0.874000
- -2.394000 -8.277000 2.545000 -2.394000 -8.277000 2.545000
- -5.922000 -6.178000 5.004000 -5.922000 -6.178000 5.004000
- -7.749000 -2.326000 6.027000 -7.749000 -2.326000 6.027000
- -7.411000 1.558000 5.422000 -7.411000 1.558000 5.422000
- -5.774000 5.828000 3.807000 -5.774000 5.828000 3.807000
- -2.909000 8.619000 1.405000 -2.909000 8.619000 1.405000
- 1.595000 14.044001 -2.467000 1.595000 14.044001 -2.467000
- 4.616000 13.252001 -4.663000 4.616000 13.252001 -4.663000
- 6.517000 11.101001 -5.895000 6.517000 11.101001 -5.895000
- 9.854000 4.084001 -7.766000 9.854000 4.084001 -7.766000
- 11.855000 2.306001 -9.107000 11.855000 2.306001 -9.107000
- 10.157000 -4.735999 -7.196000 10.157000 -4.735999 -7.196000
- 8.057000 -8.923999 -5.241000 8.057000 -8.923999 -5.241000
- 6.043000 -13.450999 -3.320000 6.043000 -13.450999 -3.320000
- 3.363000 -13.003999 -1.349000 3.363000 -13.003999 -1.349000
- -0.440000 -12.953000 1.501000 -0.440000 -12.953000 1.501000
- -5.819000 -10.608000 5.327000 -5.819000 -10.608000 5.327000
- -7.786000 -9.162000 6.672000 -7.786000 -9.162000 6.672000
- -9.828000 -4.363000 7.771000 -9.828000 -4.363000 7.771000
+ 3.237000 8.766000 -3.222000 3.237000 8.766000 -3.222000
+ 6.596000 5.760000 -5.472000 6.596000 5.760000 -5.472000
+ 8.062010 -1.352000 -5.930000 8.062010 -1.352000 -5.930000
+ 7.496010 -4.451000 -5.225000 7.496010 -4.451000 -5.225000
+ 5.467010 -7.768000 -3.402000 5.467010 -7.768000 -3.402000
+ 2.239010 -8.919000 -0.874000 2.239010 -8.919000 -0.874000
+ -2.393990 -8.277000 2.545000 -2.393990 -8.277000 2.545000
+ -5.921990 -6.178001 5.004000 -5.921990 -6.178001 5.004000
+ -7.749000 -2.326001 6.027000 -7.749000 -2.326001 6.027000
+ -7.411000 1.557999 5.422000 -7.411000 1.557999 5.422000
+ -5.774000 5.827999 3.807000 -5.774000 5.827999 3.807000
+ -2.909000 8.618999 1.405000 -2.909000 8.618999 1.405000
+ 1.595000 14.044000 -2.467000 1.595000 14.044000 -2.467000
+ 4.616000 13.252000 -4.663000 4.616000 13.252000 -4.663000
+ 6.517000 11.101000 -5.895000 6.517000 11.101000 -5.895000
+ 9.854010 4.084001 -7.766000 9.854010 4.084001 -7.766000
+ 11.855010 2.306001 -9.107000 11.855010 2.306001 -9.107000
+ 10.157010 -4.735999 -7.196000 10.157010 -4.735999 -7.196000
+ 8.057010 -8.924000 -5.241000 8.057010 -8.924000 -5.241000
+ 6.043010 -13.451000 -3.320000 6.043010 -13.451000 -3.320000
+ 3.363010 -13.004000 -1.349000 3.363010 -13.004000 -1.349000
+ -0.439990 -12.953000 1.501000 -0.439990 -12.953000 1.501000
+ -5.818990 -10.608001 5.327000 -5.818990 -10.608001 5.327000
+ -7.785990 -9.162001 6.672000 -7.785990 -9.162001 6.672000
+ -9.828000 -4.363001 7.771000 -9.828000 -4.363001 7.771000
-12.002000 -1.085001 9.107000 -12.002000 -1.085001 9.107000
--10.012000 7.257000 6.859000 -10.012000 7.257000 6.859000
- -7.994000 10.196000 5.079000 -7.994000 10.196000 5.079000
- -4.658000 13.524000 2.274000 -4.658000 13.524000 2.274000
+-10.012000 7.256999 6.859000 -10.012000 7.256999 6.859000
+ -7.994000 10.195999 5.079000 -7.994000 10.195999 5.079000
+ -4.658000 13.523999 2.274000 -4.658000 13.523999 2.274000
40.728000 37.672004 -33.976000 40.728000 37.672004 -33.976000
32.500010 -52.831997 -19.620000 32.500010 -52.831997 -19.620000
- -3.366000 17.612000 0.935000 -3.366000 17.612000 0.935000
+ -3.366000 17.611999 0.935000 -3.366000 17.611999 0.935000
-2.083000 20.137000 -0.257000 -2.083000 20.137000 -0.257000
9.952000 15.433001 -8.865000 9.952000 15.433001 -8.865000
- 15.808000 0.735002 -11.933000 15.808000 0.735002 -11.933000
- 16.273000 -4.170998 -11.838000 16.273000 -4.170998 -11.838000
- 10.481000 -13.489999 -6.648000 10.481000 -13.489999 -6.648000
- 0.640000 -17.856999 1.134000 0.640000 -17.856999 1.134000
- -5.652000 -18.729000 5.936000 -5.652000 -18.729000 5.936000
--12.966000 -7.114001 10.376000 -12.966000 -7.114001 10.376000
--15.900000 0.359999 11.902000 -15.900000 0.359999 11.902000
--13.290000 9.548999 9.112000 -13.290000 9.548999 9.112000
--14.747000 17.601999 9.478000 -14.747000 17.601999 9.478000
- -6.036000 24.133000 2.349000 -6.036000 24.133000 2.349000
- 4.247000 24.435001 -5.396000 4.247000 24.435001 -5.396000
+ 15.808010 0.735001 -11.933000 15.808010 0.735001 -11.933000
+ 16.273010 -4.170999 -11.838000 16.273010 -4.170999 -11.838000
+ 10.481010 -13.489999 -6.648000 10.481010 -13.489999 -6.648000
+ 0.640010 -17.857000 1.134000 0.640010 -17.857000 1.134000
+ -5.651990 -18.729001 5.936000 -5.651990 -18.729001 5.936000
+-12.966000 -7.114002 10.376000 -12.966000 -7.114002 10.376000
+-15.900000 0.359998 11.902000 -15.900000 0.359998 11.902000
+-13.290000 9.548998 9.112000 -13.290000 9.548998 9.112000
+-14.747000 17.601998 9.478000 -14.747000 17.601998 9.478000
+ -6.036000 24.132999 2.349000 -6.036000 24.132999 2.349000
+ 4.247000 24.435000 -5.396000 4.247000 24.435000 -5.396000
9.048000 22.275001 -8.805000 9.048000 22.275001 -8.805000
- 15.025000 17.949002 -12.901000 15.025000 17.949002 -12.901000
- 19.112000 0.861002 -14.424000 19.112000 0.861002 -14.424000
- 19.029000 -7.076998 -13.644000 19.029000 -7.076998 -13.644000
- 14.737000 -19.512998 -9.298000 14.737000 -19.512998 -9.298000
- 4.397000 -24.734999 -1.065000 4.397000 -24.734999 -1.065000
- -2.992000 -25.475000 4.548000 -2.992000 -25.475000 4.548000
--11.323000 -19.509000 10.263000 -11.323000 -19.509000 10.263000
--20.430000 -7.517001 16.015000 -20.430000 -7.517001 16.015000
--20.464000 10.156999 14.443000 -20.464000 10.156999 14.443000
--21.020000 23.936999 13.614000 -21.020000 23.936999 13.614000
--10.130000 29.284000 4.957000 -10.130000 29.284000 4.957000
- 1.400000 31.024001 -3.855000 1.400000 31.024001 -3.855000
- 7.812000 30.520001 -8.622000 7.812000 30.520001 -8.622000
+ 15.025000 17.949001 -12.901000 15.025000 17.949001 -12.901000
+ 19.112010 0.861002 -14.424000 19.112010 0.861002 -14.424000
+ 19.029010 -7.076998 -13.644000 19.029010 -7.076998 -13.644000
+ 14.737010 -19.512999 -9.298000 14.737010 -19.512999 -9.298000
+ 4.397010 -24.735000 -1.065000 4.397010 -24.735000 -1.065000
+ -2.991990 -25.475001 4.548000 -2.991990 -25.475001 4.548000
+-11.322990 -19.509001 10.263000 -11.322990 -19.509001 10.263000
+-20.430000 -7.517002 16.015000 -20.430000 -7.517002 16.015000
+-20.464000 10.156998 14.443000 -20.464000 10.156998 14.443000
+-21.020000 23.936998 13.614000 -21.020000 23.936998 13.614000
+-10.130000 29.283999 4.957000 -10.130000 29.283999 4.957000
+ 1.400000 31.024000 -3.855000 1.400000 31.024000 -3.855000
+ 7.812000 30.520000 -8.622000 7.812000 30.520000 -8.622000
19.809000 18.234002 -16.517000 19.809000 18.234002 -16.517000
- 27.168000 2.266003 -20.598000 27.168000 2.266003 -20.598000
- 26.506000 -9.904997 -19.000000 26.506000 -9.904997 -19.000000
- 21.016000 -15.896998 -14.338000 21.016000 -15.896998 -14.338000
- 15.983000 -28.737998 -9.399000 15.983000 -28.737998 -9.399000
- 1.557000 -33.839999 1.890000 1.557000 -33.839999 1.890000
- -5.597000 -32.557000 7.144000 -5.597000 -32.557000 7.144000
--17.421000 -25.733001 15.402000 -17.421000 -25.733001 15.402000
--20.509000 -18.285001 17.047000 -20.509000 -18.285001 17.047000
--26.659000 1.176998 19.904000 -26.659000 1.176998 19.904000
--24.188000 6.952998 17.528000 -24.188000 6.952998 17.528000
--28.708000 9.997998 20.645000 -28.708000 9.997998 20.645000
--10.212000 40.307000 4.022000 -10.212000 40.307000 4.022000
+ 27.168010 2.266002 -20.598000 27.168010 2.266002 -20.598000
+ 26.506010 -9.904998 -19.000000 26.506010 -9.904998 -19.000000
+ 21.016010 -15.896998 -14.338000 21.016010 -15.896998 -14.338000
+ 15.983010 -28.737999 -9.399000 15.983010 -28.737999 -9.399000
+ 1.557010 -33.840000 1.890000 1.557010 -33.840000 1.890000
+ -5.596990 -32.557001 7.144000 -5.596990 -32.557001 7.144000
+-17.420990 -25.733002 15.402000 -17.420990 -25.733002 15.402000
+-20.508990 -18.285002 17.047000 -20.508990 -18.285002 17.047000
+-26.659000 1.176997 19.904000 -26.659000 1.176997 19.904000
+-24.188000 6.952997 17.528000 -24.188000 6.952997 17.528000
+-28.708000 9.997997 20.645000 -28.708000 9.997997 20.645000
+-10.212000 40.306999 4.022000 -10.212000 40.306999 4.022000
10.278000 37.052001 -11.064000 10.278000 37.052001 -11.064000
- 24.558000 26.904003 -20.865000 24.558000 26.904003 -20.865000
- 30.216000 12.132003 -23.777000 30.216000 12.132003 -23.777000
- 22.701000 -31.263998 -14.214000 22.701000 -31.263998 -14.214000
- 5.450000 -36.142999 -0.824000 5.450000 -36.142999 -0.824000
- -7.144000 -39.832000 8.963000 -7.144000 -39.832000 8.963000
--30.315000 -6.367002 23.331000 -30.315000 -6.367002 23.331000
+ 24.558000 26.904002 -20.865000 24.558000 26.904002 -20.865000
+ 30.216010 12.132003 -23.777000 30.216010 12.132003 -23.777000
+ 22.701010 -31.263998 -14.214000 22.701010 -31.263998 -14.214000
+ 5.450010 -36.143000 -0.824000 5.450010 -36.143000 -0.824000
+ -7.143990 -39.832001 8.963000 -7.143990 -39.832001 8.963000
+-30.315000 -6.367003 23.331000 -30.315000 -6.367003 23.331000
]
HBA
-3 [ 3827436.743150000 460987.399711000 5064252.468 ]
+3 [ 3827436.699770000 460987.447164000 5064252.496 ]
48 x 2 x 3 [
- -2.506000 72.074000 -4.634000 -2.506000 72.074000 -4.634000
- 0.626000 75.200000 -7.267000 0.626000 75.200000 -7.267000
- -2.955000 64.872000 -3.646000 -2.955000 64.872000 -3.646000
- 0.177000 67.998000 -6.280000 0.177000 67.998000 -6.280000
- 3.310000 71.124001 -8.913000 3.310000 71.124001 -8.913000
- 6.442000 74.251001 -11.547000 6.442000 74.251001 -11.547000
- -3.404000 57.670000 -2.658000 -3.404000 57.670000 -2.658000
- -0.272000 60.796000 -5.291000 -0.272000 60.796000 -5.291000
- 2.861000 63.922001 -7.926000 2.861000 63.922001 -7.926000
- 5.993000 67.048001 -10.559000 5.993000 67.048001 -10.559000
- 9.126000 70.174001 -13.193000 9.126000 70.174001 -13.193000
- 12.258000 73.300001 -15.827000 12.258000 73.300001 -15.827000
- -0.720000 53.594000 -4.304000 -0.720000 53.594000 -4.304000
- 2.412000 56.721001 -6.937000 2.412000 56.721001 -6.937000
- 5.545000 59.847001 -9.572000 5.545000 59.847001 -9.572000
- 8.677000 62.973001 -12.205000 8.677000 62.973001 -12.205000
- 11.810000 66.099001 -14.839000 11.810000 66.099001 -14.839000
- 14.942000 69.225002 -17.473000 14.942000 69.225002 -17.473000
- 5.095000 52.644001 -8.583000 5.095000 52.644001 -8.583000
- 8.228000 55.770001 -11.218000 8.228000 55.770001 -11.218000
- 11.360000 58.897001 -13.851000 11.360000 58.897001 -13.851000
- 14.493000 62.023002 -16.485000 14.493000 62.023002 -16.485000
- 10.912000 51.695001 -12.863000 10.912000 51.695001 -12.863000
- 14.044000 54.821002 -15.497000 14.044000 54.821002 -15.497000
--14.044990 -54.822001 15.497000 -14.044990 -54.822001 15.497000
--10.912990 -51.696000 12.864000 -10.912990 -51.696000 12.864000
--14.493990 -62.023001 16.485000 -14.493990 -62.023001 16.485000
--11.361990 -58.897000 13.851000 -11.361990 -58.897000 13.851000
- -8.228990 -55.771000 11.218000 -8.228990 -55.771000 11.218000
- -5.096990 -52.645000 8.583000 -5.096990 -52.645000 8.583000
--14.942990 -69.226001 17.473000 -14.942990 -69.226001 17.473000
--11.810990 -66.100000 14.839000 -11.810990 -66.100000 14.839000
- -8.677990 -62.973000 12.205000 -8.677990 -62.973000 12.205000
- -5.545990 -59.847000 9.572000 -5.545990 -59.847000 9.572000
- -2.412990 -56.721000 6.938000 -2.412990 -56.721000 6.938000
- 0.719010 -53.594999 4.304000 0.719010 -53.594999 4.304000
--12.258990 -73.301001 15.827000 -12.258990 -73.301001 15.827000
- -9.126990 -70.175000 13.193000 -9.126990 -70.175000 13.193000
- -5.993990 -67.049000 10.559000 -5.993990 -67.049000 10.559000
- -2.861990 -63.923000 7.926000 -2.861990 -63.923000 7.926000
- 0.271010 -60.795999 5.292000 0.271010 -60.795999 5.292000
- 3.403010 -57.669999 2.658000 3.403010 -57.669999 2.658000
- -6.443990 -74.251000 11.547000 -6.443990 -74.251000 11.547000
- -3.310990 -71.125000 8.913000 -3.310990 -71.125000 8.913000
- -0.178990 -67.999000 6.280000 -0.178990 -67.999000 6.280000
- 2.954010 -64.872999 3.646000 2.954010 -64.872999 3.646000
- -0.626990 -75.200000 7.267000 -0.626990 -75.200000 7.267000
- 2.505010 -72.073999 4.634000 2.505010 -72.073999 4.634000
+ -2.506010 72.074000 -4.634000 -2.506010 72.074000 -4.634000
+ 0.625990 75.200000 -7.267000 0.625990 75.200000 -7.267000
+ -2.955010 64.872000 -3.646000 -2.955010 64.872000 -3.646000
+ 0.176990 67.998000 -6.280000 0.176990 67.998000 -6.280000
+ 3.309990 71.124000 -8.913000 3.309990 71.124000 -8.913000
+ 6.441990 74.251001 -11.547000 6.441990 74.251001 -11.547000
+ -3.404010 57.670000 -2.658000 -3.404010 57.670000 -2.658000
+ -0.272010 60.796000 -5.291000 -0.272010 60.796000 -5.291000
+ 2.860990 63.922000 -7.926000 2.860990 63.922000 -7.926000
+ 5.992990 67.048001 -10.559000 5.992990 67.048001 -10.559000
+ 9.125990 70.174001 -13.193000 9.125990 70.174001 -13.193000
+ 12.257990 73.300001 -15.827000 12.257990 73.300001 -15.827000
+ -0.720010 53.594000 -4.304000 -0.720010 53.594000 -4.304000
+ 2.411990 56.721000 -6.937000 2.411990 56.721000 -6.937000
+ 5.544990 59.847000 -9.572000 5.544990 59.847000 -9.572000
+ 8.676990 62.973001 -12.205000 8.676990 62.973001 -12.205000
+ 11.809990 66.099001 -14.839000 11.809990 66.099001 -14.839000
+ 14.941990 69.225001 -17.473000 14.941990 69.225001 -17.473000
+ 5.094990 52.644000 -8.583000 5.094990 52.644000 -8.583000
+ 8.227990 55.770001 -11.218000 8.227990 55.770001 -11.218000
+ 11.359990 58.897001 -13.851000 11.359990 58.897001 -13.851000
+ 14.492990 62.023001 -16.485000 14.492990 62.023001 -16.485000
+ 10.911990 51.695001 -12.863000 10.911990 51.695001 -12.863000
+ 14.043990 54.821001 -15.497000 14.043990 54.821001 -15.497000
+-14.045000 -54.822001 15.497000 -14.045000 -54.822001 15.497000
+-10.913000 -51.696001 12.864000 -10.913000 -51.696001 12.864000
+-14.494000 -62.023001 16.485000 -14.494000 -62.023001 16.485000
+-11.362000 -58.897001 13.851000 -11.362000 -58.897001 13.851000
+ -8.229000 -55.771001 11.218000 -8.229000 -55.771001 11.218000
+ -5.097000 -52.645000 8.583000 -5.097000 -52.645000 8.583000
+-14.943000 -69.226001 17.473000 -14.943000 -69.226001 17.473000
+-11.811000 -66.100001 14.839000 -11.811000 -66.100001 14.839000
+ -8.678000 -62.973001 12.205000 -8.678000 -62.973001 12.205000
+ -5.546000 -59.847000 9.572000 -5.546000 -59.847000 9.572000
+ -2.413000 -56.721000 6.938000 -2.413000 -56.721000 6.938000
+ 0.719000 -53.595000 4.304000 0.719000 -53.595000 4.304000
+-12.259000 -73.301001 15.827000 -12.259000 -73.301001 15.827000
+ -9.127000 -70.175001 13.193000 -9.127000 -70.175001 13.193000
+ -5.994000 -67.049001 10.559000 -5.994000 -67.049001 10.559000
+ -2.862000 -63.923000 7.926000 -2.862000 -63.923000 7.926000
+ 0.271000 -60.796000 5.292000 0.271000 -60.796000 5.292000
+ 3.403000 -57.670000 2.658000 3.403000 -57.670000 2.658000
+ -6.444000 -74.251001 11.547000 -6.444000 -74.251001 11.547000
+ -3.311000 -71.125000 8.913000 -3.311000 -71.125000 8.913000
+ -0.179000 -67.999000 6.280000 -0.179000 -67.999000 6.280000
+ 2.954000 -64.873000 3.646000 2.954000 -64.873000 3.646000
+ -0.627000 -75.200000 7.267000 -0.627000 -75.200000 7.267000
+ 2.505000 -72.074000 4.634000 2.505000 -72.074000 4.634000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3827442.512150000 461050.846712000 5064242.403 ]
+3 [ 3827442.468760000 461050.894165000 5064242.431 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3827430.973160000 460923.951711000 5064262.533 ]
+3 [ 3827430.929770000 460923.999163000 5064262.561 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS302-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS302-AntennaField.conf
index e0ec0f40b1d6fcdd64207702d8720a6604c22055..0e01e213641340bb4131fe5a4c23a6e68b1e4857 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS302-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS302-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS302
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:40
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:09
#
NORMAL_VECTOR LBA
@@ -15,45 +15,45 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3827945.916270000 459792.638755000 5063990.016 ]
+3 [ 3827945.872900000 459792.686213000 5063990.045 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.020000 -0.243000 1.538000 -2.020000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
- 2.020000 0.243000 -1.538000 2.020000 0.243000 -1.538000
- 1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
+ 2.020000 0.243000 -1.537990 2.020000 0.243000 -1.537990
+ 1.338000 -2.105000 -0.813990 1.338000 -2.105000 -0.813990
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- 4.534000 0.954001 -3.489000 4.534000 0.954001 -3.489000
- 4.124000 -2.936999 -2.830000 4.124000 -2.936999 -2.830000
- 1.784000 -5.454000 -0.847000 1.784000 -5.454000 -0.847000
+ 4.534000 0.954001 -3.488990 4.534000 0.954001 -3.488990
+ 4.124000 -2.936999 -2.829990 4.124000 -2.936999 -2.829990
+ 1.784000 -5.454000 -0.846990 1.784000 -5.454000 -0.846990
-1.391000 -5.418000 1.533000 -1.391000 -5.418000 1.533000
-3.915000 -2.848000 3.195000 -3.915000 -2.848000 3.195000
-4.607000 1.056000 3.362000 -4.607000 1.056000 3.362000
-3.143000 4.464000 1.956000 -3.143000 4.464000 1.956000
-0.210000 5.784000 -0.365000 -0.210000 5.784000 -0.365000
- 2.823000 4.398000 -2.515000 2.823000 4.398000 -2.515000
- 5.041000 6.517001 -4.371000 5.041000 6.517001 -4.371000
- 7.124000 3.817001 -5.691000 7.124000 3.817001 -5.691000
- 8.260000 -1.075999 -6.102000 8.260000 -1.075999 -6.102000
- 5.757000 -7.451999 -3.648000 5.757000 -7.451999 -3.648000
- 3.702000 -9.265000 -1.942000 3.702000 -9.265000 -1.942000
- 0.363000 -10.063000 0.636000 0.363000 -10.063000 0.636000
+ 2.823000 4.398001 -2.514990 2.823000 4.398001 -2.514990
+ 5.041000 6.517001 -4.370990 5.041000 6.517001 -4.370990
+ 7.124000 3.817001 -5.690990 7.124000 3.817001 -5.690990
+ 8.260000 -1.075999 -6.101990 8.260000 -1.075999 -6.101990
+ 5.757000 -7.451999 -3.647990 5.757000 -7.451999 -3.647990
+ 3.702010 -9.264999 -1.941990 3.702010 -9.264999 -1.941990
+ 0.363000 -10.063000 0.636010 0.363000 -10.063000 0.636010
-2.818000 -8.317000 2.866000 -2.818000 -8.317000 2.866000
-6.196000 -4.133000 5.024000 -6.196000 -4.133000 5.024000
- -7.936000 0.228999 5.936000 -7.936000 0.228999 5.936000
+ -7.936000 0.229000 5.936000 -7.936000 0.229000 5.936000
-7.407000 4.511000 5.152000 -7.407000 4.511000 5.152000
-5.129000 7.079000 3.210000 -5.129000 7.079000 3.210000
-1.611000 8.891000 0.406000 -1.611000 8.891000 0.406000
- 2.126000 8.635000 -2.375000 2.126000 8.635000 -2.375000
- 8.537000 8.991001 -7.219000 8.537000 8.991001 -7.219000
- 10.547000 5.991001 -8.457000 10.547000 5.991001 -8.457000
- 10.958000 2.893001 -8.486000 10.958000 2.893001 -8.486000
- 10.003000 -4.912999 -7.064000 10.003000 -4.912999 -7.064000
- 10.686000 -7.817999 -7.314000 10.686000 -7.817999 -7.314000
- 5.686000 -11.605999 -3.219000 5.686000 -11.605999 -3.219000
- 1.838000 -12.984000 -0.207000 1.838000 -12.984000 -0.207000
- -2.115000 -14.680000 2.913000 -2.115000 -14.680000 2.913000
+ 2.126000 8.635000 -2.374990 2.126000 8.635000 -2.374990
+ 8.537000 8.991001 -7.218990 8.537000 8.991001 -7.218990
+ 10.547000 5.991001 -8.456990 10.547000 5.991001 -8.456990
+ 10.958000 2.893001 -8.485990 10.958000 2.893001 -8.485990
+ 10.003000 -4.912999 -7.063990 10.003000 -4.912999 -7.063990
+ 10.686010 -7.817999 -7.313990 10.686010 -7.817999 -7.313990
+ 5.686010 -11.605999 -3.218990 5.686010 -11.605999 -3.218990
+ 1.838010 -12.984000 -0.206990 1.838010 -12.984000 -0.206990
+ -2.114990 -14.680000 2.913000 -2.114990 -14.680000 2.913000
-4.030000 -12.206000 4.127000 -4.030000 -12.206000 4.127000
-7.048000 -9.119000 6.113000 -7.048000 -9.119000 6.113000
-10.144000 -3.093001 7.893000 -10.144000 -3.093001 7.893000
@@ -62,110 +62,110 @@ LBA
-10.173000 8.826999 6.838000 -10.173000 8.826999 6.838000
-4.266000 13.332000 1.998000 -4.266000 13.332000 1.998000
-1.131000 13.864000 -0.403000 -1.131000 13.864000 -0.403000
- 3.261000 13.624000 -3.678000 3.261000 13.624000 -3.678000
- 7.778010 -64.586999 -0.005000 7.778010 -64.586999 -0.005000
--51.522000 -6.208004 39.229000 -51.522000 -6.208004 39.229000
- 6.409000 15.576001 -6.217000 6.409000 15.576001 -6.217000
- 8.743000 16.396001 -8.042000 8.743000 16.396001 -8.042000
- 15.949000 3.309002 -12.268000 15.949000 3.309002 -12.268000
- 13.040000 -12.134999 -8.691000 13.040000 -12.134999 -8.691000
- 10.875010 -16.095999 -6.709000 10.875010 -16.095999 -6.709000
- 1.419000 -18.266000 0.584000 1.419000 -18.266000 0.584000
+ 3.261000 13.624001 -3.677990 3.261000 13.624001 -3.677990
+ 7.778010 -64.586999 -0.004990 7.778010 -64.586999 -0.004990
+-51.522000 -6.208005 39.229000 -51.522000 -6.208005 39.229000
+ 6.409000 15.576001 -6.216990 6.409000 15.576001 -6.216990
+ 8.743000 16.396001 -8.041990 8.743000 16.396001 -8.041990
+ 15.949000 3.309002 -12.267990 15.949000 3.309002 -12.267990
+ 13.040010 -12.134998 -8.690990 13.040010 -12.134998 -8.690990
+ 10.875010 -16.095999 -6.708990 10.875010 -16.095999 -6.708990
+ 1.419010 -18.266000 0.584010 1.419010 -18.266000 0.584010
-8.720000 -13.570001 7.770000 -8.720000 -13.570001 7.770000
-14.209000 -9.165001 11.492000 -14.209000 -9.165001 11.492000
-14.062000 5.191999 10.085000 -14.062000 5.191999 10.085000
-12.547000 13.008999 8.242000 -12.547000 13.008999 8.242000
-5.706000 17.636000 2.690000 -5.706000 17.636000 2.690000
-2.710000 24.693000 -0.196000 -2.710000 24.693000 -0.196000
- 7.643000 22.486001 -7.766000 7.643000 22.486001 -7.766000
- 16.034000 14.465002 -13.340000 16.034000 14.465002 -13.340000
- 18.762000 9.035002 -14.897000 18.762000 9.035002 -14.897000
- 21.312000 1.081002 -16.093000 21.312000 1.081002 -16.093000
- 15.751010 -14.690999 -10.495000 15.751010 -14.690999 -10.495000
- 11.580010 -20.427999 -6.847000 11.580010 -20.427999 -6.847000
- 1.714010 -26.083000 1.069000 1.714010 -26.083000 1.069000
- -9.266000 -21.613001 8.906000 -9.266000 -21.613001 8.906000
+ 7.643000 22.486001 -7.765990 7.643000 22.486001 -7.765990
+ 16.034000 14.465002 -13.339990 16.034000 14.465002 -13.339990
+ 18.762000 9.035002 -14.896990 18.762000 9.035002 -14.896990
+ 21.312000 1.081002 -16.092990 21.312000 1.081002 -16.092990
+ 15.751010 -14.690998 -10.494990 15.751010 -14.690998 -10.494990
+ 11.580010 -20.427999 -6.846990 11.580010 -20.427999 -6.846990
+ 1.714010 -26.083000 1.069010 1.714010 -26.083000 1.069010
+ -9.265990 -21.613001 8.906000 -9.265990 -21.613001 8.906000
-15.566000 -16.230001 13.148000 -15.566000 -16.230001 13.148000
--19.154000 -5.189001 14.844000 -19.154000 -5.189001 14.844000
+-19.154000 -5.189002 14.844000 -19.154000 -5.189002 14.844000
-20.247000 10.879998 14.213000 -20.247000 10.879998 14.213000
-11.137000 23.831999 6.207000 -11.137000 23.831999 6.207000
-4.458000 34.354000 0.244000 -4.458000 34.354000 0.244000
- 7.027000 29.537001 -7.941000 7.027000 29.537001 -7.941000
- 17.160000 21.565002 -14.826000 17.160000 21.565002 -14.826000
- 22.035000 16.055002 -17.987000 22.035000 16.055002 -17.987000
- 25.290000 -2.545998 -18.751000 25.290000 -2.545998 -18.751000
- 22.928010 -20.121998 -15.391000 22.928010 -20.121998 -15.391000
- 16.106010 -28.490998 -9.515000 16.106010 -28.490998 -9.515000
- 8.612010 -28.471999 -3.893000 8.612010 -28.471999 -3.893000
- -2.057990 -33.828000 4.599000 -2.057990 -33.828000 4.599000
--16.248000 -25.993001 14.542000 -16.248000 -25.993001 14.542000
+ 7.027000 29.537001 -7.940990 7.027000 29.537001 -7.940990
+ 17.160000 21.565002 -14.825990 17.160000 21.565002 -14.825990
+ 22.035000 16.055002 -17.986990 22.035000 16.055002 -17.986990
+ 25.290010 -2.545997 -18.750990 25.290010 -2.545997 -18.750990
+ 22.928010 -20.121998 -15.390990 22.928010 -20.121998 -15.390990
+ 16.106010 -28.490998 -9.514990 16.106010 -28.490998 -9.514990
+ 8.612010 -28.471999 -3.892990 8.612010 -28.471999 -3.892990
+ -2.057990 -33.828000 4.599010 -2.057990 -33.828000 4.599010
+-16.247990 -25.993001 14.542000 -16.247990 -25.993001 14.542000
-21.313000 -19.322002 17.741000 -21.313000 -19.322002 17.741000
-27.255000 -4.852002 20.893000 -27.255000 -4.852002 20.893000
-25.877000 3.069998 19.144000 -25.877000 3.069998 19.144000
-20.741000 22.230998 13.559000 -20.741000 22.230998 13.559000
-15.776000 24.473999 9.631000 -15.776000 24.473999 9.631000
-17.822000 30.323999 10.638000 -17.822000 30.323999 10.638000
- 12.660000 37.662001 -12.902000 12.660000 37.662001 -12.902000
- 27.387000 18.856002 -22.257000 27.387000 18.856002 -22.257000
- 33.576000 -0.011997 -25.198000 33.576000 -0.011997 -25.198000
- 30.470010 -15.350997 -21.482000 30.470010 -15.350997 -21.482000
- 2.017010 -41.061000 2.194000 2.017010 -41.061000 2.194000
+ 12.660000 37.662001 -12.901990 12.660000 37.662001 -12.901990
+ 27.387000 18.856003 -22.256990 27.387000 18.856003 -22.256990
+ 33.576010 -0.011997 -25.197990 33.576010 -0.011997 -25.197990
+ 30.470010 -15.350997 -21.481990 30.470010 -15.350997 -21.481990
+ 2.017010 -41.061000 2.194010 2.017010 -41.061000 2.194010
-14.320990 -30.798001 13.529000 -14.320990 -30.798001 13.529000
-26.314000 -23.401002 21.862000 -26.314000 -23.401002 21.862000
-27.570000 19.645998 18.918000 -27.570000 19.645998 18.918000
]
HBA
-3 [ 3827931.652270000 459769.553754000 5064002.807 ]
+3 [ 3827931.608910000 459769.601212000 5064002.836 ]
48 x 2 x 3 [
- 32.297010 -34.145997 -21.157000 32.297010 -34.145997 -21.157000
- 34.917010 -30.358997 -23.466000 34.917010 -30.358997 -23.466000
- 32.865010 -41.402997 -20.928000 32.865010 -41.402997 -20.928000
- 35.484010 -37.616997 -23.236000 35.484010 -37.616997 -23.236000
- 38.103010 -33.829997 -25.544000 38.103010 -33.829997 -25.544000
- 40.722010 -30.043997 -27.851000 40.722010 -30.043997 -27.851000
- 33.433010 -48.659997 -20.699000 33.433010 -48.659997 -20.699000
- 36.051010 -44.873997 -23.007000 36.051010 -44.873997 -23.007000
- 38.670010 -41.086997 -25.314000 38.670010 -41.086997 -25.314000
- 41.290010 -37.300997 -27.622000 41.290010 -37.300997 -27.622000
- 43.909010 -33.513996 -29.930000 43.909010 -33.513996 -29.930000
- 46.528010 -29.727996 -32.237000 46.528010 -29.727996 -32.237000
- 36.619010 -52.131997 -22.777000 36.619010 -52.131997 -22.777000
- 39.238010 -48.344997 -25.085000 39.238010 -48.344997 -25.085000
- 41.857010 -44.558996 -27.392000 41.857010 -44.558996 -27.392000
- 44.477010 -40.771996 -29.701000 44.477010 -40.771996 -29.701000
- 47.096010 -36.985996 -32.008000 47.096010 -36.985996 -32.008000
- 49.715010 -33.198996 -34.316000 49.715010 -33.198996 -34.316000
- 42.425010 -51.815996 -27.163000 42.425010 -51.815996 -27.163000
- 45.044010 -48.029996 -29.471000 45.044010 -48.029996 -29.471000
- 47.664010 -44.242996 -31.779000 47.664010 -44.242996 -31.779000
- 50.283010 -40.456996 -34.086000 50.283010 -40.456996 -34.086000
- 48.231010 -51.499996 -31.549000 48.231010 -51.499996 -31.549000
- 50.851010 -47.713996 -33.857000 50.851010 -47.713996 -33.857000
--50.852000 47.712996 33.856000 -50.852000 47.712996 33.856000
--48.232000 51.498996 31.548000 -48.232000 51.498996 31.548000
--50.284000 40.454996 34.085000 -50.284000 40.454996 34.085000
--47.665000 44.241996 31.778000 -47.665000 44.241996 31.778000
--45.046000 48.027996 29.470000 -45.046000 48.027996 29.470000
--42.427000 51.814996 27.162000 -42.427000 51.814996 27.162000
--49.717000 33.197996 34.315000 -49.717000 33.197996 34.315000
--47.098000 36.984996 32.007000 -47.098000 36.984996 32.007000
--44.479000 40.770996 29.700000 -44.479000 40.770996 29.700000
--41.859000 44.557996 27.391000 -41.859000 44.557996 27.391000
--39.240000 48.343997 25.084000 -39.240000 48.343997 25.084000
--36.621000 52.130997 22.776000 -36.621000 52.130997 22.776000
--46.530000 29.726996 32.236000 -46.530000 29.726996 32.236000
--43.911000 33.512996 29.929000 -43.911000 33.512996 29.929000
--41.292000 37.298996 27.621000 -41.292000 37.298996 27.621000
--38.672000 41.085997 25.313000 -38.672000 41.085997 25.313000
--36.053000 44.872997 23.006000 -36.053000 44.872997 23.006000
--33.434000 48.658997 20.698000 -33.434000 48.658997 20.698000
--40.724000 30.041997 27.850000 -40.724000 30.041997 27.850000
--38.105000 33.828997 25.543000 -38.105000 33.828997 25.543000
--35.485000 37.614997 23.235000 -35.485000 37.614997 23.235000
--32.866000 41.401997 20.927000 -32.866000 41.401997 20.927000
--34.918000 30.357997 23.465000 -34.918000 30.357997 23.465000
--32.298000 34.144997 21.156000 -32.298000 34.144997 21.156000
+ 32.297000 -34.145997 -21.156990 32.297000 -34.145997 -21.156990
+ 34.917000 -30.358997 -23.465990 34.917000 -30.358997 -23.465990
+ 32.865000 -41.402997 -20.927990 32.865000 -41.402997 -20.927990
+ 35.484000 -37.616997 -23.235990 35.484000 -37.616997 -23.235990
+ 38.103000 -33.829996 -25.543990 38.103000 -33.829996 -25.543990
+ 40.722000 -30.043996 -27.850990 40.722000 -30.043996 -27.850990
+ 33.433000 -48.659997 -20.698990 33.433000 -48.659997 -20.698990
+ 36.051000 -44.873997 -23.006990 36.051000 -44.873997 -23.006990
+ 38.670000 -41.086996 -25.313990 38.670000 -41.086996 -25.313990
+ 41.290000 -37.300996 -27.621990 41.290000 -37.300996 -27.621990
+ 43.909000 -33.513996 -29.929990 43.909000 -33.513996 -29.929990
+ 46.528000 -29.727996 -32.236990 46.528000 -29.727996 -32.236990
+ 36.619000 -52.131997 -22.776990 36.619000 -52.131997 -22.776990
+ 39.238000 -48.344996 -25.084990 39.238000 -48.344996 -25.084990
+ 41.857000 -44.558996 -27.391990 41.857000 -44.558996 -27.391990
+ 44.477000 -40.771996 -29.700990 44.477000 -40.771996 -29.700990
+ 47.096000 -36.985996 -32.007990 47.096000 -36.985996 -32.007990
+ 49.715000 -33.198995 -34.315990 49.715000 -33.198995 -34.315990
+ 42.425000 -51.815996 -27.162990 42.425000 -51.815996 -27.162990
+ 45.044000 -48.029996 -29.470990 45.044000 -48.029996 -29.470990
+ 47.664000 -44.242996 -31.778990 47.664000 -44.242996 -31.778990
+ 50.283000 -40.456995 -34.085990 50.283000 -40.456995 -34.085990
+ 48.231000 -51.499995 -31.548990 48.231000 -51.499995 -31.548990
+ 50.851000 -47.713995 -33.856990 50.851000 -47.713995 -33.856990
+-50.852010 47.712995 33.856000 -50.852010 47.712995 33.856000
+-48.232010 51.498995 31.548000 -48.232010 51.498995 31.548000
+-50.284010 40.454995 34.085000 -50.284010 40.454995 34.085000
+-47.665010 44.241995 31.778000 -47.665010 44.241995 31.778000
+-45.046010 48.027996 29.470000 -45.046010 48.027996 29.470000
+-42.427010 51.814996 27.162000 -42.427010 51.814996 27.162000
+-49.717010 33.197995 34.315000 -49.717010 33.197995 34.315000
+-47.098010 36.984995 32.007000 -47.098010 36.984995 32.007000
+-44.479010 40.770996 29.700000 -44.479010 40.770996 29.700000
+-41.859010 44.557996 27.391000 -41.859010 44.557996 27.391000
+-39.240010 48.343996 25.084000 -39.240010 48.343996 25.084000
+-36.621010 52.130996 22.776000 -36.621010 52.130996 22.776000
+-46.530010 29.726995 32.236000 -46.530010 29.726995 32.236000
+-43.911010 33.512996 29.929000 -43.911010 33.512996 29.929000
+-41.292010 37.298996 27.621000 -41.292010 37.298996 27.621000
+-38.672010 41.085996 25.313000 -38.672010 41.085996 25.313000
+-36.053010 44.872996 23.006000 -36.053010 44.872996 23.006000
+-33.434010 48.658997 20.698000 -33.434010 48.658997 20.698000
+-40.724010 30.041996 27.850000 -40.724010 30.041996 27.850000
+-38.105010 33.828996 25.543000 -38.105010 33.828996 25.543000
+-35.485010 37.614997 23.235000 -35.485010 37.614997 23.235000
+-32.866010 41.401997 20.927000 -32.866010 41.401997 20.927000
+-34.918010 30.357997 23.465000 -34.918010 30.357997 23.465000
+-32.298010 34.144997 21.156000 -32.298010 34.144997 21.156000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3827973.226280000 459728.623758000 5063975.300 ]
+3 [ 3827973.182910000 459728.671216000 5063975.329 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3827890.077270000 459810.482750000 5064030.313 ]
+3 [ 3827890.033900000 459810.530208000 5064030.342 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS401-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS401-AntennaField.conf
index d07c0cd6c0738cdc4c49e5a3b52d2662c8750257..97fa71cbb72792c1d07fac2b820770f64481b85c 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS401-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS401-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS401
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:41
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:09
#
NORMAL_VECTOR LBA
@@ -15,157 +15,157 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3826766.106200000 460100.387655000 5064836.470 ]
+3 [ 3826766.062820000 460100.435101000 5064836.498 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
- 2.019000 0.243001 -1.538000 2.019000 0.243001 -1.538000
- 1.338000 -2.104999 -0.814000 1.338000 -2.104999 -0.814000
+ 2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
+ 1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- -4.606000 1.056000 3.362000 -4.606000 1.056000 3.362000
- -3.143000 4.464000 1.956000 -3.143000 4.464000 1.956000
+ -4.606000 1.055999 3.362000 -4.606000 1.055999 3.362000
+ -3.143000 4.463999 1.956000 -3.143000 4.463999 1.956000
-0.210000 5.784000 -0.365000 -0.210000 5.784000 -0.365000
- 2.822000 4.398001 -2.516000 2.822000 4.398001 -2.516000
- 4.534000 0.954001 -3.489000 4.534000 0.954001 -3.489000
- 4.124000 -2.936999 -2.830000 4.124000 -2.936999 -2.830000
- 1.784000 -5.453999 -0.846000 1.784000 -5.453999 -0.846000
+ 2.822000 4.398000 -2.516000 2.822000 4.398000 -2.516000
+ 4.534000 0.954000 -3.489000 4.534000 0.954000 -3.489000
+ 4.124000 -2.937000 -2.830000 4.124000 -2.937000 -2.830000
+ 1.784000 -5.454000 -0.846000 1.784000 -5.454000 -0.846000
-1.390000 -5.418000 1.533000 -1.390000 -5.418000 1.533000
- -3.914000 -2.848000 3.196000 -3.914000 -2.848000 3.196000
- -6.621000 -3.854000 5.318000 -6.621000 -3.854000 5.318000
- -7.876000 -0.477000 5.955000 -7.876000 -0.477000 5.955000
- -7.619000 4.514000 5.311000 -7.619000 4.514000 5.311000
- -3.467000 9.320000 1.760000 -3.467000 9.320000 1.760000
+ -3.914000 -2.848001 3.196000 -3.914000 -2.848001 3.196000
+ -6.621000 -3.854001 5.318000 -6.621000 -3.854001 5.318000
+ -7.876000 -0.477001 5.955000 -7.876000 -0.477001 5.955000
+ -7.619000 4.513999 5.311000 -7.619000 4.513999 5.311000
+ -3.467000 9.319999 1.760000 -3.467000 9.319999 1.760000
-0.999000 10.113000 -0.164000 -0.999000 10.113000 -0.164000
- 2.420000 9.424001 -2.668000 2.420000 9.424001 -2.668000
- 4.988000 6.459001 -4.327000 4.988000 6.459001 -4.327000
- 7.073000 1.164001 -5.414000 7.073000 1.164001 -5.414000
- 7.541000 -3.596999 -5.336000 7.541000 -3.596999 -5.336000
- 5.857000 -7.314999 -3.735000 5.857000 -7.314999 -3.735000
- 2.968000 -8.709999 -1.440000 2.968000 -8.709999 -1.440000
+ 2.420000 9.424000 -2.668000 2.420000 9.424000 -2.668000
+ 4.988000 6.459000 -4.327000 4.988000 6.459000 -4.327000
+ 7.073000 1.164000 -5.414000 7.073000 1.164000 -5.414000
+ 7.541000 -3.597000 -5.336000 7.541000 -3.597000 -5.336000
+ 5.857000 -7.315000 -3.735000 5.857000 -7.315000 -3.735000
+ 2.968000 -8.710000 -1.440000 2.968000 -8.710000 -1.440000
-0.901000 -8.878000 1.479000 -0.901000 -8.878000 1.479000
- -4.412000 -7.047000 3.949000 -4.412000 -7.047000 3.949000
--10.653000 -4.641000 8.416000 -10.653000 -4.641000 8.416000
+ -4.412000 -7.047001 3.949000 -4.412000 -7.047001 3.949000
+-10.653000 -4.641001 8.416000 -10.653000 -4.641001 8.416000
-11.754000 -1.019001 8.915000 -11.754000 -1.019001 8.915000
-11.296000 2.008999 8.297000 -11.296000 2.008999 8.297000
- -8.233010 8.792000 5.385000 -8.233010 8.792000 5.385000
- -8.089010 11.760000 5.009000 -8.089010 11.760000 5.009000
- -2.256010 13.116000 0.508000 -2.256010 13.116000 0.508000
- 1.810000 12.745001 -2.510000 1.810000 12.745001 -2.510000
- 6.063000 12.622001 -5.692000 6.063000 12.622001 -5.692000
- 7.218000 9.525001 -6.279000 7.218000 9.525001 -6.279000
+ -8.233000 8.791999 5.385000 -8.233000 8.791999 5.385000
+ -8.089000 11.759999 5.009000 -8.089000 11.759999 5.009000
+ -2.256000 13.116000 0.508000 -2.256000 13.116000 0.508000
+ 1.810000 12.745000 -2.510000 1.810000 12.745000 -2.510000
+ 6.063000 12.622000 -5.692000 6.063000 12.622000 -5.692000
+ 7.218000 9.525000 -6.279000 7.218000 9.525000 -6.279000
9.262000 5.395001 -7.439000 9.262000 5.395001 -7.439000
10.571000 -1.477999 -7.801000 10.571000 -1.477999 -7.801000
- 10.639000 -4.256999 -7.601000 10.639000 -4.256999 -7.601000
+ 10.639000 -4.256999 -7.600990 10.639000 -4.256999 -7.600990
8.414000 -8.637999 -5.535000 8.414000 -8.637999 -5.535000
- 7.320000 -12.469999 -4.367000 7.320000 -12.469999 -4.367000
+ 7.320000 -12.470000 -4.367000 7.320000 -12.470000 -4.367000
0.421000 -14.101000 0.958000 0.421000 -14.101000 0.958000
-2.729000 -13.254000 3.247000 -2.729000 -13.254000 3.247000
- -6.872000 -11.159000 6.167000 -6.872000 -11.159000 6.167000
- 40.726990 37.669004 -33.975000 40.726990 37.669004 -33.975000
- 32.498000 -52.829997 -19.618000 32.498000 -52.829997 -19.618000
--10.425000 -11.615000 8.875000 -10.425000 -11.615000 8.875000
+ -6.872000 -11.159001 6.167000 -6.872000 -11.159001 6.167000
+ 40.727000 37.669004 -33.974990 40.727000 37.669004 -33.974990
+ 32.498000 -52.829997 -19.617990 32.498000 -52.829997 -19.617990
+-10.425000 -11.615001 8.875000 -10.425000 -11.615001 8.875000
-12.886000 -11.374001 10.701000 -12.886000 -11.374001 10.701000
--16.191010 3.754999 11.814000 -16.191010 3.754999 11.814000
- -9.157010 16.741000 5.360000 -9.157010 16.741000 5.360000
- -5.994010 19.466000 2.740000 -5.994010 19.466000 2.740000
- 3.662990 17.432001 -4.325000 3.662990 17.432001 -4.325000
- 12.087000 8.782001 -9.866000 12.087000 8.782001 -9.866000
- 16.135000 2.382002 -12.326000 16.135000 2.382002 -12.326000
- 12.046000 -10.780999 -8.067000 12.046000 -10.780999 -8.067000
+-16.191000 3.754998 11.814000 -16.191000 3.754998 11.814000
+ -9.157010 16.740999 5.360000 -9.157010 16.740999 5.360000
+ -5.994010 19.465999 2.740000 -5.994010 19.465999 2.740000
+ 3.663000 17.432000 -4.325000 3.663000 17.432000 -4.325000
+ 12.087000 8.782001 -9.865990 12.087000 8.782001 -9.865990
+ 16.135000 2.382001 -12.325990 16.135000 2.382001 -12.325990
+ 12.046000 -10.780999 -8.066990 12.046000 -10.780999 -8.066990
8.444000 -17.334999 -4.772000 8.444000 -17.334999 -4.772000
0.618000 -18.680000 1.225000 0.618000 -18.680000 1.225000
- -4.194000 -23.903000 5.309000 -4.194000 -23.903000 5.309000
--13.507000 -17.454001 11.716000 -13.507000 -17.454001 11.716000
--19.340000 -6.486001 15.103000 -19.340000 -6.486001 15.103000
--20.462000 -0.321001 15.388000 -20.462000 -0.321001 15.388000
--20.718010 8.094999 14.820000 -20.718010 8.094999 14.820000
+ -4.194000 -23.903001 5.309000 -4.194000 -23.903001 5.309000
+-13.507000 -17.454002 11.716000 -13.507000 -17.454002 11.716000
+-19.340000 -6.486002 15.103000 -19.340000 -6.486002 15.103000
+-20.462000 -0.321002 15.388000 -20.462000 -0.321002 15.388000
+-20.718010 8.094998 14.820000 -20.718010 8.094998 14.820000
-11.052010 20.251999 6.465000 -11.052010 20.251999 6.465000
- -5.478010 23.758000 1.964000 -5.478010 23.758000 1.964000
- 5.530990 24.758001 -6.389000 5.530990 24.758001 -6.389000
- 14.822000 15.957002 -12.568000 14.822000 15.957002 -12.568000
- 19.378000 8.313002 -15.297000 19.378000 8.313002 -15.297000
- 19.779000 -3.388998 -14.540000 19.779000 -3.388998 -14.540000
- 16.408000 -18.657998 -10.629000 16.408000 -18.657998 -10.629000
- 4.117000 -26.703999 -0.677000 4.117000 -26.703999 -0.677000
- -5.176000 -33.549000 6.917000 -5.176000 -33.549000 6.917000
--14.856000 -24.212001 13.339000 -14.856000 -24.212001 13.339000
--22.372000 -12.546001 17.927000 -22.372000 -12.546001 17.927000
--25.528000 -5.391002 19.649000 -25.528000 -5.391002 19.649000
+ -5.478010 23.757999 1.964000 -5.478010 23.757999 1.964000
+ 5.530990 24.758000 -6.389000 5.530990 24.758000 -6.389000
+ 14.822000 15.957001 -12.567990 14.822000 15.957001 -12.567990
+ 19.378000 8.313002 -15.296990 19.378000 8.313002 -15.296990
+ 19.779000 -3.388998 -14.539990 19.779000 -3.388998 -14.539990
+ 16.408000 -18.657999 -10.628990 16.408000 -18.657999 -10.628990
+ 4.117000 -26.704000 -0.677000 4.117000 -26.704000 -0.677000
+ -5.176000 -33.549001 6.917000 -5.176000 -33.549001 6.917000
+-14.856000 -24.212002 13.339000 -14.856000 -24.212002 13.339000
+-22.372000 -12.546002 17.927000 -22.372000 -12.546002 17.927000
+-25.528000 -5.391003 19.649000 -25.528000 -5.391003 19.649000
-23.532010 13.131998 16.477000 -23.532010 13.131998 16.477000
--16.436010 28.314999 9.777000 -16.436010 28.314999 9.777000
- -7.597010 33.116000 2.709000 -7.597010 33.116000 2.709000
+-16.436010 28.314998 9.777000 -16.436010 28.314998 9.777000
+ -7.597010 33.115999 2.709000 -7.597010 33.115999 2.709000
-0.421010 29.902000 -2.387000 -0.421010 29.902000 -2.387000
11.274990 30.284001 -11.201000 11.274990 30.284001 -11.201000
- 22.717000 17.015002 -18.589000 22.717000 17.015002 -18.589000
- 25.735000 8.709003 -20.105000 25.735000 8.709003 -20.105000
- 27.449000 -7.155997 -19.957000 27.449000 -7.155997 -19.957000
- 23.951000 -13.864998 -16.725000 23.951000 -13.864998 -16.725000
- 13.760000 -29.325998 -7.678000 13.760000 -29.325998 -7.678000
- 8.386000 -29.273999 -3.648000 8.386000 -29.273999 -3.648000
- 8.737000 -35.535999 -3.346000 8.737000 -35.535999 -3.346000
--22.488000 -29.294001 19.527000 -22.488000 -29.294001 19.527000
--31.426000 -5.689002 24.103000 -31.426000 -5.689002 24.103000
--32.167010 14.331998 22.850000 -32.167010 14.331998 22.850000
--24.973010 27.137998 16.293000 -24.973010 27.137998 16.293000
+ 22.717000 17.015002 -18.588990 22.717000 17.015002 -18.588990
+ 25.735000 8.709002 -20.104990 25.735000 8.709002 -20.104990
+ 27.449000 -7.155998 -19.956990 27.449000 -7.155998 -19.956990
+ 23.951000 -13.864998 -16.724990 23.951000 -13.864998 -16.724990
+ 13.760000 -29.325999 -7.677990 13.760000 -29.325999 -7.677990
+ 8.386000 -29.273999 -3.647990 8.386000 -29.273999 -3.647990
+ 8.737000 -35.535999 -3.345990 8.737000 -35.535999 -3.345990
+-22.488000 -29.294002 19.527000 -22.488000 -29.294002 19.527000
+-31.426000 -5.689003 24.103000 -31.426000 -5.689003 24.103000
+-32.167010 14.331997 22.850000 -32.167010 14.331997 22.850000
+-24.973010 27.137997 16.293000 -24.973010 27.137997 16.293000
9.358990 38.684001 -10.522000 9.358990 38.684001 -10.522000
- 22.191000 22.263002 -18.669000 22.191000 22.263002 -18.669000
- 31.648000 10.333003 -24.690000 31.648000 10.333003 -24.690000
- 21.013000 -29.856998 -13.074000 21.013000 -29.856998 -13.074000
+ 22.191000 22.263002 -18.668990 22.191000 22.263002 -18.668990
+ 31.648000 10.333003 -24.689990 31.648000 10.333003 -24.689990
+ 21.013000 -29.856998 -13.073990 21.013000 -29.856998 -13.073990
]
HBA
-3 [ 3826789.982200000 460095.443657000 5064818.996 ]
+3 [ 3826789.938820000 460095.491103000 5064819.024 ]
48 x 2 x 3 [
-0.689010 74.202000 -6.190000 -0.689010 74.202000 -6.190000
- 2.999990 76.250001 -9.144000 2.999990 76.250001 -9.144000
+ 2.999990 76.250000 -9.144000 2.999990 76.250000 -9.144000
-2.531010 67.444000 -4.197000 -2.531010 67.444000 -4.197000
1.157990 69.491000 -7.151000 1.157990 69.491000 -7.151000
- 4.845990 71.539001 -10.105000 4.845990 71.539001 -10.105000
+ 4.845990 71.539000 -10.105000 4.845990 71.539000 -10.105000
8.534990 73.586001 -13.058000 8.534990 73.586001 -13.058000
-4.374010 60.685000 -2.203000 -4.374010 60.685000 -2.203000
-0.685010 62.733000 -5.157000 -0.685010 62.733000 -5.157000
- 3.002990 64.780001 -8.110000 3.002990 64.780001 -8.110000
+ 3.002990 64.780000 -8.110000 3.002990 64.780000 -8.110000
6.691990 66.828001 -11.064000 6.691990 66.828001 -11.064000
10.380990 68.875001 -14.018000 10.380990 68.875001 -14.018000
- 14.068990 70.923002 -16.972000 14.068990 70.923002 -16.972000
+ 14.068990 70.923001 -16.972000 14.068990 70.923001 -16.972000
-2.527010 55.974000 -3.163000 -2.527010 55.974000 -3.163000
1.160990 58.022000 -6.117000 1.160990 58.022000 -6.117000
- 4.849990 60.069001 -9.071000 4.849990 60.069001 -9.071000
+ 4.849990 60.069000 -9.071000 4.849990 60.069000 -9.071000
8.537990 62.117001 -12.024000 8.537990 62.117001 -12.024000
12.226990 64.164001 -14.978000 12.226990 64.164001 -14.978000
15.915990 66.212002 -17.932000 15.915990 66.212002 -17.932000
- 3.006990 53.311001 -7.076000 3.006990 53.311001 -7.076000
+ 3.006990 53.311000 -7.076000 3.006990 53.311000 -7.076000
6.695990 55.358001 -10.030000 6.695990 55.358001 -10.030000
10.383990 57.406001 -12.984000 10.383990 57.406001 -12.984000
- 14.072990 59.453002 -15.938000 14.072990 59.453002 -15.938000
+ 14.072990 59.453001 -15.938000 14.072990 59.453001 -15.938000
8.541990 50.647001 -10.991000 8.541990 50.647001 -10.991000
12.230990 52.695001 -13.944000 12.230990 52.695001 -13.944000
-12.228000 -52.694001 13.940000 -12.228000 -52.694001 13.940000
- -8.539000 -50.646000 10.987000 -8.539000 -50.646000 10.987000
+ -8.539000 -50.646001 10.987000 -8.539000 -50.646001 10.987000
-14.070000 -59.451001 15.934000 -14.070000 -59.451001 15.934000
--10.381000 -57.404000 12.980000 -10.381000 -57.404000 12.980000
- -6.693000 -55.357000 10.026000 -6.693000 -55.357000 10.026000
+-10.381000 -57.404001 12.980000 -10.381000 -57.404001 12.980000
+ -6.693000 -55.357001 10.026000 -6.693000 -55.357001 10.026000
-3.004000 -53.310000 7.073000 -3.004000 -53.310000 7.073000
-15.913000 -66.210001 17.928000 -15.913000 -66.210001 17.928000
-12.224000 -64.162001 14.974000 -12.224000 -64.162001 14.974000
- -8.536000 -62.115000 12.021000 -8.536000 -62.115000 12.021000
+ -8.536000 -62.115001 12.021000 -8.536000 -62.115001 12.021000
-4.847000 -60.068000 9.067000 -4.847000 -60.068000 9.067000
-1.158000 -58.021000 6.113000 -1.158000 -58.021000 6.113000
- 2.530000 -55.972999 3.159000 2.530000 -55.972999 3.159000
+ 2.530000 -55.973000 3.159000 2.530000 -55.973000 3.159000
-14.066000 -70.921001 16.968000 -14.066000 -70.921001 16.968000
--10.378000 -68.873000 14.014000 -10.378000 -68.873000 14.014000
- -6.689000 -66.826000 11.060000 -6.689000 -66.826000 11.060000
+-10.378000 -68.873001 14.014000 -10.378000 -68.873001 14.014000
+ -6.689000 -66.826001 11.060000 -6.689000 -66.826001 11.060000
-3.000000 -64.778000 8.106000 -3.000000 -64.778000 8.106000
- 0.688000 -62.731999 5.153000 0.688000 -62.731999 5.153000
+ 0.688000 -62.732000 5.153000 0.688000 -62.732000 5.153000
4.377000 -60.683999 2.199000 4.377000 -60.683999 2.199000
- -8.532000 -73.584000 13.054000 -8.532000 -73.584000 13.054000
+ -8.532000 -73.584001 13.054000 -8.532000 -73.584001 13.054000
-4.843000 -71.537000 10.101000 -4.843000 -71.537000 10.101000
-1.155000 -69.490000 7.147000 -1.155000 -69.490000 7.147000
- 2.534000 -67.442999 4.193000 2.534000 -67.442999 4.193000
- -2.997000 -76.248000 9.140000 -2.997000 -76.248000 9.140000
- 0.692000 -74.199999 6.187000 0.692000 -74.199999 6.187000
+ 2.534000 -67.443000 4.193000 2.534000 -67.443000 4.193000
+ -2.996990 -76.248000 9.140000 -2.996990 -76.248000 9.140000
+ 0.692010 -74.200000 6.187000 0.692010 -74.200000 6.187000
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3826795.752190000 460158.893658000 5064808.929 ]
+3 [ 3826795.708810000 460158.941104000 5064808.957 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3826784.211200000 460031.992657000 5064829.062 ]
+3 [ 3826784.167820000 460032.040103000 5064829.090 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS501-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS501-AntennaField.conf
index 857e74d4b1b22f0da25a05bdb9d852fd5033cebc..3abcc08d2d3c316bb9f91d5eacacbb54976872f6 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/CS501-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/CS501-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for CS501
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:41
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:09
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3825625.779100000 460642.109559000 5065640.772 ]
+3 [ 3825625.735710000 460642.156992000 5065640.800 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
@@ -33,22 +33,22 @@ LBA
2.822000 4.398000 -2.516000 2.822000 4.398000 -2.516000
4.534000 0.954000 -3.489000 4.534000 0.954000 -3.489000
4.124000 -2.937000 -2.830000 4.124000 -2.937000 -2.830000
- 6.305000 -5.406000 -4.244000 6.305000 -5.406000 -4.244000
- 4.639000 -8.290000 -2.733000 4.639000 -8.290000 -2.733000
+ 6.305000 -5.405999 -4.243990 6.305000 -5.405999 -4.243990
+ 4.639000 -8.290000 -2.732990 4.639000 -8.290000 -2.732990
1.023000 -10.273000 0.161000 1.023000 -10.273000 0.161000
-4.595000 -7.968000 4.169000 -4.595000 -7.968000 4.169000
-6.498000 -5.662001 5.389000 -6.498000 -5.662001 5.389000
-7.887000 -1.657001 6.070000 -7.887000 -1.657001 6.070000
-7.226000 2.459999 5.202000 -7.226000 2.459999 5.202000
- -4.679000 7.111000 2.870000 -4.679000 7.111000 2.870000
+ -4.679000 7.110999 2.870000 -4.679000 7.110999 2.870000
-1.619000 9.774000 0.332000 -1.619000 9.774000 0.332000
1.892000 9.641000 -2.291000 1.892000 9.641000 -2.291000
4.443000 7.152000 -3.981000 4.443000 7.152000 -3.981000
- 6.676000 3.048000 -5.287000 6.676000 3.048000 -5.287000
- 7.322000 -1.570999 -5.354000 7.322000 -1.570999 -5.354000
- 9.058000 -9.402999 -5.949000 9.058000 -9.402999 -5.949000
- 7.138000 -12.232999 -4.252000 7.138000 -12.232999 -4.252000
- 4.778000 -13.110000 -2.401000 4.778000 -13.110000 -2.401000
+ 6.676000 3.048001 -5.286990 6.676000 3.048001 -5.286990
+ 7.322000 -1.570999 -5.353990 7.322000 -1.570999 -5.353990
+ 9.058000 -9.402999 -5.948990 9.058000 -9.402999 -5.948990
+ 7.138000 -12.232999 -4.251990 7.138000 -12.232999 -4.251990
+ 4.778000 -13.110000 -2.400990 4.778000 -13.110000 -2.400990
-1.621000 -12.875000 2.381000 -1.621000 -12.875000 2.381000
-3.766000 -14.064000 4.098000 -3.766000 -14.064000 4.098000
-7.902000 -8.380001 6.688000 -7.902000 -8.380001 6.688000
@@ -60,112 +60,112 @@ LBA
-2.853000 13.420000 0.929000 -2.853000 13.420000 0.929000
1.415000 13.001000 -2.237000 1.415000 13.001000 -2.237000
4.682000 13.556000 -4.740000 4.682000 13.556000 -4.740000
- 9.591000 6.844001 -7.818000 9.591000 6.844001 -7.818000
- 10.723000 3.058001 -8.325000 10.723000 3.058001 -8.325000
- 11.529000 -2.364999 -8.440000 11.529000 -2.364999 -8.440000
--48.507000 26.917996 33.977000 -48.507000 26.917996 33.977000
- 19.022000 59.037001 -19.614000 19.022000 59.037001 -19.614000
- 13.791000 -5.994999 -9.810000 13.791000 -5.994999 -9.810000
- 14.969000 -8.762999 -10.444000 14.969000 -8.762999 -10.444000
- 6.239000 -19.188000 -2.949000 6.239000 -19.188000 -2.949000
+ 9.591000 6.844001 -7.817990 9.591000 6.844001 -7.817990
+ 10.723000 3.058001 -8.324990 10.723000 3.058001 -8.324990
+ 11.529000 -2.364999 -8.439990 11.529000 -2.364999 -8.439990
+-48.507010 26.917995 33.977000 -48.507010 26.917995 33.977000
+ 19.021990 59.037002 -19.613990 19.021990 59.037002 -19.613990
+ 13.791000 -5.994999 -9.809990 13.791000 -5.994999 -9.809990
+ 14.969000 -8.762999 -10.443990 14.969000 -8.762999 -10.443990
+ 6.239000 -19.187999 -2.948990 6.239000 -19.187999 -2.948990
-6.652000 -17.476001 6.572000 -6.652000 -17.476001 6.572000
-10.279000 -15.294001 9.098000 -10.279000 -15.294001 9.098000
-14.145000 -3.942001 10.974000 -14.145000 -3.942001 10.974000
-12.726000 9.074999 8.732000 -12.726000 9.074999 8.732000
-10.482000 16.345999 6.391000 -10.482000 16.345999 6.391000
0.921000 17.895000 -2.309000 0.921000 17.895000 -2.309000
- 7.455000 16.976001 -7.130000 7.455000 16.976001 -7.130000
- 12.672000 9.131001 -10.337000 12.672000 9.131001 -10.337000
- 18.942000 6.301001 -14.787000 18.942000 6.301001 -14.787000
- 19.543000 -6.678998 -14.065000 19.543000 -6.678998 -14.065000
- 15.094000 -17.948999 -9.707000 15.094000 -17.948999 -9.707000
- 11.413000 -21.953999 -6.583000 11.413000 -21.953999 -6.583000
- 5.692000 -26.044000 -1.919000 5.692000 -26.044000 -1.919000
+ 7.455000 16.976001 -7.129990 7.455000 16.976001 -7.129990
+ 12.672000 9.131001 -10.336990 12.672000 9.131001 -10.336990
+ 18.942000 6.301002 -14.786990 18.942000 6.301002 -14.786990
+ 19.543000 -6.678998 -14.064990 19.543000 -6.678998 -14.064990
+ 15.094000 -17.948999 -9.706990 15.094000 -17.948999 -9.706990
+ 11.413000 -21.953999 -6.582990 11.413000 -21.953999 -6.582990
+ 5.692000 -26.043999 -1.918990 5.692000 -26.043999 -1.918990
-8.061000 -21.113001 7.959000 -8.061000 -21.113001 7.959000
-13.551000 -16.682001 11.679000 -13.551000 -16.682001 11.679000
-20.268000 -5.245002 15.688000 -20.268000 -5.245002 15.688000
-19.219000 8.777998 13.633000 -19.219000 8.777998 13.633000
--16.386000 17.161999 10.749000 -16.386000 17.161999 10.749000
+-16.386000 17.161998 10.749000 -16.386000 17.161998 10.749000
-8.456000 22.897999 4.278000 -8.456000 22.897999 4.278000
4.023000 26.175000 -5.385000 4.023000 26.175000 -5.385000
- 16.347000 16.547001 -13.766000 16.347000 16.547001 -13.766000
- 26.196000 9.612002 -20.532000 26.196000 9.612002 -20.532000
- 24.986000 -5.073998 -18.296000 24.986000 -5.073998 -18.296000
- 20.973000 -18.477998 -14.072000 20.973000 -18.477998 -14.072000
- 17.716000 -25.127999 -11.026000 17.716000 -25.127999 -11.026000
- 3.722000 -31.366000 0.041000 3.722000 -31.366000 0.041000
+ 16.347000 16.547001 -13.765990 16.347000 16.547001 -13.765990
+ 26.196000 9.612002 -20.531990 26.196000 9.612002 -20.531990
+ 24.986000 -5.073998 -18.295990 24.986000 -5.073998 -18.295990
+ 20.973000 -18.477998 -14.071990 20.973000 -18.477998 -14.071990
+ 17.716000 -25.127998 -11.025990 17.716000 -25.127998 -11.025990
+ 3.722000 -31.366000 0.041010 3.722000 -31.366000 0.041010
-10.732000 -30.581001 10.820000 -10.732000 -30.581001 10.820000
-18.909000 -23.211002 16.291000 -18.909000 -23.211002 16.291000
-20.595000 -14.005002 16.725000 -20.595000 -14.005002 16.725000
--27.257000 -1.546002 20.599000 -27.257000 -1.546002 20.599000
+-27.257000 -1.546003 20.599000 -27.257000 -1.546003 20.599000
-24.273000 16.824998 16.699000 -24.273000 16.824998 16.699000
-20.139000 23.848998 12.961000 -20.139000 23.848998 12.961000
-10.028000 32.887999 4.554000 -10.028000 32.887999 4.554000
-3.441000 32.150000 -0.323000 -3.441000 32.150000 -0.323000
- 12.899000 28.149001 -12.227000 12.899000 28.149001 -12.227000
- 15.802000 22.323001 -13.879000 15.802000 22.323001 -13.879000
- 19.971000 25.538002 -17.299000 19.971000 25.538002 -17.299000
- 32.700000 -11.013997 -23.549000 32.700000 -11.013997 -23.549000
- 21.149000 -31.362998 -13.040000 21.149000 -31.362998 -13.040000
- 7.610000 -41.235999 -1.985000 7.610000 -41.235999 -1.985000
+ 12.899000 28.149001 -12.226990 12.899000 28.149001 -12.226990
+ 15.802000 22.323001 -13.878990 15.802000 22.323001 -13.878990
+ 19.971000 25.538002 -17.298990 19.971000 25.538002 -17.298990
+ 32.700000 -11.013997 -23.548990 32.700000 -11.013997 -23.548990
+ 21.149000 -31.362998 -13.039990 21.149000 -31.362998 -13.039990
+ 7.610000 -41.235999 -1.984990 7.610000 -41.235999 -1.984990
-5.243000 -39.269001 7.485000 -5.243000 -39.269001 7.485000
-32.060000 -7.420003 24.736000 -32.060000 -7.420003 24.736000
--27.641000 13.878998 19.493000 -27.641000 13.878998 19.493000
--24.503000 29.498998 15.726000 -24.503000 29.498998 15.726000
- 9.302000 36.224001 -10.257000 9.302000 36.224001 -10.257000
+-27.641000 13.878997 19.493000 -27.641000 13.878997 19.493000
+-24.503010 29.498998 15.726000 -24.503010 29.498998 15.726000
+ 9.302000 36.224001 -10.256990 9.302000 36.224001 -10.256990
]
HBA
-3 [ 3825616.164100000 460670.138558000 5065645.456 ]
+3 [ 3825616.120710000 460670.185991000 5065645.484 ]
48 x 2 x 3 [
--51.266000 -10.122004 39.395990 -51.266000 -10.122004 39.395990
--47.211000 -9.452004 36.291990 -47.211000 -9.452004 36.291990
--54.563000 -15.884005 42.390990 -54.563000 -15.884005 42.390990
--50.508000 -15.215004 39.286990 -50.508000 -15.215004 39.286990
--46.453000 -14.545004 36.182990 -46.453000 -14.545004 36.182990
--42.399000 -13.875003 33.079000 -42.399000 -13.875003 33.079000
--57.859000 -21.646005 45.385990 -57.859000 -21.646005 45.385990
--53.805000 -20.977004 42.281990 -53.805000 -20.977004 42.281990
--49.750000 -20.307004 39.177990 -49.750000 -20.307004 39.177990
--45.695000 -19.638004 36.073990 -45.695000 -19.638004 36.073990
--41.641000 -18.968003 32.971000 -41.641000 -18.968003 32.971000
--37.587000 -18.298003 29.867000 -37.587000 -18.298003 29.867000
--57.101000 -26.739005 45.277990 -57.101000 -26.739005 45.277990
--53.047000 -26.070004 42.173990 -53.047000 -26.070004 42.173990
--48.993000 -25.400004 39.069990 -48.993000 -25.400004 39.069990
+-51.266010 -10.122005 39.396000 -51.266010 -10.122005 39.396000
+-47.211010 -9.452004 36.292000 -47.211010 -9.452004 36.292000
+-54.563010 -15.884005 42.391000 -54.563010 -15.884005 42.391000
+-50.508010 -15.215005 39.287000 -50.508010 -15.215005 39.287000
+-46.453010 -14.545004 36.183000 -46.453010 -14.545004 36.183000
+-42.399010 -13.875004 33.079000 -42.399010 -13.875004 33.079000
+-57.859010 -21.646005 45.386000 -57.859010 -21.646005 45.386000
+-53.805000 -20.977005 42.282000 -53.805000 -20.977005 42.282000
+-49.750000 -20.307005 39.178000 -49.750000 -20.307005 39.178000
+-45.695000 -19.638004 36.074000 -45.695000 -19.638004 36.074000
+-41.641000 -18.968004 32.971000 -41.641000 -18.968004 32.971000
+-37.587000 -18.298004 29.867000 -37.587000 -18.298004 29.867000
+-57.101000 -26.739005 45.278000 -57.101000 -26.739005 45.278000
+-53.047000 -26.070005 42.174000 -53.047000 -26.070005 42.174000
+-48.993000 -25.400005 39.070000 -48.993000 -25.400005 39.070000
-44.938000 -24.731004 35.966000 -44.938000 -24.731004 35.966000
--40.883000 -24.061003 32.862000 -40.883000 -24.061003 32.862000
+-40.883000 -24.061004 32.862000 -40.883000 -24.061004 32.862000
-36.829000 -23.391003 29.758000 -36.829000 -23.391003 29.758000
--52.289000 -31.162004 42.065990 -52.289000 -31.162004 42.065990
--48.235000 -30.493004 38.961990 -48.235000 -30.493004 38.961990
+-52.289000 -31.162005 42.066000 -52.289000 -31.162005 42.066000
+-48.235000 -30.493005 38.962000 -48.235000 -30.493005 38.962000
-44.180000 -29.823004 35.857000 -44.180000 -29.823004 35.857000
--40.125000 -29.154003 32.753000 -40.125000 -29.154003 32.753000
--47.476000 -35.586004 38.852990 -47.476000 -35.586004 38.852990
+-40.125000 -29.154004 32.753000 -40.125000 -29.154004 32.753000
+-47.476000 -35.586004 38.853000 -47.476000 -35.586004 38.853000
-43.422000 -34.916004 35.749000 -43.422000 -34.916004 35.749000
- 43.422000 34.916004 -35.749000 43.422000 34.916004 -35.749000
- 47.476000 35.586004 -38.853000 47.476000 35.586004 -38.853000
- 40.125000 29.154003 -32.754000 40.125000 29.154003 -32.754000
- 44.180000 29.823004 -35.858000 44.180000 29.823004 -35.858000
- 48.234000 30.493004 -38.962000 48.234000 30.493004 -38.962000
- 52.289000 31.163004 -42.066000 52.289000 31.163004 -42.066000
- 36.828000 23.391003 -29.758000 36.828000 23.391003 -29.758000
- 40.883000 24.061004 -32.862000 40.883000 24.061004 -32.862000
- 44.938000 24.731004 -35.966000 44.938000 24.731004 -35.966000
- 48.992000 25.400004 -39.071000 48.992000 25.400004 -39.071000
- 53.046000 26.070005 -42.174000 53.046000 26.070005 -42.174000
- 57.101000 26.740005 -45.278000 57.101000 26.740005 -45.278000
- 37.586000 18.299003 -29.867000 37.586000 18.299003 -29.867000
- 41.641000 18.968004 -32.971000 41.641000 18.968004 -32.971000
- 45.695000 19.638004 -36.075000 45.695000 19.638004 -36.075000
- 49.750000 20.307004 -39.179000 49.750000 20.307004 -39.179000
- 53.804000 20.977005 -42.283000 53.804000 20.977005 -42.283000
- 57.859000 21.647005 -45.387000 57.859000 21.647005 -45.387000
- 42.398000 13.875004 -33.079000 42.398000 13.875004 -33.079000
- 46.453000 14.545004 -36.183000 46.453000 14.545004 -36.183000
- 50.508000 15.215004 -39.287000 50.508000 15.215004 -39.287000
- 54.562000 15.884005 -42.391000 54.562000 15.884005 -42.391000
- 47.211000 9.452004 -36.292000 47.211000 9.452004 -36.292000
- 51.266000 10.122004 -39.396000 51.266000 10.122004 -39.396000
+ 43.421990 34.916004 -35.748990 43.421990 34.916004 -35.748990
+ 47.475990 35.586005 -38.852990 47.475990 35.586005 -38.852990
+ 40.125000 29.154004 -32.753990 40.125000 29.154004 -32.753990
+ 44.180000 29.823004 -35.857990 44.180000 29.823004 -35.857990
+ 48.234000 30.493005 -38.961990 48.234000 30.493005 -38.961990
+ 52.289000 31.163005 -42.065990 52.289000 31.163005 -42.065990
+ 36.828000 23.391004 -29.757990 36.828000 23.391004 -29.757990
+ 40.883000 24.061004 -32.861990 40.883000 24.061004 -32.861990
+ 44.938000 24.731004 -35.965990 44.938000 24.731004 -35.965990
+ 48.992000 25.400005 -39.070990 48.992000 25.400005 -39.070990
+ 53.046000 26.070005 -42.173990 53.046000 26.070005 -42.173990
+ 57.101000 26.740005 -45.277990 57.101000 26.740005 -45.277990
+ 37.586000 18.299004 -29.866990 37.586000 18.299004 -29.866990
+ 41.641000 18.968004 -32.970990 41.641000 18.968004 -32.970990
+ 45.695000 19.638004 -36.074990 45.695000 19.638004 -36.074990
+ 49.750000 20.307005 -39.178990 49.750000 20.307005 -39.178990
+ 53.804000 20.977005 -42.282990 53.804000 20.977005 -42.282990
+ 57.859000 21.647006 -45.386990 57.859000 21.647006 -45.386990
+ 42.398000 13.875004 -33.078990 42.398000 13.875004 -33.078990
+ 46.453000 14.545004 -36.182990 46.453000 14.545004 -36.182990
+ 50.508000 15.215005 -39.286990 50.508000 15.215005 -39.286990
+ 54.562000 15.884005 -42.390990 54.562000 15.884005 -42.390990
+ 47.211000 9.452005 -36.291990 47.211000 9.452005 -36.291990
+ 51.266000 10.122005 -39.395990 51.266000 10.122005 -39.395990
]
NORMAL_VECTOR HBA0
@@ -179,7 +179,7 @@ ROTATION_MATRIX HBA0
]
HBA0
-3 [ 3825568.820100000 460647.619554000 5065683.028 ]
+3 [ 3825568.776710000 460647.666987000 5065683.056 ]
NORMAL_VECTOR HBA1
3 [ 0.598753 0.072099 0.797682 ]
@@ -192,4 +192,4 @@ ROTATION_MATRIX HBA1
]
HBA1
-3 [ 3825663.508100000 460692.657562000 5065607.883 ]
+3 [ 3825663.464710000 460692.704996000 5065607.911 ]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE601-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE601-AntennaField.conf
index 2f5fd307ed766a4d8c41b2f90afe999f2f5535db..6e291fcbf05d4d360f00f4aa731301a935e3cc17 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE601-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE601-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for DE601
-# ITRF2005 target_date = 2012.5
-# Created: 2013-05-14 11:16:33
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:10
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 4034038.246510000 487026.564083000 4900280.329 ]
+3 [ 4034038.204070000 487026.613754000 4900280.359 ]
96 x 2 x 3 [
- -5.288000 -12.331000 5.533000 -5.288000 -12.331000 5.533000
- -9.261000 -5.634000 8.166000 -9.261000 -5.634000 8.166000
- -8.262000 -12.056000 7.971000 -8.262000 -12.056000 7.971000
+ -5.288000 -12.331001 5.533000 -5.288000 -12.331001 5.533000
+ -9.261000 -5.634001 8.166000 -9.261000 -5.634001 8.166000
+ -8.262000 -12.056001 7.971000 -8.262000 -12.056001 7.971000
-11.768000 -6.435001 10.300000 -11.768000 -6.435001 10.300000
- 4.650000 19.186001 -5.692000 4.650000 19.186001 -5.692000
- 1.108000 23.921001 -3.257000 1.108000 23.921001 -3.257000
- 10.763000 21.388001 -10.931000 10.763000 21.388001 -10.931000
- 8.633000 25.778001 -9.759000 8.633000 25.778001 -9.759000
- -7.774000 -17.369000 8.081000 -7.774000 -17.369000 8.081000
- -5.667000 -23.901000 6.986000 -5.667000 -23.901000 6.986000
- -8.161000 -26.171000 9.251000 -8.161000 -26.171000 9.251000
--11.074000 -24.307000 11.491000 -11.074000 -24.307000 11.491000
- 1.072000 4.390001 -1.358000 1.072000 4.390001 -1.358000
- -2.965000 2.415000 2.190000 -2.965000 2.415000 2.190000
- -4.502000 5.270000 3.207000 -4.502000 5.270000 3.207000
- -2.438000 9.113000 1.129000 -2.438000 9.113000 1.129000
- -7.223000 5.675000 5.390000 -7.223000 5.675000 5.390000
- -9.550000 1.830000 7.643000 -9.550000 1.830000 7.643000
--11.915000 10.094999 8.781000 -11.915000 10.094999 8.781000
--14.516000 7.012999 11.183000 -14.516000 7.012999 11.183000
- 15.284000 -9.441998 -11.572000 15.284000 -9.441998 -11.572000
- 13.572000 -17.998998 -9.391000 13.572000 -17.998998 -9.391000
- 21.860000 -13.623998 -16.604990 21.860000 -13.623998 -16.604990
- 16.312000 -22.824998 -11.105990 16.312000 -22.824998 -11.105990
- 0.674000 -13.470999 0.741000 0.674000 -13.470999 0.741000
+ 4.649990 19.186000 -5.692000 4.649990 19.186000 -5.692000
+ 1.107990 23.921000 -3.257000 1.107990 23.921000 -3.257000
+ 10.762990 21.388001 -10.931000 10.762990 21.388001 -10.931000
+ 8.632990 25.778000 -9.759000 8.632990 25.778000 -9.759000
+ -7.774000 -17.369001 8.081000 -7.774000 -17.369001 8.081000
+ -5.667000 -23.901001 6.986000 -5.667000 -23.901001 6.986000
+ -8.161000 -26.171001 9.251000 -8.161000 -26.171001 9.251000
+-11.074000 -24.307001 11.491000 -11.074000 -24.307001 11.491000
+ 1.071990 4.390000 -1.358000 1.071990 4.390000 -1.358000
+ -2.965010 2.414999 2.190000 -2.965010 2.414999 2.190000
+ -4.502010 5.269999 3.207000 -4.502010 5.269999 3.207000
+ -2.438010 9.112999 1.129000 -2.438010 9.112999 1.129000
+ -7.223010 5.674999 5.390000 -7.223010 5.674999 5.390000
+ -9.550010 1.829999 7.643000 -9.550010 1.829999 7.643000
+-11.915010 10.094999 8.781000 -11.915010 10.094999 8.781000
+-14.516010 7.012998 11.183000 -14.516010 7.012998 11.183000
+ 15.284000 -9.441999 -11.572000 15.284000 -9.441999 -11.572000
+ 13.572000 -17.998999 -9.391000 13.572000 -17.998999 -9.391000
+ 21.860000 -13.623998 -16.605000 21.860000 -13.623998 -16.605000
+ 16.312000 -22.824999 -11.106000 16.312000 -22.824999 -11.106000
+ 0.674000 -13.471000 0.741000 0.674000 -13.471000 0.741000
-1.618000 -16.209000 2.890000 -1.618000 -16.209000 2.890000
- 3.266000 -16.407999 -1.049000 3.266000 -16.407999 -1.049000
- 4.470000 -20.213999 -1.673000 4.470000 -20.213999 -1.673000
- 14.822000 6.170002 -12.726000 14.822000 6.170002 -12.726000
- 16.901000 8.819002 -14.721000 16.901000 8.819002 -14.721000
- 19.780000 -0.610998 -16.055990 19.780000 -0.610998 -16.055990
- 22.895000 3.520002 -19.072990 22.895000 3.520002 -19.072990
--12.694000 13.947999 9.041000 -12.694000 13.947999 9.041000
--10.543000 19.729000 6.727000 -10.543000 19.729000 6.727000
--15.811000 27.357999 10.260000 -15.811000 27.357999 10.260000
--18.369000 21.992999 12.902000 -18.369000 21.992999 12.902000
- 4.765000 2.932001 -4.243000 4.765000 2.932001 -4.243000
- 3.247000 8.369001 -3.523000 3.247000 8.369001 -3.523000
- 7.679000 4.165001 -6.720000 7.679000 4.165001 -6.720000
- 7.267000 7.887001 -6.747000 7.267000 7.887001 -6.747000
--16.824000 -12.222001 15.033000 -16.824000 -12.222001 15.033000
--18.612000 -2.338001 15.565000 -18.612000 -2.338001 15.565000
--22.703000 -9.424001 19.601000 -22.703000 -9.424001 19.601000
--23.549000 1.103998 19.256000 -23.549000 1.103998 19.256000
- 5.316000 -3.566999 -4.033000 5.316000 -3.566999 -4.033000
- 8.343000 -2.748999 -6.576000 8.343000 -2.748999 -6.576000
- 5.662000 -8.333999 -3.805000 5.662000 -8.333999 -3.805000
+ 3.266000 -16.408000 -1.049000 3.266000 -16.408000 -1.049000
+ 4.470000 -20.214000 -1.673000 4.470000 -20.214000 -1.673000
+ 14.822000 6.170001 -12.726000 14.822000 6.170001 -12.726000
+ 16.901000 8.819001 -14.721000 16.901000 8.819001 -14.721000
+ 19.780000 -0.610998 -16.056000 19.780000 -0.610998 -16.056000
+ 22.895000 3.520002 -19.073000 22.895000 3.520002 -19.073000
+-12.694010 13.947998 9.041000 -12.694010 13.947998 9.041000
+-10.543010 19.728999 6.727000 -10.543010 19.728999 6.727000
+-15.811010 27.357998 10.260000 -15.811010 27.357998 10.260000
+-18.369010 21.992998 12.902000 -18.369010 21.992998 12.902000
+ 4.765000 2.932000 -4.243000 4.765000 2.932000 -4.243000
+ 3.246990 8.369000 -3.523000 3.246990 8.369000 -3.523000
+ 7.679000 4.165000 -6.720000 7.679000 4.165000 -6.720000
+ 7.266990 7.887000 -6.747000 7.266990 7.887000 -6.747000
+-16.824000 -12.222002 15.033000 -16.824000 -12.222002 15.033000
+-18.612010 -2.338002 15.565000 -18.612010 -2.338002 15.565000
+-22.703010 -9.424002 19.601000 -22.703010 -9.424002 19.601000
+-23.549010 1.103997 19.256000 -23.549010 1.103997 19.256000
+ 5.316000 -3.567000 -4.033000 5.316000 -3.567000 -4.033000
+ 8.343000 -2.749000 -6.576000 8.343000 -2.749000 -6.576000
+ 5.662000 -8.334000 -3.805000 5.662000 -8.334000 -3.805000
9.472000 -6.759999 -7.059000 9.472000 -6.759999 -7.059000
- -0.494000 17.580000 -1.321000 -0.494000 17.580000 -1.321000
- 15.835000 -2.775998 -12.627000 15.835000 -2.775998 -12.627000
- -0.545000 28.476000 -2.406000 -0.545000 28.476000 -2.406000
- -7.834000 19.906000 4.530000 -7.834000 19.906000 4.530000
- 8.190000 -23.683999 -4.405000 8.190000 -23.683999 -4.405000
- 24.213000 -6.743998 -19.154990 24.213000 -6.743998 -19.154990
- -8.428000 27.454000 4.224000 -8.428000 27.454000 4.224000
- 0.605000 7.736000 -1.278000 0.605000 7.736000 -1.278000
--16.543000 -19.123001 15.513000 -16.543000 -19.123001 15.513000
+ -0.494010 17.580000 -1.321000 -0.494010 17.580000 -1.321000
+ 15.835000 -2.775999 -12.627000 15.835000 -2.775999 -12.627000
+ -0.545010 28.476000 -2.406000 -0.545010 28.476000 -2.406000
+ -7.834010 19.905999 4.530000 -7.834010 19.905999 4.530000
+ 8.190000 -23.684000 -4.405000 8.190000 -23.684000 -4.405000
+ 24.213000 -6.743998 -19.155000 24.213000 -6.743998 -19.155000
+ -8.428010 27.453999 4.224000 -8.428010 27.453999 4.224000
+ 0.604990 7.736000 -1.278000 0.604990 7.736000 -1.278000
+-16.543000 -19.123002 15.513000 -16.543000 -19.123002 15.513000
9.312000 -17.052999 -5.978000 9.312000 -17.052999 -5.978000
- -2.680000 -19.840000 4.092000 -2.680000 -19.840000 4.092000
- 20.839000 13.067002 -18.439990 20.839000 13.067002 -18.439990
- 13.108000 -0.402998 -10.680000 13.108000 -0.402998 -10.680000
+ -2.680000 -19.840001 4.092000 -2.680000 -19.840001 4.092000
+ 20.839000 13.067002 -18.440000 20.839000 13.067002 -18.440000
+ 13.108000 -0.402999 -10.680000 13.108000 -0.402999 -10.680000
9.505000 -13.248999 -6.470000 9.505000 -13.248999 -6.470000
--15.326000 -2.025001 12.764000 -15.326000 -2.025001 12.764000
- -5.265000 -0.691000 4.380000 -5.265000 -0.691000 4.380000
- 3.318000 13.969001 -4.110000 3.318000 13.969001 -4.110000
- -2.714000 -6.956000 2.874000 -2.714000 -6.956000 2.874000
- 13.911000 13.407002 -12.798000 13.911000 13.407002 -12.798000
- 10.517000 7.415001 -9.406000 10.517000 7.415001 -9.406000
- 1.576000 -24.009999 1.036000 1.576000 -24.009999 1.036000
+-15.326010 -2.025002 12.764000 -15.326010 -2.025002 12.764000
+ -5.265010 -0.691001 4.380000 -5.265010 -0.691001 4.380000
+ 3.317990 13.969000 -4.110000 3.317990 13.969000 -4.110000
+ -2.714000 -6.956001 2.874000 -2.714000 -6.956001 2.874000
+ 13.910990 13.407001 -12.798000 13.910990 13.407001 -12.798000
+ 10.516990 7.415001 -9.406000 10.516990 7.415001 -9.406000
+ 1.576000 -24.010000 1.036000 1.576000 -24.010000 1.036000
-0.540000 -25.801000 2.969000 -0.540000 -25.801000 2.969000
- 1.111000 -4.963999 -0.397000 1.111000 -4.963999 -0.397000
--13.439000 -10.610001 12.127000 -13.439000 -10.610001 12.127000
+ 1.111000 -4.964000 -0.397000 1.111000 -4.964000 -0.397000
+-13.439000 -10.610002 12.127000 -13.439000 -10.610002 12.127000
9.961000 0.184001 -8.198000 9.961000 0.184001 -8.198000
- -6.190000 15.126000 3.632000 -6.190000 15.126000 3.632000
- 6.034000 13.740001 -6.351000 6.034000 13.740001 -6.351000
- -5.658000 27.626000 1.904000 -5.658000 27.626000 1.904000
+ -6.190010 15.125999 3.632000 -6.190010 15.125999 3.632000
+ 6.033990 13.740000 -6.351000 6.033990 13.740000 -6.351000
+ -5.658010 27.625999 1.904000 -5.658010 27.625999 1.904000
0.181000 -9.929000 0.815000 0.181000 -9.929000 0.815000
12.454000 -5.400999 -9.630000 12.454000 -5.400999 -9.630000
--10.715000 -17.646000 10.488000 -10.715000 -17.646000 10.488000
--19.002000 6.028999 15.012000 -19.002000 6.028999 15.012000
--13.244000 2.433999 10.636000 -13.244000 2.433999 10.636000
- -1.783000 21.665000 -0.644000 -1.783000 21.665000 -0.644000
- -8.925000 9.693000 6.384000 -8.925000 9.693000 6.384000
- -2.693000 -3.359000 2.511000 -2.693000 -3.359000 2.511000
- 19.546000 -9.293998 -15.089990 19.546000 -9.293998 -15.089990
- 3.994000 -0.342999 -3.287000 3.994000 -0.342999 -3.287000
- 16.161000 22.502002 -15.590000 16.161000 22.502002 -15.590000
- 11.707000 15.359001 -11.184000 11.707000 15.359001 -11.184000
- -7.867000 -0.989000 6.529000 -7.867000 -0.989000 6.529000
--23.202000 11.916998 17.899000 -23.202000 11.916998 17.899000
- -4.880000 -8.856000 4.823000 -4.880000 -8.856000 4.823000
+-10.715000 -17.646001 10.488000 -10.715000 -17.646001 10.488000
+-19.002010 6.028998 15.012000 -19.002010 6.028998 15.012000
+-13.244010 2.433998 10.636000 -13.244010 2.433998 10.636000
+ -1.783010 21.664999 -0.644000 -1.783010 21.664999 -0.644000
+ -8.925010 9.692999 6.384000 -8.925010 9.692999 6.384000
+ -2.693000 -3.359001 2.511000 -2.693000 -3.359001 2.511000
+ 19.546000 -9.293998 -15.090000 19.546000 -9.293998 -15.090000
+ 3.994000 -0.343000 -3.287000 3.994000 -0.343000 -3.287000
+ 16.160990 22.502001 -15.590000 16.160990 22.502001 -15.590000
+ 11.706990 15.359001 -11.184000 11.706990 15.359001 -11.184000
+ -7.867010 -0.989001 6.529000 -7.867010 -0.989001 6.529000
+-23.202010 11.916997 17.899000 -23.202010 11.916997 17.899000
+ -4.880000 -8.856001 4.823000 -4.880000 -8.856001 4.823000
10.654000 -24.621999 -6.308000 10.654000 -24.621999 -6.308000
--16.401000 13.001999 12.172000 -16.401000 13.001999 12.172000
- 2.429000 -8.072999 -1.199000 2.429000 -8.072999 -1.199000
- 6.020000 -11.860999 -3.713000 6.020000 -11.860999 -3.713000
- -3.493000 12.333000 1.680000 -3.493000 12.333000 1.680000
+-16.401010 13.001998 12.172000 -16.401010 13.001998 12.172000
+ 2.429000 -8.073000 -1.199000 2.429000 -8.073000 -1.199000
+ 6.020000 -11.861000 -3.713000 6.020000 -11.861000 -3.713000
+ -3.493010 12.332999 1.680000 -3.493010 12.332999 1.680000
]
NORMAL_VECTOR HBA
@@ -126,76 +126,76 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 4034101.512510000 487012.742089000 4900230.482 ]
+3 [ 4034101.470070000 487012.791760000 4900230.512 ]
96 x 2 x 3 [
- 20.808010 -15.324998 -15.499000 20.808010 -15.324998 -15.499000
- 21.305010 -10.285998 -16.398000 21.305010 -10.285998 -16.398000
- 21.802010 -5.241998 -17.294000 21.802010 -5.241998 -17.294000
- 22.288010 -0.198998 -18.197000 22.288010 -0.198998 -18.197000
- 22.776010 4.841002 -19.096000 22.776010 4.841002 -19.096000
- 16.351010 -19.412999 -11.455000 16.351010 -19.412999 -11.455000
- 16.852010 -14.368999 -12.355000 16.852010 -14.368999 -12.355000
- 17.343010 -9.320999 -13.254000 17.343010 -9.320999 -13.254000
- 17.842010 -4.273999 -14.159000 17.842010 -4.273999 -14.159000
- 18.326010 0.760001 -15.063000 18.326010 0.760001 -15.063000
- 18.827010 5.786001 -15.955000 18.827010 5.786001 -15.955000
- 19.317000 10.839001 -16.858000 19.317000 10.839001 -16.858000
- 11.894010 -23.508999 -7.425000 11.894010 -23.508999 -7.425000
- 12.394010 -18.456999 -8.332000 12.394010 -18.456999 -8.332000
- 12.898010 -13.395999 -9.235000 12.898010 -13.395999 -9.235000
- 13.392010 -8.355999 -10.119000 13.392010 -8.355999 -10.119000
- 13.875010 -3.311999 -11.017000 13.875010 -3.311999 -11.017000
- 14.359010 1.721001 -11.921000 14.359010 1.721001 -11.921000
+ 20.808000 -15.324998 -15.498990 20.808000 -15.324998 -15.498990
+ 21.305000 -10.285998 -16.397990 21.305000 -10.285998 -16.397990
+ 21.802000 -5.241998 -17.293990 21.802000 -5.241998 -17.293990
+ 22.288000 -0.198998 -18.196990 22.288000 -0.198998 -18.196990
+ 22.776000 4.841002 -19.095990 22.776000 4.841002 -19.095990
+ 16.351000 -19.412999 -11.454990 16.351000 -19.412999 -11.454990
+ 16.852000 -14.368999 -12.354990 16.852000 -14.368999 -12.354990
+ 17.343000 -9.320999 -13.253990 17.343000 -9.320999 -13.253990
+ 17.842000 -4.273999 -14.158990 17.842000 -4.273999 -14.158990
+ 18.326000 0.760001 -15.062990 18.326000 0.760001 -15.062990
+ 18.827000 5.786001 -15.954990 18.827000 5.786001 -15.954990
+ 19.317000 10.839001 -16.857990 19.317000 10.839001 -16.857990
+ 11.894000 -23.508999 -7.425000 11.894000 -23.508999 -7.425000
+ 12.394000 -18.456999 -8.332000 12.394000 -18.456999 -8.332000
+ 12.898000 -13.395999 -9.235000 12.898000 -13.395999 -9.235000
+ 13.392000 -8.355999 -10.119000 13.392000 -8.355999 -10.119000
+ 13.875000 -3.311999 -11.017000 13.875000 -3.311999 -11.017000
+ 14.359000 1.721001 -11.921000 14.359000 1.721001 -11.921000
14.855000 6.744001 -12.818000 14.855000 6.744001 -12.818000
15.351000 11.786001 -13.719000 15.351000 11.786001 -13.719000
15.834000 16.807001 -14.645000 15.834000 16.807001 -14.645000
- 7.934010 -22.554000 -4.271000 7.934010 -22.554000 -4.271000
- 8.437010 -17.503000 -5.176000 8.437010 -17.503000 -5.176000
- 8.934010 -12.440999 -6.092000 8.934010 -12.440999 -6.092000
- 9.440010 -7.394999 -6.980000 9.440010 -7.394999 -6.980000
- 9.928010 -2.358999 -7.882000 9.928010 -2.358999 -7.882000
- 10.417010 2.678001 -8.790000 10.417010 2.678001 -8.790000
+ 7.934000 -22.554000 -4.271000 7.934000 -22.554000 -4.271000
+ 8.437000 -17.503000 -5.176000 8.437000 -17.503000 -5.176000
+ 8.934000 -12.440999 -6.092000 8.934000 -12.440999 -6.092000
+ 9.440000 -7.394999 -6.980000 9.440000 -7.394999 -6.980000
+ 9.928000 -2.358999 -7.882000 9.928000 -2.358999 -7.882000
+ 10.417000 2.678001 -8.790000 10.417000 2.678001 -8.790000
10.902000 7.690001 -9.671000 10.902000 7.690001 -9.671000
11.384000 12.720001 -10.561000 11.384000 12.720001 -10.561000
11.888000 17.759001 -11.479000 11.888000 17.759001 -11.479000
- 3.984010 -21.600000 -1.127000 3.984010 -21.600000 -1.127000
- 4.470010 -16.550000 -2.015000 4.470010 -16.550000 -2.015000
- 4.963010 -11.472000 -2.928000 4.963010 -11.472000 -2.928000
- 5.466010 -6.434000 -3.830000 5.466010 -6.434000 -3.830000
- 5.965010 -1.413000 -4.735000 5.965010 -1.413000 -4.735000
+ 3.984000 -21.600000 -1.127000 3.984000 -21.600000 -1.127000
+ 4.470000 -16.550000 -2.015000 4.470000 -16.550000 -2.015000
+ 4.963000 -11.472000 -2.928000 4.963000 -11.472000 -2.928000
+ 5.466000 -6.434000 -3.830000 5.466000 -6.434000 -3.830000
+ 5.965000 -1.413000 -4.735000 5.965000 -1.413000 -4.735000
6.449000 3.622000 -5.627000 6.449000 3.622000 -5.627000
6.933000 8.641000 -6.516000 6.933000 8.641000 -6.516000
7.425000 13.669000 -7.410000 7.425000 13.669000 -7.410000
7.925000 18.716000 -8.322000 7.925000 18.716000 -8.322000
- 0.024010 -20.662000 2.036000 0.024010 -20.662000 2.036000
- 0.507010 -15.606000 1.134000 0.507010 -15.606000 1.134000
- 1.002010 -10.535000 0.229000 1.002010 -10.535000 0.229000
- 1.491010 -5.481000 -0.670000 1.491010 -5.481000 -0.670000
+ 0.024000 -20.662000 2.036000 0.024000 -20.662000 2.036000
+ 0.507000 -15.606000 1.134000 0.507000 -15.606000 1.134000
+ 1.002000 -10.535000 0.229000 1.002000 -10.535000 0.229000
+ 1.491000 -5.481000 -0.670000 1.491000 -5.481000 -0.670000
1.978000 -0.461000 -1.574000 1.978000 -0.461000 -1.574000
2.471000 4.571000 -2.468000 2.471000 4.571000 -2.468000
2.950000 9.595000 -3.354000 2.950000 9.595000 -3.354000
3.449000 14.629000 -4.253000 3.449000 14.629000 -4.253000
3.950000 19.678000 -5.195000 3.950000 19.678000 -5.195000
- -3.953990 -19.714001 5.204000 -3.953990 -19.714001 5.204000
- -3.467990 -14.631001 4.296000 -3.467990 -14.631001 4.296000
- -2.968990 -9.565000 3.368000 -2.968990 -9.565000 3.368000
- -2.467000 -4.525000 2.461000 -2.467000 -4.525000 2.461000
- -1.964000 0.492000 1.564000 -1.964000 0.492000 1.564000
+ -3.954000 -19.714001 5.204000 -3.954000 -19.714001 5.204000
+ -3.468000 -14.631001 4.296000 -3.468000 -14.631001 4.296000
+ -2.969000 -9.565001 3.368000 -2.969000 -9.565001 3.368000
+ -2.467000 -4.525001 2.461000 -2.467000 -4.525001 2.461000
+ -1.964000 0.491999 1.564000 -1.964000 0.491999 1.564000
-1.471000 5.519000 0.663000 -1.471000 5.519000 0.663000
-0.986000 10.537000 -0.217000 -0.986000 10.537000 -0.217000
-0.515000 15.563000 -1.104000 -0.515000 15.563000 -1.104000
-0.049000 20.637000 -2.040000 -0.049000 20.637000 -2.040000
- -7.911990 -18.767001 8.358000 -7.911990 -18.767001 8.358000
- -7.427990 -13.702001 7.446000 -7.427990 -13.702001 7.446000
- -6.936990 -8.614001 6.532000 -6.936990 -8.614001 6.532000
+ -7.912000 -18.767001 8.358000 -7.912000 -18.767001 8.358000
+ -7.428000 -13.702001 7.446000 -7.428000 -13.702001 7.446000
+ -6.937000 -8.614001 6.532000 -6.937000 -8.614001 6.532000
-6.432000 -3.568001 5.627000 -6.432000 -3.568001 5.627000
-5.944000 1.450999 4.725000 -5.944000 1.450999 4.725000
-5.457000 6.481999 3.828000 -5.457000 6.481999 3.828000
-4.967000 11.488999 2.937000 -4.967000 11.488999 2.937000
-4.470000 16.523999 2.032000 -4.470000 16.523999 2.032000
-4.001000 21.586999 1.087000 -4.001000 21.586999 1.087000
--11.875990 -17.809001 11.486000 -11.875990 -17.809001 11.486000
--11.392990 -12.773001 10.589000 -11.392990 -12.773001 10.589000
+-11.876000 -17.809001 11.486000 -11.876000 -17.809001 11.486000
+-11.393000 -12.773001 10.589000 -11.393000 -12.773001 10.589000
-10.907000 -7.687001 9.687000 -10.907000 -7.687001 9.687000
-10.402000 -2.627001 8.776000 -10.402000 -2.627001 8.776000
-9.901000 2.407999 7.867000 -9.901000 2.407999 7.867000
@@ -203,14 +203,14 @@ HBA
-8.935000 12.445999 6.080000 -8.935000 12.445999 6.080000
-8.438000 17.501999 5.160000 -8.438000 17.501999 5.160000
-7.962000 22.533999 4.231000 -7.962000 22.533999 4.231000
--15.837990 -16.854002 14.637000 -15.837990 -16.854002 14.637000
+-15.838000 -16.854002 14.637000 -15.838000 -16.854002 14.637000
-15.353000 -11.833002 13.739000 -15.353000 -11.833002 13.739000
--14.868000 -6.736001 12.820000 -14.868000 -6.736001 12.820000
--14.369000 -1.665001 11.915000 -14.369000 -1.665001 11.915000
--13.872000 3.345999 11.016000 -13.872000 3.345999 11.016000
--13.397000 8.345999 10.136000 -13.397000 8.345999 10.136000
--12.905000 13.404999 9.225000 -12.905000 13.404999 9.225000
--12.395000 18.469999 8.290000 -12.395000 18.469999 8.290000
+-14.868000 -6.736002 12.820000 -14.868000 -6.736002 12.820000
+-14.369000 -1.665002 11.915000 -14.369000 -1.665002 11.915000
+-13.872000 3.345998 11.016000 -13.872000 3.345998 11.016000
+-13.397000 8.345998 10.136000 -13.397000 8.345998 10.136000
+-12.905000 13.404998 9.225000 -12.905000 13.404998 9.225000
+-12.395000 18.469998 8.290000 -12.395000 18.469998 8.290000
-11.899000 23.503999 7.375000 -11.899000 23.503999 7.375000
-19.300000 -10.876002 16.866000 -19.300000 -10.876002 16.866000
-18.820000 -5.811002 15.956000 -18.820000 -5.811002 15.956000
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE602-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE602-AntennaField.conf
index 94aeb115f49b60f620e58b93c3d3db2785c899f4..d6dc3464418858e994444c6de7c1a0708dddbad0 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE602-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE602-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for DE602
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:41
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:10
#
NORMAL_VECTOR LBA
@@ -15,33 +15,33 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 4152560.657710000 828869.075730000 4754357.155 ]
+3 [ 4152560.612480000 828869.126632000 4754357.186 ]
96 x 2 x 3 [
0.344000 -14.376000 1.821000 0.344000 -14.376000 1.821000
- -5.382000 -10.685000 6.399000 -5.382000 -10.685000 6.399000
+ -5.382000 -10.685001 6.399000 -5.382000 -10.685001 6.399000
-2.174000 -15.943000 4.307000 -2.174000 -15.943000 4.307000
-7.111000 -12.939001 8.281000 -7.111000 -12.939001 8.281000
- -3.440000 20.238000 0.082000 -3.440000 20.238000 0.082000
- -8.048010 22.444999 3.879000 -8.048010 22.444999 3.879000
+ -3.440000 20.237999 0.082000 -3.440000 20.237999 0.082000
+ -8.048000 22.444999 3.879000 -8.048000 22.444999 3.879000
0.629000 25.937000 -4.404000 0.629000 25.937000 -4.404000
- -2.659010 28.649000 -1.863000 -2.659010 28.649000 -1.863000
+ -2.659000 28.648999 -1.863000 -2.659000 28.648999 -1.863000
0.207000 -20.474000 2.847000 0.207000 -20.474000 2.847000
4.399000 -25.186000 -0.207000 4.399000 -25.186000 -0.207000
3.247000 -28.720000 1.348000 3.247000 -28.720000 1.348000
0.160000 -28.813000 4.125000 0.160000 -28.813000 4.125000
-0.751000 4.642000 -0.015000 -0.751000 4.642000 -0.015000
- -3.282000 0.398000 2.879000 -3.282000 0.398000 2.879000
- -5.611000 2.101000 4.711000 -5.611000 2.101000 4.711000
- -5.381000 6.816000 3.807000 -5.381000 6.816000 3.807000
+ -3.282000 0.397999 2.879000 -3.282000 0.397999 2.879000
+ -5.611000 2.100999 4.711000 -5.611000 2.100999 4.711000
+ -5.381000 6.815999 3.807000 -5.381000 6.815999 3.807000
-7.980000 0.824999 7.020000 -7.980000 0.824999 7.020000
-8.401000 -4.070001 8.122000 -8.401000 -4.070001 8.122000
--13.413000 2.035999 11.703000 -13.413000 2.035999 11.703000
--14.349000 -2.310001 13.184000 -14.349000 -2.310001 13.184000
+-13.413000 2.035998 11.703000 -13.413000 2.035998 11.703000
+-14.349000 -2.310002 13.184000 -14.349000 -2.310002 13.184000
15.871000 0.547001 -14.285000 15.871000 0.547001 -14.285000
- 17.747000 -8.257998 -14.660000 17.747000 -8.257998 -14.660000
+ 17.747000 -8.257999 -14.660000 17.747000 -8.257999 -14.660000
22.789000 0.728002 -20.504000 22.789000 0.728002 -20.504000
21.715000 -11.022998 -17.802000 21.715000 -11.022998 -17.802000
- 5.614000 -11.883999 -3.264000 5.614000 -11.883999 -3.264000
+ 5.614000 -11.884000 -3.264000 5.614000 -11.884000 -3.264000
4.780000 -15.728000 -1.948000 4.780000 -15.728000 -1.948000
8.775000 -12.977999 -5.931000 8.775000 -12.977999 -5.931000
11.197000 -15.732999 -7.691000 11.197000 -15.732999 -7.691000
@@ -49,42 +49,42 @@ LBA
10.359000 18.183001 -11.964000 10.359000 18.183001 -11.964000
16.169000 11.273001 -16.140000 16.169000 11.273001 -16.140000
17.189000 16.925001 -17.890000 17.189000 16.925001 -17.890000
--15.457000 5.066999 13.084000 -15.457000 5.066999 13.084000
--15.915000 11.603999 12.525000 -15.915000 11.603999 12.525000
--23.001010 15.449998 18.297000 -23.001010 15.449998 18.297000
+-15.457000 5.066998 13.084000 -15.457000 5.066998 13.084000
+-15.915000 11.603998 12.525000 -15.915000 11.603998 12.525000
+-23.001000 15.449998 18.297000 -23.001000 15.449998 18.297000
-23.092000 9.035998 19.329000 -23.092000 9.035998 19.329000
2.772000 5.561000 -3.304000 2.772000 5.561000 -3.304000
-0.525000 9.634000 -0.957000 -0.525000 9.634000 -0.957000
4.624000 8.437000 -5.388000 4.624000 8.437000 -5.388000
2.927000 11.563000 -4.332000 2.927000 11.563000 -4.332000
-9.025000 -21.225001 11.221000 -9.025000 -21.225001 11.221000
--14.212000 -13.318001 14.693000 -14.212000 -13.318001 14.693000
--14.862000 -22.202001 16.589000 -14.862000 -22.202001 16.589000
+-14.212000 -13.318002 14.693000 -14.212000 -13.318002 14.693000
+-14.862000 -22.202002 16.589000 -14.862000 -22.202002 16.589000
-19.464000 -13.142002 19.366000 -19.464000 -13.142002 19.366000
- 5.650000 -0.043999 -5.050000 5.650000 -0.043999 -5.050000
- 7.761000 2.516001 -7.318000 7.761000 2.516001 -7.318000
- 7.702000 -4.209999 -6.270000 7.702000 -4.209999 -6.270000
+ 5.650000 -0.044000 -5.050000 5.650000 -0.044000 -5.050000
+ 7.761000 2.516000 -7.318000 7.761000 2.516000 -7.318000
+ 7.702000 -4.210000 -6.270000 7.702000 -4.210000 -6.270000
10.155000 -0.456999 -9.021000 10.155000 -0.456999 -9.021000
-6.977000 15.704999 3.919000 -6.977000 15.704999 3.919000
13.808000 6.948001 -13.387000 13.808000 6.948001 -13.387000
--11.111010 25.644999 6.146000 -11.111010 25.644999 6.146000
--13.820000 13.398999 10.384000 -13.820000 13.398999 10.384000
+-11.111000 25.644999 6.146000 -11.111000 25.644999 6.146000
+-13.820000 13.398998 10.384000 -13.820000 13.398998 10.384000
15.492000 -16.645999 -11.400000 15.492000 -16.645999 -11.400000
22.079000 8.363002 -20.998000 22.079000 8.363002 -20.998000
--17.098010 19.949999 12.348000 -17.098010 19.949999 12.348000
+-17.098000 19.949998 12.348000 -17.098000 19.949998 12.348000
-2.378000 7.454000 1.024000 -2.378000 7.454000 1.024000
- -6.234000 -27.353000 9.630000 -6.234000 -27.353000 9.630000
+ -6.234000 -27.353001 9.630000 -6.234000 -27.353001 9.630000
13.936000 -9.925999 -11.002000 13.936000 -9.925999 -11.002000
- 5.297000 -19.634999 -1.832000 5.297000 -19.634999 -1.832000
+ 5.297000 -19.635000 -1.832000 5.297000 -19.635000 -1.832000
11.969000 24.411001 -14.327000 11.969000 24.411001 -14.327000
10.742000 7.495001 -10.723000 10.742000 7.495001 -10.723000
12.631000 -6.358999 -10.362000 12.631000 -6.358999 -10.362000
-11.653000 -11.050001 12.066000 -11.653000 -11.050001 12.066000
- -3.998000 -3.767000 4.137000 -3.998000 -3.767000 4.137000
+ -3.998000 -3.767001 4.137000 -3.998000 -3.767001 4.137000
-2.539000 14.697000 0.096000 -2.539000 14.697000 0.096000
0.436000 -7.963000 0.789000 0.436000 -7.963000 0.789000
- 6.259000 20.534001 -8.643000 6.259000 20.534001 -8.643000
- 5.756000 13.065001 -7.086000 5.756000 13.065001 -7.086000
+ 6.259000 20.534000 -8.643000 6.259000 20.534000 -8.643000
+ 5.756000 13.065000 -7.086000 5.756000 13.065000 -7.086000
10.294000 -20.908999 -6.116000 10.294000 -20.908999 -6.116000
9.245000 -23.787999 -4.751000 9.245000 -23.787999 -4.751000
2.741000 -3.853000 -1.882000 2.741000 -3.853000 -1.882000
@@ -92,11 +92,11 @@ LBA
7.984000 6.134001 -8.054000 7.984000 6.134001 -8.054000
-10.688000 10.047999 8.078000 -10.688000 10.047999 8.078000
-0.238000 16.127000 -2.175000 -0.238000 16.127000 -2.175000
--14.906010 21.747999 10.120000 -14.906010 21.747999 10.120000
+-14.906000 21.747998 10.120000 -14.906000 21.747998 10.120000
3.866000 -8.919000 -2.139000 3.866000 -8.919000 -2.139000
12.064000 2.536001 -11.173000 12.064000 2.536001 -11.173000
-2.050000 -22.486000 5.165000 -2.050000 -22.486000 5.165000
--17.623000 -5.913001 16.648000 -17.623000 -5.913001 16.648000
+-17.623000 -5.913002 16.648000 -17.623000 -5.913002 16.648000
-11.609000 -5.722001 11.238000 -11.609000 -5.722001 11.238000
-9.562000 18.638999 5.797000 -9.562000 18.638999 5.797000
-10.843000 3.461999 9.192000 -10.843000 3.461999 9.192000
@@ -105,11 +105,11 @@ LBA
3.374000 2.088000 -3.329000 3.374000 2.088000 -3.329000
4.680000 30.123000 -8.649000 4.680000 30.123000 -8.649000
3.704000 21.073000 -6.436000 3.704000 21.073000 -6.436000
- -5.990000 -5.620000 6.194000 -5.990000 -5.620000 6.194000
+ -5.990000 -5.620001 6.194000 -5.990000 -5.620001 6.194000
-23.205000 -3.077002 21.224000 -23.205000 -3.077002 21.224000
-0.609000 -10.976000 2.171000 -0.609000 -10.976000 2.171000
- 17.826000 -16.047998 -13.577000 17.826000 -16.047998 -13.577000
--18.131000 2.022999 15.927000 -18.131000 2.022999 15.927000
+ 17.826000 -16.047999 -13.577000 17.826000 -16.047999 -13.577000
+-18.131000 2.022998 15.927000 -18.131000 2.022998 15.927000
4.982000 -5.891000 -3.586000 4.982000 -5.891000 -3.586000
9.266000 -7.193999 -7.228000 9.266000 -7.193999 -7.228000
-7.447000 9.092999 5.318000 -7.447000 9.092999 5.318000
@@ -126,53 +126,53 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 4152568.005710000 828789.152731000 4754362.203 ]
+3 [ 4152567.960490000 828789.203633000 4754362.234 ]
96 x 2 x 3 [
--18.836000 14.981998 13.779000 -18.836000 14.981998 13.779000
--15.913000 17.923998 10.727000 -15.913000 17.923998 10.727000
--12.989000 20.866999 7.675000 -12.989000 20.866999 7.675000
--10.065000 23.808999 4.623000 -10.065000 23.808999 4.623000
- -7.141000 26.751999 1.571000 -7.141000 26.751999 1.571000
--19.162000 7.865998 15.296000 -19.162000 7.865998 15.296000
--16.239000 10.807998 12.244000 -16.239000 10.807998 12.244000
--13.315000 13.750999 9.192000 -13.315000 13.750999 9.192000
--10.391000 16.692999 6.140000 -10.391000 16.692999 6.140000
- -7.467000 19.635999 3.088000 -7.467000 19.635999 3.088000
- -4.544000 22.577999 0.036000 -4.544000 22.577999 0.036000
- -1.620000 25.521000 -3.017000 -1.620000 25.521000 -3.017000
--19.488000 0.749998 16.814000 -19.488000 0.749998 16.814000
--16.565000 3.691998 13.761000 -16.565000 3.691998 13.761000
--13.641000 6.634999 10.709000 -13.641000 6.634999 10.709000
--10.717000 9.576999 7.657000 -10.717000 9.576999 7.657000
- -7.793000 12.519999 4.605000 -7.793000 12.519999 4.605000
- -4.870000 15.461999 1.553000 -4.870000 15.461999 1.553000
- -1.946000 18.405000 -1.499000 -1.946000 18.405000 -1.499000
- 0.978000 21.347000 -4.552000 0.978000 21.347000 -4.552000
- 3.902000 24.290000 -7.604000 3.902000 24.290000 -7.604000
+-18.836010 14.981998 13.779000 -18.836010 14.981998 13.779000
+-15.913010 17.923998 10.727000 -15.913010 17.923998 10.727000
+-12.989010 20.866998 7.675000 -12.989010 20.866998 7.675000
+-10.065010 23.808999 4.623000 -10.065010 23.808999 4.623000
+ -7.141010 26.751999 1.571000 -7.141010 26.751999 1.571000
+-19.162010 7.865998 15.296000 -19.162010 7.865998 15.296000
+-16.239010 10.807998 12.244000 -16.239010 10.807998 12.244000
+-13.315010 13.750998 9.192000 -13.315010 13.750998 9.192000
+-10.391010 16.692999 6.140000 -10.391010 16.692999 6.140000
+ -7.467010 19.635999 3.088000 -7.467010 19.635999 3.088000
+ -4.544010 22.577999 0.036000 -4.544010 22.577999 0.036000
+ -1.620010 25.520999 -3.017000 -1.620010 25.520999 -3.017000
+-19.488010 0.749998 16.814000 -19.488010 0.749998 16.814000
+-16.565010 3.691998 13.761000 -16.565010 3.691998 13.761000
+-13.641010 6.634998 10.709000 -13.641010 6.634998 10.709000
+-10.717010 9.576999 7.657000 -10.717010 9.576999 7.657000
+ -7.793010 12.519999 4.605000 -7.793010 12.519999 4.605000
+ -4.870010 15.461999 1.553000 -4.870010 15.461999 1.553000
+ -1.946010 18.404999 -1.499000 -1.946010 18.404999 -1.499000
+ 0.977990 21.347000 -4.552000 0.977990 21.347000 -4.552000
+ 3.901990 24.290000 -7.604000 3.901990 24.290000 -7.604000
-19.814000 -6.366002 18.331000 -19.814000 -6.366002 18.331000
-16.890000 -3.424002 15.278000 -16.890000 -3.424002 15.278000
--13.967000 -0.481001 12.226000 -13.967000 -0.481001 12.226000
--11.043000 2.460999 9.174000 -11.043000 2.460999 9.174000
+-13.967000 -0.481002 12.226000 -13.967000 -0.481002 12.226000
+-11.043000 2.460998 9.174000 -11.043000 2.460998 9.174000
-8.119000 5.403999 6.122000 -8.119000 5.403999 6.122000
- -5.196000 8.345999 3.070000 -5.196000 8.345999 3.070000
- -2.272000 11.289000 0.018000 -2.272000 11.289000 0.018000
- 0.652000 14.231000 -3.034000 0.652000 14.231000 -3.034000
- 3.576000 17.174000 -6.087000 3.576000 17.174000 -6.087000
- 6.499000 20.117000 -9.139000 6.499000 20.117000 -9.139000
- 9.423000 23.059000 -12.191000 9.423000 23.059000 -12.191000
+ -5.196010 8.345999 3.070000 -5.196010 8.345999 3.070000
+ -2.272010 11.288999 0.018000 -2.272010 11.288999 0.018000
+ 0.651990 14.231000 -3.034000 0.651990 14.231000 -3.034000
+ 3.575990 17.174000 -6.087000 3.575990 17.174000 -6.087000
+ 6.498990 20.117000 -9.139000 6.498990 20.117000 -9.139000
+ 9.422990 23.059000 -12.191000 9.422990 23.059000 -12.191000
-17.216000 -10.540002 16.796000 -17.216000 -10.540002 16.796000
--14.293000 -7.597001 13.743000 -14.293000 -7.597001 13.743000
--11.369000 -4.655001 10.691000 -11.369000 -4.655001 10.691000
+-14.293000 -7.597002 13.743000 -14.293000 -7.597002 13.743000
+-11.369000 -4.655002 10.691000 -11.369000 -4.655002 10.691000
-8.445000 -1.712001 7.639000 -8.445000 -1.712001 7.639000
-5.522000 1.230999 4.587000 -5.522000 1.230999 4.587000
- -2.598000 4.173000 1.535000 -2.598000 4.173000 1.535000
+ -2.598000 4.172999 1.535000 -2.598000 4.172999 1.535000
0.326000 7.116000 -1.517000 0.326000 7.116000 -1.517000
3.250000 10.058000 -4.569000 3.250000 10.058000 -4.569000
6.173000 13.001000 -7.622000 6.173000 13.001000 -7.622000
9.097000 15.943000 -10.674000 9.097000 15.943000 -10.674000
12.021000 18.886001 -13.726000 12.021000 18.886001 -13.726000
--14.619000 -14.713001 15.261000 -14.619000 -14.713001 15.261000
--11.695000 -11.770001 12.208000 -11.695000 -11.770001 12.208000
+-14.619000 -14.713002 15.261000 -14.619000 -14.713002 15.261000
+-11.695000 -11.770002 12.208000 -11.695000 -11.770002 12.208000
-8.771000 -8.828001 9.156000 -8.771000 -8.828001 9.156000
-5.847000 -5.885001 6.104000 -5.847000 -5.885001 6.104000
-2.924000 -2.943001 3.052000 -2.924000 -2.943001 3.052000
@@ -181,7 +181,7 @@ HBA
8.771000 8.827000 -9.157000 8.771000 8.827000 -9.157000
11.695000 11.770001 -12.209000 11.695000 11.770001 -12.209000
14.619000 14.712001 -15.261000 14.619000 14.712001 -15.261000
--12.021000 -18.886001 13.726000 -12.021000 -18.886001 13.726000
+-12.021000 -18.886002 13.726000 -12.021000 -18.886002 13.726000
-9.097000 -15.944001 10.673000 -9.097000 -15.944001 10.673000
-6.173000 -13.001001 7.621000 -6.173000 -13.001001 7.621000
-3.250000 -10.059001 4.569000 -3.250000 -10.059001 4.569000
@@ -192,36 +192,36 @@ HBA
11.369000 4.654001 -10.692000 11.369000 4.654001 -10.692000
14.293000 7.596001 -13.744000 14.293000 7.596001 -13.744000
17.216000 10.539001 -16.796000 17.216000 10.539001 -16.796000
- -9.422990 -23.060001 12.191000 -9.422990 -23.060001 12.191000
- -6.498990 -20.117001 9.138000 -6.498990 -20.117001 9.138000
- -3.575990 -17.175001 6.086000 -3.575990 -17.175001 6.086000
- -0.651990 -14.232000 3.034000 -0.651990 -14.232000 3.034000
- 2.272010 -11.290000 -0.018000 2.272010 -11.290000 -0.018000
+ -9.423000 -23.060001 12.191000 -9.423000 -23.060001 12.191000
+ -6.499000 -20.117001 9.138000 -6.499000 -20.117001 9.138000
+ -3.576000 -17.175001 6.086000 -3.576000 -17.175001 6.086000
+ -0.652000 -14.232001 3.034000 -0.652000 -14.232001 3.034000
+ 2.272000 -11.290000 -0.018000 2.272000 -11.290000 -0.018000
5.196000 -8.347000 -3.070000 5.196000 -8.347000 -3.070000
8.119000 -5.405000 -6.122000 8.119000 -5.405000 -6.122000
11.043000 -2.461999 -9.175000 11.043000 -2.461999 -9.175000
13.967000 0.480001 -12.227000 13.967000 0.480001 -12.227000
16.890000 3.423001 -15.279000 16.890000 3.423001 -15.279000
19.814000 6.365001 -18.330990 19.814000 6.365001 -18.330990
- -3.901990 -24.291001 7.603000 -3.901990 -24.291001 7.603000
- -0.977990 -21.348000 4.551000 -0.977990 -21.348000 4.551000
- 1.946010 -18.406000 1.499000 1.946010 -18.406000 1.499000
- 4.870010 -15.463000 -1.553000 4.870010 -15.463000 -1.553000
- 7.793010 -12.521000 -4.605000 7.793010 -12.521000 -4.605000
- 10.717010 -9.577999 -7.657000 10.717010 -9.577999 -7.657000
- 13.641010 -6.635999 -10.710000 13.641010 -6.635999 -10.710000
- 16.565010 -3.692999 -13.762000 16.565010 -3.692999 -13.762000
- 19.488010 -0.750999 -16.813990 19.488010 -0.750999 -16.813990
- 1.620010 -25.522000 3.016000 1.620010 -25.522000 3.016000
- 4.544010 -22.579000 -0.036000 4.544010 -22.579000 -0.036000
- 7.467010 -19.637000 -3.088000 7.467010 -19.637000 -3.088000
- 10.391010 -16.693999 -6.140000 10.391010 -16.693999 -6.140000
- 13.315010 -13.751999 -9.192000 13.315010 -13.751999 -9.192000
- 16.239010 -10.808999 -12.245000 16.239010 -10.808999 -12.245000
- 19.162010 -7.866999 -15.296990 19.162010 -7.866999 -15.296990
- 7.141010 -26.753000 -1.571000 7.141010 -26.753000 -1.571000
- 10.065010 -23.809999 -4.623000 10.065010 -23.809999 -4.623000
- 12.989010 -20.867999 -7.675000 12.989010 -20.867999 -7.675000
- 15.913010 -17.924999 -10.727990 15.913010 -17.924999 -10.727990
- 18.836010 -14.981999 -13.779990 18.836010 -14.981999 -13.779990
+ -3.902000 -24.291001 7.603000 -3.902000 -24.291001 7.603000
+ -0.978000 -21.348001 4.551000 -0.978000 -21.348001 4.551000
+ 1.946000 -18.406000 1.499000 1.946000 -18.406000 1.499000
+ 4.870000 -15.463000 -1.553000 4.870000 -15.463000 -1.553000
+ 7.793000 -12.521000 -4.605000 7.793000 -12.521000 -4.605000
+ 10.717000 -9.577999 -7.657000 10.717000 -9.577999 -7.657000
+ 13.641000 -6.635999 -10.710000 13.641000 -6.635999 -10.710000
+ 16.565000 -3.692999 -13.762000 16.565000 -3.692999 -13.762000
+ 19.488000 -0.750999 -16.813990 19.488000 -0.750999 -16.813990
+ 1.620000 -25.522000 3.016000 1.620000 -25.522000 3.016000
+ 4.544000 -22.579000 -0.036000 4.544000 -22.579000 -0.036000
+ 7.467000 -19.637000 -3.088000 7.467000 -19.637000 -3.088000
+ 10.391000 -16.693999 -6.140000 10.391000 -16.693999 -6.140000
+ 13.315000 -13.751999 -9.192000 13.315000 -13.751999 -9.192000
+ 16.239000 -10.808999 -12.245000 16.239000 -10.808999 -12.245000
+ 19.162000 -7.866999 -15.296990 19.162000 -7.866999 -15.296990
+ 7.141000 -26.753000 -1.571000 7.141000 -26.753000 -1.571000
+ 10.065000 -23.809999 -4.623000 10.065000 -23.809999 -4.623000
+ 12.989000 -20.867999 -7.675000 12.989000 -20.867999 -7.675000
+ 15.913000 -17.924999 -10.728000 15.913000 -17.924999 -10.728000
+ 18.836000 -14.981999 -13.779990 18.836000 -14.981999 -13.779990
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE603-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE603-AntennaField.conf
index 40df508ff074a8fac0178ba902b60977bdf19752..82977c43a93b308b628ffa6666f3887ea0cf03ab 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE603-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE603-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for DE603
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:41
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:10
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3940284.908280000 816802.333940000 4932393.021 ]
+3 [ 3940284.861840000 816802.382570000 4932393.051 ]
96 x 2 x 3 [
--11.567010 0.361999 8.728000 -11.567010 0.361999 8.728000
- -9.282010 7.792999 6.099000 -9.282010 7.792999 6.099000
--13.137010 3.810999 9.503000 -13.137010 3.810999 9.503000
--11.312010 10.230999 7.344000 -11.312010 10.230999 7.344000
- 15.925000 3.438001 -12.490000 15.925000 3.438001 -12.490000
- 17.148000 9.460001 -14.144000 17.148000 9.460001 -14.144000
+-11.567000 0.361999 8.728000 -11.567000 0.361999 8.728000
+ -9.282000 7.793000 6.099000 -9.282000 7.793000 6.099000
+-13.137000 3.810999 9.503000 -13.137000 3.810999 9.503000
+-11.312000 10.230999 7.344000 -11.312000 10.230999 7.344000
+ 15.925000 3.438002 -12.490000 15.925000 3.438002 -12.490000
+ 17.148000 9.460002 -14.144000 17.148000 9.460002 -14.144000
21.021000 -2.319998 -15.661000 21.021000 -2.319998 -15.661000
- 22.812000 1.915002 -17.529000 22.812000 1.915002 -17.529000
--16.509010 0.892998 12.411000 -16.509010 0.892998 12.411000
--19.805010 -4.434002 15.553000 -19.805010 -4.434002 15.553000
--22.797010 -2.694002 17.612000 -22.797010 -2.694002 17.612000
--23.248010 1.432998 17.456000 -23.248010 1.432998 17.456000
- 3.658000 0.738000 -2.863000 3.658000 0.738000 -2.863000
- -0.076010 4.359000 -0.468000 -0.076010 4.359000 -0.468000
- 1.014990 7.370000 -1.658000 1.014990 7.370000 -1.658000
- 4.850990 6.794000 -4.498000 4.850990 6.794000 -4.498000
- -0.303010 10.604000 -1.049000 -0.303010 10.604000 -1.049000
- -4.307010 11.445999 1.886000 -4.307010 11.445999 1.886000
- 0.015990 17.787000 -2.157000 0.015990 17.787000 -2.157000
- -3.607010 19.284000 0.410000 -3.607010 19.284000 0.410000
- 2.369000 -21.214000 0.762000 2.369000 -21.214000 0.762000
- -4.513000 -23.216001 6.222000 -4.513000 -23.216001 6.222000
- 3.356000 -30.458000 1.128000 3.356000 -30.458000 1.128000
- -6.264000 -28.355001 8.169000 -6.264000 -28.355001 8.169000
- -8.914000 -6.815001 7.582000 -8.914000 -6.815001 7.582000
+ 22.812000 1.915003 -17.529000 22.812000 1.915003 -17.529000
+-16.509000 0.892999 12.411000 -16.509000 0.892999 12.411000
+-19.805000 -4.434001 15.553000 -19.805000 -4.434001 15.553000
+-22.797000 -2.694002 17.612000 -22.797000 -2.694002 17.612000
+-23.248000 1.432998 17.456000 -23.248000 1.432998 17.456000
+ 3.658000 0.738001 -2.863000 3.658000 0.738001 -2.863000
+ -0.076000 4.359000 -0.468000 -0.076000 4.359000 -0.468000
+ 1.015000 7.370001 -1.658000 1.015000 7.370001 -1.658000
+ 4.851000 6.794001 -4.498000 4.851000 6.794001 -4.498000
+ -0.303000 10.604000 -1.049000 -0.303000 10.604000 -1.049000
+ -4.307000 11.446000 1.886000 -4.307000 11.446000 1.886000
+ 0.016000 17.787000 -2.157000 0.016000 17.787000 -2.157000
+ -3.607000 19.284000 0.410000 -3.607000 19.284000 0.410000
+ 2.369000 -21.213999 0.762000 2.369000 -21.213999 0.762000
+ -4.513000 -23.216000 6.222000 -4.513000 -23.216000 6.222000
+ 3.356010 -30.457999 1.128000 3.356010 -30.457999 1.128000
+ -6.264000 -28.355000 8.169000 -6.264000 -28.355000 8.169000
+ -8.914000 -6.815000 7.582000 -8.914000 -6.815000 7.582000
-12.120000 -5.481001 9.852000 -12.120000 -5.481001 9.852000
- -9.414000 -10.970001 8.461000 -9.414000 -10.970001 8.461000
+ -9.414000 -10.970000 8.461000 -9.414000 -10.970000 8.461000
-11.345000 -14.047001 10.297000 -11.345000 -14.047001 10.297000
- 12.895000 -13.689999 -8.127000 12.895000 -13.689999 -8.127000
- 15.941000 -14.863999 -10.296000 15.941000 -14.863999 -10.296000
- 11.067000 -22.224999 -5.712000 11.067000 -22.224999 -5.712000
- 15.756000 -23.906999 -9.064000 15.756000 -23.906999 -9.064000
- 2.214990 20.343000 -4.133000 2.214990 20.343000 -4.133000
- 7.436990 20.580000 -8.121000 7.436990 20.580000 -8.121000
- 9.683990 29.818001 -10.939000 9.683990 29.818001 -10.939000
- 4.492990 30.306000 -7.062000 4.492990 30.306000 -7.062000
- 4.828000 -4.016000 -3.176000 4.828000 -4.016000 -3.176000
- 7.716000 0.151000 -5.869000 7.716000 0.151000 -5.869000
- 7.375000 -6.654000 -4.790000 7.375000 -6.654000 -4.790000
+ 12.895000 -13.689998 -8.127000 12.895000 -13.689998 -8.127000
+ 15.941000 -14.863998 -10.296000 15.941000 -14.863998 -10.296000
+ 11.067000 -22.224998 -5.712000 11.067000 -22.224998 -5.712000
+ 15.756010 -23.906998 -9.064000 15.756010 -23.906998 -9.064000
+ 2.215000 20.343001 -4.133000 2.215000 20.343001 -4.133000
+ 7.437000 20.580001 -8.121000 7.437000 20.580001 -8.121000
+ 9.684000 29.818001 -10.939000 9.684000 29.818001 -10.939000
+ 4.493000 30.306001 -7.062000 4.493000 30.306001 -7.062000
+ 4.828000 -4.015999 -3.176000 4.828000 -4.015999 -3.176000
+ 7.716000 0.151001 -5.869000 7.716000 0.151001 -5.869000
+ 7.375000 -6.653999 -4.790000 7.375000 -6.653999 -4.790000
9.693000 -4.565999 -6.800000 9.693000 -4.565999 -6.800000
--18.235010 13.257998 12.229000 -18.235010 13.257998 12.229000
--12.480010 19.729999 7.084000 -12.480010 19.729999 7.084000
--19.734010 21.104998 12.419000 -19.734010 21.104998 12.419000
--12.975010 26.728999 6.616000 -12.975010 26.728999 6.616000
- 0.651000 -7.538000 0.416000 0.651000 -7.538000 0.416000
- 2.974000 -10.502000 -0.989000 2.974000 -10.502000 -0.989000
+-18.235000 13.257999 12.229000 -18.235000 13.257999 12.229000
+-12.480000 19.729999 7.084000 -12.480000 19.729999 7.084000
+-19.734000 21.104999 12.419000 -19.734000 21.104999 12.419000
+-12.975000 26.728999 6.616000 -12.975000 26.728999 6.616000
+ 0.651000 -7.537999 0.416000 0.651000 -7.537999 0.416000
+ 2.974000 -10.501999 -0.989000 2.974000 -10.501999 -0.989000
-2.464000 -10.039000 3.079000 -2.464000 -10.039000 3.079000
- 0.864000 -13.527000 0.976000 0.864000 -13.527000 0.976000
- 11.835000 8.416001 -9.990000 11.835000 8.416001 -9.990000
- 7.287000 -18.826000 -3.256000 7.287000 -18.826000 -3.256000
- 19.359990 13.367001 -16.293000 19.359990 13.367001 -16.293000
- 9.141990 17.682001 -9.065000 9.141990 17.682001 -9.065000
+ 0.864000 -13.526999 0.976000 0.864000 -13.526999 0.976000
+ 11.835000 8.416002 -9.990000 11.835000 8.416002 -9.990000
+ 7.287000 -18.825999 -3.256000 7.287000 -18.825999 -3.256000
+ 19.360000 13.367002 -16.293000 19.360000 13.367002 -16.293000
+ 9.142000 17.682001 -9.065000 9.142000 17.682001 -9.065000
-11.561000 -19.728001 11.145000 -11.561000 -19.728001 11.145000
- 9.435000 -29.944999 -3.543000 9.435000 -29.944999 -3.543000
- 14.033990 21.683001 -13.257000 14.033990 21.683001 -13.257000
- 5.731000 2.749000 -4.677000 5.731000 2.749000 -4.677000
--22.844010 9.881998 16.131000 -22.844010 9.881998 16.131000
- -6.323000 -18.034001 6.970000 -6.323000 -18.034001 6.970000
--15.212010 -5.948001 12.252000 -15.212010 -5.948001 12.252000
+ 9.435010 -29.944999 -3.543000 9.435010 -29.944999 -3.543000
+ 14.034000 21.683002 -13.257000 14.034000 21.683002 -13.257000
+ 5.731000 2.749001 -4.677000 5.731000 2.749001 -4.677000
+-22.844000 9.881998 16.131000 -22.844000 9.881998 16.131000
+ -6.323000 -18.034000 6.970000 -6.323000 -18.034000 6.970000
+-15.212000 -5.948001 12.252000 -15.212000 -5.948001 12.252000
21.166000 -17.368998 -13.956000 21.166000 -17.368998 -13.956000
- 7.357000 -14.764000 -3.798000 7.357000 -14.764000 -3.798000
+ 7.357000 -14.763999 -3.798000 7.357000 -14.763999 -3.798000
-3.602000 -16.495000 4.720000 -3.602000 -16.495000 4.720000
--10.338010 16.185999 5.888000 -10.338010 16.185999 5.888000
- -3.527010 5.552000 2.005000 -3.527010 5.552000 2.005000
- 11.560000 2.551001 -9.074000 11.560000 2.551001 -9.074000
- -6.377010 -0.126001 4.851000 -6.377010 -0.126001 4.851000
- 17.342000 -9.525999 -12.002000 17.342000 -9.525999 -12.002000
- 11.249000 -8.426999 -7.514000 11.249000 -8.426999 -7.514000
+-10.338000 16.185999 5.888000 -10.338000 16.185999 5.888000
+ -3.527000 5.552000 2.005000 -3.527000 5.552000 2.005000
+ 11.560000 2.551002 -9.074000 11.560000 2.551002 -9.074000
+ -6.377000 -0.126000 4.851000 -6.377000 -0.126000 4.851000
+ 17.342000 -9.525998 -12.002000 17.342000 -9.525998 -12.002000
+ 11.249000 -8.426998 -7.514000 11.249000 -8.426998 -7.514000
-15.634000 -12.546001 13.368000 -15.634000 -12.546001 13.368000
--18.086000 -10.980002 15.039000 -18.086000 -10.980002 15.039000
+-18.086000 -10.980001 15.039000 -18.086000 -10.980001 15.039000
-2.779000 -3.437000 2.522000 -2.779000 -3.437000 2.522000
--15.150010 10.248999 10.253000 -15.150010 10.248999 10.253000
- 5.923000 -11.007000 -3.164000 5.923000 -11.007000 -3.164000
- 6.815990 13.693000 -6.820000 6.815990 13.693000 -6.820000
- 12.994000 -0.601999 -9.781000 12.994000 -0.601999 -9.781000
- 15.751990 18.655001 -14.194000 15.751990 18.655001 -14.194000
- -6.732000 -4.650001 5.666000 -6.732000 -4.650001 5.666000
- 3.513000 -16.247000 -0.705000 3.513000 -16.247000 -0.705000
--18.406010 4.019998 13.473000 -18.406010 4.019998 13.473000
- -6.914010 23.859999 2.366000 -6.914010 23.859999 2.366000
- -6.031010 15.822999 2.665000 -6.031010 15.822999 2.665000
- 13.890990 11.699001 -11.944000 13.890990 11.699001 -11.944000
- 1.478990 14.275000 -2.843000 1.478990 14.275000 -2.843000
- -3.882010 1.494000 2.763000 -3.882010 1.494000 2.763000
- 4.979000 -25.879000 -0.655000 4.979000 -25.879000 -0.655000
- 2.096000 -4.622000 -1.032000 2.096000 -4.622000 -1.032000
- 24.893000 -7.964998 -17.916000 24.893000 -7.964998 -17.916000
- 17.468000 -6.146999 -12.504000 17.468000 -6.146999 -12.504000
- -5.265010 8.315999 2.990000 -5.265010 8.315999 2.990000
- -5.303010 31.148999 0.265000 -5.303010 31.148999 0.265000
- -8.937010 1.439999 6.604000 -8.937010 1.439999 6.604000
+-15.150000 10.248999 10.253000 -15.150000 10.248999 10.253000
+ 5.923000 -11.006999 -3.164000 5.923000 -11.006999 -3.164000
+ 6.816000 13.693001 -6.820000 6.816000 13.693001 -6.820000
+ 12.994000 -0.601998 -9.781000 12.994000 -0.601998 -9.781000
+ 15.752000 18.655002 -14.194000 15.752000 18.655002 -14.194000
+ -6.732000 -4.650000 5.666000 -6.732000 -4.650000 5.666000
+ 3.513000 -16.246999 -0.705000 3.513000 -16.246999 -0.705000
+-18.406000 4.019999 13.473000 -18.406000 4.019999 13.473000
+ -6.914000 23.860000 2.366000 -6.914000 23.860000 2.366000
+ -6.031000 15.823000 2.665000 -6.031000 15.823000 2.665000
+ 13.891000 11.699002 -11.944000 13.891000 11.699002 -11.944000
+ 1.479000 14.275001 -2.843000 1.479000 14.275001 -2.843000
+ -3.882000 1.494000 2.763000 -3.882000 1.494000 2.763000
+ 4.979000 -25.878999 -0.655000 4.979000 -25.878999 -0.655000
+ 2.096000 -4.621999 -1.032000 2.096000 -4.621999 -1.032000
+ 24.893000 -7.964997 -17.916000 24.893000 -7.964997 -17.916000
+ 17.468000 -6.146998 -12.504000 17.468000 -6.146998 -12.504000
+ -5.265000 8.316000 2.990000 -5.265000 8.316000 2.990000
+ -5.303000 31.149000 0.265000 -5.303000 31.149000 0.265000
+ -8.937000 1.440000 6.604000 -8.937000 1.440000 6.604000
-10.794000 -22.876001 10.944000 -10.794000 -22.876001 10.944000
- -0.568010 24.084000 -2.474000 -0.568010 24.084000 -2.474000
- -4.151000 -6.313001 3.909000 -4.151000 -6.313001 3.909000
- -4.684000 -11.956001 4.994000 -4.684000 -11.956001 4.994000
- 6.438990 9.420000 -6.019000 6.438990 9.420000 -6.019000
+ -0.568000 24.084000 -2.474000 -0.568000 24.084000 -2.474000
+ -4.151000 -6.313000 3.909000 -4.151000 -6.313000 3.909000
+ -4.684000 -11.956000 4.994000 -4.684000 -11.956000 4.994000
+ 6.439000 9.420001 -6.019000 6.439000 9.420001 -6.019000
]
NORMAL_VECTOR HBA
@@ -126,9 +126,9 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3940295.706280000 816722.864941000 4932394.416 ]
+3 [ 3940295.659850000 816722.913572000 4932394.446 ]
96 x 2 x 3 [
--22.150000 1.313998 16.637000 -22.150000 1.313998 16.637000
+-22.150000 1.313997 16.637000 -22.150000 1.313997 16.637000
-20.717000 5.977998 14.988000 -20.717000 5.977998 14.988000
-19.284000 10.641998 13.339000 -19.284000 10.641998 13.339000
-17.851000 15.304998 11.690000 -17.851000 15.304998 11.690000
@@ -137,52 +137,52 @@ HBA
-18.293000 -0.814002 13.969000 -18.293000 -0.814002 13.969000
-16.860000 3.849998 12.320000 -16.860000 3.849998 12.320000
-15.427000 8.512998 10.671000 -15.427000 8.512998 10.671000
--13.994000 13.176999 9.022000 -13.994000 13.176999 9.022000
--12.562000 17.840999 7.374000 -12.562000 17.840999 7.374000
--11.129000 22.504999 5.725000 -11.129000 22.504999 5.725000
+-13.994000 13.176998 9.022000 -13.994000 13.176998 9.022000
+-12.562000 17.840998 7.374000 -12.562000 17.840998 7.374000
+-11.129000 22.504998 5.725000 -11.129000 22.504998 5.725000
-17.302000 -12.270002 14.599000 -17.302000 -12.270002 14.599000
-15.869000 -7.606002 12.950000 -15.869000 -7.606002 12.950000
--14.436000 -2.942001 11.301000 -14.436000 -2.942001 11.301000
--13.003000 1.720999 9.652000 -13.003000 1.720999 9.652000
--11.571000 6.384999 8.003000 -11.571000 6.384999 8.003000
+-14.436000 -2.942002 11.301000 -14.436000 -2.942002 11.301000
+-13.003000 1.720998 9.652000 -13.003000 1.720998 9.652000
+-11.571000 6.384998 8.003000 -11.571000 6.384998 8.003000
-10.138000 11.048999 6.355000 -10.138000 11.048999 6.355000
-8.705000 15.712999 4.706000 -8.705000 15.712999 4.706000
-7.272000 20.375999 3.057000 -7.272000 20.375999 3.057000
-5.839000 25.039999 1.408000 -5.839000 25.039999 1.408000
--14.878000 -19.062001 13.580000 -14.878000 -19.062001 13.580000
--13.445000 -14.398001 11.931000 -13.445000 -14.398001 11.931000
--12.012000 -9.734001 10.282000 -12.012000 -9.734001 10.282000
+-14.878000 -19.062002 13.580000 -14.878000 -19.062002 13.580000
+-13.445000 -14.398002 11.931000 -13.445000 -14.398002 11.931000
+-12.012000 -9.734002 10.282000 -12.012000 -9.734002 10.282000
-10.580000 -5.070001 8.633000 -10.580000 -5.070001 8.633000
-9.147000 -0.407001 6.984000 -9.147000 -0.407001 6.984000
-7.714000 4.256999 5.335000 -7.714000 4.256999 5.335000
-6.281000 8.920999 3.687000 -6.281000 8.920999 3.687000
-4.848000 13.583999 2.038000 -4.848000 13.583999 2.038000
- -3.415000 18.248000 0.389000 -3.415000 18.248000 0.389000
- -1.982000 22.912000 -1.260000 -1.982000 22.912000 -1.260000
- -0.549000 27.575000 -2.909000 -0.549000 27.575000 -2.909000
+ -3.415000 18.247999 0.389000 -3.415000 18.247999 0.389000
+ -1.982000 22.911999 -1.260000 -1.982000 22.911999 -1.260000
+ -0.549000 27.574999 -2.909000 -0.549000 27.574999 -2.909000
-11.021000 -21.190001 10.912000 -11.021000 -21.190001 10.912000
-9.588000 -16.526001 9.263000 -9.588000 -16.526001 9.263000
-8.156000 -11.862001 7.614000 -8.156000 -11.862001 7.614000
-6.723000 -7.199001 5.965000 -6.723000 -7.199001 5.965000
-5.290000 -2.535001 4.316000 -5.290000 -2.535001 4.316000
-3.857000 2.128999 2.667000 -3.857000 2.128999 2.667000
- -2.424000 6.792000 1.019000 -2.424000 6.792000 1.019000
- -0.991000 11.456000 -0.630000 -0.991000 11.456000 -0.630000
+ -2.424000 6.791999 1.019000 -2.424000 6.791999 1.019000
+ -0.991000 11.455999 -0.630000 -0.991000 11.455999 -0.630000
0.442000 16.120000 -2.279000 0.442000 16.120000 -2.279000
1.874000 20.783000 -3.928000 1.874000 20.783000 -3.928000
3.307000 25.447000 -5.577000 3.307000 25.447000 -5.577000
-7.165000 -23.318001 8.244000 -7.165000 -23.318001 8.244000
-5.732000 -18.654001 6.595000 -5.732000 -18.654001 6.595000
-4.299000 -13.991001 4.946000 -4.299000 -13.991001 4.946000
- -2.866000 -9.327000 3.297000 -2.866000 -9.327000 3.297000
- -1.433000 -4.663000 1.648000 -1.433000 -4.663000 1.648000
+ -2.866000 -9.327001 3.297000 -2.866000 -9.327001 3.297000
+ -1.433000 -4.663001 1.648000 -1.433000 -4.663001 1.648000
1.433000 4.664000 -1.649000 1.433000 4.664000 -1.649000
2.865000 9.328000 -3.298000 2.865000 9.328000 -3.298000
4.298000 13.992000 -4.947000 4.298000 13.992000 -4.947000
5.731000 18.655000 -6.596000 5.731000 18.655000 -6.596000
7.164000 23.319000 -8.245000 7.164000 23.319000 -8.245000
- -3.308000 -25.446000 5.576000 -3.308000 -25.446000 5.576000
- -1.875000 -20.783000 3.927000 -1.875000 -20.783000 3.927000
+ -3.308000 -25.446001 5.576000 -3.308000 -25.446001 5.576000
+ -1.875000 -20.783001 3.927000 -1.875000 -20.783001 3.927000
-0.442000 -16.119000 2.278000 -0.442000 -16.119000 2.278000
0.991000 -11.455000 0.629000 0.991000 -11.455000 0.629000
2.424000 -6.792000 -1.020000 2.424000 -6.792000 -1.020000
@@ -190,7 +190,7 @@ HBA
5.289000 2.536000 -4.317000 5.289000 2.536000 -4.317000
6.722000 7.200000 -5.966000 6.722000 7.200000 -5.966000
8.155000 11.863000 -7.615000 8.155000 11.863000 -7.615000
- 9.588000 16.527001 -9.264000 9.588000 16.527001 -9.264000
+ 9.588000 16.527000 -9.264000 9.588000 16.527000 -9.264000
11.021000 21.191001 -10.913000 11.021000 21.191001 -10.913000
0.549000 -27.575000 2.908000 0.549000 -27.575000 2.908000
1.982000 -22.911000 1.259000 1.982000 -22.911000 1.259000
@@ -198,14 +198,14 @@ HBA
4.848000 -13.583000 -2.039000 4.848000 -13.583000 -2.039000
6.280000 -8.920000 -3.687000 6.280000 -8.920000 -3.687000
7.713000 -4.256000 -5.336000 7.713000 -4.256000 -5.336000
- 9.146000 0.408001 -6.985000 9.146000 0.408001 -6.985000
+ 9.146000 0.408000 -6.985000 9.146000 0.408000 -6.985000
10.579000 5.071001 -8.634000 10.579000 5.071001 -8.634000
12.012000 9.735001 -10.283000 12.012000 9.735001 -10.283000
13.445000 14.399001 -11.932000 13.445000 14.399001 -11.932000
14.878000 19.062001 -13.581000 14.878000 19.062001 -13.581000
5.839000 -25.039000 -1.409000 5.839000 -25.039000 -1.409000
7.271000 -20.375000 -3.058000 7.271000 -20.375000 -3.058000
- 8.704000 -15.711999 -4.707000 8.704000 -15.711999 -4.707000
+ 8.704000 -15.712000 -4.707000 8.704000 -15.712000 -4.707000
10.137000 -11.047999 -6.355000 10.137000 -11.047999 -6.355000
11.570000 -6.383999 -8.004000 11.570000 -6.383999 -8.004000
13.003000 -1.720999 -9.653000 13.003000 -1.720999 -9.653000
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE604-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE604-AntennaField.conf
index dc75d8fbeb304921d7e1f6d7c7562aee49a54276..430791aafb548473e0c60eb9656f7958e5f0f85b 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE604-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE604-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for DE604
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:42
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:10
#
NORMAL_VECTOR LBA
@@ -15,103 +15,103 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3796327.177940000 877591.635750000 5032757.508 ]
+3 [ 3796327.130060000 877591.682824000 5032757.536 ]
96 x 2 x 3 [
- 6.691010 -12.579000 -2.661000 6.691010 -12.579000 -2.661000
+ 6.691010 -12.578999 -2.661000 6.691010 -12.578999 -2.661000
0.280010 -13.349000 2.405000 0.280010 -13.349000 2.405000
- 5.293010 -15.763000 -0.964000 5.293010 -15.763000 -0.964000
+ 5.293010 -15.762999 -0.964000 5.293010 -15.762999 -0.964000
-0.155990 -16.588000 3.375000 -0.155990 -16.588000 3.375000
-11.882000 15.610999 6.045000 -11.882000 15.610999 6.045000
--16.701000 14.312998 9.994000 -16.701000 14.312998 9.994000
+-16.701000 14.312999 9.994000 -16.701000 14.312999 9.994000
-11.032000 23.582999 3.829000 -11.032000 23.582999 3.829000
--14.978000 23.668998 6.838000 -14.978000 23.668998 6.838000
+-14.978000 23.668999 6.838000 -14.978000 23.668999 6.838000
9.295010 -18.116999 -3.570000 9.295010 -18.116999 -3.570000
- 14.884010 -19.345999 -7.614000 14.884010 -19.345999 -7.614000
- 15.498010 -23.313999 -7.306000 15.498010 -23.313999 -7.306000
+ 14.884010 -19.345998 -7.614000 14.884010 -19.345998 -7.614000
+ 15.498010 -23.313998 -7.306000 15.498010 -23.313998 -7.306000
12.970010 -25.588999 -4.921000 12.970010 -25.588999 -4.921000
- -2.694000 3.608999 1.357000 -2.694000 3.608999 1.357000
- -2.911000 -1.973001 2.619000 -2.911000 -1.973001 2.619000
- -5.607000 -2.107001 4.712000 -5.607000 -2.107001 4.712000
+ -2.694000 3.609000 1.357000 -2.694000 3.609000 1.357000
+ -2.911000 -1.973000 2.619000 -2.911000 -1.973000 2.619000
+ -5.607000 -2.107000 4.712000 -5.607000 -2.107000 4.712000
-7.518000 2.262999 5.319000 -7.518000 2.262999 5.319000
-7.011000 -4.926001 6.341000 -7.011000 -4.926001 6.341000
- -5.181000 -9.590001 5.854000 -5.181000 -9.590001 5.854000
+ -5.180990 -9.590000 5.854000 -5.180990 -9.590000 5.854000
-12.074000 -7.700001 10.767000 -12.074000 -7.700001 10.767000
--10.917000 -12.240001 10.771000 -10.917000 -12.240001 10.771000
+-10.916990 -12.240001 10.771000 -10.916990 -12.240001 10.771000
12.969000 11.749001 -12.248000 12.969000 11.749001 -12.248000
- 18.454000 5.226001 -15.173000 18.454000 5.226001 -15.173000
- 18.648000 16.820001 -17.596000 18.648000 16.820001 -17.596000
- 22.990000 5.576002 -18.718000 22.990000 5.576002 -18.718000
+ 18.454010 5.226002 -15.173000 18.454010 5.226002 -15.173000
+ 18.648000 16.820002 -17.596000 18.648000 16.820002 -17.596000
+ 22.990010 5.576002 -18.718000 22.990010 5.576002 -18.718000
9.968010 -6.616999 -6.343000 9.968010 -6.616999 -6.343000
10.986010 -10.637999 -6.334000 10.986010 -10.637999 -6.334000
13.087010 -5.348999 -8.982000 13.087010 -5.348999 -8.982000
- 16.332010 -6.088999 -11.325000 16.332010 -6.088999 -11.325000
+ 16.332010 -6.088998 -11.325000 16.332010 -6.088998 -11.325000
1.553000 19.789000 -5.074000 1.553000 19.789000 -5.074000
0.523000 23.570000 -5.026000 0.523000 23.570000 -5.026000
- 8.438000 21.529000 -10.694000 8.438000 21.529000 -10.694000
- 6.768000 27.294000 -10.545000 6.768000 27.294000 -10.545000
--15.126000 -6.447002 12.861000 -15.126000 -6.447002 12.861000
+ 8.438000 21.529001 -10.694000 8.438000 21.529001 -10.694000
+ 6.768000 27.294001 -10.545000 6.768000 27.294001 -10.545000
+-15.126000 -6.447001 12.861000 -15.126000 -6.447001 12.861000
-18.419000 -0.941002 14.305000 -18.419000 -0.941002 14.305000
-26.032000 -2.537002 20.455000 -26.032000 -2.537002 20.455000
-23.251000 -8.323002 19.458000 -23.251000 -8.323002 19.458000
-0.171000 6.928000 -1.229000 -0.171000 6.928000 -1.229000
- -4.730000 8.221999 2.012000 -4.730000 8.221999 2.012000
+ -4.730000 8.222000 2.012000 -4.730000 8.222000 2.012000
0.091000 10.808000 -2.191000 0.091000 10.808000 -2.191000
- -2.715000 12.391999 -0.350000 -2.715000 12.391999 -0.350000
+ -2.715000 12.392000 -0.350000 -2.715000 12.392000 -0.350000
1.943010 -25.336000 3.482000 1.943010 -25.336000 3.482000
- -5.898990 -21.963001 8.833000 -5.898990 -21.963001 8.833000
+ -5.898990 -21.963000 8.833000 -5.898990 -21.963000 8.833000
-2.480990 -30.350000 7.858000 -2.480990 -30.350000 7.858000
-10.348990 -25.532001 12.944000 -10.348990 -25.532001 12.944000
- 4.723000 3.970000 -4.400000 4.723000 3.970000 -4.400000
- 5.340000 7.751000 -5.615000 5.340000 7.751000 -5.615000
- 8.288000 1.710000 -6.689000 8.288000 1.710000 -6.689000
- 8.658000 6.798000 -7.971000 8.658000 6.798000 -7.971000
+ 4.723000 3.970001 -4.400000 4.723000 3.970001 -4.400000
+ 5.340000 7.751001 -5.615000 5.340000 7.751001 -5.615000
+ 8.288010 1.710001 -6.689000 8.288010 1.710001 -6.689000
+ 8.658000 6.798001 -7.971000 8.658000 6.798001 -7.971000
-12.806000 9.059999 8.039000 -12.806000 9.059999 8.039000
- 8.400000 15.996000 -9.579000 8.400000 15.996000 -9.579000
+ 8.400000 15.996001 -9.579000 8.400000 15.996001 -9.579000
-20.677000 14.992998 12.909000 -20.677000 14.992998 12.909000
-17.476000 2.146998 12.976000 -17.476000 2.146998 12.976000
- 20.314010 -3.854999 -14.816000 20.314010 -3.854999 -14.816000
- 14.655000 23.125001 -15.773000 14.655000 23.125001 -15.773000
+ 20.314010 -3.854998 -14.816000 20.314010 -3.854998 -14.816000
+ 14.655000 23.125002 -15.773000 14.655000 23.125002 -15.773000
-23.124000 5.664998 16.615000 -23.124000 5.664998 16.615000
- -5.301000 4.961999 3.090000 -5.301000 4.961999 3.090000
- 6.997010 -28.821000 0.292000 6.997010 -28.821000 0.292000
- 16.024000 1.034001 -12.487000 16.024000 1.034001 -12.487000
+ -5.301000 4.962000 3.090000 -5.301000 4.962000 3.090000
+ 6.997010 -28.820999 0.292000 6.997010 -28.820999 0.292000
+ 16.024010 1.034002 -12.487000 16.024010 1.034002 -12.487000
13.157010 -13.755999 -7.387000 13.157010 -13.755999 -7.387000
-0.912000 30.268000 -5.241000 -0.912000 30.268000 -5.241000
- 5.603000 14.307000 -7.103000 5.603000 14.307000 -7.103000
- 13.348000 3.290001 -10.879000 13.348000 3.290001 -10.879000
- -4.778990 -18.126001 7.221000 -4.778990 -18.126001 7.221000
- -1.651000 -6.197000 2.482000 -1.651000 -6.197000 2.482000
+ 5.603000 14.307001 -7.103000 5.603000 14.307001 -7.103000
+ 13.348010 3.290001 -10.879000 13.348010 3.290001 -10.879000
+ -4.778990 -18.126000 7.221000 -4.778990 -18.126000 7.221000
+ -1.650990 -6.197000 2.482000 -1.650990 -6.197000 2.482000
-8.662000 11.308999 4.421000 -8.662000 11.308999 4.421000
- 3.910010 -6.793000 -1.664000 3.910010 -6.793000 -1.664000
- -3.938000 22.757999 -1.447000 -3.938000 22.757999 -1.447000
+ 3.910010 -6.792999 -1.664000 3.910010 -6.792999 -1.664000
+ -3.938000 22.758000 -1.447000 -3.938000 22.758000 -1.447000
-1.030000 15.739000 -2.299000 -1.030000 15.739000 -2.299000
- 17.885010 -11.346999 -11.484000 17.885010 -11.346999 -11.484000
- 18.294010 -14.659999 -11.148000 18.294010 -14.659999 -11.148000
- 3.999000 -1.492000 -2.772000 3.999000 -1.492000 -2.772000
+ 17.885010 -11.346998 -11.484000 17.885010 -11.346998 -11.484000
+ 18.294010 -14.659998 -11.148000 18.294010 -14.659998 -11.148000
+ 3.999010 -1.491999 -2.772000 3.999010 -1.491999 -2.772000
2.134010 -20.717000 2.430000 2.134010 -20.717000 2.430000
3.914000 11.137000 -5.186000 3.914000 11.137000 -5.186000
-13.375000 1.378999 9.983000 -13.375000 1.378999 9.983000
-7.384000 14.215999 2.871000 -7.384000 14.215999 2.871000
-22.099000 8.822998 15.210000 -22.099000 8.822998 15.210000
- 7.191010 -5.212000 -4.490000 7.191010 -5.212000 -4.490000
- 8.914000 10.823000 -8.957000 8.914000 10.823000 -8.957000
- 8.311010 -21.512000 -2.150000 8.311010 -21.512000 -2.150000
+ 7.191010 -5.211999 -4.490000 7.191010 -5.211999 -4.490000
+ 8.914000 10.823001 -8.957000 8.914000 10.823001 -8.957000
+ 8.311010 -21.511999 -2.150000 8.311010 -21.511999 -2.150000
-12.037990 -17.777001 12.717000 -12.037990 -17.777001 12.717000
-7.115990 -13.341001 8.073000 -7.115990 -13.341001 8.073000
--16.266000 9.842998 10.538000 -16.266000 9.842998 10.538000
+-16.266000 9.842999 10.538000 -16.266000 9.842999 10.538000
-10.570000 -4.606001 9.007000 -10.570000 -4.606001 9.007000
- 1.315000 -4.816000 -0.063000 1.315000 -4.816000 -0.063000
- 14.568000 16.576001 -14.421000 14.568000 16.576001 -14.421000
+ 1.315010 -4.816000 -0.063000 1.315010 -4.816000 -0.063000
+ 14.568000 16.576002 -14.421000 14.568000 16.576002 -14.421000
1.879000 4.257000 -2.276000 1.879000 4.257000 -2.276000
-9.525000 30.190999 1.377000 -9.525000 30.190999 1.377000
- -6.305000 21.426999 0.629000 -6.305000 21.426999 0.629000
- -2.484000 -9.262000 3.722000 -2.484000 -9.262000 3.722000
--17.948000 -19.209002 17.529000 -17.948000 -19.209002 17.529000
- 4.383010 -10.223000 -1.354000 4.383010 -10.223000 -1.354000
+ -6.305000 21.427000 0.629000 -6.305000 21.427000 0.629000
+ -2.483990 -9.262000 3.722000 -2.483990 -9.262000 3.722000
+-17.947990 -19.209002 17.529000 -17.947990 -19.209002 17.529000
+ 4.383010 -10.222999 -1.354000 4.383010 -10.222999 -1.354000
21.990010 -1.666998 -16.530000 21.990010 -1.666998 -16.530000
--15.996000 -11.059002 14.433000 -15.996000 -11.059002 14.433000
- 6.771000 -1.719000 -4.853000 6.771000 -1.719000 -4.853000
- 10.919000 0.158001 -8.402000 10.919000 0.158001 -8.402000
+-15.995990 -11.059001 14.433000 -15.995990 -11.059001 14.433000
+ 6.771010 -1.718999 -4.853000 6.771010 -1.718999 -4.853000
+ 10.919010 0.158001 -8.402000 10.919010 0.158001 -8.402000
-10.252000 2.828999 7.304000 -10.252000 2.828999 7.304000
]
@@ -126,102 +126,102 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3796379.822940000 877614.129754000 5032712.528 ]
+3 [ 3796379.775070000 877614.176829000 5032712.556 ]
96 x 2 x 3 [
--18.375990 -12.554001 16.549990 -18.375990 -12.554001 16.549990
--19.245000 -7.489001 16.221990 -19.245000 -7.489001 16.221990
--20.115000 -2.423002 15.893990 -20.115000 -2.423002 15.893990
--20.984000 2.641998 15.566990 -20.984000 2.641998 15.566990
--21.853000 7.707998 15.238990 -21.853000 7.707998 15.238990
--13.483990 -17.135001 13.698990 -13.483990 -17.135001 13.698990
--14.352990 -12.070001 13.370990 -14.352990 -12.070001 13.370990
--15.223000 -7.004001 13.042990 -15.223000 -7.004001 13.042990
--16.092000 -1.939001 12.715990 -16.092000 -1.939001 12.715990
--16.961000 3.126999 12.387990 -16.961000 3.126999 12.387990
--17.830000 8.191999 12.059990 -17.830000 8.191999 12.059990
--18.700000 13.257999 11.731990 -18.700000 13.257999 11.731990
- -8.591990 -21.716001 10.847990 -8.591990 -21.716001 10.847990
- -9.460990 -16.651001 10.519990 -9.460990 -16.651001 10.519990
--10.330990 -11.585001 10.191990 -10.330990 -11.585001 10.191990
--11.200000 -6.520001 9.863990 -11.200000 -6.520001 9.863990
--12.069000 -1.454001 9.536990 -12.069000 -1.454001 9.536990
--12.938000 3.610999 9.208990 -12.938000 3.610999 9.208990
--13.808000 8.676999 8.880990 -13.808000 8.676999 8.880990
--14.677000 13.742999 8.553990 -14.677000 13.742999 8.553990
--15.546000 18.807999 8.225990 -15.546000 18.807999 8.225990
- -3.699990 -26.297000 7.996000 -3.699990 -26.297000 7.996000
- -4.568990 -21.231000 7.669000 -4.568990 -21.231000 7.669000
- -5.438990 -16.166000 7.340990 -5.438990 -16.166000 7.340990
- -6.307990 -11.100000 7.012990 -6.307990 -11.100000 7.012990
- -7.176990 -6.035000 6.685990 -7.176990 -6.035000 6.685990
- -8.046000 -0.969001 6.357990 -8.046000 -0.969001 6.357990
- -8.916000 4.095999 6.029990 -8.916000 4.095999 6.029990
- -9.785000 9.161999 5.701990 -9.785000 9.161999 5.701990
--10.654000 14.226999 5.374990 -10.654000 14.226999 5.374990
--11.524000 19.292999 5.046990 -11.524000 19.292999 5.046990
--12.393000 24.357999 4.718990 -12.393000 24.357999 4.718990
- 0.323010 -25.812000 4.818000 0.323010 -25.812000 4.818000
- -0.546990 -20.747000 4.490000 -0.546990 -20.747000 4.490000
- -1.415990 -15.681000 4.162000 -1.415990 -15.681000 4.162000
- -2.284990 -10.616000 3.834000 -2.284990 -10.616000 3.834000
- -3.153990 -5.550000 3.507000 -3.153990 -5.550000 3.507000
- -4.024000 -0.485000 3.178990 -4.024000 -0.485000 3.178990
- -4.893000 4.581000 2.850990 -4.893000 4.581000 2.850990
- -5.762000 9.646000 2.522990 -5.762000 9.646000 2.522990
- -6.632000 14.712000 2.195990 -6.632000 14.712000 2.195990
- -7.501000 19.776999 1.867990 -7.501000 19.776999 1.867990
- -8.370000 24.842999 1.539990 -8.370000 24.842999 1.539990
- 4.345010 -25.327999 1.639000 4.345010 -25.327999 1.639000
- 3.476010 -20.262000 1.311000 3.476010 -20.262000 1.311000
- 2.607010 -15.197000 0.983000 2.607010 -15.197000 0.983000
- 1.738010 -10.131000 0.655000 1.738010 -10.131000 0.655000
- 0.868010 -5.066000 0.328000 0.868010 -5.066000 0.328000
+-18.376000 -12.554002 16.550000 -18.376000 -12.554002 16.550000
+-19.245000 -7.489002 16.222000 -19.245000 -7.489002 16.222000
+-20.115010 -2.423002 15.894000 -20.115010 -2.423002 15.894000
+-20.984010 2.641998 15.567000 -20.984010 2.641998 15.567000
+-21.853010 7.707998 15.239000 -21.853010 7.707998 15.239000
+-13.484000 -17.135001 13.699000 -13.484000 -17.135001 13.699000
+-14.353000 -12.070001 13.371000 -14.353000 -12.070001 13.371000
+-15.223000 -7.004001 13.043000 -15.223000 -7.004001 13.043000
+-16.092010 -1.939001 12.716000 -16.092010 -1.939001 12.716000
+-16.961010 3.126998 12.388000 -16.961010 3.126998 12.388000
+-17.830010 8.191998 12.060000 -17.830010 8.191998 12.060000
+-18.700010 13.257998 11.732000 -18.700010 13.257998 11.732000
+ -8.592000 -21.716001 10.848000 -8.592000 -21.716001 10.848000
+ -9.461000 -16.651001 10.520000 -9.461000 -16.651001 10.520000
+-10.331000 -11.585001 10.192000 -10.331000 -11.585001 10.192000
+-11.200000 -6.520001 9.864000 -11.200000 -6.520001 9.864000
+-12.069000 -1.454001 9.537000 -12.069000 -1.454001 9.537000
+-12.938010 3.610999 9.209000 -12.938010 3.610999 9.209000
+-13.808010 8.676999 8.881000 -13.808010 8.676999 8.881000
+-14.677010 13.742999 8.554000 -14.677010 13.742999 8.554000
+-15.546010 18.807999 8.226000 -15.546010 18.807999 8.226000
+ -3.700000 -26.297000 7.996000 -3.700000 -26.297000 7.996000
+ -4.569000 -21.231000 7.669000 -4.569000 -21.231000 7.669000
+ -5.439000 -16.166000 7.341000 -5.439000 -16.166000 7.341000
+ -6.308000 -11.100000 7.013000 -6.308000 -11.100000 7.013000
+ -7.177000 -6.035001 6.686000 -7.177000 -6.035001 6.686000
+ -8.046000 -0.969001 6.358000 -8.046000 -0.969001 6.358000
+ -8.916010 4.095999 6.030000 -8.916010 4.095999 6.030000
+ -9.785010 9.161999 5.702000 -9.785010 9.161999 5.702000
+-10.654010 14.226999 5.375000 -10.654010 14.226999 5.375000
+-11.524010 19.292999 5.047000 -11.524010 19.292999 5.047000
+-12.393010 24.357999 4.719000 -12.393010 24.357999 4.719000
+ 0.323000 -25.812000 4.818000 0.323000 -25.812000 4.818000
+ -0.547000 -20.747000 4.490000 -0.547000 -20.747000 4.490000
+ -1.416000 -15.681000 4.162000 -1.416000 -15.681000 4.162000
+ -2.285000 -10.616000 3.834000 -2.285000 -10.616000 3.834000
+ -3.154000 -5.550000 3.507000 -3.154000 -5.550000 3.507000
+ -4.024000 -0.485000 3.179000 -4.024000 -0.485000 3.179000
+ -4.893010 4.581000 2.851000 -4.893010 4.581000 2.851000
+ -5.762010 9.646000 2.523000 -5.762010 9.646000 2.523000
+ -6.632010 14.711999 2.196000 -6.632010 14.711999 2.196000
+ -7.501010 19.776999 1.868000 -7.501010 19.776999 1.868000
+ -8.370010 24.842999 1.540000 -8.370010 24.842999 1.540000
+ 4.345000 -25.327999 1.639000 4.345000 -25.327999 1.639000
+ 3.476000 -20.262000 1.311000 3.476000 -20.262000 1.311000
+ 2.607000 -15.197000 0.983000 2.607000 -15.197000 0.983000
+ 1.738000 -10.131000 0.655000 1.738000 -10.131000 0.655000
+ 0.868000 -5.066000 0.328000 0.868000 -5.066000 0.328000
-0.870000 5.066000 -0.328000 -0.870000 5.066000 -0.328000
- -1.740000 10.131000 -0.655000 -1.740000 10.131000 -0.655000
- -2.609000 15.197000 -0.983010 -2.609000 15.197000 -0.983010
- -3.478000 20.262000 -1.311010 -3.478000 20.262000 -1.311010
- -4.347000 25.328000 -1.639010 -4.347000 25.328000 -1.639010
- 8.368010 -24.842999 -1.540000 8.368010 -24.842999 -1.540000
- 7.499010 -19.776999 -1.868000 7.499010 -19.776999 -1.868000
- 6.630010 -14.711999 -2.196000 6.630010 -14.711999 -2.196000
- 5.760010 -9.645999 -2.523000 5.760010 -9.645999 -2.523000
- 4.891010 -4.580999 -2.851000 4.891010 -4.580999 -2.851000
- 4.022010 0.485000 -3.179000 4.022010 0.485000 -3.179000
+ -1.740010 10.131000 -0.655000 -1.740010 10.131000 -0.655000
+ -2.609010 15.197000 -0.983000 -2.609010 15.197000 -0.983000
+ -3.478010 20.262000 -1.311000 -3.478010 20.262000 -1.311000
+ -4.347010 25.328000 -1.639000 -4.347010 25.328000 -1.639000
+ 8.368000 -24.842999 -1.540000 8.368000 -24.842999 -1.540000
+ 7.499000 -19.776999 -1.868000 7.499000 -19.776999 -1.868000
+ 6.630000 -14.711999 -2.196000 6.630000 -14.711999 -2.196000
+ 5.760000 -9.645999 -2.523000 5.760000 -9.645999 -2.523000
+ 4.891000 -4.580999 -2.851000 4.891000 -4.580999 -2.851000
+ 4.022000 0.485000 -3.179000 4.022000 0.485000 -3.179000
3.152000 5.550000 -3.507000 3.152000 5.550000 -3.507000
- 2.283000 10.616000 -3.834000 2.283000 10.616000 -3.834000
- 1.414000 15.681000 -4.162000 1.414000 15.681000 -4.162000
- 0.545000 20.747000 -4.490000 0.545000 20.747000 -4.490000
- -0.325000 25.812000 -4.818000 -0.325000 25.812000 -4.818000
- 12.391010 -24.357999 -4.719000 12.391010 -24.357999 -4.719000
- 11.522010 -19.292999 -5.047000 11.522010 -19.292999 -5.047000
- 10.652010 -14.226999 -5.375000 10.652010 -14.226999 -5.375000
- 9.783010 -9.161999 -5.702000 9.783010 -9.161999 -5.702000
- 8.914010 -4.095999 -6.030000 8.914010 -4.095999 -6.030000
- 8.044010 0.969001 -6.358000 8.044010 0.969001 -6.358000
+ 2.282990 10.616000 -3.834000 2.282990 10.616000 -3.834000
+ 1.413990 15.681000 -4.162000 1.413990 15.681000 -4.162000
+ 0.544990 20.747000 -4.490000 0.544990 20.747000 -4.490000
+ -0.325010 25.812000 -4.818000 -0.325010 25.812000 -4.818000
+ 12.391000 -24.357999 -4.719000 12.391000 -24.357999 -4.719000
+ 11.522000 -19.292999 -5.047000 11.522000 -19.292999 -5.047000
+ 10.652000 -14.226999 -5.375000 10.652000 -14.226999 -5.375000
+ 9.783000 -9.161999 -5.702000 9.783000 -9.161999 -5.702000
+ 8.914000 -4.095999 -6.030000 8.914000 -4.095999 -6.030000
+ 8.044000 0.969001 -6.358000 8.044000 0.969001 -6.358000
7.175000 6.035001 -6.686000 7.175000 6.035001 -6.686000
- 6.306000 11.100001 -7.013000 6.306000 11.100001 -7.013000
- 5.437000 16.166001 -7.341000 5.437000 16.166001 -7.341000
- 4.567000 21.231000 -7.669000 4.567000 21.231000 -7.669000
- 3.698000 26.297000 -7.996000 3.698000 26.297000 -7.996000
- 15.544010 -18.807999 -8.226000 15.544010 -18.807999 -8.226000
- 14.675010 -13.742999 -8.554000 14.675010 -13.742999 -8.554000
- 13.806010 -8.676999 -8.881000 13.806010 -8.676999 -8.881000
- 12.936010 -3.610999 -9.209000 12.936010 -3.610999 -9.209000
- 12.067010 1.454001 -9.537000 12.067010 1.454001 -9.537000
+ 6.305990 11.100001 -7.013000 6.305990 11.100001 -7.013000
+ 5.436990 16.166001 -7.341000 5.436990 16.166001 -7.341000
+ 4.566990 21.231001 -7.669000 4.566990 21.231001 -7.669000
+ 3.697990 26.297000 -7.996000 3.697990 26.297000 -7.996000
+ 15.544000 -18.807998 -8.226000 15.544000 -18.807998 -8.226000
+ 14.675000 -13.742998 -8.554000 14.675000 -13.742998 -8.554000
+ 13.806000 -8.676999 -8.881000 13.806000 -8.676999 -8.881000
+ 12.936000 -3.610999 -9.209000 12.936000 -3.610999 -9.209000
+ 12.067000 1.454001 -9.537000 12.067000 1.454001 -9.537000
11.198000 6.520001 -9.864000 11.198000 6.520001 -9.864000
10.329000 11.585001 -10.192000 10.329000 11.585001 -10.192000
- 9.459000 16.651001 -10.520000 9.459000 16.651001 -10.520000
- 8.590000 21.716001 -10.848000 8.590000 21.716001 -10.848000
- 18.698010 -13.257998 -11.732000 18.698010 -13.257998 -11.732000
- 17.828010 -8.191998 -12.060000 17.828010 -8.191998 -12.060000
- 16.959010 -3.126998 -12.388000 16.959010 -3.126998 -12.388000
- 16.090010 1.939001 -12.716000 16.090010 1.939001 -12.716000
- 15.221010 7.004001 -13.043000 15.221010 7.004001 -13.043000
+ 9.458990 16.651001 -10.520000 9.458990 16.651001 -10.520000
+ 8.589990 21.716001 -10.848000 8.589990 21.716001 -10.848000
+ 18.698000 -13.257998 -11.732000 18.698000 -13.257998 -11.732000
+ 17.828000 -8.191998 -12.060000 17.828000 -8.191998 -12.060000
+ 16.959000 -3.126998 -12.388000 16.959000 -3.126998 -12.388000
+ 16.090000 1.939002 -12.716000 16.090000 1.939002 -12.716000
+ 15.221000 7.004002 -13.043000 15.221000 7.004002 -13.043000
14.351000 12.070001 -13.371000 14.351000 12.070001 -13.371000
- 13.482000 17.135001 -13.699000 13.482000 17.135001 -13.699000
- 21.851010 -7.707998 -15.239000 21.851010 -7.707998 -15.239000
- 20.982010 -2.641998 -15.567000 20.982010 -2.641998 -15.567000
- 20.113010 2.423002 -15.894000 20.113010 2.423002 -15.894000
- 19.243010 7.489002 -16.222000 19.243010 7.489002 -16.222000
+ 13.481990 17.135001 -13.699000 13.481990 17.135001 -13.699000
+ 21.851000 -7.707998 -15.238990 21.851000 -7.707998 -15.238990
+ 20.982000 -2.641998 -15.567000 20.982000 -2.641998 -15.567000
+ 20.113000 2.423002 -15.894000 20.113000 2.423002 -15.894000
+ 19.243000 7.489002 -16.222000 19.243000 7.489002 -16.222000
18.374000 12.554002 -16.550000 18.374000 12.554002 -16.550000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE605-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE605-AntennaField.conf
index 0ffe944429fcdb9b9f9f74894daaa3674d61aab4..fa9cece0aac2e65f0399c407dc9033337960d61b 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE605-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE605-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for DE605
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:42
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:10
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 4005681.355170000 450968.620722000 4926457.941 ]
+3 [ 4005681.312940000 450968.670090000 4926457.970 ]
96 x 2 x 3 [
-9.631000 8.005999 7.297000 -9.631000 8.005999 7.297000
- -4.444000 12.508999 2.805000 -4.444000 12.508999 2.805000
+ -4.444000 12.509000 2.805000 -4.444000 12.509000 2.805000
-9.450000 11.850999 6.906000 -9.450000 11.850999 6.906000
- -5.095000 15.838999 3.121000 -5.095000 15.838999 3.121000
- 14.981010 -7.830999 -11.646000 14.981010 -7.830999 -11.646000
- 18.653010 -3.762999 -14.883000 18.653010 -3.762999 -14.883000
- 16.774010 -15.897999 -12.586000 16.774010 -15.897999 -12.586000
- 20.143010 -13.657999 -15.459000 20.143010 -13.657999 -15.459000
+ -5.095000 15.839000 3.121000 -5.095000 15.839000 3.121000
+ 14.981000 -7.830998 -11.646000 14.981000 -7.830998 -11.646000
+ 18.653000 -3.762998 -14.883000 18.653000 -3.762998 -14.883000
+ 16.774000 -15.897998 -12.586000 16.774000 -15.897998 -12.586000
+ 20.143000 -13.657998 -15.459000 20.143000 -13.657998 -15.459000
-13.581000 11.730999 10.262000 -13.581000 11.730999 10.262000
--18.702000 9.609998 14.549000 -18.702000 9.609998 14.549000
+-18.702000 9.609999 14.549000 -18.702000 9.609999 14.549000
-20.473000 13.016998 15.767000 -20.473000 13.016998 15.767000
--19.047000 16.662998 14.379000 -19.047000 16.662998 14.379000
- 3.418000 -1.842000 -2.654000 3.418000 -1.842000 -2.654000
- 1.842000 3.586000 -1.722000 1.842000 3.586000 -1.722000
- 4.085000 5.300000 -3.649000 4.085000 5.300000 -3.649000
- 7.079000 2.276000 -5.884000 7.079000 2.276000 -5.884000
- 4.385000 8.801000 -4.116000 4.385000 8.801000 -4.116000
- 1.366000 12.154000 -1.882000 1.366000 12.154000 -1.882000
- 7.799000 14.413000 -7.242000 7.799000 14.413000 -7.242000
- 5.389000 18.043000 -5.519000 5.389000 18.043000 -5.519000
- -7.282990 -18.783001 7.101000 -7.282990 -18.783001 7.101000
+-19.047000 16.662999 14.379000 -19.047000 16.662999 14.379000
+ 3.418000 -1.841999 -2.654000 3.418000 -1.841999 -2.654000
+ 1.842000 3.586001 -1.722000 1.842000 3.586001 -1.722000
+ 4.085000 5.300001 -3.649000 4.085000 5.300001 -3.649000
+ 7.079000 2.276001 -5.884000 7.079000 2.276001 -5.884000
+ 4.385000 8.801001 -4.116000 4.385000 8.801001 -4.116000
+ 1.366000 12.154001 -1.882000 1.366000 12.154001 -1.882000
+ 7.799000 14.413001 -7.242000 7.799000 14.413001 -7.242000
+ 5.389000 18.043001 -5.519000 5.389000 18.043001 -5.519000
+ -7.283000 -18.783000 7.101000 -7.283000 -18.783000 7.101000
-13.983000 -15.817001 12.345000 -13.983000 -15.817001 12.345000
--10.493990 -26.937001 10.225000 -10.493990 -26.937001 10.225000
--17.714000 -18.816002 15.560000 -17.714000 -18.816002 15.560000
+-10.494000 -26.937001 10.225000 -10.494000 -26.937001 10.225000
+-17.714000 -18.816001 15.560000 -17.714000 -18.816001 15.560000
-10.528000 0.417999 8.509000 -10.528000 0.417999 8.509000
-12.658000 3.636999 10.030000 -12.658000 3.636999 10.030000
-12.770000 -2.619001 10.519000 -12.770000 -2.619001 10.519000
--15.750000 -3.826002 13.013000 -15.750000 -3.826002 13.013000
- 4.919010 -19.699000 -2.732000 4.919010 -19.699000 -2.732000
- 6.984010 -22.683000 -4.216000 6.984010 -22.683000 -4.216000
- -0.363990 -25.401000 1.914000 -0.363990 -25.401000 1.914000
- 2.868010 -29.892000 -0.419000 2.868010 -29.892000 -0.419000
+-15.750000 -3.826001 13.013000 -15.750000 -3.826001 13.013000
+ 4.919000 -19.698999 -2.732000 4.919000 -19.698999 -2.732000
+ 6.984000 -22.682999 -4.216000 6.984000 -22.682999 -4.216000
+ -0.364000 -25.401000 1.914000 -0.364000 -25.401000 1.914000
+ 2.868000 -29.891999 -0.419000 2.868000 -29.891999 -0.419000
10.779000 15.019001 -9.697000 10.779000 15.019001 -9.697000
- 15.303000 11.729001 -13.154000 15.303000 11.729001 -13.154000
- 21.248000 17.723001 -18.356000 21.248000 17.723001 -18.356000
- 17.069000 21.580001 -15.214000 17.069000 21.580001 -15.214000
- 2.327000 -6.476000 -1.473000 2.327000 -6.476000 -1.473000
- 6.595000 -5.022000 -5.027000 6.595000 -5.022000 -5.027000
- 3.329010 -10.312000 -2.041000 3.329010 -10.312000 -2.041000
- 6.204010 -10.166000 -4.382000 6.204010 -10.166000 -4.382000
+ 15.303000 11.729002 -13.154000 15.303000 11.729002 -13.154000
+ 21.248000 17.723002 -18.356000 21.248000 17.723002 -18.356000
+ 17.069000 21.580002 -15.214000 17.069000 21.580002 -15.214000
+ 2.327000 -6.475999 -1.473000 2.327000 -6.475999 -1.473000
+ 6.595000 -5.021999 -5.027000 6.595000 -5.021999 -5.027000
+ 3.329000 -10.311999 -2.041000 3.329000 -10.311999 -2.041000
+ 6.204000 -10.165999 -4.382000 6.204000 -10.165999 -4.382000
-9.629000 22.908999 6.346000 -9.629000 22.908999 6.346000
-1.925000 24.321000 0.010000 -1.925000 24.321000 0.010000
- -7.462000 30.271999 4.119000 -7.462000 30.271999 4.119000
+ -7.462000 30.272000 4.119000 -7.462000 30.272000 4.119000
0.719000 30.326000 -2.517000 0.719000 30.326000 -2.517000
- -2.750000 -6.547001 2.646000 -2.750000 -6.547001 2.646000
+ -2.750000 -6.547000 2.646000 -2.750000 -6.547000 2.646000
-2.081000 -10.499000 2.356000 -2.081000 -10.499000 2.356000
- -6.481000 -6.498001 5.668000 -6.481000 -6.498001 5.668000
- -5.191000 -11.546001 4.944000 -5.191000 -11.546001 4.944000
- 13.700000 -1.065999 -11.039000 13.700000 -1.065999 -11.039000
- -2.073990 -20.126000 2.965000 -2.073990 -20.126000 2.965000
- 22.236010 -2.068998 -17.895000 22.236010 -2.068998 -17.895000
- 15.477000 8.242001 -13.073000 15.477000 8.242001 -13.073000
--18.420000 -8.289002 15.461000 -18.420000 -8.289002 15.461000
- -5.124990 -30.575001 6.105000 -5.124990 -30.575001 6.105000
- 21.368000 8.225001 -17.848000 21.368000 8.225001 -17.848000
- 6.052000 -1.593000 -4.805000 6.052000 -1.593000 -4.805000
--15.008000 23.245998 10.684000 -15.008000 23.245998 10.684000
+ -6.481000 -6.498000 5.668000 -6.481000 -6.498000 5.668000
+ -5.191000 -11.546000 4.944000 -5.191000 -11.546000 4.944000
+ 13.700000 -1.065998 -11.039000 13.700000 -1.065998 -11.039000
+ -2.074000 -20.126000 2.965000 -2.074000 -20.126000 2.965000
+ 22.236000 -2.068997 -17.895000 22.236000 -2.068997 -17.895000
+ 15.477000 8.242002 -13.073000 15.477000 8.242002 -13.073000
+-18.420000 -8.289001 15.461000 -18.420000 -8.289001 15.461000
+ -5.125000 -30.575000 6.105000 -5.125000 -30.575000 6.105000
+ 21.368000 8.225002 -17.848000 21.368000 8.225002 -17.848000
+ 6.052000 -1.592999 -4.805000 6.052000 -1.592999 -4.805000
+-15.008000 23.245999 10.684000 -15.008000 23.245999 10.684000
-13.246000 -10.407001 11.402000 -13.246000 -10.407001 11.402000
--15.479000 5.318998 12.209000 -15.479000 5.318998 12.209000
- 10.308010 -28.196999 -6.559000 10.308010 -28.196999 -6.559000
- -0.236990 -16.878000 1.268000 -0.236990 -16.878000 1.268000
+-15.479000 5.318999 12.209000 -15.479000 5.318999 12.209000
+ 10.308000 -28.196999 -6.559000 10.308000 -28.196999 -6.559000
+ -0.237000 -16.878000 1.268000 -0.237000 -16.878000 1.268000
-10.269000 -10.974001 9.025000 -10.269000 -10.974001 9.025000
-1.665000 20.019000 0.073000 -1.665000 20.019000 0.073000
-0.555000 6.854000 0.013000 -0.555000 6.854000 0.013000
10.899000 -5.638999 -8.476000 10.899000 -5.638999 -8.476000
- -5.452000 4.149999 4.155000 -5.452000 4.149999 4.155000
- 10.506010 -19.288999 -7.287000 10.506010 -19.288999 -7.287000
- 5.831010 -14.334000 -3.813000 5.831010 -14.334000 -3.813000
--18.724000 0.250998 15.164000 -18.724000 0.250998 15.164000
+ -5.452000 4.150000 4.155000 -5.452000 4.150000 4.155000
+ 10.506000 -19.288999 -7.287000 10.506000 -19.288999 -7.287000
+ 5.831000 -14.333999 -3.813000 5.831000 -14.333999 -3.813000
+-18.724000 0.250999 15.164000 -18.724000 0.250999 15.164000
-20.114000 3.155998 16.105000 -20.114000 3.155998 16.105000
- -3.856000 -0.935001 3.186000 -3.856000 -0.935001 3.186000
- -8.335000 18.411999 5.583000 -8.335000 18.411999 5.583000
- 0.194010 -12.875000 0.664000 0.194010 -12.875000 0.664000
- 11.762000 6.559001 -9.954000 11.762000 6.559001 -9.954000
- 10.733010 -9.151999 -8.118000 10.733010 -9.151999 -8.118000
- 21.496000 4.624001 -17.722000 21.496000 4.624001 -17.722000
- -7.734000 0.717999 6.224000 -7.734000 0.717999 6.224000
- -4.139990 -15.518001 4.345000 -4.139990 -15.518001 4.345000
+ -3.856000 -0.935000 3.186000 -3.856000 -0.935000 3.186000
+ -8.335000 18.412000 5.583000 -8.335000 18.412000 5.583000
+ 0.194000 -12.875000 0.664000 0.194000 -12.875000 0.664000
+ 11.762000 6.559002 -9.954000 11.762000 6.559002 -9.954000
+ 10.733000 -9.151999 -8.118000 10.733000 -9.151999 -8.118000
+ 21.496000 4.624002 -17.722000 21.496000 4.624002 -17.722000
+ -7.734000 0.718000 6.224000 -7.734000 0.718000 6.224000
+ -4.140000 -15.518000 4.345000 -4.140000 -15.518000 4.345000
-13.818000 15.532999 10.212000 -13.818000 15.532999 10.212000
- 4.593000 23.959000 -5.251000 4.593000 23.959000 -5.251000
- 1.822000 16.851000 -2.552000 1.822000 16.851000 -2.552000
- 16.877000 0.225001 -13.697000 16.877000 0.225001 -13.697000
- 7.500000 10.590000 -6.756000 7.500000 10.590000 -6.756000
- -2.632000 3.799999 1.891000 -2.632000 3.799999 1.891000
- -7.115990 -24.306001 7.318000 -7.115990 -24.306001 7.318000
+ 4.593000 23.959001 -5.251000 4.593000 23.959001 -5.251000
+ 1.822000 16.851001 -2.552000 1.822000 16.851001 -2.552000
+ 16.877000 0.225002 -13.697000 16.877000 0.225002 -13.697000
+ 7.500000 10.590001 -6.756000 7.500000 10.590001 -6.756000
+ -2.632000 3.800000 1.891000 -2.632000 3.800000 1.891000
+ -7.116000 -24.306000 7.318000 -7.116000 -24.306000 7.318000
-0.250000 -5.146000 0.531000 -0.250000 -5.146000 0.531000
- 17.580010 -23.057999 -12.782000 17.580010 -23.057999 -12.782000
- 12.091010 -16.631999 -8.742000 12.091010 -16.631999 -8.742000
+ 17.580000 -23.057998 -12.782000 17.580000 -23.057998 -12.782000
+ 12.091000 -16.631998 -8.742000 12.091000 -16.631998 -8.742000
-0.816000 10.254000 0.007000 -0.816000 10.254000 0.007000
- 9.147000 28.794000 -9.252000 9.147000 28.794000 -9.252000
- -6.934000 7.126999 5.167000 -6.934000 7.126999 5.167000
--19.149000 -11.353002 16.248000 -19.149000 -11.353002 16.248000
+ 9.147000 28.794001 -9.252000 9.147000 28.794001 -9.252000
+ -6.934000 7.127000 5.167000 -6.934000 7.127000 5.167000
+-19.149000 -11.353001 16.248000 -19.149000 -11.353001 16.248000
10.062000 19.909001 -9.427000 10.062000 19.909001 -9.427000
- -6.277000 -2.350001 5.239000 -6.277000 -2.350001 5.239000
- -9.198000 -6.573001 7.876000 -9.198000 -6.573001 7.876000
- 9.573000 3.346000 -7.974000 9.573000 3.346000 -7.974000
+ -6.277000 -2.350000 5.239000 -6.277000 -2.350000 5.239000
+ -9.198000 -6.573000 7.876000 -9.198000 -6.573000 7.876000
+ 9.573000 3.346001 -7.974000 9.573000 3.346001 -7.974000
]
NORMAL_VECTOR HBA
@@ -126,102 +126,102 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 4005681.020170000 450968.642722000 4926458.211 ]
+3 [ 4005680.977940000 450968.692090000 4926458.240 ]
96 x 2 x 3 [
- 16.374000 68.696001 -17.655000 16.374000 68.696001 -17.655000
- 18.859000 72.598001 -19.918000 18.859000 72.598001 -19.918000
- 21.345000 76.500001 -22.182000 21.345000 76.500001 -22.182000
- 23.830000 80.401002 -24.445000 23.830000 80.401002 -24.445000
- 26.316000 84.303002 -26.709000 26.316000 84.303002 -26.709000
- 17.028000 61.443001 -17.722000 17.028000 61.443001 -17.722000
- 19.513000 65.344001 -19.986000 19.513000 65.344001 -19.986000
- 21.998000 69.246001 -22.249000 21.998000 69.246001 -22.249000
- 24.484000 73.147002 -24.513000 24.484000 73.147002 -24.513000
- 26.969000 77.049002 -26.777000 26.969000 77.049002 -26.777000
- 29.454000 80.950002 -29.040000 29.454000 80.950002 -29.040000
- 31.940000 84.853002 -31.304000 31.940000 84.853002 -31.304000
- 17.682000 54.190001 -17.790000 17.682000 54.190001 -17.790000
- 20.167000 58.091001 -20.054000 20.167000 58.091001 -20.054000
+ 16.374000 68.696002 -17.655000 16.374000 68.696002 -17.655000
+ 18.858990 72.598002 -19.918000 18.858990 72.598002 -19.918000
+ 21.344990 76.500002 -22.182000 21.344990 76.500002 -22.182000
+ 23.829990 80.401003 -24.445000 23.829990 80.401003 -24.445000
+ 26.315990 84.303003 -26.709000 26.315990 84.303003 -26.709000
+ 17.028000 61.443002 -17.722000 17.028000 61.443002 -17.722000
+ 19.513000 65.344002 -19.986000 19.513000 65.344002 -19.986000
+ 21.998000 69.246002 -22.249000 21.998000 69.246002 -22.249000
+ 24.484000 73.147003 -24.513000 24.484000 73.147003 -24.513000
+ 26.968990 77.049003 -26.777000 26.968990 77.049003 -26.777000
+ 29.453990 80.950003 -29.040000 29.453990 80.950003 -29.040000
+ 31.939990 84.853003 -31.304000 31.939990 84.853003 -31.304000
+ 17.682000 54.190002 -17.790000 17.682000 54.190002 -17.790000
+ 20.167000 58.091002 -20.054000 20.167000 58.091002 -20.054000
22.652000 61.993002 -22.317000 22.652000 61.993002 -22.317000
- 25.138000 65.894002 -24.581000 25.138000 65.894002 -24.581000
- 27.623000 69.796002 -26.844000 27.623000 69.796002 -26.844000
- 30.108000 73.697002 -29.107000 30.108000 73.697002 -29.107000
- 32.594000 77.599002 -31.371000 32.594000 77.599002 -31.371000
- 35.078000 81.500003 -33.634000 35.078000 81.500003 -33.634000
- 37.564000 85.402003 -35.898000 37.564000 85.402003 -35.898000
- 18.335000 46.936001 -17.857000 18.335000 46.936001 -17.857000
- 20.821000 50.837001 -20.121000 20.821000 50.837001 -20.121000
- 23.306000 54.739002 -22.384000 23.306000 54.739002 -22.384000
- 25.791000 58.640002 -24.648000 25.791000 58.640002 -24.648000
- 28.276000 62.542002 -26.911000 28.276000 62.542002 -26.911000
- 30.762000 66.444002 -29.175000 30.762000 66.444002 -29.175000
- 33.247000 70.346002 -31.439000 33.247000 70.346002 -31.439000
- 35.732000 74.247003 -33.702000 35.732000 74.247003 -33.702000
- 38.218000 78.149003 -35.966000 38.218000 78.149003 -35.966000
- 40.703000 82.050003 -38.229000 40.703000 82.050003 -38.229000
- 43.188000 85.952003 -40.493000 43.188000 85.952003 -40.493000
- 21.475000 43.584001 -20.189000 21.475000 43.584001 -20.189000
- 23.960000 47.486002 -22.452000 23.960000 47.486002 -22.452000
- 26.445000 51.387002 -24.716000 26.445000 51.387002 -24.716000
- 28.930000 55.289002 -26.979000 28.930000 55.289002 -26.979000
- 31.416000 59.190002 -29.243000 31.416000 59.190002 -29.243000
- 33.901000 63.092002 -31.506000 33.901000 63.092002 -31.506000
- 36.386000 66.993003 -33.769000 36.386000 66.993003 -33.769000
- 38.872000 70.896003 -36.033000 38.872000 70.896003 -36.033000
- 41.357000 74.797003 -38.296000 41.357000 74.797003 -38.296000
- 43.842000 78.699003 -40.560000 43.842000 78.699003 -40.560000
- 46.328000 82.600004 -42.824000 46.328000 82.600004 -42.824000
- 24.614000 40.233002 -22.519000 24.614000 40.233002 -22.519000
- 27.099000 44.134002 -24.783000 27.099000 44.134002 -24.783000
- 29.584000 48.036002 -27.046000 29.584000 48.036002 -27.046000
- 32.070000 51.937002 -29.310000 32.070000 51.937002 -29.310000
- 34.554000 55.839003 -31.573000 34.554000 55.839003 -31.573000
- 39.526000 63.641003 -36.101000 39.526000 63.641003 -36.101000
- 42.010000 67.543003 -38.364000 42.010000 67.543003 -38.364000
- 44.496000 71.444003 -40.628000 44.496000 71.444003 -40.628000
- 46.981000 75.346004 -42.891000 46.981000 75.346004 -42.891000
- 49.466000 79.247004 -45.154990 49.466000 79.247004 -45.154990
- 27.752000 36.880002 -24.850000 27.752000 36.880002 -24.850000
- 30.238000 40.781002 -27.114000 30.238000 40.781002 -27.114000
- 32.723000 44.683002 -29.378000 32.723000 44.683002 -29.378000
- 35.208000 48.584003 -31.641000 35.208000 48.584003 -31.641000
- 37.694000 52.487003 -33.905000 37.694000 52.487003 -33.905000
- 40.179000 56.388003 -36.168000 40.179000 56.388003 -36.168000
- 42.664000 60.290003 -38.431000 42.664000 60.290003 -38.431000
- 45.150000 64.191003 -40.695000 45.150000 64.191003 -40.695000
- 47.635000 68.093004 -42.957990 47.635000 68.093004 -42.957990
- 50.120000 71.994004 -45.221990 50.120000 71.994004 -45.221990
- 52.605000 75.896004 -47.484990 52.605000 75.896004 -47.484990
- 30.892000 33.528002 -27.181000 30.892000 33.528002 -27.181000
- 33.377000 37.430002 -29.445000 33.377000 37.430002 -29.445000
- 35.862000 41.331003 -31.708000 35.862000 41.331003 -31.708000
- 38.348000 45.233003 -33.972000 38.348000 45.233003 -33.972000
- 40.833000 49.134003 -36.235000 40.833000 49.134003 -36.235000
- 43.318000 53.036003 -38.499000 43.318000 53.036003 -38.499000
- 45.804000 56.938003 -40.763000 45.804000 56.938003 -40.763000
- 48.289000 60.840004 -43.025990 48.289000 60.840004 -43.025990
- 50.774000 64.741004 -45.289990 50.774000 64.741004 -45.289990
- 53.259000 68.643004 -47.552990 53.259000 68.643004 -47.552990
- 55.745000 72.544004 -49.816990 55.745000 72.544004 -49.816990
- 36.516000 34.078003 -31.776000 36.516000 34.078003 -31.776000
- 39.002000 37.980003 -34.040000 39.002000 37.980003 -34.040000
- 41.486000 41.881003 -36.303000 41.486000 41.881003 -36.303000
- 43.972000 45.783003 -38.567000 43.972000 45.783003 -38.567000
- 46.457000 49.684004 -40.829990 46.457000 49.684004 -40.829990
- 48.942000 53.586004 -43.092990 48.942000 53.586004 -43.092990
- 51.428000 57.487004 -45.356990 51.428000 57.487004 -45.356990
- 53.913000 61.389004 -47.619990 53.913000 61.389004 -47.619990
- 56.398000 65.290004 -49.883990 56.398000 65.290004 -49.883990
- 42.140000 34.627003 -36.370000 42.140000 34.627003 -36.370000
- 44.626000 38.530003 -38.633990 44.626000 38.530003 -38.633990
- 47.111000 42.431004 -40.896990 47.111000 42.431004 -40.896990
- 49.596000 46.333004 -43.160990 49.596000 46.333004 -43.160990
- 52.082000 50.234004 -45.424990 52.082000 50.234004 -45.424990
- 54.567000 54.136004 -47.687990 54.567000 54.136004 -47.687990
- 57.052000 58.037004 -49.951990 57.052000 58.037004 -49.951990
- 47.764000 35.177004 -40.964990 47.764000 35.177004 -40.964990
- 50.250000 39.079004 -43.228990 50.250000 39.079004 -43.228990
- 52.735000 42.980004 -45.491990 52.735000 42.980004 -45.491990
- 55.221000 46.882004 -47.755990 55.221000 46.882004 -47.755990
- 57.706000 50.784004 -50.018990 57.706000 50.784004 -50.018990
+ 25.138000 65.894003 -24.581000 25.138000 65.894003 -24.581000
+ 27.623000 69.796003 -26.844000 27.623000 69.796003 -26.844000
+ 30.108000 73.697003 -29.107000 30.108000 73.697003 -29.107000
+ 32.594000 77.599003 -31.371000 32.594000 77.599003 -31.371000
+ 35.077990 81.500004 -33.634000 35.077990 81.500004 -33.634000
+ 37.563990 85.402004 -35.898000 37.563990 85.402004 -35.898000
+ 18.335000 46.936002 -17.857000 18.335000 46.936002 -17.857000
+ 20.821000 50.837002 -20.121000 20.821000 50.837002 -20.121000
+ 23.306000 54.739003 -22.384000 23.306000 54.739003 -22.384000
+ 25.791000 58.640003 -24.648000 25.791000 58.640003 -24.648000
+ 28.276000 62.542003 -26.911000 28.276000 62.542003 -26.911000
+ 30.762000 66.444003 -29.175000 30.762000 66.444003 -29.175000
+ 33.247000 70.346003 -31.439000 33.247000 70.346003 -31.439000
+ 35.732000 74.247004 -33.702000 35.732000 74.247004 -33.702000
+ 38.218000 78.149004 -35.966000 38.218000 78.149004 -35.966000
+ 40.703000 82.050004 -38.228990 40.703000 82.050004 -38.228990
+ 43.187990 85.952004 -40.492990 43.187990 85.952004 -40.492990
+ 21.475000 43.584002 -20.189000 21.475000 43.584002 -20.189000
+ 23.960000 47.486003 -22.452000 23.960000 47.486003 -22.452000
+ 26.445000 51.387003 -24.716000 26.445000 51.387003 -24.716000
+ 28.930000 55.289003 -26.979000 28.930000 55.289003 -26.979000
+ 31.416000 59.190003 -29.243000 31.416000 59.190003 -29.243000
+ 33.901000 63.092004 -31.506000 33.901000 63.092004 -31.506000
+ 36.386000 66.993004 -33.769000 36.386000 66.993004 -33.769000
+ 38.872000 70.896004 -36.032990 38.872000 70.896004 -36.032990
+ 41.357000 74.797004 -38.295990 41.357000 74.797004 -38.295990
+ 43.842000 78.699004 -40.559990 43.842000 78.699004 -40.559990
+ 46.328000 82.600005 -42.823990 46.328000 82.600005 -42.823990
+ 24.614000 40.233003 -22.519000 24.614000 40.233003 -22.519000
+ 27.099000 44.134003 -24.783000 27.099000 44.134003 -24.783000
+ 29.584000 48.036003 -27.046000 29.584000 48.036003 -27.046000
+ 32.070000 51.937003 -29.310000 32.070000 51.937003 -29.310000
+ 34.554000 55.839004 -31.573000 34.554000 55.839004 -31.573000
+ 39.526000 63.641004 -36.100990 39.526000 63.641004 -36.100990
+ 42.010000 67.543004 -38.363990 42.010000 67.543004 -38.363990
+ 44.496000 71.444005 -40.627990 44.496000 71.444005 -40.627990
+ 46.981000 75.346005 -42.890990 46.981000 75.346005 -42.890990
+ 49.466000 79.247005 -45.154990 49.466000 79.247005 -45.154990
+ 27.752000 36.880003 -24.850000 27.752000 36.880003 -24.850000
+ 30.238000 40.781003 -27.114000 30.238000 40.781003 -27.114000
+ 32.723000 44.683003 -29.378000 32.723000 44.683003 -29.378000
+ 35.208000 48.584004 -31.641000 35.208000 48.584004 -31.641000
+ 37.694000 52.487004 -33.904990 37.694000 52.487004 -33.904990
+ 40.179000 56.388004 -36.167990 40.179000 56.388004 -36.167990
+ 42.664000 60.290004 -38.430990 42.664000 60.290004 -38.430990
+ 45.150000 64.191005 -40.694990 45.150000 64.191005 -40.694990
+ 47.635000 68.093005 -42.957990 47.635000 68.093005 -42.957990
+ 50.120000 71.994005 -45.221990 50.120000 71.994005 -45.221990
+ 52.605000 75.896005 -47.484990 52.605000 75.896005 -47.484990
+ 30.892000 33.528003 -27.181000 30.892000 33.528003 -27.181000
+ 33.377000 37.430004 -29.445000 33.377000 37.430004 -29.445000
+ 35.862000 41.331004 -31.707990 35.862000 41.331004 -31.707990
+ 38.348000 45.233004 -33.971990 38.348000 45.233004 -33.971990
+ 40.833000 49.134004 -36.234990 40.833000 49.134004 -36.234990
+ 43.318000 53.036004 -38.498990 43.318000 53.036004 -38.498990
+ 45.804000 56.938005 -40.762990 45.804000 56.938005 -40.762990
+ 48.289000 60.840005 -43.025990 48.289000 60.840005 -43.025990
+ 50.774000 64.741005 -45.289990 50.774000 64.741005 -45.289990
+ 53.259000 68.643005 -47.552990 53.259000 68.643005 -47.552990
+ 55.745000 72.544006 -49.816990 55.745000 72.544006 -49.816990
+ 36.516000 34.078004 -31.775990 36.516000 34.078004 -31.775990
+ 39.002000 37.980004 -34.039990 39.002000 37.980004 -34.039990
+ 41.486000 41.881004 -36.302990 41.486000 41.881004 -36.302990
+ 43.972000 45.783005 -38.566990 43.972000 45.783005 -38.566990
+ 46.457000 49.684005 -40.829990 46.457000 49.684005 -40.829990
+ 48.942000 53.586005 -43.092990 48.942000 53.586005 -43.092990
+ 51.428000 57.487005 -45.356990 51.428000 57.487005 -45.356990
+ 53.913000 61.389005 -47.619990 53.913000 61.389005 -47.619990
+ 56.398000 65.290006 -49.883990 56.398000 65.290006 -49.883990
+ 42.140000 34.627004 -36.369990 42.140000 34.627004 -36.369990
+ 44.626000 38.530005 -38.633990 44.626000 38.530005 -38.633990
+ 47.111000 42.431005 -40.896990 47.111000 42.431005 -40.896990
+ 49.596000 46.333005 -43.160990 49.596000 46.333005 -43.160990
+ 52.082000 50.234005 -45.424990 52.082000 50.234005 -45.424990
+ 54.567000 54.136006 -47.687990 54.567000 54.136006 -47.687990
+ 57.052000 58.037006 -49.951990 57.052000 58.037006 -49.951990
+ 47.764000 35.177005 -40.964990 47.764000 35.177005 -40.964990
+ 50.250000 39.079005 -43.228990 50.250000 39.079005 -43.228990
+ 52.735000 42.980005 -45.491990 52.735000 42.980005 -45.491990
+ 55.221000 46.882006 -47.755990 55.221000 46.882006 -47.755990
+ 57.706000 50.784006 -50.018990 57.706000 50.784006 -50.018990
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE609-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE609-AntennaField.conf
index 009af8b75162f970a3fa9f2279d41f6aac40130a..594e0c9e98caf74a3741ebc65d4514281c1dddeb 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE609-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE609-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for DE609
-# ITRF2005 target_date = 2015.0
-# Created: 2014-12-11 20:26:16
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:11
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3727207.323440000 655185.253748000 5117000.901 ]
+3 [ 3727207.315770000 655185.261474000 5117000.905 ]
96 x 2 x 3 [
- -2.385000 -13.491000 3.441000 -2.385000 -13.491000 3.441000
- -7.901000 -8.415000 6.782000 -7.901000 -8.415000 6.782000
- -5.396000 -14.324000 5.723000 -5.396000 -14.324000 5.723000
--10.186000 -10.119001 8.650000 -10.186000 -10.119001 8.650000
- -0.124000 20.778000 -2.555000 -0.124000 20.778000 -2.555000
- -4.701000 24.130000 0.327000 -4.701000 24.130000 0.327000
+ -2.385000 -13.491000 3.440990 -2.385000 -13.491000 3.440990
+ -7.901000 -8.415000 6.781990 -7.901000 -8.415000 6.781990
+ -5.396000 -14.324000 5.722990 -5.396000 -14.324000 5.722990
+-10.186000 -10.119001 8.649990 -10.186000 -10.119001 8.649990
+ -0.124000 20.778000 -2.555010 -0.124000 20.778000 -2.555010
+ -4.701000 24.130000 0.326990 -4.701000 24.130000 0.326990
5.326000 25.166001 -7.052000 5.326000 25.166001 -7.052000
- 2.267000 28.650001 -5.285000 2.267000 28.650001 -5.285000
- -3.652000 -19.315000 5.098000 -3.652000 -19.315000 5.098000
- 0.017000 -24.962000 3.165000 0.017000 -24.962000 3.165000
- -1.879000 -28.049000 4.928000 -1.879000 -28.049000 4.928000
- -5.236000 -27.314000 7.261000 -5.236000 -27.314000 7.261000
- -0.077000 5.075000 -0.590000 -0.077000 5.075000 -0.590000
- -3.595000 1.673000 2.386000 -3.595000 1.673000 2.386000
- -5.802000 3.931000 3.693000 -5.802000 3.931000 3.693000
- -4.688000 8.401000 2.319000 -4.688000 8.401000 2.319000
- -8.598000 3.338000 5.789000 -8.598000 3.338000 5.789000
- -9.953000 -1.251001 7.353000 -9.953000 -1.251001 7.353000
--14.253000 5.953999 9.544000 -14.253000 5.953999 9.544000
--16.063000 2.028999 11.352000 -16.063000 2.028999 11.352000
+ 2.267000 28.650001 -5.285010 2.267000 28.650001 -5.285010
+ -3.652000 -19.315000 5.097990 -3.652000 -19.315000 5.097990
+ 0.017010 -24.962000 3.165000 0.017010 -24.962000 3.165000
+ -1.878990 -28.049000 4.928000 -1.878990 -28.049000 4.928000
+ -5.235990 -27.314000 7.260990 -5.235990 -27.314000 7.260990
+ -0.077000 5.075000 -0.590010 -0.077000 5.075000 -0.590010
+ -3.595000 1.673000 2.385990 -3.595000 1.673000 2.385990
+ -5.802000 3.931000 3.692990 -5.802000 3.931000 3.692990
+ -4.688000 8.401000 2.318990 -4.688000 8.401000 2.318990
+ -8.598000 3.337999 5.788990 -8.598000 3.337999 5.788990
+ -9.953000 -1.251001 7.352990 -9.953000 -1.251001 7.352990
+-14.253000 5.953999 9.543990 -14.253000 5.953999 9.543990
+-16.063000 2.028999 11.351990 -16.063000 2.028999 11.351990
17.152000 -3.302998 -11.976000 17.152000 -3.302998 -11.976000
17.566000 -12.263998 -11.135000 17.566000 -12.263998 -11.135000
24.669000 -4.977997 -17.197000 24.669000 -4.977997 -17.197000
- 21.351000 -15.981998 -13.397000 21.351000 -15.981998 -13.397000
+ 21.351010 -15.981998 -13.397000 21.351010 -15.981998 -13.397000
3.774000 -12.505999 -1.136000 3.774000 -12.505999 -1.136000
2.166000 -15.975999 0.468000 2.166000 -15.975999 0.468000
6.991000 -14.399999 -3.220000 6.991000 -14.399999 -3.220000
- 9.106000 -17.695999 -4.329000 9.106000 -17.695999 -4.329000
+ 9.106010 -17.695999 -4.329000 9.106010 -17.695999 -4.329000
12.973000 11.788002 -10.876000 12.973000 11.788002 -10.876000
14.427000 15.115002 -12.351000 14.427000 15.115002 -12.351000
19.444000 6.923002 -14.935000 19.444000 6.923002 -14.935000
21.584000 12.082002 -17.138000 21.584000 12.082002 -17.138000
--15.908000 9.413999 10.300000 -15.908000 9.413999 10.300000
--15.203000 15.815999 8.975000 -15.203000 15.815999 8.975000
--22.162010 21.404998 13.293000 -22.162010 21.404998 13.293000
--23.439000 15.267998 14.998000 -23.439000 15.267998 14.998000
+-15.908000 9.413999 10.299990 -15.908000 9.413999 10.299990
+-15.203000 15.815999 8.974990 -15.203000 15.815999 8.974990
+-22.162000 21.404998 13.292990 -22.162000 21.404998 13.292990
+-23.439000 15.267998 14.997990 -23.439000 15.267998 14.997990
3.902000 5.015001 -3.459000 3.902000 5.015001 -3.459000
1.084000 9.810000 -2.032000 1.084000 9.810000 -2.032000
6.434000 7.284001 -5.577000 6.434000 7.284001 -5.577000
5.172000 10.742001 -5.105000 5.172000 10.742001 -5.105000
--13.778000 -17.568001 12.194000 -13.778000 -17.568001 12.194000
--17.938000 -8.584001 14.057000 -17.938000 -8.584001 14.057000
--20.272000 -16.947001 16.809000 -20.272000 -16.947001 16.809000
--23.586000 -7.012002 17.939000 -23.586000 -7.012002 17.939000
+-13.778000 -17.568001 12.193990 -13.778000 -17.568001 12.193990
+-17.938000 -8.584001 14.056990 -17.938000 -8.584001 14.056990
+-20.272000 -16.947002 16.808990 -20.272000 -16.947002 16.808990
+-23.586000 -7.012002 17.938990 -23.586000 -7.012002 17.938990
5.987000 -1.138999 -4.182000 5.987000 -1.138999 -4.182000
8.740000 0.756001 -6.413000 8.740000 0.756001 -6.413000
7.442000 -5.689999 -4.655000 7.442000 -5.689999 -4.655000
10.784000 -2.740999 -7.446000 10.784000 -2.740999 -7.446000
- -4.781000 17.368000 1.245000 -4.781000 17.368000 1.245000
+ -4.781000 17.368000 1.244990 -4.781000 17.368000 1.244990
16.096000 3.398002 -12.066000 16.096000 3.398002 -12.066000
- -7.428010 28.024000 1.802000 -7.428010 28.024000 1.802000
--12.607000 16.980999 6.951000 -12.607000 16.980999 6.951000
- 13.586000 -19.721998 -7.309000 13.586000 -19.721998 -7.309000
+ -7.428000 28.024000 1.801990 -7.428000 28.024000 1.801990
+-12.607000 16.980999 6.950990 -12.607000 16.980999 6.950990
+ 13.586010 -19.721998 -7.309000 13.586010 -19.721998 -7.309000
25.303000 2.547003 -18.612000 25.303000 2.547003 -18.612000
--14.951010 24.151999 7.732000 -14.951010 24.151999 7.732000
- -1.321000 8.211000 -0.090000 -1.321000 8.211000 -0.090000
--11.883000 -24.202001 11.669000 -11.883000 -24.202001 11.669000
+-14.951000 24.151999 7.731990 -14.951000 24.151999 7.731990
+ -1.321000 8.211000 -0.090010 -1.321000 8.211000 -0.090010
+-11.883000 -24.202001 11.668990 -11.883000 -24.202001 11.668990
13.136000 -12.848998 -7.859000 13.136000 -12.848998 -7.859000
2.007000 -19.867999 1.078000 2.007000 -19.867999 1.078000
17.313000 20.669002 -15.144000 17.313000 20.669002 -15.144000
12.879000 4.744002 -9.912000 12.879000 4.744002 -9.912000
12.378000 -9.072998 -7.792000 12.378000 -9.072998 -7.792000
--14.753000 -7.090001 11.566000 -14.753000 -7.090001 11.566000
- -5.135000 -2.138000 3.983000 -5.135000 -2.138000 3.983000
- -0.165000 15.213000 -1.817000 -0.165000 15.213000 -1.817000
- -1.108000 -7.354000 1.737000 -1.108000 -7.354000 1.737000
+-14.753000 -7.090001 11.565990 -14.753000 -7.090001 11.565990
+ -5.135000 -2.138000 3.982990 -5.135000 -2.138000 3.982990
+ -0.165000 15.213000 -1.817010 -0.165000 15.213000 -1.817010
+ -1.108000 -7.354000 1.736990 -1.108000 -7.354000 1.736990
10.425000 18.470001 -9.886000 10.425000 18.470001 -9.886000
8.508000 11.428001 -7.603000 8.508000 11.428001 -7.603000
- 7.179000 -22.427999 -2.334000 7.179000 -22.427999 -2.334000
- 5.515000 -24.913999 -0.815000 5.515000 -24.913999 -0.815000
+ 7.179010 -22.427999 -2.334000 7.179010 -22.427999 -2.334000
+ 5.515010 -24.913999 -0.815000 5.515010 -24.913999 -0.815000
2.140000 -4.021999 -1.035000 2.140000 -4.021999 -1.035000
--10.858000 -14.764001 9.727000 -10.858000 -14.764001 9.727000
+-10.858000 -14.764001 9.726990 -10.858000 -14.764001 9.726990
9.646000 4.173001 -7.503000 9.646000 4.173001 -7.503000
- -9.835000 12.923999 5.463000 -9.835000 12.923999 5.463000
+ -9.835000 12.923999 5.462990 -9.835000 12.923999 5.462990
2.586000 15.972001 -3.902000 2.586000 15.972001 -3.902000
--12.249010 25.292999 5.634000 -12.249010 25.292999 5.634000
+-12.249000 25.292999 5.633990 -12.249000 25.292999 5.633990
2.427000 -9.188999 -0.584000 2.427000 -9.188999 -0.584000
13.400000 -0.374998 -9.637000 13.400000 -0.374998 -9.637000
- -6.464000 -20.643000 7.299000 -6.464000 -20.643000 7.299000
--20.268000 -0.557002 14.720000 -20.268000 -0.557002 14.720000
--13.727000 -1.982001 10.173000 -13.727000 -1.982001 10.173000
- -7.039000 20.879000 2.430000 -7.039000 20.879000 2.430000
--11.211000 6.636999 7.258000 -11.211000 6.636999 7.258000
- -1.969000 -3.827000 1.910000 -1.969000 -3.827000 1.910000
+ -6.464000 -20.643000 7.298990 -6.464000 -20.643000 7.298990
+-20.268000 -0.557002 14.719990 -20.268000 -0.557002 14.719990
+-13.727000 -1.982001 10.172990 -13.727000 -1.982001 10.172990
+ -7.039000 20.879000 2.429990 -7.039000 20.879000 2.429990
+-11.211000 6.636999 7.257990 -11.211000 6.636999 7.257990
+ -1.969000 -3.827000 1.909990 -1.969000 -3.827000 1.909990
21.307000 -1.589998 -15.198000 21.307000 -1.589998 -15.198000
3.916000 1.518001 -3.024000 3.916000 1.518001 -3.024000
10.477000 28.105001 -11.149000 10.477000 28.105001 -11.149000
7.760000 19.672001 -8.112000 7.760000 19.672001 -8.112000
- -7.629000 -3.386000 5.945000 -7.629000 -3.386000 5.945000
--25.785000 3.657998 18.171000 -25.785000 3.657998 18.171000
- -2.791000 -9.971000 3.287000 -2.791000 -9.971000 3.287000
- 16.219000 -19.770998 -9.206000 16.219000 -19.770998 -9.206000
--19.359000 7.202999 13.075000 -19.359000 7.202999 13.075000
+ -7.629000 -3.386000 5.944990 -7.629000 -3.386000 5.944990
+-25.785000 3.657998 18.170990 -25.785000 3.657998 18.170990
+ -2.791000 -9.971000 3.286990 -2.791000 -9.971000 3.286990
+ 16.219010 -19.770998 -9.206000 16.219010 -19.770998 -9.206000
+-19.359000 7.202998 13.074990 -19.359000 7.202998 13.074990
4.190000 -6.577999 -2.191000 4.190000 -6.577999 -2.191000
8.585000 -8.974999 -5.063000 8.585000 -8.974999 -5.063000
- -6.503000 11.141000 3.282000 -6.503000 11.141000 3.282000
+ -6.503000 11.141000 3.281990 -6.503000 11.141000 3.281990
]
NORMAL_VECTOR HBA
@@ -126,72 +126,72 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3727217.673450000 655109.174749000 5117003.123 ]
+3 [ 3727217.665780000 655109.182475000 5117003.127 ]
96 x 2 x 3 [
--22.005010 7.896998 14.919000 -22.005010 7.896998 14.919000
--19.653010 11.909999 12.708000 -19.653010 11.909999 12.708000
--17.301010 15.922999 10.497000 -17.301010 15.922999 10.497000
--14.950010 19.935999 8.286000 -14.950010 19.935999 8.286000
--12.598010 23.948999 6.075000 -12.598010 23.948999 6.075000
--20.896010 0.699998 15.031000 -20.896010 0.699998 15.031000
--18.544010 4.712999 12.819000 -18.544010 4.712999 12.819000
--16.193010 8.724999 10.609000 -16.193010 8.724999 10.609000
--13.841010 12.738999 8.397000 -13.841010 12.738999 8.397000
--11.489010 16.751999 6.186000 -11.489010 16.751999 6.186000
- -9.137010 20.764000 3.975000 -9.137010 20.764000 3.975000
- -6.786010 24.777000 1.764000 -6.786010 24.777000 1.764000
--19.788010 -6.498001 15.143000 -19.788010 -6.498001 15.143000
--17.436010 -2.484001 12.931000 -17.436010 -2.484001 12.931000
--15.084010 1.527999 10.720000 -15.084010 1.527999 10.720000
--12.732010 5.540999 8.509000 -12.732010 5.540999 8.509000
--10.381010 9.552999 6.298000 -10.381010 9.552999 6.298000
- -8.029010 13.567000 4.087000 -8.029010 13.567000 4.087000
- -5.678010 17.580000 1.876000 -5.678010 17.580000 1.876000
- -3.325010 21.592000 -0.335000 -3.325010 21.592000 -0.335000
- -0.974010 25.605000 -2.546000 -0.974010 25.605000 -2.546000
+-22.005000 7.896998 14.918990 -22.005000 7.896998 14.918990
+-19.653000 11.909998 12.707990 -19.653000 11.909998 12.707990
+-17.301000 15.922999 10.496990 -17.301000 15.922999 10.496990
+-14.950000 19.935999 8.286000 -14.950000 19.935999 8.286000
+-12.598000 23.948999 6.075000 -12.598000 23.948999 6.075000
+-20.896000 0.699998 15.030990 -20.896000 0.699998 15.030990
+-18.544000 4.712999 12.818990 -18.544000 4.712999 12.818990
+-16.193000 8.724999 10.609000 -16.193000 8.724999 10.609000
+-13.841000 12.738999 8.397000 -13.841000 12.738999 8.397000
+-11.489000 16.751999 6.186000 -11.489000 16.751999 6.186000
+ -9.137000 20.763999 3.975000 -9.137000 20.763999 3.975000
+ -6.786000 24.777000 1.764000 -6.786000 24.777000 1.764000
+-19.788000 -6.498002 15.142990 -19.788000 -6.498002 15.142990
+-17.436000 -2.484001 12.931000 -17.436000 -2.484001 12.931000
+-15.084000 1.527999 10.720000 -15.084000 1.527999 10.720000
+-12.732000 5.540999 8.509000 -12.732000 5.540999 8.509000
+-10.381000 9.552999 6.298000 -10.381000 9.552999 6.298000
+ -8.029000 13.567000 4.087000 -8.029000 13.567000 4.087000
+ -5.678000 17.580000 1.876000 -5.678000 17.580000 1.876000
+ -3.325000 21.592000 -0.335000 -3.325000 21.592000 -0.335000
+ -0.974000 25.605000 -2.546000 -0.974000 25.605000 -2.546000
-18.679000 -13.695001 15.254000 -18.679000 -13.695001 15.254000
-16.327000 -9.682001 13.043000 -16.327000 -9.682001 13.043000
--13.976010 -5.669001 10.832000 -13.976010 -5.669001 10.832000
--11.624010 -1.656001 8.621000 -11.624010 -1.656001 8.621000
- -9.272010 2.356000 6.410000 -9.272010 2.356000 6.410000
- -6.920010 6.369000 4.199000 -6.920010 6.369000 4.199000
- -4.569010 10.382000 1.988000 -4.569010 10.382000 1.988000
- -2.217010 14.395000 -0.224000 -2.217010 14.395000 -0.224000
- 0.133990 18.408000 -2.434000 0.133990 18.408000 -2.434000
- 2.486990 22.420001 -4.646000 2.486990 22.420001 -4.646000
- 4.837990 26.433001 -6.857000 4.837990 26.433001 -6.857000
+-13.976000 -5.669001 10.832000 -13.976000 -5.669001 10.832000
+-11.624000 -1.656001 8.621000 -11.624000 -1.656001 8.621000
+ -9.272000 2.355999 6.410000 -9.272000 2.355999 6.410000
+ -6.920000 6.369000 4.199000 -6.920000 6.369000 4.199000
+ -4.569000 10.382000 1.988000 -4.569000 10.382000 1.988000
+ -2.217000 14.395000 -0.224000 -2.217000 14.395000 -0.224000
+ 0.134000 18.408000 -2.434000 0.134000 18.408000 -2.434000
+ 2.487000 22.420001 -4.646000 2.487000 22.420001 -4.646000
+ 4.838000 26.433001 -6.857000 4.838000 26.433001 -6.857000
-15.219000 -16.880001 13.155000 -15.219000 -16.880001 13.155000
-12.867000 -12.867001 10.944000 -12.867000 -12.867001 10.944000
-10.515000 -8.854001 8.733000 -10.515000 -8.854001 8.733000
-8.164000 -4.841000 6.522000 -8.164000 -4.841000 6.522000
- -5.812010 -0.828000 4.310000 -5.812010 -0.828000 4.310000
- -3.461010 3.184000 2.100000 -3.461010 3.184000 2.100000
- -1.108010 7.197000 -0.112000 -1.108010 7.197000 -0.112000
- 1.242990 11.211001 -2.323000 1.242990 11.211001 -2.323000
- 3.594990 15.223001 -4.534000 3.594990 15.223001 -4.534000
- 5.945990 19.236001 -6.745000 5.945990 19.236001 -6.745000
- 8.297990 23.248001 -8.956000 8.297990 23.248001 -8.956000
+ -5.812000 -0.828000 4.310000 -5.812000 -0.828000 4.310000
+ -3.461000 3.184000 2.100000 -3.461000 3.184000 2.100000
+ -1.108000 7.197000 -0.112000 -1.108000 7.197000 -0.112000
+ 1.243000 11.211000 -2.323000 1.243000 11.211000 -2.323000
+ 3.595000 15.223001 -4.534000 3.595000 15.223001 -4.534000
+ 5.946000 19.236001 -6.745000 5.946000 19.236001 -6.745000
+ 8.298000 23.248001 -8.956000 8.298000 23.248001 -8.956000
-11.758000 -20.064001 11.055000 -11.758000 -20.064001 11.055000
- -9.407000 -16.051000 8.844000 -9.407000 -16.051000 8.844000
+ -9.407000 -16.051001 8.844000 -9.407000 -16.051001 8.844000
-7.055000 -12.039000 6.633000 -7.055000 -12.039000 6.633000
-4.703000 -8.025000 4.422000 -4.703000 -8.025000 4.422000
-2.351000 -4.013000 2.211000 -2.351000 -4.013000 2.211000
- 2.350990 4.013001 -2.211000 2.350990 4.013001 -2.211000
- 4.702990 8.025001 -4.422000 4.702990 8.025001 -4.422000
- 7.054990 12.039001 -6.633000 7.054990 12.039001 -6.633000
- 9.406990 16.051001 -8.844000 9.406990 16.051001 -8.844000
- 11.757990 20.064002 -11.055000 11.757990 20.064002 -11.055000
+ 2.351000 4.013001 -2.211000 2.351000 4.013001 -2.211000
+ 4.703000 8.025001 -4.422000 4.703000 8.025001 -4.422000
+ 7.055000 12.039001 -6.633000 7.055000 12.039001 -6.633000
+ 9.407000 16.051001 -8.844000 9.407000 16.051001 -8.844000
+ 11.758000 20.064001 -11.055000 11.758000 20.064001 -11.055000
-8.298000 -23.248000 8.956000 -8.298000 -23.248000 8.956000
-5.946000 -19.236000 6.745000 -5.946000 -19.236000 6.745000
-3.595000 -15.223000 4.534000 -3.595000 -15.223000 4.534000
-1.243000 -11.211000 2.323000 -1.243000 -11.211000 2.323000
- 1.108000 -7.196999 0.112000 1.108000 -7.196999 0.112000
+ 1.108000 -7.197000 0.112000 1.108000 -7.197000 0.112000
3.461000 -3.183999 -2.100000 3.461000 -3.183999 -2.100000
5.812000 0.828001 -4.310000 5.812000 0.828001 -4.310000
- 8.163990 4.841001 -6.522000 8.163990 4.841001 -6.522000
- 10.514990 8.854001 -8.733000 10.514990 8.854001 -8.733000
- 12.866990 12.867002 -10.944000 12.866990 12.867002 -10.944000
- 15.218990 16.880002 -13.155000 15.218990 16.880002 -13.155000
+ 8.164000 4.841001 -6.522000 8.164000 4.841001 -6.522000
+ 10.515000 8.854001 -8.733000 10.515000 8.854001 -8.733000
+ 12.867000 12.867002 -10.944000 12.867000 12.867002 -10.944000
+ 15.219000 16.880002 -13.155000 15.219000 16.880002 -13.155000
-4.838000 -26.433000 6.857000 -4.838000 -26.433000 6.857000
-2.487000 -22.420000 4.646000 -2.487000 -22.420000 4.646000
-0.134000 -18.408000 2.434000 -0.134000 -18.408000 2.434000
@@ -199,11 +199,11 @@ HBA
4.569000 -10.381999 -1.988000 4.569000 -10.381999 -1.988000
6.920000 -6.368999 -4.199000 6.920000 -6.368999 -4.199000
9.272000 -2.355999 -6.410000 9.272000 -2.355999 -6.410000
- 11.624000 1.656002 -8.621000 11.624000 1.656002 -8.621000
+ 11.624000 1.656001 -8.621000 11.624000 1.656001 -8.621000
13.976000 5.669002 -10.832000 13.976000 5.669002 -10.832000
- 16.326990 9.682002 -13.043000 16.326990 9.682002 -13.043000
- 18.678990 13.695002 -15.254000 18.678990 13.695002 -15.254000
- 0.974000 -25.604999 2.546000 0.974000 -25.604999 2.546000
+ 16.327000 9.682002 -13.043000 16.327000 9.682002 -13.043000
+ 18.679000 13.695002 -15.254000 18.679000 13.695002 -15.254000
+ 0.974000 -25.605000 2.546000 0.974000 -25.605000 2.546000
3.325000 -21.591999 0.335000 3.325000 -21.591999 0.335000
5.678000 -17.579999 -1.876000 5.678000 -17.579999 -1.876000
8.029000 -13.566999 -4.087000 8.029000 -13.566999 -4.087000
@@ -214,7 +214,7 @@ HBA
19.788000 6.498002 -15.143000 19.788000 6.498002 -15.143000
6.786000 -24.776999 -1.764000 6.786000 -24.776999 -1.764000
9.137000 -20.763999 -3.975000 9.137000 -20.763999 -3.975000
- 11.489000 -16.751998 -6.186000 11.489000 -16.751998 -6.186000
+ 11.489000 -16.751999 -6.186000 11.489000 -16.751999 -6.186000
13.841000 -12.738998 -8.397000 13.841000 -12.738998 -8.397000
16.193000 -8.724998 -10.609000 16.193000 -8.724998 -10.609000
18.544000 -4.712998 -12.819000 18.544000 -4.712998 -12.819000
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/FI609-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/FI609-AntennaField.conf
index f0c2e0907cebb8bb86062419f1862e3bdba8d1fc..2fa8e2e3b86dd09064dfaca8c6292366e614c819 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/FI609-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/FI609-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for FI609
-# ITRF2005 target_date = 2013.5
-# Created: 2012-10-09 13:53:51
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:11
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 2136832.728720000 810088.928305000 5935285.442 ]
+3 [ 2136832.692780000 810088.947595000 5935285.453 ]
48 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-0.912000 2.380000 0.004000 -0.912000 2.380000 0.004000
@@ -30,16 +30,16 @@ LBA
4.983000 2.129000 -2.070000 4.983000 2.129000 -2.070000
2.370000 5.066000 -1.534000 2.370000 5.066000 -1.534000
-1.351000 5.633000 -0.280000 -1.351000 5.633000 -0.280000
- -4.441000 3.563999 1.105000 -4.441000 3.563999 1.105000
+ -4.441000 3.564000 1.105000 -4.441000 3.564000 1.105000
-5.451000 -0.173001 1.973000 -5.451000 -0.173001 1.973000
- -3.912000 -3.830001 1.918000 -3.912000 -3.830001 1.918000
+ -3.912000 -3.830000 1.918000 -3.912000 -3.830000 1.918000
-5.729000 -6.740001 2.963000 -5.729000 -6.740001 2.963000
-3.029000 -9.120000 2.320000 -3.029000 -9.120000 2.320000
1.656000 -10.163000 0.786000 1.656000 -10.163000 0.786000
- 7.453000 -6.582000 -1.773000 7.453000 -6.582000 -1.773000
+ 7.453000 -6.581999 -1.773000 7.453000 -6.581999 -1.773000
8.995000 -3.898999 -2.688000 8.995000 -3.898999 -2.688000
9.484000 0.302001 -3.432000 9.484000 0.302001 -3.432000
- 7.595000 4.116000 -3.274000 7.595000 4.116000 -3.274000
+ 7.595000 4.116001 -3.274000 7.595000 4.116001 -3.274000
3.399000 7.992000 -2.299000 3.399000 7.992000 -2.299000
-0.835000 9.824000 -1.033000 -0.835000 9.824000 -1.033000
-4.818000 8.848999 0.523000 -4.818000 8.848999 0.523000
@@ -47,9 +47,9 @@ LBA
-8.480000 1.332999 2.852000 -8.480000 1.332999 2.852000
-7.947000 -3.283001 3.287000 -7.947000 -3.283001 3.287000
-7.781000 -11.260001 4.309000 -7.781000 -11.260001 4.309000
- -4.804000 -13.529001 3.553000 -4.804000 -13.529001 3.553000
+ -4.804000 -13.529000 3.553000 -4.804000 -13.529000 3.553000
-1.861000 -13.806000 2.538000 -1.861000 -13.806000 2.538000
- 5.400000 -12.037000 -0.299000 5.400000 -12.037000 -0.299000
+ 5.400000 -12.036999 -0.299000 5.400000 -12.036999 -0.299000
8.181000 -12.666999 -1.208000 8.181000 -12.666999 -1.208000
11.351000 -6.183999 -3.220000 11.351000 -6.183999 -3.220000
12.344000 -1.308999 -4.236000 12.344000 -1.308999 -4.236000
@@ -78,14 +78,14 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 2136818.697730000 810039.764004000 5935299.217 ]
+3 [ 2136818.661790000 810039.783294000 5935299.227 ]
48 x 2 x 3 [
-19.391000 -15.634702 9.053400 -19.391000 -15.634702 9.053400
-17.585000 -10.985702 7.777400 -17.585000 -10.985702 7.777400
-15.777000 -6.335702 6.500400 -15.777000 -6.335702 6.500400
-13.971000 -1.687702 5.224400 -13.971000 -1.687702 5.224400
--10.356000 7.610299 2.671400 -10.356000 7.610299 2.671400
- -8.549000 12.258299 1.394400 -8.549000 12.258299 1.394400
+-10.356010 7.610299 2.671400 -10.356010 7.610299 2.671400
+ -8.549010 12.258299 1.394400 -8.549010 12.258299 1.394400
-4.934010 21.556299 -1.158600 -4.934010 21.556299 -1.158600
-3.128010 26.204299 -2.434600 -3.128010 26.204299 -2.434600
-14.888000 -17.747702 7.729400 -14.888000 -17.747702 7.729400
@@ -93,16 +93,16 @@ HBA
-11.273000 -8.450701 5.177400 -11.273000 -8.450701 5.177400
-9.467000 -3.801701 3.900400 -9.467000 -3.801701 3.900400
-5.852000 5.495299 1.347400 -5.852000 5.495299 1.347400
- -4.045000 10.145299 0.071400 -4.045000 10.145299 0.071400
+ -4.045010 10.145299 0.071400 -4.045010 10.145299 0.071400
-0.431010 19.442300 -2.481600 -0.431010 19.442300 -2.481600
1.375990 24.091300 -3.758600 1.375990 24.091300 -3.758600
-10.384000 -19.862701 6.406400 -10.384000 -19.862701 6.406400
-8.577000 -15.214701 5.129400 -8.577000 -15.214701 5.129400
-6.770000 -10.564701 3.853400 -6.770000 -10.564701 3.853400
-4.963000 -5.915701 2.576400 -4.963000 -5.915701 2.576400
- -1.349000 3.381299 0.023400 -1.349000 3.381299 0.023400
+ -1.349000 3.381300 0.023400 -1.349000 3.381300 0.023400
0.458000 8.030300 -1.252600 0.458000 8.030300 -1.252600
- 4.073000 17.327300 -3.805600 4.073000 17.327300 -3.805600
+ 4.072990 17.327300 -3.805600 4.072990 17.327300 -3.805600
5.878990 21.976300 -5.082600 5.878990 21.976300 -5.082600
-5.880000 -21.976701 5.082400 -5.880000 -21.976701 5.082400
-4.074000 -17.327701 3.806400 -4.074000 -17.327701 3.806400
@@ -110,22 +110,22 @@ HBA
-0.460000 -8.030700 1.253400 -0.460000 -8.030700 1.253400
3.155000 1.266300 -1.299600 3.155000 1.266300 -1.299600
4.962000 5.916300 -2.576600 4.962000 5.916300 -2.576600
- 8.576000 15.213300 -5.129600 8.576000 15.213300 -5.129600
- 10.383000 19.862300 -6.405600 10.383000 19.862300 -6.405600
- -1.377000 -24.090701 3.758400 -1.377000 -24.090701 3.758400
+ 8.575990 15.213300 -5.129600 8.575990 15.213300 -5.129600
+ 10.382990 19.862301 -6.405600 10.382990 19.862301 -6.405600
+ -1.377000 -24.090700 3.758400 -1.377000 -24.090700 3.758400
0.430000 -19.442700 2.482400 0.430000 -19.442700 2.482400
2.237000 -14.792700 1.205400 2.237000 -14.792700 1.205400
4.044000 -10.144700 -0.070600 4.044000 -10.144700 -0.070600
7.659000 -0.846700 -2.624600 7.659000 -0.846700 -2.624600
- 9.466000 3.801300 -3.900600 9.466000 3.801300 -3.900600
- 13.080000 13.099301 -6.453600 13.080000 13.099301 -6.453600
- 14.888000 17.748301 -7.730600 14.888000 17.748301 -7.730600
+ 9.466000 3.801301 -3.900600 9.466000 3.801301 -3.900600
+ 13.079990 13.099301 -6.453600 13.079990 13.099301 -6.453600
+ 14.887990 17.748301 -7.730600 14.887990 17.748301 -7.730600
3.127000 -26.204700 2.434400 3.127000 -26.204700 2.434400
4.934000 -21.555700 1.158400 4.934000 -21.555700 1.158400
6.741000 -16.907700 -0.118600 6.741000 -16.907700 -0.118600
- 8.549000 -12.258700 -1.394600 8.549000 -12.258700 -1.394600
+ 8.549000 -12.258699 -1.394600 8.549000 -12.258699 -1.394600
12.163000 -2.961699 -3.947600 12.163000 -2.961699 -3.947600
13.969000 1.688301 -5.224600 13.969000 1.688301 -5.224600
17.583000 10.985301 -7.777600 17.583000 10.985301 -7.777600
- 19.391000 15.634301 -9.053600 19.391000 15.634301 -9.053600
+ 19.390990 15.634302 -9.053600 19.390990 15.634302 -9.053600
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/FR606-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/FR606-AntennaField.conf
index c19264b1ed03a507f4ad2f485d6b9ca6abff5f9f..02d9270c3b1654fe8e5f9549519c8031631422ce 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/FR606-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/FR606-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for FR606
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:42
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:11
#
NORMAL_VECTOR LBA
@@ -15,103 +15,103 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 4323979.808680000 165608.773464000 4670303.094 ]
+3 [ 4323979.771620000 165608.826246000 4670303.127 ]
96 x 2 x 3 [
8.683000 8.133001 -8.278000 8.683000 8.133001 -8.278000
9.978000 0.080001 -9.191000 9.978000 0.080001 -9.191000
- 11.227000 6.316001 -10.558000 11.227000 6.316001 -10.558000
- 12.456000 -0.530999 -11.451000 12.456000 -0.530999 -11.451000
--10.375000 -14.580001 10.061000 -10.375000 -14.580001 10.061000
- -8.861000 -20.647001 8.878000 -8.861000 -20.647001 8.878000
--16.448000 -13.353002 15.611000 -16.448000 -13.353002 15.611000
+ 11.227000 6.316002 -10.558000 11.227000 6.316002 -10.558000
+ 12.456000 -0.530998 -11.450990 12.456000 -0.530998 -11.450990
+-10.375000 -14.580000 10.061000 -10.375000 -14.580000 10.061000
+ -8.861000 -20.647000 8.878000 -8.861000 -20.647000 8.878000
+-16.448000 -13.353001 15.611000 -16.448000 -13.353001 15.611000
-16.070000 -18.299001 15.435000 -16.070000 -18.299001 15.435000
- 12.544000 11.285001 -11.943000 12.544000 11.285001 -11.943000
- 12.839000 18.268001 -12.458000 12.839000 18.268001 -12.458000
- 15.747000 18.957001 -15.159000 15.747000 18.957001 -15.159000
- 17.735000 15.741001 -16.878000 17.735000 15.741001 -16.878000
+ 12.544000 11.285002 -11.942990 12.544000 11.285002 -11.942990
+ 12.838990 18.268002 -12.457990 12.838990 18.268002 -12.457990
+ 15.746990 18.957002 -15.158990 15.746990 18.957002 -15.158990
+ 17.735000 15.741002 -16.877990 17.735000 15.741002 -16.877990
-2.404000 -3.304000 2.329000 -2.404000 -3.304000 2.329000
- 1.806000 -3.689000 -1.534000 1.806000 -3.689000 -1.534000
- 2.208000 -7.073000 -1.787000 2.208000 -7.073000 -1.787000
+ 1.806000 -3.688999 -1.534000 1.806000 -3.688999 -1.534000
+ 2.208000 -7.072999 -1.787000 2.208000 -7.072999 -1.787000
-0.854000 -9.379000 1.113000 -0.854000 -9.379000 1.113000
- 4.479000 -8.889000 -3.815000 4.479000 -8.889000 -3.815000
+ 4.479000 -8.888999 -3.815000 4.479000 -8.888999 -3.815000
7.773000 -6.689999 -6.924000 7.773000 -6.689999 -6.924000
- 7.127000 -15.292000 -6.030000 7.127000 -15.292000 -6.030000
- 10.402000 -13.933999 -9.093000 10.402000 -13.933999 -9.093000
--10.263000 16.495999 8.877000 -10.263000 16.495999 8.877000
- -5.986000 23.239999 4.704000 -5.986000 23.239999 4.704000
--14.702000 23.716999 12.712000 -14.702000 23.716999 12.712000
- -6.757000 28.932999 5.215000 -6.757000 28.932999 5.215000
- 3.845000 12.363000 -3.970000 3.845000 12.363000 -3.970000
- 6.746000 13.557000 -6.684000 6.746000 13.557000 -6.684000
- 2.546000 16.297000 -2.911000 2.546000 16.297000 -2.911000
- 2.737000 20.350000 -3.228000 2.737000 20.350000 -3.228000
--15.013000 2.346999 13.743000 -15.013000 2.346999 13.743000
--17.733000 1.130998 16.290000 -17.733000 1.130998 16.290000
--17.089000 11.013998 15.353000 -17.089000 11.013998 15.353000
--21.225000 9.036998 19.230000 -21.225000 9.036998 19.230000
- 6.530000 -19.094000 -5.347000 6.530000 -19.094000 -5.347000
- 2.770000 -23.110000 -1.746000 2.770000 -23.110000 -1.746000
- 4.820000 -32.687000 -3.300000 4.820000 -32.687000 -3.300000
- 8.847000 -29.316999 -7.126000 8.847000 -29.316999 -7.126000
- -5.175000 -0.074001 4.769000 -5.175000 -0.074001 4.769000
- -5.635000 -5.763001 5.390000 -5.635000 -5.763001 5.390000
- -8.114000 0.330999 7.461000 -8.114000 0.330999 7.461000
- -8.988000 -3.154001 8.386000 -8.988000 -3.154001 8.386000
- 18.781000 1.923001 -17.360000 18.781000 1.923001 -17.360000
- 17.131000 -7.838999 -15.501000 17.131000 -7.838999 -15.501000
- 23.037000 -3.724998 -21.083000 23.037000 -3.724998 -21.083000
- 20.305000 -13.490998 -18.227000 20.305000 -13.490998 -18.227000
- -3.506000 6.001000 3.020000 -3.506000 6.001000 3.020000
- -6.410000 6.850999 5.665000 -6.410000 6.850999 5.665000
- -2.211000 10.423000 1.674000 -2.211000 10.423000 1.674000
- -6.067000 10.990999 5.205000 -6.067000 10.990999 5.205000
- -5.358000 -15.871001 5.487000 -5.358000 -15.871001 5.487000
--12.935000 10.852999 11.533000 -12.935000 10.852999 11.533000
- -8.926000 -25.618001 9.111000 -8.926000 -25.618001 9.111000
- 0.349000 -21.865000 0.441000 0.349000 -21.865000 0.441000
- 0.615000 25.387000 -1.450000 0.615000 25.387000 -1.450000
--18.983000 18.839998 16.825000 -18.983000 18.839998 16.825000
+ 7.127000 -15.291999 -6.030000 7.127000 -15.291999 -6.030000
+ 10.402000 -13.933999 -9.092990 10.402000 -13.933999 -9.092990
+-10.263010 16.496000 8.877000 -10.263010 16.496000 8.877000
+ -5.986010 23.240000 4.704000 -5.986010 23.240000 4.704000
+-14.702010 23.716999 12.712000 -14.702010 23.716999 12.712000
+ -6.757010 28.933000 5.215000 -6.757010 28.933000 5.215000
+ 3.844990 12.363001 -3.970000 3.844990 12.363001 -3.970000
+ 6.745990 13.557001 -6.684000 6.745990 13.557001 -6.684000
+ 2.545990 16.297001 -2.911000 2.545990 16.297001 -2.911000
+ 2.736990 20.350001 -3.228000 2.736990 20.350001 -3.228000
+-15.013010 2.346999 13.743000 -15.013010 2.346999 13.743000
+-17.733010 1.130999 16.290000 -17.733010 1.130999 16.290000
+-17.089010 11.013999 15.353000 -17.089010 11.013999 15.353000
+-21.225010 9.036998 19.230000 -21.225010 9.036998 19.230000
+ 6.530000 -19.093999 -5.347000 6.530000 -19.093999 -5.347000
+ 2.770000 -23.109999 -1.746000 2.770000 -23.109999 -1.746000
+ 4.820000 -32.686999 -3.300000 4.820000 -32.686999 -3.300000
+ 8.847000 -29.316999 -7.125990 8.847000 -29.316999 -7.125990
+ -5.175000 -0.074000 4.769000 -5.175000 -0.074000 4.769000
+ -5.635000 -5.763000 5.390000 -5.635000 -5.763000 5.390000
+ -8.114000 0.331000 7.461000 -8.114000 0.331000 7.461000
+ -8.988000 -3.154000 8.386000 -8.988000 -3.154000 8.386000
+ 18.781000 1.923002 -17.359990 18.781000 1.923002 -17.359990
+ 17.131000 -7.838998 -15.500990 17.131000 -7.838998 -15.500990
+ 23.037000 -3.724997 -21.082990 23.037000 -3.724997 -21.082990
+ 20.305000 -13.490998 -18.226990 20.305000 -13.490998 -18.226990
+ -3.506010 6.001000 3.020000 -3.506010 6.001000 3.020000
+ -6.410010 6.851000 5.665000 -6.410010 6.851000 5.665000
+ -2.211010 10.423000 1.674000 -2.211010 10.423000 1.674000
+ -6.067010 10.991000 5.205000 -6.067010 10.991000 5.205000
+ -5.358000 -15.871000 5.487000 -5.358000 -15.871000 5.487000
+-12.935010 10.852999 11.533000 -12.935010 10.852999 11.533000
+ -8.926000 -25.618000 9.111000 -8.926000 -25.618000 9.111000
+ 0.349000 -21.864999 0.441000 0.349000 -21.864999 0.441000
+ 0.614990 25.387001 -1.450000 0.614990 25.387001 -1.450000
+-18.983010 18.839999 16.825000 -18.983010 18.839999 16.825000
-1.657000 -28.874000 2.531000 -1.657000 -28.874000 2.531000
-3.127000 -6.545000 3.108000 -3.127000 -6.545000 3.108000
- 20.828000 8.188002 -19.464000 20.828000 8.188002 -19.464000
- -2.571000 20.109000 1.668000 -2.571000 20.109000 1.668000
- 8.841000 16.216001 -8.705000 8.841000 16.216001 -8.705000
--22.595000 -0.530002 20.824000 -22.595000 -0.530002 20.824000
--11.357000 7.312999 10.203000 -11.357000 7.312999 10.203000
- -3.962000 16.800000 3.064000 -3.962000 16.800000 3.064000
- 14.127000 -6.357999 -12.787000 14.127000 -6.357999 -12.787000
- 4.832000 -2.195000 -4.373000 4.832000 -2.195000 -4.373000
- -7.509000 -10.630001 7.285000 -7.509000 -10.630001 7.285000
- 4.656000 4.764000 -4.453000 4.656000 4.764000 -4.453000
--16.625000 -4.477002 15.465000 -16.625000 -4.477002 15.465000
+ 20.828000 8.188002 -19.463990 20.828000 8.188002 -19.463990
+ -2.571010 20.109000 1.668000 -2.571010 20.109000 1.668000
+ 8.840990 16.216001 -8.705000 8.840990 16.216001 -8.705000
+-22.595010 -0.530002 20.824000 -22.595010 -0.530002 20.824000
+-11.357010 7.312999 10.203000 -11.357010 7.312999 10.203000
+ -3.962010 16.800000 3.064000 -3.962010 16.800000 3.064000
+ 14.127000 -6.357998 -12.786990 14.127000 -6.357998 -12.786990
+ 4.832000 -2.194999 -4.373000 4.832000 -2.194999 -4.373000
+ -7.509000 -10.630000 7.285000 -7.509000 -10.630000 7.285000
+ 4.656000 4.764001 -4.453000 4.656000 4.764001 -4.453000
+-16.625000 -4.477001 15.465000 -16.625000 -4.477001 15.465000
-11.686000 -0.973001 10.795000 -11.686000 -0.973001 10.795000
- 6.505000 22.192000 -6.762000 6.505000 22.192000 -6.762000
- 8.943000 22.638001 -9.022000 8.943000 22.638001 -9.022000
- 0.671000 4.982000 -0.791000 0.671000 4.982000 -0.791000
- 15.296000 2.256001 -14.163000 15.296000 2.256001 -14.163000
- -8.790000 5.130999 7.916000 -8.790000 5.130999 7.916000
- 0.464000 -16.739000 0.156000 0.464000 -16.739000 0.156000
- -9.833000 -8.969001 9.367000 -9.833000 -8.969001 9.367000
+ 6.504990 22.192001 -6.762000 6.504990 22.192001 -6.762000
+ 8.942990 22.638001 -9.022000 8.942990 22.638001 -9.022000
+ 0.671000 4.982001 -0.791000 0.671000 4.982001 -0.791000
+ 15.296000 2.256002 -14.162990 15.296000 2.256002 -14.162990
+ -8.790010 5.131000 7.916000 -8.790010 5.131000 7.916000
+ 0.464000 -16.738999 0.156000 0.464000 -16.738999 0.156000
+ -9.833000 -8.969000 9.367000 -9.833000 -8.969000 9.367000
-4.140000 -27.526000 4.771000 -4.140000 -27.526000 4.771000
- 3.103000 8.910000 -3.167000 3.103000 8.910000 -3.167000
- -9.114000 11.392999 7.996000 -9.114000 11.392999 7.996000
- 15.200000 9.984001 -14.344000 15.200000 9.984001 -14.344000
- 14.680000 -15.450999 -12.979000 14.680000 -15.450999 -12.979000
- 10.801000 -9.190999 -9.626000 10.801000 -9.190999 -9.626000
- -5.558000 -20.192001 5.821000 -5.558000 -20.192001 5.821000
- 4.638000 -13.344000 -3.806000 4.638000 -13.344000 -3.806000
- 3.465000 1.550000 -3.244000 3.465000 1.550000 -3.244000
--14.062000 18.598999 12.301000 -14.062000 18.598999 12.301000
+ 3.102990 8.910001 -3.167000 3.102990 8.910001 -3.167000
+ -9.114010 11.393000 7.996000 -9.114010 11.393000 7.996000
+ 15.200000 9.984002 -14.343990 15.200000 9.984002 -14.343990
+ 14.680000 -15.450998 -12.978990 14.680000 -15.450998 -12.978990
+ 10.801000 -9.190999 -9.625990 10.801000 -9.190999 -9.625990
+ -5.558000 -20.192000 5.821000 -5.558000 -20.192000 5.821000
+ 4.638000 -13.343999 -3.806000 4.638000 -13.343999 -3.806000
+ 3.465000 1.550001 -3.244000 3.465000 1.550001 -3.244000
+-14.062010 18.598999 12.301000 -14.062010 18.598999 12.301000
-3.403000 2.441000 3.049000 -3.403000 2.441000 3.049000
-21.572000 -11.331002 20.259000 -21.572000 -11.331002 20.259000
-15.361000 -7.472001 14.405000 -15.361000 -7.472001 14.405000
- 7.224000 -3.301000 -6.537000 7.224000 -3.301000 -6.537000
- 16.416000 -22.888999 -14.319000 16.416000 -22.888999 -14.319000
- 7.175000 5.288000 -6.790000 7.175000 5.288000 -6.790000
- -1.214000 27.533000 0.160000 -1.214000 27.533000 0.160000
- 10.085000 -20.276999 -8.581000 10.085000 -20.276999 -8.581000
- 0.531000 8.454000 -0.783000 0.531000 8.454000 -0.783000
- -1.342000 13.691000 0.759000 -1.342000 13.691000 0.759000
+ 7.224000 -3.300999 -6.537000 7.224000 -3.300999 -6.537000
+ 16.416000 -22.888998 -14.318990 16.416000 -22.888998 -14.318990
+ 7.175000 5.288001 -6.790000 7.175000 5.288001 -6.790000
+ -1.214010 27.533000 0.160000 -1.214010 27.533000 0.160000
+ 10.085000 -20.276999 -8.580990 10.085000 -20.276999 -8.580990
+ 0.530990 8.454001 -0.783000 0.530990 8.454001 -0.783000
+ -1.342010 13.691000 0.759000 -1.342010 13.691000 0.759000
-0.972000 -12.794000 1.341000 -0.972000 -12.794000 1.341000
]
@@ -126,51 +126,51 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 4324016.707690000 165545.525467000 4670271.363 ]
+3 [ 4324016.670620000 165545.578250000 4670271.396 ]
96 x 2 x 3 [
--12.622010 22.182999 10.850000 -12.622010 22.182999 10.850000
- -8.989010 23.520999 7.454000 -8.989010 23.520999 7.454000
- -5.355010 24.857999 4.058000 -5.355010 24.857999 4.058000
- -1.722010 26.195000 0.663000 -1.722010 26.195000 0.663000
- 1.911990 27.532000 -2.733000 1.911990 27.532000 -2.733000
--15.185010 15.874999 13.434000 -15.185010 15.874999 13.434000
--11.551010 17.210999 10.038000 -11.551010 17.210999 10.038000
- -7.918010 18.548999 6.643000 -7.918010 18.548999 6.643000
- -4.284010 19.886000 3.247000 -4.284010 19.886000 3.247000
- -0.650010 21.223000 -0.149000 -0.650010 21.223000 -0.149000
- 2.982990 22.561000 -3.545000 2.982990 22.561000 -3.545000
- 6.616990 23.898000 -6.941000 6.616990 23.898000 -6.941000
--17.748010 9.565998 16.018000 -17.748010 9.565998 16.018000
--14.114010 10.902999 12.622000 -14.114010 10.902999 12.622000
--10.480010 12.240999 9.226000 -10.480010 12.240999 9.226000
- -6.847010 13.577999 5.831000 -6.847010 13.577999 5.831000
- -3.213010 14.914000 2.435000 -3.213010 14.914000 2.435000
- 0.420990 16.252000 -0.961000 0.420990 16.252000 -0.961000
- 4.053990 17.589000 -4.357000 4.053990 17.589000 -4.357000
- 7.687990 18.926001 -7.752000 7.687990 18.926001 -7.752000
- 11.320990 20.263001 -11.147990 11.320990 20.263001 -11.147990
--20.310010 3.256998 18.602000 -20.310010 3.256998 18.602000
--16.677010 4.593999 15.207000 -16.677010 4.593999 15.207000
--13.043010 5.931999 11.811000 -13.043010 5.931999 11.811000
- -9.409010 7.268999 8.415000 -9.409010 7.268999 8.415000
- -5.775010 8.605999 5.019000 -5.775010 8.605999 5.019000
- -2.142010 9.944000 1.624000 -2.142010 9.944000 1.624000
- 1.490990 11.281000 -1.772000 1.490990 11.281000 -1.772000
- 5.124990 12.617000 -5.168000 5.124990 12.617000 -5.168000
- 8.758990 13.954001 -8.564000 8.758990 13.954001 -8.564000
- 12.391990 15.292001 -11.958990 12.391990 15.292001 -11.958990
- 16.025990 16.629001 -15.354990 16.025990 16.629001 -15.354990
--19.239010 -1.715002 17.790000 -19.239010 -1.715002 17.790000
--15.605010 -0.377001 14.395000 -15.605010 -0.377001 14.395000
--11.972010 0.959999 10.999000 -11.972010 0.959999 10.999000
- -8.338010 2.296999 7.603000 -8.338010 2.296999 7.603000
- -4.705010 3.634000 4.207000 -4.705010 3.634000 4.207000
+-12.622000 22.182999 10.850000 -12.622000 22.182999 10.850000
+ -8.989000 23.520999 7.454000 -8.989000 23.520999 7.454000
+ -5.355000 24.857999 4.058000 -5.355000 24.857999 4.058000
+ -1.722000 26.195000 0.663000 -1.722000 26.195000 0.663000
+ 1.912000 27.532000 -2.733000 1.912000 27.532000 -2.733000
+-15.185000 15.874999 13.434000 -15.185000 15.874999 13.434000
+-11.551000 17.210999 10.038000 -11.551000 17.210999 10.038000
+ -7.918000 18.548999 6.643000 -7.918000 18.548999 6.643000
+ -4.284000 19.886000 3.247000 -4.284000 19.886000 3.247000
+ -0.650000 21.223000 -0.149000 -0.650000 21.223000 -0.149000
+ 2.983000 22.561000 -3.545000 2.983000 22.561000 -3.545000
+ 6.617000 23.898001 -6.941000 6.617000 23.898001 -6.941000
+-17.748000 9.565998 16.018000 -17.748000 9.565998 16.018000
+-14.114000 10.902999 12.622000 -14.114000 10.902999 12.622000
+-10.480000 12.240999 9.226000 -10.480000 12.240999 9.226000
+ -6.847000 13.577999 5.831000 -6.847000 13.577999 5.831000
+ -3.213000 14.914000 2.435000 -3.213000 14.914000 2.435000
+ 0.421000 16.252000 -0.961000 0.421000 16.252000 -0.961000
+ 4.054000 17.589000 -4.357000 4.054000 17.589000 -4.357000
+ 7.688000 18.926001 -7.752000 7.688000 18.926001 -7.752000
+ 11.321000 20.263001 -11.148000 11.321000 20.263001 -11.148000
+-20.310000 3.256998 18.602000 -20.310000 3.256998 18.602000
+-16.677000 4.593998 15.207000 -16.677000 4.593998 15.207000
+-13.043000 5.931999 11.811000 -13.043000 5.931999 11.811000
+ -9.409000 7.268999 8.415000 -9.409000 7.268999 8.415000
+ -5.775000 8.605999 5.019000 -5.775000 8.605999 5.019000
+ -2.142000 9.944000 1.624000 -2.142000 9.944000 1.624000
+ 1.491000 11.281000 -1.772000 1.491000 11.281000 -1.772000
+ 5.125000 12.617000 -5.168000 5.125000 12.617000 -5.168000
+ 8.759000 13.954001 -8.564000 8.759000 13.954001 -8.564000
+ 12.392000 15.292001 -11.959000 12.392000 15.292001 -11.959000
+ 16.026000 16.629001 -15.355000 16.026000 16.629001 -15.355000
+-19.239000 -1.715002 17.790000 -19.239000 -1.715002 17.790000
+-15.605000 -0.377002 14.395000 -15.605000 -0.377002 14.395000
+-11.972000 0.959999 10.999000 -11.972000 0.959999 10.999000
+ -8.338000 2.296999 7.603000 -8.338000 2.296999 7.603000
+ -4.705000 3.634000 4.207000 -4.705000 3.634000 4.207000
-1.071000 4.972000 0.811000 -1.071000 4.972000 0.811000
2.562000 6.309000 -2.584000 2.562000 6.309000 -2.584000
- 6.196000 7.646000 -5.980000 6.196000 7.646000 -5.980000
- 9.830000 8.983001 -9.375990 9.830000 8.983001 -9.375990
- 13.464000 10.320001 -12.771990 13.464000 10.320001 -12.771990
- 17.097000 11.657001 -16.167990 17.097000 11.657001 -16.167990
+ 6.196000 7.646001 -5.980000 6.196000 7.646001 -5.980000
+ 9.830000 8.983001 -9.376000 9.830000 8.983001 -9.376000
+ 13.464000 10.320001 -12.772000 13.464000 10.320001 -12.772000
+ 17.097000 11.657002 -16.168000 17.097000 11.657002 -16.168000
-18.168000 -6.685002 16.979000 -18.168000 -6.685002 16.979000
-14.534000 -5.349001 13.583000 -14.534000 -5.349001 13.583000
-10.901000 -4.012001 10.187000 -10.901000 -4.012001 10.187000
@@ -178,10 +178,10 @@ HBA
-3.634000 -1.337000 3.396000 -3.634000 -1.337000 3.396000
3.634000 1.337000 -3.396000 3.634000 1.337000 -3.396000
7.268000 2.675001 -6.792000 7.268000 2.675001 -6.792000
- 10.901000 4.012001 -10.186990 10.901000 4.012001 -10.186990
- 14.534000 5.349001 -13.582990 14.534000 5.349001 -13.582990
- 18.168000 6.685001 -16.978990 18.168000 6.685001 -16.978990
--17.097000 -11.657001 16.168000 -17.097000 -11.657001 16.168000
+ 10.901000 4.012001 -10.187000 10.901000 4.012001 -10.187000
+ 14.534000 5.349001 -13.583000 14.534000 5.349001 -13.583000
+ 18.168000 6.685002 -16.979000 18.168000 6.685002 -16.979000
+-17.097000 -11.657002 16.168000 -17.097000 -11.657002 16.168000
-13.464000 -10.320001 12.772000 -13.464000 -10.320001 12.772000
-9.830000 -8.983001 9.376000 -9.830000 -8.983001 9.376000
-6.196000 -7.646001 5.980000 -6.196000 -7.646001 5.980000
@@ -189,39 +189,39 @@ HBA
1.071000 -4.972000 -0.811000 1.071000 -4.972000 -0.811000
4.705000 -3.634000 -4.207000 4.705000 -3.634000 -4.207000
8.338000 -2.296999 -7.603000 8.338000 -2.296999 -7.603000
- 11.972000 -0.959999 -10.998990 11.972000 -0.959999 -10.998990
- 15.605000 0.377001 -14.394990 15.605000 0.377001 -14.394990
- 19.239000 1.715002 -17.789990 19.239000 1.715002 -17.789990
--16.026000 -16.629001 15.355000 -16.026000 -16.629001 15.355000
+ 11.972000 -0.959999 -10.999000 11.972000 -0.959999 -10.999000
+ 15.605010 0.377001 -14.395000 15.605010 0.377001 -14.395000
+ 19.239010 1.715002 -17.790000 19.239010 1.715002 -17.790000
+-16.026000 -16.629002 15.355000 -16.026000 -16.629002 15.355000
-12.392000 -15.292001 11.959000 -12.392000 -15.292001 11.959000
-8.759000 -13.954001 8.564000 -8.759000 -13.954001 8.564000
- -5.125000 -12.617000 5.168000 -5.125000 -12.617000 5.168000
- -1.491000 -11.281000 1.772000 -1.491000 -11.281000 1.772000
- 2.142000 -9.944000 -1.624000 2.142000 -9.944000 -1.624000
- 5.775000 -8.606000 -5.019000 5.775000 -8.606000 -5.019000
- 9.409000 -7.268999 -8.414990 9.409000 -7.268999 -8.414990
- 13.043000 -5.931999 -11.810990 13.043000 -5.931999 -11.810990
- 16.677000 -4.593999 -15.206990 16.677000 -4.593999 -15.206990
- 20.310000 -3.256998 -18.601990 20.310000 -3.256998 -18.601990
--11.321000 -20.263001 11.148000 -11.321000 -20.263001 11.148000
- -7.688000 -18.926001 7.752000 -7.688000 -18.926001 7.752000
- -4.054000 -17.589000 4.357000 -4.054000 -17.589000 4.357000
- -0.421000 -16.252000 0.961000 -0.421000 -16.252000 0.961000
- 3.213000 -14.914000 -2.435000 3.213000 -14.914000 -2.435000
- 6.847000 -13.577999 -5.831000 6.847000 -13.577999 -5.831000
- 10.480000 -12.240999 -9.225990 10.480000 -12.240999 -9.225990
- 14.114000 -10.902999 -12.621990 14.114000 -10.902999 -12.621990
- 17.748000 -9.565999 -16.017990 17.748000 -9.565999 -16.017990
- -6.617000 -23.898001 6.941000 -6.617000 -23.898001 6.941000
- -2.983000 -22.561000 3.545000 -2.983000 -22.561000 3.545000
- 0.650000 -21.223000 0.149000 0.650000 -21.223000 0.149000
- 4.284000 -19.886000 -3.247000 4.284000 -19.886000 -3.247000
- 7.918000 -18.548999 -6.642990 7.918000 -18.548999 -6.642990
- 11.551000 -17.210999 -10.037990 11.551000 -17.210999 -10.037990
- 15.185000 -15.874999 -13.433990 15.185000 -15.874999 -13.433990
- -1.912000 -27.532000 2.733000 -1.912000 -27.532000 2.733000
- 1.722000 -26.195000 -0.663000 1.722000 -26.195000 -0.663000
- 5.355000 -24.858000 -4.058000 5.355000 -24.858000 -4.058000
- 8.989000 -23.520999 -7.453990 8.989000 -23.520999 -7.453990
- 12.622000 -22.182999 -10.849990 12.622000 -22.182999 -10.849990
+ -5.124990 -12.617001 5.168000 -5.124990 -12.617001 5.168000
+ -1.490990 -11.281000 1.772000 -1.490990 -11.281000 1.772000
+ 2.142010 -9.944000 -1.624000 2.142010 -9.944000 -1.624000
+ 5.775010 -8.605999 -5.019000 5.775010 -8.605999 -5.019000
+ 9.409010 -7.268999 -8.415000 9.409010 -7.268999 -8.415000
+ 13.043010 -5.931999 -11.811000 13.043010 -5.931999 -11.811000
+ 16.677010 -4.593998 -15.207000 16.677010 -4.593998 -15.207000
+ 20.310010 -3.256998 -18.602000 20.310010 -3.256998 -18.602000
+-11.320990 -20.263001 11.148000 -11.320990 -20.263001 11.148000
+ -7.687990 -18.926001 7.752000 -7.687990 -18.926001 7.752000
+ -4.053990 -17.589000 4.357000 -4.053990 -17.589000 4.357000
+ -0.420990 -16.252000 0.961000 -0.420990 -16.252000 0.961000
+ 3.213010 -14.914000 -2.435000 3.213010 -14.914000 -2.435000
+ 6.847010 -13.577999 -5.831000 6.847010 -13.577999 -5.831000
+ 10.480010 -12.240999 -9.226000 10.480010 -12.240999 -9.226000
+ 14.114010 -10.902999 -12.622000 14.114010 -10.902999 -12.622000
+ 17.748010 -9.565998 -16.018000 17.748010 -9.565998 -16.018000
+ -6.616990 -23.898001 6.941000 -6.616990 -23.898001 6.941000
+ -2.982990 -22.561000 3.545000 -2.982990 -22.561000 3.545000
+ 0.650010 -21.223000 0.149000 0.650010 -21.223000 0.149000
+ 4.284010 -19.886000 -3.247000 4.284010 -19.886000 -3.247000
+ 7.918010 -18.548999 -6.643000 7.918010 -18.548999 -6.643000
+ 11.551010 -17.210999 -10.038000 11.551010 -17.210999 -10.038000
+ 15.185010 -15.874999 -13.434000 15.185010 -15.874999 -13.434000
+ -1.911990 -27.532000 2.733000 -1.911990 -27.532000 2.733000
+ 1.722010 -26.195000 -0.663000 1.722010 -26.195000 -0.663000
+ 5.355010 -24.858000 -4.058000 5.355010 -24.858000 -4.058000
+ 8.989010 -23.520999 -7.454000 8.989010 -23.520999 -7.454000
+ 12.622010 -22.182999 -10.850000 12.622010 -22.182999 -10.850000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS106-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS106-AntennaField.conf
index 928db49cf41f78591e95cfa7956ad0e29612e554..5ed31019ed5d98016e844c09620bf840d29283a7 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS106-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS106-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS106
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:42
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:11
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3829261.424550000 469162.284861000 5062137.310 ]
+3 [ 3829261.381090000 469162.332332000 5062137.339 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
- 2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
- 1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
+ 2.019000 0.243001 -1.538000 2.019000 0.243001 -1.538000
+ 1.338000 -2.104999 -0.814000 1.338000 -2.104999 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- 4.079000 2.490000 -3.287000 4.079000 2.490000 -3.287000
- 4.553000 -1.450000 -3.287000 4.553000 -1.450000 -3.287000
- 2.897000 -4.710000 -1.749000 2.897000 -4.710000 -1.749000
+ 4.079000 2.490001 -3.287000 4.079000 2.490001 -3.287000
+ 4.553000 -1.449999 -3.287000 4.553000 -1.449999 -3.287000
+ 2.897000 -4.709999 -1.749000 2.897000 -4.709999 -1.749000
-0.114000 -5.767000 0.607000 -0.114000 -5.767000 0.607000
-3.073000 -4.125000 2.679000 -3.073000 -4.125000 2.679000
- -4.593000 -0.553001 3.498000 -4.593000 -0.553001 3.498000
- -3.965000 3.276999 2.680000 -3.965000 3.276999 2.680000
+ -4.593000 -0.553000 3.498000 -4.593000 -0.553000 3.498000
+ -3.965000 3.277000 2.680000 -3.965000 3.277000 2.680000
-1.481000 5.575000 0.607000 -1.481000 5.575000 0.607000
- 1.696000 5.264000 -1.749000 1.696000 5.264000 -1.749000
- 3.325000 8.094000 -3.227000 3.325000 8.094000 -3.227000
- 5.895000 6.174000 -4.983000 5.895000 6.174000 -4.983000
- 8.055000 1.789000 -6.208000 8.055000 1.789000 -6.208000
- 7.100000 -5.296000 -4.851000 7.100000 -5.296000 -4.851000
- 5.558000 -7.771000 -3.469000 5.558000 -7.771000 -3.469000
- 2.574000 -9.698000 -1.056000 2.574000 -9.698000 -1.056000
+ 1.696000 5.264001 -1.749000 1.696000 5.264001 -1.749000
+ 3.325000 8.094001 -3.227000 3.325000 8.094001 -3.227000
+ 5.895000 6.174001 -4.983000 5.895000 6.174001 -4.983000
+ 8.055000 1.789001 -6.208000 8.055000 1.789001 -6.208000
+ 7.100000 -5.295999 -4.851000 7.100000 -5.295999 -4.851000
+ 5.558000 -7.770999 -3.469000 5.558000 -7.770999 -3.469000
+ 2.574000 -9.697999 -1.056000 2.574000 -9.697999 -1.056000
-0.823000 -9.088000 1.439000 -0.823000 -9.088000 1.439000
- -4.947000 -6.164001 4.270000 -4.947000 -6.164001 4.270000
- -7.561000 -2.503001 5.902000 -7.561000 -2.503001 5.902000
- -8.010000 1.856999 5.845000 -8.010000 1.856999 5.845000
- -6.423000 5.147999 4.356000 -6.423000 5.147999 4.356000
- -3.496000 8.124999 1.890000 -3.496000 8.124999 1.890000
+ -4.947000 -6.164000 4.270000 -4.947000 -6.164000 4.270000
+ -7.561000 -2.503000 5.902000 -7.561000 -2.503000 5.902000
+ -8.010000 1.857000 5.845000 -8.010000 1.857000 5.845000
+ -6.423000 5.148000 4.356000 -6.423000 5.148000 4.356000
+ -3.496000 8.125000 1.890000 -3.496000 8.125000 1.890000
0.098000 9.160000 -0.901000 0.098000 9.160000 -0.901000
- 6.085000 11.711000 -5.626000 6.085000 11.711000 -5.626000
+ 6.085000 11.711001 -5.626000 6.085000 11.711001 -5.626000
8.653000 9.473001 -7.351000 8.653000 9.473001 -7.351000
9.729000 6.591001 -7.898000 9.729000 6.591001 -7.898000
10.555000 -1.357999 -7.800000 10.555000 -1.357999 -7.800000
- 11.846000 -3.957999 -8.534000 11.846000 -3.957999 -8.534000
- 7.953000 -9.375000 -5.122000 7.953000 -9.375000 -5.122000
- 4.619000 -12.043000 -2.378000 4.619000 -12.043000 -2.378000
- 1.254000 -15.057000 0.420000 1.254000 -15.057000 0.420000
+ 11.846000 -3.957998 -8.534000 11.846000 -3.957998 -8.534000
+ 7.953000 -9.374999 -5.122000 7.953000 -9.374999 -5.122000
+ 4.619000 -12.042999 -2.378000 4.619000 -12.042999 -2.378000
+ 1.254000 -15.056999 0.420000 1.254000 -15.056999 0.420000
-1.108000 -13.300000 2.034000 -1.108000 -13.300000 2.034000
- -4.648000 -11.324001 4.512000 -4.648000 -11.324001 4.512000
- -8.914000 -6.506001 7.279000 -8.914000 -6.506001 7.279000
+ -4.648000 -11.324000 4.512000 -4.648000 -11.324000 4.512000
+ -8.914000 -6.506000 7.279000 -8.914000 -6.506000 7.279000
-10.281000 -4.219001 8.099000 -10.281000 -4.219001 8.099000
-10.622000 1.094999 7.874000 -10.622000 1.094999 7.874000
-11.584000 5.119999 8.232000 -11.584000 5.119999 8.232000
- -6.993000 11.547999 4.205000 -6.993000 11.547999 4.205000
- -4.144000 13.144999 1.922000 -4.144000 13.144999 1.922000
+ -6.993000 11.548000 4.205000 -6.993000 11.548000 4.205000
+ -4.144000 13.145000 1.922000 -4.144000 13.145000 1.922000
0.066000 14.419000 -1.353000 0.066000 14.419000 -1.353000
--46.335000 17.673996 33.182000 -46.335000 17.673996 33.182000
+-46.335010 17.673996 33.181990 -46.335010 17.673996 33.181990
11.383990 57.565001 -13.748000 11.383990 57.565001 -13.748000
- 2.611000 17.408000 -3.533000 2.611000 17.408000 -3.533000
- 4.638000 19.009000 -5.200000 4.638000 19.009000 -5.200000
- 14.358000 8.711001 -11.565000 14.358000 8.711001 -11.565000
- 15.030000 -7.363999 -10.616000 15.030000 -7.363999 -10.616000
- 13.860000 -11.972999 -9.321000 13.860000 -11.972999 -9.321000
- 5.393000 -17.343000 -2.480000 5.393000 -17.343000 -2.480000
- -5.242000 -16.244001 5.403000 -5.242000 -16.244001 5.403000
+ 2.611000 17.408001 -3.533000 2.611000 17.408001 -3.533000
+ 4.638000 19.009001 -5.200000 4.638000 19.009001 -5.200000
+ 14.358000 8.711002 -11.565000 14.358000 8.711002 -11.565000
+ 15.030000 -7.363998 -10.616000 15.030000 -7.363998 -10.616000
+ 13.860000 -11.972998 -9.321000 13.860000 -11.972998 -9.321000
+ 5.393000 -17.342999 -2.480000 5.393000 -17.342999 -2.480000
+ -5.242000 -16.244000 5.403000 -5.242000 -16.244000 5.403000
-11.414000 -13.831001 9.818000 -11.414000 -13.831001 9.818000
-14.458000 0.234999 10.831000 -14.458000 0.234999 10.831000
-14.758000 8.385999 10.320000 -14.758000 8.385999 10.320000
-9.310000 15.253999 5.609000 -9.310000 15.253999 5.609000
- -8.039000 23.172999 3.939000 -8.039000 23.172999 3.939000
- 2.247000 24.576000 -3.908000 2.247000 24.576000 -3.908000
- 11.966000 19.631001 -10.756000 11.966000 19.631001 -10.756000
- 15.751000 15.269001 -13.203000 15.751000 15.269001 -13.203000
- 19.928000 8.381001 -15.716000 19.928000 8.381001 -15.716000
- 18.162000 -8.927999 -12.826000 18.162000 -8.927999 -12.826000
- 15.488000 -15.960999 -10.183000 15.488000 -15.960999 -10.183000
- 7.405000 -24.872000 -3.310000 7.405000 -24.872000 -3.310000
- -3.977000 -24.282001 5.180000 -3.977000 -24.282001 5.180000
+ -8.039010 23.173000 3.939000 -8.039010 23.173000 3.939000
+ 2.246990 24.576001 -3.908000 2.246990 24.576001 -3.908000
+ 11.966000 19.631002 -10.756000 11.966000 19.631002 -10.756000
+ 15.751000 15.269002 -13.203000 15.751000 15.269002 -13.203000
+ 19.928000 8.381002 -15.716000 19.928000 8.381002 -15.716000
+ 18.162000 -8.927998 -12.826000 18.162000 -8.927998 -12.826000
+ 15.488000 -15.960998 -10.183000 15.488000 -15.960998 -10.183000
+ 7.405000 -24.871999 -3.310000 7.405000 -24.871999 -3.310000
+ -3.977000 -24.282000 5.180000 -3.977000 -24.282000 5.180000
-11.131000 -21.194001 10.271000 -11.131000 -21.194001 10.271000
--16.975000 -11.649002 13.794000 -16.975000 -11.649002 13.794000
+-16.975000 -11.649001 13.794000 -16.975000 -11.649001 13.794000
-21.572000 3.661998 15.861000 -21.572000 3.661998 15.861000
--15.823000 19.435998 10.120000 -15.823000 19.435998 10.120000
--11.836000 32.002999 5.991000 -11.836000 32.002999 5.991000
- 0.101000 31.247000 -2.900000 0.101000 31.247000 -2.900000
+-15.823010 19.435999 10.120000 -15.823010 19.435999 10.120000
+-11.836010 32.002999 5.991000 -11.836010 32.002999 5.991000
+ 0.100990 31.247000 -2.900000 0.100990 31.247000 -2.900000
11.458000 26.949001 -11.036000 11.458000 26.949001 -11.036000
- 17.292000 23.246001 -15.080000 17.292000 23.246001 -15.080000
- 24.497000 6.208002 -18.949000 24.497000 6.208002 -18.949000
- 26.158000 -11.760998 -18.572000 26.158000 -11.760998 -18.572000
+ 17.292000 23.246002 -15.080000 17.292000 23.246002 -15.080000
+ 24.497000 6.208003 -18.949000 24.497000 6.208003 -18.949000
+ 26.158000 -11.760997 -18.572000 26.158000 -11.760997 -18.572000
21.558000 -22.275998 -14.168000 21.558000 -22.275998 -14.168000
- 14.462000 -24.832999 -8.611000 14.462000 -24.832999 -8.611000
- 5.553000 -33.729000 -1.119000 5.553000 -33.729000 -1.119000
+ 14.462000 -24.832998 -8.611000 14.462000 -24.832998 -8.611000
+ 5.553000 -33.728999 -1.119000 5.553000 -33.728999 -1.119000
-9.613000 -30.959001 10.014000 -9.613000 -30.959001 10.014000
--15.886000 -26.187002 14.291000 -15.886000 -26.187002 14.291000
+-15.886000 -26.187001 14.291000 -15.886000 -26.187001 14.291000
-24.716000 -14.105002 19.827000 -24.716000 -14.105002 19.827000
-25.169000 -5.898002 19.425000 -25.169000 -5.898002 19.425000
--24.556000 14.570998 17.115000 -24.556000 14.570998 17.115000
--20.355000 18.467998 13.610000 -20.355000 18.467998 13.610000
--23.588000 23.474998 15.584000 -23.588000 23.474998 15.584000
- 3.630000 41.115000 -6.441000 3.630000 41.115000 -6.441000
+-24.556010 14.570998 17.115000 -24.556010 14.570998 17.115000
+-20.355010 18.467998 13.610000 -20.355010 18.467998 13.610000
+-23.588010 23.474998 15.584000 -23.588010 23.474998 15.584000
+ 3.629990 41.115001 -6.441000 3.629990 41.115001 -6.441000
21.736000 27.821002 -18.830000 21.736000 27.821002 -18.830000
- 31.775000 11.529002 -24.893000 31.775000 11.529002 -24.893000
+ 31.775000 11.529003 -24.893000 31.775000 11.529003 -24.893000
32.237000 -4.510997 -23.790000 32.237000 -4.510997 -23.790000
11.012000 -39.388999 -4.705000 11.012000 -39.388999 -4.705000
- -6.724000 -34.986001 8.209000 -6.724000 -34.986001 8.209000
--19.713000 -31.887002 17.679000 -19.713000 -31.887002 17.679000
--30.445000 9.700997 21.975000 -30.445000 9.700997 21.975000
+ -6.724000 -34.986000 8.209000 -6.724000 -34.986000 8.209000
+-19.713000 -31.887001 17.679000 -19.713000 -31.887001 17.679000
+-30.445010 9.700997 21.975000 -30.445010 9.700997 21.975000
]
NORMAL_VECTOR HBA
@@ -126,44 +126,44 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3829205.597550000 469142.532856000 5062181.002 ]
+3 [ 3829205.554090000 469142.580327000 5062181.031 ]
48 x 2 x 3 [
-15.664000 2.488999 11.533000 -15.664000 2.488999 11.533000
--13.765000 6.914999 9.707000 -13.765000 6.914999 9.707000
--11.866000 11.339999 7.882000 -11.866000 11.339999 7.882000
- -9.967000 15.764999 6.057000 -9.967000 15.764999 6.057000
+-13.765010 6.914999 9.707000 -13.765010 6.914999 9.707000
+-11.866010 11.339999 7.882000 -11.866010 11.339999 7.882000
+ -9.967010 15.764999 6.057000 -9.967010 15.764999 6.057000
-12.003000 -0.119001 9.020000 -12.003000 -0.119001 9.020000
-10.104000 4.306999 7.195000 -10.104000 4.306999 7.195000
-8.205000 8.731999 5.370000 -8.205000 8.731999 5.370000
- -6.305000 13.157000 3.544000 -6.305000 13.157000 3.544000
+ -6.305010 13.156999 3.544000 -6.305010 13.156999 3.544000
-12.139000 -11.577001 10.158000 -12.139000 -11.577001 10.158000
-10.240000 -7.151001 8.333000 -10.240000 -7.151001 8.333000
-8.341000 -2.726001 6.507000 -8.341000 -2.726001 6.507000
- -6.442000 1.699000 4.682000 -6.442000 1.699000 4.682000
+ -6.442000 1.698999 4.682000 -6.442000 1.698999 4.682000
-4.543000 6.125000 2.856000 -4.543000 6.125000 2.856000
-2.644000 10.549000 1.031000 -2.644000 10.549000 1.031000
- -0.745000 14.975000 -0.794000 -0.745000 14.975000 -0.794000
- 1.154000 19.400000 -2.620000 1.154000 19.400000 -2.620000
+ -0.745010 14.975000 -0.794000 -0.745010 14.975000 -0.794000
+ 1.153990 19.400000 -2.620000 1.153990 19.400000 -2.620000
-8.477000 -14.185001 7.645000 -8.477000 -14.185001 7.645000
- -6.578000 -9.760000 5.820000 -6.578000 -9.760000 5.820000
+ -6.578000 -9.760001 5.820000 -6.578000 -9.760001 5.820000
-4.680000 -5.334000 3.995000 -4.680000 -5.334000 3.995000
-2.780000 -0.909000 2.169000 -2.780000 -0.909000 2.169000
-0.882000 3.517000 0.344000 -0.882000 3.517000 0.344000
1.017000 7.942000 -1.482000 1.017000 7.942000 -1.482000
2.917000 12.368000 -3.307000 2.917000 12.368000 -3.307000
- 4.816000 16.793000 -5.133000 4.816000 16.793000 -5.133000
+ 4.815990 16.793001 -5.133000 4.815990 16.793001 -5.133000
-4.816000 -16.793000 5.133000 -4.816000 -16.793000 5.133000
-2.917000 -12.368000 3.307000 -2.917000 -12.368000 3.307000
-1.017000 -7.942000 1.482000 -1.017000 -7.942000 1.482000
0.882000 -3.517000 -0.344000 0.882000 -3.517000 -0.344000
2.780000 0.909000 -2.169000 2.780000 0.909000 -2.169000
- 4.680000 5.334000 -3.995000 4.680000 5.334000 -3.995000
+ 4.680000 5.334001 -3.995000 4.680000 5.334001 -3.995000
6.578000 9.760001 -5.820000 6.578000 9.760001 -5.820000
8.477000 14.185001 -7.645000 8.477000 14.185001 -7.645000
-1.154000 -19.400000 2.620000 -1.154000 -19.400000 2.620000
0.745000 -14.975000 0.794000 0.745000 -14.975000 0.794000
2.644000 -10.549000 -1.031000 2.644000 -10.549000 -1.031000
- 4.543000 -6.125000 -2.856000 4.543000 -6.125000 -2.856000
+ 4.543000 -6.124999 -2.856000 4.543000 -6.124999 -2.856000
6.442000 -1.698999 -4.682000 6.442000 -1.698999 -4.682000
8.341000 2.726001 -6.507000 8.341000 2.726001 -6.507000
10.240000 7.151001 -8.333000 10.240000 7.151001 -8.333000
@@ -175,5 +175,5 @@ HBA
9.967000 -15.764999 -6.057000 9.967000 -15.764999 -6.057000
11.866000 -11.339999 -7.882000 11.866000 -11.339999 -7.882000
13.765000 -6.914999 -9.707000 13.765000 -6.914999 -9.707000
- 15.664000 -2.488999 -11.533000 15.664000 -2.488999 -11.533000
+ 15.664000 -2.488998 -11.533000 15.664000 -2.488998 -11.533000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS205-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS205-AntennaField.conf
index 9665097f1858ee674e15c553d8759a18ccdb2440..f755050d330bb5f7d92071853ea1659b8697eb08 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS205-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS205-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS205
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:42
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:11
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3831438.563120000 463435.440048000 5061025.466 ]
+3 [ 3831438.519740000 463435.487543000 5061025.495 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
+ -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
3.308000 3.832000 -2.830000 3.308000 3.832000 -2.830000
- 4.631000 0.150000 -3.489000 4.631000 0.150000 -3.489000
+ 4.631000 0.150001 -3.489000 4.631000 0.150001 -3.489000
3.786000 -3.602000 -2.516000 3.786000 -3.602000 -2.516000
1.170000 -5.669000 -0.366000 1.170000 -5.669000 -0.366000
- -1.993000 -5.083001 1.956000 -1.993000 -5.083001 1.956000
- -4.224000 -2.119001 3.362000 -4.224000 -2.119001 3.362000
- -4.479000 1.835999 3.196000 -4.479000 1.835999 3.196000
- -2.637000 4.932999 1.534000 -2.637000 4.932999 1.534000
+ -1.993000 -5.083000 1.956000 -1.993000 -5.083000 1.956000
+ -4.224000 -2.119000 3.362000 -4.224000 -2.119000 3.362000
+ -4.479000 1.836000 3.196000 -4.479000 1.836000 3.196000
+ -2.637000 4.933000 1.534000 -2.637000 4.933000 1.534000
0.438000 5.721000 -0.846000 0.438000 5.721000 -0.846000
- 1.352000 9.045000 -1.832000 1.352000 9.045000 -1.832000
+ 1.351990 9.045000 -1.832000 1.351990 9.045000 -1.832000
4.211000 8.053000 -3.888000 4.211000 8.053000 -3.888000
- 7.226000 4.516000 -5.832000 7.226000 4.516000 -5.832000
- 7.893000 -2.728000 -5.678000 7.893000 -2.728000 -5.678000
- 6.982000 -5.676000 -4.728000 6.982000 -5.676000 -4.728000
- 4.586010 -8.582000 -2.667000 4.586010 -8.582000 -2.667000
+ 7.226000 4.516001 -5.832000 7.226000 4.516001 -5.832000
+ 7.893000 -2.727999 -5.678000 7.893000 -2.727999 -5.678000
+ 6.982000 -5.675999 -4.728000 6.982000 -5.675999 -4.728000
+ 4.586000 -8.581999 -2.667000 4.586000 -8.581999 -2.667000
1.235000 -9.154000 -0.100000 1.235000 -9.154000 -0.100000
- -3.315000 -7.718001 3.186000 -3.315000 -7.718001 3.186000
+ -3.315000 -7.718000 3.186000 -3.315000 -7.718000 3.186000
-6.600000 -5.044001 5.410000 -6.600000 -5.044001 5.410000
-7.992000 -0.941001 6.084000 -7.992000 -0.941001 6.084000
-7.219000 2.816999 5.164000 -7.219000 2.816999 5.164000
- -5.109000 6.729999 3.227000 -5.109000 6.729999 3.227000
- -1.938000 8.975999 0.644000 -1.938000 8.975999 0.644000
- 3.163000 13.525000 -3.597000 3.163000 13.525000 -3.597000
- 6.089000 12.222000 -5.675000 6.089000 12.222000 -5.675000
- 7.746000 9.778000 -6.698000 7.746000 9.778000 -6.698000
+ -5.109010 6.730000 3.227000 -5.109010 6.730000 3.227000
+ -1.938010 8.976000 0.644000 -1.938010 8.976000 0.644000
+ 3.162990 13.525000 -3.597000 3.162990 13.525000 -3.597000
+ 6.088990 12.222001 -5.675000 6.088990 12.222001 -5.675000
+ 7.746000 9.778001 -6.698000 7.746000 9.778001 -6.698000
10.290000 2.302001 -7.932000 10.290000 2.302001 -7.932000
12.087000 0.208001 -9.091000 12.087000 0.208001 -9.091000
- 9.605010 -6.417000 -6.629000 9.605010 -6.417000 -6.629000
- 7.040010 -10.169000 -4.365000 7.040010 -10.169000 -4.365000
- 4.524010 -14.267000 -2.106000 4.524010 -14.267000 -2.106000
- 1.900010 -13.364000 -0.218000 1.900010 -13.364000 -0.218000
- -1.888990 -12.653000 2.561000 -1.888990 -12.653000 2.561000
+ 9.605000 -6.416999 -6.629000 9.605000 -6.416999 -6.629000
+ 7.040000 -10.168999 -4.365000 7.040000 -10.168999 -4.365000
+ 4.524000 -14.266999 -2.106000 4.524000 -14.266999 -2.106000
+ 1.900000 -13.364000 -0.218000 1.900000 -13.364000 -0.218000
+ -1.889000 -12.653000 2.561000 -1.889000 -12.653000 2.561000
-6.994000 -9.415001 6.100000 -6.994000 -9.415001 6.100000
-8.794000 -7.653001 7.293000 -8.794000 -7.653001 7.293000
-10.294000 -2.582001 7.961000 -10.294000 -2.582001 7.961000
-12.097000 1.015999 8.988000 -12.097000 1.015999 8.988000
- -9.178000 8.869999 6.087000 -9.178000 8.869999 6.087000
- -6.835000 11.406999 4.100000 -6.835000 11.406999 4.100000
- -3.134000 14.098999 1.078000 -3.134000 14.098999 1.078000
- 40.636010 8.623003 -31.281990 40.636010 8.623003 -31.281990
- 9.048010 -51.105000 -2.173000 9.048010 -51.105000 -2.173000
- -1.388000 17.891000 -0.575000 -1.388000 17.891000 -0.575000
- 0.176000 20.152000 -1.953000 0.176000 20.152000 -1.953000
+ -9.178010 8.869999 6.087000 -9.178010 8.869999 6.087000
+ -6.835010 11.406999 4.100000 -6.835010 11.406999 4.100000
+ -3.134010 14.099000 1.078000 -3.134010 14.099000 1.078000
+ 40.636000 8.623004 -31.282000 40.636000 8.623004 -31.282000
+ 9.048000 -51.104999 -2.173000 9.048000 -51.104999 -2.173000
+ -1.388010 17.891000 -0.575000 -1.388010 17.891000 -0.575000
+ 0.175990 20.152000 -1.953000 0.175990 20.152000 -1.953000
11.657000 13.439001 -9.965000 11.657000 13.439001 -9.965000
- 15.856010 -2.021999 -11.718990 15.856010 -2.021999 -11.718990
- 15.770010 -6.923999 -11.211990 15.770010 -6.923999 -11.211990
- 8.948010 -15.076000 -5.354000 8.948010 -15.076000 -5.354000
- -1.360990 -17.660000 2.617000 -1.360990 -17.660000 2.617000
- -7.735990 -17.424001 7.382000 -7.735990 -17.424001 7.382000
--13.734000 -4.741002 10.738000 -13.734000 -4.741002 10.738000
--15.825000 3.112998 11.597000 -15.825000 3.112998 11.597000
--12.191000 11.690999 8.094000 -12.191000 11.690999 8.094000
--12.745000 19.857999 7.771000 -12.745000 19.857999 7.771000
- -3.321000 24.763999 0.255000 -3.321000 24.763999 0.255000
- 6.972000 23.277000 -7.337000 6.972000 23.277000 -7.337000
- 11.521000 20.320001 -10.484000 11.521000 20.320001 -10.484000
- 17.001000 15.032001 -14.120000 17.001000 15.032001 -14.120000
- 19.167010 -2.470999 -14.162990 19.167010 -2.470999 -14.162990
- 18.195010 -10.256999 -12.729990 18.195010 -10.256999 -12.729990
- 12.521010 -21.733999 -7.434000 12.521010 -21.733999 -7.434000
- 1.619010 -25.070000 1.051000 1.619010 -25.070000 1.051000
- -5.835990 -24.515001 6.596000 -5.835990 -24.515001 6.596000
--13.480990 -17.206001 11.674000 -13.480990 -17.206001 11.674000
+ 15.856000 -2.021998 -11.719000 15.856000 -2.021998 -11.719000
+ 15.770000 -6.923998 -11.212000 15.770000 -6.923998 -11.212000
+ 8.948000 -15.075999 -5.354000 8.948000 -15.075999 -5.354000
+ -1.361000 -17.660000 2.617000 -1.361000 -17.660000 2.617000
+ -7.736000 -17.424001 7.382000 -7.736000 -17.424001 7.382000
+-13.734000 -4.741001 10.738000 -13.734000 -4.741001 10.738000
+-15.825010 3.112999 11.597000 -15.825010 3.112999 11.597000
+-12.191010 11.690999 8.094000 -12.191010 11.690999 8.094000
+-12.745010 19.857999 7.771000 -12.745010 19.857999 7.771000
+ -3.321010 24.764000 0.255000 -3.321010 24.764000 0.255000
+ 6.971990 23.277001 -7.337000 6.971990 23.277001 -7.337000
+ 11.520990 20.320001 -10.484000 11.520990 20.320001 -10.484000
+ 17.001000 15.032002 -14.120000 17.001000 15.032002 -14.120000
+ 19.167000 -2.470998 -14.163000 19.167000 -2.470998 -14.163000
+ 18.195000 -10.256998 -12.730000 18.195000 -10.256998 -12.730000
+ 12.521000 -21.733999 -7.434000 12.521000 -21.733999 -7.434000
+ 1.619000 -25.070000 1.051000 1.619000 -25.070000 1.051000
+ -5.836000 -24.515000 6.596000 -5.836000 -24.515000 6.596000
+-13.481000 -17.206001 11.674000 -13.481000 -17.206001 11.674000
-21.226000 -3.842002 16.280000 -21.226000 -3.842002 16.280000
--19.282000 13.533998 13.250000 -19.282000 13.533998 13.250000
--18.294000 27.171998 11.276000 -18.294000 27.171998 11.276000
- -6.831000 30.537999 2.367000 -6.831000 30.537999 2.367000
- 4.869000 30.246000 -6.389000 4.869000 30.246000 -6.389000
- 11.211000 28.637001 -11.003000 11.211000 28.637001 -11.003000
- 21.806000 14.480001 -17.676990 21.806000 14.480001 -17.676990
- 27.362010 -2.488998 -20.312990 27.362010 -2.488998 -20.312990
- 25.339010 -14.334998 -17.723990 25.339010 -14.334998 -17.723990
- 19.191010 -19.270999 -12.662990 19.191010 -19.270999 -12.662990
- 12.731010 -31.016999 -6.752990 12.731010 -31.016999 -6.752990
- -2.234990 -33.526001 4.708000 -2.234990 -33.526001 4.708000
- -9.227990 -31.025001 9.731000 -9.227990 -31.025001 9.731000
--20.262990 -22.265002 17.222000 -20.262990 -22.265002 17.222000
+-19.282010 13.533998 13.250000 -19.282010 13.533998 13.250000
+-18.294010 27.171998 11.276000 -18.294010 27.171998 11.276000
+ -6.831010 30.537999 2.367000 -6.831010 30.537999 2.367000
+ 4.868990 30.246001 -6.389000 4.868990 30.246001 -6.389000
+ 11.210990 28.637001 -11.003000 11.210990 28.637001 -11.003000
+ 21.806000 14.480002 -17.677000 21.806000 14.480002 -17.677000
+ 27.362000 -2.488997 -20.313000 27.362000 -2.488997 -20.313000
+ 25.339000 -14.334997 -17.724000 25.339000 -14.334997 -17.724000
+ 19.191000 -19.270998 -12.663000 19.191000 -19.270998 -12.663000
+ 12.731000 -31.016999 -6.753000 12.731000 -31.016999 -6.753000
+ -2.235000 -33.526000 4.708000 -2.235000 -33.526000 4.708000
+ -9.228000 -31.025001 9.731000 -9.228000 -31.025001 9.731000
+-20.263000 -22.265002 17.222000 -20.263000 -22.265002 17.222000
-22.511000 -14.409002 18.199000 -22.511000 -14.409002 18.199000
--26.469000 5.782997 19.345000 -26.469000 5.782997 19.345000
--23.357000 11.029998 16.535000 -23.357000 11.029998 16.535000
--27.526000 14.807997 19.323000 -27.526000 14.807997 19.323000
- -5.678000 41.383999 0.522000 -5.678000 41.383999 0.522000
- 14.402000 34.629001 -13.940000 14.402000 34.629001 -13.940000
- 27.515000 22.178002 -22.657990 27.515000 22.178002 -22.657990
- 31.508010 6.678002 -24.253990 31.508010 6.678002 -24.253990
- 19.152010 -34.664999 -11.242990 19.152010 -34.664999 -11.242990
- 1.392010 -36.464000 2.251000 1.392010 -36.464000 2.251000
--11.586990 -37.904001 12.123000 -11.586990 -37.904001 12.123000
--30.962000 -0.995003 23.330000 -30.962000 -0.995003 23.330000
+-26.469010 5.782998 19.345000 -26.469010 5.782998 19.345000
+-23.357010 11.029998 16.535000 -23.357010 11.029998 16.535000
+-27.526010 14.807997 19.323000 -27.526010 14.807997 19.323000
+ -5.678010 41.384000 0.522000 -5.678010 41.384000 0.522000
+ 14.401990 34.629001 -13.940000 14.401990 34.629001 -13.940000
+ 27.515000 22.178003 -22.658000 27.515000 22.178003 -22.658000
+ 31.508000 6.678003 -24.254000 31.508000 6.678003 -24.254000
+ 19.152000 -34.664998 -11.243000 19.152000 -34.664998 -11.243000
+ 1.392000 -36.464000 2.251000 1.392000 -36.464000 2.251000
+-11.587000 -37.904001 12.123000 -11.587000 -37.904001 12.123000
+-30.962010 -0.995003 23.330000 -30.962010 -0.995003 23.330000
]
NORMAL_VECTOR HBA
@@ -126,9 +126,9 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3831479.670120000 463487.529051000 5060989.903 ]
+3 [ 3831479.626730000 463487.576547000 5060989.932 ]
48 x 2 x 3 [
--15.707000 1.129999 11.688000 -15.707000 1.129999 11.688000
+-15.707000 1.129998 11.688000 -15.707000 1.129998 11.688000
-14.068000 5.725999 10.042000 -14.068000 5.725999 10.042000
-12.429000 10.322999 8.396000 -12.429000 10.322999 8.396000
-10.789000 14.918999 6.750000 -10.789000 14.918999 6.750000
@@ -139,13 +139,13 @@ HBA
-11.414000 -12.648001 9.711000 -11.414000 -12.648001 9.711000
-9.775000 -8.052001 8.065000 -9.775000 -8.052001 8.065000
-8.136000 -3.456001 6.420000 -8.136000 -3.456001 6.420000
- -6.498000 1.141000 4.774000 -6.498000 1.141000 4.774000
+ -6.498000 1.140999 4.774000 -6.498000 1.140999 4.774000
-4.859000 5.737000 3.128000 -4.859000 5.737000 3.128000
-3.220000 10.334000 1.483000 -3.220000 10.334000 1.483000
-1.580000 14.930000 -0.164000 -1.580000 14.930000 -0.164000
0.059000 19.527000 -1.809000 0.059000 19.527000 -1.809000
-7.629000 -14.942001 7.077000 -7.629000 -14.942001 7.077000
- -5.990000 -10.345000 5.431000 -5.990000 -10.345000 5.431000
+ -5.990000 -10.345001 5.431000 -5.990000 -10.345001 5.431000
-4.351000 -5.749000 3.785000 -4.351000 -5.749000 3.785000
-2.712000 -1.152000 2.140000 -2.712000 -1.152000 2.140000
-1.073000 3.444000 0.494000 -1.073000 3.444000 0.494000
@@ -163,17 +163,17 @@ HBA
-0.059000 -19.527000 1.809000 -0.059000 -19.527000 1.809000
1.580000 -14.930000 0.164000 1.580000 -14.930000 0.164000
3.220000 -10.334000 -1.483000 3.220000 -10.334000 -1.483000
- 4.859000 -5.736999 -3.128000 4.859000 -5.736999 -3.128000
+ 4.859000 -5.737000 -3.128000 4.859000 -5.737000 -3.128000
6.498000 -1.140999 -4.774000 6.498000 -1.140999 -4.774000
8.136000 3.456001 -6.420000 8.136000 3.456001 -6.420000
- 9.775000 8.052001 -8.065000 9.775000 8.052001 -8.065000
- 11.414000 12.648001 -9.711000 11.414000 12.648001 -9.711000
+ 9.775000 8.052001 -8.064990 9.775000 8.052001 -8.064990
+ 11.414000 12.648001 -9.710990 11.414000 12.648001 -9.710990
7.005000 -12.626999 -4.116000 7.005000 -12.626999 -4.116000
- 8.643000 -8.029999 -5.762000 8.643000 -8.029999 -5.762000
- 10.282000 -3.433999 -7.408000 10.282000 -3.433999 -7.408000
- 11.921000 1.162001 -9.053000 11.921000 1.162001 -9.053000
- 10.789000 -14.918999 -6.750000 10.789000 -14.918999 -6.750000
- 12.429000 -10.322999 -8.396000 12.429000 -10.322999 -8.396000
- 14.068000 -5.725999 -10.042000 14.068000 -5.725999 -10.042000
- 15.707000 -1.129999 -11.688000 15.707000 -1.129999 -11.688000
+ 8.643000 -8.029999 -5.761990 8.643000 -8.029999 -5.761990
+ 10.282000 -3.433999 -7.407990 10.282000 -3.433999 -7.407990
+ 11.921000 1.162001 -9.052990 11.921000 1.162001 -9.052990
+ 10.789000 -14.918999 -6.749990 10.789000 -14.918999 -6.749990
+ 12.429000 -10.322999 -8.395990 12.429000 -10.322999 -8.395990
+ 14.068000 -5.725999 -10.041990 14.068000 -5.725999 -10.041990
+ 15.707000 -1.129999 -11.687990 15.707000 -1.129999 -11.687990
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS208-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS208-AntennaField.conf
index 37ff4f95a20b1270881f850812275a69df28e3e8..acbb6475d13c2739e9a19a1a52a51a826fe75266 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS208-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS208-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS208
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:43
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:12
#
NORMAL_VECTOR LBA
@@ -15,79 +15,79 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3847810.050560000 466929.706426000 5048357.222 ]
+3 [ 3847810.007230000 466929.754098000 5048357.251 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.014000 -0.243000 1.546000 -2.014000 -0.243000 1.546000
+ -2.014000 -0.243001 1.546000 -2.014000 -0.243001 1.546000
-1.336000 2.105000 0.818000 -1.336000 2.105000 0.818000
0.796000 2.362000 -0.819000 0.796000 2.362000 -0.819000
2.014000 0.243000 -1.546000 2.014000 0.243000 -1.546000
1.336000 -2.105000 -0.818000 1.336000 -2.105000 -0.818000
-0.796000 -2.362000 0.819000 -0.796000 -2.362000 0.819000
- 3.137000 -4.464999 -1.964000 3.137000 -4.464999 -1.964000
+ 3.137000 -4.465000 -1.964000 3.137000 -4.465000 -1.964000
0.213000 -5.784000 0.369000 0.213000 -5.784000 0.369000
- -2.812000 -4.397000 2.530000 -2.812000 -4.397000 2.530000
- -4.520000 -0.953000 3.507000 -4.520000 -0.953000 3.507000
- -4.114000 2.938000 2.843000 -4.114000 2.938000 2.843000
+ -2.812000 -4.397001 2.530000 -2.812000 -4.397001 2.530000
+ -4.520000 -0.953001 3.507000 -4.520000 -0.953001 3.507000
+ -4.114000 2.937999 2.843000 -4.114000 2.937999 2.843000
-1.782000 5.454000 0.849000 -1.782000 5.454000 0.849000
1.383000 5.417000 -1.543000 1.383000 5.417000 -1.543000
- 3.902000 2.846001 -3.213000 3.902000 2.846001 -3.213000
- 4.594000 -1.056999 -3.379000 4.594000 -1.056999 -3.379000
- 7.276000 -2.492999 -5.276000 7.276000 -2.492999 -5.276000
- 6.538000 -5.966999 -4.400000 6.538000 -5.966999 -4.400000
- 3.763000 -9.407999 -1.985000 3.763000 -9.407999 -1.985000
- -2.030000 -9.594000 2.415000 -2.030000 -9.594000 2.415000
- -4.410000 -8.194000 4.088000 -4.410000 -8.194000 4.088000
- -6.787000 -4.949000 5.589000 -6.787000 -4.949000 5.589000
- -7.312000 -0.723000 5.598000 -7.312000 -0.723000 5.598000
- -6.252000 4.821000 4.288000 -6.252000 4.821000 4.288000
- -4.173000 8.676000 2.362000 -4.173000 8.676000 2.362000
+ 3.902000 2.846000 -3.213000 3.902000 2.846000 -3.213000
+ 4.594000 -1.057000 -3.379000 4.594000 -1.057000 -3.379000
+ 7.276000 -2.493000 -5.276000 7.276000 -2.493000 -5.276000
+ 6.538000 -5.967000 -4.400000 6.538000 -5.967000 -4.400000
+ 3.763000 -9.408000 -1.985000 3.763000 -9.408000 -1.985000
+ -2.030000 -9.594001 2.415000 -2.030000 -9.594001 2.415000
+ -4.410000 -8.194001 4.088000 -4.410000 -8.194001 4.088000
+ -6.787000 -4.949001 5.589000 -6.787000 -4.949001 5.589000
+ -7.312000 -0.723001 5.598000 -7.312000 -0.723001 5.598000
+ -6.252000 4.820999 4.288000 -6.252000 4.820999 4.288000
+ -4.173000 8.675999 2.362000 -4.173000 8.675999 2.362000
-0.913000 10.044000 -0.230000 -0.913000 10.044000 -0.230000
2.114000 8.746000 -2.401000 2.114000 8.746000 -2.401000
- 5.292000 5.766001 -4.532000 5.292000 5.766001 -4.532000
- 7.155000 1.614001 -5.561000 7.155000 1.614001 -5.561000
+ 5.292000 5.766000 -4.532000 5.292000 5.766000 -4.532000
+ 7.155000 1.614000 -5.561000 7.155000 1.614000 -5.561000
10.903000 -5.149999 -7.777000 10.903000 -5.149999 -7.777000
9.917000 -8.678999 -6.708000 9.917000 -8.678999 -6.708000
- 7.991000 -10.525999 -5.081000 7.991000 -10.525999 -5.081000
+ 7.991000 -10.526000 -5.081000 7.991000 -10.526000 -5.081000
2.050000 -13.028000 -0.357000 2.050000 -13.028000 -0.357000
0.407000 -15.083000 1.074000 0.407000 -15.083000 1.074000
- -4.953000 -11.397000 4.792000 -4.953000 -11.397000 4.792000
- -8.009000 -7.867000 6.780000 -8.009000 -7.867000 6.780000
+ -4.953000 -11.397001 4.792000 -4.953000 -11.397001 4.792000
+ -8.009000 -7.867001 6.780000 -8.009000 -7.867001 6.780000
-11.345000 -4.365001 8.983000 -11.345000 -4.365001 8.983000
-10.673000 -1.175001 8.182000 -10.673000 -1.175001 8.182000
-10.178000 3.481999 7.381000 -10.178000 3.481999 7.381000
- -7.685000 9.556000 4.939000 -7.685000 9.556000 4.939000
- -6.308000 11.643000 3.706000 -6.308000 11.643000 3.706000
- -2.274000 13.061000 0.524000 -2.274000 13.061000 0.524000
+ -7.685000 9.555999 4.939000 -7.685000 9.555999 4.939000
+ -6.308000 11.642999 3.706000 -6.308000 11.642999 3.706000
+ -2.274000 13.060999 0.524000 -2.274000 13.060999 0.524000
0.574000 14.985000 -1.807000 0.574000 14.985000 -1.807000
- 6.927000 10.646001 -6.216000 6.927000 10.646001 -6.216000
+ 6.927000 10.646000 -6.216000 6.927000 10.646000 -6.216000
9.007000 7.500001 -7.502000 9.007000 7.500001 -7.502000
11.238000 2.647001 -8.744000 11.238000 2.647001 -8.744000
--16.214000 43.391999 8.291000 -16.214000 43.391999 8.291000
+-16.214010 43.391998 8.291000 -16.214010 43.391998 8.291000
35.228000 18.769003 -28.371000 35.228000 18.769003 -28.371000
14.312000 0.132001 -10.840000 14.312000 0.132001 -10.840000
- 16.154000 -2.017998 -12.037000 16.154000 -2.017998 -12.037000
+ 16.154000 -2.017999 -12.037000 16.154000 -2.017999 -12.037000
11.004000 -15.727999 -6.884000 11.004000 -15.727999 -6.884000
-1.305000 -19.581000 2.782000 -1.305000 -19.581000 2.782000
- -5.236000 -19.036000 5.706000 -5.236000 -19.036000 5.706000
+ -5.236000 -19.036001 5.706000 -5.236000 -19.036001 5.706000
-11.905000 -9.807001 9.905000 -11.905000 -9.807001 9.905000
--14.180000 3.270999 10.428000 -14.180000 3.270999 10.428000
--14.119000 11.195999 9.656000 -14.119000 11.195999 9.656000
- -4.072000 17.540000 1.474000 -4.072000 17.540000 1.474000
+-14.180000 3.270998 10.428000 -14.180000 3.270998 10.428000
+-14.119000 11.195998 9.656000 -14.119000 11.195998 9.656000
+ -4.072000 17.539999 1.474000 -4.072000 17.539999 1.474000
2.181000 19.444000 -3.432000 2.181000 19.444000 -3.432000
9.127000 14.150001 -8.202000 9.127000 14.150001 -8.202000
- 15.662000 14.111002 -13.142000 15.662000 14.111002 -13.142000
+ 15.662000 14.111001 -13.142000 15.662000 14.111001 -13.142000
19.782000 1.929002 -15.143000 19.782000 1.929002 -15.143000
- 18.794000 -10.765998 -13.232000 18.794000 -10.765998 -13.232000
- 16.515000 -16.172998 -11.013000 16.515000 -16.172998 -11.013000
+ 18.794000 -10.765999 -13.232000 18.794000 -10.765999 -13.232000
+ 16.515000 -16.172999 -11.013000 16.515000 -16.172999 -11.013000
12.385000 -22.529999 -7.306000 12.385000 -22.529999 -7.306000
-1.600000 -23.666000 3.379000 -1.600000 -23.666000 3.379000
- -7.859000 -21.760000 7.940000 -7.859000 -21.760000 7.940000
--17.171000 -13.664001 14.243000 -17.171000 -13.664001 14.243000
--20.061000 0.219999 15.157000 -20.061000 0.219999 15.157000
--19.765000 9.461999 14.086000 -19.765000 9.461999 14.086000
--14.058000 18.336999 8.956000 -14.058000 18.336999 8.956000
- -3.501000 26.797000 0.193000 -3.501000 26.797000 0.193000
+ -7.859000 -21.760001 7.940000 -7.859000 -21.760001 7.940000
+-17.171000 -13.664002 14.243000 -17.171000 -13.664002 14.243000
+-20.061000 0.219998 15.157000 -20.061000 0.219998 15.157000
+-19.765000 9.461998 14.086000 -19.765000 9.461998 14.086000
+-14.058000 18.336998 8.956000 -14.058000 18.336998 8.956000
+ -3.501000 26.796999 0.193000 -3.501000 26.796999 0.193000
10.464000 22.824001 -10.008000 10.464000 22.824001 -10.008000
21.414000 20.375002 -18.068000 21.414000 20.375002 -18.068000
24.339000 5.787002 -18.944000 24.339000 5.787002 -18.944000
@@ -96,23 +96,23 @@ LBA
12.039000 -28.468999 -6.500000 12.039000 -28.468999 -6.500000
-1.451000 -33.878000 4.202000 -1.451000 -33.878000 4.202000
-10.986000 -30.300001 11.087000 -10.986000 -30.300001 11.087000
--15.064000 -22.197001 13.431000 -15.064000 -22.197001 13.431000
--24.607000 -13.097002 19.816000 -24.607000 -13.097002 19.816000
--26.915000 5.776998 19.833000 -26.915000 5.776998 19.833000
--25.049000 14.269998 17.643000 -25.049000 14.269998 17.643000
--18.247000 27.240999 11.309000 -18.247000 27.240999 11.309000
--11.996000 29.340999 6.387000 -11.996000 29.340999 6.387000
- 4.109000 32.471001 -6.084000 4.109000 32.471001 -6.084000
- 8.376000 28.125001 -8.914000 8.376000 28.125001 -8.914000
+-15.064000 -22.197002 13.431000 -15.064000 -22.197002 13.431000
+-24.607000 -13.097003 19.816000 -24.607000 -13.097003 19.816000
+-26.915000 5.776997 19.833000 -26.915000 5.776997 19.833000
+-25.049000 14.269997 17.643000 -25.049000 14.269997 17.643000
+-18.247010 27.240998 11.309000 -18.247010 27.240998 11.309000
+-11.996010 29.340999 6.387000 -11.996010 29.340999 6.387000
+ 4.109000 32.471000 -6.084000 4.109000 32.471000 -6.084000
+ 8.376000 28.125000 -8.914000 8.376000 28.125000 -8.914000
11.321000 32.983001 -11.587000 11.321000 32.983001 -11.587000
33.056000 3.383003 -25.319000 33.056000 3.383003 -25.319000
- 28.041000 -21.039997 -19.287000 28.041000 -21.039997 -19.287000
- 18.321000 -36.270998 -10.538000 18.321000 -36.270998 -10.538000
- 5.978000 -39.862999 -0.870000 5.978000 -39.862999 -0.870000
--27.403000 -20.774002 22.635000 -27.403000 -20.774002 22.635000
--29.198000 1.518998 21.951000 -29.198000 1.518998 21.951000
--30.610000 17.822998 21.525000 -30.610000 17.822998 21.525000
- -1.413000 38.675000 -2.475000 -1.413000 38.675000 -2.475000
+ 28.041000 -21.039998 -19.287000 28.041000 -21.039998 -19.287000
+ 18.321000 -36.270999 -10.538000 18.321000 -36.270999 -10.538000
+ 5.978000 -39.863000 -0.870000 5.978000 -39.863000 -0.870000
+-27.403000 -20.774003 22.635000 -27.403000 -20.774003 22.635000
+-29.198000 1.518997 21.951000 -29.198000 1.518997 21.951000
+-30.610010 17.822997 21.524990 -30.610010 17.822997 21.524990
+ -1.413010 38.675000 -2.475000 -1.413010 38.675000 -2.475000
]
NORMAL_VECTOR HBA
@@ -126,48 +126,48 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3847753.309560000 466962.809421000 5048397.244 ]
+3 [ 3847753.266220000 466962.857092000 5048397.273 ]
48 x 2 x 3 [
--15.254000 -3.628001 11.777990 -15.254000 -3.628001 11.777990
--14.580010 1.386999 10.818990 -14.580010 1.386999 10.818990
--13.905010 6.401999 9.858990 -13.905010 6.401999 9.858990
--13.231010 11.415999 8.898990 -13.231010 11.415999 8.898990
--11.185000 -4.740000 8.823990 -11.185000 -4.740000 8.823990
--10.511000 0.275000 7.864990 -10.511000 0.275000 7.864990
- -9.836010 5.289000 6.904990 -9.836010 5.289000 6.904990
- -9.162010 10.304000 5.945990 -9.162010 10.304000 5.945990
- -8.465000 -15.883000 7.788990 -8.465000 -15.883000 7.788990
- -7.791000 -10.868000 6.829990 -7.791000 -10.868000 6.829990
- -7.116000 -5.853000 5.869990 -7.116000 -5.853000 5.869990
- -6.441000 -0.839000 4.910990 -6.441000 -0.839000 4.910990
- -5.766010 4.176000 3.950990 -5.766010 4.176000 3.950990
- -5.092010 9.191000 2.991990 -5.092010 9.191000 2.991990
- -4.417010 14.206000 2.031990 -4.417010 14.206000 2.031990
- -3.743010 19.220000 1.071990 -3.743010 19.220000 1.071990
- -4.396000 -16.995000 4.835990 -4.396000 -16.995000 4.835990
- -3.721000 -11.980000 3.875990 -3.721000 -11.980000 3.875990
- -3.046000 -6.965000 2.915990 -3.046000 -6.965000 2.915990
- -2.372000 -1.951000 1.956990 -2.372000 -1.951000 1.956990
- -1.697000 3.064000 0.996990 -1.697000 3.064000 0.996990
- -1.023010 8.079000 0.037990 -1.023010 8.079000 0.037990
- -0.348010 13.093000 -0.922010 -0.348010 13.093000 -0.922010
- 0.325990 18.108000 -1.882010 0.325990 18.108000 -1.882010
+-15.254000 -3.628001 11.778000 -15.254000 -3.628001 11.778000
+-14.580000 1.386999 10.819000 -14.580000 1.386999 10.819000
+-13.905000 6.401999 9.859000 -13.905000 6.401999 9.859000
+-13.231000 11.415999 8.899000 -13.231000 11.415999 8.899000
+-11.185000 -4.740001 8.824000 -11.185000 -4.740001 8.824000
+-10.511000 0.274999 7.865000 -10.511000 0.274999 7.865000
+ -9.836000 5.288999 6.905000 -9.836000 5.288999 6.905000
+ -9.162000 10.303999 5.946000 -9.162000 10.303999 5.946000
+ -8.465000 -15.883001 7.789000 -8.465000 -15.883001 7.789000
+ -7.791000 -10.868000 6.830000 -7.791000 -10.868000 6.830000
+ -7.116000 -5.853000 5.870000 -7.116000 -5.853000 5.870000
+ -6.441000 -0.839000 4.911000 -6.441000 -0.839000 4.911000
+ -5.766000 4.176000 3.951000 -5.766000 4.176000 3.951000
+ -5.092000 9.191000 2.992000 -5.092000 9.191000 2.992000
+ -4.417000 14.206000 2.032000 -4.417000 14.206000 2.032000
+ -3.743000 19.220000 1.072000 -3.743000 19.220000 1.072000
+ -4.396000 -16.995000 4.836000 -4.396000 -16.995000 4.836000
+ -3.721000 -11.980000 3.876000 -3.721000 -11.980000 3.876000
+ -3.046000 -6.965000 2.916000 -3.046000 -6.965000 2.916000
+ -2.372000 -1.951000 1.957000 -2.372000 -1.951000 1.957000
+ -1.697000 3.064000 0.997000 -1.697000 3.064000 0.997000
+ -1.023000 8.079000 0.038000 -1.023000 8.079000 0.038000
+ -0.348000 13.093000 -0.922000 -0.348000 13.093000 -0.922000
+ 0.326000 18.108000 -1.882000 0.326000 18.108000 -1.882000
-0.326000 -18.108000 1.882000 -0.326000 -18.108000 1.882000
0.348000 -13.093000 0.922000 0.348000 -13.093000 0.922000
- 1.023000 -8.078999 -0.038000 1.023000 -8.078999 -0.038000
- 1.697000 -3.063999 -0.997000 1.697000 -3.063999 -0.997000
- 2.372000 1.951001 -1.957000 2.372000 1.951001 -1.957000
+ 1.023000 -8.079000 -0.038000 1.023000 -8.079000 -0.038000
+ 1.697000 -3.064000 -0.997000 1.697000 -3.064000 -0.997000
+ 2.372000 1.951000 -1.957000 2.372000 1.951000 -1.957000
3.046000 6.965001 -2.916000 3.046000 6.965001 -2.916000
- 3.720990 11.980001 -3.876000 3.720990 11.980001 -3.876000
- 4.395990 16.995001 -4.836000 4.395990 16.995001 -4.836000
+ 3.721000 11.980001 -3.876000 3.721000 11.980001 -3.876000
+ 4.396000 16.995001 -4.836000 4.396000 16.995001 -4.836000
3.743000 -19.219999 -1.072000 3.743000 -19.219999 -1.072000
4.417000 -14.205999 -2.032000 4.417000 -14.205999 -2.032000
5.092000 -9.190999 -2.992000 5.092000 -9.190999 -2.992000
5.766000 -4.175999 -3.951000 5.766000 -4.175999 -3.951000
6.441000 0.839001 -4.911000 6.441000 0.839001 -4.911000
7.116000 5.853001 -5.870000 7.116000 5.853001 -5.870000
- 7.790990 10.868001 -6.830000 7.790990 10.868001 -6.830000
- 8.464990 15.883001 -7.789000 8.464990 15.883001 -7.789000
+ 7.791000 10.868001 -6.830000 7.791000 10.868001 -6.830000
+ 8.465000 15.883001 -7.789000 8.465000 15.883001 -7.789000
9.162000 -10.303999 -5.946000 9.162000 -10.303999 -5.946000
9.836000 -5.288999 -6.905000 9.836000 -5.288999 -6.905000
10.511000 -0.274999 -7.865000 10.511000 -0.274999 -7.865000
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS210-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS210-AntennaField.conf
index db3f309dd513dd779a39c4f75b7448716e622c1f..f26f66a11bbd19f26b03200e053292b2f56f55c9 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS210-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS210-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS210
-# ITRF2005 target_date = 2012.5
-# Created: 2013-07-15 18:28:41
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:12
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3877847.446870000 467456.926958000 5025437.607 ]
+3 [ 3877847.403700000 467456.974952000 5025437.636 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.008000 -0.242001 1.554000 -2.008000 -0.242001 1.554000
- -1.330000 2.105999 0.825000 -1.330000 2.105999 0.825000
+ -2.008000 -0.242000 1.554000 -2.008000 -0.242000 1.554000
+ -1.330000 2.106000 0.825000 -1.330000 2.106000 0.825000
0.796000 2.362000 -0.820000 0.796000 2.362000 -0.820000
2.008000 0.242000 -1.554000 2.008000 0.242000 -1.554000
1.330000 -2.106000 -0.825000 1.330000 -2.106000 -0.825000
-0.796000 -2.362000 0.820000 -0.796000 -2.362000 0.820000
- 4.323000 1.736000 -3.455000 4.323000 1.736000 -3.455000
- 4.355000 -2.218000 -3.123000 4.355000 -2.218000 -3.123000
+ 4.323000 1.736001 -3.455000 4.323000 1.736001 -3.455000
+ 4.355000 -2.217999 -3.123000 4.355000 -2.217999 -3.123000
2.350000 -5.134000 -1.330000 2.350000 -5.134000 -1.330000
-0.756000 -5.647000 1.086000 -0.756000 -5.647000 1.086000
- -3.508000 -3.518001 2.994000 -3.508000 -3.518001 2.994000
- -4.618000 0.255999 3.501000 -4.618000 0.255999 3.501000
- -3.567000 3.910999 2.369000 -3.567000 3.910999 2.369000
+ -3.508000 -3.518000 2.994000 -3.508000 -3.518000 2.994000
+ -4.618000 0.256000 3.501000 -4.618000 0.256000 3.501000
+ -3.567000 3.911000 2.369000 -3.567000 3.911000 2.369000
-0.848000 5.736000 0.129000 -0.848000 5.736000 0.129000
2.268000 4.876000 -2.171000 2.268000 4.876000 -2.171000
- 4.199000 7.374000 -3.869000 4.199000 7.374000 -3.869000
- 6.535000 5.040000 -5.441000 6.535000 5.040000 -5.441000
- 8.189000 0.355000 -6.280000 8.189000 0.355000 -6.280000
- 6.453000 -6.441000 -4.343000 6.453000 -6.441000 -4.343000
- 4.646000 -8.605000 -2.769000 4.646000 -8.605000 -2.769000
+ 4.199000 7.374001 -3.869000 4.199000 7.374001 -3.869000
+ 6.535000 5.040001 -5.441000 6.535000 5.040001 -5.441000
+ 8.189000 0.355001 -6.280000 8.189000 0.355001 -6.280000
+ 6.453000 -6.440999 -4.343000 6.453000 -6.440999 -4.343000
+ 4.646000 -8.604999 -2.769000 4.646000 -8.604999 -2.769000
1.473000 -9.978000 -0.224000 1.473000 -9.978000 -0.224000
- -1.829000 -8.787001 2.188000 -1.829000 -8.787001 2.188000
- -5.593000 -5.195001 4.736000 -5.593000 -5.195001 4.736000
+ -1.829000 -8.787000 2.188000 -1.829000 -8.787000 2.188000
+ -5.593000 -5.195000 4.736000 -5.593000 -5.195000 4.736000
-7.778000 -1.143001 6.038000 -7.778000 -1.143001 6.038000
-7.738000 3.220999 5.614000 -7.738000 3.220999 5.614000
- -5.798000 6.177999 3.867000 -5.798000 6.177999 3.867000
- -2.562000 8.592999 1.180000 -2.562000 8.592999 1.180000
+ -5.798000 6.178000 3.867000 -5.798000 6.178000 3.867000
+ -2.562000 8.593000 1.180000 -2.562000 8.593000 1.180000
1.117000 8.984000 -1.662000 1.117000 8.984000 -1.662000
- 7.340000 10.447000 -6.543000 7.340000 10.447000 -6.543000
- 9.638000 7.801000 -8.058000 9.638000 7.801000 -8.058000
- 10.383000 4.781000 -8.354000 10.383000 4.781000 -8.354000
- 10.318000 -3.174000 -7.587000 10.318000 -3.174000 -7.587000
+ 7.340000 10.447001 -6.543000 7.340000 10.447001 -6.543000
+ 9.638000 7.801001 -8.058000 9.638000 7.801001 -8.058000
+ 10.383000 4.781001 -8.354000 10.383000 4.781001 -8.354000
+ 10.318000 -3.173999 -7.587000 10.318000 -3.173999 -7.587000
11.308000 -5.953999 -8.092000 11.308000 -5.953999 -8.092000
- 6.845000 -10.598000 -4.267000 6.845000 -10.598000 -4.267000
+ 6.845000 -10.597999 -4.267000 6.845000 -10.597999 -4.267000
3.240000 -12.639000 -1.332000 3.240000 -12.639000 -1.332000
-0.433000 -15.015000 1.684000 -0.433000 -15.015000 1.684000
- -2.580000 -12.876001 3.130000 -2.580000 -12.876001 3.130000
- -5.872000 -10.318001 5.411000 -5.872000 -10.318001 5.411000
+ -2.580000 -12.876000 3.130000 -2.580000 -12.876000 3.130000
+ -5.872000 -10.318000 5.411000 -5.872000 -10.318000 5.411000
-9.566000 -4.840001 7.736000 -9.566000 -4.840001 7.736000
-10.667000 -2.354001 8.352000 -10.667000 -2.354001 8.352000
-10.414000 2.926999 7.682000 -10.414000 2.926999 7.682000
-10.920000 7.049999 7.696000 -10.920000 7.049999 7.696000
- -5.650000 12.565999 3.178000 -5.650000 12.565999 3.178000
- -2.647000 13.638999 0.789000 -2.647000 13.638999 0.789000
+ -5.650000 12.566000 3.178000 -5.650000 12.566000 3.178000
+ -2.647000 13.639000 0.789000 -2.647000 13.639000 0.789000
1.671000 14.159000 -2.552000 1.671000 14.159000 -2.552000
- 18.857990 48.144001 -18.731000 18.857990 48.144001 -18.731000
- 39.520000 -26.286997 -27.785000 39.520000 -26.286997 -27.785000
- 4.529000 16.651000 -4.957000 4.529000 16.651000 -4.957000
- 6.718000 17.872000 -6.738000 6.718000 17.872000 -6.738000
- 15.212000 6.058001 -12.153000 15.212000 6.058001 -12.153000
- 14.088000 -9.855999 -9.861000 14.088000 -9.855999 -9.861000
+ 18.858000 48.144002 -18.731000 18.858000 48.144002 -18.731000
+ 39.520000 -26.286996 -27.784990 39.520000 -26.286996 -27.784990
+ 4.529000 16.651001 -4.957000 4.529000 16.651001 -4.957000
+ 6.718000 17.872001 -6.738000 6.718000 17.872001 -6.738000
+ 15.212000 6.058002 -12.153000 15.212000 6.058002 -12.153000
+ 14.088000 -9.855998 -9.861000 14.088000 -9.855998 -9.861000
12.414000 -14.181999 -8.193000 12.414000 -14.181999 -8.193000
- 3.418000 -17.982000 -0.986000 3.418000 -17.982000 -0.986000
- -7.008000 -15.048001 6.705000 -7.008000 -15.048001 6.705000
+ 3.418000 -17.981999 -0.986000 3.418000 -17.981999 -0.986000
+ -7.008000 -15.048000 6.705000 -7.008000 -15.048000 6.705000
-12.862000 -11.602001 10.860000 -12.862000 -11.602001 10.860000
--14.314000 2.749998 10.674000 -14.314000 2.749998 10.674000
--13.704010 10.811998 9.482000 -13.704010 10.811998 9.482000
- -7.535010 16.611999 4.252000 -7.535010 16.611999 4.252000
- -5.393010 24.171999 1.935000 -5.393010 24.171999 1.935000
- 4.965990 23.759000 -5.932000 4.965990 23.759000 -5.932000
+-14.314000 2.749999 10.674000 -14.314000 2.749999 10.674000
+-13.704000 10.811999 9.482000 -13.704000 10.811999 9.482000
+ -7.535000 16.611999 4.252000 -7.535000 16.611999 4.252000
+ -5.393000 24.172000 1.935000 -5.393000 24.172000 1.935000
+ 4.966000 23.759001 -5.932000 4.966000 23.759001 -5.932000
14.054000 17.206001 -12.276000 14.054000 17.206001 -12.276000
- 17.323000 12.259001 -14.324000 17.323000 12.259001 -14.324000
- 20.700000 4.762001 -16.224000 20.700000 4.762001 -16.224000
- 17.020000 -11.937999 -11.911000 17.020000 -11.937999 -11.911000
+ 17.323000 12.259002 -14.324000 17.323000 12.259002 -14.324000
+ 20.700000 4.762002 -16.224000 20.700000 4.762002 -16.224000
+ 17.020000 -11.937998 -11.911000 17.020000 -11.937998 -11.911000
13.584000 -18.383999 -8.707000 13.584000 -18.383999 -8.707000
- 4.575000 -25.731000 -1.170000 4.575000 -25.731000 -1.170000
- -6.649000 -23.168001 7.163000 -6.649000 -23.168001 7.163000
--13.401000 -18.887002 11.929000 -13.401000 -18.887002 11.929000
+ 4.575000 -25.730999 -1.170000 4.575000 -25.730999 -1.170000
+ -6.649000 -23.168000 7.163000 -6.649000 -23.168000 7.163000
+-13.401000 -18.887001 11.929000 -13.401000 -18.887001 11.929000
-18.134000 -8.489002 14.602000 -18.134000 -8.489002 14.602000
--20.989010 7.356998 15.352000 -20.989010 7.356998 15.352000
--13.530010 21.855998 8.353000 -13.530010 21.855998 8.353000
- -8.175010 33.510999 3.216000 -8.175010 33.510999 3.216000
- 3.579990 30.689000 -5.499000 3.579990 30.689000 -5.499000
- 14.364990 24.485001 -13.169000 14.364990 24.485001 -13.169000
- 19.740000 19.830001 -16.851000 19.740000 19.830001 -16.851000
- 24.989000 1.830002 -19.233000 24.989000 1.830002 -19.233000
- 24.636000 -16.115998 -17.345000 24.636000 -16.115998 -17.345000
- 18.902000 -25.646999 -12.110000 18.902000 -25.646999 -12.110000
+-20.989000 7.356998 15.352000 -20.989000 7.356998 15.352000
+-13.530000 21.855999 8.353000 -13.530000 21.855999 8.353000
+ -8.175000 33.510999 3.216000 -8.175000 33.510999 3.216000
+ 3.580000 30.689000 -5.499000 3.580000 30.689000 -5.499000
+ 14.365000 24.485002 -13.169000 14.365000 24.485002 -13.169000
+ 19.740000 19.830002 -16.851000 19.740000 19.830002 -16.851000
+ 24.989000 1.830003 -19.233000 24.989000 1.830003 -19.233000
+ 24.636000 -16.115997 -17.345000 24.636000 -16.115997 -17.345000
+ 18.902000 -25.646998 -12.110000 18.902000 -25.646998 -12.110000
11.579000 -26.922999 -6.407000 11.579000 -26.922999 -6.407000
1.751000 -34.111000 1.740000 1.751000 -34.111000 1.740000
-12.982000 -28.747001 12.498000 -12.982000 -28.747001 12.498000
-18.672000 -22.965002 16.319000 -18.672000 -22.965002 16.319000
--26.085000 -9.553003 20.766000 -26.085000 -9.553003 20.766000
--25.620000 -1.410003 19.676000 -25.620000 -1.410003 19.676000
--22.734010 18.598998 15.669000 -22.734010 18.598998 15.669000
--18.133010 21.694998 11.880000 -18.133010 21.694998 11.880000
--20.782010 27.178998 13.406000 -20.782010 27.178998 13.406000
- 8.178990 39.770000 -9.828000 8.178990 39.770000 -9.828000
+-26.085000 -9.553002 20.766000 -26.085000 -9.553002 20.766000
+-25.620000 -1.410002 19.676000 -25.620000 -1.410002 19.676000
+-22.734000 18.598998 15.669000 -22.734000 18.598998 15.669000
+-18.133000 21.694998 11.880000 -18.133000 21.694998 11.880000
+-20.782000 27.178998 13.406000 -20.782000 27.178998 13.406000
+ 8.179000 39.770001 -9.828000 8.179000 39.770001 -9.828000
24.657000 23.550002 -20.938000 24.657000 23.550002 -20.938000
- 32.801000 5.791002 -25.551000 32.801000 5.791002 -25.551000
- 31.472000 -10.050998 -23.108000 31.472000 -10.050998 -23.108000
- 6.536000 -40.625000 -1.323000 6.536000 -40.625000 -1.323000
+ 32.801000 5.791003 -25.551000 32.801000 5.791003 -25.551000
+ 31.472000 -10.050997 -23.108000 31.472000 -10.050997 -23.108000
+ 6.536000 -40.624999 -1.323000 6.536000 -40.624999 -1.323000
-10.565000 -33.208001 11.057000 -10.565000 -33.208001 11.057000
-23.104000 -27.899002 20.145000 -23.104000 -27.899002 20.145000
--29.117010 14.838997 20.879000 -29.117010 14.838997 20.879000
+-29.117000 14.838997 20.879000 -29.117000 14.838997 20.879000
]
NORMAL_VECTOR HBA
@@ -126,54 +126,54 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3877827.561860000 467536.604956000 5025445.584 ]
+3 [ 3877827.518690000 467536.652950000 5025445.613 ]
48 x 2 x 3 [
-14.173000 8.992999 10.142000 -14.173000 8.992999 10.142000
-11.153000 12.256999 7.543000 -11.153000 12.256999 7.543000
-8.134000 15.520999 4.946000 -8.134000 15.520999 4.946000
- -5.115000 18.785999 2.347000 -5.115000 18.785999 2.347000
+ -5.115000 18.786000 2.347000 -5.115000 18.786000 2.347000
-11.399000 5.025999 8.382000 -11.399000 5.025999 8.382000
-8.379000 8.290999 5.784000 -8.379000 8.290999 5.784000
- -5.360000 11.555999 3.186000 -5.360000 11.555999 3.186000
+ -5.360000 11.556000 3.186000 -5.360000 11.556000 3.186000
-2.340000 14.820000 0.588000 -2.340000 14.820000 0.588000
-14.663000 -5.468001 11.819000 -14.663000 -5.468001 11.819000
-11.644000 -2.204001 9.221000 -11.644000 -2.204001 9.221000
-8.624000 1.060999 6.623000 -8.624000 1.060999 6.623000
- -5.605000 4.323999 4.025000 -5.605000 4.323999 4.025000
+ -5.605000 4.324000 4.025000 -5.605000 4.324000 4.025000
-2.585000 7.589000 1.427000 -2.585000 7.589000 1.427000
0.434000 10.854000 -1.171000 0.434000 10.854000 -1.171000
- 3.453000 14.118000 -3.769000 3.453000 14.118000 -3.769000
- 6.473000 17.383000 -6.367000 6.473000 17.383000 -6.367000
+ 3.453000 14.118001 -3.769000 3.453000 14.118001 -3.769000
+ 6.473000 17.383001 -6.367000 6.473000 17.383001 -6.367000
-11.888000 -9.435001 10.060000 -11.888000 -9.435001 10.060000
-8.869000 -6.170001 7.462000 -8.869000 -6.170001 7.462000
- -5.849000 -2.906001 4.864000 -5.849000 -2.906001 4.864000
+ -5.849000 -2.906000 4.864000 -5.849000 -2.906000 4.864000
-2.831000 0.359000 2.266000 -2.831000 0.359000 2.266000
0.189000 3.623000 -0.332000 0.189000 3.623000 -0.332000
- 3.208000 6.888000 -2.930000 3.208000 6.888000 -2.930000
- 6.228000 10.152000 -5.528000 6.228000 10.152000 -5.528000
+ 3.208000 6.888001 -2.930000 3.208000 6.888001 -2.930000
+ 6.228000 10.152001 -5.528000 6.228000 10.152001 -5.528000
9.247000 13.416001 -8.126000 9.247000 13.416001 -8.126000
-9.114000 -13.401001 8.300000 -9.114000 -13.401001 8.300000
- -6.095000 -10.136001 5.703000 -6.095000 -10.136001 5.703000
+ -6.095000 -10.136000 5.703000 -6.095000 -10.136000 5.703000
-3.075000 -6.872000 3.104000 -3.075000 -6.872000 3.104000
-0.056000 -3.608000 0.507000 -0.056000 -3.608000 0.507000
- 2.964000 -0.343000 -2.092000 2.964000 -0.343000 -2.092000
- 5.983000 2.921000 -4.689000 5.983000 2.921000 -4.689000
+ 2.964000 -0.342999 -2.092000 2.964000 -0.342999 -2.092000
+ 5.983000 2.921001 -4.689000 5.983000 2.921001 -4.689000
9.002000 6.186001 -7.287000 9.002000 6.186001 -7.287000
12.021000 9.451001 -9.885000 12.021000 9.451001 -9.885000
- -6.340000 -17.367001 6.542000 -6.340000 -17.367001 6.542000
+ -6.340000 -17.367000 6.542000 -6.340000 -17.367000 6.542000
-3.320000 -14.103000 3.943000 -3.320000 -14.103000 3.943000
-0.301000 -10.838000 1.346000 -0.301000 -10.838000 1.346000
2.718000 -7.573000 -1.253000 2.718000 -7.573000 -1.253000
- 5.738000 -4.309000 -3.851000 5.738000 -4.309000 -3.851000
+ 5.738000 -4.308999 -3.851000 5.738000 -4.308999 -3.851000
8.757000 -1.044999 -6.449000 8.757000 -1.044999 -6.449000
11.777000 2.220001 -9.047000 11.777000 2.220001 -9.047000
- 14.796000 5.484001 -11.644000 14.796000 5.484001 -11.644000
+ 14.796000 5.484002 -11.644000 14.796000 5.484002 -11.644000
2.473000 -14.805000 -0.414000 2.473000 -14.805000 -0.414000
- 5.493000 -11.540000 -3.012000 5.493000 -11.540000 -3.012000
+ 5.493000 -11.539999 -3.012000 5.493000 -11.539999 -3.012000
8.512000 -8.274999 -5.610000 8.512000 -8.274999 -5.610000
11.532000 -5.010999 -8.208000 11.532000 -5.010999 -8.208000
- 5.248000 -18.770000 -2.173000 5.248000 -18.770000 -2.173000
+ 5.248000 -18.769999 -2.173000 5.248000 -18.769999 -2.173000
8.268000 -15.505999 -4.771000 8.268000 -15.505999 -4.771000
11.286000 -12.240999 -7.369000 11.286000 -12.240999 -7.369000
- 14.306000 -8.976999 -9.967000 14.306000 -8.976999 -9.967000
+ 14.306000 -8.976998 -9.967000 14.306000 -8.976998 -9.967000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS305-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS305-AntennaField.conf
index 733ed4df00c8d0edd1592ea7887f7bce524ed47c..009a4d5ebc304286de7cbd3c536d5049c5d4d463 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS305-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS305-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS305
-# ITRF2005 target_date = 2012.5
-# Created: 2012-10-10 14:47:46
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:12
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3828720.758730000 454781.410823000 5063851.082 ]
+3 [ 3828720.715420000 454781.458290000 5063851.111 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.020000 -0.243000 1.537000 -2.020000 -0.243000 1.537000
@@ -26,17 +26,17 @@ LBA
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
-2.079000 5.305000 1.080000 -2.079000 5.305000 1.080000
1.078000 5.547000 -1.310000 1.078000 5.547000 -1.310000
- 3.731000 3.192001 -3.087000 3.731000 3.192001 -3.087000
- 4.638000 -0.655999 -3.420000 4.638000 -0.655999 -3.420000
- 3.375000 -4.195999 -2.153000 3.375000 -4.195999 -2.153000
+ 3.731000 3.192000 -3.087000 3.731000 3.192000 -3.087000
+ 4.638000 -0.656000 -3.420000 4.638000 -0.656000 -3.420000
+ 3.375000 -4.196000 -2.153000 3.375000 -4.196000 -2.153000
0.533000 -5.774000 0.121000 0.533000 -5.774000 0.121000
-2.559000 -4.649000 2.339000 -2.559000 -4.649000 2.339000
-4.454000 -1.349000 3.462000 -4.454000 -1.349000 3.462000
-4.264000 2.582000 2.965000 -4.264000 2.582000 2.965000
- -6.571000 4.864000 4.489000 -6.571000 4.864000 4.489000
- -5.076000 7.897000 3.095000 -5.076000 7.897000 3.095000
- -1.592000 10.199000 0.274000 -1.592000 10.199000 0.274000
- 4.122000 8.378001 -3.848000 4.122000 8.378001 -3.848000
+ -6.571000 4.863999 4.489000 -6.571000 4.863999 4.489000
+ -5.076010 7.897000 3.095000 -5.076010 7.897000 3.095000
+ -1.592010 10.199000 0.274000 -1.592010 10.199000 0.274000
+ 4.122000 8.378000 -3.848000 4.122000 8.378000 -3.848000
6.141000 6.235001 -5.169000 6.141000 6.235001 -5.169000
7.747000 2.346001 -6.022000 7.747000 2.346001 -6.022000
7.321000 -1.833999 -5.326000 7.321000 -1.833999 -5.326000
@@ -44,45 +44,45 @@ LBA
2.158000 -9.647000 -0.747000 2.158000 -9.647000 -0.747000
-1.340000 -9.818000 1.892000 -1.340000 -9.818000 1.892000
-4.015000 -7.547000 3.693000 -4.015000 -7.547000 3.693000
- -6.465000 -3.634000 5.177000 -6.465000 -3.634000 5.177000
- -7.366000 0.937000 5.440000 -7.366000 0.937000 5.440000
- -9.531000 8.626999 6.370000 -9.531000 8.626999 6.370000
- -7.782000 11.628000 4.787000 -7.782000 11.628000 4.787000
- -5.484000 12.712000 2.966000 -5.484000 12.712000 2.966000
- 0.889000 13.034000 -1.844000 0.889000 13.034000 -1.844000
- 2.955000 14.411000 -3.518000 2.955000 14.411000 -3.518000
+ -6.465000 -3.634001 5.177000 -6.465000 -3.634001 5.177000
+ -7.366000 0.936999 5.440000 -7.366000 0.936999 5.440000
+ -9.531010 8.626999 6.370000 -9.531010 8.626999 6.370000
+ -7.782010 11.627999 4.787000 -7.782010 11.627999 4.787000
+ -5.484010 12.712000 2.966000 -5.484010 12.712000 2.966000
+ 0.888990 13.034000 -1.844000 0.888990 13.034000 -1.844000
+ 2.954990 14.411000 -3.518000 2.954990 14.411000 -3.518000
7.385000 9.079001 -6.358000 7.385000 9.079001 -6.358000
9.593000 4.685001 -7.618000 9.593000 4.685001 -7.618000
12.081000 0.224001 -9.082000 12.081000 0.224001 -9.082000
10.713000 -2.563999 -7.804000 10.713000 -2.563999 -7.804000
9.193000 -6.800999 -6.281000 9.193000 -6.800999 -6.281000
5.401000 -11.688999 -2.996000 5.401000 -11.688999 -2.996000
- 3.589000 -13.188999 -1.501000 3.589000 -13.188999 -1.501000
+ 3.589000 -13.189000 -1.501000 3.589000 -13.189000 -1.501000
-0.677000 -13.141000 1.694000 -0.677000 -13.141000 1.694000
-3.894000 -13.982000 4.183000 -3.894000 -13.982000 4.183000
-9.151000 -7.688001 7.557000 -9.151000 -7.688001 7.557000
-10.488000 -3.995001 8.227000 -10.488000 -3.995001 8.227000
-11.593000 1.364999 8.572000 -11.593000 1.364999 8.572000
- 25.915000 -46.067998 -15.278000 25.915000 -46.067998 -15.278000
+ 25.915000 -46.067997 -15.278000 25.915000 -46.067997 -15.278000
-35.656000 -29.798003 29.434000 -35.656000 -29.798003 29.434000
--14.045000 4.802999 10.101000 -14.045000 4.802999 10.101000
--15.371000 7.471999 10.854000 -15.371000 7.471999 10.854000
- -7.278000 18.670000 3.773000 -7.278000 18.670000 3.773000
- 5.633000 18.079001 -5.857000 5.633000 18.079001 -5.857000
- 9.361000 16.209001 -8.485000 9.361000 16.209001 -8.485000
+-14.045010 4.802999 10.101000 -14.045010 4.802999 10.101000
+-15.371010 7.471999 10.854000 -15.371010 7.471999 10.854000
+ -7.278010 18.669999 3.773000 -7.278010 18.669999 3.773000
+ 5.632990 18.079001 -5.857000 5.632990 18.079001 -5.857000
+ 9.360990 16.209001 -8.485000 9.360990 16.209001 -8.485000
13.839000 5.179001 -10.847000 13.839000 5.179001 -10.847000
13.159000 -7.978999 -9.150000 13.159000 -7.978999 -9.150000
11.337000 -15.456999 -7.108000 11.337000 -15.456999 -7.108000
0.088000 -17.999000 1.559000 0.088000 -17.999000 1.559000
- -6.459000 -17.647000 6.438000 -6.459000 -17.647000 6.438000
+ -6.459000 -17.647001 6.438000 -6.459000 -17.647001 6.438000
-12.085000 -10.246001 9.989000 -12.085000 -10.246001 9.989000
--18.476000 -7.958001 14.576000 -18.476000 -7.958001 14.576000
--19.801000 4.986999 14.401000 -19.801000 4.986999 14.401000
--16.011000 16.658999 10.504000 -16.011000 16.658999 10.504000
--12.576000 20.989999 7.538000 -12.576000 20.989999 7.538000
- -7.119010 25.583000 3.030000 -7.119010 25.583000 3.030000
- 6.829000 21.843001 -7.094000 6.829000 21.843001 -7.094000
- 12.535000 17.884001 -11.016000 12.535000 17.884001 -11.016000
+-18.476000 -7.958002 14.576000 -18.476000 -7.958002 14.576000
+-19.801010 4.986998 14.401000 -19.801010 4.986998 14.401000
+-16.011010 16.658999 10.504000 -16.011010 16.658999 10.504000
+-12.576010 20.989999 7.538000 -12.576010 20.989999 7.538000
+ -7.119010 25.582999 3.030000 -7.119010 25.582999 3.030000
+ 6.828990 21.843001 -7.094000 6.828990 21.843001 -7.094000
+ 12.534990 17.884001 -11.016000 12.534990 17.884001 -11.016000
19.854000 7.016002 -15.524000 19.854000 7.016002 -15.524000
19.597000 -7.116998 -14.056000 19.597000 -7.116998 -14.056000
17.252000 -15.759998 -11.516000 17.252000 -15.759998 -11.516000
@@ -90,12 +90,12 @@ LBA
-2.531000 -26.560000 4.296000 -2.531000 -26.560000 4.296000
-15.323000 -17.992001 13.117000 -15.323000 -17.992001 13.117000
-25.501000 -11.904002 20.202000 -25.501000 -11.904002 20.202000
--25.122000 2.905998 18.580000 -25.122000 2.905998 18.580000
--21.884000 16.676998 14.908000 -21.884000 16.676998 14.908000
--19.020010 23.618999 12.133000 -19.020010 23.618999 12.133000
+-25.122010 2.905998 18.580000 -25.122010 2.905998 18.580000
+-21.884010 16.676998 14.908000 -21.884010 16.676998 14.908000
+-19.020010 23.618998 12.133000 -19.020010 23.618998 12.133000
-5.459010 31.084000 1.288000 -5.459010 31.084000 1.288000
- 8.954000 31.557001 -9.565000 8.954000 31.557001 -9.565000
- 17.496000 24.887002 -15.370000 17.496000 24.887002 -15.370000
+ 8.953990 31.557001 -9.565000 8.953990 31.557001 -9.565000
+ 17.495990 24.887002 -15.370000 17.495990 24.887002 -15.370000
19.687000 15.816002 -16.194000 19.687000 15.816002 -16.194000
27.009000 3.920003 -20.611000 27.009000 3.920003 -20.611000
25.073000 -14.735998 -17.475000 25.073000 -14.735998 -17.475000
@@ -104,15 +104,15 @@ LBA
5.223000 -31.892999 -1.038000 5.223000 -31.892999 -1.038000
-11.245000 -29.310001 11.080000 -11.245000 -29.310001 11.080000
-14.457000 -23.728001 12.986000 -14.457000 -23.728001 12.986000
--18.421000 -27.311001 16.282000 -18.421000 -27.311001 16.282000
--33.123000 8.182997 24.104990 -33.123000 8.182997 24.104990
+-18.421000 -27.311002 16.282000 -18.421000 -27.311002 16.282000
+-33.123010 8.182997 24.105000 -33.123010 8.182997 24.105000
-22.782010 29.564998 14.418000 -22.782010 29.564998 14.418000
-9.876010 40.628999 3.739000 -9.876010 40.628999 3.739000
3.009990 39.778000 -5.849000 3.009990 39.778000 -5.849000
31.454000 10.221003 -24.515000 31.454000 10.221003 -24.515000
28.255000 -11.492997 -20.155000 28.255000 -11.492997 -20.155000
- 26.012000 -27.405998 -17.036000 26.012000 -27.405998 -17.036000
- -7.217000 -37.082000 8.761000 -7.217000 -37.082000 8.761000
+ 26.012000 -27.405997 -17.036000 26.012000 -27.405997 -17.036000
+ -7.217000 -37.082001 8.761000 -7.217000 -37.082001 8.761000
]
NORMAL_VECTOR HBA
@@ -126,54 +126,54 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3828732.711740000 454692.403824000 5063850.315 ]
+3 [ 3828732.668420000 454692.451291000 5063850.344 ]
48 x 2 x 3 [
--15.478010 -2.278001 11.824000 -15.478010 -2.278001 11.824000
--14.521010 2.646999 10.661000 -14.521010 2.646999 10.661000
--13.565010 7.571999 9.498000 -13.565010 7.571999 9.498000
--12.608010 12.496999 8.334000 -12.608010 12.496999 8.334000
+-15.478000 -2.278001 11.824000 -15.478000 -2.278001 11.824000
+-14.521000 2.646999 10.661000 -14.521000 2.646999 10.661000
+-13.565000 7.571999 9.498000 -13.565000 7.571999 9.498000
+-12.608000 12.496999 8.334000 -12.608000 12.496999 8.334000
-11.466000 -3.737001 8.944000 -11.466000 -3.737001 8.944000
--10.509010 1.186999 7.781000 -10.509010 1.186999 7.781000
- -9.553010 6.111999 6.618000 -9.553010 6.111999 6.618000
- -8.596010 11.037000 5.455000 -8.596010 11.037000 5.455000
- -9.367000 -15.048000 8.391000 -9.367000 -15.048000 8.391000
- -8.411000 -10.123000 7.228000 -8.411000 -10.123000 7.228000
- -7.453000 -5.198000 6.064000 -7.453000 -5.198000 6.064000
+-10.509000 1.186999 7.781000 -10.509000 1.186999 7.781000
+ -9.553000 6.111999 6.618000 -9.553000 6.111999 6.618000
+ -8.596000 11.036999 5.455000 -8.596000 11.036999 5.455000
+ -9.366990 -15.048001 8.391000 -9.366990 -15.048001 8.391000
+ -8.410990 -10.123001 7.228000 -8.410990 -10.123001 7.228000
+ -7.452990 -5.198000 6.064000 -7.452990 -5.198000 6.064000
-6.497000 -0.273000 4.901000 -6.497000 -0.273000 4.901000
- -5.540010 4.652000 3.738000 -5.540010 4.652000 3.738000
- -4.584010 9.576000 2.575000 -4.584010 9.576000 2.575000
- -3.626010 14.501000 1.411000 -3.626010 14.501000 1.411000
- -2.669010 19.426000 0.248000 -2.669010 19.426000 0.248000
- -5.355000 -16.507000 5.512000 -5.355000 -16.507000 5.512000
- -4.398000 -11.582000 4.348000 -4.398000 -11.582000 4.348000
- -3.441000 -6.657000 3.185000 -3.441000 -6.657000 3.185000
- -2.484000 -1.733000 2.021000 -2.484000 -1.733000 2.021000
+ -5.540000 4.652000 3.738000 -5.540000 4.652000 3.738000
+ -4.584000 9.576000 2.575000 -4.584000 9.576000 2.575000
+ -3.626000 14.501000 1.411000 -3.626000 14.501000 1.411000
+ -2.669000 19.426000 0.248000 -2.669000 19.426000 0.248000
+ -5.354990 -16.507000 5.512000 -5.354990 -16.507000 5.512000
+ -4.397990 -11.582000 4.348000 -4.397990 -11.582000 4.348000
+ -3.440990 -6.657000 3.185000 -3.440990 -6.657000 3.185000
+ -2.483990 -1.733000 2.021000 -2.483990 -1.733000 2.021000
-1.528000 3.192000 0.858000 -1.528000 3.192000 0.858000
- -0.571010 8.117000 -0.305000 -0.571010 8.117000 -0.305000
- 0.385990 13.042000 -1.469000 0.385990 13.042000 -1.469000
- 1.342990 17.967000 -2.632000 1.342990 17.967000 -2.632000
- -1.343000 -17.967000 2.632000 -1.343000 -17.967000 2.632000
- -0.386000 -13.042000 1.469000 -0.386000 -13.042000 1.469000
- 0.571000 -8.117000 0.305000 0.571000 -8.117000 0.305000
- 1.528000 -3.192000 -0.858000 1.528000 -3.192000 -0.858000
- 2.484000 1.733001 -2.021000 2.484000 1.733001 -2.021000
- 3.440990 6.657001 -3.185000 3.440990 6.657001 -3.185000
- 4.397990 11.582001 -4.348000 4.397990 11.582001 -4.348000
- 5.354990 16.507001 -5.512000 5.354990 16.507001 -5.512000
- 2.669000 -19.425999 -0.248000 2.669000 -19.425999 -0.248000
- 3.626000 -14.500999 -1.411000 3.626000 -14.500999 -1.411000
- 4.584000 -9.575999 -2.575000 4.584000 -9.575999 -2.575000
- 5.540000 -4.651999 -3.738000 5.540000 -4.651999 -3.738000
- 6.497000 0.273001 -4.901000 6.497000 0.273001 -4.901000
+ -0.571000 8.117000 -0.305000 -0.571000 8.117000 -0.305000
+ 0.386000 13.042000 -1.469000 0.386000 13.042000 -1.469000
+ 1.343000 17.967000 -2.632000 1.343000 17.967000 -2.632000
+ -1.342990 -17.967000 2.632000 -1.342990 -17.967000 2.632000
+ -0.385990 -13.042000 1.469000 -0.385990 -13.042000 1.469000
+ 0.571010 -8.117000 0.305000 0.571010 -8.117000 0.305000
+ 1.528010 -3.192000 -0.858000 1.528010 -3.192000 -0.858000
+ 2.484000 1.733000 -2.021000 2.484000 1.733000 -2.021000
+ 3.441000 6.657001 -3.185000 3.441000 6.657001 -3.185000
+ 4.398000 11.582001 -4.348000 4.398000 11.582001 -4.348000
+ 5.355000 16.507001 -5.512000 5.355000 16.507001 -5.512000
+ 2.669010 -19.426000 -0.248000 2.669010 -19.426000 -0.248000
+ 3.626010 -14.500999 -1.411000 3.626010 -14.500999 -1.411000
+ 4.584010 -9.575999 -2.575000 4.584010 -9.575999 -2.575000
+ 5.540010 -4.651999 -3.738000 5.540010 -4.651999 -3.738000
+ 6.497010 0.273001 -4.901000 6.497010 0.273001 -4.901000
7.453000 5.198001 -6.064000 7.453000 5.198001 -6.064000
- 8.410990 10.123001 -7.228000 8.410990 10.123001 -7.228000
- 9.366990 15.048001 -8.391000 9.366990 15.048001 -8.391000
- 8.596000 -11.036999 -5.455000 8.596000 -11.036999 -5.455000
- 9.553000 -6.111999 -6.618000 9.553000 -6.111999 -6.618000
- 10.509000 -1.186999 -7.781000 10.509000 -1.186999 -7.781000
- 11.466000 3.737001 -8.944000 11.466000 3.737001 -8.944000
- 12.608000 -12.496999 -8.334000 12.608000 -12.496999 -8.334000
- 13.565000 -7.571999 -9.498000 13.565000 -7.571999 -9.498000
- 14.521000 -2.646998 -10.661000 14.521000 -2.646998 -10.661000
- 15.478000 2.278002 -11.824000 15.478000 2.278002 -11.824000
+ 8.411000 10.123001 -7.228000 8.411000 10.123001 -7.228000
+ 9.367000 15.048001 -8.391000 9.367000 15.048001 -8.391000
+ 8.596010 -11.036999 -5.455000 8.596010 -11.036999 -5.455000
+ 9.553010 -6.111999 -6.618000 9.553010 -6.111999 -6.618000
+ 10.509010 -1.186999 -7.781000 10.509010 -1.186999 -7.781000
+ 11.466010 3.737001 -8.944000 11.466010 3.737001 -8.944000
+ 12.608010 -12.496999 -8.334000 12.608010 -12.496999 -8.334000
+ 13.565010 -7.571998 -9.498000 13.565010 -7.571998 -9.498000
+ 14.521010 -2.646998 -10.661000 14.521010 -2.646998 -10.661000
+ 15.478010 2.278002 -11.824000 15.478010 2.278002 -11.824000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS306-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS306-AntennaField.conf
index 630e13349f022d2db8b35e700fbbc63c194bbe4d..b4df82546685f1891d731e681d5d3cb96409e90c 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS306-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS306-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS306
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:43
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:12
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3829791.807940000 452829.847915000 5063221.590 ]
+3 [ 3829791.764650000 452829.895393000 5063221.619 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
+ -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
-1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
0.533000 -5.775000 0.122000 0.533000 -5.775000 0.122000
- -2.558000 -4.649001 2.340000 -2.558000 -4.649001 2.340000
- -4.452000 -1.349001 3.464000 -4.452000 -1.349001 3.464000
- -4.263000 2.582999 2.967000 -4.263000 2.582999 2.967000
- -2.079000 5.304999 1.081000 -2.079000 5.304999 1.081000
+ -2.558000 -4.649000 2.340000 -2.558000 -4.649000 2.340000
+ -4.452000 -1.349000 3.464000 -4.452000 -1.349000 3.464000
+ -4.263000 2.583000 2.967000 -4.263000 2.583000 2.967000
+ -2.079000 5.305000 1.081000 -2.079000 5.305000 1.081000
1.078000 5.547000 -1.310000 1.078000 5.547000 -1.310000
3.730000 3.192000 -3.088000 3.730000 3.192000 -3.088000
- 4.637000 -0.656000 -3.421000 4.637000 -0.656000 -3.421000
+ 4.637000 -0.655999 -3.421000 4.637000 -0.655999 -3.421000
3.375000 -4.197000 -2.154000 3.375000 -4.197000 -2.154000
- 4.956000 -7.283000 -3.062000 4.956000 -7.283000 -3.062000
+ 4.956000 -7.282999 -3.062000 4.956000 -7.282999 -3.062000
2.691000 -9.440000 -1.167000 2.691000 -9.440000 -1.167000
-1.279000 -10.074000 1.870000 -1.279000 -10.074000 1.870000
- -6.252000 -5.961001 5.232000 -6.252000 -5.961001 5.232000
+ -6.252000 -5.961000 5.232000 -6.252000 -5.961000 5.232000
-7.598000 -3.124001 5.985000 -7.598000 -3.124001 5.985000
-8.067000 1.142999 5.952000 -8.067000 1.142999 5.952000
- -6.509000 4.811999 4.451000 -6.509000 4.811999 4.451000
- -2.991000 8.338999 1.492000 -2.991000 8.338999 1.492000
+ -6.509000 4.812000 4.451000 -6.509000 4.812000 4.451000
+ -2.991000 8.339000 1.492000 -2.991000 8.339000 1.492000
0.586000 9.807000 -1.326000 0.586000 9.807000 -1.326000
3.983000 8.473000 -3.756000 3.983000 8.473000 -3.756000
- 5.922000 5.241000 -4.919000 5.922000 5.241000 -4.919000
- 7.193000 0.591000 -5.452000 7.193000 0.591000 -5.452000
- 6.798000 -4.004000 -4.741000 6.798000 -4.004000 -4.741000
- 6.758000 -12.012000 -3.987000 6.758000 -12.012000 -3.987000
- 4.256000 -14.030000 -1.927000 4.256000 -14.030000 -1.927000
- 1.758000 -14.049000 -0.050000 1.758000 -14.049000 -0.050000
- -4.436000 -11.627001 4.381000 -4.436000 -11.627001 4.381000
+ 5.922000 5.241001 -4.919000 5.922000 5.241001 -4.919000
+ 7.193000 0.591001 -5.452000 7.193000 0.591001 -5.452000
+ 6.798000 -4.003999 -4.741000 6.798000 -4.003999 -4.741000
+ 6.758010 -12.011999 -3.987000 6.758010 -12.011999 -3.987000
+ 4.256010 -14.029999 -1.927000 4.256010 -14.029999 -1.927000
+ 1.758010 -14.049000 -0.050000 1.758010 -14.049000 -0.050000
+ -4.436000 -11.627000 4.381000 -4.436000 -11.627000 4.381000
-6.794000 -12.015001 6.186000 -6.794000 -12.015001 6.186000
-9.571000 -5.214001 7.655000 -9.571000 -5.214001 7.655000
-10.478000 -0.225001 7.885000 -10.478000 -0.225001 7.885000
-11.634000 4.945999 8.286000 -11.634000 4.945999 8.286000
-9.558000 6.929999 6.548000 -9.558000 6.929999 6.548000
-6.936000 10.184999 4.286000 -6.936000 10.184999 4.286000
- -1.959000 13.070999 0.289000 -1.959000 13.070999 0.289000
+ -1.959000 13.071000 0.289000 -1.959000 13.071000 0.289000
0.189000 13.681000 -1.379000 0.189000 13.681000 -1.379000
- 4.263000 11.817000 -4.268000 4.263000 11.817000 -4.268000
- 7.576000 11.220000 -6.700000 7.576000 11.220000 -6.700000
+ 4.263000 11.817001 -4.268000 4.263000 11.817001 -4.268000
+ 7.576000 11.220001 -6.700000 7.576000 11.220001 -6.700000
10.880000 3.180001 -8.454000 10.880000 3.180001 -8.454000
11.145000 -0.791999 -8.294000 11.145000 -0.791999 -8.294000
10.731000 -6.201999 -7.494000 10.731000 -6.201999 -7.494000
--31.286000 -32.083003 26.384000 -31.286000 -32.083003 26.384000
--27.493010 40.743997 16.954000 -27.493010 40.743997 16.954000
- 12.133000 -10.413999 -8.166000 12.133000 -10.413999 -8.166000
- 12.669000 -13.438999 -8.295000 12.669000 -13.438999 -8.295000
- 1.837000 -20.303000 0.456000 1.837000 -20.303000 0.456000
+-31.285990 -32.083003 26.383990 -31.285990 -32.083003 26.383990
+-27.493000 40.743997 16.953990 -27.493000 40.743997 16.953990
+ 12.133010 -10.413999 -8.166000 12.133010 -10.413999 -8.166000
+ 12.669010 -13.438999 -8.295000 12.669010 -13.438999 -8.295000
+ 1.837010 -20.303000 0.456000 1.837010 -20.303000 0.456000
-10.367000 -14.251001 9.070000 -10.367000 -14.251001 9.070000
-13.425000 -10.940001 11.066000 -13.425000 -10.940001 11.066000
--14.681000 1.130998 10.918000 -14.681000 1.130998 10.918000
+-14.681000 1.130999 10.918000 -14.681000 1.130999 10.918000
-10.411000 12.961999 6.643000 -10.411000 12.961999 6.643000
-6.610000 19.072999 3.237000 -6.610000 19.072999 3.237000
- 4.866000 16.618000 -5.155000 4.866000 16.618000 -5.155000
+ 4.866000 16.618001 -5.155000 4.866000 16.618001 -5.155000
11.041000 13.503001 -9.508000 11.041000 13.503001 -9.508000
14.394000 4.285001 -11.192000 14.394000 4.285001 -11.192000
- 19.887000 -0.547999 -14.878000 19.887000 -0.547999 -14.878000
- 17.596000 -13.038999 -12.029000 17.596000 -13.038999 -12.029000
- 10.755000 -22.174999 -6.069000 10.755000 -22.174999 -6.069000
- 6.275000 -24.700000 -2.478000 6.275000 -24.700000 -2.478000
- -0.216000 -26.604000 2.567000 -0.216000 -26.604000 2.567000
+ 19.887000 -0.547998 -14.878000 19.887000 -0.547998 -14.878000
+ 17.596010 -13.038998 -12.029000 17.596010 -13.038998 -12.029000
+ 10.755010 -22.174999 -6.069000 10.755010 -22.174999 -6.069000
+ 6.275010 -24.699999 -2.478000 6.275010 -24.699999 -2.478000
+ -0.215990 -26.604000 2.567000 -0.215990 -26.604000 2.567000
-12.549000 -17.210001 10.975000 -12.549000 -17.210001 10.975000
--16.926000 -11.129002 13.711000 -16.926000 -11.129002 13.711000
--20.948000 2.003998 15.543000 -20.948000 2.003998 15.543000
--16.815000 14.913998 11.274000 -16.815000 14.913998 11.274000
+-16.926000 -11.129001 13.711000 -16.926000 -11.129001 13.711000
+-20.948000 2.003998 15.542990 -20.948000 2.003998 15.542990
+-16.815000 14.913999 11.273990 -16.815000 14.913999 11.273990
-12.192000 21.874999 7.174000 -12.192000 21.874999 7.174000
- -3.179000 24.575999 0.165000 -3.179000 24.575999 0.165000
- 9.728000 23.389000 -9.416000 9.728000 23.389000 -9.416000
- 19.626000 10.041001 -15.639000 19.626000 10.041001 -15.639000
- 27.702000 0.091002 -20.802000 27.702000 0.091002 -20.802000
- 23.267000 -13.389998 -16.254000 23.267000 -13.389998 -16.254000
- 16.377000 -24.694999 -10.061000 16.377000 -24.694999 -10.061000
- 11.723000 -29.868999 -6.100000 11.723000 -29.868999 -6.100000
- -3.319000 -30.962001 5.290000 -3.319000 -30.962001 5.290000
--17.256000 -25.251002 15.235000 -17.256000 -25.251002 15.235000
--23.604000 -15.465002 19.115000 -23.604000 -15.465002 19.115000
--23.209000 -6.174002 17.979000 -23.209000 -6.174002 17.979000
--26.950000 7.906997 19.515000 -26.950000 7.906997 19.515000
--19.966000 24.265998 12.793000 -19.966000 24.265998 12.793000
--14.373000 29.492998 8.123000 -14.373000 29.492998 8.123000
- -2.498000 34.569999 -1.250000 -2.498000 34.569999 -1.250000
+ -3.179000 24.576000 0.165000 -3.179000 24.576000 0.165000
+ 9.728000 23.389001 -9.416000 9.728000 23.389001 -9.416000
+ 19.626000 10.041002 -15.639000 19.626000 10.041002 -15.639000
+ 27.702010 0.091003 -20.802000 27.702010 0.091003 -20.802000
+ 23.267010 -13.389998 -16.254000 23.267010 -13.389998 -16.254000
+ 16.377010 -24.694998 -10.061000 16.377010 -24.694998 -10.061000
+ 11.723010 -29.868999 -6.100000 11.723010 -29.868999 -6.100000
+ -3.318990 -30.962000 5.290000 -3.318990 -30.962000 5.290000
+-17.255990 -25.251001 15.235000 -17.255990 -25.251001 15.235000
+-23.604000 -15.465002 19.114990 -23.604000 -15.465002 19.114990
+-23.209000 -6.174002 17.978990 -23.209000 -6.174002 17.978990
+-26.950000 7.906998 19.514990 -26.950000 7.906998 19.514990
+-19.966000 24.265998 12.792990 -19.966000 24.265998 12.792990
+-14.373000 29.492999 8.122990 -14.373000 29.492999 8.122990
+ -2.498000 34.570000 -1.250000 -2.498000 34.570000 -1.250000
3.767000 31.608000 -5.685000 3.767000 31.608000 -5.685000
- 18.832000 22.205001 -16.143000 18.832000 22.205001 -16.143000
- 20.374000 15.693001 -16.711000 20.374000 15.693001 -16.711000
- 25.157000 17.303002 -20.447000 25.157000 17.303002 -20.447000
- 29.479000 -21.662998 -20.170000 29.479000 -21.662998 -20.170000
- 13.692000 -36.949999 -6.938000 13.692000 -36.949999 -6.938000
- -1.712000 -41.640000 5.049000 -1.712000 -41.640000 5.049000
--13.823000 -35.359001 13.572000 -13.823000 -35.359001 13.572000
--32.942000 3.997997 24.365000 -32.942000 3.997997 24.365000
--23.906000 22.635998 15.899000 -23.906000 22.635998 15.899000
--17.381010 36.339998 9.762000 -17.381010 36.339998 9.762000
- 17.111000 31.082001 -15.653000 17.111000 31.082001 -15.653000
+ 18.832000 22.205002 -16.143000 18.832000 22.205002 -16.143000
+ 20.374000 15.693002 -16.711000 20.374000 15.693002 -16.711000
+ 25.157000 17.303003 -20.447000 25.157000 17.303003 -20.447000
+ 29.479010 -21.662997 -20.170000 29.479010 -21.662997 -20.170000
+ 13.692010 -36.949999 -6.938000 13.692010 -36.949999 -6.938000
+ -1.711990 -41.640000 5.049000 -1.711990 -41.640000 5.049000
+-13.822990 -35.359001 13.572000 -13.822990 -35.359001 13.572000
+-32.942000 3.997997 24.364990 -32.942000 3.997997 24.364990
+-23.906000 22.635998 15.898990 -23.906000 22.635998 15.898990
+-17.381000 36.339998 9.761990 -17.381000 36.339998 9.761990
+ 17.111000 31.082002 -15.653000 17.111000 31.082002 -15.653000
]
NORMAL_VECTOR HBA
@@ -126,54 +126,54 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3829771.248940000 452761.701913000 5063243.181 ]
+3 [ 3829771.205660000 452761.749391000 5063243.210 ]
48 x 2 x 3 [
--12.341000 12.911999 8.096000 -12.341000 12.911999 8.096000
- -8.719000 15.122999 5.178000 -8.719000 15.122999 5.178000
- -5.097000 17.334000 2.259000 -5.097000 17.334000 2.259000
- -1.475000 19.544000 -0.659000 -1.475000 19.544000 -0.659000
--10.367000 8.274999 7.034000 -10.367000 8.274999 7.034000
- -6.745000 10.485999 4.115000 -6.745000 10.485999 4.115000
- -3.123000 12.697000 1.197000 -3.123000 12.697000 1.197000
+-12.341000 12.911999 8.095990 -12.341000 12.911999 8.095990
+ -8.719000 15.122999 5.177990 -8.719000 15.122999 5.177990
+ -5.097000 17.334000 2.258990 -5.097000 17.334000 2.258990
+ -1.475000 19.544000 -0.659010 -1.475000 19.544000 -0.659010
+-10.367000 8.274999 7.033990 -10.367000 8.274999 7.033990
+ -6.745000 10.486000 4.114990 -6.745000 10.486000 4.114990
+ -3.123000 12.697000 1.196990 -3.123000 12.697000 1.196990
0.499000 14.908000 -1.722000 0.499000 14.908000 -1.722000
--15.637000 -0.782001 11.808000 -15.637000 -0.782001 11.808000
--12.016000 1.428999 8.890000 -12.016000 1.428999 8.890000
- -8.393000 3.638999 5.971000 -8.393000 3.638999 5.971000
- -4.772000 5.849000 3.053000 -4.772000 5.849000 3.053000
+-15.637000 -0.782001 11.807990 -15.637000 -0.782001 11.807990
+-12.016000 1.428999 8.889990 -12.016000 1.428999 8.889990
+ -8.393000 3.638999 5.970990 -8.393000 3.638999 5.970990
+ -4.772000 5.849000 3.052990 -4.772000 5.849000 3.052990
-1.149000 8.060000 0.134000 -1.149000 8.060000 0.134000
2.472000 10.270000 -2.784000 2.472000 10.270000 -2.784000
- 6.094000 12.482000 -5.702000 6.094000 12.482000 -5.702000
+ 6.094000 12.482001 -5.702000 6.094000 12.482001 -5.702000
9.716000 14.692001 -8.621000 9.716000 14.692001 -8.621000
--13.664000 -5.418001 10.746000 -13.664000 -5.418001 10.746000
--10.042000 -3.208001 7.827000 -10.042000 -3.208001 7.827000
- -6.420000 -0.997001 4.909000 -6.420000 -0.997001 4.909000
+-13.664000 -5.418001 10.745990 -13.664000 -5.418001 10.745990
+-10.042000 -3.208001 7.826990 -10.042000 -3.208001 7.826990
+ -6.420000 -0.997000 4.908990 -6.420000 -0.997000 4.908990
-2.798000 1.213000 1.990000 -2.798000 1.213000 1.990000
0.824000 3.423000 -0.928000 0.824000 3.423000 -0.928000
- 4.446000 5.634000 -3.846000 4.446000 5.634000 -3.846000
+ 4.446000 5.634001 -3.846000 4.446000 5.634001 -3.846000
8.068000 7.844001 -6.765000 8.068000 7.844001 -6.765000
11.690000 10.056001 -9.683000 11.690000 10.056001 -9.683000
--11.690000 -10.056001 9.683000 -11.690000 -10.056001 9.683000
- -8.068000 -7.844001 6.765000 -8.068000 -7.844001 6.765000
- -4.446000 -5.634000 3.846000 -4.446000 -5.634000 3.846000
+-11.690000 -10.056001 9.682990 -11.690000 -10.056001 9.682990
+ -8.068000 -7.844001 6.764990 -8.068000 -7.844001 6.764990
+ -4.446000 -5.634000 3.845990 -4.446000 -5.634000 3.845990
-0.824000 -3.423000 0.928000 -0.824000 -3.423000 0.928000
2.798000 -1.213000 -1.990000 2.798000 -1.213000 -1.990000
6.420000 0.997001 -4.909000 6.420000 0.997001 -4.909000
10.042000 3.208001 -7.827000 10.042000 3.208001 -7.827000
- 13.664000 5.418001 -10.746000 13.664000 5.418001 -10.746000
- -9.716000 -14.692001 8.621000 -9.716000 -14.692001 8.621000
- -6.094000 -12.482001 5.702000 -6.094000 -12.482001 5.702000
+ 13.664000 5.418002 -10.746000 13.664000 5.418002 -10.746000
+ -9.716000 -14.692001 8.620990 -9.716000 -14.692001 8.620990
+ -6.094000 -12.482000 5.701990 -6.094000 -12.482000 5.701990
-2.472000 -10.270000 2.784000 -2.472000 -10.270000 2.784000
1.149000 -8.060000 -0.134000 1.149000 -8.060000 -0.134000
- 4.772000 -5.849000 -3.053000 4.772000 -5.849000 -3.053000
+ 4.772000 -5.848999 -3.053000 4.772000 -5.848999 -3.053000
8.393000 -3.638999 -5.971000 8.393000 -3.638999 -5.971000
12.016000 -1.428999 -8.890000 12.016000 -1.428999 -8.890000
- 15.637000 0.782001 -11.808000 15.637000 0.782001 -11.808000
+ 15.637000 0.782002 -11.808000 15.637000 0.782002 -11.808000
-0.499000 -14.908000 1.722000 -0.499000 -14.908000 1.722000
- 3.123000 -12.697000 -1.197000 3.123000 -12.697000 -1.197000
+ 3.123000 -12.696999 -1.197000 3.123000 -12.696999 -1.197000
6.745000 -10.485999 -4.115000 6.745000 -10.485999 -4.115000
10.367000 -8.274999 -7.034000 10.367000 -8.274999 -7.034000
1.475000 -19.544000 0.659000 1.475000 -19.544000 0.659000
- 5.097000 -17.334000 -2.259000 5.097000 -17.334000 -2.259000
+ 5.097000 -17.333999 -2.259000 5.097000 -17.333999 -2.259000
8.719000 -15.122999 -5.178000 8.719000 -15.122999 -5.178000
12.341000 -12.911999 -8.096000 12.341000 -12.911999 -8.096000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS307-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS307-AntennaField.conf
index 12b785800ea09a33a71707af8cc4ca424c793b43..b60604819d0ffb0821f5f5682ae07d145786e556 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS307-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS307-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS307
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:43
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:12
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3837940.948570000 449560.755604000 5057381.288 ]
+3 [ 3837940.905370000 449560.803170000 5057381.316 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
@@ -24,95 +24,95 @@ LBA
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- -4.263000 2.582999 2.967000 -4.263000 2.582999 2.967000
+ -4.263000 2.583000 2.967000 -4.263000 2.583000 2.967000
-2.079000 5.305000 1.081000 -2.079000 5.305000 1.081000
1.078000 5.547000 -1.310000 1.078000 5.547000 -1.310000
- 3.730000 3.192000 -3.088000 3.730000 3.192000 -3.088000
- 4.637000 -0.656000 -3.421000 4.637000 -0.656000 -3.421000
+ 3.730000 3.192001 -3.088000 3.730000 3.192001 -3.088000
+ 4.637000 -0.655999 -3.421000 4.637000 -0.655999 -3.421000
3.375000 -4.196000 -2.154000 3.375000 -4.196000 -2.154000
0.533000 -5.774000 0.122000 0.533000 -5.774000 0.122000
-2.558000 -4.649000 2.340000 -2.558000 -4.649000 2.340000
- -4.452000 -1.349001 3.464000 -4.452000 -1.349001 3.464000
+ -4.452000 -1.349000 3.464000 -4.452000 -1.349000 3.464000
-7.318000 -1.370001 5.617000 -7.318000 -1.370001 5.617000
-7.794000 2.255999 5.646000 -7.794000 2.255999 5.646000
- -6.436000 6.890999 4.209000 -6.436000 6.890999 4.209000
+ -6.436000 6.891000 4.209000 -6.436000 6.891000 4.209000
-1.319000 10.012000 0.085000 -1.319000 10.012000 0.085000
1.267000 9.915000 -1.847000 1.267000 9.915000 -1.847000
- 4.451000 8.087000 -4.072000 4.451000 8.087000 -4.072000
- 6.301000 4.398000 -5.127000 6.301000 4.398000 -5.127000
- 7.163000 -1.330000 -5.257000 7.163000 -1.330000 -5.257000
- 6.564000 -5.996000 -4.385000 6.564000 -5.996000 -4.385000
- 4.096000 -8.936000 -2.267000 4.096000 -8.936000 -2.267000
+ 4.451000 8.087001 -4.072000 4.451000 8.087001 -4.072000
+ 6.301000 4.398001 -5.127000 6.301000 4.398001 -5.127000
+ 7.163000 -1.329999 -5.257000 7.163000 -1.329999 -5.257000
+ 6.564000 -5.995999 -4.385000 6.564000 -5.995999 -4.385000
+ 4.096000 -8.935999 -2.267000 4.096000 -8.935999 -2.267000
0.966000 -9.262000 0.112000 0.966000 -9.262000 0.112000
-2.848000 -8.091000 2.869000 -2.848000 -8.091000 2.869000
- -5.869000 -5.153001 4.871000 -5.869000 -5.153001 4.871000
+ -5.869000 -5.153000 4.871000 -5.869000 -5.153000 4.871000
-11.428000 -0.730001 8.644000 -11.428000 -0.730001 8.644000
-11.700000 3.075999 8.504000 -11.700000 3.075999 8.504000
-10.581000 5.783999 7.419000 -10.581000 5.783999 7.419000
- -6.088000 11.150999 3.562000 -6.088000 11.150999 3.562000
- -5.289000 13.908999 2.713000 -5.289000 13.908999 2.713000
+ -6.088000 11.151000 3.562000 -6.088000 11.151000 3.562000
+ -5.289000 13.909000 2.713000 -5.289000 13.909000 2.713000
0.705000 13.188000 -1.721000 0.705000 13.188000 -1.721000
- 4.592000 11.439000 -4.481000 4.592000 11.439000 -4.481000
- 8.716000 9.860000 -7.434000 8.716000 9.860000 -7.434000
+ 4.592000 11.439001 -4.481000 4.592000 11.439001 -4.481000
+ 8.716000 9.860001 -7.434000 8.716000 9.860001 -7.434000
9.157000 6.532001 -7.464000 9.157000 6.532001 -7.464000
10.237000 1.921001 -7.857000 10.237000 1.921001 -7.857000
9.991000 -5.031999 -7.045000 9.991000 -5.031999 -7.045000
9.442000 -7.685999 -6.392000 9.442000 -7.685999 -6.392000
- 6.298000 -11.066000 -3.727000 6.298000 -11.066000 -3.727000
- 4.381010 -14.318000 -1.994000 4.381010 -14.318000 -1.994000
+ 6.298000 -11.065999 -3.727000 6.298000 -11.065999 -3.727000
+ 4.381000 -14.317999 -1.994000 4.381000 -14.317999 -1.994000
-2.715000 -13.490000 3.257000 -2.715000 -13.490000 3.257000
- -5.602000 -11.604001 5.254000 -5.602000 -11.604001 5.254000
+ -5.602000 -11.604000 5.254000 -5.602000 -11.604000 5.254000
-9.182000 -8.198001 7.633000 -9.182000 -8.198001 7.633000
-43.593000 -4.950004 33.169000 -43.593000 -4.950004 33.169000
- -3.829000 69.137999 -3.375000 -3.829000 69.137999 -3.375000
+ -3.829010 69.138000 -3.375000 -3.829010 69.138000 -3.375000
-12.751000 -7.408001 10.241000 -12.751000 -7.408001 10.241000
--15.100000 -6.335002 11.907000 -15.100000 -6.335002 11.907000
--14.972000 9.118998 10.414000 -14.972000 9.118998 10.414000
- -5.228000 18.989999 2.208000 -5.228000 18.989999 2.208000
+-15.100000 -6.335001 11.907000 -15.100000 -6.335001 11.907000
+-14.972000 9.118999 10.414000 -14.972000 9.118999 10.414000
+ -5.228000 18.990000 2.208000 -5.228000 18.990000 2.208000
-1.536000 20.481000 -0.698000 -1.536000 20.481000 -0.698000
- 7.440000 15.237000 -6.962000 7.440000 15.237000 -6.962000
+ 7.440000 15.237001 -6.962000 7.440000 15.237001 -6.962000
13.745000 4.156001 -10.693000 13.745000 4.156001 -10.693000
- 16.278000 -3.291999 -11.921000 16.278000 -3.291999 -11.921000
- 9.369010 -14.342999 -5.736000 9.369010 -14.342999 -5.736000
- 4.401010 -19.308000 -1.558000 4.401010 -19.308000 -1.558000
- -3.538000 -17.890001 4.273000 -3.538000 -17.890001 4.273000
- -9.392990 -21.179001 8.965000 -9.392990 -21.179001 8.965000
--17.054000 -11.874002 13.874000 -17.054000 -11.874002 13.874000
+ 16.278000 -3.291998 -11.921000 16.278000 -3.291998 -11.921000
+ 9.369000 -14.342999 -5.736000 9.369000 -14.342999 -5.736000
+ 4.401000 -19.307999 -1.558000 4.401000 -19.307999 -1.558000
+ -3.538000 -17.890000 4.273000 -3.538000 -17.890000 4.273000
+ -9.393000 -21.179001 8.965000 -9.393000 -21.179001 8.965000
+-17.054000 -11.874001 13.874000 -17.054000 -11.874001 13.874000
-20.318000 0.509998 15.205000 -20.318000 0.509998 15.205000
-20.045000 6.729998 14.438000 -20.045000 6.729998 14.438000
-18.431000 14.781998 12.498000 -18.431000 14.781998 12.498000
- -6.299000 22.963999 2.653000 -6.299000 22.963999 2.653000
+ -6.299000 22.964000 2.653000 -6.299000 22.964000 2.653000
-0.081000 24.366000 -2.141000 -0.081000 24.366000 -2.141000
10.888000 21.529001 -10.118000 10.888000 21.529001 -10.118000
- 18.006000 10.006001 -14.420000 18.006000 10.006001 -14.420000
- 20.759000 1.205001 -15.691000 20.759000 1.205001 -15.691000
- 18.557010 -10.005999 -13.024000 18.557010 -10.005999 -13.024000
- 11.881010 -23.297999 -6.812000 11.881010 -23.297999 -6.812000
- -1.899990 -26.687000 3.838000 -1.899990 -26.687000 3.838000
--12.488990 -29.969001 12.084000 -12.488990 -29.969001 12.084000
+ 18.006000 10.006002 -14.420000 18.006000 10.006002 -14.420000
+ 20.759000 1.205002 -15.691000 20.759000 1.205002 -15.691000
+ 18.557000 -10.005998 -13.024000 18.557000 -10.005998 -13.024000
+ 11.881000 -23.297999 -6.812000 11.881000 -23.297999 -6.812000
+ -1.900000 -26.687000 3.838000 -1.900000 -26.687000 3.838000
+-12.489000 -29.969001 12.084000 -12.489000 -29.969001 12.084000
-19.869000 -17.806002 16.523000 -19.869000 -17.806002 16.523000
-24.620000 -4.182002 18.858000 -24.620000 -4.182002 18.858000
-26.115000 3.671998 19.270000 -26.115000 3.671998 19.270000
-20.061000 20.517998 13.203000 -20.061000 20.517998 13.203000
-9.767000 32.446999 4.399000 -9.767000 32.446999 4.399000
-0.075000 33.950000 -3.012000 -0.075000 33.950000 -3.012000
- 6.217000 28.443000 -7.237000 6.217000 28.443000 -7.237000
- 17.719000 24.784001 -15.541000 17.719000 24.784001 -15.541000
- 25.947000 8.293002 -20.226000 25.947000 8.293002 -20.226000
- 27.053000 -0.604998 -20.251000 27.053000 -0.604998 -20.251000
- 25.209010 -16.206998 -17.457000 25.209010 -16.206998 -17.457000
- 20.306010 -21.353999 -13.312000 20.306010 -21.353999 -13.312000
- 6.931010 -32.482000 -2.267000 6.931010 -32.482000 -2.267000
- 1.697010 -30.587000 1.491000 1.697010 -30.587000 1.491000
- 0.652010 -36.632000 2.822000 0.652010 -36.632000 2.822000
+ 6.217000 28.443001 -7.237000 6.217000 28.443001 -7.237000
+ 17.719000 24.784002 -15.541000 17.719000 24.784002 -15.541000
+ 25.947000 8.293003 -20.226000 25.947000 8.293003 -20.226000
+ 27.053000 -0.604997 -20.251000 27.053000 -0.604997 -20.251000
+ 25.209000 -16.206997 -17.457000 25.209000 -16.206997 -17.457000
+ 20.306000 -21.353998 -13.312000 20.306000 -21.353998 -13.312000
+ 6.931000 -32.481999 -2.267000 6.931000 -32.481999 -2.267000
+ 1.697000 -30.587000 1.491000 1.697000 -30.587000 1.491000
+ 0.652000 -36.632000 2.822000 0.652000 -36.632000 2.822000
-28.445000 -19.992003 23.158000 -28.445000 -19.992003 23.158000
-31.939000 5.417997 23.484000 -31.939000 5.417997 23.484000
-28.224000 24.620997 18.960000 -28.224000 24.620997 18.960000
-18.363000 34.264998 10.687000 -18.363000 34.264998 10.687000
- 17.712000 33.391001 -16.313000 17.712000 33.391001 -16.313000
- 26.598000 13.440002 -21.180000 26.598000 13.440002 -21.180000
- 33.185010 -1.099997 -24.809990 33.185010 -1.099997 -24.809990
- 13.894010 -35.477999 -7.222000 13.894010 -35.477999 -7.222000
+ 17.712000 33.391002 -16.313000 17.712000 33.391002 -16.313000
+ 26.598000 13.440003 -21.180000 26.598000 13.440003 -21.180000
+ 33.185000 -1.099997 -24.810000 33.185000 -1.099997 -24.810000
+ 13.894000 -35.477998 -7.222000 13.894000 -35.477998 -7.222000
]
NORMAL_VECTOR HBA
@@ -126,54 +126,54 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3837964.519570000 449627.260606000 5057357.585 ]
+3 [ 3837964.476370000 449627.308172000 5057357.613 ]
48 x 2 x 3 [
--14.585000 -6.268002 11.514000 -14.585000 -6.268002 11.514000
--14.483000 -1.147002 10.975000 -14.483000 -1.147002 10.975000
--14.382000 3.973998 10.436000 -14.382000 3.973998 10.436000
--14.280000 9.094998 9.897000 -14.280000 9.094998 9.897000
+-14.585000 -6.268001 11.514000 -14.585000 -6.268001 11.514000
+-14.483010 -1.147001 10.975000 -14.483010 -1.147001 10.975000
+-14.382010 3.973999 10.436000 -14.382010 3.973999 10.436000
+-14.280010 9.094999 9.897000 -14.280010 9.094999 9.897000
-10.462000 -6.671001 8.456000 -10.462000 -6.671001 8.456000
--10.360000 -1.550001 7.917000 -10.360000 -1.550001 7.917000
--10.258000 3.570999 7.377000 -10.258000 3.570999 7.377000
--10.156000 8.689999 6.838000 -10.156000 8.689999 6.838000
- -6.541000 -17.317001 6.475000 -6.541000 -17.317001 6.475000
- -6.439000 -12.196001 5.936000 -6.439000 -12.196001 5.936000
- -6.338000 -7.075001 5.397000 -6.338000 -7.075001 5.397000
- -6.236000 -1.954001 4.858000 -6.236000 -1.954001 4.858000
- -6.134000 3.165999 4.318000 -6.134000 3.165999 4.318000
- -6.033000 8.286999 3.779000 -6.033000 8.286999 3.779000
- -5.931000 13.407999 3.240000 -5.931000 13.407999 3.240000
- -5.830000 18.528999 2.701000 -5.830000 18.528999 2.701000
- -2.418000 -17.720001 3.416000 -2.418000 -17.720001 3.416000
+-10.360010 -1.550001 7.917000 -10.360010 -1.550001 7.917000
+-10.258010 3.570999 7.377000 -10.258010 3.570999 7.377000
+-10.156010 8.689999 6.838000 -10.156010 8.689999 6.838000
+ -6.541000 -17.317000 6.475000 -6.541000 -17.317000 6.475000
+ -6.439000 -12.196000 5.936000 -6.439000 -12.196000 5.936000
+ -6.338000 -7.075000 5.397000 -6.338000 -7.075000 5.397000
+ -6.236000 -1.954000 4.858000 -6.236000 -1.954000 4.858000
+ -6.134010 3.166000 4.318000 -6.134010 3.166000 4.318000
+ -6.033010 8.287000 3.779000 -6.033010 8.287000 3.779000
+ -5.931010 13.408000 3.240000 -5.931010 13.408000 3.240000
+ -5.830010 18.529000 2.701000 -5.830010 18.529000 2.701000
+ -2.418000 -17.720000 3.416000 -2.418000 -17.720000 3.416000
-2.316000 -12.600000 2.877000 -2.316000 -12.600000 2.877000
-2.214000 -7.479000 2.338000 -2.214000 -7.479000 2.338000
-2.113000 -2.359000 1.799000 -2.113000 -2.359000 1.799000
- -2.011000 2.762000 1.260000 -2.011000 2.762000 1.260000
- -1.909000 7.883000 0.720000 -1.909000 7.883000 0.720000
- -1.808000 13.004000 0.181000 -1.808000 13.004000 0.181000
- -1.706000 18.124000 -0.358000 -1.706000 18.124000 -0.358000
- 1.706000 -18.124000 0.358000 1.706000 -18.124000 0.358000
- 1.808000 -13.004000 -0.181000 1.808000 -13.004000 -0.181000
- 1.909000 -7.883000 -0.720000 1.909000 -7.883000 -0.720000
- 2.011000 -2.762000 -1.260000 2.011000 -2.762000 -1.260000
- 2.113000 2.359000 -1.799000 2.113000 2.359000 -1.799000
- 2.214000 7.479000 -2.338000 2.214000 7.479000 -2.338000
- 2.316000 12.600000 -2.877000 2.316000 12.600000 -2.877000
- 2.418000 17.720000 -3.416000 2.418000 17.720000 -3.416000
- 5.830000 -18.529000 -2.701000 5.830000 -18.529000 -2.701000
- 5.931000 -13.408000 -3.240000 5.931000 -13.408000 -3.240000
- 6.033000 -8.287000 -3.779000 6.033000 -8.287000 -3.779000
- 6.134000 -3.166000 -4.318000 6.134000 -3.166000 -4.318000
- 6.236000 1.954000 -4.858000 6.236000 1.954000 -4.858000
- 6.338000 7.075000 -5.397000 6.338000 7.075000 -5.397000
- 6.439000 12.196000 -5.936000 6.439000 12.196000 -5.936000
- 6.541000 17.317000 -6.475000 6.541000 17.317000 -6.475000
+ -2.011010 2.762000 1.260000 -2.011010 2.762000 1.260000
+ -1.909010 7.883000 0.720000 -1.909010 7.883000 0.720000
+ -1.808010 13.004000 0.181000 -1.808010 13.004000 0.181000
+ -1.706010 18.124000 -0.358000 -1.706010 18.124000 -0.358000
+ 1.706000 -18.123999 0.358000 1.706000 -18.123999 0.358000
+ 1.808000 -13.003999 -0.181000 1.808000 -13.003999 -0.181000
+ 1.909000 -7.882999 -0.720000 1.909000 -7.882999 -0.720000
+ 2.011000 -2.761999 -1.260000 2.011000 -2.761999 -1.260000
+ 2.113000 2.359001 -1.799000 2.113000 2.359001 -1.799000
+ 2.213990 7.479001 -2.338000 2.213990 7.479001 -2.338000
+ 2.315990 12.600001 -2.877000 2.315990 12.600001 -2.877000
+ 2.417990 17.720001 -3.416000 2.417990 17.720001 -3.416000
+ 5.830000 -18.528999 -2.701000 5.830000 -18.528999 -2.701000
+ 5.931000 -13.407999 -3.240000 5.931000 -13.407999 -3.240000
+ 6.033000 -8.286999 -3.779000 6.033000 -8.286999 -3.779000
+ 6.134000 -3.165999 -4.318000 6.134000 -3.165999 -4.318000
+ 6.236000 1.954001 -4.858000 6.236000 1.954001 -4.858000
+ 6.337990 7.075001 -5.397000 6.337990 7.075001 -5.397000
+ 6.438990 12.196001 -5.936000 6.438990 12.196001 -5.936000
+ 6.540990 17.317001 -6.475000 6.540990 17.317001 -6.475000
10.156000 -8.689999 -6.838000 10.156000 -8.689999 -6.838000
10.258000 -3.570999 -7.377000 10.258000 -3.570999 -7.377000
10.360000 1.550001 -7.917000 10.360000 1.550001 -7.917000
10.462000 6.671001 -8.456000 10.462000 6.671001 -8.456000
- 14.280000 -9.094999 -9.896990 14.280000 -9.094999 -9.896990
- 14.382000 -3.973999 -10.435990 14.382000 -3.973999 -10.435990
- 14.483000 1.147001 -10.974990 14.483000 1.147001 -10.974990
- 14.585000 6.268001 -11.514000 14.585000 6.268001 -11.514000
+ 14.280000 -9.094998 -9.897000 14.280000 -9.094998 -9.897000
+ 14.382000 -3.973998 -10.436000 14.382000 -3.973998 -10.436000
+ 14.483000 1.147002 -10.975000 14.483000 1.147002 -10.975000
+ 14.585000 6.268002 -11.514000 14.585000 6.268002 -11.514000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS310-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS310-AntennaField.conf
index d3353ad01cab9c9ee00cdfa0d89127147ea11814..99c610d265388e675c632f5b7883462e8ab7c1d2 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS310-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS310-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS310
-# ITRF2005 target_date = 2012.5
-# Created: 2012-12-04 12:46:44
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:12
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3845433.051930000 413580.888254000 5054756.170 ]
+3 [ 3845433.009150000 413580.935904000 5054756.199 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.015000 -0.243000 1.544000 -2.015000 -0.243000 1.544000
- -1.326000 2.106000 0.831000 -1.326000 2.106000 0.831000
+ -2.015000 -0.243001 1.544000 -2.015000 -0.243001 1.544000
+ -1.326000 2.105999 0.831000 -1.326000 2.105999 0.831000
0.808000 2.364000 -0.804000 0.808000 2.364000 -0.804000
2.015000 0.243000 -1.544000 2.015000 0.243000 -1.544000
- 1.326000 -2.106000 -0.831000 1.326000 -2.106000 -0.831000
+ 1.326010 -2.106000 -0.831000 1.326010 -2.106000 -0.831000
-0.808000 -2.364000 0.804000 -0.808000 -2.364000 0.804000
- -2.009000 -5.085000 1.934000 -2.009000 -5.085000 1.934000
- -4.222000 -2.119000 3.365000 -4.222000 -2.119000 3.365000
- -4.459000 1.839000 3.222000 -4.459000 1.839000 3.222000
- -2.610000 4.936000 1.571000 -2.610000 4.936000 1.571000
+ -2.008990 -5.085001 1.934000 -2.008990 -5.085001 1.934000
+ -4.222000 -2.119001 3.365000 -4.222000 -2.119001 3.365000
+ -4.459000 1.838999 3.222000 -4.459000 1.838999 3.222000
+ -2.610000 4.935999 1.571000 -2.610000 4.935999 1.571000
0.461000 5.724000 -0.816000 0.461000 5.724000 -0.816000
3.316000 3.833000 -2.820000 3.316000 3.833000 -2.820000
- 4.619000 0.149001 -3.505000 4.619000 0.149001 -3.505000
- 3.761000 -3.605000 -2.550000 3.761000 -3.605000 -2.550000
- 1.143000 -5.672000 -0.401000 1.143000 -5.672000 -0.401000
- 1.200000 -9.248000 -0.153000 1.200000 -9.248000 -0.153000
- -1.699000 -9.516000 2.062000 -1.699000 -9.516000 2.062000
- -5.431000 -7.411000 4.712000 -5.431000 -7.411000 4.712000
+ 4.619000 0.149000 -3.505000 4.619000 0.149000 -3.505000
+ 3.761010 -3.605000 -2.550000 3.761010 -3.605000 -2.550000
+ 1.143010 -5.672000 -0.401000 1.143010 -5.672000 -0.401000
+ 1.200010 -9.248000 -0.153000 1.200010 -9.248000 -0.153000
+ -1.698990 -9.516001 2.062000 -1.698990 -9.516001 2.062000
+ -5.430990 -7.411001 4.712000 -5.430990 -7.411001 4.712000
-8.003000 -0.750001 6.113000 -8.003000 -0.750001 6.113000
-7.961000 2.463999 5.819000 -7.961000 2.463999 5.819000
- -6.541000 6.272000 4.434000 -6.541000 6.272000 4.434000
- -3.611000 8.250000 2.058000 -3.611000 8.250000 2.058000
+ -6.541000 6.271999 4.434000 -6.541000 6.271999 4.434000
+ -3.611000 8.249999 2.058000 -3.611000 8.249999 2.058000
0.965000 8.813000 -1.449000 0.965000 8.813000 -1.449000
- 4.713000 7.650001 -4.188000 4.713000 7.650001 -4.188000
- 7.102000 4.309001 -5.722000 7.102000 4.309001 -5.722000
- 7.407000 0.378001 -5.632000 7.407000 0.378001 -5.632000
- 6.522000 -4.272999 -4.583000 6.522000 -4.272999 -4.583000
- 4.210000 -7.777999 -2.549000 4.210000 -7.777999 -2.549000
- 0.744000 -14.315000 0.606000 0.744000 -14.315000 0.606000
- -2.301000 -14.315000 2.908000 -2.301000 -14.315000 2.908000
- -4.487000 -12.677000 4.427000 -4.487000 -12.677000 4.427000
+ 4.713000 7.650000 -4.188000 4.713000 7.650000 -4.188000
+ 7.102000 4.309000 -5.722000 7.102000 4.309000 -5.722000
+ 7.407010 0.378000 -5.632000 7.407010 0.378000 -5.632000
+ 6.522010 -4.273000 -4.583000 6.522010 -4.273000 -4.583000
+ 4.210010 -7.778000 -2.549000 4.210010 -7.778000 -2.549000
+ 0.744010 -14.315000 0.606000 0.744010 -14.315000 0.606000
+ -2.300990 -14.315001 2.908000 -2.300990 -14.315001 2.908000
+ -4.486990 -12.677001 4.427000 -4.486990 -12.677001 4.427000
-8.850000 -6.596001 7.230000 -8.850000 -6.596001 7.230000
-11.070000 -5.354001 8.808000 -11.070000 -5.354001 8.808000
-10.576000 2.056999 7.829000 -10.576000 2.056999 7.829000
-9.229000 6.745999 6.428000 -9.229000 6.745999 6.428000
-8.022000 11.748999 5.107000 -8.022000 11.748999 5.107000
- -5.361000 12.003000 3.075000 -5.361000 12.003000 3.075000
- -1.682000 12.936000 0.216000 -1.682000 12.936000 0.216000
+ -5.361000 12.002999 3.075000 -5.361000 12.002999 3.075000
+ -1.682000 12.935999 0.216000 -1.682000 12.935999 0.216000
3.893000 12.010000 -3.924000 3.893000 12.010000 -3.924000
- 6.027000 11.087001 -5.462000 6.027000 11.087001 -5.462000
- 8.778000 6.866001 -7.198000 8.778000 6.866001 -7.198000
+ 6.027000 11.087000 -5.462000 6.027000 11.087000 -5.462000
+ 8.778000 6.866000 -7.198000 8.778000 6.866000 -7.198000
11.410000 4.185001 -8.969000 11.410000 4.185001 -8.969000
- 10.845000 -4.588999 -7.826000 10.845000 -4.588999 -7.826000
- 9.375000 -8.021999 -6.435000 9.375000 -8.021999 -6.435000
- 6.696000 -12.180999 -4.069000 6.696000 -12.180999 -4.069000
--31.677000 -36.015002 26.891000 -31.677000 -36.015002 26.891000
--30.387010 41.368998 19.601990 -30.387010 41.368998 19.601990
- 6.113000 -16.561999 -3.271000 6.113000 -16.561999 -3.271000
- 5.285000 -19.394999 -2.414000 5.285000 -19.394999 -2.414000
- -7.099000 -17.856000 6.825000 -7.099000 -17.856000 6.825000
--15.142000 -4.824001 11.844000 -15.142000 -4.824001 11.844000
--16.388000 -0.087001 12.399000 -16.388000 -0.087001 12.399000
--12.312000 10.637999 8.442000 -12.312000 10.637999 8.442000
- -3.521000 17.511000 1.234000 -3.521000 17.511000 1.234000
+ 10.845010 -4.588999 -7.826000 10.845010 -4.588999 -7.826000
+ 9.375010 -8.021999 -6.435000 9.375010 -8.021999 -6.435000
+ 6.696010 -12.181000 -4.069000 6.696010 -12.181000 -4.069000
+-31.676990 -36.015003 26.891000 -31.676990 -36.015003 26.891000
+-30.387000 41.368997 19.602000 -30.387000 41.368997 19.602000
+ 6.113010 -16.562000 -3.271000 6.113010 -16.562000 -3.271000
+ 5.285010 -19.395000 -2.414000 5.285010 -19.395000 -2.414000
+ -7.098990 -17.856001 6.825000 -7.098990 -17.856001 6.825000
+-15.142000 -4.824002 11.844000 -15.142000 -4.824002 11.844000
+-16.388000 -0.087002 12.399000 -16.388000 -0.087002 12.399000
+-12.312000 10.637998 8.442000 -12.312000 10.637998 8.442000
+ -3.521000 17.510999 1.234000 -3.521000 17.510999 1.234000
2.412000 20.005000 -3.456000 2.412000 20.005000 -3.456000
11.361000 10.402001 -9.440000 11.361000 10.402001 -9.440000
- 15.409000 3.764001 -11.959000 15.409000 3.764001 -11.959000
- 14.382000 -6.009999 -10.385000 14.382000 -6.009999 -10.385000
- 17.099000 -13.603998 -11.820000 17.099000 -13.603998 -11.820000
- 9.751000 -22.325999 -5.551000 9.751000 -22.325999 -5.551000
- -0.126000 -25.290000 2.159000 -0.126000 -25.290000 2.159000
- -5.113000 -24.395000 5.857000 -5.113000 -24.395000 5.857000
--11.587000 -21.662001 10.529000 -11.587000 -21.662001 10.529000
--18.311000 -5.805001 14.320000 -18.311000 -5.805001 14.320000
--19.521000 2.074999 14.592000 -19.521000 2.074999 14.592000
--17.400000 15.497999 11.893000 -17.400000 15.497999 11.893000
+ 15.409010 3.764001 -11.959000 15.409010 3.764001 -11.959000
+ 14.382010 -6.009999 -10.385000 14.382010 -6.009999 -10.385000
+ 17.099010 -13.603999 -11.820000 17.099010 -13.603999 -11.820000
+ 9.751010 -22.325999 -5.551000 9.751010 -22.325999 -5.551000
+ -0.125990 -25.290000 2.159000 -0.125990 -25.290000 2.159000
+ -5.112990 -24.395001 5.857000 -5.112990 -24.395001 5.857000
+-11.586990 -21.662001 10.529000 -11.586990 -21.662001 10.529000
+-18.311000 -5.805002 14.320000 -18.311000 -5.805002 14.320000
+-19.521000 2.074998 14.592000 -19.521000 2.074998 14.592000
+-17.400000 15.497998 11.893000 -17.400000 15.497998 11.893000
-8.267000 23.345999 4.346000 -8.267000 23.345999 4.346000
- -1.254000 25.993000 -1.173000 -1.254000 25.993000 -1.173000
- 7.760000 22.246001 -7.683000 7.760000 22.246001 -7.683000
- 18.501000 12.734002 -15.029000 18.501000 12.734002 -15.029000
- 21.408000 -4.751998 -15.800000 21.408000 -4.751998 -15.800000
- 24.185000 -18.248998 -16.799000 24.185000 -18.248998 -16.799000
- 14.542000 -26.364999 -8.845000 14.542000 -26.364999 -8.845000
- 3.693000 -31.075000 -0.257000 3.693000 -31.075000 -0.257000
- -2.580000 -32.236000 4.581000 -2.580000 -32.236000 4.581000
--16.160000 -23.183001 14.111000 -16.160000 -23.183001 14.111000
--25.861000 -9.282002 20.312000 -25.861000 -9.282002 20.312000
--27.200000 2.937998 20.328000 -27.200000 2.937998 20.328000
--22.875000 10.290998 16.457000 -22.875000 10.290998 16.457000
+ -1.254000 25.992999 -1.173000 -1.254000 25.992999 -1.173000
+ 7.760000 22.246000 -7.683000 7.760000 22.246000 -7.683000
+ 18.501000 12.734001 -15.029000 18.501000 12.734001 -15.029000
+ 21.408010 -4.751998 -15.800000 21.408010 -4.751998 -15.800000
+ 24.185010 -18.248998 -16.799000 24.185010 -18.248998 -16.799000
+ 14.542010 -26.364999 -8.845000 14.542010 -26.364999 -8.845000
+ 3.693010 -31.075000 -0.257000 3.693010 -31.075000 -0.257000
+ -2.579990 -32.236001 4.581000 -2.579990 -32.236001 4.581000
+-16.159990 -23.183002 14.111000 -16.159990 -23.183002 14.111000
+-25.861000 -9.282003 20.312000 -25.861000 -9.282003 20.312000
+-27.200000 2.937997 20.328000 -27.200000 2.937997 20.328000
+-22.875000 10.290997 16.457000 -22.875000 10.290997 16.457000
-20.103000 24.307998 13.218000 -20.103000 24.307998 13.218000
- -7.005000 33.096000 2.596000 -7.005000 33.096000 2.596000
+ -7.005000 33.095999 2.596000 -7.005000 33.095999 2.596000
0.109000 33.680000 -2.831000 0.109000 33.680000 -2.831000
12.635000 29.987001 -12.001000 12.635000 29.987001 -12.001000
- 16.827000 23.414002 -14.635000 16.827000 23.414002 -14.635000
- 25.929000 5.743002 -20.075000 25.929000 5.743002 -20.075000
- 24.482000 -0.614998 -18.463000 24.482000 -0.614998 -18.463000
- 29.341000 -2.457997 -21.986000 29.341000 -2.457997 -21.986000
- 16.413000 -37.254998 -9.371000 16.413000 -37.254998 -9.371000
- -3.898000 -39.343000 6.158000 -3.898000 -39.343000 6.158000
--19.334000 -32.996001 17.312000 -19.334000 -32.996001 17.312000
--27.199000 -19.839002 22.186000 -27.199000 -19.839002 22.186000
--26.999000 25.067998 18.371000 -26.999000 25.067998 18.371000
+ 16.827000 23.414001 -14.635000 16.827000 23.414001 -14.635000
+ 25.929010 5.743002 -20.075000 25.929010 5.743002 -20.075000
+ 24.482010 -0.614998 -18.463000 24.482010 -0.614998 -18.463000
+ 29.341010 -2.457998 -21.986000 29.341010 -2.457998 -21.986000
+ 16.413010 -37.254999 -9.371000 16.413010 -37.254999 -9.371000
+ -3.897990 -39.343001 6.158000 -3.897990 -39.343001 6.158000
+-19.333990 -32.996002 17.312000 -19.333990 -32.996002 17.312000
+-27.198990 -19.839003 22.186000 -27.198990 -19.839003 22.186000
+-26.999000 25.067997 18.371000 -26.999000 25.067997 18.371000
-11.138000 34.365999 5.618000 -11.138000 34.365999 5.618000
0.421000 41.282000 -3.687000 0.421000 41.282000 -3.687000
- 28.232000 14.158003 -22.504000 28.232000 14.158003 -22.504000
+ 28.232000 14.158002 -22.504000 28.232000 14.158002 -22.504000
]
NORMAL_VECTOR HBA
@@ -126,54 +126,54 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3845376.289920000 413616.564249000 5054796.341 ]
+3 [ 3845376.247150000 413616.611898000 5054796.370 ]
48 x 2 x 3 [
--11.541000 13.915999 7.596000 -11.541000 13.915999 7.596000
- -7.793000 15.798000 4.609000 -7.793000 15.798000 4.609000
- -4.044000 17.680000 1.620000 -4.044000 17.680000 1.620000
+-11.541000 13.915999 7.595990 -11.541000 13.915999 7.595990
+ -7.793000 15.797999 4.608990 -7.793000 15.797999 4.608990
+ -4.044000 17.680000 1.619990 -4.044000 17.680000 1.619990
-0.295000 19.561000 -1.368000 -0.295000 19.561000 -1.368000
- -9.851000 9.134000 6.707000 -9.851000 9.134000 6.707000
- -6.102000 11.015000 3.719000 -6.102000 11.015000 3.719000
+ -9.851000 9.133999 6.706990 -9.851000 9.133999 6.706990
+ -6.102000 11.015000 3.718990 -6.102000 11.015000 3.718990
-2.353000 12.897000 0.731000 -2.353000 12.897000 0.731000
1.396000 14.779000 -2.258000 1.396000 14.779000 -2.258000
--15.657000 0.587999 11.793000 -15.657000 0.587999 11.793000
--11.909000 2.469999 8.805000 -11.909000 2.469999 8.805000
- -8.159000 4.351000 5.817000 -8.159000 4.351000 5.817000
+-15.657000 0.587999 11.792990 -15.657000 0.587999 11.792990
+-11.909000 2.469999 8.804990 -11.909000 2.469999 8.804990
+ -8.159000 4.350999 5.816990 -8.159000 4.350999 5.816990
-4.411000 6.233000 2.829000 -4.411000 6.233000 2.829000
-0.662000 8.115000 -0.159000 -0.662000 8.115000 -0.159000
- 3.086000 9.996001 -3.147000 3.086000 9.996001 -3.147000
+ 3.086000 9.996000 -3.147000 3.086000 9.996000 -3.147000
6.836000 11.878001 -6.136000 6.836000 11.878001 -6.136000
10.584000 13.758001 -9.124000 10.584000 13.758001 -9.124000
--13.967000 -4.194001 10.904000 -13.967000 -4.194001 10.904000
--10.217000 -2.313001 7.915000 -10.217000 -2.313001 7.915000
- -6.469000 -0.431000 4.927000 -6.469000 -0.431000 4.927000
+-13.967000 -4.194001 10.903990 -13.967000 -4.194001 10.903990
+-10.217000 -2.313001 7.914990 -10.217000 -2.313001 7.914990
+ -6.469000 -0.431000 4.926990 -6.469000 -0.431000 4.926990
-2.720000 1.450000 1.939000 -2.720000 1.450000 1.939000
1.029000 3.332000 -1.049000 1.029000 3.332000 -1.049000
4.778000 5.214001 -4.037000 4.778000 5.214001 -4.037000
8.526000 7.095001 -7.025000 8.526000 7.095001 -7.025000
12.275000 8.977001 -10.014000 12.275000 8.977001 -10.014000
--12.275000 -8.977001 10.014000 -12.275000 -8.977001 10.014000
- -8.526000 -7.095000 7.025000 -8.526000 -7.095000 7.025000
+-12.275000 -8.977001 10.013990 -12.275000 -8.977001 10.013990
+ -8.526000 -7.095001 7.024990 -8.526000 -7.095001 7.024990
-4.778000 -5.214000 4.037000 -4.778000 -5.214000 4.037000
-1.029000 -3.332000 1.049000 -1.029000 -3.332000 1.049000
- 2.720000 -1.449999 -1.939000 2.720000 -1.449999 -1.939000
+ 2.720000 -1.450000 -1.939000 2.720000 -1.450000 -1.939000
6.469000 0.431001 -4.927000 6.469000 0.431001 -4.927000
10.217000 2.313001 -7.915000 10.217000 2.313001 -7.915000
13.967000 4.194002 -10.904000 13.967000 4.194002 -10.904000
--10.584000 -13.758001 9.124000 -10.584000 -13.758001 9.124000
- -6.836000 -11.878000 6.136000 -6.836000 -11.878000 6.136000
+-10.584000 -13.758001 9.123990 -10.584000 -13.758001 9.123990
+ -6.836000 -11.878000 6.135990 -6.836000 -11.878000 6.135990
-3.086000 -9.996000 3.147000 -3.086000 -9.996000 3.147000
0.662000 -8.115000 0.159000 0.662000 -8.115000 0.159000
4.411000 -6.232999 -2.829000 4.411000 -6.232999 -2.829000
8.159000 -4.350999 -5.817000 8.159000 -4.350999 -5.817000
11.909000 -2.469999 -8.805000 11.909000 -2.469999 -8.805000
15.657000 -0.587998 -11.793000 15.657000 -0.587998 -11.793000
- -1.395990 -14.779000 2.258000 -1.395990 -14.779000 2.258000
- 2.353010 -12.896999 -0.731000 2.353010 -12.896999 -0.731000
- 6.102010 -11.014999 -3.719000 6.102010 -11.014999 -3.719000
- 9.851010 -9.133999 -6.707000 9.851010 -9.133999 -6.707000
- 0.295010 -19.561000 1.368000 0.295010 -19.561000 1.368000
- 4.044010 -17.679999 -1.620000 4.044010 -17.679999 -1.620000
- 7.793010 -15.797999 -4.609000 7.793010 -15.797999 -4.609000
- 11.541010 -13.915999 -7.596000 11.541010 -13.915999 -7.596000
+ -1.396000 -14.779000 2.258000 -1.396000 -14.779000 2.258000
+ 2.353000 -12.897000 -0.731000 2.353000 -12.897000 -0.731000
+ 6.102000 -11.014999 -3.719000 6.102000 -11.014999 -3.719000
+ 9.851000 -9.133999 -6.707000 9.851000 -9.133999 -6.707000
+ 0.295000 -19.561000 1.368000 0.295000 -19.561000 1.368000
+ 4.044000 -17.679999 -1.620000 4.044000 -17.679999 -1.620000
+ 7.793000 -15.797999 -4.609000 7.793000 -15.797999 -4.609000
+ 11.541000 -13.915999 -7.596000 11.541000 -13.915999 -7.596000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS406-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS406-AntennaField.conf
index 5a897def527dc8c45bdd08d5a9da6a5f131635fe..94b8c0d032a3155eb8df6677cd7370226e520934 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS406-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS406-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS406
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:43
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:13
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3818467.633510000 451974.600960000 5071790.597 ]
+3 [ 3818467.590170000 451974.648316000 5071790.625 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.033000 -0.245000 1.520000 -2.033000 -0.245000 1.520000
-1.353000 2.103000 0.794000 -1.353000 2.103000 0.794000
- 0.799000 2.362000 -0.816000 0.799000 2.362000 -0.816000
- 2.033000 0.245000 -1.520000 2.033000 0.245000 -1.520000
- 1.353000 -2.103000 -0.794000 1.353000 -2.103000 -0.794000
+ 0.799000 2.362001 -0.816000 0.799000 2.362001 -0.816000
+ 2.033000 0.245001 -1.520000 2.033000 0.245001 -1.520000
+ 1.353000 -2.102999 -0.794000 1.353000 -2.102999 -0.794000
-0.799000 -2.362000 0.816000 -0.799000 -2.362000 0.816000
-2.563000 -4.650000 2.335000 -2.563000 -4.650000 2.335000
-4.479000 -1.352000 3.428000 -4.479000 -1.352000 3.428000
-4.299000 2.578000 2.918000 -4.299000 2.578000 2.918000
-2.108000 5.302000 1.042000 -2.108000 5.302000 1.042000
- 1.070000 5.546000 -1.321000 1.070000 5.546000 -1.321000
- 3.746000 3.194000 -3.066000 3.746000 3.194000 -3.066000
- 4.670000 -0.652000 -3.377000 4.670000 -0.652000 -3.377000
- 3.409000 -4.192000 -2.107000 3.409000 -4.192000 -2.107000
- 0.553000 -5.771000 0.148000 0.553000 -5.771000 0.148000
- 0.232000 -9.296000 0.723000 0.232000 -9.296000 0.723000
+ 1.070000 5.546001 -1.321000 1.070000 5.546001 -1.321000
+ 3.746000 3.194001 -3.066000 3.746000 3.194001 -3.066000
+ 4.670000 -0.651999 -3.377000 4.670000 -0.651999 -3.377000
+ 3.409000 -4.191999 -2.107000 3.409000 -4.191999 -2.107000
+ 0.553000 -5.770999 0.148000 0.553000 -5.770999 0.148000
+ 0.232000 -9.295999 0.723000 0.232000 -9.295999 0.723000
-2.718000 -9.059000 2.873000 -2.718000 -9.059000 2.873000
- -6.256000 -6.345001 5.218000 -6.256000 -6.345001 5.218000
- -8.145000 0.645999 5.936000 -8.145000 0.645999 5.936000
- -7.763000 3.797999 5.351000 -7.763000 3.797999 5.351000
- -5.929000 7.294999 3.664000 -5.929000 7.294999 3.664000
+ -6.256000 -6.345000 5.218000 -6.256000 -6.345000 5.218000
+ -8.145000 0.646000 5.936000 -8.145000 0.646000 5.936000
+ -7.763000 3.798000 5.351000 -7.763000 3.798000 5.351000
+ -5.929000 7.295000 3.664000 -5.929000 7.295000 3.664000
-2.768000 8.731000 1.198000 -2.768000 8.731000 1.198000
- 1.904000 8.495000 -2.220000 1.904000 8.495000 -2.220000
- 5.558000 6.704000 -4.738000 5.558000 6.704000 -4.738000
+ 1.904000 8.495001 -2.220000 1.904000 8.495001 -2.220000
+ 5.558000 6.704001 -4.738000 5.558000 6.704001 -4.738000
7.613000 3.008001 -5.896000 7.613000 3.008001 -5.896000
7.504000 -0.908999 -5.439000 7.504000 -0.908999 -5.439000
- 6.121000 -5.327000 -3.995000 6.121000 -5.327000 -3.995000
- 3.421000 -8.372000 -1.713000 3.421000 -8.372000 -1.713000
+ 6.121000 -5.326999 -3.995000 6.121000 -5.326999 -3.995000
+ 3.421000 -8.371999 -1.713000 3.421000 -8.371999 -1.713000
-0.763000 -14.197000 1.928000 -0.763000 -14.197000 1.928000
-3.832000 -13.670000 4.137000 -3.832000 -13.670000 4.137000
- -5.862000 -11.684001 5.441000 -5.862000 -11.684001 5.441000
- -9.615000 -4.953001 7.557000 -9.615000 -4.953001 7.557000
+ -5.862000 -11.684000 5.441000 -5.862000 -11.684000 5.441000
+ -9.615000 -4.953000 7.557000 -9.615000 -4.953000 7.557000
-11.722000 -3.348001 8.955000 -11.722000 -3.348001 8.955000
-10.441000 3.849999 7.319000 -10.441000 3.849999 7.319000
- -8.588000 8.225999 5.533000 -8.588000 8.225999 5.533000
- -6.842000 12.932999 3.794000 -6.842000 12.932999 3.794000
+ -8.588000 8.226000 5.533000 -8.588000 8.226000 5.533000
+ -6.842000 12.933000 3.794000 -6.842000 12.933000 3.794000
-4.134000 12.722000 1.821000 -4.134000 12.722000 1.821000
-0.327000 13.003000 -1.010000 -0.327000 13.003000 -1.010000
- 5.192000 11.130000 -4.894000 5.192000 11.130000 -4.894000
+ 5.192000 11.130001 -4.894000 5.192000 11.130001 -4.894000
7.246000 9.854001 -6.284000 7.246000 9.854001 -6.284000
9.573000 5.230001 -7.553000 9.573000 5.230001 -7.553000
- 11.941000 2.141001 -9.000000 11.941000 2.141001 -9.000000
+ 11.941000 2.141002 -9.000000 11.941000 2.141002 -9.000000
10.444000 -6.384999 -7.077000 10.444000 -6.384999 -7.077000
8.600000 -9.502999 -5.419000 8.600000 -9.502999 -5.419000
- 5.460000 -13.128000 -2.758000 5.460000 -13.128000 -2.758000
- -8.822000 -53.035001 11.599000 -8.822000 -53.035001 11.599000
+ 5.460000 -13.127999 -2.758000 5.460000 -13.127999 -2.758000
+ -8.822000 -53.035000 11.599000 -8.822000 -53.035000 11.599000
-43.455000 14.051996 30.649000 -43.455000 14.051996 30.649000
- 4.410000 -17.333000 -1.580000 4.410000 -17.333000 -1.580000
- 3.276000 -19.974000 -0.491000 3.276000 -19.974000 -0.491000
- -9.040000 -16.321001 8.227000 -9.040000 -16.321001 8.227000
+ 4.410000 -17.332999 -1.580000 4.410000 -17.332999 -1.580000
+ 3.276000 -19.973999 -0.491000 3.276000 -19.973999 -0.491000
+ -9.040000 -16.321000 8.227000 -9.040000 -16.321000 8.227000
-15.770000 -2.124001 11.817000 -15.770000 -2.124001 11.817000
-16.525000 2.746999 11.905000 -16.525000 2.746999 11.905000
-11.283000 12.581999 7.098000 -11.283000 12.581999 7.098000
-1.697000 17.817000 -0.464000 -1.697000 17.817000 -0.464000
- 4.544000 19.242000 -5.198000 4.544000 19.242000 -5.198000
- 12.549000 8.259001 -10.036000 12.549000 8.259001 -10.036000
- 15.926000 1.035001 -11.828000 15.926000 1.035001 -11.828000
- 13.859000 -8.390999 -9.399000 13.859000 -8.390999 -9.399000
- 15.794000 -16.324999 -10.060000 15.794000 -16.324999 -10.060000
+ 4.544000 19.242001 -5.198000 4.544000 19.242001 -5.198000
+ 12.549000 8.259002 -10.036000 12.549000 8.259002 -10.036000
+ 15.926000 1.035002 -11.828000 15.926000 1.035002 -11.828000
+ 13.859000 -8.390998 -9.399000 13.859000 -8.390998 -9.399000
+ 15.794000 -16.324998 -10.060000 15.794000 -16.324998 -10.060000
7.467000 -23.625999 -3.226000 7.467000 -23.625999 -3.226000
-2.800000 -24.831000 4.451000 -2.800000 -24.831000 4.451000
- -7.731000 -23.090001 7.915000 -7.731000 -23.090001 7.915000
+ -7.731000 -23.090000 7.915000 -7.731000 -23.090000 7.915000
-13.967000 -19.286001 12.141000 -13.967000 -19.286001 12.141000
--19.067000 -2.539002 14.286000 -19.067000 -2.539002 14.286000
--19.456000 5.410998 13.807000 -19.456000 5.410998 13.807000
+-19.067000 -2.539001 14.286000 -19.067000 -2.539001 14.286000
+-19.456000 5.410999 13.807000 -19.456000 5.410999 13.807000
-15.895000 18.238999 9.950000 -15.895000 18.238999 9.950000
- -5.864000 24.372999 1.973000 -5.864000 24.372999 1.973000
- 1.487000 25.762000 -3.574000 1.487000 25.762000 -3.574000
+ -5.864000 24.373000 1.973000 -5.864000 24.373000 1.973000
+ 1.487000 25.762001 -3.574000 1.487000 25.762001 -3.574000
10.170000 20.524001 -9.464000 10.170000 20.524001 -9.464000
19.990000 9.318002 -15.618000 19.990000 9.318002 -15.618000
21.069000 -8.369998 -14.710000 21.069000 -8.369998 -14.710000
- 22.443000 -22.113998 -14.400000 22.443000 -22.113998 -14.400000
- 11.868000 -28.423999 -6.005000 11.868000 -28.423999 -6.005000
- 0.439000 -31.181000 2.676000 0.439000 -31.181000 2.676000
- -6.010000 -31.233001 7.431000 -6.010000 -31.233001 7.431000
--18.738000 -19.995002 15.723000 -18.738000 -19.995002 15.723000
+ 22.443000 -22.113997 -14.400000 22.443000 -22.113997 -14.400000
+ 11.868000 -28.423998 -6.005000 11.868000 -28.423998 -6.005000
+ 0.439000 -31.180999 2.676000 0.439000 -31.180999 2.676000
+ -6.010000 -31.233000 7.431000 -6.010000 -31.233000 7.431000
+-18.738000 -19.995001 15.723000 -18.738000 -19.995001 15.723000
-27.042000 -4.648002 20.361000 -27.042000 -4.648002 20.361000
-27.105000 7.591998 19.230000 -27.105000 7.591998 19.230000
-21.962000 14.063998 14.820000 -21.962000 14.063998 14.820000
--17.690000 27.359998 10.395000 -17.690000 27.359998 10.395000
+-17.690000 27.359999 10.395000 -17.690000 27.359999 10.395000
-3.563000 33.735000 -0.622000 -3.563000 33.735000 -0.622000
- 3.670000 33.076000 -5.885000 3.670000 33.076000 -5.885000
- 15.900000 27.287001 -14.334000 15.900000 27.287001 -14.334000
+ 3.670000 33.076001 -5.885000 3.670000 33.076001 -5.885000
+ 15.900000 27.287002 -14.334000 15.900000 27.287002 -14.334000
19.429000 20.098002 -16.242000 19.429000 20.098002 -16.242000
- 26.738000 1.167002 -19.802000 26.738000 1.167002 -19.802000
- 24.610000 -4.830998 -17.658000 24.610000 -4.830998 -17.658000
- 29.308000 -7.487998 -20.863000 29.308000 -7.487998 -20.863000
- 12.604000 -39.444999 -5.487000 12.604000 -39.444999 -5.487000
- -8.084000 -37.989001 9.608000 -8.084000 -37.989001 9.608000
+ 26.738000 1.167003 -19.802000 26.738000 1.167003 -19.802000
+ 24.610000 -4.830997 -17.658000 24.610000 -4.830997 -17.658000
+ 29.308000 -7.487997 -20.863000 29.308000 -7.487997 -20.863000
+ 12.604000 -39.444998 -5.487000 12.604000 -39.444998 -5.487000
+ -8.084000 -37.989000 9.608000 -8.084000 -37.989000 9.608000
-22.974000 -29.086002 19.717000 -22.974000 -29.086002 19.717000
--29.504000 -14.795003 23.151000 -29.504000 -14.795003 23.151000
+-29.504000 -14.795002 23.151000 -29.504000 -14.795002 23.151000
-24.557000 29.301998 15.265000 -24.557000 29.301998 15.265000
- -7.593000 35.696999 2.157000 -7.593000 35.696999 2.157000
- 4.788000 40.493000 -7.422000 4.788000 40.493000 -7.422000
- 29.943000 9.037002 -22.920000 29.943000 9.037002 -22.920000
+ -7.593000 35.697000 2.157000 -7.593000 35.697000 2.157000
+ 4.788000 40.493001 -7.422000 4.788000 40.493001 -7.422000
+ 29.943000 9.037003 -22.920000 29.943000 9.037003 -22.920000
]
NORMAL_VECTOR HBA
@@ -126,54 +126,54 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3818424.938500000 452020.268956000 5071817.644 ]
+3 [ 3818424.895160000 452020.316312000 5071817.672 ]
48 x 2 x 3 [
--10.162000 15.670999 5.976000 -10.162000 15.670999 5.976000
- -6.186000 16.872000 2.932000 -6.186000 16.872000 2.932000
+-10.162000 15.670999 5.975990 -10.162000 15.670999 5.975990
+ -6.186000 16.872000 2.931990 -6.186000 16.872000 2.931990
-2.210000 18.073000 -0.112000 -2.210000 18.073000 -0.112000
- 1.767000 19.274000 -3.156000 1.767000 19.274000 -3.156000
- -8.964000 10.679000 5.574000 -8.964000 10.679000 5.574000
- -4.987000 11.880000 2.529000 -4.987000 11.880000 2.529000
+ 1.767000 19.274001 -3.156000 1.767000 19.274001 -3.156000
+ -8.964000 10.679000 5.573990 -8.964000 10.679000 5.573990
+ -4.987000 11.880000 2.528990 -4.987000 11.880000 2.528990
-1.010000 13.081000 -0.515000 -1.010000 13.081000 -0.515000
2.967000 14.282001 -3.559000 2.967000 14.282001 -3.559000
--15.718000 3.283999 11.259000 -15.718000 3.283999 11.259000
--11.741000 4.485999 8.215000 -11.741000 4.485999 8.215000
- -7.764000 5.687000 5.170000 -7.764000 5.687000 5.170000
+-15.718000 3.283999 11.258990 -15.718000 3.283999 11.258990
+-11.741000 4.485999 8.214990 -11.741000 4.485999 8.214990
+ -7.764000 5.687000 5.169990 -7.764000 5.687000 5.169990
-3.787000 6.887000 2.126000 -3.787000 6.887000 2.126000
0.189000 8.089000 -0.918000 0.189000 8.089000 -0.918000
4.166000 9.290001 -3.962000 4.166000 9.290001 -3.962000
8.143000 10.491001 -7.006000 8.143000 10.491001 -7.006000
- 12.119000 11.691001 -10.049000 12.119000 11.691001 -10.049000
--14.518000 -1.708001 10.856000 -14.518000 -1.708001 10.856000
--10.541000 -0.507001 7.811000 -10.541000 -0.507001 7.811000
- -6.565000 0.695000 4.767000 -6.565000 0.695000 4.767000
+ 12.119000 11.691002 -10.049000 12.119000 11.691002 -10.049000
+-14.518000 -1.708001 10.855990 -14.518000 -1.708001 10.855990
+-10.541000 -0.507001 7.810990 -10.541000 -0.507001 7.810990
+ -6.565000 0.695000 4.766990 -6.565000 0.695000 4.766990
-2.588000 1.896000 1.723000 -2.588000 1.896000 1.723000
- 1.389000 3.096000 -1.321000 1.389000 3.096000 -1.321000
+ 1.389000 3.096001 -1.321000 1.389000 3.096001 -1.321000
5.365000 4.298001 -4.364000 5.365000 4.298001 -4.364000
9.342000 5.499001 -7.408000 9.342000 5.499001 -7.408000
- 13.318000 6.700001 -10.453000 13.318000 6.700001 -10.453000
--13.318000 -6.700001 10.453000 -13.318000 -6.700001 10.453000
- -9.342000 -5.499001 7.408000 -9.342000 -5.499001 7.408000
+ 13.318000 6.700002 -10.453000 13.318000 6.700002 -10.453000
+-13.318000 -6.700001 10.452990 -13.318000 -6.700001 10.452990
+ -9.342000 -5.499001 7.407990 -9.342000 -5.499001 7.407990
-5.365000 -4.298000 4.364000 -5.365000 -4.298000 4.364000
-1.389000 -3.096000 1.321000 -1.389000 -3.096000 1.321000
- 2.588000 -1.896000 -1.723000 2.588000 -1.896000 -1.723000
+ 2.588000 -1.895999 -1.723000 2.588000 -1.895999 -1.723000
6.565000 -0.694999 -4.767000 6.565000 -0.694999 -4.767000
10.541000 0.507001 -7.811000 10.541000 0.507001 -7.811000
- 14.518000 1.708001 -10.856000 14.518000 1.708001 -10.856000
--12.119000 -11.691001 10.049000 -12.119000 -11.691001 10.049000
- -8.143000 -10.491000 7.006000 -8.143000 -10.491000 7.006000
+ 14.518000 1.708002 -10.856000 14.518000 1.708002 -10.856000
+-12.119000 -11.691001 10.048990 -12.119000 -11.691001 10.048990
+ -8.143000 -10.491000 7.005990 -8.143000 -10.491000 7.005990
-4.166000 -9.290000 3.962000 -4.166000 -9.290000 3.962000
-0.189000 -8.089000 0.918000 -0.189000 -8.089000 0.918000
3.787000 -6.886999 -2.126000 3.787000 -6.886999 -2.126000
7.764000 -5.686999 -5.170000 7.764000 -5.686999 -5.170000
- 11.741000 -4.485999 -8.215000 11.741000 -4.485999 -8.215000
+ 11.741000 -4.485998 -8.215000 11.741000 -4.485998 -8.215000
15.718000 -3.283998 -11.259000 15.718000 -3.283998 -11.259000
-2.967000 -14.282000 3.559000 -2.967000 -14.282000 3.559000
1.010000 -13.081000 0.515000 1.010000 -13.081000 0.515000
4.987000 -11.879999 -2.529000 4.987000 -11.879999 -2.529000
8.964000 -10.678999 -5.574000 8.964000 -10.678999 -5.574000
-1.767000 -19.274000 3.156000 -1.767000 -19.274000 3.156000
- 2.210000 -18.073000 0.112000 2.210000 -18.073000 0.112000
+ 2.210000 -18.072999 0.112000 2.210000 -18.072999 0.112000
6.186000 -16.871999 -2.932000 6.186000 -16.871999 -2.932000
10.162000 -15.670999 -5.976000 10.162000 -15.670999 -5.976000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf
index bc304d6e61f13abf2dc8afc5fc0cff00262fd094..400cf95659a35d8dc13beecd6d5cbed0128a1bb3 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS407
-# ITRF2005 target_date = 2012.5
-# Created: 2012-11-30 15:19:23
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:13
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3811595.861080000 453444.681379000 5076770.429 ]
+3 [ 3811595.817690000 453444.728662000 5076770.457 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
- -1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
+ -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
+ -1.338000 2.104999 0.814000 -1.338000 2.104999 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
- -3.965000 3.277000 2.680000 -3.965000 3.277000 2.680000
- -1.481000 5.575000 0.607000 -1.481000 5.575000 0.607000
+ -3.965000 3.276999 2.680000 -3.965000 3.276999 2.680000
+ -1.481000 5.574999 0.607000 -1.481000 5.574999 0.607000
1.696000 5.264000 -1.749000 1.696000 5.264000 -1.749000
- 4.079000 2.490001 -3.287000 4.079000 2.490001 -3.287000
- 4.553000 -1.449999 -3.287000 4.553000 -1.449999 -3.287000
+ 4.079000 2.490000 -3.287000 4.079000 2.490000 -3.287000
+ 4.553000 -1.450000 -3.287000 4.553000 -1.450000 -3.287000
2.897000 -4.710000 -1.749000 2.897000 -4.710000 -1.749000
-0.114000 -5.767000 0.607000 -0.114000 -5.767000 0.607000
- -3.073000 -4.125000 2.679000 -3.073000 -4.125000 2.679000
- -4.593000 -0.553000 3.498000 -4.593000 -0.553000 3.498000
- -7.456000 -0.076000 5.603000 -7.456000 -0.076000 5.603000
- -7.524000 3.570000 5.325000 -7.524000 3.570000 5.325000
- -5.651000 7.889000 3.529000 -5.651000 7.889000 3.529000
+ -3.073000 -4.125001 2.679000 -3.073000 -4.125001 2.679000
+ -4.593000 -0.553001 3.498000 -4.593000 -0.553001 3.498000
+ -7.456000 -0.076001 5.603000 -7.456000 -0.076001 5.603000
+ -7.524000 3.569999 5.325000 -7.524000 3.569999 5.325000
+ -5.651000 7.888999 3.529000 -5.651000 7.888999 3.529000
-0.195000 10.068000 -0.764000 -0.195000 10.068000 -0.764000
2.374000 9.523000 -2.642000 2.374000 9.523000 -2.642000
- 5.346000 7.175001 -4.662000 5.346000 7.175001 -4.662000
- 6.779000 3.229001 -5.380990 6.779000 3.229001 -5.380990
- 6.998000 -2.548999 -5.022990 6.998000 -2.548999 -5.022990
- 5.879000 -7.031999 -3.776990 5.879000 -7.031999 -3.776990
+ 5.346000 7.175000 -4.662000 5.346000 7.175000 -4.662000
+ 6.779000 3.229000 -5.381000 6.779000 3.229000 -5.381000
+ 6.998000 -2.549000 -5.023000 6.998000 -2.549000 -5.023000
+ 5.879000 -7.032000 -3.777000 5.879000 -7.032000 -3.777000
3.087000 -9.493000 -1.459000 3.087000 -9.493000 -1.459000
-0.072000 -9.270000 0.892000 -0.072000 -9.270000 0.892000
- -3.747000 -7.457000 3.487000 -3.747000 -7.457000 3.487000
- -6.433000 -4.046000 5.194000 -6.433000 -4.046000 5.194000
+ -3.747000 -7.457001 3.487000 -3.747000 -7.457001 3.487000
+ -6.433000 -4.046001 5.194000 -6.433000 -4.046001 5.194000
-11.484000 1.265999 8.506000 -11.484000 1.265999 8.506000
-11.330000 5.052999 8.048000 -11.330000 5.052999 8.048000
-9.910000 7.520999 6.759000 -9.910000 7.520999 6.759000
- -4.827000 12.015000 2.537000 -4.827000 12.015000 2.537000
- -3.721000 14.587000 1.474000 -3.721000 14.587000 1.474000
+ -4.827000 12.014999 2.537000 -4.827000 12.014999 2.537000
+ -3.721000 14.586999 1.474000 -3.721000 14.586999 1.474000
2.180000 12.838000 -2.797000 2.180000 12.838000 -2.797000
- 5.862000 10.445001 -5.344000 5.862000 10.445001 -5.344000
- 9.801000 8.177001 -8.095990 9.801000 8.177001 -8.095990
- 9.869000 4.830001 -7.843990 9.869000 4.830001 -7.843990
- 10.429000 0.111001 -7.837990 10.429000 0.111001 -7.837990
- 9.406000 -6.679999 -6.456990 9.406000 -6.679999 -6.456990
- 8.561010 -9.191999 -5.594990 8.561010 -9.191999 -5.594990
- 5.046010 -11.967999 -2.705990 5.046010 -11.967999 -2.705990
- 2.769010 -14.830000 -0.738000 2.769010 -14.830000 -0.738000
- -4.219000 -12.785000 4.322000 -4.219000 -12.785000 4.322000
- -6.889000 -10.432000 6.114000 -6.889000 -10.432000 6.114000
+ 5.862000 10.445000 -5.344000 5.862000 10.445000 -5.344000
+ 9.801000 8.177001 -8.096000 9.801000 8.177001 -8.096000
+ 9.869000 4.830001 -7.844000 9.869000 4.830001 -7.844000
+ 10.429000 0.111001 -7.838000 10.429000 0.111001 -7.838000
+ 9.406000 -6.679999 -6.457000 9.406000 -6.679999 -6.457000
+ 8.561000 -9.192000 -5.595000 8.561000 -9.192000 -5.595000
+ 5.046000 -11.968000 -2.706000 5.046000 -11.968000 -2.706000
+ 2.769000 -14.830000 -0.738000 2.769000 -14.830000 -0.738000
+ -4.219000 -12.785001 4.322000 -4.219000 -12.785001 4.322000
+ -6.889000 -10.432001 6.114000 -6.889000 -10.432001 6.114000
-10.078000 -6.463001 8.149000 -10.078000 -6.463001 8.149000
--43.433000 12.068997 31.511000 -43.433000 12.068997 31.511000
- 7.355000 53.513001 -10.358000 7.355000 53.513001 -10.358000
--13.553000 -5.068001 10.631000 -13.553000 -5.068001 10.631000
--15.776000 -3.604001 12.168000 -15.776000 -3.604001 12.168000
--13.919000 11.559999 9.403000 -13.919000 11.559999 9.403000
- -3.091000 19.570000 0.551000 -3.091000 19.570000 0.551000
+-43.433000 12.068995 31.511000 -43.433000 12.068995 31.511000
+ 7.355000 53.513000 -10.358000 7.355000 53.513000 -10.358000
+-13.553000 -5.068002 10.631000 -13.553000 -5.068002 10.631000
+-15.776000 -3.604002 12.168000 -15.776000 -3.604002 12.168000
+-13.919000 11.559998 9.403000 -13.919000 11.559998 9.403000
+ -3.091000 19.569999 0.551000 -3.091000 19.569999 0.551000
0.760000 20.394000 -2.413000 0.760000 20.394000 -2.413000
- 9.129000 13.683001 -8.088990 9.129000 13.683001 -8.088990
- 14.180000 1.698001 -10.797990 14.180000 1.698001 -10.797990
- 15.874010 -6.060998 -11.367990 15.874010 -6.060998 -11.367990
- 7.743010 -15.721999 -4.390990 7.743010 -15.721999 -4.390990
- 2.230010 -19.739000 0.110000 2.230010 -19.739000 0.110000
- -5.532990 -16.967000 5.686000 -5.532990 -16.967000 5.686000
--11.742990 -19.182001 10.548000 -11.742990 -19.182001 10.548000
--18.345000 -8.709001 14.557000 -18.345000 -8.709001 14.557000
+ 9.129000 13.683000 -8.089000 9.129000 13.683000 -8.089000
+ 14.180000 1.698001 -10.798000 14.180000 1.698001 -10.798000
+ 15.874000 -6.060999 -11.368000 15.874000 -6.060999 -11.368000
+ 7.743000 -15.722000 -4.391000 7.743000 -15.722000 -4.391000
+ 2.230000 -19.739000 0.110000 2.230000 -19.739000 0.110000
+ -5.533000 -16.967001 5.686000 -5.533000 -16.967001 5.686000
+-11.743000 -19.182001 10.548000 -11.743000 -19.182001 10.548000
+-18.345000 -8.709002 14.557000 -18.345000 -8.709002 14.557000
-20.215000 4.027998 14.810000 -20.215000 4.027998 14.810000
--19.248000 10.092999 13.536000 -19.248000 10.092999 13.536000
--16.735000 17.724999 10.960000 -16.735000 17.724999 10.960000
- -3.715000 23.662000 0.650000 -3.715000 23.662000 0.650000
+-19.248000 10.092998 13.536000 -19.248000 10.092998 13.536000
+-16.735000 17.724998 10.960000 -16.735000 17.724998 10.960000
+ -3.715000 23.661999 0.650000 -3.715000 23.661999 0.650000
2.646000 23.960000 -4.152000 2.646000 23.960000 -4.152000
- 13.273000 19.268001 -11.704990 13.273000 19.268001 -11.704990
- 19.086000 6.707002 -14.932990 19.086000 6.707002 -14.932990
- 20.848010 -2.417998 -15.430990 20.848010 -2.417998 -15.430990
- 17.396010 -13.054998 -11.877990 17.396010 -13.054998 -11.877990
- 9.247010 -24.956999 -4.684990 9.247010 -24.956999 -4.684990
- -4.882990 -25.896000 6.006000 -4.882990 -25.896000 6.006000
--15.815990 -27.284001 14.338000 -15.815990 -27.284001 14.338000
+ 13.273000 19.268001 -11.705000 13.273000 19.268001 -11.705000
+ 19.086000 6.707001 -14.933000 19.086000 6.707001 -14.933000
+ 20.848000 -2.417998 -15.431000 20.848000 -2.417998 -15.431000
+ 17.396000 -13.054999 -11.878000 17.396000 -13.054999 -11.878000
+ 9.247000 -24.956999 -4.685000 9.247000 -24.956999 -4.685000
+ -4.883000 -25.896001 6.006000 -4.883000 -25.896001 6.006000
+-15.816000 -27.284002 14.338000 -15.816000 -27.284002 14.338000
-21.818000 -14.050002 17.647000 -21.818000 -14.050002 17.647000
--25.034000 0.163998 18.776000 -25.034000 0.163998 18.776000
--25.647000 8.141998 18.515000 -25.647000 8.141998 18.515000
--17.720000 23.644999 11.164000 -17.720000 23.644999 11.164000
- -6.114000 33.581000 1.554000 -6.114000 33.581000 1.554000
+-25.034000 0.163997 18.776000 -25.034000 0.163997 18.776000
+-25.647000 8.141997 18.515000 -25.647000 8.141997 18.515000
+-17.720000 23.644998 11.164000 -17.720000 23.644998 11.164000
+ -6.114000 33.580999 1.554000 -6.114000 33.580999 1.554000
3.725000 33.377000 -5.813000 3.725000 33.377000 -5.813000
- 9.387000 26.873001 -9.474990 9.387000 26.873001 -9.474990
- 20.454000 21.280002 -17.275990 20.454000 21.280002 -17.275990
- 26.819000 3.646002 -20.459990 26.819000 3.646002 -20.459990
- 26.925010 -5.289998 -19.731990 26.925010 -5.289998 -19.731990
- 23.339010 -20.302998 -15.683990 23.339010 -20.302998 -15.683990
- 17.872010 -24.509998 -11.198990 17.872010 -24.509998 -11.198990
- 3.281010 -33.124000 0.531010 3.281010 -33.124000 0.531010
- -1.729990 -30.353000 4.042000 -1.729990 -30.353000 4.042000
- -3.449990 -36.113000 5.854000 -3.449990 -36.113000 5.854000
--30.621000 -14.710002 24.314000 -30.621000 -14.710002 24.314000
--31.262000 10.868998 22.483000 -31.262000 10.868998 22.483000
--25.407000 29.093998 16.441000 -25.407000 29.093998 16.441000
--14.487000 36.861999 7.543000 -14.487000 36.861999 7.543000
- 21.410000 29.741002 -18.758990 21.410000 29.741002 -18.758990
- 28.043000 8.592003 -21.825990 28.043000 8.592003 -21.825990
- 32.989010 -6.840997 -24.142990 32.989010 -6.840997 -24.142990
- 9.893010 -37.276999 -4.055990 9.893010 -37.276999 -4.055990
+ 9.387000 26.873000 -9.475000 9.387000 26.873000 -9.475000
+ 20.454000 21.280002 -17.276000 20.454000 21.280002 -17.276000
+ 26.819000 3.646002 -20.460000 26.819000 3.646002 -20.460000
+ 26.925000 -5.289998 -19.732000 26.925000 -5.289998 -19.732000
+ 23.339000 -20.302998 -15.684000 23.339000 -20.302998 -15.684000
+ 17.872000 -24.509999 -11.199000 17.872000 -24.509999 -11.199000
+ 3.281000 -33.124000 0.531000 3.281000 -33.124000 0.531000
+ -1.730000 -30.353001 4.042000 -1.730000 -30.353001 4.042000
+ -3.450000 -36.113001 5.854000 -3.450000 -36.113001 5.854000
+-30.621000 -14.710003 24.314000 -30.621000 -14.710003 24.314000
+-31.262000 10.868997 22.483000 -31.262000 10.868997 22.483000
+-25.407000 29.093997 16.441000 -25.407000 29.093997 16.441000
+-14.487000 36.861998 7.543000 -14.487000 36.861998 7.543000
+ 21.410000 29.741002 -18.759000 21.410000 29.741002 -18.759000
+ 28.043000 8.592002 -21.826000 28.043000 8.592002 -21.826000
+ 32.989000 -6.840997 -24.143000 32.989000 -6.840997 -24.143000
+ 9.893000 -37.276999 -4.056000 9.893000 -37.276999 -4.056000
]
NORMAL_VECTOR HBA
@@ -126,54 +126,54 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3811649.455090000 453459.894384000 5076728.952 ]
+3 [ 3811649.411690000 453459.941667000 5076728.980 ]
48 x 2 x 3 [
-14.143000 -7.545002 11.298000 -14.143000 -7.545002 11.298000
--14.329010 -2.408002 10.973000 -14.329010 -2.408002 10.973000
--14.515010 2.727998 10.649000 -14.515010 2.727998 10.649000
--14.702010 7.864998 10.324000 -14.702010 7.864998 10.324000
+-14.329000 -2.408002 10.973000 -14.329000 -2.408002 10.973000
+-14.515000 2.727998 10.649000 -14.515000 2.727998 10.649000
+-14.702000 7.864998 10.324000 -14.702000 7.864998 10.324000
-10.022000 -7.590001 8.209000 -10.022000 -7.590001 8.209000
--10.209010 -2.454001 7.885000 -10.209010 -2.454001 7.885000
--10.394010 2.682999 7.560000 -10.394010 2.682999 7.560000
--10.581010 7.817999 7.235000 -10.581010 7.817999 7.235000
+-10.209000 -2.454001 7.885000 -10.209000 -2.454001 7.885000
+-10.394000 2.682999 7.560000 -10.394000 2.682999 7.560000
+-10.581000 7.817999 7.235000 -10.581000 7.817999 7.235000
-5.529000 -17.909001 5.769000 -5.529000 -17.909001 5.769000
-5.715000 -12.772001 5.444000 -5.715000 -12.772001 5.444000
-5.901000 -7.636001 5.120000 -5.901000 -7.636001 5.120000
- -6.088010 -2.499001 4.796000 -6.088010 -2.499001 4.796000
- -6.274010 2.635999 4.471000 -6.274010 2.635999 4.471000
- -6.460010 7.772999 4.146000 -6.460010 7.772999 4.146000
- -6.647010 12.909999 3.822000 -6.647010 12.909999 3.822000
- -6.833010 18.045999 3.498000 -6.833010 18.045999 3.498000
+ -6.088000 -2.499001 4.796000 -6.088000 -2.499001 4.796000
+ -6.274000 2.635999 4.471000 -6.274000 2.635999 4.471000
+ -6.460000 7.772999 4.146000 -6.460000 7.772999 4.146000
+ -6.647000 12.909999 3.822000 -6.647000 12.909999 3.822000
+ -6.833000 18.045999 3.498000 -6.833000 18.045999 3.498000
-1.409000 -17.954000 2.680000 -1.409000 -17.954000 2.680000
-1.595000 -12.818000 2.356000 -1.595000 -12.818000 2.356000
-1.781000 -7.682000 2.031000 -1.781000 -7.682000 2.031000
-1.967000 -2.546000 1.707000 -1.967000 -2.546000 1.707000
- -2.154010 2.591000 1.382000 -2.154010 2.591000 1.382000
- -2.339010 7.727999 1.057000 -2.339010 7.727999 1.057000
- -2.526010 12.863999 0.733000 -2.526010 12.863999 0.733000
- -2.712010 17.999999 0.409000 -2.712010 17.999999 0.409000
+ -2.154000 2.590999 1.382000 -2.154000 2.590999 1.382000
+ -2.339000 7.727999 1.057000 -2.339000 7.727999 1.057000
+ -2.526000 12.863999 0.733000 -2.526000 12.863999 0.733000
+ -2.712000 17.999999 0.409000 -2.712000 17.999999 0.409000
2.712000 -18.000000 -0.409000 2.712000 -18.000000 -0.409000
2.526000 -12.864000 -0.733000 2.526000 -12.864000 -0.733000
2.339000 -7.728000 -1.057000 2.339000 -7.728000 -1.057000
2.154000 -2.591000 -1.382000 2.154000 -2.591000 -1.382000
- 1.966990 2.546000 -1.707000 1.966990 2.546000 -1.707000
- 1.780990 7.682000 -2.031000 1.780990 7.682000 -2.031000
- 1.594990 12.818000 -2.356000 1.594990 12.818000 -2.356000
- 1.408990 17.954000 -2.680000 1.408990 17.954000 -2.680000
- 6.833000 -18.046000 -3.498000 6.833000 -18.046000 -3.498000
- 6.647000 -12.910000 -3.822000 6.647000 -12.910000 -3.822000
+ 1.967000 2.546000 -1.707000 1.967000 2.546000 -1.707000
+ 1.781000 7.682000 -2.031000 1.781000 7.682000 -2.031000
+ 1.595000 12.818000 -2.356000 1.595000 12.818000 -2.356000
+ 1.409000 17.954000 -2.680000 1.409000 17.954000 -2.680000
+ 6.833000 -18.046000 -3.497990 6.833000 -18.046000 -3.497990
+ 6.647000 -12.910000 -3.821990 6.647000 -12.910000 -3.821990
6.460000 -7.773000 -4.146000 6.460000 -7.773000 -4.146000
6.274000 -2.636000 -4.471000 6.274000 -2.636000 -4.471000
6.088000 2.499000 -4.796000 6.088000 2.499000 -4.796000
- 5.900990 7.636000 -5.120000 5.900990 7.636000 -5.120000
- 5.714990 12.772000 -5.444000 5.714990 12.772000 -5.444000
- 5.528990 17.909000 -5.769000 5.528990 17.909000 -5.769000
- 10.581000 -7.817999 -7.235000 10.581000 -7.817999 -7.235000
- 10.394000 -2.682999 -7.560000 10.394000 -2.682999 -7.560000
- 10.209000 2.454001 -7.885000 10.209000 2.454001 -7.885000
- 10.021990 7.590001 -8.209000 10.021990 7.590001 -8.209000
- 14.702000 -7.864999 -10.324000 14.702000 -7.864999 -10.324000
- 14.515000 -2.727999 -10.649000 14.515000 -2.727999 -10.649000
- 14.329000 2.408001 -10.973000 14.329000 2.408001 -10.973000
- 14.143000 7.545001 -11.298000 14.143000 7.545001 -11.298000
+ 5.901000 7.636000 -5.120000 5.901000 7.636000 -5.120000
+ 5.715000 12.772000 -5.444000 5.715000 12.772000 -5.444000
+ 5.529000 17.909000 -5.769000 5.529000 17.909000 -5.769000
+ 10.581000 -7.817999 -7.234990 10.581000 -7.817999 -7.234990
+ 10.394000 -2.682999 -7.559990 10.394000 -2.682999 -7.559990
+ 10.209000 2.454001 -7.884990 10.209000 2.454001 -7.884990
+ 10.022000 7.590001 -8.208990 10.022000 7.590001 -8.208990
+ 14.702000 -7.864999 -10.323990 14.702000 -7.864999 -10.323990
+ 14.515000 -2.727999 -10.648990 14.515000 -2.727999 -10.648990
+ 14.329000 2.408001 -10.972990 14.329000 2.408001 -10.972990
+ 14.143000 7.545001 -11.297990 14.143000 7.545001 -11.297990
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS409-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS409-AntennaField.conf
index b1af4d8519d19fef86201f8245954653330b0e2b..6e228c898d3d6af3c277557ca61c3e1bb180561b 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS409-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS409-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS409
-# ITRF2005 target_date = 2012.5
-# Created: 2012-11-26 21:32:24
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:13
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3824755.852950000 426178.846504000 5069289.868 ]
+3 [ 3824755.809920000 426178.893930000 5069289.897 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
@@ -37,10 +37,10 @@ LBA
-5.871000 6.998999 3.774000 -5.871000 6.998999 3.774000
-2.707000 9.899000 1.137000 -2.707000 9.899000 1.137000
3.111000 9.074000 -3.155000 3.111000 9.074000 -3.155000
- 5.335000 7.287000 -4.663000 5.335000 7.287000 -4.663000
+ 5.335000 7.287001 -4.663000 5.335000 7.287001 -4.663000
7.349000 3.685001 -5.849000 7.349000 3.685001 -5.849000
7.398000 -0.559999 -5.503000 7.398000 -0.559999 -5.503000
- 5.713000 -5.823000 -3.762000 5.713000 -5.823000 -3.762000
+ 5.713000 -5.822999 -3.762000 5.713000 -5.822999 -3.762000
3.200000 -9.252000 -1.566000 3.200000 -9.252000 -1.566000
-0.217000 -10.029000 1.070000 -0.217000 -10.029000 1.070000
-3.100000 -8.228000 3.071000 -3.100000 -8.228000 3.071000
@@ -51,68 +51,68 @@ LBA
-6.812000 11.731999 4.052000 -6.812000 11.731999 4.052000
-0.586000 13.159000 -0.750000 -0.586000 13.159000 -0.750000
1.290000 14.892000 -2.314000 1.290000 14.892000 -2.314000
- 6.239000 10.340000 -5.617000 6.239000 10.340000 -5.617000
+ 6.239000 10.340001 -5.617000 6.239000 10.340001 -5.617000
8.900000 6.339001 -7.254000 8.900000 6.339001 -7.254000
11.844000 2.319001 -9.100000 11.844000 2.319001 -9.100000
10.813000 -0.699999 -8.053000 10.813000 -0.699999 -8.053000
9.793000 -5.190999 -6.882000 9.793000 -5.190999 -6.882000
- 6.615000 -10.725999 -3.996000 6.615000 -10.725999 -3.996000
- 5.003000 -12.538000 -2.622000 5.003000 -12.538000 -2.622000
- 0.806000 -13.230000 0.591000 0.806000 -13.230000 0.591000
- -2.261000 -14.626000 3.019000 -2.261000 -14.626000 3.019000
+ 6.615010 -10.725999 -3.996000 6.615010 -10.725999 -3.996000
+ 5.003010 -12.538000 -2.622000 5.003010 -12.538000 -2.622000
+ 0.806010 -13.230000 0.591000 0.806010 -13.230000 0.591000
+ -2.260990 -14.626000 3.019000 -2.260990 -14.626000 3.019000
-8.129000 -9.259001 6.939000 -8.129000 -9.259001 6.939000
-9.857000 -5.806001 7.924000 -9.857000 -5.806001 7.924000
-11.544000 -0.650001 8.724000 -11.544000 -0.650001 8.724000
- 41.521000 17.848003 -32.780000 41.521000 17.848003 -32.780000
+ 41.521000 17.848004 -32.780000 41.521000 17.848004 -32.780000
15.332010 -51.001999 -6.899000 15.332010 -51.001999 -6.899000
-14.337000 2.355999 10.549000 -14.337000 2.355999 10.549000
--15.938000 4.788999 11.530000 -15.938000 4.788999 11.530000
+-15.938000 4.788998 11.529990 -15.938000 4.788998 11.529990
-9.241000 17.366999 5.367000 -9.241000 17.366999 5.367000
3.510000 19.015000 -4.353000 3.510000 19.015000 -4.353000
7.382000 17.797001 -7.150000 7.382000 17.797001 -7.150000
13.017000 7.568001 -10.455000 13.017000 7.568001 -10.455000
13.822000 -5.677999 -9.862000 13.822000 -5.677999 -9.862000
- 12.869000 -13.454999 -8.444000 12.869000 -13.454999 -8.444000
- 2.101000 -17.944000 0.045000 2.101000 -17.944000 0.045000
- -4.370000 -18.729000 4.973000 -4.370000 -18.729000 4.973000
+ 12.869010 -13.454999 -8.444000 12.869010 -13.454999 -8.444000
+ 2.101010 -17.944000 0.045000 2.101010 -17.944000 0.045000
+ -4.369990 -18.729000 4.973000 -4.369990 -18.729000 4.973000
-10.726000 -12.320001 9.165000 -10.726000 -12.320001 9.165000
--17.260000 -11.146001 13.963000 -17.260000 -11.146001 13.963000
--20.012000 1.540998 14.882000 -20.012000 1.540998 14.882000
--17.595000 13.845998 11.956000 -17.595000 13.845998 11.956000
--14.706000 18.761999 9.343000 -14.706000 18.761999 9.343000
+-17.260000 -11.146002 13.962990 -17.260000 -11.146002 13.962990
+-20.012000 1.540998 14.881990 -20.012000 1.540998 14.881990
+-17.595000 13.845998 11.955990 -17.595000 13.845998 11.955990
+-14.706000 18.761999 9.342990 -14.706000 18.761999 9.342990
-9.858000 24.291999 5.204000 -9.858000 24.291999 5.204000
4.264000 22.979000 -5.277000 4.264000 22.979000 -5.277000
10.313000 20.018001 -9.550000 10.313000 20.018001 -9.550000
18.720000 10.445002 -14.996000 18.720000 10.445002 -14.996000
- 20.051000 -3.700998 -14.716000 20.051000 -3.700998 -14.716000
- 18.714000 -12.731998 -12.896000 18.714000 -12.731998 -12.896000
- 12.005000 -20.462999 -7.162000 12.005000 -20.462999 -7.162000
- 0.488000 -26.941000 2.069000 0.488000 -26.941000 2.069000
--13.039000 -20.611001 11.650000 -13.039000 -20.611001 11.650000
--23.722000 -16.303002 19.279000 -23.722000 -16.303002 19.279000
--25.008000 -1.459002 18.903000 -25.008000 -1.459002 18.903000
--23.368000 12.843998 16.380000 -23.368000 12.843998 16.380000
--21.331000 20.267998 14.179000 -21.331000 20.267998 14.179000
+ 20.051010 -3.700998 -14.716000 20.051010 -3.700998 -14.716000
+ 18.714010 -12.731998 -12.896000 18.714010 -12.731998 -12.896000
+ 12.005010 -20.462999 -7.162000 12.005010 -20.462999 -7.162000
+ 0.488010 -26.941000 2.069000 0.488010 -26.941000 2.069000
+-13.038990 -20.611001 11.650000 -13.038990 -20.611001 11.650000
+-23.722000 -16.303002 19.278990 -23.722000 -16.303002 19.278990
+-25.008000 -1.459002 18.902990 -25.008000 -1.459002 18.902990
+-23.368000 12.843998 16.379990 -23.368000 12.843998 16.379990
+-21.331000 20.267998 14.178990 -21.331000 20.267998 14.178990
-8.844000 30.067999 3.920000 -8.844000 30.067999 3.920000
5.264000 33.040000 -6.938000 5.264000 33.040000 -6.938000
14.403000 27.867001 -13.330000 14.403000 27.867001 -13.330000
- 17.571000 19.197001 -14.924000 17.571000 19.197001 -14.924000
+ 17.571000 19.197002 -14.924000 17.571000 19.197002 -14.924000
26.097000 8.596002 -20.366000 26.097000 8.596002 -20.366000
- 26.283000 -10.351998 -18.792000 26.283000 -10.351998 -18.792000
- 23.460000 -18.374998 -15.948000 23.460000 -18.374998 -15.948000
- 15.195000 -29.938999 -8.699000 15.195000 -29.938999 -8.699000
- 8.702000 -30.916999 -3.738000 8.702000 -30.916999 -3.738000
- -7.766000 -31.196001 8.649000 -7.766000 -31.196001 8.649000
--11.547000 -26.183001 11.034000 -11.547000 -26.183001 11.034000
--15.040000 -30.447001 14.041000 -15.040000 -30.447001 14.041000
--33.458000 2.417997 24.896000 -33.458000 2.417997 24.896000
--25.693000 25.546998 16.976000 -25.693000 25.546998 16.976000
--14.252000 38.825999 7.189000 -14.252000 38.825999 7.189000
+ 26.283010 -10.351997 -18.792000 26.283010 -10.351997 -18.792000
+ 23.460010 -18.374998 -15.948000 23.460010 -18.374998 -15.948000
+ 15.195010 -29.938999 -8.699000 15.195010 -29.938999 -8.699000
+ 8.702010 -30.916999 -3.738000 8.702010 -30.916999 -3.738000
+ -7.765990 -31.196001 8.649000 -7.765990 -31.196001 8.649000
+-11.546990 -26.183001 11.034000 -11.546990 -26.183001 11.034000
+-15.039990 -30.447001 14.041000 -15.039990 -30.447001 14.041000
+-33.458000 2.417997 24.895990 -33.458000 2.417997 24.895990
+-25.693000 25.546998 16.975990 -25.693000 25.546998 16.975990
+-14.252000 38.825999 7.188990 -14.252000 38.825999 7.188990
-1.497000 40.212000 -2.511000 -1.497000 40.212000 -2.511000
- 29.759000 15.655002 -23.752000 29.759000 15.655002 -23.752000
- 29.046000 -6.564998 -21.209000 29.046000 -6.564998 -21.209000
- 28.625000 -22.832998 -19.422000 28.625000 -22.832998 -19.422000
- -2.938000 -38.252000 5.663000 -2.938000 -38.252000 5.663000
+ 29.759000 15.655003 -23.752000 29.759000 15.655003 -23.752000
+ 29.046010 -6.564997 -21.209000 29.046010 -6.564997 -21.209000
+ 28.625010 -22.832997 -19.422000 28.625010 -22.832997 -19.422000
+ -2.937990 -38.252000 5.663000 -2.937990 -38.252000 5.663000
]
NORMAL_VECTOR HBA
@@ -126,7 +126,7 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3824812.620960000 426130.329509000 5069251.754 ]
+3 [ 3824812.577930000 426130.376935000 5069251.783 ]
48 x 2 x 3 [
-14.956000 -4.960001 11.674000 -14.956000 -4.960001 11.674000
-14.567000 0.119999 10.924000 -14.567000 0.119999 10.924000
@@ -135,15 +135,15 @@ HBA
-10.849000 -5.720001 8.661000 -10.849000 -5.720001 8.661000
-10.461000 -0.640001 7.910000 -10.461000 -0.640001 7.910000
-10.072000 4.439999 7.159000 -10.072000 4.439999 7.159000
- -9.683000 9.519999 6.407000 -9.683000 9.519999 6.407000
- -7.521000 -16.640001 7.150000 -7.521000 -16.640001 7.150000
- -7.132000 -11.560001 6.398000 -7.132000 -11.560001 6.398000
- -6.743000 -6.480001 5.647000 -6.743000 -6.480001 5.647000
- -6.354000 -1.400001 4.896000 -6.354000 -1.400001 4.896000
- -5.965000 3.679999 4.145000 -5.965000 3.679999 4.145000
- -5.576000 8.759999 3.394000 -5.576000 8.759999 3.394000
- -5.187000 13.839999 2.643000 -5.187000 13.839999 2.643000
- -4.798000 18.919999 1.891000 -4.798000 18.919999 1.891000
+ -9.683000 9.520000 6.407000 -9.683000 9.520000 6.407000
+ -7.521000 -16.640000 7.150000 -7.521000 -16.640000 7.150000
+ -7.132000 -11.560000 6.398000 -7.132000 -11.560000 6.398000
+ -6.743000 -6.480000 5.647000 -6.743000 -6.480000 5.647000
+ -6.354000 -1.400000 4.896000 -6.354000 -1.400000 4.896000
+ -5.965000 3.680000 4.145000 -5.965000 3.680000 4.145000
+ -5.576000 8.760000 3.394000 -5.576000 8.760000 3.394000
+ -5.187000 13.840000 2.643000 -5.187000 13.840000 2.643000
+ -4.798000 18.920000 1.891000 -4.798000 18.920000 1.891000
-3.415000 -17.400000 4.136000 -3.415000 -17.400000 4.136000
-3.026000 -12.320000 3.385000 -3.026000 -12.320000 3.385000
-2.636000 -7.240000 2.633000 -2.636000 -7.240000 2.633000
@@ -152,28 +152,28 @@ HBA
-1.470000 8.000000 0.380000 -1.470000 8.000000 0.380000
-1.081000 13.081000 -0.371000 -1.081000 13.081000 -0.371000
-0.692000 18.161000 -1.122000 -0.692000 18.161000 -1.122000
- 0.692000 -18.161000 1.122000 0.692000 -18.161000 1.122000
- 1.081000 -13.081000 0.371000 1.081000 -13.081000 0.371000
- 1.470000 -8.000000 -0.380000 1.470000 -8.000000 -0.380000
- 1.859000 -2.920000 -1.131000 1.859000 -2.920000 -1.131000
- 2.247000 2.160000 -1.882000 2.247000 2.160000 -1.882000
- 2.636000 7.240000 -2.633000 2.636000 7.240000 -2.633000
- 3.026000 12.320000 -3.385000 3.026000 12.320000 -3.385000
- 3.415000 17.400000 -4.136000 3.415000 17.400000 -4.136000
- 4.798000 -18.920000 -1.891000 4.798000 -18.920000 -1.891000
- 5.187000 -13.840000 -2.643000 5.187000 -13.840000 -2.643000
- 5.576000 -8.760000 -3.394000 5.576000 -8.760000 -3.394000
- 5.965000 -3.680000 -4.145000 5.965000 -3.680000 -4.145000
- 6.354000 1.400000 -4.896000 6.354000 1.400000 -4.896000
- 6.743000 6.480000 -5.647000 6.743000 6.480000 -5.647000
- 7.132000 11.560000 -6.398000 7.132000 11.560000 -6.398000
- 7.521000 16.640000 -7.150000 7.521000 16.640000 -7.150000
+ 0.692000 -18.160999 1.122000 0.692000 -18.160999 1.122000
+ 1.081000 -13.080999 0.371000 1.081000 -13.080999 0.371000
+ 1.470000 -7.999999 -0.380000 1.470000 -7.999999 -0.380000
+ 1.859000 -2.919999 -1.131000 1.859000 -2.919999 -1.131000
+ 2.247000 2.160001 -1.882000 2.247000 2.160001 -1.882000
+ 2.636000 7.240001 -2.633000 2.636000 7.240001 -2.633000
+ 3.026000 12.320001 -3.385000 3.026000 12.320001 -3.385000
+ 3.415000 17.400001 -4.136000 3.415000 17.400001 -4.136000
+ 4.798000 -18.919999 -1.891000 4.798000 -18.919999 -1.891000
+ 5.187000 -13.839999 -2.643000 5.187000 -13.839999 -2.643000
+ 5.576000 -8.759999 -3.394000 5.576000 -8.759999 -3.394000
+ 5.965000 -3.679999 -4.145000 5.965000 -3.679999 -4.145000
+ 6.354000 1.400001 -4.896000 6.354000 1.400001 -4.896000
+ 6.743000 6.480001 -5.647000 6.743000 6.480001 -5.647000
+ 7.132000 11.560001 -6.398000 7.132000 11.560001 -6.398000
+ 7.521000 16.640001 -7.150000 7.521000 16.640001 -7.150000
9.683000 -9.519999 -6.407000 9.683000 -9.519999 -6.407000
10.072000 -4.439999 -7.159000 10.072000 -4.439999 -7.159000
10.461000 0.640001 -7.910000 10.461000 0.640001 -7.910000
10.849000 5.720001 -8.661000 10.849000 5.720001 -8.661000
- 13.789000 -10.279999 -9.421000 13.789000 -10.279999 -9.421000
- 14.178000 -5.199999 -10.172000 14.178000 -5.199999 -10.172000
- 14.567000 -0.119999 -10.924000 14.567000 -0.119999 -10.924000
- 14.956000 4.960001 -11.674000 14.956000 4.960001 -11.674000
+ 13.789000 -10.279998 -9.421000 13.789000 -10.279998 -9.421000
+ 14.178000 -5.199998 -10.172000 14.178000 -5.199998 -10.172000
+ 14.567000 -0.119998 -10.924000 14.567000 -0.119998 -10.924000
+ 14.956000 4.960002 -11.674000 14.956000 4.960002 -11.674000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS503-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS503-AntennaField.conf
index b59baebdbc32632c031238935bd384a36d69a216..24ea6ea5eab2ad1e676cc5b386cd994a87dffaf7 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS503-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS503-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS503
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:43
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:13
#
NORMAL_VECTOR LBA
@@ -15,19 +15,19 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3824090.452130000 459438.282430000 5066898.190 ]
+3 [ 3824090.408750000 459438.329847000 5066898.218 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
- -2.019000 -0.243000 1.537990 -2.019000 -0.243000 1.537990
- -1.338000 2.105000 0.813990 -1.338000 2.105000 0.813990
+ -2.019000 -0.243001 1.538000 -2.019000 -0.243001 1.538000
+ -1.338000 2.105000 0.814000 -1.338000 2.105000 0.814000
0.800000 2.363000 -0.814000 0.800000 2.363000 -0.814000
2.019000 0.243000 -1.538000 2.019000 0.243000 -1.538000
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
-1.390000 -5.418000 1.533000 -1.390000 -5.418000 1.533000
- -3.914000 -2.848000 3.195990 -3.914000 -2.848000 3.195990
- -4.606000 1.056000 3.361990 -4.606000 1.056000 3.361990
- -3.143000 4.464000 1.955990 -3.143000 4.464000 1.955990
+ -3.914000 -2.848001 3.196000 -3.914000 -2.848001 3.196000
+ -4.606000 1.055999 3.362000 -4.606000 1.055999 3.362000
+ -3.143000 4.463999 1.956000 -3.143000 4.463999 1.956000
-0.210000 5.784000 -0.365000 -0.210000 5.784000 -0.365000
2.822000 4.398000 -2.516000 2.822000 4.398000 -2.516000
4.534000 0.954000 -3.489000 4.534000 0.954000 -3.489000
@@ -35,83 +35,83 @@ LBA
1.784000 -5.454000 -0.846000 1.784000 -5.454000 -0.846000
2.255000 -9.007000 -0.878000 2.255000 -9.007000 -0.878000
-0.570000 -9.780000 1.312000 -0.570000 -9.780000 1.312000
- -4.492000 -8.332000 4.124990 -4.492000 -8.332000 4.124990
- -7.799000 -2.143001 6.047990 -7.799000 -2.143001 6.047990
- -8.130000 1.067999 6.005990 -8.130000 1.067999 6.005990
- -7.173000 5.110999 4.921990 -7.173000 5.110999 4.921990
- -4.516000 7.591000 2.702990 -4.516000 7.591000 2.702990
+ -4.492000 -8.332001 4.125000 -4.492000 -8.332001 4.125000
+ -7.799000 -2.143001 6.048000 -7.799000 -2.143001 6.048000
+ -8.130000 1.067999 6.006000 -8.130000 1.067999 6.006000
+ -7.173000 5.110999 4.922000 -7.173000 5.110999 4.922000
+ -4.516000 7.590999 2.703000 -4.516000 7.590999 2.703000
-0.071000 8.952000 -0.756000 -0.071000 8.952000 -0.756000
3.756000 8.446000 -3.583000 3.756000 8.446000 -3.583000
- 6.499000 5.533001 -5.378000 6.499000 5.533001 -5.378000
- 7.254000 1.668001 -5.596000 7.254000 1.668001 -5.596000
- 6.923000 -3.121999 -4.914000 6.923000 -3.121999 -4.914000
+ 6.499000 5.533000 -5.378000 6.499000 5.533000 -5.378000
+ 7.254000 1.668000 -5.596000 7.254000 1.668000 -5.596000
+ 6.923000 -3.122000 -4.914000 6.923000 -3.122000 -4.914000
5.051000 -7.018000 -3.157000 5.051000 -7.018000 -3.157000
2.393000 -14.137000 -0.519000 2.393000 -14.137000 -0.519000
-0.607000 -14.667000 1.781000 -0.607000 -14.667000 1.781000
- -2.951000 -13.417000 3.426990 -2.951000 -13.417000 3.426990
- -7.954000 -8.116001 6.703990 -7.954000 -8.116001 6.703990
--10.287000 -7.266001 8.377990 -10.287000 -7.266001 8.377990
--10.659000 0.205999 7.981990 -10.659000 0.205999 7.981990
- -9.877000 5.113999 6.950990 -9.877000 5.113999 6.950990
- -9.267000 10.310999 6.023990 -9.267000 10.310999 6.023990
- -6.674000 11.026999 4.012990 -6.674000 11.026999 4.012990
- -3.157000 12.599000 1.230990 -3.157000 12.599000 1.230990
- 2.442000 12.647000 -2.976000 2.442000 12.647000 -2.976000
+ -2.951000 -13.417001 3.427000 -2.951000 -13.417001 3.427000
+ -7.954000 -8.116001 6.704000 -7.954000 -8.116001 6.704000
+-10.287000 -7.266001 8.378000 -10.287000 -7.266001 8.378000
+-10.659000 0.205999 7.982000 -10.659000 0.205999 7.982000
+ -9.877000 5.113999 6.951000 -9.877000 5.113999 6.951000
+ -9.267010 10.310999 6.024000 -9.267010 10.310999 6.024000
+ -6.674010 11.026999 4.013000 -6.674010 11.026999 4.013000
+ -3.157010 12.598999 1.231000 -3.157010 12.598999 1.231000
+ 2.441990 12.647000 -2.976000 2.441990 12.647000 -2.976000
4.652000 12.100000 -4.585000 4.652000 12.100000 -4.585000
- 7.853000 8.373001 -6.652000 7.853000 8.373001 -6.652000
+ 7.853000 8.373000 -6.652000 7.853000 8.373000 -6.652000
10.757000 6.160001 -8.631000 10.757000 6.160001 -8.631000
11.219000 -2.682999 -8.178000 11.219000 -2.682999 -8.178000
10.168000 -6.358999 -7.057000 10.168000 -6.358999 -7.057000
- 8.010000 -10.971999 -5.021000 8.010000 -10.971999 -5.021000
--35.146000 24.974997 24.123990 -35.146000 24.974997 24.123990
- 28.328000 58.307002 -26.534000 28.328000 58.307002 -26.534000
- 7.945000 -15.438999 -4.568000 7.945000 -15.438999 -4.568000
- 7.457010 -18.406999 -3.934000 7.457010 -18.406999 -3.934000
- -4.922000 -19.032000 5.414990 -4.922000 -19.032000 5.414990
--14.360000 -7.447001 11.451990 -14.360000 -7.447001 11.451990
--16.138000 -2.944001 12.378990 -16.138000 -2.944001 12.378990
--13.365000 8.455999 9.267990 -13.365000 8.455999 9.267990
- -5.501000 16.837000 2.606990 -5.501000 16.837000 2.606990
- 0.055000 20.357000 -1.882010 0.055000 20.357000 -1.882010
+ 8.010000 -10.972000 -5.021000 8.010000 -10.972000 -5.021000
+-35.146010 24.974996 24.124000 -35.146010 24.974996 24.124000
+ 28.327990 58.307002 -26.534000 28.327990 58.307002 -26.534000
+ 7.945000 -15.439000 -4.568000 7.945000 -15.439000 -4.568000
+ 7.457000 -18.407000 -3.934000 7.457000 -18.407000 -3.934000
+ -4.922000 -19.032001 5.415000 -4.922000 -19.032001 5.415000
+-14.360000 -7.447002 11.452000 -14.360000 -7.447002 11.452000
+-16.138000 -2.944002 12.379000 -16.138000 -2.944002 12.379000
+-13.365010 8.455998 9.268000 -13.365010 8.455998 9.268000
+ -5.501010 16.836999 2.607000 -5.501010 16.836999 2.607000
+ 0.054990 20.357000 -1.882000 0.054990 20.357000 -1.882000
9.988000 12.347001 -8.613000 9.988000 12.347001 -8.613000
14.746000 6.437001 -11.650000 14.746000 6.437001 -11.650000
14.869000 -3.480999 -10.846000 14.869000 -3.480999 -10.846000
- 18.426000 -10.575998 -12.875000 18.426000 -10.575998 -12.875000
- 12.198010 -20.548999 -7.299000 12.198010 -20.548999 -7.299000
- 2.809010 -25.225000 0.172000 2.809010 -25.225000 0.172000
- -2.207990 -25.203000 3.935000 -2.207990 -25.203000 3.935000
- -8.904000 -23.609001 8.816990 -8.904000 -23.609001 8.816990
--17.369000 -8.977001 13.848990 -17.369000 -8.977001 13.848990
--19.475000 -1.336002 14.738990 -19.475000 -1.336002 14.738990
--18.943000 12.410998 13.096990 -18.943000 12.410998 13.096990
--10.854000 21.824999 6.173990 -10.854000 21.824999 6.173990
- -4.251000 25.686000 0.868990 -4.251000 25.686000 0.868990
- 5.064000 23.523000 -5.928000 5.064000 23.523000 -5.928000
+ 18.426000 -10.575999 -12.875000 18.426000 -10.575999 -12.875000
+ 12.198000 -20.548999 -7.299000 12.198000 -20.548999 -7.299000
+ 2.809000 -25.225000 0.172000 2.809000 -25.225000 0.172000
+ -2.208000 -25.203001 3.935000 -2.208000 -25.203001 3.935000
+ -8.904000 -23.609001 8.817000 -8.904000 -23.609001 8.817000
+-17.369000 -8.977002 13.849000 -17.369000 -8.977002 13.849000
+-19.475000 -1.336002 14.739000 -19.475000 -1.336002 14.739000
+-18.943010 12.410998 13.097000 -18.943010 12.410998 13.097000
+-10.854010 21.824999 6.174000 -10.854010 21.824999 6.174000
+ -4.251010 25.685999 0.869000 -4.251010 25.685999 0.869000
+ 5.063990 23.523000 -5.928000 5.063990 23.523000 -5.928000
16.752000 15.917001 -14.013000 16.752000 15.917001 -14.013000
21.645000 -1.003998 -16.157000 21.645000 -1.003998 -16.157000
- 25.947010 -13.970998 -18.214000 25.947010 -13.970998 -18.214000
- 17.387010 -23.739998 -10.905000 17.387010 -23.739998 -10.905000
- 7.243010 -30.323999 -2.696000 7.243010 -30.323999 -2.696000
- 1.198010 -32.577000 2.045000 1.198010 -32.577000 2.045000
--13.233000 -25.921001 12.275990 -13.233000 -25.921001 12.275990
--24.403000 -13.759002 19.560990 -24.403000 -13.759002 19.560990
--27.141000 -1.815002 20.536990 -27.141000 -1.815002 20.536990
--23.732000 6.267998 17.246990 -23.732000 6.267998 17.246990
--22.627000 20.719998 15.111990 -22.627000 20.719998 15.111990
--10.741000 31.760999 5.191990 -10.741000 31.760999 5.191990
- -3.800000 33.584000 -0.183010 -3.800000 33.584000 -0.183010
- 8.971000 32.087001 -9.634000 8.971000 32.087001 -9.634000
- 13.863000 26.268001 -12.780000 13.863000 26.268001 -12.780000
+ 25.947000 -13.970998 -18.214000 25.947000 -13.970998 -18.214000
+ 17.387000 -23.739999 -10.905000 17.387000 -23.739999 -10.905000
+ 7.243000 -30.324000 -2.696000 7.243000 -30.324000 -2.696000
+ 1.198000 -32.577000 2.045000 1.198000 -32.577000 2.045000
+-13.233000 -25.921002 12.276000 -13.233000 -25.921002 12.276000
+-24.403000 -13.759003 19.561000 -24.403000 -13.759003 19.561000
+-27.141010 -1.815003 20.537000 -27.141010 -1.815003 20.537000
+-23.732010 6.267997 17.247000 -23.732010 6.267997 17.247000
+-22.627010 20.719997 15.112000 -22.627010 20.719997 15.112000
+-10.741010 31.760999 5.192000 -10.741010 31.760999 5.192000
+ -3.800010 33.583999 -0.183000 -3.800010 33.583999 -0.183000
+ 8.970990 32.087000 -9.634000 8.970990 32.087000 -9.634000
+ 13.862990 26.268001 -12.780000 13.862990 26.268001 -12.780000
24.881000 10.244002 -19.602000 24.881000 10.244002 -19.602000
24.194000 3.655002 -18.491000 24.194000 3.655002 -18.491000
- 29.195000 2.665003 -22.155000 29.195000 2.665003 -22.155000
- 20.494010 -34.266998 -12.286000 20.494010 -34.266998 -12.286000
- 0.724010 -39.888000 3.062000 0.724010 -39.888000 3.062000
--15.221990 -36.254001 14.702990 -15.221990 -36.254001 14.702990
--24.498000 -24.512002 20.603990 -24.498000 -24.512002 20.603990
--29.511000 20.273998 20.318990 -29.511000 20.273998 20.318990
--14.962000 32.306999 8.309990 -14.962000 32.306999 8.309990
- -4.374000 41.215000 -0.442010 -4.374000 41.215000 -0.442010
+ 29.195000 2.665002 -22.155000 29.195000 2.665002 -22.155000
+ 20.494000 -34.266998 -12.286000 20.494000 -34.266998 -12.286000
+ 0.724000 -39.888000 3.062000 0.724000 -39.888000 3.062000
+-15.222000 -36.254002 14.703000 -15.222000 -36.254002 14.703000
+-24.498000 -24.512003 20.604000 -24.498000 -24.512003 20.604000
+-29.511010 20.273997 20.319000 -29.511010 20.273997 20.319000
+-14.962010 32.306998 8.310000 -14.962010 32.306998 8.310000
+ -4.374010 41.214999 -0.442000 -4.374010 41.214999 -0.442000
26.175000 19.032002 -21.368000 26.175000 19.032002 -21.368000
]
@@ -126,10 +126,10 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3824138.566130000 459476.972434000 5066858.578 ]
+3 [ 3824138.522740000 459477.019851000 5066858.606 ]
48 x 2 x 3 [
-10.869000 14.830999 6.818000 -10.869000 14.830999 6.818000
- -7.007000 16.374999 3.779000 -7.007000 16.374999 3.779000
+ -7.007000 16.375000 3.779000 -7.007000 16.375000 3.779000
-3.146000 17.918000 0.742000 -3.146000 17.918000 0.742000
0.716000 19.462000 -2.296000 0.716000 19.462000 -2.296000
-9.418000 9.932999 6.172000 -9.418000 9.932999 6.172000
@@ -141,7 +141,7 @@ HBA
-7.967000 5.032999 5.526000 -7.967000 5.032999 5.526000
-4.106000 6.577000 2.488000 -4.106000 6.577000 2.488000
-0.245000 8.121000 -0.550000 -0.245000 8.121000 -0.550000
- 3.616000 9.664000 -3.588000 3.616000 9.664000 -3.588000
+ 3.616000 9.664001 -3.588000 3.616000 9.664001 -3.588000
7.478000 11.208001 -6.626000 7.478000 11.208001 -6.626000
11.339000 12.752001 -9.664000 11.339000 12.752001 -9.664000
-14.240000 -2.954001 10.955000 -14.240000 -2.954001 10.955000
@@ -155,25 +155,25 @@ HBA
-12.790000 -7.852001 10.310000 -12.790000 -7.852001 10.310000
-8.928000 -6.309001 7.272000 -8.928000 -6.309001 7.272000
-5.067000 -4.765000 4.234000 -5.067000 -4.765000 4.234000
- -1.205000 -3.221000 1.196000 -1.205000 -3.221000 1.196000
- 2.656000 -1.677000 -1.842000 2.656000 -1.677000 -1.842000
- 6.518000 -0.133999 -4.880000 6.518000 -0.133999 -4.880000
- 10.379000 1.410001 -7.918000 10.379000 1.410001 -7.918000
- 14.240000 2.954001 -10.955000 14.240000 2.954001 -10.955000
--11.339000 -12.752001 9.664000 -11.339000 -12.752001 9.664000
- -7.478000 -11.208001 6.626000 -7.478000 -11.208001 6.626000
- -3.616000 -9.664000 3.588000 -3.616000 -9.664000 3.588000
- 0.245000 -8.121000 0.550000 0.245000 -8.121000 0.550000
- 4.106000 -6.577000 -2.488000 4.106000 -6.577000 -2.488000
- 7.967000 -5.032999 -5.526000 7.967000 -5.032999 -5.526000
- 11.829000 -3.488999 -8.564000 11.829000 -3.488999 -8.564000
- 15.690000 -1.945999 -11.602000 15.690000 -1.945999 -11.602000
- -2.166000 -14.564000 2.942000 -2.166000 -14.564000 2.942000
- 1.695000 -13.020000 -0.096000 1.695000 -13.020000 -0.096000
- 5.557000 -11.475999 -3.134000 5.557000 -11.475999 -3.134000
- 9.418000 -9.932999 -6.172000 9.418000 -9.932999 -6.172000
- -0.716000 -19.462000 2.296000 -0.716000 -19.462000 2.296000
- 3.146000 -17.918000 -0.742000 3.146000 -17.918000 -0.742000
- 7.007000 -16.374999 -3.779000 7.007000 -16.374999 -3.779000
- 10.869000 -14.830999 -6.818000 10.869000 -14.830999 -6.818000
+ -1.204990 -3.221000 1.196000 -1.204990 -3.221000 1.196000
+ 2.656010 -1.677000 -1.842000 2.656010 -1.677000 -1.842000
+ 6.518010 -0.133999 -4.880000 6.518010 -0.133999 -4.880000
+ 10.379010 1.410001 -7.918000 10.379010 1.410001 -7.918000
+ 14.240010 2.954002 -10.955000 14.240010 2.954002 -10.955000
+-11.338990 -12.752001 9.664000 -11.338990 -12.752001 9.664000
+ -7.477990 -11.208001 6.626000 -7.477990 -11.208001 6.626000
+ -3.615990 -9.664000 3.588000 -3.615990 -9.664000 3.588000
+ 0.245010 -8.121000 0.550000 0.245010 -8.121000 0.550000
+ 4.106010 -6.576999 -2.488000 4.106010 -6.576999 -2.488000
+ 7.967010 -5.032999 -5.526000 7.967010 -5.032999 -5.526000
+ 11.829010 -3.488999 -8.564000 11.829010 -3.488999 -8.564000
+ 15.690010 -1.945998 -11.602000 15.690010 -1.945998 -11.602000
+ -2.165990 -14.564000 2.942000 -2.165990 -14.564000 2.942000
+ 1.695010 -13.020000 -0.096000 1.695010 -13.020000 -0.096000
+ 5.557010 -11.475999 -3.134000 5.557010 -11.475999 -3.134000
+ 9.418010 -9.932999 -6.172000 9.418010 -9.932999 -6.172000
+ -0.715990 -19.462000 2.296000 -0.715990 -19.462000 2.296000
+ 3.146010 -17.917999 -0.742000 3.146010 -17.917999 -0.742000
+ 7.007010 -16.374999 -3.779000 7.007010 -16.374999 -3.779000
+ 10.869010 -14.830999 -6.818000 10.869010 -14.830999 -6.818000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS508-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS508-AntennaField.conf
index 3778bb4eeefaa06893886abd67ab1d5103fbe988..3dd3ace74b983d89195f1da7fcb8e9edebdcdd64 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS508-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS508-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS508
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:44
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:13
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3797202.115650000 463087.509159000 5086605.037 ]
+3 [ 3797202.072070000 463087.556286000 5086605.065 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.029000 -0.244000 1.525000 -2.029000 -0.244000 1.525000
@@ -24,35 +24,35 @@ LBA
2.029000 0.244000 -1.525000 2.029000 0.244000 -1.525000
1.342000 -2.105000 -0.809000 1.342000 -2.105000 -0.809000
-0.806000 -2.363000 0.806000 -0.806000 -2.363000 0.806000
- -3.602000 3.907000 2.324000 -3.602000 3.907000 2.324000
+ -3.602000 3.906999 2.324000 -3.602000 3.906999 2.324000
-0.851000 5.735000 0.125000 -0.851000 5.735000 0.125000
2.297000 4.881000 -2.132000 2.297000 4.881000 -2.132000
4.371000 1.741000 -3.391000 4.371000 1.741000 -3.391000
4.399000 -2.213000 -3.064000 4.399000 -2.213000 -3.064000
2.370000 -5.131000 -1.303000 2.370000 -5.131000 -1.303000
-0.769000 -5.649000 1.068000 -0.769000 -5.649000 1.068000
- -3.548000 -3.524000 2.939000 -3.548000 -3.524000 2.939000
- -4.667000 0.251000 3.435000 -4.667000 0.251000 3.435000
+ -3.548000 -3.524001 2.939000 -3.548000 -3.524001 2.939000
+ -4.667000 0.250999 3.435000 -4.667000 0.250999 3.435000
-7.481000 1.214999 5.435000 -7.481000 1.214999 5.435000
- -7.136010 4.810999 4.863000 -7.136010 4.810999 4.863000
- -4.769010 8.732000 2.763000 -4.769010 8.732000 2.763000
- 0.946990 9.930000 -1.577000 0.946990 9.930000 -1.577000
+ -7.136000 4.810999 4.863000 -7.136000 4.810999 4.863000
+ -4.769000 8.731999 2.763000 -4.769000 8.731999 2.763000
+ 0.947000 9.930000 -1.577000 0.947000 9.930000 -1.577000
3.459000 8.950000 -3.352000 3.459000 8.950000 -3.352000
- 6.173000 6.127001 -5.113000 6.173000 6.127001 -5.113000
- 7.161000 2.001001 -5.481000 7.161000 2.001001 -5.481000
- 6.726000 -3.716999 -4.655000 6.726000 -3.716999 -4.655000
- 5.094000 -7.928999 -3.075000 5.094000 -7.928999 -3.075000
+ 6.173000 6.127000 -5.113000 6.173000 6.127000 -5.113000
+ 7.161000 2.001000 -5.481000 7.161000 2.001000 -5.481000
+ 6.726000 -3.717000 -4.655000 6.726000 -3.717000 -4.655000
+ 5.094000 -7.929000 -3.075000 5.094000 -7.929000 -3.075000
2.016000 -9.865000 -0.624000 2.016000 -9.865000 -0.624000
-1.125000 -9.099000 1.635000 -1.125000 -9.099000 1.635000
- -4.602000 -6.682000 3.999000 -4.602000 -6.682000 3.999000
- -6.906000 -2.864000 5.369000 -6.906000 -2.864000 5.369000
--11.367010 3.230999 8.136000 -11.367010 3.230999 8.136000
--10.783010 6.926999 7.378000 -10.783010 6.926999 7.378000
- -9.079010 9.106999 5.924000 -9.079010 9.106999 5.924000
- -3.473010 12.644000 1.459000 -3.473010 12.644000 1.459000
- -2.074010 14.981000 0.216000 -2.074010 14.981000 0.216000
- 3.641990 12.242000 -3.777000 3.641990 12.242000 -3.777000
- 7.060000 9.253001 -6.046000 7.060000 9.253001 -6.046000
+ -4.602000 -6.682001 3.999000 -4.602000 -6.682001 3.999000
+ -6.906000 -2.864001 5.369000 -6.906000 -2.864001 5.369000
+-11.367000 3.230999 8.136000 -11.367000 3.230999 8.136000
+-10.783000 6.926999 7.378000 -10.783000 6.926999 7.378000
+ -9.079000 9.106999 5.924000 -9.079000 9.106999 5.924000
+ -3.473000 12.643999 1.459000 -3.473000 12.643999 1.459000
+ -2.074000 14.981000 0.216000 -2.074000 14.981000 0.216000
+ 3.642000 12.242000 -3.777000 3.642000 12.242000 -3.777000
+ 7.060000 9.253000 -6.046000 7.060000 9.253000 -6.046000
10.752000 6.342001 -8.524000 10.752000 6.342001 -8.524000
10.439000 3.041001 -8.001000 10.439000 3.041001 -8.001000
10.465000 -1.694999 -7.604000 10.465000 -1.694999 -7.604000
@@ -60,59 +60,59 @@ LBA
7.537000 -10.516999 -4.657000 7.537000 -10.516999 -4.657000
3.699000 -12.637000 -1.627000 3.699000 -12.637000 -1.627000
1.092000 -15.056000 0.518000 1.092000 -15.056000 0.518000
- -5.679000 -11.837000 5.251000 -5.679000 -11.837000 5.251000
+ -5.679000 -11.837001 5.251000 -5.679000 -11.837001 5.251000
-8.088000 -9.062001 6.791000 -8.088000 -9.062001 6.791000
-10.835000 -4.608001 8.433000 -10.835000 -4.608001 8.433000
--41.565000 -16.088003 32.210990 -41.565000 -16.088003 32.210990
--15.163010 52.452999 6.609990 -15.163010 52.452999 6.609990
--14.159000 -2.637001 10.722000 -14.159000 -2.637001 10.722000
--16.221000 -0.813001 12.089000 -16.221000 -0.813001 12.089000
--12.639010 13.770999 8.149000 -12.639010 13.770999 8.149000
- -0.877010 19.771000 -1.093000 -0.877010 19.771000 -1.093000
- 3.075990 19.915000 -4.034000 3.075990 19.915000 -4.034000
+-41.565000 -16.088004 32.210990 -41.565000 -16.088004 32.210990
+-15.163010 52.452998 6.609990 -15.163010 52.452998 6.609990
+-14.159000 -2.637002 10.722000 -14.159000 -2.637002 10.722000
+-16.221000 -0.813002 12.089000 -16.221000 -0.813002 12.089000
+-12.639000 13.770999 8.149000 -12.639000 13.770999 8.149000
+ -0.877000 19.771000 -1.093000 -0.877000 19.771000 -1.093000
+ 3.076000 19.915000 -4.034000 3.076000 19.915000 -4.034000
10.704000 11.870001 -8.976000 10.704000 11.870001 -8.976000
14.405000 -0.783999 -10.603000 14.405000 -0.783999 -10.603000
15.223000 -8.703999 -10.510000 15.223000 -8.703999 -10.510000
- 5.976000 -16.792999 -2.947000 5.976000 -16.792999 -2.947000
+ 5.976000 -16.793000 -2.947000 5.976000 -16.793000 -2.947000
-0.005000 -19.788000 1.748000 -0.005000 -19.788000 1.748000
-7.471000 -15.720001 6.921000 -7.471000 -15.720001 6.921000
--13.947000 -16.823001 11.815000 -13.947000 -16.823001 11.815000
--19.376000 -5.386002 14.828990 -19.376000 -5.386002 14.828990
--19.804010 7.456998 14.014990 -19.804010 7.456998 14.014990
--18.146010 13.250999 12.275990 -18.146010 13.250999 12.275990
--14.762010 20.318999 9.144990 -14.762010 20.318999 9.144990
- -1.038010 23.900000 -1.337000 -1.038010 23.900000 -1.337000
- 5.375990 23.089001 -6.018000 5.375990 23.089001 -6.018000
- 15.488990 16.642001 -12.942000 15.488990 16.642001 -12.942000
+-13.947000 -16.823002 11.815000 -13.947000 -16.823002 11.815000
+-19.376000 -5.386002 14.829000 -19.376000 -5.386002 14.829000
+-19.804000 7.456998 14.014990 -19.804000 7.456998 14.014990
+-18.146000 13.250998 12.276000 -18.146000 13.250998 12.276000
+-14.762000 20.318998 9.145000 -14.762000 20.318998 9.145000
+ -1.038000 23.900000 -1.337000 -1.038000 23.900000 -1.337000
+ 5.376000 23.089000 -6.018000 5.376000 23.089000 -6.018000
+ 15.489000 16.642001 -12.942000 15.489000 16.642001 -12.942000
19.891000 3.293002 -15.027000 19.891000 3.293002 -15.027000
20.625000 -5.985998 -14.752000 20.625000 -5.985998 -14.752000
15.955000 -15.844999 -10.423000 15.955000 -15.844999 -10.423000
- 6.436000 -26.127999 -2.465000 6.436000 -26.127999 -2.465000
+ 6.436000 -26.128000 -2.465000 6.436000 -26.128000 -2.465000
-7.833000 -24.614001 7.972000 -7.833000 -24.614001 7.972000
--18.948000 -24.079001 16.160000 -18.948000 -24.079001 16.160000
+-18.948000 -24.079002 16.160000 -18.948000 -24.079002 16.160000
-23.458000 -10.038002 18.262990 -23.458000 -10.038002 18.262990
--25.071010 4.492998 18.177990 -25.071010 4.492998 18.177990
--24.782010 12.444998 17.262990 -24.782010 12.444998 17.262990
--15.078010 26.304999 8.851990 -15.078010 26.304999 8.851990
- -2.318010 34.067000 -1.285000 -2.318010 34.067000 -1.285000
- 7.524990 32.161001 -8.409000 7.524990 32.161001 -8.409000
- 12.461990 24.789001 -11.417000 12.461990 24.789001 -11.417000
+-25.071000 4.492997 18.177990 -25.071000 4.492997 18.177990
+-24.782000 12.444997 17.262990 -24.782000 12.444997 17.262990
+-15.078000 26.304998 8.852000 -15.078000 26.304998 8.852000
+ -2.318000 34.067000 -1.285000 -2.318000 34.067000 -1.285000
+ 7.525000 32.161000 -8.409000 7.525000 32.161000 -8.409000
+ 12.462000 24.789001 -11.417000 12.462000 24.789001 -11.417000
22.917000 17.376002 -18.509000 22.917000 17.376002 -18.509000
27.290000 -1.052998 -20.125000 27.290000 -1.052998 -20.125000
26.385000 -9.854998 -18.678000 26.385000 -9.854998 -18.678000
21.089000 -23.989998 -13.509000 21.089000 -23.989998 -13.509000
15.127000 -27.185999 -8.811000 15.127000 -27.185999 -8.811000
-0.475000 -33.125000 3.271000 -0.475000 -33.125000 3.271000
- -5.176000 -29.531000 6.438000 -5.176000 -29.531000 6.438000
+ -5.176000 -29.531001 6.438000 -5.176000 -29.531001 6.438000
-7.559000 -34.905001 8.676000 -7.559000 -34.905001 8.676000
-32.362000 -9.157003 24.781990 -32.362000 -9.157003 24.781990
--30.104010 16.094998 20.882990 -30.104010 16.094998 20.882990
+-30.104000 16.094997 20.882990 -30.104000 16.094997 20.882990
-22.161010 32.995998 13.509990 -22.161010 32.995998 13.509990
-10.338010 38.741999 4.244000 -10.338010 38.741999 4.244000
- 24.836990 25.524002 -20.650000 24.836990 25.524002 -20.650000
+ 24.837000 25.524002 -20.650000 24.837000 25.524002 -20.650000
29.082000 3.595003 -21.862000 29.082000 3.595003 -21.862000
32.289000 -12.436997 -22.824000 32.289000 -12.436997 -22.824000
- 5.682000 -38.355999 -0.829000 5.682000 -38.355999 -0.829000
+ 5.682000 -38.356000 -0.829000 5.682000 -38.356000 -0.829000
]
NORMAL_VECTOR HBA
@@ -126,13 +126,13 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3797136.483640000 463114.447154000 5086651.286 ]
+3 [ 3797136.440060000 463114.494280000 5086651.314 ]
48 x 2 x 3 [
-15.701000 -0.927002 11.713000 -15.701000 -0.927002 11.713000
-14.456000 3.885998 10.367000 -14.456000 3.885998 10.367000
-13.210000 8.697998 9.020000 -13.210000 8.697998 9.020000
--11.965000 13.510999 7.673000 -11.965000 13.510999 7.673000
--11.748000 -2.724001 8.944000 -11.748000 -2.724001 8.944000
+-11.965000 13.510998 7.673000 -11.965000 13.510998 7.673000
+-11.748000 -2.724002 8.944000 -11.748000 -2.724002 8.944000
-10.503000 2.088999 7.597000 -10.503000 2.088999 7.597000
-9.258000 6.899999 6.250000 -9.258000 6.899999 6.250000
-8.013000 11.712999 4.904000 -8.013000 11.712999 4.904000
@@ -170,7 +170,7 @@ HBA
10.287000 14.146000 -8.868000 10.287000 14.146000 -8.868000
8.013000 -11.713000 -4.904000 8.013000 -11.713000 -4.904000
9.258000 -6.900000 -6.250000 9.258000 -6.900000 -6.250000
- 10.503000 -2.089000 -7.597000 10.503000 -2.089000 -7.597000
+ 10.503000 -2.088999 -7.597000 10.503000 -2.088999 -7.597000
11.748000 2.724001 -8.944000 11.748000 2.724001 -8.944000
11.965000 -13.510999 -7.673000 11.965000 -13.510999 -7.673000
13.210000 -8.697999 -9.020000 13.210000 -8.697999 -9.020000
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS509-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS509-AntennaField.conf
index e2406a58ed1066d7ea0db022b10d2de0b6822ff0..c9a18e62ae019ce91da932734c6ea6ba9f3c637d 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS509-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS509-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS509
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:44
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:13
#
NORMAL_VECTOR LBA
@@ -15,7 +15,7 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3783579.131130000 450178.882016000 5097830.835 ]
+3 [ 3783579.087620000 450178.928997000 5097830.864 ]
96 x 2 x 3 [
0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-2.019000 -0.243000 1.538000 -2.019000 -0.243000 1.538000
@@ -25,7 +25,7 @@ LBA
1.338000 -2.105000 -0.814000 1.338000 -2.105000 -0.814000
-0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
3.730000 3.192000 -3.088000 3.730000 3.192000 -3.088000
- 4.637000 -0.655999 -3.421000 4.637000 -0.655999 -3.421000
+ 4.637000 -0.656000 -3.421000 4.637000 -0.656000 -3.421000
3.375000 -4.197000 -2.154000 3.375000 -4.197000 -2.154000
0.533000 -5.774000 0.122000 0.533000 -5.774000 0.122000
-2.558000 -4.649000 2.340000 -2.558000 -4.649000 2.340000
@@ -34,19 +34,19 @@ LBA
-2.079000 5.305000 1.081000 -2.079000 5.305000 1.081000
1.078000 5.547000 -1.310000 1.078000 5.547000 -1.310000
2.362000 8.654000 -2.555000 2.362000 8.654000 -2.555000
- 5.103000 7.184001 -4.479000 5.103000 7.184001 -4.479000
+ 5.103000 7.184000 -4.479000 5.103000 7.184000 -4.479000
7.715000 3.184001 -6.079000 7.715000 3.184001 -6.079000
7.570000 -4.051999 -5.316000 7.570000 -4.051999 -5.316000
6.331000 -6.788999 -4.139000 6.331000 -6.788999 -4.139000
3.615000 -9.230000 -1.880000 3.615000 -9.230000 -1.880000
0.208000 -9.210000 0.676000 0.208000 -9.210000 0.676000
-4.172000 -7.009000 3.765000 -4.172000 -7.009000 3.765000
- -7.150000 -3.811000 5.712000 -7.150000 -3.811000 5.712000
+ -7.150000 -3.811001 5.712000 -7.150000 -3.811001 5.712000
-8.080000 0.462999 6.023000 -8.080000 0.462999 6.023000
- -6.889000 4.022000 4.807000 -6.889000 4.022000 4.807000
+ -6.889000 4.021999 4.807000 -6.889000 4.021999 4.807000
-4.345000 7.500000 2.583000 -4.345000 7.500000 2.583000
-0.929000 9.157000 -0.130000 -0.929000 9.157000 -0.130000
- 4.670000 12.742001 -4.657000 4.670000 12.742001 -4.657000
+ 4.670000 12.742000 -4.657000 4.670000 12.742000 -4.657000
7.444000 10.955001 -6.577000 7.444000 10.955001 -6.577000
8.823000 8.265001 -7.370000 8.823000 8.265001 -7.370000
10.525000 0.477001 -7.943000 10.525000 0.477001 -7.943000
@@ -61,12 +61,12 @@ LBA
-10.561000 -0.751001 7.995000 -10.561000 -0.751001 7.995000
-11.957000 3.097999 8.695000 -11.957000 3.097999 8.695000
-8.164000 10.308999 5.196000 -8.164000 10.308999 5.196000
- -5.544000 12.397000 3.041000 -5.544000 12.397000 3.041000
+ -5.544000 12.396999 3.041000 -5.544000 12.396999 3.041000
-1.549000 14.399000 -0.139000 -1.549000 14.399000 -0.139000
- 0.513010 -54.812000 4.570000 0.513010 -54.812000 4.570000
--44.052000 2.659996 32.826000 -44.052000 2.659996 32.826000
+ 0.513000 -54.812000 4.570000 0.513000 -54.812000 4.570000
+-44.052010 2.659996 32.826000 -44.052010 2.659996 32.826000
0.618000 17.824000 -2.075000 0.618000 17.824000 -2.075000
- 2.431000 19.773000 -3.612000 2.431000 19.773000 -3.612000
+ 2.430990 19.773000 -3.612000 2.430990 19.773000 -3.612000
13.136000 11.185001 -10.871000 13.136000 11.185001 -10.871000
15.595000 -4.738999 -11.278000 15.595000 -4.738999 -11.278000
14.961000 -9.541999 -10.367000 14.961000 -9.541999 -10.367000
@@ -74,10 +74,10 @@ LBA
-3.334000 -17.118000 4.050000 -3.334000 -17.118000 4.050000
-9.669000 -15.781001 8.684000 -9.669000 -15.781001 8.684000
-14.235000 -2.275001 10.890000 -14.235000 -2.275001 10.890000
--15.441000 5.805999 11.066000 -15.441000 5.805999 11.066000
--10.856000 13.604999 6.919000 -10.856000 13.604999 6.919000
--10.493000 21.726999 5.913000 -10.493000 21.726999 5.913000
- -0.542000 24.913000 -1.845000 -0.542000 24.913000 -1.845000
+-15.441000 5.805998 11.066000 -15.441000 5.805998 11.066000
+-10.856010 13.604999 6.919000 -10.856010 13.604999 6.919000
+-10.493010 21.726999 5.913000 -10.493010 21.726999 5.913000
+ -0.542010 24.913000 -1.845000 -0.542010 24.913000 -1.845000
9.562000 21.664001 -9.135000 9.562000 21.664001 -9.135000
13.770000 17.969001 -11.960000 13.770000 17.969001 -11.960000
18.646000 11.821002 -15.065000 18.646000 11.821002 -15.065000
@@ -86,33 +86,33 @@ LBA
10.058000 -23.535999 -5.422000 10.058000 -23.535999 -5.422000
-1.192000 -24.922000 3.147000 -1.192000 -24.922000 3.147000
-8.564000 -23.080001 8.515000 -8.564000 -23.080001 8.515000
--15.374000 -14.574001 12.857000 -15.374000 -14.574001 12.857000
+-15.374000 -14.574002 12.857000 -15.374000 -14.574002 12.857000
-21.609000 -0.096002 16.229000 -21.609000 -0.096002 16.229000
--17.729000 16.648999 11.803000 -17.729000 16.648999 11.803000
--15.217000 29.873999 8.722000 -15.217000 29.873999 8.722000
- -3.397000 31.198000 -0.270000 -3.397000 31.198000 -0.270000
- 8.244000 28.873001 -8.798000 8.244000 28.873001 -8.798000
- 14.391000 26.200001 -13.170000 14.391000 26.200001 -13.170000
+-17.729010 16.648998 11.803000 -17.729010 16.648998 11.803000
+-15.217010 29.873998 8.722000 -15.217010 29.873998 8.722000
+ -3.397010 31.198000 -0.270000 -3.397010 31.198000 -0.270000
+ 8.243990 28.873001 -8.798000 8.243990 28.873001 -8.798000
+ 14.390990 26.200001 -13.170000 14.390990 26.200001 -13.170000
23.376000 10.441002 -18.490000 23.376000 10.441002 -18.490000
- 27.027000 -7.198998 -19.637000 27.027000 -7.198998 -19.637000
+ 27.027000 -7.198997 -19.637000 27.027000 -7.198997 -19.637000
23.679000 -18.489998 -16.103000 23.679000 -18.489998 -16.103000
16.992000 -22.266998 -10.742000 16.992000 -22.266998 -10.742000
9.233000 -32.689999 -3.975000 9.233000 -32.689999 -3.975000
- -5.984000 -32.560000 7.435000 -5.984000 -32.560000 7.435000
+ -5.984000 -32.560001 7.435000 -5.984000 -32.560001 7.435000
-12.678000 -28.884001 12.127000 -12.678000 -28.884001 12.127000
-22.712000 -18.359002 18.707000 -22.712000 -18.359002 18.707000
-24.074000 -10.253002 18.997000 -24.074000 -10.253002 18.997000
--25.760000 10.281998 18.406000 -25.760000 10.281998 18.406000
--22.073000 14.896998 15.222000 -22.073000 14.896998 15.222000
--25.805000 19.331998 17.623000 -25.805000 19.331998 17.623000
- -1.033000 41.656000 -2.990000 -1.033000 41.656000 -2.990000
- 18.249000 31.529002 -16.548000 18.249000 31.529002 -16.548000
+-25.760010 10.281997 18.406000 -25.760010 10.281997 18.406000
+-22.073010 14.896998 15.222000 -22.073010 14.896998 15.222000
+-25.805010 19.331997 17.623000 -25.805010 19.331997 17.623000
+ -1.033010 41.656000 -2.990000 -1.033010 41.656000 -2.990000
+ 18.248990 31.529002 -16.548000 18.248990 31.529002 -16.548000
29.935000 17.023003 -24.008000 29.935000 17.023003 -24.008000
32.182000 1.098003 -24.256000 32.182000 1.098003 -24.256000
- 15.230010 -37.386999 -8.052000 15.230010 -37.386999 -8.052000
+ 15.230000 -37.386999 -8.052000 15.230000 -37.386999 -8.052000
-2.692000 -36.081000 5.282000 -2.692000 -36.081000 5.282000
--15.801000 -35.243001 15.046000 -15.801000 -35.243001 15.046000
--31.004000 4.392998 22.875000 -31.004000 4.392998 22.875000
+-15.801000 -35.243002 15.046000 -15.801000 -35.243002 15.046000
+-31.004010 4.392997 22.875000 -31.004010 4.392997 22.875000
]
NORMAL_VECTOR HBA
@@ -126,9 +126,9 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3783537.525130000 450130.064013000 5097866.146 ]
+3 [ 3783537.481620000 450130.110993000 5097866.175 ]
48 x 2 x 3 [
--15.545000 3.836998 11.322000 -15.545000 3.836998 11.322000
+-15.545000 3.836999 11.322000 -15.545000 3.836999 11.322000
-13.396000 8.069999 9.326000 -13.396000 8.069999 9.326000
-11.246000 12.301999 7.330000 -11.246000 12.301999 7.330000
-9.096000 16.534999 5.333000 -9.096000 16.534999 5.333000
@@ -140,40 +140,40 @@ HBA
-10.655000 -6.216001 8.560000 -10.655000 -6.216001 8.560000
-8.505000 -1.984001 6.563000 -8.505000 -1.984001 6.563000
-6.355000 2.248999 4.567000 -6.355000 2.248999 4.567000
- -4.206000 6.480999 2.571000 -4.206000 6.480999 2.571000
- -2.055000 10.713999 0.574000 -2.055000 10.713999 0.574000
+ -4.206000 6.481000 2.571000 -4.206000 6.481000 2.571000
+ -2.055000 10.714000 0.574000 -2.055000 10.714000 0.574000
0.094000 14.947000 -1.422000 0.094000 14.947000 -1.422000
2.244000 19.179000 -3.418000 2.244000 19.179000 -3.418000
-9.285000 -13.360001 8.177000 -9.285000 -13.360001 8.177000
-7.134000 -9.127001 6.180000 -7.134000 -9.127001 6.180000
- -4.985000 -4.894001 4.184000 -4.985000 -4.894001 4.184000
- -2.835000 -0.661001 2.188000 -2.835000 -0.661001 2.188000
+ -4.985000 -4.894000 4.184000 -4.985000 -4.894000 4.184000
+ -2.835000 -0.661000 2.188000 -2.835000 -0.661000 2.188000
-0.685000 3.572000 0.191000 -0.685000 3.572000 0.191000
1.465000 7.804000 -1.805000 1.465000 7.804000 -1.805000
3.614000 12.037000 -3.801000 3.614000 12.037000 -3.801000
- 5.765000 16.269000 -5.797000 5.765000 16.269000 -5.797000
- -5.764990 -16.269001 5.797000 -5.764990 -16.269001 5.797000
- -3.614000 -12.037001 3.801000 -3.614000 -12.037001 3.801000
+ 5.765000 16.269001 -5.797000 5.765000 16.269001 -5.797000
+ -5.765000 -16.269001 5.797000 -5.765000 -16.269001 5.797000
+ -3.614000 -12.037000 3.801000 -3.614000 -12.037000 3.801000
-1.465000 -7.804000 1.805000 -1.465000 -7.804000 1.805000
0.685000 -3.572000 -0.191000 0.685000 -3.572000 -0.191000
2.835000 0.661000 -2.188000 2.835000 0.661000 -2.188000
4.985000 4.894000 -4.184000 4.985000 4.894000 -4.184000
- 7.134000 9.127000 -6.180000 7.134000 9.127000 -6.180000
- 9.285000 13.360000 -8.177000 9.285000 13.360000 -8.177000
- -2.243990 -19.179000 3.418000 -2.243990 -19.179000 3.418000
- -0.093990 -14.947000 1.422000 -0.093990 -14.947000 1.422000
- 2.055010 -10.714000 -0.574000 2.055010 -10.714000 -0.574000
+ 7.134000 9.127001 -6.180000 7.134000 9.127001 -6.180000
+ 9.285000 13.360001 -8.177000 9.285000 13.360001 -8.177000
+ -2.244000 -19.179000 3.418000 -2.244000 -19.179000 3.418000
+ -0.094000 -14.947000 1.422000 -0.094000 -14.947000 1.422000
+ 2.055000 -10.714000 -0.574000 2.055000 -10.714000 -0.574000
4.206000 -6.481000 -2.571000 4.206000 -6.481000 -2.571000
- 6.355000 -2.249000 -4.567000 6.355000 -2.249000 -4.567000
- 8.505000 1.984000 -6.563000 8.505000 1.984000 -6.563000
+ 6.355000 -2.248999 -4.567000 6.355000 -2.248999 -4.567000
+ 8.505000 1.984001 -6.563000 8.505000 1.984001 -6.563000
10.655000 6.216001 -8.560000 10.655000 6.216001 -8.560000
12.805000 10.449001 -10.556000 12.805000 10.449001 -10.556000
- 5.576010 -13.625000 -2.954000 5.576010 -13.625000 -2.954000
- 7.726010 -9.391000 -4.950000 7.726010 -9.391000 -4.950000
+ 5.576000 -13.624999 -2.954000 5.576000 -13.624999 -2.954000
+ 7.726000 -9.390999 -4.950000 7.726000 -9.390999 -4.950000
9.876000 -5.158999 -6.946000 9.876000 -5.158999 -6.946000
12.025000 -0.925999 -8.943000 12.025000 -0.925999 -8.943000
- 9.096010 -16.535000 -5.333000 9.096010 -16.535000 -5.333000
- 11.246010 -12.301999 -7.330000 11.246010 -12.301999 -7.330000
- 13.396010 -8.069999 -9.326000 13.396010 -8.069999 -9.326000
- 15.545010 -3.836999 -11.322000 15.545010 -3.836999 -11.322000
+ 9.096000 -16.534999 -5.333000 9.096000 -16.534999 -5.333000
+ 11.246000 -12.301999 -7.330000 11.246000 -12.301999 -7.330000
+ 13.396000 -8.069999 -9.326000 13.396000 -8.069999 -9.326000
+ 15.545000 -3.836999 -11.322000 15.545000 -3.836999 -11.322000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/SE607-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/SE607-AntennaField.conf
index 6c15446f984cd48efdc81186ae1020cb0fd2ea2d..220bd8652b84e1aaaefd0f4c60b41c612282d226 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/SE607-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/SE607-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for SE607
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:44
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:14
#
NORMAL_VECTOR LBA
@@ -15,21 +15,21 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 3370286.930950000 712053.870798000 5349991.459 ]
+3 [ 3370286.882560000 712053.913283000 5349991.484 ]
96 x 2 x 3 [
- 1.887000 -14.355000 0.671000 1.887000 -14.355000 0.671000
+ 1.887010 -14.355000 0.671000 1.887010 -14.355000 0.671000
-4.857000 -11.806001 4.592000 -4.857000 -11.806001 4.592000
- -0.744000 -16.435000 2.599000 -0.744000 -16.435000 2.599000
+ -0.743990 -16.435001 2.599000 -0.743990 -16.435001 2.599000
-6.542000 -14.418001 5.992000 -6.542000 -14.418001 5.992000
-5.941000 19.612999 1.204000 -5.941000 19.612999 1.204000
--11.288000 20.898999 4.408000 -11.288000 20.898999 4.408000
- -2.019000 26.153000 -2.116000 -2.019000 26.153000 -2.116000
+-11.288000 20.898998 4.408000 -11.288000 20.898998 4.408000
+ -2.019000 26.152999 -2.116000 -2.019000 26.152999 -2.116000
-5.954000 28.210999 0.099000 -5.954000 28.210999 0.099000
- 2.375000 -20.503000 1.159000 2.375000 -20.503000 1.159000
+ 2.375010 -20.503000 1.159000 2.375010 -20.503000 1.159000
7.523010 -24.386000 -1.583000 7.523010 -24.386000 -1.583000
6.613010 -28.163000 -0.520000 6.613010 -28.163000 -0.520000
3.195010 -28.880000 1.728000 3.195010 -28.880000 1.728000
- -1.320000 4.507000 0.248000 -1.320000 4.507000 0.248000
+ -1.320000 4.506999 0.248000 -1.320000 4.506999 0.248000
-3.687000 -0.263001 2.358000 -3.687000 -0.263001 2.358000
-6.451000 0.975999 3.941000 -6.451000 0.975999 3.941000
-6.691000 5.753999 3.473000 -6.691000 5.753999 3.473000
@@ -38,13 +38,13 @@ LBA
-15.107000 -0.663002 9.610000 -15.107000 -0.663002 9.610000
-15.691000 -5.212002 10.567000 -15.691000 -5.212002 10.567000
17.566000 3.751001 -11.560000 17.566000 3.751001 -11.560000
- 20.572000 -4.704999 -12.359000 20.572000 -4.704999 -12.359000
+ 20.572010 -4.704999 -12.359000 20.572010 -4.704999 -12.359000
25.229000 5.328002 -16.595000 25.229000 5.328002 -16.595000
- 25.267000 -6.678998 -15.063000 25.267000 -6.678998 -15.063000
- 7.478000 -10.792000 -3.316000 7.478000 -10.792000 -3.316000
- 6.955000 -14.818000 -2.464000 6.955000 -14.818000 -2.464000
- 11.102000 -11.250999 -5.541000 11.102000 -11.250999 -5.541000
- 14.081000 -13.527999 -7.124000 14.081000 -13.527999 -7.124000
+ 25.267010 -6.678998 -15.063000 25.267010 -6.678998 -15.063000
+ 7.478010 -10.792000 -3.316000 7.478010 -10.792000 -3.316000
+ 6.955010 -14.818000 -2.464000 6.955010 -14.818000 -2.464000
+ 11.102010 -11.250999 -5.541000 11.102010 -11.250999 -5.541000
+ 14.081010 -13.527999 -7.124000 14.081010 -13.527999 -7.124000
9.178000 16.512000 -7.925000 9.178000 16.512000 -7.925000
9.598000 20.335000 -8.685000 9.598000 20.335000 -8.685000
16.773000 14.574001 -12.462000 16.773000 14.574001 -12.462000
@@ -54,12 +54,12 @@ LBA
-27.159000 10.863997 15.714000 -27.159000 10.863997 15.714000
-26.589000 4.408997 16.191000 -26.589000 4.408997 16.191000
2.495000 6.140000 -2.368000 2.495000 6.140000 -2.368000
- -1.593000 9.561000 -0.235000 -1.593000 9.561000 -0.235000
+ -1.593000 9.560999 -0.235000 -1.593000 9.560999 -0.235000
4.250000 9.399000 -3.897000 4.250000 9.399000 -3.897000
2.038000 12.194000 -2.865000 2.038000 12.194000 -2.865000
- -7.798000 -23.118001 7.911000 -7.798000 -23.118001 7.911000
+ -7.797990 -23.118001 7.911000 -7.797990 -23.118001 7.911000
-14.386000 -16.230002 11.173000 -14.386000 -16.230002 11.173000
--14.177000 -25.277001 12.213000 -14.177000 -25.277001 12.213000
+-14.176990 -25.277002 12.213000 -14.176990 -25.277002 12.213000
-20.236000 -17.113002 14.975000 -20.236000 -17.113002 14.975000
6.278000 1.096000 -4.100000 6.278000 1.096000 -4.100000
8.354000 4.090000 -5.796000 8.354000 4.090000 -5.796000
@@ -69,46 +69,46 @@ LBA
14.604000 9.757001 -10.471000 14.604000 9.757001 -10.471000
-15.025000 23.491998 6.429000 -15.025000 23.491998 6.429000
-16.750000 10.657998 9.179000 -16.750000 10.657998 9.179000
- 18.946000 -13.576999 -10.185000 18.946000 -13.576999 -10.185000
+ 18.946010 -13.576999 -10.185000 18.946010 -13.576999 -10.185000
23.640000 12.845002 -16.567000 23.640000 12.845002 -16.567000
--21.076000 16.568998 11.140000 -21.076000 16.568998 11.140000
+-21.076000 16.568997 11.140000 -21.076000 16.568997 11.140000
-3.421000 6.999999 1.250000 -3.421000 6.999999 1.250000
-4.055990 -28.704001 6.277000 -4.055990 -28.704001 6.277000
- 16.514000 -7.147999 -9.484000 16.514000 -7.147999 -9.484000
- 7.938000 -18.633000 -2.590000 7.938000 -18.633000 -2.590000
+ 16.514010 -7.147999 -9.484000 16.514010 -7.147999 -9.484000
+ 7.938010 -18.633000 -2.590000 7.938010 -18.633000 -2.590000
10.733000 26.909001 -10.253000 10.733000 26.909001 -10.253000
11.142000 9.687001 -8.279000 11.142000 9.687001 -8.279000
14.690000 -3.832999 -8.764000 14.690000 -3.832999 -8.764000
--11.783000 -13.439001 9.170000 -11.783000 -13.439001 9.170000
+-11.783000 -13.439002 9.170000 -11.783000 -13.439002 9.170000
-4.046000 -4.586001 3.145000 -4.046000 -4.586001 3.145000
-4.359000 14.234999 0.904000 -4.359000 14.234999 0.904000
1.317000 -7.902000 0.194000 1.317000 -7.902000 0.194000
4.799000 21.867000 -5.859000 4.799000 21.867000 -5.859000
5.021000 14.271000 -5.014000 5.021000 14.271000 -5.014000
- 13.620000 -18.903999 -6.137000 13.620000 -18.903999 -6.137000
+ 13.620010 -18.903999 -6.137000 13.620010 -18.903999 -6.137000
12.756010 -22.003999 -5.191000 12.756010 -22.003999 -5.191000
3.447000 -3.312000 -1.744000 3.447000 -3.312000 -1.744000
- -5.828000 -19.177001 6.159000 -5.828000 -19.177001 6.159000
+ -5.827990 -19.177001 6.159000 -5.827990 -19.177001 6.159000
8.223000 7.766000 -6.190000 8.223000 7.766000 -6.190000
--12.921000 7.925999 7.119000 -12.921000 7.925999 7.119000
- -1.955000 16.134000 -0.858000 -1.955000 16.134000 -0.858000
+-12.921000 7.925998 7.119000 -12.921000 7.925998 7.119000
+ -1.955000 16.133999 -0.858000 -1.955000 16.133999 -0.858000
-18.830000 18.814998 9.433000 -18.830000 18.814998 9.433000
5.226000 -8.169000 -2.236000 5.226000 -8.169000 -2.236000
13.130000 4.978001 -8.923000 13.130000 4.978001 -8.923000
- 0.079000 -22.976000 2.927000 0.079000 -22.976000 2.927000
+ 0.079010 -22.976000 2.927000 0.079010 -22.976000 2.927000
-18.950000 -9.487002 13.176000 -18.950000 -9.487002 13.176000
--12.292000 -8.083001 8.797000 -12.292000 -8.083001 8.797000
--12.571000 16.774999 5.752000 -12.571000 16.774999 5.752000
--12.403000 1.285999 7.652000 -12.403000 1.285999 7.652000
- -0.532000 -4.870000 0.966000 -0.532000 -4.870000 0.966000
- 21.032000 7.165001 -14.187000 21.032000 7.165001 -14.187000
+-12.292000 -8.083002 8.797000 -12.292000 -8.083002 8.797000
+-12.571000 16.774998 5.752000 -12.571000 16.774998 5.752000
+-12.403000 1.285998 7.652000 -12.403000 1.285998 7.652000
+ -0.532000 -4.870001 0.966000 -0.532000 -4.870001 0.966000
+ 21.032000 7.165002 -14.187000 21.032000 7.165002 -14.187000
3.528000 2.776000 -2.583000 3.528000 2.776000 -2.583000
2.040000 31.170000 -5.325000 2.040000 31.170000 -5.325000
1.905000 21.894000 -4.038000 1.905000 21.894000 -4.038000
-6.063000 -6.847001 4.709000 -6.063000 -6.847001 4.709000
--25.445000 -7.768002 17.048000 -25.445000 -7.768002 17.048000
+-25.445000 -7.768003 17.048000 -25.445000 -7.768003 17.048000
0.473000 -11.137000 1.145000 0.473000 -11.137000 1.145000
- 21.474000 -12.506998 -11.917000 21.474000 -12.506998 -11.917000
+ 21.474010 -12.506998 -11.917000 21.474010 -12.506998 -11.917000
-20.344000 -1.627002 13.036000 -20.344000 -1.627002 13.036000
6.148000 -4.906000 -3.240000 6.148000 -4.906000 -3.240000
11.042000 -5.348999 -6.268000 11.042000 -5.348999 -6.268000
@@ -126,21 +126,21 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 3370271.656950000 712125.880796000 5349991.165 ]
+3 [ 3370271.608560000 712125.923281000 5349991.190 ]
96 x 2 x 3 [
-23.046000 -3.654002 14.990000 -23.046000 -3.654002 14.990000
-22.275000 1.307998 13.845000 -22.275000 1.307998 13.845000
--21.505000 6.269999 12.700000 -21.505000 6.269999 12.700000
--20.735010 11.230999 11.556000 -20.735010 11.230999 11.556000
--19.964010 16.192999 10.411000 -19.964010 16.192999 10.411000
--19.515000 -9.870001 13.595000 -19.515000 -9.870001 13.595000
--18.744000 -4.907001 12.450000 -18.744000 -4.907001 12.450000
--17.974000 0.053999 11.305000 -17.974000 0.053999 11.305000
--17.204000 5.015999 10.160000 -17.204000 5.015999 10.160000
--16.433000 9.976999 9.015000 -16.433000 9.976999 9.015000
--15.663010 14.938999 7.871000 -15.663010 14.938999 7.871000
+-21.505000 6.269998 12.700000 -21.505000 6.269998 12.700000
+-20.735010 11.230998 11.556000 -20.735010 11.230998 11.556000
+-19.964010 16.192998 10.411000 -19.964010 16.192998 10.411000
+-19.515000 -9.870002 13.595000 -19.515000 -9.870002 13.595000
+-18.744000 -4.907002 12.450000 -18.744000 -4.907002 12.450000
+-17.974000 0.053998 11.305000 -17.974000 0.053998 11.305000
+-17.204000 5.015998 10.160000 -17.204000 5.015998 10.160000
+-16.433000 9.976998 9.015000 -16.433000 9.976998 9.015000
+-15.663010 14.938998 7.871000 -15.663010 14.938998 7.871000
-14.892010 19.900999 6.725000 -14.892010 19.900999 6.725000
--15.985000 -16.085001 12.200000 -15.985000 -16.085001 12.200000
+-15.985000 -16.085002 12.200000 -15.985000 -16.085002 12.200000
-15.214000 -11.123001 11.055000 -15.214000 -11.123001 11.055000
-14.444000 -6.162001 9.910000 -14.444000 -6.162001 9.910000
-13.674000 -1.200001 8.765000 -13.674000 -1.200001 8.765000
@@ -153,18 +153,18 @@ HBA
-11.683000 -17.339001 9.659000 -11.683000 -17.339001 9.659000
-10.913000 -12.377001 8.515000 -10.913000 -12.377001 8.515000
-10.143000 -7.416001 7.370000 -10.143000 -7.416001 7.370000
- -9.372000 -2.454000 6.225000 -9.372000 -2.454000 6.225000
- -8.602000 2.508000 5.080000 -8.602000 2.508000 5.080000
- -7.831000 7.469000 3.935000 -7.831000 7.469000 3.935000
- -7.061000 12.432000 2.790000 -7.061000 12.432000 2.790000
- -6.291010 17.393000 1.646000 -6.291010 17.393000 1.646000
- -5.520010 22.354000 0.501000 -5.520010 22.354000 0.501000
- -4.750010 27.316000 -0.644000 -4.750010 27.316000 -0.644000
- -8.153000 -23.555000 8.264000 -8.153000 -23.555000 8.264000
- -7.383000 -18.593000 7.120000 -7.383000 -18.593000 7.120000
- -6.612000 -13.631000 5.975000 -6.612000 -13.631000 5.975000
- -5.842000 -8.669000 4.830000 -5.842000 -8.669000 4.830000
- -5.072000 -3.708000 3.685000 -5.072000 -3.708000 3.685000
+ -9.372000 -2.454001 6.225000 -9.372000 -2.454001 6.225000
+ -8.602000 2.507999 5.080000 -8.602000 2.507999 5.080000
+ -7.831000 7.468999 3.935000 -7.831000 7.468999 3.935000
+ -7.061000 12.431999 2.790000 -7.061000 12.431999 2.790000
+ -6.291010 17.392999 1.646000 -6.291010 17.392999 1.646000
+ -5.520010 22.353999 0.501000 -5.520010 22.353999 0.501000
+ -4.750010 27.315999 -0.644000 -4.750010 27.315999 -0.644000
+ -8.153000 -23.555001 8.264000 -8.153000 -23.555001 8.264000
+ -7.383000 -18.593001 7.120000 -7.383000 -18.593001 7.120000
+ -6.612000 -13.631001 5.975000 -6.612000 -13.631001 5.975000
+ -5.842000 -8.669001 4.830000 -5.842000 -8.669001 4.830000
+ -5.072000 -3.708001 3.685000 -5.072000 -3.708001 3.685000
-4.301000 1.254000 2.540000 -4.301000 1.254000 2.540000
-3.531000 6.216000 1.395000 -3.531000 6.216000 1.395000
-2.760000 11.177000 0.251000 -2.760000 11.177000 0.251000
@@ -178,21 +178,21 @@ HBA
-0.770000 -4.961000 1.145000 -0.770000 -4.961000 1.145000
0.770000 4.961000 -1.145000 0.770000 4.961000 -1.145000
1.541000 9.924000 -2.290000 1.541000 9.924000 -2.290000
- 2.311000 14.885001 -3.434000 2.311000 14.885001 -3.434000
- 3.081990 19.847001 -4.580000 3.081990 19.847001 -4.580000
- 3.851990 24.808001 -5.724000 3.851990 24.808001 -5.724000
+ 2.311000 14.885000 -3.434000 2.311000 14.885000 -3.434000
+ 3.081990 19.847000 -4.580000 3.081990 19.847000 -4.580000
+ 3.851990 24.808000 -5.724000 3.851990 24.808000 -5.724000
0.449000 -26.062000 3.184000 0.449000 -26.062000 3.184000
1.219000 -21.101000 2.039000 1.219000 -21.101000 2.039000
- 1.990000 -16.138999 0.895000 1.990000 -16.138999 0.895000
- 2.760000 -11.176999 -0.251000 2.760000 -11.176999 -0.251000
- 3.531000 -6.215999 -1.395000 3.531000 -6.215999 -1.395000
- 4.301000 -1.253999 -2.540000 4.301000 -1.253999 -2.540000
- 5.072000 3.708001 -3.685000 5.072000 3.708001 -3.685000
+ 1.990000 -16.139000 0.895000 1.990000 -16.139000 0.895000
+ 2.760000 -11.177000 -0.251000 2.760000 -11.177000 -0.251000
+ 3.531000 -6.216000 -1.395000 3.531000 -6.216000 -1.395000
+ 4.301000 -1.254000 -2.540000 4.301000 -1.254000 -2.540000
+ 5.072000 3.708000 -3.685000 5.072000 3.708000 -3.685000
5.842000 8.669001 -4.830000 5.842000 8.669001 -4.830000
6.612000 13.631001 -5.975000 6.612000 13.631001 -5.975000
7.383000 18.593001 -7.120000 7.383000 18.593001 -7.120000
8.152990 23.555001 -8.264000 8.152990 23.555001 -8.264000
- 4.750000 -27.315999 0.644000 4.750000 -27.315999 0.644000
+ 4.750000 -27.316000 0.644000 4.750000 -27.316000 0.644000
5.520000 -22.353999 -0.501000 5.520000 -22.353999 -0.501000
6.291000 -17.392999 -1.646000 6.291000 -17.392999 -1.646000
7.061000 -12.431999 -2.790000 7.061000 -12.431999 -2.790000
@@ -209,11 +209,11 @@ HBA
12.133000 -8.723999 -6.475000 12.133000 -8.723999 -6.475000
12.903000 -3.761999 -7.620000 12.903000 -3.761999 -7.620000
13.674000 1.200001 -8.765000 13.674000 1.200001 -8.765000
- 14.444000 6.162002 -9.910000 14.444000 6.162002 -9.910000
- 15.214000 11.123002 -11.055000 15.214000 11.123002 -11.055000
- 15.985000 16.085002 -12.200000 15.985000 16.085002 -12.200000
- 14.892000 -19.900998 -6.725000 14.892000 -19.900998 -6.725000
- 15.663000 -14.938998 -7.871000 15.663000 -14.938998 -7.871000
+ 14.444000 6.162001 -9.910000 14.444000 6.162001 -9.910000
+ 15.214000 11.123001 -11.055000 15.214000 11.123001 -11.055000
+ 15.985000 16.085001 -12.200000 15.985000 16.085001 -12.200000
+ 14.892000 -19.900999 -6.725000 14.892000 -19.900999 -6.725000
+ 15.663000 -14.938999 -7.871000 15.663000 -14.938999 -7.871000
16.433000 -9.976998 -9.015000 16.433000 -9.976998 -9.015000
17.204000 -5.015998 -10.160000 17.204000 -5.015998 -10.160000
17.974000 -0.053998 -11.305000 17.974000 -0.053998 -11.305000
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/UK608-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/UK608-AntennaField.conf
index 88a21167329f7de6f786c8b6254707c0b0df9ee0..472ecc84d3f51db57653abf5260807e222251bff 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/UK608-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/UK608-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for UK608
-# ITRF2005 target_date = 2012.5
-# Created: 2012-01-24 14:49:44
+# ITRF2005 target_date = 2015.5
+# Created: 2015-01-20 21:24:14
#
NORMAL_VECTOR LBA
@@ -15,32 +15,32 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 4008438.457200000 -100309.724927000 4943735.828 ]
+3 [ 4008438.421100000 -100309.675513000 4943735.858 ]
96 x 2 x 3 [
--10.131000 6.249000 8.272000 -10.131000 6.249000 8.272000
- -5.280000 11.669000 4.471000 -5.280000 11.669000 4.471000
--10.216000 10.114000 8.414000 -10.216000 10.114000 8.414000
- -6.158000 14.873000 5.238000 -6.158000 14.873000 5.238000
- 15.441000 -5.110998 -12.525000 15.441000 -5.110998 -12.525000
- 18.813000 -0.394998 -15.149000 18.813000 -0.394998 -15.149000
- 17.779000 -12.830998 -14.553000 17.779000 -12.830998 -14.553000
- 20.976000 -9.991998 -17.072000 20.976000 -9.991998 -17.072000
+-10.131000 6.248999 8.272000 -10.131000 6.248999 8.272000
+ -5.280000 11.668999 4.471000 -5.280000 11.668999 4.471000
+-10.216000 10.113999 8.414000 -10.216000 10.113999 8.414000
+ -6.158000 14.872999 5.238000 -6.158000 14.872999 5.238000
+ 15.441000 -5.110999 -12.524990 15.441000 -5.110999 -12.524990
+ 18.813000 -0.394998 -15.148990 18.813000 -0.394998 -15.148990
+ 17.779000 -12.830998 -14.552990 17.779000 -12.830998 -14.552990
+ 20.976000 -9.991998 -17.071990 20.976000 -9.991998 -17.071990
-14.316000 9.251999 11.697000 -14.316000 9.251999 11.697000
--19.264000 6.214999 15.622000 -19.264000 6.214999 15.622000
--21.260000 9.292999 17.286000 -21.260000 9.292999 17.286000
--20.093000 13.183999 16.421000 -20.093000 13.183999 16.421000
- 3.527000 -1.220999 -2.862000 3.527000 -1.220999 -2.862000
+-19.264000 6.214998 15.622000 -19.264000 6.214998 15.622000
+-21.260000 9.292998 17.286000 -21.260000 9.292998 17.286000
+-20.093000 13.183998 16.421000 -20.093000 13.183998 16.421000
+ 3.527000 -1.221000 -2.862000 3.527000 -1.221000 -2.862000
1.586000 3.907000 -1.203000 1.586000 3.907000 -1.203000
- 3.699000 6.018001 -2.863000 3.699000 6.018001 -2.863000
+ 3.699000 6.018000 -2.863000 3.699000 6.018000 -2.863000
6.885000 3.542001 -5.475000 6.885000 3.542001 -5.475000
- 3.756000 9.562001 -2.842000 3.756000 9.562001 -2.842000
+ 3.756000 9.562000 -2.842000 3.756000 9.562000 -2.842000
0.522000 12.362000 -0.186000 0.522000 12.362000 -0.186000
6.766000 15.771001 -5.147000 6.766000 15.771001 -5.147000
- 4.118000 18.956001 -2.955000 4.118000 18.956001 -2.955000
- -5.951000 -20.035000 4.409000 -5.951000 -20.035000 4.409000
+ 4.118000 18.956000 -2.955000 4.118000 18.956000 -2.955000
+ -5.951000 -20.035001 4.409000 -5.951000 -20.035001 4.409000
-12.820000 -18.284001 9.970000 -12.820000 -18.284001 9.970000
- -8.584000 -28.742000 6.363000 -8.584000 -28.742000 6.363000
--16.326000 -21.945001 12.722000 -16.326000 -21.945001 12.722000
+ -8.584000 -28.742001 6.363000 -8.584000 -28.742001 6.363000
+-16.326000 -21.945002 12.722000 -16.326000 -21.945002 12.722000
-10.501000 -1.478001 8.423000 -10.501000 -1.478001 8.423000
-12.840000 1.347999 10.359000 -12.840000 1.347999 10.359000
-12.522000 -4.909001 9.984000 -12.522000 -4.909001 9.984000
@@ -48,70 +48,70 @@ LBA
6.249000 -18.752999 -5.386000 6.249000 -18.752999 -5.386000
8.508000 -21.355999 -7.254000 8.508000 -21.355999 -7.254000
1.386000 -25.388000 -1.598000 1.386000 -25.388000 -1.598000
- 4.909010 -29.282999 -4.508000 4.909010 -29.282999 -4.508000
+ 4.909000 -29.283000 -4.508000 4.909000 -29.283000 -4.508000
9.689000 16.912001 -7.477000 9.689000 16.912001 -7.477000
- 14.415000 14.446002 -11.328000 14.415000 14.446002 -11.328000
- 19.915000 21.491002 -15.621000 19.915000 21.491002 -15.621000
- 15.494000 24.584002 -12.003000 15.494000 24.584002 -12.003000
- 2.760000 -6.037999 -2.337000 2.760000 -6.037999 -2.337000
+ 14.415000 14.446001 -11.328000 14.415000 14.446001 -11.328000
+ 19.915000 21.491002 -15.620990 19.915000 21.491002 -15.620990
+ 15.494000 24.584001 -12.003000 15.494000 24.584001 -12.003000
+ 2.760000 -6.038000 -2.337000 2.760000 -6.038000 -2.337000
6.906000 -3.819999 -5.631000 6.906000 -3.819999 -5.631000
- 4.021000 -9.681999 -3.420000 4.021000 -9.681999 -3.420000
+ 4.021000 -9.682000 -3.420000 4.021000 -9.682000 -3.420000
6.871000 -9.018999 -5.702000 6.871000 -9.018999 -5.702000
-11.154000 21.105999 9.378000 -11.154000 21.105999 9.378000
-3.588000 23.899000 3.341000 -3.588000 23.899000 3.341000
- -9.506000 28.835000 8.197000 -9.506000 28.835000 8.197000
+ -9.506000 28.834999 8.197000 -9.506000 28.834999 8.197000
-1.371000 30.362000 1.679000 -1.371000 30.362000 1.679000
-2.285000 -7.022000 1.705000 -2.285000 -7.022000 1.705000
-1.347000 -10.841000 0.878000 -1.347000 -10.841000 0.878000
- -5.999000 -7.644000 4.683000 -5.999000 -7.644000 4.683000
+ -5.999000 -7.644001 4.683000 -5.999000 -7.644001 4.683000
-4.369000 -12.444000 3.280000 -4.369000 -12.444000 3.280000
- 13.701000 1.402002 -11.000000 13.701000 1.402002 -11.000000
+ 13.701000 1.402001 -11.000000 13.701000 1.402001 -11.000000
-0.678000 -20.436000 0.157000 -0.678000 -20.436000 0.157000
- 22.260000 1.937002 -17.879000 22.260000 1.937002 -17.879000
- 14.828000 11.001002 -11.725000 14.828000 11.001002 -11.725000
--17.752000 -11.578001 14.066000 -17.752000 -11.578001 14.066000
+ 22.260000 1.937002 -17.878990 22.260000 1.937002 -17.878990
+ 14.828000 11.001001 -11.725000 14.828000 11.001001 -11.725000
+-17.752000 -11.578002 14.066000 -17.752000 -11.578002 14.066000
-2.994000 -31.402000 1.813000 -2.994000 -31.402000 1.813000
- 20.689000 12.045002 -16.423000 20.689000 12.045002 -16.423000
+ 20.689000 12.045002 -16.422990 20.689000 12.045002 -16.422990
6.130000 -0.498999 -4.943000 6.130000 -0.498999 -4.943000
--16.528000 20.472999 13.690000 -16.528000 20.472999 13.690000
+-16.528000 20.472998 13.690000 -16.528000 20.472998 13.690000
-12.459000 -12.759001 9.785000 -12.459000 -12.759001 9.785000
--15.762000 2.517999 12.733000 -15.762000 2.517999 12.733000
- 12.195010 -26.255999 -10.314000 12.195010 -26.255999 -10.314000
+-15.762000 2.517998 12.733000 -15.762000 2.517998 12.733000
+ 12.195000 -26.255999 -10.314000 12.195000 -26.255999 -10.314000
0.925000 -16.868000 -1.066000 0.925000 -16.868000 -1.066000
- -9.460000 -12.789000 7.370000 -9.460000 -12.789000 7.370000
+ -9.460000 -12.789001 7.370000 -9.460000 -12.789001 7.370000
-3.033000 19.657000 2.814000 -3.033000 19.657000 2.814000
-1.023000 6.733000 0.951000 -1.023000 6.733000 0.951000
11.230000 -3.661999 -9.108000 11.230000 -3.661999 -9.108000
- -5.709000 3.155000 4.654000 -5.709000 3.155000 4.654000
+ -5.709000 3.154999 4.654000 -5.709000 3.154999 4.654000
11.778000 -17.338999 -9.809000 11.778000 -17.338999 -9.809000
6.787000 -13.240999 -5.714000 6.787000 -13.240999 -5.714000
--18.641000 -3.119001 14.943000 -18.641000 -3.119001 14.943000
--20.224000 -0.474001 16.268000 -20.224000 -0.474001 16.268000
+-18.641000 -3.119002 14.943000 -18.641000 -3.119002 14.943000
+-20.224000 -0.474002 16.268000 -20.224000 -0.474002 16.268000
-3.771000 -1.626000 3.004000 -3.771000 -1.626000 3.004000
- -9.558000 16.855000 8.012000 -9.558000 16.855000 8.012000
+ -9.558000 16.854999 8.012000 -9.558000 16.854999 8.012000
1.079000 -12.800000 -1.112000 1.079000 -12.800000 -1.112000
11.249000 8.654001 -8.889000 11.249000 8.654001 -8.889000
11.306000 -7.192999 -9.236000 11.306000 -7.192999 -9.236000
- 21.064000 8.477002 -16.792000 21.064000 8.477002 -16.792000
- -7.742000 -0.676000 6.218000 -7.742000 -0.676000 6.218000
+ 21.064000 8.477002 -16.791990 21.064000 8.477002 -16.791990
+ -7.742000 -0.676001 6.218000 -7.742000 -0.676001 6.218000
-3.050000 -16.214000 2.146000 -3.050000 -16.214000 2.146000
-14.814000 12.998999 12.169000 -14.814000 12.998999 12.169000
- 2.920000 24.711001 -1.881000 2.920000 24.711001 -1.881000
+ 2.920000 24.711000 -1.881000 2.920000 24.711000 -1.881000
0.653000 17.127000 -0.201000 0.653000 17.127000 -0.201000
- 16.772000 3.260002 -13.437000 16.772000 3.260002 -13.437000
+ 16.772000 3.260002 -13.436990 16.772000 3.260002 -13.436990
6.732000 11.907001 -5.192000 6.732000 11.907001 -5.192000
-2.879000 3.314000 2.380000 -2.879000 3.314000 2.380000
- -5.405000 -25.511000 3.865000 -5.405000 -25.511000 3.865000
+ -5.405000 -25.511001 3.865000 -5.405000 -25.511001 3.865000
0.106000 -5.175000 -0.184000 0.106000 -5.175000 -0.184000
- 19.073000 -19.822998 -15.728000 19.073000 -19.822998 -15.728000
+ 19.073000 -19.822998 -15.727990 19.073000 -19.822998 -15.727990
13.172000 -14.404999 -10.875000 13.172000 -14.404999 -10.875000
-1.517000 10.075000 1.411000 -1.517000 10.075000 1.411000
7.118000 30.351001 -5.153000 7.118000 30.351001 -5.153000
- -7.388000 5.857000 6.056000 -7.388000 5.857000 6.056000
--18.267000 -14.764001 14.421000 -18.267000 -14.764001 14.421000
+ -7.388000 5.856999 6.056000 -7.388000 5.856999 6.056000
+-18.267000 -14.764002 14.421000 -18.267000 -14.764002 14.421000
8.639000 21.658001 -6.542000 8.639000 21.658001 -6.542000
- -6.082000 -3.473000 4.829000 -6.082000 -3.473000 4.829000
- -8.697000 -8.208000 6.843000 -8.697000 -8.208000 6.843000
+ -6.082000 -3.473001 4.829000 -6.082000 -3.473001 4.829000
+ -8.697000 -8.208001 6.843000 -8.697000 -8.208001 6.843000
9.292000 5.058001 -7.383000 9.292000 5.058001 -7.383000
]
@@ -126,77 +126,77 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 4008461.941210000 -100376.608925000 4943716.874 ]
+3 [ 4008461.905110000 -100376.559511000 4943716.904 ]
96 x 2 x 3 [
--19.804000 10.761999 16.159000 -19.804000 10.761999 16.159000
--16.954000 14.425999 13.930000 -16.954000 14.425999 13.930000
--14.104000 18.090999 11.700000 -14.104000 18.090999 11.700000
+-19.804000 10.761998 16.158990 -19.804000 10.761998 16.158990
+-16.954000 14.425999 13.929990 -16.954000 14.425999 13.929990
+-14.104000 18.090999 11.699990 -14.104000 18.090999 11.699990
-11.254000 21.754999 9.471000 -11.254000 21.754999 9.471000
- -8.404000 25.419000 7.242000 -8.404000 25.419000 7.242000
--19.835000 3.478999 16.048000 -19.835000 3.478999 16.048000
--16.984000 7.143999 13.819000 -16.984000 7.143999 13.819000
--14.134000 10.807999 11.589000 -14.134000 10.807999 11.589000
+ -8.404000 25.418999 7.242000 -8.404000 25.418999 7.242000
+-19.835000 3.478998 16.047990 -19.835000 3.478998 16.047990
+-16.984000 7.143999 13.818990 -16.984000 7.143999 13.818990
+-14.134000 10.807999 11.588990 -14.134000 10.807999 11.588990
-11.283000 14.472999 9.359000 -11.283000 14.472999 9.359000
- -8.433000 18.137000 7.130000 -8.433000 18.137000 7.130000
+ -8.433000 18.136999 7.130000 -8.433000 18.136999 7.130000
-5.583000 21.801000 4.900000 -5.583000 21.801000 4.900000
-2.732000 25.466000 2.671000 -2.732000 25.466000 2.671000
--19.865000 -3.803001 15.937000 -19.865000 -3.803001 15.937000
--17.014000 -0.139001 13.707000 -17.014000 -0.139001 13.707000
+-19.865000 -3.803002 15.936990 -19.865000 -3.803002 15.936990
+-17.014000 -0.139001 13.706990 -17.014000 -0.139001 13.706990
-14.164000 3.525999 11.478000 -14.164000 3.525999 11.478000
-11.313000 7.189999 9.248000 -11.313000 7.189999 9.248000
- -8.463000 10.854000 7.019000 -8.463000 10.854000 7.019000
+ -8.463000 10.853999 7.019000 -8.463000 10.853999 7.019000
-5.613000 14.519000 4.790000 -5.613000 14.519000 4.790000
-2.763000 18.183000 2.560000 -2.763000 18.183000 2.560000
0.088000 21.847000 0.331000 0.088000 21.847000 0.331000
- 2.938000 25.512001 -1.899000 2.938000 25.512001 -1.899000
--19.894000 -11.085001 15.825000 -19.894000 -11.085001 15.825000
--17.044000 -7.420001 13.596000 -17.044000 -7.420001 13.596000
+ 2.938000 25.512000 -1.899000 2.938000 25.512000 -1.899000
+-19.894000 -11.085002 15.824990 -19.894000 -11.085002 15.824990
+-17.044000 -7.420001 13.595990 -17.044000 -7.420001 13.595990
-14.194000 -3.756001 11.367000 -14.194000 -3.756001 11.367000
-11.343000 -0.091001 9.137000 -11.343000 -0.091001 9.137000
- -8.493000 3.573000 6.908000 -8.493000 3.573000 6.908000
+ -8.493000 3.572999 6.908000 -8.493000 3.572999 6.908000
-5.643000 7.237000 4.678000 -5.643000 7.237000 4.678000
-2.793000 10.902000 2.449000 -2.793000 10.902000 2.449000
0.058000 14.566000 0.219000 0.058000 14.566000 0.219000
- 2.909000 18.230001 -2.010000 2.909000 18.230001 -2.010000
+ 2.909000 18.230000 -2.010000 2.909000 18.230000 -2.010000
5.759000 21.895001 -4.240000 5.759000 21.895001 -4.240000
8.609000 25.559001 -6.469000 8.609000 25.559001 -6.469000
--17.074000 -14.703001 13.485000 -17.074000 -14.703001 13.485000
+-17.074000 -14.703001 13.484990 -17.074000 -14.703001 13.484990
-14.224000 -11.038001 11.256000 -14.224000 -11.038001 11.256000
-11.374000 -7.374001 9.026000 -11.374000 -7.374001 9.026000
- -8.523000 -3.710000 6.797000 -8.523000 -3.710000 6.797000
+ -8.523000 -3.710001 6.797000 -8.523000 -3.710001 6.797000
-5.672000 -0.045000 4.567000 -5.672000 -0.045000 4.567000
-2.822000 3.619000 2.337000 -2.822000 3.619000 2.337000
0.028000 7.283000 0.108000 0.028000 7.283000 0.108000
- 2.878000 10.948001 -2.121000 2.878000 10.948001 -2.121000
+ 2.878000 10.948000 -2.121000 2.878000 10.948000 -2.121000
5.729000 14.612001 -4.351000 5.729000 14.612001 -4.351000
8.579000 18.277001 -6.580000 8.579000 18.277001 -6.580000
11.429000 21.941001 -8.810000 11.429000 21.941001 -8.810000
-14.254000 -18.321001 11.145000 -14.254000 -18.321001 11.145000
-11.404000 -14.656001 8.915000 -11.404000 -14.656001 8.915000
- -8.553000 -10.992000 6.685000 -8.553000 -10.992000 6.685000
+ -8.553000 -10.992001 6.685000 -8.553000 -10.992001 6.685000
-5.702000 -7.328000 4.456000 -5.702000 -7.328000 4.456000
-2.852000 -3.663000 2.226000 -2.852000 -3.663000 2.226000
- 2.848000 3.665001 -2.232000 2.848000 3.665001 -2.232000
+ 2.848000 3.665000 -2.232000 2.848000 3.665000 -2.232000
5.698000 7.330001 -4.462000 5.698000 7.330001 -4.462000
8.549000 10.994001 -6.691000 8.549000 10.994001 -6.691000
11.400000 14.658001 -8.921000 11.400000 14.658001 -8.921000
14.250000 18.323002 -11.151000 14.250000 18.323002 -11.151000
-11.433000 -21.939001 8.804000 -11.433000 -21.939001 8.804000
- -8.583000 -18.275000 6.574000 -8.583000 -18.275000 6.574000
+ -8.583000 -18.275001 6.574000 -8.583000 -18.275001 6.574000
-5.733000 -14.610000 4.345000 -5.733000 -14.610000 4.345000
-2.882000 -10.946000 2.115000 -2.882000 -10.946000 2.115000
-0.032000 -7.281000 -0.114000 -0.032000 -7.281000 -0.114000
- 2.818000 -3.616999 -2.343000 2.818000 -3.616999 -2.343000
+ 2.818000 -3.617000 -2.343000 2.818000 -3.617000 -2.343000
5.668000 0.047001 -4.573000 5.668000 0.047001 -4.573000
8.519000 3.712001 -6.803000 8.519000 3.712001 -6.803000
11.370000 7.376001 -9.032000 11.370000 7.376001 -9.032000
14.220000 11.040002 -11.262000 14.220000 11.040002 -11.262000
17.070000 14.705002 -13.491000 17.070000 14.705002 -13.491000
- -8.613000 -25.557000 6.463000 -8.613000 -25.557000 6.463000
+ -8.613000 -25.557001 6.463000 -8.613000 -25.557001 6.463000
-5.763000 -21.893000 4.234000 -5.763000 -21.893000 4.234000
-2.913000 -18.228000 2.004000 -2.913000 -18.228000 2.004000
-0.062000 -14.564000 -0.225000 -0.062000 -14.564000 -0.225000
- 2.789000 -10.899999 -2.455000 2.789000 -10.899999 -2.455000
+ 2.789000 -10.900000 -2.455000 2.789000 -10.900000 -2.455000
5.639000 -7.234999 -4.684000 5.639000 -7.234999 -4.684000
8.489000 -3.570999 -6.914000 8.489000 -3.570999 -6.914000
11.339000 0.093001 -9.143000 11.339000 0.093001 -9.143000
@@ -205,14 +205,14 @@ HBA
19.890000 11.087002 -15.831000 19.890000 11.087002 -15.831000
-2.942000 -25.510000 1.893000 -2.942000 -25.510000 1.893000
-0.092000 -21.845000 -0.337000 -0.092000 -21.845000 -0.337000
- 2.759000 -18.180999 -2.566000 2.759000 -18.180999 -2.566000
+ 2.759000 -18.181000 -2.566000 2.759000 -18.181000 -2.566000
5.609000 -14.516999 -4.796000 5.609000 -14.516999 -4.796000
8.459000 -10.851999 -7.025000 8.459000 -10.851999 -7.025000
11.309000 -7.187999 -9.254000 11.309000 -7.187999 -9.254000
14.160000 -3.523998 -11.484000 14.160000 -3.523998 -11.484000
17.010000 0.141002 -13.713000 17.010000 0.141002 -13.713000
19.861000 3.805002 -15.943000 19.861000 3.805002 -15.943000
- 2.728000 -25.463999 -2.677000 2.728000 -25.463999 -2.677000
+ 2.728000 -25.464000 -2.677000 2.728000 -25.464000 -2.677000
5.579000 -21.798999 -4.906000 5.579000 -21.798999 -4.906000
8.429000 -18.134999 -7.136000 8.429000 -18.134999 -7.136000
11.279000 -14.470999 -9.365000 11.279000 -14.470999 -9.365000
diff --git a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
index e1c50e4b6d35fb26e4deb2fe0062dc7429693f0e..afaa1b882280a5c1b987fa6a322466a99d41640f 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
@@ -148,7 +148,7 @@ RS305 RSP_0 cbt006-10GB04 10.168.101.4 A0:36:9F:1F:7A:36
RS306 RSP_0 cbt005-10GB01 10.168.100.1 A0:36:9F:1F:7B:74
# RS307 -> BG3
-RS307 RSP_0 cbt008-10GB04 10.168.103.4 A0:36:9F:1F:7B:6A
+RS307 RSP_0 cbt008-10GB01 10.168.103.1 A0:36:9F:1F:79:00
# RS310 -> BG0
RS310 RSP_0 cbt002-10GB04 10.168.97.4 A0:36:9F:1F:79:A2
@@ -217,6 +217,6 @@ UK608 RSP_0 cbt005-10GB04 10.213.8.50 A0:36:9F:1F:79:E2
UK608 RSP_0 cbt005-10GB04 10.214.8.50 A0:36:9F:1F:79:E2
# DE609 -> BG2 (NON-OFFICIAL!!!!)
-DE609 RSP_0 cbt005-10GB04 10.200.91.50 A0:36:9F:1F:79:E2
-DE609 RSP_0 cbt005-10GB04 10.200.92.50 A0:36:9F:1F:79:E2
+DE609 RSP_0 cbt008-10GB04 10.200.91.50 A0:36:9F:1F:7B:6A
+DE609 RSP_0 cbt008-10GB04 10.200.92.50 A0:36:9F:1F:7B:6A
diff --git a/MAC/Deployment/data/StaticMetaData/RSPImage.conf b/MAC/Deployment/data/StaticMetaData/RSPImage.conf
index 6f7fd0f5d6e161858cf4fc7a8e7335923a0286fc..58786a949a9535874e054bf5140b501b281b412c 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPImage.conf
+++ b/MAC/Deployment/data/StaticMetaData/RSPImage.conf
@@ -5,23 +5,23 @@
#
# This file contains the default RSP image location of a station.
#
-CS001C 4
+CS001C 6
CS002C 6
CS003C 6
CS004C 6
CS005C 6
CS006C 6
CS007C 6
-CS011C 4
-CS013C 4
-CS017C 4
-CS021C 4
+CS011C 6
+CS013C 6
+CS017C 6
+CS021C 6
CS024C 4
CS026C 4
CS028C 4
CS030C 4
CS031C 4
-CS032C 4
+CS032C 6
CS101C 4
CS103C 4
CS201C 4
diff --git a/MAC/Deployment/data/StaticMetaData/StationInfo.dat b/MAC/Deployment/data/StaticMetaData/StationInfo.dat
index abc6fa60a59ec69e4f1be6d4ac2b8bcf4235d50c..5ccab30d7a59f317f8ca82da4ccac76064da2c0b 100644
--- a/MAC/Deployment/data/StaticMetaData/StationInfo.dat
+++ b/MAC/Deployment/data/StaticMetaData/StationInfo.dat
@@ -19,7 +19,7 @@
# name ID ring long lat height nrRSP nrTBB nrLBA nrHBA HBAsplit LBAcal Aartfaac
#--------------------------------------------------------------------------------------------------------------
## core (1-59)
-CS001 1 C 6.8680483 52.9110414 54.43 12 6 96 48 Yes Yes No
+CS001 1 C 6.8680483 52.9110414 54.43 12 6 96 48 Yes Yes Yes
CS002 2 C 6.8693028 52.9148347 55.90 12 6 96 48 Yes Yes Yes
CS003 3 C 6.8693283 52.9159339 55.19 12 6 96 48 Yes Yes Yes
CS004 4 C 6.8680911 52.9147486 55.94 12 6 96 48 Yes Yes Yes
@@ -29,17 +29,17 @@ CS007 7 C 6.8715772 52.9157881 56.56 12 6 96 48 Ye
CS008 8 C 0.0 0.0 0 12 6 96 48 Yes Yes No
CS009 9 C 0.0 0.0 0 12 6 96 48 Yes Yes No
CS010 10 C 0.0 0.0 0 12 6 96 48 Yes Yes No
-CS011 11 C 6.8737881 52.9141903 53.68 12 6 96 48 Yes Yes No
+CS011 11 C 6.8737881 52.9141903 53.68 12 6 96 48 Yes Yes Yes
CS012 12 C 0.0 0.0 0 12 6 96 48 Yes Yes No
-CS013 13 C 6.8672969 52.9177144 54.98 12 6 96 48 Yes Yes No
+CS013 13 C 6.8672969 52.9177144 54.98 12 6 96 48 Yes Yes Yes
CS014 14 C 0.0 0.0 0 12 6 96 48 Yes Yes No
CS015 15 C 0.0 0.0 0 12 6 96 48 Yes Yes No
CS016 16 C 0.0 0.0 0 12 6 96 48 Yes Yes No
-CS017 17 C 6.8778067 52.9158697 59.23 12 6 96 48 Yes Yes No
+CS017 17 C 6.8778067 52.9158697 59.23 12 6 96 48 Yes Yes Yes
CS018 18 C 0.0 0.0 0 12 6 96 48 Yes Yes No
CS019 19 C 0.0 0.0 0 12 6 96 48 Yes Yes No
CS020 20 C 0.0 0.0 0 12 6 96 48 Yes Yes No
-CS021 21 C 6.8622447 52.9176275 52.73 12 6 96 48 Yes Yes No
+CS021 21 C 6.8622447 52.9176275 52.73 12 6 96 48 Yes Yes Yes
CS022 22 C 0.0 0.0 0 12 6 96 48 Yes Yes No
CS023 23 C 0.0 0.0 0 12 6 96 48 Yes Yes No
CS024 24 C 6.8738103 52.9080003 55.80 12 6 96 48 Yes Yes No
@@ -50,7 +50,7 @@ CS028 28 C 6.8755528 52.9254167 52.66 12 6 96 48 Ye
CS029 29 C 0.0 0.0 0 12 6 96 48 Yes Yes No
CS030 30 C 6.8609850 52.9225878 58.01 12 6 96 48 Yes Yes No
CS031 31 C 6.8597219 52.9177706 53.61 12 6 96 48 Yes Yes No
-CS032 32 C 6.8603878 52.9121611 59.31 12 6 96 48 Yes Yes No
+CS032 32 C 6.8603878 52.9121611 59.31 12 6 96 48 Yes Yes Yes
# The Remote stations with core station layout (i.e., with HBASplit set to 'yes')
CS101 101 C 6.8805014 52.9223181 57.78 12 6 96 48 Yes Yes No
diff --git a/MAC/Deployment/data/StaticMetaData/createFiles b/MAC/Deployment/data/StaticMetaData/createFiles
index 06f8cb5b27e996d286d6a69c466caf336cf58ca3..e0a71e8a39d83c5ee181331177afa97d59525081 100755
--- a/MAC/Deployment/data/StaticMetaData/createFiles
+++ b/MAC/Deployment/data/StaticMetaData/createFiles
@@ -289,7 +289,7 @@ def createRSPDriverFile(resultDir, stationName, dataDir,int_local,is_Cobalt):
dstip_mac_alias = findIPandMAC_local(stationName,dataDir)
# International stations still need old (BG) portnumbers
basePort = 0x10FA
- for rspNr in range(len(ip_mac_alias)):
+ for rspNr in range(len(dstip_mac_alias)):
blet_out = find_Blets(stationName, dataDir)[1+rspNr];
RSPconfig = RSPconfig.replace("@LANE_0"+str(rspNr)+"_BLET@", blet_out)
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS001-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS001-iHBADeltas.conf
index 201a2659368da475cb8ff2a18f5e5f9ed43902ff..08d92a0a0a95bda0c28a37b64d37972a17ceda8c 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS001-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS001-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS001
-# Created: 2012-01-24 14:49:37
+# Created: 2015-01-20 21:24:05
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS002-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS002-iHBADeltas.conf
index 650acc78b2570e6214580d7505e90c7e6855b54f..89aebb9a562837e3d38dbdc8ca000f2131546e92 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS002-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS002-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS002
-# Created: 2012-01-24 14:49:37
+# Created: 2015-01-20 21:24:05
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS003-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS003-iHBADeltas.conf
index 6f783c1f90b0aae2f9b578f86366cd67cee7936b..83e6c4aae9cea8eac22e39e15b5dabfb936d766d 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS003-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS003-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS003
-# Created: 2012-01-24 14:49:37
+# Created: 2015-01-20 21:24:06
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS004-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS004-iHBADeltas.conf
index 16241bc819747a38f1142f44001702123051b71f..1993445292d19a45badd0e8be499fbc434b58512 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS004-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS004-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS004
-# Created: 2012-01-24 14:49:37
+# Created: 2015-01-20 21:24:06
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS005-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS005-iHBADeltas.conf
index 26026d2efaa6f3f1b1c5c04f0f50f6975f97a4c6..51cb144d834a59015c130f2d7648d14651b6961c 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS005-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS005-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS005
-# Created: 2012-01-24 14:49:37
+# Created: 2015-01-20 21:24:06
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS006-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS006-iHBADeltas.conf
index fa2f4ac999cc7dc3150637fce89f769db657ce83..dbff643d33b1aa45a5eb3060e9c53675a0a4858e 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS006-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS006-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS006
-# Created: 2012-01-24 14:49:37
+# Created: 2015-01-20 21:24:06
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS007-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS007-iHBADeltas.conf
index b6f26616333d29f380c09282cf68780094b9a02a..157b73ad824dce2a58d9012925473f29ad97927b 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS007-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS007-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS007
-# Created: 2012-01-24 14:49:38
+# Created: 2015-01-20 21:24:06
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS011-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS011-iHBADeltas.conf
index 9f0ba5dbfa8b46192c43ecc0a002ce989fee7cab..e0853811e13aac5489b637be72f83585059e4674 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS011-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS011-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS011
-# Created: 2012-01-24 14:49:38
+# Created: 2015-01-20 21:24:07
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS013-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS013-iHBADeltas.conf
index f15ed692bcef4b07e41bc669e7787cdc10a2619d..40a896fe6fba52e5a7b41bdbf923b3a98b3b55b2 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS013-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS013-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS013
-# Created: 2012-01-24 14:49:38
+# Created: 2015-01-20 21:24:07
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS017-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS017-iHBADeltas.conf
index 15e654c4de40db96950653d6deae49ea43d2079a..10c335b877856b9de2c76a240c04e9d8a0d9d2d3 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS017-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS017-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS017
-# Created: 2012-01-24 14:49:38
+# Created: 2015-01-20 21:24:07
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS021-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS021-iHBADeltas.conf
index 77508047b10052d4d00acd86d6d1d3b2d92fa8df..e2365f777149f87265c8b1669012f651e0fb7c78 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS021-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS021-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS021
-# Created: 2012-01-24 14:49:38
+# Created: 2015-01-20 21:24:07
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS024-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS024-iHBADeltas.conf
index 8119ad7167963f26d4ec0755bf8c4d672ffa004e..f8608e3fa7e49174027ac03afc1340a21ba2dc23 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS024-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS024-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS024
-# Created: 2012-01-24 14:49:39
+# Created: 2015-01-20 21:24:07
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS026-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS026-iHBADeltas.conf
index f39b92526863c9a5cfed7f5e4a6e1a60d9139d9f..3da073bb36e796227b9f1c608e8e2f7839df1dbd 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS026-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS026-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS026
-# Created: 2012-01-24 14:49:39
+# Created: 2015-01-20 21:24:07
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS028-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS028-iHBADeltas.conf
index ad77775ed3467d9fda04bdddc33073deebcded59..e47b0788361c854f4844389b2ec4b5f90d0ae107 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS028-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS028-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS028
-# Created: 2012-01-24 14:49:39
+# Created: 2015-01-20 21:24:08
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS030-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS030-iHBADeltas.conf
index 310dc4949b5a67aed3946131074af20ea8999536..4ff6fc9a1c4e4e17e40d86bafdb787764537d56d 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS030-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS030-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS030
-# Created: 2012-01-24 14:49:39
+# Created: 2015-01-20 21:24:08
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS031-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS031-iHBADeltas.conf
index 0cbe3b1a8016e408a0776ab299360c3abb5faeef..7f3ab223e8d54b22073ce6e0c423884950474411 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS031-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS031-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS031
-# Created: 2012-01-24 14:49:39
+# Created: 2015-01-20 21:24:08
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS032-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS032-iHBADeltas.conf
index 2ee7e45c1102c8d0390c037d6f4230eb3608bf83..2077a35e60316f350f50765ea026083176a2cdfa 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS032-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS032-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS032
-# Created: 2012-01-24 14:49:40
+# Created: 2015-01-20 21:24:08
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS101-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS101-iHBADeltas.conf
index 69ec86c5b708ed1f6deb7d192b26264b39941ec1..d1ccb8a2436624ab205c79dc3efb3b90cb8a97f8 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS101-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS101-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS101
-# Created: 2012-11-08 20:42:17
+# Created: 2015-01-20 21:24:08
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS103-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS103-iHBADeltas.conf
index cdd77cf9a66a7c052d09c9ab963e02ada091f96c..8618447b6becbf5c212f9ae2de281626ce42d59c 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS103-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS103-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS103
-# Created: 2012-01-24 14:49:40
+# Created: 2015-01-20 21:24:09
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS201-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS201-iHBADeltas.conf
index fa5adaa0ed9ba928012d23f6e9bf1ccb8d921cc0..20808f03c14d98c06ca768fbc6c5033eac53bd20 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS201-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS201-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS201
-# Created: 2012-01-24 14:49:40
+# Created: 2015-01-20 21:24:09
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS301-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS301-iHBADeltas.conf
index 5882387f3477a63119fe417773c6cbea9e624374..d609bfecaa6c41a738935f8219b11b72ff8e7889 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS301-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS301-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS301
-# Created: 2012-11-08 20:42:17
+# Created: 2015-01-20 21:24:09
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS302-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS302-iHBADeltas.conf
index 31f8758e8079d97b3eb3a1a66af5786172763770..6d7ae67a8eae5b4b95ec3fc90fe0a214d8651a47 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS302-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS302-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS302
-# Created: 2012-01-24 14:49:41
+# Created: 2015-01-20 21:24:09
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS401-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS401-iHBADeltas.conf
index bcd1dde20c37e984423fe630bda94d8b46752878..1a5c913a9f6c31ce62e02f856db6a37d2019f41e 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS401-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS401-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS401
-# Created: 2012-01-24 14:49:41
+# Created: 2015-01-20 21:24:09
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS501-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS501-iHBADeltas.conf
index 53be7a47f05581f3135e029c55f23b62228d1250..1731430bb982d5ac1ce7f511537e480e349a5f5c 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS501-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/CS501-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for CS501
-# Created: 2012-01-24 14:49:41
+# Created: 2015-01-20 21:24:09
#
HBADeltas
32 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE601-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE601-iHBADeltas.conf
index 29772c28ae21fa3aae9ecb19c0303adaf1b0928f..785401a09d4c5a7920b45b4556edfe05c23eca37 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE601-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE601-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for DE601
-# Created: 2013-05-14 11:16:33
+# Created: 2015-01-20 21:24:10
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE602-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE602-iHBADeltas.conf
index 15d1fcf3a3377c451ad6523e63ca395e577b206b..5a459cda14db13b5055ff263e114ce090470c0c0 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE602-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE602-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for DE602
-# Created: 2012-01-24 14:49:41
+# Created: 2015-01-20 21:24:10
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE603-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE603-iHBADeltas.conf
index b2fa367b8baa851aceb83349f1cdca7728954f18..f839e2d9d58bdc311b354d7a0d76c203975d4bd3 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE603-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE603-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for DE603
-# Created: 2012-01-24 14:49:41
+# Created: 2015-01-20 21:24:10
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE604-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE604-iHBADeltas.conf
index acd155468fcec6dd13fd89c19724d08931f1ef5f..7564cec408780482d80264f9a5385a97891aeefc 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE604-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE604-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for DE604
-# Created: 2013-09-05 12:12:26
+# Created: 2015-01-20 21:24:10
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE605-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE605-iHBADeltas.conf
index ee3f81be40536db7e76a32de0692e1af98627269..77e9e2f0308a8476240869233d3e1ce108406cc1 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE605-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE605-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for DE605
-# Created: 2012-01-24 14:49:42
+# Created: 2015-01-20 21:24:10
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE609-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE609-iHBADeltas.conf
index f692abe413e1366a742a7d7ebf5bf8a0ac78f663..482d74665c9b844dde1621048cc22bd7301bfa1a 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE609-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE609-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for DE609
-# Created: 2014-12-11 20:26:16
+# Created: 2015-01-20 21:24:11
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/FI609-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/FI609-iHBADeltas.conf
index b51f7a53be1b04e8c3271dbf05358b6b80bb0918..67c3dfb3f986bb551e9d54bc6cb35dd4d6bff1ee 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/FI609-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/FI609-iHBADeltas.conf
@@ -1,23 +1,23 @@
#
# HBADeltas for FI609
-# Created: 2012-08-08 06:35:00, manually rotated by 90 degrees by IV
+# Created: 2015-01-20 21:24:11
#
HBADeltas
16 x 3 [
- 0.980 -2.464 -0.017
- -0.113 -1.949 0.305
- -1.206 -1.436 0.626
- -2.299 -0.921 0.948
- 1.420 -1.336 -0.327
- 0.327 -0.821 -0.005
- -0.766 -0.307 0.316
- -1.860 0.207 0.637
- 1.860 -0.207 -0.637
- 0.766 0.307 -0.316
- -0.327 0.821 0.005
- -1.420 1.336 0.327
- 2.299 0.921 -0.948
- 1.206 1.436 -0.626
- 0.113 1.949 -0.305
- -0.980 2.464 0.017
+ -2.299 -0.921 0.947
+ -1.859 0.207 0.637
+ -1.420 1.336 0.327
+ -0.980 2.464 0.017
+ -1.206 -1.435 0.626
+ -0.766 -0.307 0.316
+ -0.327 0.821 0.006
+ 0.113 1.950 -0.305
+ -0.113 -1.950 0.305
+ 0.327 -0.821 -0.006
+ 0.766 0.307 -0.316
+ 1.206 1.435 -0.626
+ 0.980 -2.464 -0.017
+ 1.420 -1.336 -0.327
+ 1.859 -0.207 -0.637
+ 2.299 0.921 -0.947
]
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/FR606-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/FR606-iHBADeltas.conf
index 822c36c63280ee13e72e03d27156027cf4c8948b..4d14f78c7cb29a5bab81451d9d61620103f64af1 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/FR606-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/FR606-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for FR606
-# Created: 2012-01-24 14:49:42
+# Created: 2015-01-20 21:24:11
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS106-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS106-iHBADeltas.conf
index a628ae8a407756f21a7e842397c881682fb0df2e..86a8e1f93393d11c74feba035af93fbc4472f45d 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS106-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS106-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS106
-# Created: 2012-01-24 14:49:42
+# Created: 2015-01-20 21:24:11
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS205-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS205-iHBADeltas.conf
index 54cbc629aa890466485c497ccf7221c534611794..ffd0403922674fcc6e04986d56f5792a1d79f620 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS205-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS205-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS205
-# Created: 2012-01-24 14:49:42
+# Created: 2015-01-20 21:24:11
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS208-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS208-iHBADeltas.conf
index f4b4781be7c89150e560718c9bb94d806820a993..844d9af64ac220df753493fa439373d966e7f219 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS208-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS208-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS208
-# Created: 2012-01-24 14:49:43
+# Created: 2015-01-20 21:24:12
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS210-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS210-iHBADeltas.conf
index 671cdfc9cdd629672abeb431af26af9123e6e789..33b6687fc84d1e44d01b4ac9dfff5c5bc3f8f3fa 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS210-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS210-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS210
-# Created: 2013-02-25 20:17:05
+# Created: 2015-01-20 21:24:12
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS305-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS305-iHBADeltas.conf
index e1dd8dfd99b27f6c4690eb9492419ecf8e534e21..c3e3e8b89befab5745f1a767228064319b95df39 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS305-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS305-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS305
-# Created: 2012-10-10 14:47:46
+# Created: 2015-01-20 21:24:12
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS306-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS306-iHBADeltas.conf
index 6a6fbc3a084796abda52028231de5bc3c76a7820..d0cac25979ab549aebf65d81887cf3692cfafaa7 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS306-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS306-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS306
-# Created: 2012-01-24 14:49:43
+# Created: 2015-01-20 21:24:12
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS307-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS307-iHBADeltas.conf
index b93f2e1e6b0402e902f0d3aef49487abf94ed811..b2863a27e0851e809a030c1c7e538c9d2ad2cbf3 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS307-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS307-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS307
-# Created: 2012-01-24 14:49:43
+# Created: 2015-01-20 21:24:12
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS310-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS310-iHBADeltas.conf
index 888698403744914425666946336a0449fcdc456c..d8f86f367e1ceffc68c4dbecc53f67e487d622af 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS310-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS310-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS310
-# Created: 2012-12-04 12:46:44
+# Created: 2015-01-20 21:24:12
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS406-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS406-iHBADeltas.conf
index 164cf74927ce5fb94dcb87c97ae68fb89c69e27c..9d5e36ef6ecc61bce8708a388f2ae9d78bf88e84 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS406-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS406-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS406
-# Created: 2012-01-24 14:49:43
+# Created: 2015-01-20 21:24:13
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf
index fd9699fa44caf99d141e895214550b05370daab9..c127ac3ec8b68a16a82610ef0b6dc6b417caf9c9 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS407
-# Created: 2012-11-30 15:19:23
+# Created: 2015-01-20 21:24:13
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS409-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS409-iHBADeltas.conf
index 10bc25b731bdb69efcf6788e7815d31e6b39c414..ee0f1f1088ecad2045849823a44fd4392f5fbfa8 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS409-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS409-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS409
-# Created: 2012-11-26 21:32:24
+# Created: 2015-01-20 21:24:13
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS503-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS503-iHBADeltas.conf
index f8665090250c27ec9671778b277b0f6ca7ce1706..51b5077ac5cf9ff054bc644091acef110d0319c1 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS503-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS503-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS503
-# Created: 2012-01-24 14:49:43
+# Created: 2015-01-20 21:24:13
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS508-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS508-iHBADeltas.conf
index 9eb5408759ca4524ccdd86ab9fba416f79c83835..62c2b520d9a304d90f18de900db2ab536de67671 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS508-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS508-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS508
-# Created: 2012-01-24 14:49:44
+# Created: 2015-01-20 21:24:13
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS509-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS509-iHBADeltas.conf
index 4b79761ac70600dba70a6c1d83f279cc62dd5b3c..51936a09fa5a24a3694a114800821f0d37f21892 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS509-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS509-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS509
-# Created: 2012-01-24 14:49:44
+# Created: 2015-01-20 21:24:13
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/SE607-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/SE607-iHBADeltas.conf
index de44ecfca46b0aef98a484f76462c306063d4407..3119b65cba19ee955ed7681eadf5191777edbacb 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/SE607-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/SE607-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for SE607
-# Created: 2012-01-24 14:49:44
+# Created: 2015-01-20 21:24:14
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/UK608-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/UK608-iHBADeltas.conf
index 3a8ffcef29c18950f33187faa1f3ac8a0c5a8c37..614bced6e5cf19b8b2664e006695e1c3bede82eb 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/UK608-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/UK608-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for UK608
-# Created: 2012-01-24 14:49:44
+# Created: 2015-01-20 21:24:14
#
HBADeltas
16 x 3 [
diff --git a/MAC/Deployment/data/bin/PVSS2SAS.cc b/MAC/Deployment/data/bin/PVSS2SAS.cc
index 020582d7211f2dd87e336f08f2d8a0d257226869..86f6b4482453174af1e72fd68ad0990ec8fed62c 100644
--- a/MAC/Deployment/data/bin/PVSS2SAS.cc
+++ b/MAC/Deployment/data/bin/PVSS2SAS.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/bin/load_OTDB_comps.cc b/MAC/Deployment/data/bin/load_OTDB_comps.cc
index fca64ba2b888d954bbc014961e2825217115f7e9..6a2237f59b1d5d433d0d17b40b64c47755e3aa9c 100644
--- a/MAC/Deployment/data/bin/load_OTDB_comps.cc
+++ b/MAC/Deployment/data/bin/load_OTDB_comps.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/bin/load_PICtree.cc b/MAC/Deployment/data/bin/load_PICtree.cc
index e78701787ef9fdd7333fba5dbae1960ab647590d..556b92295c5e77992250f82a884ea7ce3838820d 100644
--- a/MAC/Deployment/data/bin/load_PICtree.cc
+++ b/MAC/Deployment/data/bin/load_PICtree.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Drivers/spid/src/spid.c b/MAC/Drivers/spid/src/spid.c
index b5c0620a2e78723822c43151dafffcda6e531e89..685c690aceca79234b106eb30c4b6bd0f3a9c04d 100755
--- a/MAC/Drivers/spid/src/spid.c
+++ b/MAC/Drivers/spid/src/spid.c
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Drivers/spid/tools/ClockSim.c b/MAC/Drivers/spid/tools/ClockSim.c
index f7bce39e54b9c56a3275f8bffffe36726aa70d72..92d9ea5f2099889864d6fd58a07745b81c01a2b4 100644
--- a/MAC/Drivers/spid/tools/ClockSim.c
+++ b/MAC/Drivers/spid/tools/ClockSim.c
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Drivers/spid/tools/SPIDreset.c b/MAC/Drivers/spid/tools/SPIDreset.c
index 0f1a09107b428618f280104d56e72c7909057e17..5684e95f391dc5aabaabb293af561ba40b6959c7 100644
--- a/MAC/Drivers/spid/tools/SPIDreset.c
+++ b/MAC/Drivers/spid/tools/SPIDreset.c
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/CLPMain.cc b/MAC/GCF/LogSys/CLP/src/CLPMain.cc
index 93afc0ad8c5f47529f088604b29dd4eeeae7439a..c4e5c708a992ee1dc6bf6b720a8a9f30a14fcd3c 100644
--- a/MAC/GCF/LogSys/CLP/src/CLPMain.cc
+++ b/MAC/GCF/LogSys/CLP/src/CLPMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.cc b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.cc
index c957fcb73057873a353295f5473488913ed545d6..7acc60041fb2d297af0dc0a0c07cd10a34338a1f 100644
--- a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.cc
+++ b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.h b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.h
index 6b8e71f09c4bc0d8ed0ce8cd207e0fdc394c6a26..97f2fb45cf763a125826b7ba6a1166e86f0383a0 100644
--- a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.h
+++ b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/PropertyProxy.cc b/MAC/GCF/LogSys/CLP/src/PropertyProxy.cc
index 57906d26174e6854756149b1628c156b5e0de712..004573d9d0d7ae9c651e7a450a9d3ec2bd89812f 100644
--- a/MAC/GCF/LogSys/CLP/src/PropertyProxy.cc
+++ b/MAC/GCF/LogSys/CLP/src/PropertyProxy.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/PropertyProxy.h b/MAC/GCF/LogSys/CLP/src/PropertyProxy.h
index 40b49a050cf632466176cf75911e7d34261067ae..3ee2f2748af4a4ce1b003b2294cdafe88298a8c9 100644
--- a/MAC/GCF/LogSys/CLP/src/PropertyProxy.h
+++ b/MAC/GCF/LogSys/CLP/src/PropertyProxy.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/CEPKeyValueLogger.cc b/MAC/GCF/LogSys/KVLogSys/src/CEPKeyValueLogger.cc
index 451bfa3ef943604e8cfdb0ace8556186df58433a..dcf553eccbcdba8f12c2403c88259ff635d5a7b3 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/CEPKeyValueLogger.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/CEPKeyValueLogger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc b/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc
index e0f2564dd23c51db0928c83cdf6fa5dea97d6d1e..a0544e1b62c36392c54d6c1467cebd2df083a137 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLDMain.cc b/MAC/GCF/LogSys/KVLogSys/src/KVLDMain.cc
index 1007626ad4e5407c4edbd6aa62cdacae0a4f405e..2bab78d99056a686d388d9e2737d1c52ae8c02bb 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLDMain.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLDMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLDefines.h b/MAC/GCF/LogSys/KVLogSys/src/KVLDefines.h
index a2c6e52c5a20393e3c1a7e124df8d4f757915288..8b2bb945d2110de962679e9eeb226d793a185ef5 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLDefines.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLDefines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLMMain.cc b/MAC/GCF/LogSys/KVLogSys/src/KVLMMain.cc
index 6011d6ae9a34564150d42a46f318da0fc4abe698..b326a1ecf307eba3ca40cdbbc8c7511f8a7e9711 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLMMain.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLMMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc
index d33a592ff834b584e6e4365bd7efbe3e5563521a..a1546f611f406b9eb399fccf81df6f31e30f56c6 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.h b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.h
index f584daa3d665e53789850c65b3e804fdc8d83b6a..e9665ee818b6ad0a328e44dccd1e9d2545fa50c8 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc
index bb5cc1ed1de4c7087452d38f619efc35668954fb..14d1cc8889f6275578829567a080ba5ba489d3e8 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h
index f26ca7c2ad4a0a7ba4641da3637c7057cb522b04..3e6b7dd8562f74ace62281d3ff0b9df096fb9367 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc
index 444ad67cf5a6b5178b704853d562bb1c6998d9d6..9d91ca85d7b857e78a8114203b918d2394b6b918 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.h b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.h
index 557f949cd095de8bc94be5911e0553c054391a16..248e37a241627f933fe3bab41d196e3f3acc9df1 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.cc b/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.cc
index 42529e63f4c6823192ef51ca61b561e53df248e5..c6c96edbc64c96437a85ca4b4475ebb94d128161 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.h b/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.h
index 40141a065edbc01a18f1c5dd3d157f457a7defb6..e3a62abdc96fa9653fc7daef249071d8a55cd0fa 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/test/tKVLlogger.cc b/MAC/GCF/LogSys/KVLogSys/test/tKVLlogger.cc
index b7fdf043b225222b55a03bd2deefa0bbb428166b..dfffba2389097169777bd06a70e4d85f4a4322ea 100644
--- a/MAC/GCF/LogSys/KVLogSys/test/tKVLlogger.cc
+++ b/MAC/GCF/LogSys/KVLogSys/test/tKVLlogger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/include/GCF/LogSys/CEPKeyValueLogger.h b/MAC/GCF/LogSys/include/GCF/LogSys/CEPKeyValueLogger.h
index 06a2c5eded7aa5a45c880b7eb0c1fdc0271f2e06..05f24cc3292505a73f851402128a8844100af075 100644
--- a/MAC/GCF/LogSys/include/GCF/LogSys/CEPKeyValueLogger.h
+++ b/MAC/GCF/LogSys/include/GCF/LogSys/CEPKeyValueLogger.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/include/GCF/LogSys/GCF_KeyValueLogger.h b/MAC/GCF/LogSys/include/GCF/LogSys/GCF_KeyValueLogger.h
index ab9f74a617812bd3138fb694afc2ea83c66348cf..5cad2cb3488d4e69b7578c0d27a4ee26b8aa5ca2 100644
--- a/MAC/GCF/LogSys/include/GCF/LogSys/GCF_KeyValueLogger.h
+++ b/MAC/GCF/LogSys/include/GCF/LogSys/GCF_KeyValueLogger.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_Defines.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_Defines.h
index f4429319b6fd5ede2290e6abf6a7f8b2ed0b4e5e..781a7c6d7ebaa104c8e45fca5c13447e8d0ce158 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_Defines.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_Defines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBlob.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBlob.h
index 99be0f09b1c26e5022efd546798547ee14de3e2d..d2ae9bf213fca4aebc3b503e1bb2c8b017404e56 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBlob.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBlob.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBool.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBool.h
index bf20aef5d1149e973eb1aa86d07273a624d757e9..da685ccac7ece5813013b3680260871938dbc63b 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBool.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBool.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVChar.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVChar.h
index d2bd976a745de47c67498ae60ffaeaf0b3bf6e59..e0a73c8c9a8e8e5aca855c3e93bcdec4ef36a638 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVChar.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVChar.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDateTime.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDateTime.h
index 30480dd19d96efd29717d90a03242f2b3065724e..7a0e6bf0e940f925cdf9debe342bd322a5963617 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDateTime.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDateTime.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDouble.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDouble.h
index a4fe7d5e58eebfe582b95a130c841bcc5b6fe4ff..2a65aeb0b1bc4d95fc5c595b840338dae6c8a2ca 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDouble.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDouble.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDynArr.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDynArr.h
index ccb0c3e731d3489a9285b17a6f7261f89fc4a95b..77e6b4876ada1450b1bef58d20f59e94321fd082 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDynArr.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDynArr.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVInteger.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVInteger.h
index 8d67ea6576507cd347acb18c3d78e7f1fdacc0e4..cca6868c0a466878f5bc243a15bfcc2602442bd3 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVInteger.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVInteger.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVString.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVString.h
index fba06e4077ddd6818a29324a29afe8f394c967c2..2d59abe211d4c25c7c96585152cc688cec94f267 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVString.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVString.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVTypes.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVTypes.h
index c4b6808b27e1d7d82ab52a307d9e0a82efb951f4..56e7452f9c05a437e06520b18aae4fb6e3ba5275 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVTypes.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVTypes.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVUnsigned.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVUnsigned.h
index 1348f0fd338cf6f4a4c6fae8941a679b632dba38..5911fdd65d4fc284d88876e759b22cda8acba037 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVUnsigned.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVUnsigned.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PValue.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PValue.h
index 955e73dc1c7230ba213ece9d825decb39db11456..d26d69713d379d690c943064a53c9d0f0897385c 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PValue.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PValue.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSinfo.h b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSinfo.h
index e983c1f39ef8a06602424124c4329f7fefb9450a..142d0a4a1439b8abda5414798a226350ea9acaee 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSinfo.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSinfo.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresponse.h b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresponse.h
index 6baf13beadcea937b8066b95e905d18f30ba659f..202467d4ae4a49592e67a2edf7c4a03831740fd9 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresponse.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresponse.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresult.h b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresult.h
index 8b4b4d18c3149dd4026ea905f8f0cfabe79ea391..087213fa6d77d5ecae48418d0c7c1e8118d0af63 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresult.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresult.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h
index d2b7b54a06e9f4f03a508533d43a1c695d1b5461..48197a60f5ba771008580b9acc22f9c3a5a47974 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_DynTypes.h b/MAC/GCF/PVSS/src/GCF_DynTypes.h
index 34041f2dc49013fa4c5a116126e9d5c86707a229..40bf4c148c821de7f34f8354dcf7592c7373abc9 100644
--- a/MAC/GCF/PVSS/src/GCF_DynTypes.h
+++ b/MAC/GCF/PVSS/src/GCF_DynTypes.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVBlob.cc b/MAC/GCF/PVSS/src/GCF_PVBlob.cc
index 0b3690a52191f56dd7f70b647ebe862b096cb412..3f4ff273c7221fe76048a2f09eafc633afe912f6 100644
--- a/MAC/GCF/PVSS/src/GCF_PVBlob.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVBlob.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVBool.cc b/MAC/GCF/PVSS/src/GCF_PVBool.cc
index 056ba6958bf26e06b8581c7d297b3fab6eab98b6..f1edcc7bd986e28d2e1d5b474a584171e2beb4c9 100644
--- a/MAC/GCF/PVSS/src/GCF_PVBool.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVBool.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVChar.cc b/MAC/GCF/PVSS/src/GCF_PVChar.cc
index 35cde28478330ab40d65890c7919745e34b583ee..7a63d9cd1a8d3c8ddd906eaadcc7e8be6beeb802 100644
--- a/MAC/GCF/PVSS/src/GCF_PVChar.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVChar.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVDateTime.cc b/MAC/GCF/PVSS/src/GCF_PVDateTime.cc
index a286ead47bd8f143889a897a06f27d93d7f8fbc9..658b12dbe46035fe61bb0ec294b09112da93b799 100644
--- a/MAC/GCF/PVSS/src/GCF_PVDateTime.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVDateTime.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVDouble.cc b/MAC/GCF/PVSS/src/GCF_PVDouble.cc
index 99b0b93da358f35568892709ed3f5a4fc7d12688..7a433116e062fb923fecb7be6293aa3cd9c42b82 100644
--- a/MAC/GCF/PVSS/src/GCF_PVDouble.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVDouble.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVDynArr.cc b/MAC/GCF/PVSS/src/GCF_PVDynArr.cc
index 0c8765f2d0a592c717a21deecaeb82b1e3059599..56947b2ac0cf28c1723bcf12cc536ffa4188bd54 100644
--- a/MAC/GCF/PVSS/src/GCF_PVDynArr.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVDynArr.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVInteger.cc b/MAC/GCF/PVSS/src/GCF_PVInteger.cc
index 7ea35dea0901bd809d929a36a18c0ef27c253f6d..79dc016b266afba6e56a95dc65a6bfa0993101ea 100644
--- a/MAC/GCF/PVSS/src/GCF_PVInteger.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVInteger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVString.cc b/MAC/GCF/PVSS/src/GCF_PVString.cc
index 1e2fe2b3fa45d4dacfe7cc0c1f7f1ae9dfd8bd66..8886f20da7048b894a4b751a3cce3dd758f72eb3 100644
--- a/MAC/GCF/PVSS/src/GCF_PVString.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVString.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVTypes.cc b/MAC/GCF/PVSS/src/GCF_PVTypes.cc
index 97ba0606b0b8970a8e4b180989e1991339e2fe73..809de5ce239a7d83acf9b10396b1ebae0dfd396f 100644
--- a/MAC/GCF/PVSS/src/GCF_PVTypes.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVTypes.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2014
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVUnsigned.cc b/MAC/GCF/PVSS/src/GCF_PVUnsigned.cc
index 3b5632edeacf448eab60aa8663783c39e52f7eb9..ce8cd6a69e1a676156b226b83f0155732da07e73 100644
--- a/MAC/GCF/PVSS/src/GCF_PVUnsigned.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVUnsigned.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PValue.cc b/MAC/GCF/PVSS/src/GCF_PValue.cc
index b8dabaeff137bfe28febfbb2978a3a0d3d0e215e..89f061c2b3510e141ba43819708e76e7dead2262 100644
--- a/MAC/GCF/PVSS/src/GCF_PValue.cc
+++ b/MAC/GCF/PVSS/src/GCF_PValue.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_PvssApi.cc b/MAC/GCF/PVSS/src/GSA_PvssApi.cc
index 8678d6854a280bd1de91c8c5dc0ff7b90715fbfb..8e3ee4ee33ee15c37690d0a5b14322de7aa37c69 100644
--- a/MAC/GCF/PVSS/src/GSA_PvssApi.cc
+++ b/MAC/GCF/PVSS/src/GSA_PvssApi.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_PvssApi.h b/MAC/GCF/PVSS/src/GSA_PvssApi.h
index a20e647a23e5852fe0a4c39f2e618fd4be302ceb..4aea36a974f1faa07f32061bf26006f76fa78470 100644
--- a/MAC/GCF/PVSS/src/GSA_PvssApi.h
+++ b/MAC/GCF/PVSS/src/GSA_PvssApi.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_Resources.cc b/MAC/GCF/PVSS/src/GSA_Resources.cc
index 6c24cb0df00f76dc94dba159f112b582e7b85c52..31a3b4c1361200b7158984ad5f630c61e9bf36aa 100644
--- a/MAC/GCF/PVSS/src/GSA_Resources.cc
+++ b/MAC/GCF/PVSS/src/GSA_Resources.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_Resources.h b/MAC/GCF/PVSS/src/GSA_Resources.h
index 2ac96b394bf1c794df3ce92afe9ccfebeda12e03..2bde4baafa9badd30dc9c7746fe8baf9438d24ba 100644
--- a/MAC/GCF/PVSS/src/GSA_Resources.h
+++ b/MAC/GCF/PVSS/src/GSA_Resources.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc b/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc
index 7a474ac914f8a04bccf95d607b6486def4da9b5b..52d24ddc882259bdcaae5757aa5d74805d7a4383 100644
--- a/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc
+++ b/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_SCADAHandler.h b/MAC/GCF/PVSS/src/GSA_SCADAHandler.h
index 2c11b0bd71992f6c6ca6f52a772715d6e2dea016..9f887f2aaa4b8b79c93a6fb59b00120e16a5fed5 100644
--- a/MAC/GCF/PVSS/src/GSA_SCADAHandler.h
+++ b/MAC/GCF/PVSS/src/GSA_SCADAHandler.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_WaitForAnswer.h b/MAC/GCF/PVSS/src/GSA_WaitForAnswer.h
index 9a572b3c886b4db7fce06bd550e8d5d9201f9408..576bdd00b26b352dbbec01518ce4b5d7c026f026 100644
--- a/MAC/GCF/PVSS/src/GSA_WaitForAnswer.h
+++ b/MAC/GCF/PVSS/src/GSA_WaitForAnswer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/PVSSinfo.cc b/MAC/GCF/PVSS/src/PVSSinfo.cc
index f4b961239a8df12321ebab7f0a4be990539f0fb3..21d7e92b6e33098a4ffefabbdba1c281a679f0cc 100644
--- a/MAC/GCF/PVSS/src/PVSSinfo.cc
+++ b/MAC/GCF/PVSS/src/PVSSinfo.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/PVSSservice.cc b/MAC/GCF/PVSS/src/PVSSservice.cc
index 53ad7269e7a2c43c5a9de2f0098cd91ec0299fb5..c7e1164c0b697f1b474f4937e42ed5cd32334bea 100644
--- a/MAC/GCF/PVSS/src/PVSSservice.cc
+++ b/MAC/GCF/PVSS/src/PVSSservice.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/PerformanceResponse.h b/MAC/GCF/PVSS/test/PerformanceResponse.h
index aa9e6d2d84e774d5577038673507ef40c918ee77..e104738828163d49ee2f4573168de9bcae694104 100644
--- a/MAC/GCF/PVSS/test/PerformanceResponse.h
+++ b/MAC/GCF/PVSS/test/PerformanceResponse.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/Response.h b/MAC/GCF/PVSS/test/Response.h
index f966d022586bab9f1cf09b39bb2edc7da0c232c2..54c7875e29ef2a2dd455201c9af6b1a10dfe7c10 100644
--- a/MAC/GCF/PVSS/test/Response.h
+++ b/MAC/GCF/PVSS/test/Response.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tGCFtypes.cc b/MAC/GCF/PVSS/test/tGCFtypes.cc
index 1b825a935f9f5c75fd6f75826ee2fd85c450b696..4c584598d4829cbb8124cbe1265c83d27ed304de 100644
--- a/MAC/GCF/PVSS/test/tGCFtypes.cc
+++ b/MAC/GCF/PVSS/test/tGCFtypes.cc
@@ -2,7 +2,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tMonitorState.cc b/MAC/GCF/PVSS/test/tMonitorState.cc
index 128ad5b288e528ca2e64316a87aea119454dcd09..325522aee111e5f58cc3212fbc9435154208e9dd 100644
--- a/MAC/GCF/PVSS/test/tMonitorState.cc
+++ b/MAC/GCF/PVSS/test/tMonitorState.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tMonitorState.h b/MAC/GCF/PVSS/test/tMonitorState.h
index d58b05d23a21099b56a1f3257c2e2fa1169c51cc..eb3be621f2c9a2edcdeab8313a11e12a94f4eeec 100644
--- a/MAC/GCF/PVSS/test/tMonitorState.h
+++ b/MAC/GCF/PVSS/test/tMonitorState.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSconnect.cc b/MAC/GCF/PVSS/test/tPVSSconnect.cc
index b8703f3e4d97c5182f24e9e03db406ce1951c5e3..c963c49f44bf2397750d4f278f01f62cf608900d 100644
--- a/MAC/GCF/PVSS/test/tPVSSconnect.cc
+++ b/MAC/GCF/PVSS/test/tPVSSconnect.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSinfo.cc b/MAC/GCF/PVSS/test/tPVSSinfo.cc
index 705b356465c1b26c3115a13156d6fe1e3f7efcfb..d8962db9a1ded1e7bc576d6b0f56d2a4136a10bc 100644
--- a/MAC/GCF/PVSS/test/tPVSSinfo.cc
+++ b/MAC/GCF/PVSS/test/tPVSSinfo.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSinfo.h b/MAC/GCF/PVSS/test/tPVSSinfo.h
index cc16955ff861b3d08009c649c6c9b986b75a353f..3cec561a2f8989ee40cb22d1127898543dc86125 100644
--- a/MAC/GCF/PVSS/test/tPVSSinfo.h
+++ b/MAC/GCF/PVSS/test/tPVSSinfo.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSservice.cc b/MAC/GCF/PVSS/test/tPVSSservice.cc
index fc0e09b2db60d01384eea85b13b00787731e615a..2911092340cb67da7bef2d98dd3709632bf4cdc7 100644
--- a/MAC/GCF/PVSS/test/tPVSSservice.cc
+++ b/MAC/GCF/PVSS/test/tPVSSservice.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSservice.h b/MAC/GCF/PVSS/test/tPVSSservice.h
index e37215c3a1b51ee2add87f0e8c84438c41b356eb..6a054702a4f961e8c430adf0bc0576de03c9da5f 100644
--- a/MAC/GCF/PVSS/test/tPVSSservice.h
+++ b/MAC/GCF/PVSS/test/tPVSSservice.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPerformance.cc b/MAC/GCF/PVSS/test/tPerformance.cc
index 2f643ed7b76a338579c339e03a67149981b51ddf..5922b305885365148ebacdeff62f1062c596cf01 100644
--- a/MAC/GCF/PVSS/test/tPerformance.cc
+++ b/MAC/GCF/PVSS/test/tPerformance.cc
@@ -2,7 +2,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPerformance.h b/MAC/GCF/PVSS/test/tPerformance.h
index 84d34bcc5dd61ee662784b905e4cedf8b6b3f763..a1e0c3f53c5a7d008dd6b99ce80a350368736bbf 100644
--- a/MAC/GCF/PVSS/test/tPerformance.h
+++ b/MAC/GCF/PVSS/test/tPerformance.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/include/GCF/RTDB/DPservice.h b/MAC/GCF/RTDB/include/GCF/RTDB/DPservice.h
index e56dbf589e7438869972ade902b1ca8f81331da1..2addbfa3ffd8ce635b90e040dc1638b475ba0920 100644
--- a/MAC/GCF/RTDB/include/GCF/RTDB/DPservice.h
+++ b/MAC/GCF/RTDB/include/GCF/RTDB/DPservice.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/include/GCF/RTDB/GCF_RTDBPort.h b/MAC/GCF/RTDB/include/GCF/RTDB/GCF_RTDBPort.h
index 9c5d871f1a8c04019d9f8ac2a70a58ff8375bfb1..87c1b30a6a344c2ded3c4f46a1b6b710cd8de169 100644
--- a/MAC/GCF/RTDB/include/GCF/RTDB/GCF_RTDBPort.h
+++ b/MAC/GCF/RTDB/include/GCF/RTDB/GCF_RTDBPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/include/GCF/RTDB/RTDB_PropertySet.h b/MAC/GCF/RTDB/include/GCF/RTDB/RTDB_PropertySet.h
index d58a32480b7f0356e465b9ab3c08122d742244d0..5cd09114b732b10bd060b5613303ceda18be6151 100644
--- a/MAC/GCF/RTDB/include/GCF/RTDB/RTDB_PropertySet.h
+++ b/MAC/GCF/RTDB/include/GCF/RTDB/RTDB_PropertySet.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DP_Protocol.prot b/MAC/GCF/RTDB/src/DP_Protocol.prot
index 78e9930c6cfac4caf1a4da1eb90b540e3ccb4cd6..acbbd6f864bc9edff51d8c01c57e8bdbae986551 100644
--- a/MAC/GCF/RTDB/src/DP_Protocol.prot
+++ b/MAC/GCF/RTDB/src/DP_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DPanswer.cc b/MAC/GCF/RTDB/src/DPanswer.cc
index ba638b1f5c4350887fffd532ad3f9733400bffa5..8b334e631fa3c75f9410df45fb1975d79018e429 100644
--- a/MAC/GCF/RTDB/src/DPanswer.cc
+++ b/MAC/GCF/RTDB/src/DPanswer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DPanswer.h b/MAC/GCF/RTDB/src/DPanswer.h
index e425cd277a1497fa341d53d84b490b5af3fdbc1e..872eb40a88a68e8cfd02b120e56e42c36c8a75d7 100644
--- a/MAC/GCF/RTDB/src/DPanswer.h
+++ b/MAC/GCF/RTDB/src/DPanswer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DPresponse.h b/MAC/GCF/RTDB/src/DPresponse.h
index c3f92f07f6ddcffdf1ca84dabeb51a844e725402..b8a8cc722c45232f12987af95982e958f946e472 100644
--- a/MAC/GCF/RTDB/src/DPresponse.h
+++ b/MAC/GCF/RTDB/src/DPresponse.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DPservice.cc b/MAC/GCF/RTDB/src/DPservice.cc
index 529b86739e758e03ce53fccd403b5d927c7c4a55..7f6a24a32ad8f785ff2e368a54a3aa4e1c8c3f2e 100644
--- a/MAC/GCF/RTDB/src/DPservice.cc
+++ b/MAC/GCF/RTDB/src/DPservice.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/GCF_RTDBPort.cc b/MAC/GCF/RTDB/src/GCF_RTDBPort.cc
index 8e3456a51665990118f51ea723c627610f4db16b..25726448b5a7f1cb82f55e73c04afcdde1f26034 100644
--- a/MAC/GCF/RTDB/src/GCF_RTDBPort.cc
+++ b/MAC/GCF/RTDB/src/GCF_RTDBPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/PortResponse.h b/MAC/GCF/RTDB/src/PortResponse.h
index 7e493c7ebf9ddca1d68827178ef2ef7c92a26ebc..9c274b678eb2e2eeb576f95faea0eb9a2f9ad380 100644
--- a/MAC/GCF/RTDB/src/PortResponse.h
+++ b/MAC/GCF/RTDB/src/PortResponse.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/PropSetResponse.h b/MAC/GCF/RTDB/src/PropSetResponse.h
index 30c801409b4b7db58e4816190cdb378cd370bdd5..6888a0a9243612e78eba80a853d84b785f72e997 100644
--- a/MAC/GCF/RTDB/src/PropSetResponse.h
+++ b/MAC/GCF/RTDB/src/PropSetResponse.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/RTDB_PropertySet.cc b/MAC/GCF/RTDB/src/RTDB_PropertySet.cc
index 05dc03c741ec1b4075d518a7fd715ca1ad9b8105..0e1d57961fadecadd680fe16990328bdb3f830c3 100644
--- a/MAC/GCF/RTDB/src/RTDB_PropertySet.cc
+++ b/MAC/GCF/RTDB/src/RTDB_PropertySet.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/DPresponse.h b/MAC/GCF/RTDB/test/DPresponse.h
index e21d083d4e96e079077e11ac31ea930b110ad008..dff25396d7cd5152efea150113e0649a30c7762c 100644
--- a/MAC/GCF/RTDB/test/DPresponse.h
+++ b/MAC/GCF/RTDB/test/DPresponse.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/RTDBPerfResp.h b/MAC/GCF/RTDB/test/RTDBPerfResp.h
index 45c598c2272e87052aa26a44439fff810399b6d3..892814d7d5b3fe4beb0b9a8fe7bfcca90aa2f6d2 100644
--- a/MAC/GCF/RTDB/test/RTDBPerfResp.h
+++ b/MAC/GCF/RTDB/test/RTDBPerfResp.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tDPservice.cc b/MAC/GCF/RTDB/test/tDPservice.cc
index 828332ae6bc4bdf08db751e520056708f0e2b0b5..5d915b54c5050fd2525cf0815ebf39fef574885b 100644
--- a/MAC/GCF/RTDB/test/tDPservice.cc
+++ b/MAC/GCF/RTDB/test/tDPservice.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tDPservice.h b/MAC/GCF/RTDB/test/tDPservice.h
index 51099722dcb0836d03d056f9af82390621014206..797e94d702d6a5165c86e582ec84c238c587b9c8 100644
--- a/MAC/GCF/RTDB/test/tDPservice.h
+++ b/MAC/GCF/RTDB/test/tDPservice.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tPerformanceReport.cc b/MAC/GCF/RTDB/test/tPerformanceReport.cc
index 4ed522aa07db022fd9d266f41b1fcbe5bc2b38d6..8c1673961f2f86fc1cbdabc2454c7436bf9dc177 100644
--- a/MAC/GCF/RTDB/test/tPerformanceReport.cc
+++ b/MAC/GCF/RTDB/test/tPerformanceReport.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2008
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tPerformanceReport.h b/MAC/GCF/RTDB/test/tPerformanceReport.h
index 12d3baa0b1c6fed174ca79e7fbfa54e81b38e43e..7379c5dd2b2d88ca401d48917aa6b189aff04a18 100644
--- a/MAC/GCF/RTDB/test/tPerformanceReport.h
+++ b/MAC/GCF/RTDB/test/tPerformanceReport.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tPropertySet.cc b/MAC/GCF/RTDB/test/tPropertySet.cc
index d159ca3546e6f029b33b3e99de7d18f22a1cbeca..252df33a5c9d2937cffd51978d4702f7a30b192e 100644
--- a/MAC/GCF/RTDB/test/tPropertySet.cc
+++ b/MAC/GCF/RTDB/test/tPropertySet.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tPropertySet.h b/MAC/GCF/RTDB/test/tPropertySet.h
index e49e5083ecdb2d9f17ef7e0bda3a04a5006706c6..450d73299b15517117f43cba83065533d4b127c8 100644
--- a/MAC/GCF/RTDB/test/tPropertySet.h
+++ b/MAC/GCF/RTDB/test/tPropertySet.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tRTDBPerformance.cc b/MAC/GCF/RTDB/test/tRTDBPerformance.cc
index 49f84f0342cf76e6958e7590624ab9a66ddb9064..59e03e2db51baf837a429dc176aeb970686b7fbf 100644
--- a/MAC/GCF/RTDB/test/tRTDBPerformance.cc
+++ b/MAC/GCF/RTDB/test/tRTDBPerformance.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tRTDBPerformance.h b/MAC/GCF/RTDB/test/tRTDBPerformance.h
index cf522895be7035449c13580d39aff84649097821..babd7af2bd36e3523bf4d137792cdbbcffaa75de 100644
--- a/MAC/GCF/RTDB/test/tRTDBPerformance.h
+++ b/MAC/GCF/RTDB/test/tRTDBPerformance.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tRTDBPort.cc b/MAC/GCF/RTDB/test/tRTDBPort.cc
index 2f02645d341dd90e3e580d595e2c015144fe9975..6dd5a1365353a4594d91df8281baeb05b51d1770 100644
--- a/MAC/GCF/RTDB/test/tRTDBPort.cc
+++ b/MAC/GCF/RTDB/test/tRTDBPort.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tRTDBPort.h b/MAC/GCF/RTDB/test/tRTDBPort.h
index 6e54efb156821f8160df336449004dc917cc42ec..1ba769d8accd4d790c28d6670d21f3f4177250f9 100644
--- a/MAC/GCF/RTDB/test/tRTDBPort.h
+++ b/MAC/GCF/RTDB/test/tRTDBPort.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/testQuery.cc b/MAC/GCF/RTDB/test/testQuery.cc
index cc92152e896d4175886eda9e6bf8479d6ec609d5..17a7480673e541b3b8014f04c704ae739169b3f5 100644
--- a/MAC/GCF/RTDB/test/testQuery.cc
+++ b/MAC/GCF/RTDB/test/testQuery.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/testQuery.h b/MAC/GCF/RTDB/test/testQuery.h
index 1e89f310c0a8f6aa143998fc7eb48f69a7e970ff..a4abc7aedb22cda4e36730a1e0396bbd081cbb88 100644
--- a/MAC/GCF/RTDB/test/testQuery.h
+++ b/MAC/GCF/RTDB/test/testQuery.h
@@ -2,7 +2,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Control.h b/MAC/GCF/TM/include/GCF/TM/GCF_Control.h
index 503b4e62826cb48f90d0aa4fa548387886eda76c..1a448ee6442c5888847942dc38f6f462e96c3065 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Control.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Control.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_DevicePort.h b/MAC/GCF/TM/include/GCF/TM/GCF_DevicePort.h
index 10bdb59ad08262b8cf0becdb189faa0ba118533d..f21143501d1ae636247b2c4b5f184c68036751d0 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_DevicePort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_DevicePort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_ETHRawPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_ETHRawPort.h
index 80c171a43bf3c690985c0dcb9875dcd55b4e3b7f..2d7230ccd8eb67b2c8c61a2cc46553a2ef582a23 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_ETHRawPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_ETHRawPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Fsm.h b/MAC/GCF/TM/include/GCF/TM/GCF_Fsm.h
index e1cb947237d07a3392f6d84df958ea550f2e12d0..8da21157eb6ed4350ca62b6357c4dc6ef6c60026 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Fsm.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Fsm.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Handler.h b/MAC/GCF/TM/include/GCF/TM/GCF_Handler.h
index 5cbc4f62ee9f61f07f718c967ff83aca3cbf871c..8d12fcd9b73a87fc1cd782344cb71f200bb981dc 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Handler.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Handler.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_ITCPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_ITCPort.h
index 78035be063caec94f831a083d7b686c0f340b5b6..55fa858b879ce5ba14ffce8ae78a0d6ab9f1f572 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_ITCPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_ITCPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Port.h b/MAC/GCF/TM/include/GCF/TM/GCF_Port.h
index 5fcc0b89ea5ed5df455aa05ea8cf59f8a487a705..c786e4efdd9deb8a5dc6c085b518b84813141f19 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Port.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Port.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_PortInterface.h b/MAC/GCF/TM/include/GCF/TM/GCF_PortInterface.h
index d07714611566056bf7f6bd3f23e3f2feaa237a87..551ae31022e4e453009179e83954a0c8e7a5b0ee 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_PortInterface.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_PortInterface.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Protocols.h b/MAC/GCF/TM/include/GCF/TM/GCF_Protocols.h
index b422125780f5edb3f34e0e54a9f28a8b5ad2dc14..660fde1ac933d3215f90d0389c52d73f86c5f717 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Protocols.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Protocols.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_RawPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_RawPort.h
index c95f91100570b0efd21cd73408cac0117e39c952..21e88d318c4ca2e59478bc5f15c1613e8deca1b0 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_RawPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_RawPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Scheduler.h b/MAC/GCF/TM/include/GCF/TM/GCF_Scheduler.h
index 1b0e6365077b2346b5658c8a96b1fac42950786e..ccecc8eac3e9c8457b07cbc5139944c11f565571 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Scheduler.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Scheduler.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_TCPPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_TCPPort.h
index 36c3fe5f19aa9a824739a92fdf2dbe0cb5593292..21f853a2324e10dc75dc4c1030d61197e49e4b4a 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_TCPPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_TCPPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Task.h b/MAC/GCF/TM/include/GCF/TM/GCF_Task.h
index 298b06f70669dc0419a97b2f59e92bdd6a737a0d..bd1d63598039bf9d13204531324bd3e58fe2c754 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Task.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Task.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_TimerPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_TimerPort.h
index 7c53e95a41a4897ca3e4bbe442ad23e1ff4a71f8..d42c351a80e5dcb7cbc32184ff83b48bf10503c0 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_TimerPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_TimerPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/TestTask.h b/MAC/GCF/TM/include/GCF/TM/TestTask.h
index f745e3c25ffe209dca7729d1f42dd26333d8dd87..d71112fb80dba24c60df76e2c14f5db9a7322477 100644
--- a/MAC/GCF/TM/include/GCF/TM/TestTask.h
+++ b/MAC/GCF/TM/include/GCF/TM/TestTask.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010-2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GCF_Fsm.cc b/MAC/GCF/TM/src/GCF_Fsm.cc
index 7fb45ef5137e2e26cff14f7581a85ff257ca1e56..37c6ff99c698b785d421e10239172c6739bfd175 100644
--- a/MAC/GCF/TM/src/GCF_Fsm.cc
+++ b/MAC/GCF/TM/src/GCF_Fsm.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GCF_Handler.cc b/MAC/GCF/TM/src/GCF_Handler.cc
index 9896cc8a695fd33b70f35407c7f6339badd5d3bf..d82de365b94782ec1cc3fde9937103f31c92dddb 100644
--- a/MAC/GCF/TM/src/GCF_Handler.cc
+++ b/MAC/GCF/TM/src/GCF_Handler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GCF_Protocols.cc b/MAC/GCF/TM/src/GCF_Protocols.cc
index 18b8710d2c35e8f8a0226cb4ee6de5e0fc4fadb9..3a8c03a15b433d3e97373c4c9d5fa5f0dbff4dc1 100644
--- a/MAC/GCF/TM/src/GCF_Protocols.cc
+++ b/MAC/GCF/TM/src/GCF_Protocols.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GCF_Scheduler.cc b/MAC/GCF/TM/src/GCF_Scheduler.cc
index fb275f3a2e66e856780d1dd28ffd87b065466df0..f63e3676261c847d8ef62d612891038e69ad070f 100644
--- a/MAC/GCF/TM/src/GCF_Scheduler.cc
+++ b/MAC/GCF/TM/src/GCF_Scheduler.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GTM_Defines.h b/MAC/GCF/TM/src/GTM_Defines.h
index bcf7ff2dd99b9333ab132475713329308e41fcba..d92a52235308b0ee67d300b042cf5c7f3620ccb0 100644
--- a/MAC/GCF/TM/src/GTM_Defines.h
+++ b/MAC/GCF/TM/src/GTM_Defines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Port/GCF_Port.cc b/MAC/GCF/TM/src/Port/GCF_Port.cc
index 2043a672a07e52c57991efcc7ad3d02b77173746..969ff84c42a4e87e3d3f9c639f099ae1dfff0846 100644
--- a/MAC/GCF/TM/src/Port/GCF_Port.cc
+++ b/MAC/GCF/TM/src/Port/GCF_Port.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Port/GCF_PortInterface.cc b/MAC/GCF/TM/src/Port/GCF_PortInterface.cc
index f81e217b8f24c2507834f8603fb9c1b6ad48d767..070c9cf6facad924371c05af1d687ff7d130c0b3 100644
--- a/MAC/GCF/TM/src/Port/GCF_PortInterface.cc
+++ b/MAC/GCF/TM/src/Port/GCF_PortInterface.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Port/GCF_RawPort.cc b/MAC/GCF/TM/src/Port/GCF_RawPort.cc
index 14ecd90bfa43f64e157873266bc37e507268947f..ca79d25f8bba7c88277f69139972ccae6d61605e 100644
--- a/MAC/GCF/TM/src/Port/GCF_RawPort.cc
+++ b/MAC/GCF/TM/src/Port/GCF_RawPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc b/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc
index b30c0b20b39370214384b4c9544345c49af0e2b9..c61ce654aa6d84355d97a063b48ed82b2e319376 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc b/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc
index 458507c68c91a8878c735d46008715e2c12ac2a9..becb20d4f89c420828d79481f4981cb283f55026 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_ITCPort.cc b/MAC/GCF/TM/src/PortImpl/GCF_ITCPort.cc
index cabd719f65c9174c0a8e5ae7f0cd26b05d3d3d91..29a22f1d8452669fe7b8ad6a05266fa208d67604 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_ITCPort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_ITCPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc b/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc
index 171230573102398a20b51fb387d08e90f7ea9b39..2b56e883d5d7093556015f92bcb961f77fe402c3 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_Device.cc b/MAC/GCF/TM/src/PortImpl/GTM_Device.cc
index e46194dac107ca9dd077c29d0b97a770b554faae..19eba56493f332880cc8856ab8985c834c7049df 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_Device.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_Device.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_Device.h b/MAC/GCF/TM/src/PortImpl/GTM_Device.h
index f95f3051cd133517520872b1cc8474cabfed9f2c..50009fc4b86696d5b85ced8a3d9430b8b06d5e5f 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_Device.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_Device.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.cc b/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.cc
index 6f8942c7129a269c7d40f7edfcbd2442898842f2..cfff1a98bbb05a6f36fb622a25ff30eed38261b2 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.h b/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.h
index 5244ef2027cb0108b8e57c1f906df975dceaa852..1db172af1d31dca4449fb8954777f2ee5acdb4ca 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_File.cc b/MAC/GCF/TM/src/PortImpl/GTM_File.cc
index a4366947118e3ae71cfbeaf4fac24d61c891de6d..4ac40622c3c0d33a052dfd199e3f45b2d66b0670 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_File.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_File.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_File.h b/MAC/GCF/TM/src/PortImpl/GTM_File.h
index 6fcd89a80b5c3d7bd1492178b8eb7e1283d09294..2ec94d08a6a61c7a6a33814185549f2286e30dbc 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_File.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_File.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.cc b/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.cc
index a4dce1f9eb8a9abba11acd2973423fcce641a0fe..9db328d0e2484be828793be9a1e361845a5bf2cf 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.h b/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.h
index 130c3c9401f2febd766d307dff2b3ce2d751566e..82bd97480ec5b37172d39c5794780924f3f27564 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.cc b/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.cc
index ecec7ec8eea08ef103a42d5d225d8bf2d14fd0c1..391552695bd071c98eb55fce2f763a9b2b81bb1a 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.h b/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.h
index a0e053934e4cacd8cf951404e237a4e4d6b49826..cbf90c5d92de566330c16c61fe0369234b2670fc 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.cc b/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.cc
index 11bac0c6c433ca430a46ca24f72dd1a9c6687c07..517a18000c6800d841c88356930faf84dbb9e61d 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.h b/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.h
index 7980bbc256fac0b79841c00e0ff7a5603e49381c..bc402a574cbb5469ab39c66f424a3ce25ed94d32 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc
index 04466c4e7dc761be4ec30bfb17ac906a01ddf167..3cf2541301d01ad0fd9f06302ff02083f8445707 100644
--- a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc
+++ b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.h b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.h
index 6c638f172dc7d90f48c0748b2cee0ea06dc7e68e..a09dd37f1081fc202294ab48177ae46c984d7359 100644
--- a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.h
+++ b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.cc b/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.cc
index 8efb555fbbbd1fe25d060d4f61b13edd8381cee8..6e99bc2a6827b35decfa24da242cbe54987ad384 100644
--- a/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.cc
+++ b/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.h b/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.h
index 7d0c497721e490c821ef22683f7d3bf8655cbb6c..b3dd3491487b226b0328e663e8da8e023dcb3ad5 100644
--- a/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.h
+++ b/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/TestFramework/TestFW_Protocol.prot b/MAC/GCF/TM/src/TestFramework/TestFW_Protocol.prot
index 0518b7958b89886c1202bd348640bc5b41dd4a9d..607fe243c608d71d659b7927fdf65d8c63d8e2c8 100644
--- a/MAC/GCF/TM/src/TestFramework/TestFW_Protocol.prot
+++ b/MAC/GCF/TM/src/TestFramework/TestFW_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/TestFramework/TestTask.cc b/MAC/GCF/TM/src/TestFramework/TestTask.cc
index abf2586a7fbcbe07d22c6d7ad525ffd002d00a2f..1b2c467aec6071e0990a619cbe78721b85c82698 100644
--- a/MAC/GCF/TM/src/TestFramework/TestTask.cc
+++ b/MAC/GCF/TM/src/TestFramework/TestTask.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Timer/GTM_Timer.cc b/MAC/GCF/TM/src/Timer/GTM_Timer.cc
index b4c26db5cc5163ef630cfc707bf0d908137cc962..5064d0ea49520a8a09f92b406b68ee2799c00dac 100644
--- a/MAC/GCF/TM/src/Timer/GTM_Timer.cc
+++ b/MAC/GCF/TM/src/Timer/GTM_Timer.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Timer/GTM_Timer.h b/MAC/GCF/TM/src/Timer/GTM_Timer.h
index b4582c7d85091e31d1987704dd7221bbf9f2fe5d..4695df826f4cf216854dd9c4bd886f177c840418 100644
--- a/MAC/GCF/TM/src/Timer/GTM_Timer.h
+++ b/MAC/GCF/TM/src/Timer/GTM_Timer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Timer/GTM_TimerHandler.cc b/MAC/GCF/TM/src/Timer/GTM_TimerHandler.cc
index ebe46775238a1f4ad47cafc6169157e5fda6e9a7..2f5e287b9e721baa87cf962ca775c4bf8785fa2b 100644
--- a/MAC/GCF/TM/src/Timer/GTM_TimerHandler.cc
+++ b/MAC/GCF/TM/src/Timer/GTM_TimerHandler.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Timer/GTM_TimerHandler.h b/MAC/GCF/TM/src/Timer/GTM_TimerHandler.h
index ac351b30f4997c001604d1a752be1db791bc8e3b..37aa90ab5de6d84a41f956dce938d911c8942631 100644
--- a/MAC/GCF/TM/src/Timer/GTM_TimerHandler.h
+++ b/MAC/GCF/TM/src/Timer/GTM_TimerHandler.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/Echo.cc b/MAC/GCF/TM/test/Echo.cc
index 3911e0c9a6b8638a44f4ac9b3a338cae3b0fa30e..98680a672854173a59796da22c0b6a2a648f9ec6 100644
--- a/MAC/GCF/TM/test/Echo.cc
+++ b/MAC/GCF/TM/test/Echo.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/Echo.h b/MAC/GCF/TM/test/Echo.h
index 28720502100bffc47aee26d96740263c243a7e39..45e988bef16c5ef0881b5d21897e1e62e9bedb78 100644
--- a/MAC/GCF/TM/test/Echo.h
+++ b/MAC/GCF/TM/test/Echo.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/Ping.cc b/MAC/GCF/TM/test/Ping.cc
index c0533fe75086103e870cf1ccd6c4966eebc032d3..08e7e3f0b56ded1166179d34636eae7a96615f01 100644
--- a/MAC/GCF/TM/test/Ping.cc
+++ b/MAC/GCF/TM/test/Ping.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/Ping.h b/MAC/GCF/TM/test/Ping.h
index 02feec29c11d670f15bc0e3bc730de5b1b0a0930..d2f9ac02f0281d3e3328c36664c1d2014e22b054 100644
--- a/MAC/GCF/TM/test/Ping.h
+++ b/MAC/GCF/TM/test/Ping.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/PythonTest_Protocol.prot b/MAC/GCF/TM/test/PythonTest_Protocol.prot
index 69a44dcb9951b6c5ca5ab992e4dddd71f21d1ebc..e6461bbf29b2a82716272d3e3013410fa0f009b2 100644
--- a/MAC/GCF/TM/test/PythonTest_Protocol.prot
+++ b/MAC/GCF/TM/test/PythonTest_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tAutoOpen.cc b/MAC/GCF/TM/test/tAutoOpen.cc
index 1c9348e3cc370ec733af69fd9b5758f24b90b2b7..b50df9898bdd29c26a249962df6ad410c8304c41 100644
--- a/MAC/GCF/TM/test/tAutoOpen.cc
+++ b/MAC/GCF/TM/test/tAutoOpen.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2009
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tAutoOpen.h b/MAC/GCF/TM/test/tAutoOpen.h
index fc6308d5230a264c81706eabae8f661428b1b1e8..5366620b7a7e0e2a12e4a372ca0af56ce6e0dcec 100644
--- a/MAC/GCF/TM/test/tAutoOpen.h
+++ b/MAC/GCF/TM/test/tAutoOpen.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tClient.cc b/MAC/GCF/TM/test/tClient.cc
index a8563f5b7c6194f04bc6dd1d6db0b3d610a09ec7..671a51135bf0bd9c6bf98e695efd7f36934e5f7f 100644
--- a/MAC/GCF/TM/test/tClient.cc
+++ b/MAC/GCF/TM/test/tClient.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tClient.h b/MAC/GCF/TM/test/tClient.h
index a0bde272b1e007cdfc44fca51223000731efb0f3..824f66ca80cac129cd854015dea2841db9a4a930 100644
--- a/MAC/GCF/TM/test/tClient.h
+++ b/MAC/GCF/TM/test/tClient.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tEventBinding.cc b/MAC/GCF/TM/test/tEventBinding.cc
index 90de09b21c6229052a37b3b1f0cd342be1729962..692ebdfbbf94ba58454b8bd2563a654325251793 100644
--- a/MAC/GCF/TM/test/tEventBinding.cc
+++ b/MAC/GCF/TM/test/tEventBinding.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2013
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tEventBinding.h b/MAC/GCF/TM/test/tEventBinding.h
index e86a3d46321d2046be3129bd8fd277cb9ca4134d..b6d5b40f53534952aee110747a7345bdd602bbb5 100644
--- a/MAC/GCF/TM/test/tEventBinding.h
+++ b/MAC/GCF/TM/test/tEventBinding.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tEventQueue.cc b/MAC/GCF/TM/test/tEventQueue.cc
index 9bd31941ac417466b38edf960a73b4914f91c393..7117401142eee501df95744879e6c4fbf2f0c7c8 100644
--- a/MAC/GCF/TM/test/tEventQueue.cc
+++ b/MAC/GCF/TM/test/tEventQueue.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tEventQueue.h b/MAC/GCF/TM/test/tEventQueue.h
index 64614e9c1f9a5f7727758c8c4ffeae8c36a2a9f4..876687bfc64d5ca74a8e1acd193f9cf144023de8 100644
--- a/MAC/GCF/TM/test/tEventQueue.h
+++ b/MAC/GCF/TM/test/tEventQueue.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFPort.cc b/MAC/GCF/TM/test/tGCFPort.cc
index a8d3a7c33927c2f652c1f0aa8c8a89b8c9003ab4..b2ac93b6d15dcef172d1ba190df7641526bf53cc 100644
--- a/MAC/GCF/TM/test/tGCFPort.cc
+++ b/MAC/GCF/TM/test/tGCFPort.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFPort.h b/MAC/GCF/TM/test/tGCFPort.h
index 3a434d19fe63456929da09f6e8e780581b97ee96..74cfedf63024d9e84fb6ad00cd89ddb9b529a05f 100644
--- a/MAC/GCF/TM/test/tGCFPort.h
+++ b/MAC/GCF/TM/test/tGCFPort.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask1.cc b/MAC/GCF/TM/test/tGCFTask1.cc
index 61e008162b81c4c82ea109e0b48bb17ef98da47b..fe7edb8119901315da0592ea3b4a601f56e3b38f 100644
--- a/MAC/GCF/TM/test/tGCFTask1.cc
+++ b/MAC/GCF/TM/test/tGCFTask1.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask2.cc b/MAC/GCF/TM/test/tGCFTask2.cc
index 756fe88bc4003d42d5ef9deda7c1764766009671..4064180033e11a7d462590c92c0e2a77caf6cf6a 100644
--- a/MAC/GCF/TM/test/tGCFTask2.cc
+++ b/MAC/GCF/TM/test/tGCFTask2.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask3.cc b/MAC/GCF/TM/test/tGCFTask3.cc
index b78d6d16b8802afc3338f45d1acb2a7026b437dc..e01b4cc27f3afe98ecd60b11ca87a95ac3db93e1 100644
--- a/MAC/GCF/TM/test/tGCFTask3.cc
+++ b/MAC/GCF/TM/test/tGCFTask3.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask4.cc b/MAC/GCF/TM/test/tGCFTask4.cc
index 957957c6833c3b1ae5d58e8bf0ccefbf2119174b..4a698464b3e2c301e0bcc41622f8d6cae716ff11 100644
--- a/MAC/GCF/TM/test/tGCFTask4.cc
+++ b/MAC/GCF/TM/test/tGCFTask4.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask5.cc b/MAC/GCF/TM/test/tGCFTask5.cc
index fa68599714699b61645400200fa5e08ca4317f37..a4aa8694db39c949f0849ccf93acd00b19c6b979 100644
--- a/MAC/GCF/TM/test/tGCFTask5.cc
+++ b/MAC/GCF/TM/test/tGCFTask5.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tITCPort.cc b/MAC/GCF/TM/test/tITCPort.cc
index f16c67398ae03a90dfff3a9e4ee95eb0162d7b52..d49ad07f9fcb2dfd32a5123d72c94ff2855a639e 100644
--- a/MAC/GCF/TM/test/tITCPort.cc
+++ b/MAC/GCF/TM/test/tITCPort.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2009
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tITCPort.h b/MAC/GCF/TM/test/tITCPort.h
index 92f3ae10bda6eaaed505bc7f0a4fd6c4f32eec30..24709b385e7c3fe65b8317e69c988365843403b5 100644
--- a/MAC/GCF/TM/test/tITCPort.h
+++ b/MAC/GCF/TM/test/tITCPort.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2009
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tPythonClient.cc b/MAC/GCF/TM/test/tPythonClient.cc
index eaedaf00b92095474604f23c414c587e876cc88e..4c9feeeda687fec1b2c8dbacc5cb688de37a1c4c 100644
--- a/MAC/GCF/TM/test/tPythonClient.cc
+++ b/MAC/GCF/TM/test/tPythonClient.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tPythonClient.h b/MAC/GCF/TM/test/tPythonClient.h
index abe29be4258de54ec55eace4fecb861eb1e63565..dc864f61b2c113f51f6e7cdbe0ccf1d709188479 100644
--- a/MAC/GCF/TM/test/tPythonClient.h
+++ b/MAC/GCF/TM/test/tPythonClient.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tPythonServer.cc b/MAC/GCF/TM/test/tPythonServer.cc
index a3062dc4c1e2bd3961f95a0140cd46eff47aefea..6a00d10669729e70af8102fe4714d8c500c68a74 100644
--- a/MAC/GCF/TM/test/tPythonServer.cc
+++ b/MAC/GCF/TM/test/tPythonServer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tPythonServer.h b/MAC/GCF/TM/test/tPythonServer.h
index 3d72ee09b470f6c78fb3256efb75a21222d46966..7ac017890c251007b8ec01b7c80a60a926bf76a2 100644
--- a/MAC/GCF/TM/test/tPythonServer.h
+++ b/MAC/GCF/TM/test/tPythonServer.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2009
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tServer.cc b/MAC/GCF/TM/test/tServer.cc
index 0c73dccedbbaf648ebc90bc01662d6b23606bf01..ed8b86dc3e69b4b480d4e196c5662696d85e32bb 100644
--- a/MAC/GCF/TM/test/tServer.cc
+++ b/MAC/GCF/TM/test/tServer.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2009
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tServer.h b/MAC/GCF/TM/test/tServer.h
index 8df307a4228177e892c26294e285fb6f1eac85c1..6a3f3eead7547726113420801a8506138dcdf8fc 100644
--- a/MAC/GCF/TM/test/tServer.h
+++ b/MAC/GCF/TM/test/tServer.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2009
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tStateResult.cc b/MAC/GCF/TM/test/tStateResult.cc
index 9eb4d036da0ae163dbb1b66c77bf38cbc9629ae9..b68904ed0b2383511ce47c2a820ddb1d1250471b 100644
--- a/MAC/GCF/TM/test/tStateResult.cc
+++ b/MAC/GCF/TM/test/tStateResult.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2009
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tStateResult.h b/MAC/GCF/TM/test/tStateResult.h
index 82062f7586c42b8beb88f465ba0070e9f84c3996..5205a0add3578ca06ef5e9a769c72463c68549b3 100644
--- a/MAC/GCF/TM/test/tStateResult.h
+++ b/MAC/GCF/TM/test/tStateResult.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tTimer.cc b/MAC/GCF/TM/test/tTimer.cc
index aef32b12ee275ad9321386bf2ca817011d38f472..88803298452cd66c7afa3b8f351f9397fd900ade 100644
--- a/MAC/GCF/TM/test/tTimer.cc
+++ b/MAC/GCF/TM/test/tTimer.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tTimer.h b/MAC/GCF/TM/test/tTimer.h
index 5a30a9a78e166a1b6a6b7b6d5ab064a82a8750b1..76df436eecc1f9ea493f89012963634c0ee61033 100644
--- a/MAC/GCF/TM/test/tTimer.h
+++ b/MAC/GCF/TM/test/tTimer.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2006
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/testTask.cc b/MAC/GCF/TM/test/testTask.cc
index 654dcd5a4ab88713b243a22693622ea0c1964866..3f40684578094b91537012c6a3d601b38b5c5b88 100644
--- a/MAC/GCF/TM/test/testTask.cc
+++ b/MAC/GCF/TM/test/testTask.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/testTask.h b/MAC/GCF/TM/test/testTask.h
index e96f56781b25c7b2560ba2c6bbed214a6c6f4f9c..4d573a98bdd6d6f6ce06e02c616c370b32d106b5 100644
--- a/MAC/GCF/TM/test/testTask.h
+++ b/MAC/GCF/TM/test/testTask.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcf-logging.ctl b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcf-logging.ctl
index 305ffc078ceb309b48cf4287cffa1414b102d4e9..ab33d07e4dc4d15f2972708fe11e5fe91a4af0b9 100644
--- a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcf-logging.ctl
+++ b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcf-logging.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl
index d882f1e91ffd5efcda295c1932e8816b2794166e..256979483f4ae01a0ee33a5eb59fa11472e265b7 100644
--- a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl
+++ b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl
index 34d1a585b964ceed7fe8cb174e8e33a0be729ce2..c3a513e4ac6a912f9703719f0992800057a8255b 100644
--- a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl
+++ b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl
index 7dd9aaadea587c028572e891609a286a1862c8af..ace00617577a8ed7810ecbcd9b29d719a59914b2 100644
--- a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl
+++ b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_Controller.cc b/MAC/GCF/_PAL/PA/src/GPA_Controller.cc
index f4c0ea0808fc4886875ebb64d31b254666f131d3..623ee8af29ef88069a842776c1943042d7486c0a 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_Controller.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_Controller.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_Controller.h b/MAC/GCF/_PAL/PA/src/GPA_Controller.h
index 36e0733e49678bb863240c6c1779713224a6c52e..38ef5d5a70583fc22efd5eddd50a8d059ab22791 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_Controller.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_Controller.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_Defines.h b/MAC/GCF/_PAL/PA/src/GPA_Defines.h
index 35f474c2944818357ae012a14e2f52cca0798e30..f454b7dfba7376d2fffe952b66a0929db650f264 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_Defines.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_Defines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_Main.cc b/MAC/GCF/_PAL/PA/src/GPA_Main.cc
index 040770b61b23c65a78c6385942cc189cc31e3213..9f10dc34effd5bec1e1e49dc68e836676c863808 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_Main.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_Main.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.cc b/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.cc
index 3c8660a18f6898dfc86bce285258b1e3c7e03f1c..1402815d5b9707183d5c055689f81fe95359a5c0 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.h b/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.h
index e6b41ab0ada1f6702b1186c6729e0220a9c04e18..3ce35dbf4cf868ab3a81777e464465d6c208541a 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_PropertySet.cc b/MAC/GCF/_PAL/PA/src/GPA_PropertySet.cc
index d3a5612a238cc631a68a3e9a8c86ea949135ce8f..fc376bd1c8ff4574e898c929adf6705a5ab76646 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_PropertySet.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_PropertySet.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_PropertySet.h b/MAC/GCF/_PAL/PA/src/GPA_PropertySet.h
index 061602ec1fb7d3c73ffb5dca3ebf05c98fbd1c80..1f4b193e9955fcc70f2368ea7ec06a54fbb5964a 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_PropertySet.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_PropertySet.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_RequestManager.cc b/MAC/GCF/_PAL/PA/src/GPA_RequestManager.cc
index a020af7deaa35cf33dbcdac933d7586b6fdb32fd..2b49ae563c60e4ba436f7beda4254e95e730f989 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_RequestManager.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_RequestManager.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_RequestManager.h b/MAC/GCF/_PAL/PA/src/GPA_RequestManager.h
index bc3e45aac0e1e7208934a3112aa37fcd49a63a77..368df633726ca8a64afc3226add88bc4b68c8a0d 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_RequestManager.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_RequestManager.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_CEPServer.cc b/MAC/GCF/_PAL/PI/src/GPI_CEPServer.cc
index 12877e9e29b99aa656d786221ee5434abfe8fe97..cc784c74ed53d45c73765265a6e00743b47a4e91 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_CEPServer.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_CEPServer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_CEPServer.h b/MAC/GCF/_PAL/PI/src/GPI_CEPServer.h
index eb4b32e28fa66f5d772dec41a9060521f7f28e25..6d3805ee33e6ae0ceadc0fcec75fcdc4dc80ec0f 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_CEPServer.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_CEPServer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_Controller.cc b/MAC/GCF/_PAL/PI/src/GPI_Controller.cc
index ffe0c6c5c37d159e28782861c0e517db353ad721..9d761cdaa85708df689645d820fc8bc898883456 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_Controller.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_Controller.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_Controller.h b/MAC/GCF/_PAL/PI/src/GPI_Controller.h
index 0e87e92b549ba4caa14d86dc1a725b05da7ba509..bd34065eadcece7f28d5b6e224d1047ecce267e9 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_Controller.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_Controller.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_Defines.h b/MAC/GCF/_PAL/PI/src/GPI_Defines.h
index 704d608284c0a932c895626e93b6f7ecd8a8f335..0819247bdab348a591475bf4abff6b48a1510d6a 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_Defines.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_Defines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_Main.cc b/MAC/GCF/_PAL/PI/src/GPI_Main.cc
index c76d31d07706a047187bb25176d641f982012db7..6ab46fe820062777aa070d98ac9537bfddf00642 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_Main.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_Main.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.cc b/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.cc
index 348ccdfd1568d8f830bf35514aea981b6bfdccfd..7294cec6a597ea031563b9b10048a425e6bee7c3 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.h b/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.h
index 71ada5f77dc713bd57918515053be53ebed18b80..10d03c2733530ffeb19ac7bc8371ee6e0342e66b 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.cc b/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.cc
index c8d33c1507656e30c07ae19f4f02e176a5a7b195..693f09887da31c92cc60370c7574c674b2dadb38 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.h b/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.h
index 0edb84a155392bce5b0644c1858387f3921e67e0..a6887bb94a84ae1db268867a486cd57d88174742 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PropertySet.cc b/MAC/GCF/_PAL/PI/src/GPI_PropertySet.cc
index 2d9a55e17498cfd90314849ef0e3f1b6cca40622..7412a8c6334d117d37576cae52082fde3958356d 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PropertySet.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_PropertySet.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PropertySet.h b/MAC/GCF/_PAL/PI/src/GPI_PropertySet.h
index 0fe6abf0ea9b698b7cbfca6a67de7dba4389439d..4cde456f2595d6603597a69e98640db96c2c2270 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PropertySet.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_PropertySet.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_RTCServer.cc b/MAC/GCF/_PAL/PI/src/GPI_RTCServer.cc
index 996c82d917ca9f85caf331150edbf522ae58ed9b..bb2b8dff6799243851d09c75384bab9209718ef2 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_RTCServer.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_RTCServer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_RTCServer.h b/MAC/GCF/_PAL/PI/src/GPI_RTCServer.h
index cf0583a0bba85144d221fe6bc819f3d99fccb210..56a5b8bd4bd4c7d2863ee33653186323c1d796c4 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_RTCServer.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_RTCServer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_TH_Port.cc b/MAC/GCF/_PAL/PI/src/GPI_TH_Port.cc
index c2630fd1c34e85b61c3dd8222991c05d82d1d335..8a6d4f4975267ffd33c215b084362d3e86f372d6 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_TH_Port.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_TH_Port.cc
@@ -2,7 +2,7 @@
//
// Copyright (C) 2000-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_TH_Port.h b/MAC/GCF/_PAL/PI/src/GPI_TH_Port.h
index a26aff04389cbaa165c88d8f45184766da0a3228..3aa13d74ec50631552cdfeb8c84257a4be1dc474 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_TH_Port.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_TH_Port.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2000, 2001
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_Answer.cc b/MAC/GCF/_PAL/PML/src/GCF_Answer.cc
index bbe181f16d109cd3b7349f5b63a637ce97db27c2..c726b798d7adf82c13acf0f18edadc307def4870 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_Answer.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_Answer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_ExtProperty.cc b/MAC/GCF/_PAL/PML/src/GCF_ExtProperty.cc
index 7bd8cb2bc5ae56ad488bff540f3a59f7a911d053..362465220c8d8446db5f73ffc9706eb52b19bbe3 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_ExtProperty.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_ExtProperty.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_ExtPropertySet.cc b/MAC/GCF/_PAL/PML/src/GCF_ExtPropertySet.cc
index c9a91f68a3a7e75dd0536bd7cd2162b0331f05d0..1d80cf86bf6efef23012082c4b66572b86f11d36 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_ExtPropertySet.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_ExtPropertySet.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_MyProperty.cc b/MAC/GCF/_PAL/PML/src/GCF_MyProperty.cc
index e53638373d4e74c20e6bd8655493119bd6196cec..eda7813f5d8d183678f2fe72d98192b474719cfb 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_MyProperty.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_MyProperty.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_MyPropertySet.cc b/MAC/GCF/_PAL/PML/src/GCF_MyPropertySet.cc
index 71a1fa53f86c458bdf1a8530dad3441aaa20a275..68aa264375cc3432bc30933d4b6dc58ef5721fca 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_MyPropertySet.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_MyPropertySet.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_Property.cc b/MAC/GCF/_PAL/PML/src/GCF_Property.cc
index c9b95b9c724bae9f949fa97bd29068a8d61a96fa..248d0fcda621e52046ef56fefb6c419b56e974a8 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_Property.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_Property.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_PropertyProxy.cc b/MAC/GCF/_PAL/PML/src/GCF_PropertyProxy.cc
index 378a29787095d1c782efc911fca5011313d94d01..d8be111e4203178e67b2c5e17fc1691e5c2f901b 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_PropertyProxy.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_PropertyProxy.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_PropertySet.cc b/MAC/GCF/_PAL/PML/src/GCF_PropertySet.cc
index 09bf345b069e24fe1503820cb7e5de86c8504fb3..581fa26556748726671dc76359fa25765d34ef33 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_PropertySet.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_PropertySet.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_PropertySetAnswer.cc b/MAC/GCF/_PAL/PML/src/GCF_PropertySetAnswer.cc
index 984acb8eef87d0abaf0dc5b15a8211671fd5daa2..26b1c6682b361dd42415b01637cada45d2cfcfac 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_PropertySetAnswer.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_PropertySetAnswer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_Controller.cc b/MAC/GCF/_PAL/PML/src/GPM_Controller.cc
index d40ee4bf2d391e08b0f99a8afb881674578c3409..b3c43cac3c8f50cb019769f1887c4b17f38bb38b 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_Controller.cc
+++ b/MAC/GCF/_PAL/PML/src/GPM_Controller.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_Controller.h b/MAC/GCF/_PAL/PML/src/GPM_Controller.h
index 3a1c42154c5d37cacedf8de9d0b6830ade842045..895194089f546b2ae4c33b5f26e33e038549e2f2 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_Controller.h
+++ b/MAC/GCF/_PAL/PML/src/GPM_Controller.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_Defines.h b/MAC/GCF/_PAL/PML/src/GPM_Defines.h
index 96654957347686a5bc33bcc4af09006a47b8d432..62e77195fb4a5c0c9aa6b1d6b91696703895dff5 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_Defines.h
+++ b/MAC/GCF/_PAL/PML/src/GPM_Defines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_PropertyProxy.h b/MAC/GCF/_PAL/PML/src/GPM_PropertyProxy.h
index 269c25b03d32dd3598140b77f7a45a0687104fdd..0122207b7bc9baffe3c3a279305b43ef8312388d 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_PropertyProxy.h
+++ b/MAC/GCF/_PAL/PML/src/GPM_PropertyProxy.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_PropertyService.cc b/MAC/GCF/_PAL/PML/src/GPM_PropertyService.cc
index aae037612126c1b454266844ba1dc581fc38efdf..7ce0185819263cbb6b2d2920f511f82d66e4a346 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_PropertyService.cc
+++ b/MAC/GCF/_PAL/PML/src/GPM_PropertyService.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_PropertyService.h b/MAC/GCF/_PAL/PML/src/GPM_PropertyService.h
index 09e566257c917a964ff96443c2421c66157fbf5b..7a328c41d52ba7d13439607d8ec6de41bec7780c 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_PropertyService.h
+++ b/MAC/GCF/_PAL/PML/src/GPM_PropertyService.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/GSA_Defines.h b/MAC/GCF/_PAL/PML/test/GSA_Defines.h
index bf4d73ec3ce0d35e48cd5787e73c67e3e31fc7c6..8a32384ca5cd31fcdc790775f166f065eccbef9c 100644
--- a/MAC/GCF/_PAL/PML/test/GSA_Defines.h
+++ b/MAC/GCF/_PAL/PML/test/GSA_Defines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/GSA_Service.h b/MAC/GCF/_PAL/PML/test/GSA_Service.h
index 2d1e205cc56dc2e9183a34da71f20b1dab619406..e7b9edf3cddcf4764097f9039a15041b9d934b3e 100644
--- a/MAC/GCF/_PAL/PML/test/GSA_Service.h
+++ b/MAC/GCF/_PAL/PML/test/GSA_Service.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/PerformanceService.h b/MAC/GCF/_PAL/PML/test/PerformanceService.h
index 029c6a7521ad445b679f4990f9555913fc148006..c4e85e6b23dd553e16fbcdd8f3b1b8d83fdbcdc3 100644
--- a/MAC/GCF/_PAL/PML/test/PerformanceService.h
+++ b/MAC/GCF/_PAL/PML/test/PerformanceService.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/tPAPerformance.cc b/MAC/GCF/_PAL/PML/test/tPAPerformance.cc
index 1008b17fd694ce18ebd6b11bba335b79dd688b4b..888afd333eb73e5a1b5a52b24b897164b302d60c 100644
--- a/MAC/GCF/_PAL/PML/test/tPAPerformance.cc
+++ b/MAC/GCF/_PAL/PML/test/tPAPerformance.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/tPAPerformance.h b/MAC/GCF/_PAL/PML/test/tPAPerformance.h
index 9f442d89d468401b17a27d1dda32053faee5a8b1..09540afbc0e4f91ac862e82a5436abce2ad12368 100644
--- a/MAC/GCF/_PAL/PML/test/tPAPerformance.h
+++ b/MAC/GCF/_PAL/PML/test/tPAPerformance.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc b/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc
index 9bdbe47a5183cfca26c993b539a669fd962a96bd..690d64c1c74c0928e21b8594c7f65b3afe3a513c 100644
--- a/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc
+++ b/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GCF_PVSSPort.cc b/MAC/GCF/_PAL/SAL/src/GCF_PVSSPort.cc
index 6e77b9d8f0303670aca0c562beb22031d4d09a5f..e23c8c56d073889df5ae02d65bed831ee60a64b0 100644
--- a/MAC/GCF/_PAL/SAL/src/GCF_PVSSPort.cc
+++ b/MAC/GCF/_PAL/SAL/src/GCF_PVSSPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GCF_SysConnGuard.cc b/MAC/GCF/_PAL/SAL/src/GCF_SysConnGuard.cc
index bed05b2853fe0fb412351975434812a350059632..4e49301fa055700f37ba03383da550ae20f5ffc7 100644
--- a/MAC/GCF/_PAL/SAL/src/GCF_SysConnGuard.cc
+++ b/MAC/GCF/_PAL/SAL/src/GCF_SysConnGuard.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Defines.h b/MAC/GCF/_PAL/SAL/src/GSA_Defines.h
index bf4d73ec3ce0d35e48cd5787e73c67e3e31fc7c6..8a32384ca5cd31fcdc790775f166f065eccbef9c 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Defines.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Defines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_PortService.cc b/MAC/GCF/_PAL/SAL/src/GSA_PortService.cc
index 84c6a3d8a11070229db7a5763f9a0d34e5615e24..d5a6380b9cd2698ed3b2ddd5aaca104538479082 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_PortService.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_PortService.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_PortService.h b/MAC/GCF/_PAL/SAL/src/GSA_PortService.h
index 6d9e2a526141dba01ac794d1a22023ba441bc5bf..7bfa0af03d10a181eb48c25ea8e99d9e74d446b9 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_PortService.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_PortService.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.cc b/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.cc
index 24036907d5f2fae0f98b6d018306617daf95079f..a9acde31fb03cf29039f9c3b86a01cecceaa5e8a 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.h b/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.h
index 3f590e2af5f84967d0844fede6063cdfcc55ea74..1cd9c60c91e447d9a452ec0f9d43cc93fe6c48ca 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Resources.cc b/MAC/GCF/_PAL/SAL/src/GSA_Resources.cc
index 6a588f69737eb2a92f065fa4d67cf16d54612448..87e76cabb6bb1d49cb1c0e1e6e333ce37bb902a5 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Resources.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Resources.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Resources.h b/MAC/GCF/_PAL/SAL/src/GSA_Resources.h
index 351f3776d45fef7c653323f0cbb26f194b50aa5b..281c2e6fd9c704772dbc61fe0eebf59155277705 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Resources.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Resources.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc
index a714af0d137f1a879fc89e05cc639bf803404d74..792aa16f53be0b48a95b9ce37a84adba6694825d 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.h b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.h
index d737f385a4069130918d489d2a70d6dd00a7f76a..82a0d44b715fc0e37fe6804676c1f25251701e62 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Service.cc b/MAC/GCF/_PAL/SAL/src/GSA_Service.cc
index a46fd1358ac532ee9267cd24186a5a7f9bf650f2..f7e65167a33b599ff7ac978b4cab717cae7d5c08 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Service.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Service.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Service.h b/MAC/GCF/_PAL/SAL/src/GSA_Service.h
index 2d1e205cc56dc2e9183a34da71f20b1dab619406..e7b9edf3cddcf4764097f9039a15041b9d934b3e 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Service.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Service.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.cc b/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.cc
index 31100d30e542f40e32d44b49cbec61528cfeeff4..5bfabcbaefbbdff091511ddc2cc933c332170ba9 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.h b/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.h
index 59e28e3780fdde7c285d498aa2c950b7bdd51e36..4aa6fbbff38e7bb872f5af92cbcbc93a4482139e 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.cc b/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.cc
index 5f70eaa6d9a77bf86f782319fc5ccb19be217da7..0fc4eb3bef3a966bfd369317409c2373613fca2c 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.h b/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.h
index 849a6910c9efd5feea3e2e1a8a2ae09b1d21d2dc..54645e8cb6e1a773852349322f8f309136f5f961 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Echo.cc b/MAC/GCF/_PAL/SAL/test/Echo.cc
index bf4a940ede2b6d695515e7cbd62bd7ab26f17532..67a765471beb8635cdba6d80e2d7795d7e44a1dc 100644
--- a/MAC/GCF/_PAL/SAL/test/Echo.cc
+++ b/MAC/GCF/_PAL/SAL/test/Echo.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Echo.h b/MAC/GCF/_PAL/SAL/test/Echo.h
index 80bb99a6b2ef028bf1b9ebbb1cbc564ea7299d04..d9ebbfdd1d3bd46c599fb09ac0e573f251cc02a4 100644
--- a/MAC/GCF/_PAL/SAL/test/Echo.h
+++ b/MAC/GCF/_PAL/SAL/test/Echo.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/PerformanceService.h b/MAC/GCF/_PAL/SAL/test/PerformanceService.h
index fe37d3342c4f22014bb2df2c3311ffb823f69221..9df3363364642295ef3e12dbd840b2980c83821d 100644
--- a/MAC/GCF/_PAL/SAL/test/PerformanceService.h
+++ b/MAC/GCF/_PAL/SAL/test/PerformanceService.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Ping.cc b/MAC/GCF/_PAL/SAL/test/Ping.cc
index 09a53348220408bcd9a649ddaa122906325f71d8..0091b62f22bc40a2e4c0513fb4730638a9b077c6 100644
--- a/MAC/GCF/_PAL/SAL/test/Ping.cc
+++ b/MAC/GCF/_PAL/SAL/test/Ping.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Ping.h b/MAC/GCF/_PAL/SAL/test/Ping.h
index 3295a8289417abea27cf30accaf41a7b4096285f..8921b580de09184edc446131bec559011bedfb59 100644
--- a/MAC/GCF/_PAL/SAL/test/Ping.h
+++ b/MAC/GCF/_PAL/SAL/test/Ping.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Service.h b/MAC/GCF/_PAL/SAL/test/Service.h
index 0d381e22e07ae0bad1800ecb146cd385c1aec692..8db90797e632f938e742197bc26b9a4e59d57c8f 100644
--- a/MAC/GCF/_PAL/SAL/test/Service.h
+++ b/MAC/GCF/_PAL/SAL/test/Service.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/tGSAPerformance.cc b/MAC/GCF/_PAL/SAL/test/tGSAPerformance.cc
index 07c3a65db45483d7fea694fa7734e9901cbe1873..752a7774b4d6302ad372ec8fcd1da2b56cbdd512 100644
--- a/MAC/GCF/_PAL/SAL/test/tGSAPerformance.cc
+++ b/MAC/GCF/_PAL/SAL/test/tGSAPerformance.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2007
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/tGSAPerformance.h b/MAC/GCF/_PAL/SAL/test/tGSAPerformance.h
index c03a66369742c2ddf8b392b8e416fad4870ca17e..e4eeef8ff14bc4b283cda0ece8f51a680bbaca95 100644
--- a/MAC/GCF/_PAL/SAL/test/tGSAPerformance.h
+++ b/MAC/GCF/_PAL/SAL/test/tGSAPerformance.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/tGSAService.cc b/MAC/GCF/_PAL/SAL/test/tGSAService.cc
index 3af00736a845c38c8ddd6ef12378f739bf021691..c76c82ce8cf13b724aaed9e5ebf2c071765cdc4c 100644
--- a/MAC/GCF/_PAL/SAL/test/tGSAService.cc
+++ b/MAC/GCF/_PAL/SAL/test/tGSAService.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/tGSAService.h b/MAC/GCF/_PAL/SAL/test/tGSAService.h
index 620efdb44b389a11b54f754e34a121ae1e37d07a..a8c1b226b1b21754eb8932028665d82d2718fa2f 100644
--- a/MAC/GCF/_PAL/SAL/test/tGSAService.h
+++ b/MAC/GCF/_PAL/SAL/test/tGSAService.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_Answer.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_Answer.h
index d74e73d6a35b828d92a43e4303a4a907e9c579d5..920a434353dce0e73c22644218c6e7a4066f9a17 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_Answer.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_Answer.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtProperty.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtProperty.h
index f25691fcfcfc6d0d7cdec158559906a44c955895..2b220b174c2c822e69d51855c2fb3ecb38fa71d0 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtProperty.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtProperty.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtPropertySet.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtPropertySet.h
index 3ed2b3f69fca4feda6bf6be37d6edf742bccdc0c..df4f3ad3b016a91f96196ef88947cccfc3ffd4b1 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtPropertySet.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtPropertySet.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyProperty.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyProperty.h
index 8f42d05f0a9fb5157c31500530fbdbe3cff5cbf9..07278f55619454afa1972dc0a898512465297273 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyProperty.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyProperty.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyPropertySet.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyPropertySet.h
index 52e12bbe012b8b219746dfc184bc1151051d8918..f36d035ee2f032e7e327c86f22314741caadc9ce 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyPropertySet.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyPropertySet.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSInfo.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSInfo.h
index 2eac5a36a628ad56f5200366efcf4f709f3add28..74effb0d3430587270c91f43ee5946b71ac8c744 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSInfo.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSInfo.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSPort.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSPort.h
index 1badcc5e160e57ba555f836e17465966c9280264..bba53570edb392346ca5cb6be7cb5d9c3ace6dc9 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSPort.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_Property.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_Property.h
index 4725ff8890189abdb8bb21ce503abef54f2b524c..dfae9b5ffa0b06ff98f3d9adbb3a0d3b796ab711 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_Property.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_Property.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertyProxy.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertyProxy.h
index e677e47c990730f732a5bea5e471bea129dabfc4..5e58c4fd2b035470c04038ff28329471b13f586b 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertyProxy.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertyProxy.h
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySet.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySet.h
index 406dc95599fbfb6faf86efc2e6087e133a93c838..5f59473197a4a43bdcf77277f0f0d7c912f58ac6 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySet.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySet.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswer.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswer.h
index 519f642459bc61e6e1bdeadac93ac15c5a63f04c..3155ba70ffaa550a1cee998651f729b425c10cdb 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswer.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswerHandlerInterface.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswerHandlerInterface.h
index 67ca101102c3c1042eb0cb3425ba59995900cf2c..a2a422ccb37a525ded8622e828c1e0f9c5ce36ab 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswerHandlerInterface.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswerHandlerInterface.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_SysConnGuard.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_SysConnGuard.h
index 5625bf31438dc9506c92ab344b46be1ef224af8d..88640e47bb9a6c7e45ab7ba28776bada79115414 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_SysConnGuard.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_SysConnGuard.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPProperty.cc b/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPProperty.cc
index e3e02bcb508abc0a42a002c33d2fa5ac6f76da14..e48566c03b99d66ca6b4a057fe943a8424ea72e4 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPProperty.cc
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPProperty.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPPropertySet.cc b/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPPropertySet.cc
index 627fe1ce5b29d2215900f8c02d6726143866b42f..7ab2473dde1a96c9cfe33c4d4f659554b08ee478 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPPropertySet.cc
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPPropertySet.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/PICEPDefines.h b/MAC/GCF/_PALlight/CEP-PMLlight/src/PICEPDefines.h
index d619244ddcf884759490b51f2df0faa80af46fca..dcdd5a286bd09c9ddde92699256644df6e18ea8b 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/PICEPDefines.h
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/PICEPDefines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc
index 9cd37b75925607e6f80595eefa16d94da75fbe07..4416e9041dc7b56dce8f787c4fe963a3e539f39d 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.h b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.h
index 2271afa17845567cae896130db569616039d4ee0..c248d56c3d3b3e8dcd0ba7e0a9d5c65ad975ca6d 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.h
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTAnswer.cc b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTAnswer.cc
index 10f87ef3544bb762f72c7c56c0d39ea9faf9afcc..bd9e1ce70e22970ff43874957a912f1d4ef773f2 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTAnswer.cc
+++ b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTAnswer.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyProperty.cc b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyProperty.cc
index dd01c9a1b20885caaea8454731731e90dc1ecb54..cf993de516af58f04b291ccd6bcca57050743213 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyProperty.cc
+++ b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyProperty.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyPropertySet.cc b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyPropertySet.cc
index b3ef8906423075af59ce5e743110299e717e835a..c0d9a4b105b8772148eb97c0bd0b8f86f97e5ac4 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyPropertySet.cc
+++ b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyPropertySet.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc
index c7552263aad5e3388e2ef9ce8a22d010a577da5a..3a58adaab41f411001dbf119de0e218e59e23af8 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc
+++ b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.h b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.h
index 1ff8e3ac5ad17c6e10567db2572a47b4c5a7bbd7..18aef6dba1374ea4881bd78df7df10c8e056d76c 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.h
+++ b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.h
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTDefines.h b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTDefines.h
index 80bf922df4daa915965f173479eb3c29fd5d8f05..82ffce69f1606564d3c774a510a589526cc80eca 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTDefines.h
+++ b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTDefines.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/CEPProperty.h b/MAC/GCF/_PALlight/include/GCF/PALlight/CEPProperty.h
index 7cc2ca8fdaf99ba8a6e00e46061c5c373a92f020..7ae4d036575bb991af7e3db919fa02b60471eeab 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/CEPProperty.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/CEPProperty.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/CEPPropertySet.h b/MAC/GCF/_PALlight/include/GCF/PALlight/CEPPropertySet.h
index 0b4ec365148eec37a5e9f3d7f0bb433f7a0d6e49..48c7d5fada9c19400f50eb5802e8752ff567da8e 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/CEPPropertySet.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/CEPPropertySet.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTAnswer.h b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTAnswer.h
index eb6ad33388301c799e3571bf1d53a516a3bdbff1..6de799167be95b00bb04016f460c3b681908a42b 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTAnswer.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTAnswer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyProperty.h b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyProperty.h
index 53d2ba62e1f1c196859c6fffaa3af22e2492c1ae..d9a4361f77310ab5c0afafe2d3707f7f0808c4af 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyProperty.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyProperty.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyPropertySet.h b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyPropertySet.h
index a9ca98617ed37820640ec7f050efad00467d759d..ee1c23afb0669f17c97fae8eb52bb9162c3ceaa5 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyPropertySet.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyPropertySet.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/autogen/MACIO.py b/MAC/MACIO/autogen/MACIO.py
index 7c564ecceee14d7220d3a485a4912c1be494b38b..b9597dbe09535e449f8d65dca60e0e075d2c1aa5 100644
--- a/MAC/MACIO/autogen/MACIO.py
+++ b/MAC/MACIO/autogen/MACIO.py
@@ -5,7 +5,7 @@
#
# Copyright (C) 2013
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
# This program is free software: you can redistribute it and/or modify it
diff --git a/MAC/MACIO/autogen/protocol.tpl b/MAC/MACIO/autogen/protocol.tpl
index 53fc8104c5af9b728dcc68b2c249331b06463315..763352f1284df120094ebe305655a0322fec90af 100644
--- a/MAC/MACIO/autogen/protocol.tpl
+++ b/MAC/MACIO/autogen/protocol.tpl
@@ -21,7 +21,7 @@
//
// Copyright (C) 2003-2012
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
[+ IF (== autogen-version "5.12") +]
// [+ (lgpl "This program" "ASTRON" "// ") +]
diff --git a/MAC/MACIO/autogen/pytocol.tpl b/MAC/MACIO/autogen/pytocol.tpl
index 95862d011361c0b03885dd7626e21bdac253d90c..0f4959a6757fda002f5a6e31e282fccb8203e5c8 100644
--- a/MAC/MACIO/autogen/pytocol.tpl
+++ b/MAC/MACIO/autogen/pytocol.tpl
@@ -8,7 +8,7 @@
#
# Copyright (C) 2003-2013
# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
#
[+ IF (== autogen-version "5.12") +]
# [+ (lgpl "This program" "ASTRON" "# ") +]
diff --git a/MAC/MACIO/include/MACIO/DoubleVector.h b/MAC/MACIO/include/MACIO/DoubleVector.h
index 136f956682051c4936032ba1f78109b33a13d6f3..f3ef5c4752811c33a999a64c14e4c8cd68ac2701 100644
--- a/MAC/MACIO/include/MACIO/DoubleVector.h
+++ b/MAC/MACIO/include/MACIO/DoubleVector.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/EventPort.h b/MAC/MACIO/include/MACIO/EventPort.h
index ec8ba7ef31c1459da7c3163fdce884dbaf031b9b..307ecf5909b252dacde286786ddba626bf11b202 100644
--- a/MAC/MACIO/include/MACIO/EventPort.h
+++ b/MAC/MACIO/include/MACIO/EventPort.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/GCF_Event.h b/MAC/MACIO/include/MACIO/GCF_Event.h
index aa472cf22127798141ed603240bd9149a1e37ac0..e084f8784c4b61e8f7462a9586128bcd368e33b7 100644
--- a/MAC/MACIO/include/MACIO/GCF_Event.h
+++ b/MAC/MACIO/include/MACIO/GCF_Event.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/KVTLogger.h b/MAC/MACIO/include/MACIO/KVTLogger.h
index 6a2cc363ab248074aaad83501a8b7c3be9aa05e2..6b099b919941bf854209a754aec97f045f175be7 100644
--- a/MAC/MACIO/include/MACIO/KVTLogger.h
+++ b/MAC/MACIO/include/MACIO/KVTLogger.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/MACServiceInfo.h b/MAC/MACIO/include/MACIO/MACServiceInfo.h
index 247d8bc57c56f6a2894788f3b01fe038c732b650..04ee0d70a05c9f07f1406cd8375fbf7fa4760314 100644
--- a/MAC/MACIO/include/MACIO/MACServiceInfo.h
+++ b/MAC/MACIO/include/MACIO/MACServiceInfo.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/Marshalling.tcc b/MAC/MACIO/include/MACIO/Marshalling.tcc
index ad0d9321aa9a6547bc9cd1cd45798a589b85fb2f..0e8b571c28a1ef481c285815da4be08f60c94656 100644
--- a/MAC/MACIO/include/MACIO/Marshalling.tcc
+++ b/MAC/MACIO/include/MACIO/Marshalling.tcc
@@ -4,7 +4,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/ProtocolDefs.h b/MAC/MACIO/include/MACIO/ProtocolDefs.h
index ea155c1b8be847cc12bbc9ae5e581d153803958a..2415a79553399e0677f5442d0d4fab43686c68b9 100644
--- a/MAC/MACIO/include/MACIO/ProtocolDefs.h
+++ b/MAC/MACIO/include/MACIO/ProtocolDefs.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/RTmetadata.h b/MAC/MACIO/include/MACIO/RTmetadata.h
index 096851cfbc0a350d5c1b716d826b2dac9f9514b2..de776587deb802b3ee0f892cb8257c7234e4f952 100644
--- a/MAC/MACIO/include/MACIO/RTmetadata.h
+++ b/MAC/MACIO/include/MACIO/RTmetadata.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2013-2014
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/StringVector.h b/MAC/MACIO/include/MACIO/StringVector.h
index 26a7e4f01ad8ed33f958c1612f38908af469aa72..15dd7e5c49efbe39678f545465739478982acfbf 100644
--- a/MAC/MACIO/include/MACIO/StringVector.h
+++ b/MAC/MACIO/include/MACIO/StringVector.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/EventPort.cc b/MAC/MACIO/src/EventPort.cc
index 5a902c13fd6b65db5c0f23fedbbb653604b5506d..fceda40f61fc535ac35b00cb4bea62972ff8d65d 100644
--- a/MAC/MACIO/src/EventPort.cc
+++ b/MAC/MACIO/src/EventPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/GCF_Event.cc b/MAC/MACIO/src/GCF_Event.cc
index 6cbef362f9dd659d9d5229376efab014ddc4438c..4198d9d7f64bcd62eb40e29a8a05bc76be4564a3 100644
--- a/MAC/MACIO/src/GCF_Event.cc
+++ b/MAC/MACIO/src/GCF_Event.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/KVTLogger.cc b/MAC/MACIO/src/KVTLogger.cc
index 52a16853562b164779d32fc17996217c6f37ff55..5c1620b6ee73f69bf51e88b1ce00a6ee1fe50ad2 100644
--- a/MAC/MACIO/src/KVTLogger.cc
+++ b/MAC/MACIO/src/KVTLogger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/KVT_Protocol.prot b/MAC/MACIO/src/KVT_Protocol.prot
index fc36ccbb2e83de9d8ce624ae68bc24bcb9157109..d2540563858871e6220df36dc5fb21fb479b9265 100644
--- a/MAC/MACIO/src/KVT_Protocol.prot
+++ b/MAC/MACIO/src/KVT_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/LOG_Protocol.prot b/MAC/MACIO/src/LOG_Protocol.prot
index db42271361a8adf789a1d7209585f6c94e139e13..ecc1891b83d2c27a9933b7ca9ba6b5462afe2d43 100644
--- a/MAC/MACIO/src/LOG_Protocol.prot
+++ b/MAC/MACIO/src/LOG_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/ProtocolDefs.cc b/MAC/MACIO/src/ProtocolDefs.cc
index f8aef9fceba832a9d90fb64e7b963c99c3083ff5..85c13e27c2edc59891e86a53c9bf47cb8dc2f70d 100644
--- a/MAC/MACIO/src/ProtocolDefs.cc
+++ b/MAC/MACIO/src/ProtocolDefs.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/RTmetadata.cc b/MAC/MACIO/src/RTmetadata.cc
index 36d92d0cc10121904207bf1abc465c0e7fa6d707..12bbeb7f8d241634da5b4e9bb89faf0783edbc6a 100644
--- a/MAC/MACIO/src/RTmetadata.cc
+++ b/MAC/MACIO/src/RTmetadata.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2013-2014
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/SB_Protocol.prot b/MAC/MACIO/src/SB_Protocol.prot
index ecb81edda5d86d4b254522e290d240ea806cc149..dcabca365c126070ad3b04943a774e4afed6ef7d 100644
--- a/MAC/MACIO/src/SB_Protocol.prot
+++ b/MAC/MACIO/src/SB_Protocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tClone.cc b/MAC/MACIO/test/tClone.cc
index 3cf69d07ce775cec11b92d337cfde122c2def11a..f8ed9a1400931b1e7c03ec164e05b6c869b69f2d 100644
--- a/MAC/MACIO/test/tClone.cc
+++ b/MAC/MACIO/test/tClone.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2009
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tEventPort.cc b/MAC/MACIO/test/tEventPort.cc
index 458d8170b22ae9756fc9bd1bda352f2f8e9f4677..6c95d91665ae6f8b4ea88d747e37f0d9011ec119 100644
--- a/MAC/MACIO/test/tEventPort.cc
+++ b/MAC/MACIO/test/tEventPort.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tKVTLogger.cc b/MAC/MACIO/test/tKVTLogger.cc
index 63f078e4a02230d49ef5bb6dda6f8c65baae5d6c..0c9d64fcb504a821152141a364aadfc64bbfc27a 100644
--- a/MAC/MACIO/test/tKVTLogger.cc
+++ b/MAC/MACIO/test/tKVTLogger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tMarshalling.cc b/MAC/MACIO/test/tMarshalling.cc
index 6eae8e24c21789addd677802c8f3d1e05fb62cc6..013bfe578a92e7b8b11887a35a242753d89d8268 100644
--- a/MAC/MACIO/test/tMarshalling.cc
+++ b/MAC/MACIO/test/tMarshalling.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tMarshalling.h b/MAC/MACIO/test/tMarshalling.h
index 89ff7e5cb46a629c6b5a311c242b1d4ce74e961d..306ca88a4be911793daaa1b2c582cf0497f9e4cb 100644
--- a/MAC/MACIO/test/tMarshalling.h
+++ b/MAC/MACIO/test/tMarshalling.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tProtocol.cc b/MAC/MACIO/test/tProtocol.cc
index a90d2b7d1c076134a4f3bb1ee1fd0c3a17b6db7a..56423b0e39c463410ec00ed3ca16e76822bff45e 100644
--- a/MAC/MACIO/test/tProtocol.cc
+++ b/MAC/MACIO/test/tProtocol.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tRTmetadata.cc b/MAC/MACIO/test/tRTmetadata.cc
index e3c76618ed9e8cc13dbd63ced9ecdc85ddaf8aaf..75c0ee654671542ae7d78ba209b3611eb80110b4 100644
--- a/MAC/MACIO/test/tRTmetadata.cc
+++ b/MAC/MACIO/test/tRTmetadata.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2014
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/testprotocol.prot b/MAC/MACIO/test/testprotocol.prot
index fab32b28692fee7f0c1a05bd7765d215592d9d24..2e35d66c2117ffe27f56c93b505798277ba7a613 100644
--- a/MAC/MACIO/test/testprotocol.prot
+++ b/MAC/MACIO/test/testprotocol.prot
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/panels/Processes/CEP_Processes.pnl b/MAC/Navigator2/panels/Processes/CEP_Processes.pnl
index a31fb736a5ac03117ab6a072b7c7435289621a86..5b6da885cdb4a6512c515eb0751a891ccf66a1bc 100644
--- a/MAC/Navigator2/panels/Processes/CEP_Processes.pnl
+++ b/MAC/Navigator2/panels/Processes/CEP_Processes.pnl
@@ -187,41 +187,31 @@ LANG:1 6 logMsg
0
1 183 39 "" 48
0
-1 184 39 "15" 4
+1 184 39 "" 113
0
-1 185 39 "15" 3
+1 185 39 "" 144
0
-1 186 39 "15.0" 1
+1 186 39 "" 166
0
-1 187 39 "15" 6
+1 187 39 "16" 4
0
-1 188 39 "15" 2
+1 188 39 "16" 3
0
-1 189 39 "" 113
+1 189 39 "16.0" 1
0
-1 190 39 "" 144
+1 190 39 "16" 6
0
-1 191 39 "" 166
+1 191 39 "16" 2
0
-1 192 39 "16" 4
+1 192 40 "" 4
0
-1 193 39 "16" 3
+1 193 40 "" 3
0
-1 194 39 "16.0" 1
+1 194 40 "0" 1
0
-1 195 39 "16" 6
+1 195 40 "" 2
0
-1 196 39 "16" 2
-0
-1 197 40 "" 4
-0
-1 198 40 "" 3
-0
-1 199 40 "0" 1
-0
-1 200 40 "" 2
-0
-1 201 40 "" 6
+1 196 40 "" 6
0
2 155
"PRIMITIVE_TEXT2"
@@ -299,35 +289,35 @@ E E 0 1 1 2 1 E U 1 E 417 251 451 264
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
LANG:1 6 logMsg
-1 202 41 "" 4
+1 197 41 "" 4
0
-1 203 41 "" 3
+1 198 41 "" 3
0
-1 204 41 "0" 1
+1 199 41 "0" 1
0
-1 205 41 "" 2
+1 200 41 "" 2
0
-1 206 41 "" 6
+1 201 41 "" 6
0
-1 207 42 "" 4
+1 207 43 "" 4
0
-1 208 42 "" 3
+1 208 43 "" 3
0
-1 209 42 "0" 1
+1 209 43 "0" 1
0
-1 210 42 "" 2
+1 210 43 "" 2
0
-1 211 42 "" 6
+1 211 43 "" 6
0
-1 212 43 "" 4
+1 212 44 "" 4
0
-1 213 43 "" 3
+1 213 44 "" 3
0
-1 214 43 "0" 1
+1 214 44 "0" 1
0
-1 215 43 "" 6
+1 215 44 "" 2
0
-1 216 43 "" 2
+1 216 44 "" 6
0
0
LAYER, 1
@@ -359,7 +349,7 @@ LAYER, 7
LANG:1 0
0
3 13 "PANEL_REF14" -1
-"objects\\Processes\\daemon_small.pnl" 0 40 T 16 1 0 1 0 -10
+"objects\\Processes\\daemon_small.pnl" 0 40 T 16 1 0 1 0 20
1
"$name""LogProcessor"
3 14 "PANEL_REF15" -1
@@ -382,15 +372,15 @@ LANG:1 0
1
"$name""CEPHardwareMonitor"
3 41 "PANEL_REF42" -1
-"objects\\Processes\\controller_small.pnl" 0 280 T 55 1 0 1 0 15
+"objects\\Processes\\controller_small.pnl" 0 280 T 55 1 0 1 0 20
1
"$name""SoftwareMonitor"
-3 42 "PANEL_REF42" -1
-"objects\\Processes\\daemon_small.pnl" 0 40 T 55 1 0 1 0 20
-1
-"$name""CEPlogProcessor"
3 43 "PANEL_REF43" -1
"objects\\Processes\\daemon_small.pnl" 0 140 T 55 1 0 1 0 44
1
"$name""PVSSGateway"
+3 44 "PANEL_REF44" -1
+"objects\\Processes\\daemon_small.pnl" 0 40 T 55 1 0 1 0 -10
+1
+"$name""MessageRouter"
0
diff --git a/MAC/Navigator2/panels/Processes/MainCU_Processes.pnl b/MAC/Navigator2/panels/Processes/MainCU_Processes.pnl
index ba0b8fe6876ba2eb3a1922b777f2a50e667f6603..d786453f2c2ec1b042432c942ccd57469c4b31bd 100644
--- a/MAC/Navigator2/panels/Processes/MainCU_Processes.pnl
+++ b/MAC/Navigator2/panels/Processes/MainCU_Processes.pnl
@@ -82,7 +82,7 @@ LANG:1 7 Daemons
2 37
"PRIMITIVE_TEXT2"
""
-1 370 186 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 370 242 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
6 0 0 0 0 0
E E E
@@ -92,8 +92,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 370 186 439 206
-0 2 2 "0s" 0 0 0 192 0 0 370 186 1
+E E 0 1 1 2 1 E U 1 E 370 242 439 262
+0 2 2 "0s" 0 0 0 192 0 0 370 242 1
1
LANG:1 33 MS Shell Dlg,-1,16,5,75,0,0,0,0,0
0 1
@@ -120,77 +120,67 @@ LANG:1 6 PermSW
0
1 147 12 "14" 2
0
-1 148 12 "15" 4
+1 148 12 "17" 4
0
-1 149 12 "15" 3
+1 149 12 "17" 3
0
-1 150 12 "15.0" 1
+1 150 12 "17.0" 1
0
-1 151 12 "15" 6
+1 151 12 "17" 6
0
-1 152 12 "15" 2
+1 152 12 "17" 2
0
-1 153 12 "17" 4
+1 153 12 "18" 4
0
-1 154 12 "17" 3
+1 154 12 "18" 3
0
-1 155 12 "17.0" 1
+1 155 12 "18.0" 1
0
-1 156 12 "17" 6
+1 156 12 "18" 6
0
-1 157 12 "17" 2
+1 157 12 "18" 2
0
-1 158 12 "18" 4
+1 158 12 "19" 4
0
-1 159 12 "18" 3
+1 159 12 "19" 3
0
-1 160 12 "18.0" 1
+1 160 12 "19.0" 1
0
-1 161 12 "18" 6
+1 161 12 "19" 6
0
-1 162 12 "18" 2
+1 162 12 "19" 2
0
-1 163 12 "19" 4
+1 163 12 "" 79
0
-1 164 12 "19" 3
+1 164 12 "" 80
0
-1 165 12 "19.0" 1
+1 165 12 "" 82
0
-1 166 12 "19" 6
+1 166 12 "" 113
0
-1 167 12 "19" 2
+1 167 12 "" 144
0
-1 168 12 "" 79
+1 168 12 "" 145
0
-1 169 12 "" 80
+1 169 12 "20" 4
0
-1 170 12 "" 82
+1 170 12 "20" 3
0
-1 171 12 "" 113
+1 171 12 "20.0" 1
0
-1 172 12 "" 144
+1 172 12 "20" 6
0
-1 173 12 "" 145
+1 173 12 "20" 2
0
-1 174 12 "20" 4
+1 174 13 "" 4
0
-1 175 12 "20" 3
+1 175 13 "" 3
0
-1 176 12 "20.0" 1
+1 176 13 "0" 1
0
-1 177 12 "20" 6
+1 177 13 "" 2
0
-1 178 12 "20" 2
-0
-1 179 13 "" 4
-0
-1 180 13 "" 3
-0
-1 181 13 "0" 1
-0
-1 182 13 "" 2
-0
-1 183 13 "" 6
+1 178 13 "" 6
0
2 109
"PRIMITIVE_TEXT7"
@@ -230,50 +220,50 @@ E E 0 1 1 2 1 E U 1 E 220 18 254 31
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
LANG:1 6 logMsg
-1 184 14 "" 4
+1 179 14 "" 4
0
-1 185 14 "" 3
+1 180 14 "" 3
0
-1 186 14 "0" 1
+1 181 14 "0" 1
0
-1 187 14 "" 2
+1 182 14 "" 2
0
-1 188 14 "" 6
+1 183 14 "" 6
0
-1 189 15 "" 4
+1 184 15 "" 4
0
-1 190 15 "" 3
+1 185 15 "" 3
0
-1 191 15 "0" 1
+1 186 15 "0" 1
0
-1 192 15 "" 2
+1 187 15 "" 2
0
-1 193 15 "" 6
+1 188 15 "" 6
0
-1 194 16 "" 4
+1 189 16 "" 4
0
-1 195 16 "" 3
+1 190 16 "" 3
0
-1 196 16 "0" 1
+1 191 16 "0" 1
0
-1 197 16 "" 2
+1 192 16 "" 2
0
-1 198 16 "" 6
+1 193 16 "" 6
0
-1 199 19 "" 4
+1 194 19 "" 4
0
-1 200 19 "" 3
+1 195 19 "" 3
0
-1 201 19 "0" 1
+1 196 19 "0" 1
0
-1 202 19 "" 2
+1 197 19 "" 2
0
-1 203 19 "" 6
+1 198 19 "" 6
0
2 134
"PRIMITIVE_TEXT12"
""
-1 163 205 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 163 261 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
30 0 0 0 0 0
E E E
@@ -283,8 +273,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 163 205 184 218
-0 2 2 "0s" 0 0 0 192 0 0 163 205 1
+E E 0 1 1 2 1 E U 1 E 163 261 184 274
+0 2 2 "0s" 0 0 0 192 0 0 163 261 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -292,7 +282,7 @@ LANG:1 5 error
2 135
"PRIMITIVE_TEXT13"
""
-1 288 205 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 288 261 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
32 0 0 0 0 0
E E E
@@ -302,8 +292,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 288 205 351 218
-0 2 2 "0s" 0 0 0 192 0 0 288 205 1
+E E 0 1 1 2 1 E U 1 E 288 261 351 274
+0 2 2 "0s" 0 0 0 192 0 0 288 261 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -311,7 +301,7 @@ LANG:1 13 currentAction
2 136
"PRIMITIVE_TEXT14"
""
-1 413 205 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 413 261 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
34 0 0 0 0 0
E E E
@@ -321,21 +311,41 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 413 205 447 218
-0 2 2 "0s" 0 0 0 192 0 0 413 205 1
+E E 0 1 1 2 1 E U 1 E 413 261 447 274
+0 2 2 "0s" 0 0 0 192 0 0 413 261 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
LANG:1 6 logMsg
-1 204 20 "" 4
+1 199 20 "" 4
+0
+1 200 20 "" 3
+0
+1 201 20 "0" 1
+0
+1 202 20 "" 2
+0
+1 203 20 "" 6
0
-1 205 20 "" 3
+1 204 21 "" 4
0
-1 206 20 "0" 1
+1 205 21 "" 3
0
-1 207 20 "" 2
+1 206 21 "0" 1
0
-1 208 20 "" 6
+1 207 21 "" 2
+0
+1 208 21 "" 6
+0
+1 209 22 "" 4
+0
+1 210 22 "" 3
+0
+1 211 22 "0" 1
+0
+1 212 22 "" 6
+0
+1 213 22 "" 2
0
0
LAYER, 1
@@ -367,30 +377,38 @@ LAYER, 7
LANG:1 0
0
3 12 "PANEL_REF13" -1
-"objects\\Processes\\ObsSW_Main.pnl" 75 402 T 15 1 0 1 -65 -110
+"objects\\Processes\\ObsSW_Main.pnl" 75 402 T 15 1 0 1 -65 -54
0
3 13 "PANEL_REF14" -1
-"objects\\Processes\\daemon_small.pnl" 0 40 T 16 1 0 1 0 -8
+"objects\\Processes\\daemon_small.pnl" 0 40 T 16 1 0 1 0 20
1
"$name""LogProcessor"
3 14 "PANEL_REF15" -1
-"objects\\Processes\\daemon_small.pnl" 0 80 T 24 1 0 1 0 -18
+"objects\\Processes\\daemon_small.pnl" 0 80 T 24 1 0 1 0 10
1
"$name""ServiceBroker"
3 15 "PANEL_REF16" -1
-"objects\\Processes\\daemon_small.pnl" 0 110 T 25 1 0 1 0 -18
+"objects\\Processes\\daemon_small.pnl" 0 110 T 25 1 0 1 0 10
1
"$name""CTStartDaemon"
3 16 "PANEL_REF17" -1
-"objects\\Processes\\daemon_small.pnl" 0 140 T 26 1 0 1 0 -18
+"objects\\Processes\\daemon_small.pnl" 0 140 T 26 1 0 1 0 10
1
"$name""SASGateway"
3 19 "PANEL_REF20" -1
-"objects\\Processes\\controller_small.pnl" 0 220 T 27 U
+"objects\\Processes\\controller_small.pnl" 0 220 T 27 1 0 1 0 56
1
"$name""MACScheduler"
3 20 "PANEL_REF21" -1
-"objects\\Processes\\controller_small.pnl" 0 280 T 35 1 0 1 0 -32
+"objects\\Processes\\controller_small.pnl" 0 280 T 35 1 0 1 0 24
1
"$name""SoftwareMonitor"
+3 21 "PANEL_REF21" -1
+"objects\\Processes\\daemon_small.pnl" 0 40 T 35 1 0 1 0 -10
+1
+"$name""FeedbackService"
+3 22 "PANEL_REF22" -1
+"objects\\Processes\\daemon_small.pnl" 0 140 T 36 1 0 1 0 40
+1
+"$name""PVSSGateway"
0
diff --git a/MAC/Navigator2/panels/Processes/ObservationAEmbedded.pnl b/MAC/Navigator2/panels/Processes/ObservationAEmbedded.pnl
deleted file mode 100644
index ef421ef3aaf6385f2ad726a60c3de8f848ad49dc..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Processes/ObservationAEmbedded.pnl
+++ /dev/null
@@ -1,272 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 1200 823 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
- baseDP = g_currentDatapoint;
- dpGet(baseDP+\".observationName\",observationNr);
- observationName=\"Observation\"+observationNr;
- TopLabel.text(observationName+\" Adders\");
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"ObservationAEmbedded.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"ObservationAEmbedded.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
- reload();
- }
-}
-
-void reload() {
-
- navFunct_clearGlobalLists();
-
- addAdders();
-
-}
-
-void addAdders() {
-
- // get all the InputBuffers used by this observation
- adders = navFunct_getAddersForObservation(observationName);
-
-}
-" 0
- E E E E 1 -1 -1 0 200 170
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string baseDP=\"\";
-string observationNr;
-string observationName;
-dyn_string adders;
-" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
-LAYER, 0
-1
-LANG:1 0
-29 0
-"AdderModule"
-""
-1 200 224.2340838334161 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-0 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 0 50 1199 820
-15 Canvas.Canvas.1
-0
-"main(bool enter)
-{
- this.ModuleName = \"AdderModule\";
-
- RootPanelOnModule(\"Processes/ObservationAdders.pnl\",\"\",\"AdderModule\",\"\");
-
-}" 0
-2 21
-"TopLabel"
-""
-1 417 2 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
- E E
-21 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 417 2 575 22
-0 2 2 "0s" 0 0 0 192 0 0 417 2 1
-1
-LANG:1 33 MS Shell Dlg,-1,16,5,75,0,0,0,0,0
-0 1
-LANG:1 18 Observation Adders
-2 22
-"PRIMITIVE_TEXT2"
-""
-1 25 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-22 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 25 32 75 45
-0 2 2 "0s" 0 0 0 192 0 0 25 32 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 8 dropping
-2 23
-"PRIMITIVE_TEXT3"
-""
-1 85 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-23 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 85 32 132 45
-0 2 2 "0s" 0 0 0 192 0 0 85 32 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 7 dropped
-2 24
-"PRIMITIVE_TEXT5"
-""
-1 142 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-24 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 142 32 199 45
-0 2 2 "0s" 0 0 0 192 0 0 142 32 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 9 locusNode
-2 25
-"PRIMITIVE_TEXT7"
-""
-1 209 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-25 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 209 32 243 45
-0 2 2 "0s" 0 0 0 192 0 0 209 32 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 6 writer
-2 27
-"PRIMITIVE_TEXT14"
-""
-1 264 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-27 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 264 32 362 45
-0 2 2 "0s" 0 0 0 192 0 0 264 32 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 15 dataProductType
-2 28
-"PRIMITIVE_TEXT18"
-""
-1 379 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-28 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 379 32 431 45
-0 2 2 "0s" 0 0 0 192 0 0 379 32 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 9 directory
-2 29
-"PRIMITIVE_TEXT23"
-""
-1 469 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-29 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 469 32 518 45
-0 2 2 "0s" 0 0 0 192 0 0 469 32 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 8 fileName
-0
-LAYER, 1
-1
-LANG:1 0
-0
-LAYER, 2
-1
-LANG:1 0
-0
-LAYER, 3
-1
-LANG:1 0
-0
-LAYER, 4
-1
-LANG:1 0
-0
-LAYER, 5
-1
-LANG:1 0
-0
-LAYER, 6
-1
-LANG:1 0
-0
-LAYER, 7
-1
-LANG:1 0
-0
-0
diff --git a/MAC/Navigator2/panels/Processes/ObservationAdders.pnl b/MAC/Navigator2/panels/Processes/ObservationAdders.pnl
deleted file mode 100644
index 38700dd996dea19a9fee336ed06e122057962b02..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Processes/ObservationAdders.pnl
+++ /dev/null
@@ -1,184 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 1200 7500 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
- baseDP = g_currentDatapoint;
- dpGet(baseDP+\".observationName\",observationNr);
- observationName=\"Observation\"+observationNr;
- strModuleName = myModuleName();
-
- reload();
-
-}
-
-void prepareProcesses() {
- dyn_string result;
- string connectTo=MainDBName+claimManager_nameToRealName(\"LOFAR_ObsSW_\"+observationName);
- dynAppend(result,\",\"+observationName+\",\"+connectTo);
-
- string osnr=\"\";
- string anr=\"\";
- string oldNr=\"\";
- for (int i=1; i<= dynlen(adders); i++) {
- osnr = substr(adders[i],strpos(adders[i],\"OSIONode\")+8,2);
- anr = substr(adders[i],strpos(adders[i],\"Adder\")+5,2);
- if (osnr != oldNr) {
- dynAppend(result,connectTo+\",IONode\"+osnr+\",\"+CEPDBName+\"LOFAR_ObsSW_OSIONode\"+osnr);
- oldNr=osnr;
- }
- dynAppend(result,CEPDBName+\"LOFAR_ObsSW_OSIONode\"+osnr+\",_Adder\"+anr+\",\"+adders[i]);
- dynAppend(g_processesList,adders[i]);
- }
-
- // write result to the db so various panels can reset themselves
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".processesList\",result);
-
- LOG_DEBUG(\"ObservationAdders.pnl:prepareProcesses|processList found: \"+ result);
-
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"ObservationAdders.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"ObservationAdders.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
- reload();
- }
-}
-
-void reload() {
-
- navFunct_clearGlobalLists();
-
- addAdders();
-
- // set the observation selectable items
- prepareProcesses();
-
- redraw();
-
- // set panel to ready
- g_objectReady=true;
-
- // trigger that the panel values are calculated and ready
- navPanel_setEvent(\"ObservationAdders.pnl\",\"Update\");
-}
-
-void addAdders() {
-
- // get all the Adders used by this observation
- adders = navFunct_getAddersForObservation(observationName);
-}" 0
- E E E E 1 -1 -1 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string baseDP=\"\";
-string observationNr;
-string observationName;
-dyn_string adders;
-bool connected = false;
-dyn_string ARefNames;
-string strModuleName;
-
-
-void clearARefNames() {
- // remove all symbols because new ones will be added
- for (int i=1; i <= dynlen(ARefNames); i++) {
- removeSymbol(strModuleName,\"\",ARefNames[i]);
- }
- dynClear(ARefNames);
-}
-
-void redraw() {
- string barColor = \"_3DFace\";
- if (dynlen(ARefNames) > 0) {
- clearARefNames();
- }
- int xPos_AddSymbol = 0;
- int yPos_AddSymbol = 0;
- int ref = 1;
- string addPanelName = \"objects/Processes/adderDetail.pnl\";
- //loop over list and prepare panel with all adder objects
- for (int i=1; i<= dynlen(adders); i++) {
- if ((float)i/2. != floor(i/2.)) {
- barColor = \"lightgrey\";
- } else {
- barColor = \"_3DFace\";
- }
- ARefNames[ref]=\"A\"+(ref);
-
- if ( addSymbol( strModuleName, // Stay in this modul
- \"\", // Name of this panel
- addPanelName, // Panel to add
- ARefNames[ref], // Ref of the addedPanel
- makeDynString( \"$adder:\" + adders[i],
- \"$barColor:\" + barColor) , // Define all $values
- xPos_AddSymbol, // Xpos of the AddedSymbol
- yPos_AddSymbol, // Ypos of the AddedSymbol
- 0, // angle
- 1 ,1 // zoomX , zoomY
- ) < 0 ) {
- LOG_ERROR(\"ObservationAdders.pnl:redraw|Error Appending adder for: \" + adders[i] + \" in this panel.\");
- }
- yPos_AddSymbol += 14;
- ref++;
- }
-
-}
-
-
-" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
-LAYER, 0
-1
-LANG:1 0
-0
-LAYER, 1
-1
-LANG:1 0
-0
-LAYER, 2
-1
-LANG:1 0
-0
-LAYER, 3
-1
-LANG:1 0
-0
-LAYER, 4
-1
-LANG:1 0
-0
-LAYER, 5
-1
-LANG:1 0
-0
-LAYER, 6
-1
-LANG:1 0
-0
-LAYER, 7
-1
-LANG:1 0
-0
-0
diff --git a/MAC/Navigator2/panels/Processes/ObservationGPUProcEmbedded.pnl b/MAC/Navigator2/panels/Processes/ObservationGPUProcEmbedded.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..ab8eccd8d12a441022fb7de7ac4d028a925bbd40
--- /dev/null
+++ b/MAC/Navigator2/panels/Processes/ObservationGPUProcEmbedded.pnl
@@ -0,0 +1,479 @@
+V 11
+1
+LANG:1 0
+PANEL,-1 -1 1200 823 N "_3DFace" 0
+"main()
+{
+ // Initialise the Panel
+ navPanel_initPanel(\"fw_viewBox\");
+ baseDP = g_currentDatapoint;
+ dpGet(baseDP+\".observationName\",observationNr);
+ observationName=\"Observation\"+observationNr;
+
+}
+
+//
+// Callback for dpConnect to action point.
+// If there is an action required this point will tell so
+//
+void doAction(string aDP, string anAction) {
+ LOG_DEBUG(\"ObservationGPUProcEmbedded.pnl:doAction| Action required. found: \" + anAction);
+ // split action into essentials
+ dyn_string actionString;
+ if (!navFunct_splitAction(anAction,actionString)) {
+ return;
+ }
+
+ LOG_DEBUG(\"ObservationGPUProcEmbedded.pnl:doAction|found actionString: \" + actionString);
+
+ // Reload
+ if (actionString[1] == \"Reload\") {
+ reload();
+ }
+}
+
+void reload() {
+
+ navFunct_clearGlobalLists();
+
+ addGPUProcs();
+}
+
+void addGPUProcs() {
+
+ // get all the InputBuffers used by this observation
+ gpuProcs = navFunct_getGPUProcsForObservation(observationName);
+
+}
+" 0
+ E E E E 1 -1 -1 0 200 170
+""0 1
+E "#uses \"navPanel.ctl\"
+
+string baseDP=\"\";
+string observationNr;
+string observationName;
+dyn_string gpuProcs;
+" 0
+ 2
+"CBRef" "1"
+"EClose" E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+29 0
+"GPUProcModule"
+""
+1 168.4737281067556 224.2340838334161 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+0 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
+0 0 50 1010 820
+15 Canvas.Canvas.1
+0
+"main(bool enter)
+{
+ this.ModuleName = \"GPUProcModule\";
+
+ RootPanelOnModule(\"Processes/ObservationGPUProcs.pnl\",\"\",\"GPUProcModule\",\"\");
+
+}" 0
+2 21
+"TopLabel"
+""
+1 420 0 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
+ E E
+21 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 1 E 420 0 604 20
+0 2 2 "0s" 0 0 0 192 0 0 420 0 1
+1
+LANG:1 33 MS Shell Dlg,-1,16,5,75,0,0,0,0,0
+0 1
+LANG:1 20 Observation GPUProcs
+2 22
+"PRIMITIVE_TEXT2"
+""
+1 51 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+22 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 51 32 72 45
+0 2 2 "0s" 0 0 0 192 0 0 51 32 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 3 Obs
+2 23
+"PRIMITIVE_TEXT3"
+""
+1 360.5738337842142 36 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+23 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1.087719298245614 0 1 -31.40350877192984 2 0 E 360 30 477 43
+0 2 2 "0s" 0 0 0 192 0 0 360 30 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 19 subband information
+2 31
+"PRIMITIVE_TEXT4"
+""
+1 100 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+25 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 100 32 171 45
+0 2 2 "0s" 0 0 0 192 0 0 100 32 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 11 DataProduct
+2 32
+"PRIMITIVE_TEXT5"
+""
+1 225 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+26 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 225 32 276 45
+0 2 2 "0s" 0 0 0 192 0 0 225 32 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 8 Dropping
+2 33
+"PRIMITIVE_TEXT6"
+""
+1 2 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+27 0 0 0 0 0
+E E E
+0
+1
+LANG:1 6 Status
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 2 32 9 45
+0 2 2 "0s" 0 0 0 192 0 0 2 32 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 1 S
+2 34
+"PRIMITIVE_TEXT7"
+""
+1 18 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+28 0 0 0 0 0
+E E E
+0
+1
+LANG:1 8 CBT Node
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 18 32 25 45
+0 2 2 "0s" 0 0 0 192 0 0 18 32 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 1 N
+2 35
+"PRIMITIVE_TEXT8"
+""
+1 30 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+29 0 0 0 0 0
+E E E
+0
+1
+LANG:1 11 GPU Proc Nr
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 30 32 38 45
+0 2 2 "0s" 0 0 0 192 0 0 30 32 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 1 G
+6 38
+"RECTANGLE2"
+""
+1 660 10 E E E 1 E 1 E N {0,0,0} E N "Lofar_operational" E E
+ E E
+32 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 432 62 1 E 660 10 674 24
+6 40
+"RECTANGLE4"
+""
+1 660 10 E E E 1 E 1 E N {0,0,0} E N "Lofar_maintenance" E E
+ E E
+34 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 432 92 1 E 660 10 674 24
+6 41
+"RECTANGLE5"
+""
+1 660 10 E E E 1 E 1 E N {0,0,0} E N "Lofar_suspicious" E E
+ E E
+35 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 432 122 1 E 660 10 674 24
+6 42
+"RECTANGLE6"
+""
+1 660 10 E E E 1 E 1 E N {0,0,0} E N "Lofar_broken" E E
+ E E
+36 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 432 152 1 E 660 10 674 24
+2 43
+"PRIMITIVE_TEXT10"
+""
+1 1132 72 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+37 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 1132 72 1183 85
+0 2 2 "0s" 0 0 0 192 0 0 1132 72 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 7 <= 0.1%
+2 47
+"PRIMITIVE_TEXT14"
+""
+1 1072 22 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+41 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 1072 22 1128 38
+0 2 2 "0s" 0 0 0 192 0 0 1072 22 1
+1
+LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 8 legenda:
+2 49
+"PRIMITIVE_TEXT16"
+""
+1 1022 104 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+43 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 1022 104 1064 117
+0 2 2 "0s" 0 0 0 192 0 0 1022 104 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 6 > 0.1%
+2 50
+"PRIMITIVE_TEXT17"
+""
+1 1022 132 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+44 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 1022 132 1064 145
+0 2 2 "0s" 0 0 0 192 0 0 1022 132 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 6 > 0.5%
+2 51
+"PRIMITIVE_TEXT18"
+""
+1 1022 162 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+45 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 1022 162 1064 175
+0 2 2 "0s" 0 0 0 192 0 0 1022 162 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 6 > 5.0%
+2 52
+"PRIMITIVE_TEXT19"
+""
+1 1134 104 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+46 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 1134 104 1185 117
+0 2 2 "0s" 0 0 0 192 0 0 1134 104 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 7 <= 0.5%
+2 53
+"PRIMITIVE_TEXT20"
+""
+1 1134 134 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+47 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 1134 134 1185 147
+0 2 2 "0s" 0 0 0 192 0 0 1134 134 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 7 <= 5.0%
+2 54
+"PRIMITIVE_TEXT21"
+""
+1 1134 164 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+48 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 1134 164 1185 177
+0 2 2 "0s" 0 0 0 192 0 0 1134 164 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 7 <= 0.1%
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+0
diff --git a/MAC/Navigator2/panels/Processes/ObservationGPUProcs.pnl b/MAC/Navigator2/panels/Processes/ObservationGPUProcs.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..bd7b77bdd92e3ac0f02415290df5715d7f68cfcf
--- /dev/null
+++ b/MAC/Navigator2/panels/Processes/ObservationGPUProcs.pnl
@@ -0,0 +1,260 @@
+V 11
+1
+LANG:1 0
+PANEL,-1 -1 1200 7500 N "_3DFace" 0
+"main()
+{
+ // Initialise the Panel
+ navPanel_initPanel(\"fw_viewBox\");
+ strModuleName = myModuleName();
+ baseDP = \"LOFAR_PermSW\";
+ database=dpSubStr(baseDP,DPSUB_SYS);
+
+
+ // This panel needs to act on active observations, in running status so we connect to the MACScheduler te be updated
+
+ activeObsDP =MainDBName+\"LOFAR_PermSW_MACScheduler.activeObservations\";
+ // check if MACScheduler pointenabled and accessible
+ if (dpExists(activeObsDP)) {
+ if (dpConnect(\"updateActiveObservations\", activeObsDP+\":_online.._value\",
+ activeObsDP+\":_online.._invalid\") == -1) {
+ LOG_ERROR(\"ObservationGPUProcs.pnl:main|Couldn't connect to: \"+activeObsDP);
+ }
+ } else {
+ if (!isStandalone()) LOG_ERROR(\"ObservationGPUProcs.pnl:main|Couldn't find DP to connect to: \"+activeObsDP);
+ }
+}
+
+void updateActiveObservations(string dp1, dyn_string obs,
+ string dp2, bool invalid)
+{
+
+ // remove pipelines from the list
+ for (int i=dynlen(obs);i > 0; i--) if (!navFunct_isObservation(obs[i])) dynRemove(obs,i);
+
+ activeObservations = obs;
+ // if there are selected observation check the observationsList if those selected observations still are active
+ // remove the unactive observations from the list
+
+ // replace old observations if there are no observations selected
+ if (selectedObservations) {
+ for (int i=dynlen(observationsList); i < 1; i--) {
+ int idx = dynContains(activeObservations,observationsList[i]);
+ if (i <= 0) dynRemove(observationsList,i);
+ }
+ if (dynlen(observationsList) ==0) {
+ selectedObservations=false;
+ }
+ }
+
+ if (!selectedObservations) {
+ observationsList = activeObservations;
+ }
+ // because CobaltProcesses claim their datapoints when the observation is actually running we need to connect to all these observations
+ // and give a signal when the runstate of one of them changes to running to trigger the Cobalt point collection
+
+ LOG_DEBUG(\"ObservationGPUProcs.pnl:updateActiveObservations|observationList: \"+observationsList);
+
+ obsConnections = makeDynString();
+ for (int i = 1; i <= dynlen(observationsList) ; i++) {
+ // compose the WinCC OA DP name
+ string obsName = \"LOFAR_ObsSW_\"+observationsList[i];
+
+ // Ask the claimmanager for the temp obs representation
+ string obsDP=MainDBName+claimManager_nameToRealName(obsName);
+
+ // add DP to list with all connects
+ if (! dynContains(obsConnections,obsDP+\".runState\")) dynAppend(obsConnections,obsDP+\".runState\");
+ }
+
+ if (dynlen(oldObsConnections) > 0) {
+ // disconnect old observations
+ dpDisconnect(\"monitorRunStates\",oldObsConnections);
+ dynClear(oldObsConnections);
+ }
+
+ // connect to runState for all active observations
+ if (dynlen(obsConnections) > 0 && dpConnect(\"monitorRunStates\",obsConnections) == -1) {
+ LOG_ERROR(\"ObservationGPUProcs.pnl:updateActiveObservations|ERROR: couldn't connect to : \"+obsConnections+ \" \" + getLastError());
+ } else if (dynlen(obsConnections) > 0) {
+ oldObsConnections = obsConnections;
+ }
+}
+
+void monitorRunStates(dyn_string dpList,dyn_string runStates) {
+ for (int i=1; i<= dynlen(runStates); i++) {
+ if (runStates[i] == \"Running\" || runStates[i] == \"Quiting\") {
+ reload();
+ break;
+ }
+ }
+}
+
+void prepareProcesses() {
+ dyn_string result;
+
+ g_processesList = gpuProcs;
+
+ // write result to the db so various panels can reset themselves
+ dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".processesList\",result);
+
+ LOG_DEBUG(\"ObservationGPUProcs.pnl:prepareProcesses|processList found: \"+ g_processesList);
+}
+
+//
+// Callback for dpConnect to action point.
+// If there is an action required this point will tell so
+//
+void doAction(string aDP, string anAction) {
+ LOG_DEBUG(\"ObservationGPUProcs.pnl:doAction| Action required. found: \" + anAction);
+ // split action into essentials
+ dyn_string actionString;
+ if (!navFunct_splitAction(anAction,actionString)) {
+ return;
+ }
+
+ LOG_DEBUG(\"ObservationGPUProcs.pnl:doAction|found actionString: \" + actionString);
+
+ // Reload
+ if (actionString[1] == \"Reload\") {
+ reload();
+ }
+}
+
+void reload() {
+
+ navFunct_clearGlobalLists();
+
+ addGPUProcs();
+
+ // set the observation selectable items
+ prepareProcesses();
+
+ redraw();
+
+ // set panel to ready
+ g_objectReady=true;
+
+ // trigger that the panel values are calculated and ready
+ navPanel_setEvent(\"ObservationGPUProcs.pnl\",\"Update\");
+}
+
+void addGPUProcs() {
+
+ // get all the GPUProcs used for all active observations
+ dynClear(gpuProcs);
+ for (int i =1; i <= dynlen(obsConnections); i++) {
+
+ string observation = claimManager_realNameToName(obsConnections[i]);
+
+ dyn_string ib = navFunct_getGPUProcsForObservation(navFunct_observationNameToNumber(observation));
+
+ dynAppend(gpuProcs,ib);
+ }
+ dynSort(gpuProcs);
+}
+
+" 0
+ E E E E 1 -1 -1 0 0 0
+""0 1
+E "#uses \"navPanel.ctl\"
+
+string baseDP=\"\";
+dyn_string observationsList;
+dyn_string obsConnections;
+dyn_string oldObsConnections; // keep copy latest observations to be disconnected when the list changes
+dyn_string activeObservations;
+
+string activeObsDP = \"\";
+string database;
+bool selectedObservations=false;
+
+dyn_string gpuProcs;
+bool connected = false;
+dyn_string GPURefNames;
+string strModuleName;
+
+
+void clearGPURefNames() {
+ // remove all symbols because new ones will be added
+ for (int i=1; i <= dynlen(GPURefNames); i++) {
+ removeSymbol(strModuleName,\"\",GPURefNames[i]);
+ }
+ dynClear(GPURefNames);
+}
+
+void redraw() {
+ string barColor = \"_3DFace\";
+ if (dynlen(GPURefNames) > 0) {
+ clearGPURefNames();
+ }
+ int xPos_AddSymbol = 0;
+ int yPos_AddSymbol = 0;
+ int ref = 1;
+ string addPanelName = \"objects/Processes/GPUProcDetail.pnl\";
+ //loop over list and prepare panel with all gpuProc objects
+ for (int i=1; i<= dynlen(gpuProcs); i++) {
+ if ((float)i/2. != floor(i/2.)) {
+ barColor = \"lightgrey\";
+ } else {
+ barColor = \"_3DFace\";
+ }
+ GPURefNames[ref]=\"GPU\"+(ref);
+
+ if ( addSymbol( strModuleName, // Stay in this modul
+ \"\", // Name of this panel
+ addPanelName, // Panel to add
+ GPURefNames[ref], // Ref of the addedPanel
+ makeDynString( \"$gpuProc:\" + gpuProcs[i],
+ \"$yPos_AddSymbol:\" + yPos_AddSymbol,
+ \"$barColor:\" + barColor) , // Define all $values
+ xPos_AddSymbol, // Xpos of the AddedSymbol
+ yPos_AddSymbol, // Ypos of the AddedSymbol
+ 0, // angle
+ 1 ,1 // zoomX , zoomY
+ ) < 0 ) {
+ LOG_ERROR(\"ObservationGPUProcs.pnl:redraw|Error Appending inputBuffer for: \" + gpuProcs[i] + \" in this panel.\");
+ }
+ yPos_AddSymbol += 14;
+ ref++;
+ }
+
+}" 0
+ 2
+"CBRef" "1"
+"EClose" E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+0
diff --git a/MAC/Navigator2/panels/Processes/ObservationIBEmbedded.pnl b/MAC/Navigator2/panels/Processes/ObservationIBEmbedded.pnl
index e8f29ec274439b6d82793435ebd69895f1e4eea5..4a48327bce5728c1c8c67c59b8419134ccf01b4c 100644
--- a/MAC/Navigator2/panels/Processes/ObservationIBEmbedded.pnl
+++ b/MAC/Navigator2/panels/Processes/ObservationIBEmbedded.pnl
@@ -128,7 +128,7 @@ LANG:1 7 Station
2 3
"PRIMITIVE_TEXT3"
""
-1 250 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 230 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
3 0 0 0 0 0
E E E
@@ -138,8 +138,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 250 54 278 67
-0 2 2 "0s" 0 0 0 192 0 0 250 54 1
+E E 0 1 1 2 1 E U 0 E 230 54 258 67
+0 2 2 "0s" 0 0 0 192 0 0 230 54 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -147,7 +147,7 @@ LANG:1 4 Node
2 4
"PRIMITIVE_TEXT5"
""
-1 310 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 290 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
4 0 0 0 0 0
E E E
@@ -157,8 +157,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 310 54 332 67
-0 2 2 "0s" 0 0 0 192 0 0 310 54 1
+E E 0 1 1 2 1 E U 0 E 290 54 312 67
+0 2 2 "0s" 0 0 0 192 0 0 290 54 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -166,7 +166,7 @@ LANG:1 3 CPU
2 5
"PRIMITIVE_TEXT7"
""
-1 370 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 355 52 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
5 0 0 0 0 0
E E E
@@ -176,8 +176,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 370 54 418 67
-0 2 2 "0s" 0 0 0 192 0 0 370 54 1
+E E 0 1 1 2 1 E U 0 E 355 52 403 65
+0 2 2 "0s" 0 0 0 192 0 0 355 52 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -185,7 +185,7 @@ LANG:1 8 blocksIn
2 6
"PRIMITIVE_TEXT11"
""
-1 430 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 415 52 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
7 0 0 0 0 0
E E E
@@ -195,8 +195,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 430 54 478 67
-0 2 2 "0s" 0 0 0 192 0 0 430 54 1
+E E 0 1 1 2 1 E U 0 E 415 52 463 65
+0 2 2 "0s" 0 0 0 192 0 0 415 52 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -204,7 +204,7 @@ LANG:1 8 rejected
2 7
"PRIMITIVE_TEXT13"
""
-1 400 36 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 390 36 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
8 0 0 0 0 0
E E E
@@ -214,8 +214,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 400 36 448 49
-0 2 2 "0s" 0 0 0 192 0 0 400 36 1
+E E 0 1 1 2 1 E U 0 E 390 36 438 49
+0 2 2 "0s" 0 0 0 192 0 0 390 36 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -223,7 +223,7 @@ LANG:1 7 stream0
2 8
"PRIMITIVE_TEXT14"
""
-1 490 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 475 52 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
9 0 0 0 0 0
E E E
@@ -233,8 +233,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 490 54 538 67
-0 2 2 "0s" 0 0 0 192 0 0 490 54 1
+E E 0 1 1 2 1 E U 0 E 475 52 523 65
+0 2 2 "0s" 0 0 0 192 0 0 475 52 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -242,7 +242,7 @@ LANG:1 8 blocksIn
2 9
"PRIMITIVE_TEXT18"
""
-1 550 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 535 52 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
11 0 0 0 0 0
E E E
@@ -252,8 +252,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 550 54 598 67
-0 2 2 "0s" 0 0 0 192 0 0 550 54 1
+E E 0 1 1 2 1 E U 0 E 535 52 583 65
+0 2 2 "0s" 0 0 0 192 0 0 535 52 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -261,7 +261,7 @@ LANG:1 8 rejected
2 10
"PRIMITIVE_TEXT20"
""
-1 520 36 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 510 36 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
12 0 0 0 0 0
E E E
@@ -271,8 +271,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 520 36 568 49
-0 2 2 "0s" 0 0 0 192 0 0 520 36 1
+E E 0 1 1 2 1 E U 0 E 510 36 558 49
+0 2 2 "0s" 0 0 0 192 0 0 510 36 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -280,7 +280,7 @@ LANG:1 7 stream1
2 11
"PRIMITIVE_TEXT23"
""
-1 610 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 595 52 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
13 0 0 0 0 0
E E E
@@ -290,8 +290,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 610 54 658 67
-0 2 2 "0s" 0 0 0 192 0 0 610 54 1
+E E 0 1 1 2 1 E U 0 E 595 52 643 65
+0 2 2 "0s" 0 0 0 192 0 0 595 52 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -299,7 +299,7 @@ LANG:1 8 blocksIn
2 12
"PRIMITIVE_TEXT27"
""
-1 670 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 655 52 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
15 0 0 0 0 0
E E E
@@ -309,8 +309,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 670 54 718 67
-0 2 2 "0s" 0 0 0 192 0 0 670 54 1
+E E 0 1 1 2 1 E U 0 E 655 52 703 65
+0 2 2 "0s" 0 0 0 192 0 0 655 52 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -318,7 +318,7 @@ LANG:1 8 rejected
2 13
"PRIMITIVE_TEXT29"
""
-1 640 36 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 630 36 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
16 0 0 0 0 0
E E E
@@ -328,8 +328,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 640 36 688 49
-0 2 2 "0s" 0 0 0 192 0 0 640 36 1
+E E 0 1 1 2 1 E U 0 E 630 36 678 49
+0 2 2 "0s" 0 0 0 192 0 0 630 36 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -337,7 +337,7 @@ LANG:1 7 stream2
2 14
"PRIMITIVE_TEXT39"
""
-1 730 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 715 52 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
17 0 0 0 0 0
E E E
@@ -347,8 +347,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 730 54 778 67
-0 2 2 "0s" 0 0 0 192 0 0 730 54 1
+E E 0 1 1 2 1 E U 0 E 715 52 763 65
+0 2 2 "0s" 0 0 0 192 0 0 715 52 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -356,7 +356,7 @@ LANG:1 8 blocksIn
2 15
"PRIMITIVE_TEXT42"
""
-1 790 54 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 775 52 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
19 0 0 0 0 0
E E E
@@ -366,8 +366,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 790 54 838 67
-0 2 2 "0s" 0 0 0 192 0 0 790 54 1
+E E 0 1 1 2 1 E U 0 E 775 52 823 65
+0 2 2 "0s" 0 0 0 192 0 0 775 52 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
@@ -375,7 +375,7 @@ LANG:1 8 rejected
2 16
"PRIMITIVE_TEXT45"
""
-1 760 36 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 750 36 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
20 0 0 0 0 0
E E E
@@ -385,12 +385,31 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 760 36 808 49
-0 2 2 "0s" 0 0 0 192 0 0 760 36 1
+E E 0 1 1 2 1 E U 0 E 750 36 798 49
+0 2 2 "0s" 0 0 0 192 0 0 750 36 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
0 1
LANG:1 7 stream3
+2 17
+"PRIMITIVE_TEXT46"
+""
+1 82 56 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+21 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 82 56 151 69
+0 2 2 "0s" 0 0 0 192 0 0 82 56 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 11 Observation
0
LAYER, 1
1
diff --git a/MAC/Navigator2/panels/Processes/ObservationInputBuffers.pnl b/MAC/Navigator2/panels/Processes/ObservationInputBuffers.pnl
index d12d0f54a4ceb3b614c66a3cac34e6e4e984e7bb..48334101b74c6b9598a65ebd2e3ab53e7c06b5b9 100644
--- a/MAC/Navigator2/panels/Processes/ObservationInputBuffers.pnl
+++ b/MAC/Navigator2/panels/Processes/ObservationInputBuffers.pnl
@@ -93,115 +93,6 @@ void monitorRunStates(dyn_string dpList,dyn_string runStates) {
-// connect to stationInputStreams from the active observations
-void connectStationInputStreams(string runState) {
- stationInputs = \"\";
- string obsDP=\"\";
- dyn_string stream0DPList;
- dyn_string stream1DPList;
- dyn_string stream2DPList;
- dyn_string stream3DPList;
-
- // change all found DP's to contain all the elements that contain the stream.percBad
- if (connected0) {
- dpDisconnect(\"streamCB0\",connectTo0);
- dynClear(connectTo0);
- connected0 = false;
- }
- if (connected1) {
- dpDisconnect(\"streamCB1\",connectTo1);
- dynClear(connectTo1);
- connected1 = false;
- }
- if (connected2) {
- dpDisconnect(\"streamCB2\",connectTo2);
- dynClear(connectTo2);
- connected2 = false;
- }
- if (connected3) {
- dpDisconnect(\"streamCB3\",connectTo3);
- dynClear(connectTo3);
- connected3 = false;
- }
-
- if (dynlen(observationsList) == 1 && runState == \"Quiting\") {
- setValue(\"streamObject0\", \"foreCol\", \"Lofar_off\");
- setValue(\"streamObject1\", \"foreCol\", \"Lofar_off\");
- setValue(\"streamObject2\", \"foreCol\", \"Lofar_off\");
- setValue(\"streamObject3\", \"foreCol\", \"Lofar_off\");
- return;
- }
-
-
- //collect all active observations and their stationInputStreams
- if (dynlen(observationsList) > 0) {
- // prepare connectList
- for(int i=1; i <= dynlen(observationsList); i++) {
- dynClear(stream0DPList);
- dynClear(stream1DPList);
- dynClear(stream2DPList);
- dynClear(stream3DPList);
- // For all observations collect the PermSW streamInfo
- stationInputs = navFunct_getStationInputForObservation(observationsList[i]);
-
-
- for (int i=1; i<= dynlen(stationInputs); i++) {
- if (! dynContains(connectTo0,stationInputs[i]+\".stream0:_online.._value\")) dynAppend(connectTo0,stationInputs[i]+\".stream0.rejected:_online.._value\");
- if (! dynContains(connectTo1,stationInputs[i]+\".stream1:_online.._value\")) dynAppend(connectTo1,stationInputs[i]+\".stream1.rejected:_online.._value\");
- if (! dynContains(connectTo2,stationInputs[i]+\".stream2:_online.._value\")) dynAppend(connectTo2,stationInputs[i]+\".stream2.rejected:_online.._value\");
- if (! dynContains(connectTo3,stationInputs[i]+\".stream3:_online.._value\")) dynAppend(connectTo3,stationInputs[i]+\".stream3.rejected:_online.._value\");
- }
- if (dynlen(stationInputs) > 0) baseDP = stationInputs[1];
- }
-
-
- // check if the required datapoint for this view are enabled and accessible
- if (dynlen(connectTo0)>0 && navFunct_dpReachable(CEPDBName) ){
- if (dpConnect(\"streamCB0\", connectTo0) == -1) {
- setValue(\"streamObject0\", \"foreCol\", \"Lofar_dpdoesnotexist\");
- } else {
- connected0 = true;
- }
- } else {
-
- setValue(\"streamObject0\", \"foreCol\", \"Lofar_off\");
- }
- if (dynlen(connectTo1)>0 && navFunct_dpReachable(CEPDBName) ){
- if (dpConnect(\"streamCB1\", connectTo1) == -1) {
- setValue(\"streamObject1\", \"foreCol\", \"Lofar_dpdoesnotexist\");
- } else {
- connected1 = true;
- }
- } else {
- setValue(\"streamObject1\", \"foreCol\", \"Lofar_off\");
- }
- if (dynlen(connectTo2)>0 && navFunct_dpReachable(CEPDBName) ){
- if (dpConnect(\"streamCB2\", connectTo2) == -1) {
- setValue(\"streamObject2\", \"foreCol\", \"Lofar_dpdoesnotexist\");
- } else {
- connected2 = true;
- }
- } else {
- setValue(\"streamObject2\", \"foreCol\", \"Lofar_off\");
- }
- if (dynlen(connectTo3)>0 && navFunct_dpReachable(CEPDBName)){
- if (dpConnect(\"streamCB3\", connectTo3) == -1) {
- setValue(\"streamObject3\", \"foreCol\", \"Lofar_dpdoesnotexist\");
- } else {
- connected3 = true;
- }
- } else {
- setValue(\"streamObject3\", \"foreCol\", \"Lofar_off\");
- }
- } else {
- setValue(\"streamObject0\", \"foreCol\", \"Lofar_off\");
- setValue(\"streamObject1\", \"foreCol\", \"Lofar_off\");
- setValue(\"streamObject2\", \"foreCol\", \"Lofar_off\");
- setValue(\"streamObject3\", \"foreCol\", \"Lofar_off\");
- }
-}
-
-
void prepareProcesses() {
dyn_string result;
string connectTo=\"LOFAR_PermSW\";
@@ -211,6 +102,7 @@ void prepareProcesses() {
dyn_string splitted = strsplit(inputBuffers[i],\"_\");
dynAppend(result,\"LOFAR_PermSW,\"+splitted[3]+\",\"+connectTo+\"_\"+splitted[3]);
dynAppend(result,connectTo+\"_\"+splitted[3]+\",CobaltStationInput,\"+connectTo+\"_\"+splitted[3]+\"_CobaltStationInput\");
+ dynAppend(g_processesList,inputBuffers[i]);
}
// write result to the db so various panels can reset themselves
@@ -286,7 +178,6 @@ string activeObsDP = \"\";
string database;
bool selectedObservations=false;
-dyn_string inputBuffers;
bool connected = false;
dyn_string IBRefNames;
string strModuleName;
diff --git a/MAC/Navigator2/panels/Processes/ObservationOutputProcs.pnl b/MAC/Navigator2/panels/Processes/ObservationOutputProcs.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..71a2c0a14708a7bbbb1b0140ef092444fffc4223
--- /dev/null
+++ b/MAC/Navigator2/panels/Processes/ObservationOutputProcs.pnl
@@ -0,0 +1,1412 @@
+V 11
+1
+LANG:1 0
+PANEL,-1 -1 1268 905 N "_3DFace" 0
+"main()
+{
+ // Initialise the Panel
+ navPanel_initPanel(\"fw_viewBox\");
+ baseDP = g_currentDatapoint;
+ database=dpSubStr(baseDP,DPSUB_SYS);
+
+
+ // This panel needs to act on active observations, in running status so we connect to the MACScheduler te be updated
+
+ activeObsDP =MainDBName+\"LOFAR_PermSW_MACScheduler.activeObservations\";
+ // check if MACScheduler pointenabled and accessible
+ if (dpExists(activeObsDP)) {
+ if (dpConnect(\"updateActiveObservations\", activeObsDP+\":_online.._value\",
+ activeObsDP+\":_online.._invalid\") == -1) {
+ LOG_ERROR(\"ObservationFlow_cobaltNodeProcesses.pnl:main|Couldn't connect to: \"+activeObsDP);
+ }
+ } else {
+ if (!isStandalone()) LOG_ERROR(\"ObservationFlow_cobaltInputStreams.pnl:main|Couldn't find DP to connect to: \"+activeObsDP);
+ }
+}
+
+void updateActiveObservations(string dp1, dyn_string obs,
+ string dp2, bool invalid)
+{
+
+ // remove pipelines from the list
+ for (int i=dynlen(obs);i > 0; i--) if (!navFunct_isObservation(obs[i])) dynRemove(obs,i);
+
+ activeObservations = obs;
+ // if there are selected observation check the observationsList if those selected observations still are active
+ // remove the unactive observations from the list
+
+ // replace old observations if there are no observations selected
+ if (selectedObservations) {
+ for (int i=dynlen(observationsList); i < 1; i--) {
+ int idx = dynContains(activeObservations,observationsList[i]);
+ if (i <= 0) dynRemove(observationsList,i);
+ }
+ if (dynlen(observationsList) ==0) {
+ selectedObservations=false;
+ }
+ }
+
+ if (!selectedObservations) {
+ observationsList = activeObservations;
+ }
+ // because CobaltProcesses claim their datapoints when the observation is actually running we need to connect to all these observations
+ // and give a signal when the runstate of one of them changes to running to trigger the Cobalt point collection
+
+ LOG_DEBUG(\"ObservationFlow_cobaltInputStreams.pnl:updateActiveObservations|observationList: \"+observationsList);
+
+ obsConnections = makeDynString();
+ for (int i = 1; i <= dynlen(observationsList) ; i++) {
+ // compose the WinCC OA DP name
+ string obsName = \"LOFAR_ObsSW_\"+observationsList[i];
+
+ // Ask the claimmanager for the temp obs representation
+ string obsDP=MainDBName+claimManager_nameToRealName(obsName);
+
+ // add DP to list with all connects
+ if (! dynContains(obsConnections,obsDP+\".runState\")) dynAppend(obsConnections,obsDP+\".runState\");
+ }
+
+ if (dynlen(oldObsConnections) > 0) {
+ // disconnect old observations
+ dpDisconnect(\"monitorRunStates\",oldObsConnections);
+ dynClear(oldObsConnections);
+ }
+
+ // connect to runState for all active observations
+ if (dynlen(obsConnections) > 0 && dpConnect(\"monitorRunStates\",obsConnections) == -1) {
+ LOG_ERROR(\"ObservationFlow_cobaltInputStreams.pnl:updateActiveObservations|ERROR: couldn't connect to : \"+obsConnections+ \" \" + getLastError());
+ } else if (dynlen(obsConnections) > 0) {
+ oldObsConnections = obsConnections;
+ }
+}
+
+void monitorRunStates(dyn_string dpList,dyn_string runStates) {
+ for (int i=1; i<= dynlen(runStates); i++) {
+ if (runStates[i] == \"Running\" || runStates[i] == \"Quiting\") {
+ reload();
+ break;
+ }
+ }
+}
+
+
+
+
+void prepareProcesses() {
+ dyn_string result;
+ g_processesList = outputProcs;
+ // write result to the db so various panels can reset themselves
+ dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".processesList\",result);
+
+ LOG_DEBUG(\"ObservationOutputProcs.pnl:prepareProcesses|processList found: \"+ result);
+}
+
+//
+// Callback for dpConnect to action point.
+// If there is an action required this point will tell so
+//
+void doAction(string aDP, string anAction) {
+ LOG_DEBUG(\"ObservationOutputProcs.pnl:doAction| Action required. found: \" + anAction);
+ // split action into essentials
+ dyn_string actionString;
+ if (!navFunct_splitAction(anAction,actionString)) {
+ return;
+ }
+
+ LOG_DEBUG(\"ObservationOutputProcs.pnl:doAction|found actionString: \" + actionString);
+
+ // Reload
+ if (actionString[1] == \"Reload\") {
+ reload();
+ }
+}
+
+void reload() {
+
+ navFunct_clearGlobalLists();
+
+ addOutputProcs();
+
+ // set the observation selectable items
+ prepareProcesses();
+
+ // set panel to ready
+ g_objectReady=true;
+
+ // trigger that the panel values are calculated and ready
+ navPanel_setEvent(\"ObservationInputBuffers.pnl\",\"Update\");
+}
+
+void addOutputProcs() {
+
+ // get all the outputProcs used for all active observations
+ dynClear(outputProcs);
+ for (int i =1; i <= dynlen(obsConnections); i++) {
+ string obs = dpSubStr(obsConnections[i],DPSUB_DP);
+ if (!dynContains(outputProcs,obs+\"_OutputProc\")) {
+ dynAppend(outputProcs,obs+\"_OutputProc\");
+ }
+ }
+ dynSort(outputProcs);
+}" 0
+ E E E E 1 -1 -1 0 0 0
+""0 1
+E "#uses \"navPanel.ctl\"
+
+string baseDP=\"\";
+dyn_string observationsList;
+dyn_string obsConnections;
+dyn_string oldObsConnections; // keep copy latest observations to be disconnected when the list changes
+dyn_string activeObservations;
+dyn_string outputProcs;
+
+string activeObsDP = \"\";
+string database;
+bool selectedObservations=false;
+" 0
+ 2
+"CBRef" "1"
+"EClose" E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+1 313 0 "" 0
+0
+1 314 0 "" 2
+0
+1 315 0 "" 4
+0
+1 316 1 "" 0
+0
+1 317 1 "" 2
+0
+1 318 1 "" 4
+0
+1 319 2 "" 0
+0
+1 320 2 "" 2
+0
+1 321 2 "" 4
+0
+1 322 3 "" 0
+0
+1 323 3 "" 2
+0
+1 324 3 "" 4
+0
+1 325 4 "" 0
+0
+1 326 4 "" 2
+0
+1 327 4 "" 4
+0
+1 328 5 "" 0
+0
+1 329 5 "" 2
+0
+1 330 5 "" 4
+0
+1 331 6 "" 0
+0
+1 332 6 "" 2
+0
+1 333 6 "" 4
+0
+1 334 7 "" 0
+0
+1 335 7 "" 2
+0
+1 336 7 "" 4
+0
+1 337 8 "" 0
+0
+1 338 8 "" 2
+0
+1 339 8 "" 4
+0
+1 340 9 "" 0
+0
+1 341 9 "" 2
+0
+1 342 9 "" 4
+0
+1 343 10 "" 0
+0
+1 344 10 "" 2
+0
+1 345 10 "" 4
+0
+1 346 11 "" 0
+0
+1 347 11 "" 2
+0
+1 348 11 "" 4
+0
+1 349 12 "" 0
+0
+1 350 12 "" 2
+0
+1 351 12 "" 4
+0
+1 352 13 "" 0
+0
+1 353 13 "" 2
+0
+1 354 13 "" 4
+0
+1 355 14 "" 0
+0
+1 356 14 "" 2
+0
+1 357 14 "" 4
+0
+1 358 15 "" 0
+0
+1 359 15 "" 2
+0
+1 360 15 "" 4
+0
+1 361 16 "" 0
+0
+1 362 16 "" 2
+0
+1 363 16 "" 4
+0
+1 364 17 "" 0
+0
+1 365 17 "" 2
+0
+1 366 17 "" 4
+0
+1 367 18 "" 0
+0
+1 368 18 "" 2
+0
+1 369 18 "" 4
+0
+1 370 19 "" 0
+0
+1 371 19 "" 2
+0
+1 372 19 "" 4
+0
+1 373 20 "" 0
+0
+1 374 20 "" 2
+0
+1 375 20 "" 4
+0
+1 376 21 "" 0
+0
+1 377 21 "" 2
+0
+1 378 21 "" 4
+0
+1 379 22 "" 0
+0
+1 380 22 "" 2
+0
+1 381 22 "" 4
+0
+1 382 23 "" 0
+0
+1 383 23 "" 2
+0
+1 384 23 "" 4
+0
+1 385 24 "" 0
+0
+1 386 24 "" 2
+0
+1 387 24 "" 4
+0
+1 388 25 "" 0
+0
+1 389 25 "" 2
+0
+1 390 25 "" 4
+0
+1 391 26 "" 0
+0
+1 392 26 "" 2
+0
+1 393 26 "" 4
+0
+1 394 27 "" 0
+0
+1 395 27 "" 2
+0
+1 396 27 "" 4
+0
+1 397 28 "" 0
+0
+1 398 28 "" 2
+0
+1 399 28 "" 4
+0
+1 400 29 "" 0
+0
+1 401 29 "" 2
+0
+1 402 29 "" 4
+0
+1 403 30 "" 0
+0
+1 404 30 "" 2
+0
+1 405 30 "" 4
+0
+1 406 31 "" 0
+0
+1 407 31 "" 2
+0
+1 408 31 "" 4
+0
+1 409 32 "" 0
+0
+1 410 32 "" 2
+0
+1 411 32 "" 4
+0
+1 412 33 "" 0
+0
+1 413 33 "" 2
+0
+1 414 33 "" 4
+0
+1 415 34 "" 0
+0
+1 416 34 "" 2
+0
+1 417 34 "" 4
+0
+1 418 35 "" 0
+0
+1 419 35 "" 2
+0
+1 420 35 "" 4
+0
+1 421 36 "" 0
+0
+1 422 36 "" 2
+0
+1 423 36 "" 4
+0
+1 424 37 "" 0
+0
+1 425 37 "" 2
+0
+1 426 37 "" 4
+0
+1 427 38 "" 0
+0
+1 428 38 "" 2
+0
+1 429 38 "" 4
+0
+1 430 39 "" 0
+0
+1 431 39 "" 2
+0
+1 432 39 "" 4
+0
+1 433 40 "" 0
+0
+1 434 40 "" 2
+0
+1 435 40 "" 4
+0
+1 436 41 "" 0
+0
+1 437 41 "" 2
+0
+1 438 41 "" 4
+0
+1 439 42 "" 0
+0
+1 440 42 "" 2
+0
+1 441 42 "" 4
+0
+1 442 43 "" 0
+0
+1 443 43 "" 2
+0
+1 444 43 "" 4
+0
+1 445 44 "" 0
+0
+1 446 44 "" 2
+0
+1 447 44 "" 4
+0
+1 448 45 "" 0
+0
+1 449 45 "" 2
+0
+1 450 45 "" 4
+0
+1 451 46 "" 0
+0
+1 452 46 "" 2
+0
+1 453 46 "" 4
+0
+1 454 47 "" 0
+0
+1 455 47 "" 2
+0
+1 456 47 "" 4
+0
+1 457 48 "" 0
+0
+1 458 48 "" 2
+0
+1 459 48 "" 4
+0
+1 460 49 "" 0
+0
+1 461 49 "" 2
+0
+1 462 49 "" 4
+0
+1 463 50 "" 0
+0
+1 464 50 "" 2
+0
+1 465 50 "" 4
+0
+1 466 51 "" 0
+0
+1 467 51 "" 2
+0
+1 468 51 "" 4
+0
+1 469 52 "" 0
+0
+1 470 52 "" 2
+0
+1 471 52 "" 4
+0
+1 472 53 "" 0
+0
+1 473 53 "" 2
+0
+1 474 53 "" 4
+0
+1 475 54 "" 0
+0
+1 476 54 "" 2
+0
+1 477 54 "" 4
+0
+1 478 55 "" 0
+0
+1 479 55 "" 2
+0
+1 480 55 "" 4
+0
+1 481 56 "" 0
+0
+1 482 56 "" 2
+0
+1 483 56 "" 4
+0
+1 484 57 "" 0
+0
+1 485 57 "" 2
+0
+1 486 57 "" 4
+0
+1 487 58 "" 0
+0
+1 488 58 "" 2
+0
+1 489 58 "" 4
+0
+1 490 59 "" 0
+0
+1 491 59 "" 2
+0
+1 492 59 "" 4
+0
+1 493 60 "" 0
+0
+1 494 60 "" 2
+0
+1 495 60 "" 4
+0
+1 496 61 "" 0
+0
+1 497 61 "" 2
+0
+1 498 61 "" 4
+0
+1 499 62 "" 0
+0
+1 500 62 "" 2
+0
+1 501 62 "" 4
+0
+1 502 63 "" 0
+0
+1 503 63 "" 2
+0
+1 504 63 "" 4
+0
+1 505 64 "" 0
+0
+1 506 64 "" 2
+0
+1 507 64 "" 4
+0
+1 508 65 "" 0
+0
+1 509 65 "" 2
+0
+1 510 65 "" 4
+0
+1 511 66 "" 0
+0
+1 512 66 "" 2
+0
+1 513 66 "" 4
+0
+1 514 67 "" 0
+0
+1 515 67 "" 2
+0
+1 516 67 "" 4
+0
+1 517 68 "" 0
+0
+1 518 68 "" 2
+0
+1 519 68 "" 4
+0
+1 520 69 "" 0
+0
+1 521 69 "" 2
+0
+1 522 69 "" 4
+0
+1 523 70 "" 0
+0
+1 524 70 "" 2
+0
+1 525 70 "" 4
+0
+1 526 71 "" 0
+0
+1 527 71 "" 2
+0
+1 528 71 "" 4
+0
+1 529 72 "" 0
+0
+1 530 72 "" 2
+0
+1 531 72 "" 4
+0
+1 532 73 "" 0
+0
+1 533 73 "" 2
+0
+1 534 73 "" 4
+0
+1 535 74 "" 0
+0
+1 536 74 "" 2
+0
+1 537 74 "" 4
+0
+1 538 75 "" 0
+0
+1 539 75 "" 2
+0
+1 540 75 "" 4
+0
+1 541 76 "" 0
+0
+1 542 76 "" 2
+0
+1 543 76 "" 4
+0
+1 544 77 "" 0
+0
+1 545 77 "" 2
+0
+1 546 77 "" 4
+0
+1 547 78 "" 0
+0
+1 548 78 "" 2
+0
+1 549 78 "" 4
+0
+1 550 79 "" 0
+0
+1 551 79 "" 2
+0
+1 552 79 "" 4
+0
+1 553 80 "" 0
+0
+1 554 80 "" 2
+0
+1 555 80 "" 4
+0
+1 556 81 "" 0
+0
+1 557 81 "" 2
+0
+1 558 81 "" 4
+0
+1 559 82 "" 0
+0
+1 560 82 "" 2
+0
+1 561 82 "" 4
+0
+1 562 83 "" 0
+0
+1 563 83 "" 2
+0
+1 564 83 "" 4
+0
+1 565 84 "" 0
+0
+1 566 84 "" 2
+0
+1 567 84 "" 4
+0
+1 568 85 "" 0
+0
+1 569 85 "" 2
+0
+1 570 85 "" 4
+0
+1 571 86 "" 0
+0
+1 572 86 "" 2
+0
+1 573 86 "" 4
+0
+1 574 87 "" 0
+0
+1 575 87 "" 2
+0
+1 576 87 "" 4
+0
+1 577 88 "" 0
+0
+1 578 88 "" 2
+0
+1 579 88 "" 4
+0
+1 580 89 "" 0
+0
+1 581 89 "" 2
+0
+1 582 89 "" 4
+0
+1 583 90 "" 0
+0
+1 584 90 "" 2
+0
+1 585 90 "" 4
+0
+1 586 91 "" 0
+0
+1 587 91 "" 2
+0
+1 588 91 "" 4
+0
+1 589 92 "" 0
+0
+1 590 92 "" 2
+0
+1 591 92 "" 4
+0
+1 592 93 "" 0
+0
+1 593 93 "" 2
+0
+1 594 93 "" 4
+0
+1 595 94 "" 0
+0
+1 596 94 "" 2
+0
+1 597 94 "" 4
+0
+1 598 95 "" 0
+0
+1 599 95 "" 2
+0
+1 600 95 "" 4
+0
+1 601 96 "" 0
+0
+1 602 96 "" 2
+0
+1 603 96 "" 4
+0
+1 604 97 "" 0
+0
+1 605 97 "" 2
+0
+1 606 97 "" 4
+0
+1 607 98 "" 0
+0
+1 608 98 "" 2
+0
+1 609 98 "" 4
+0
+1 610 99 "" 0
+0
+1 611 99 "" 2
+0
+1 612 99 "" 4
+0
+6 301
+"RECTANGLE2"
+""
+1 660 10 E E E 1 E 1 E N {0,0,0} E N "Lofar_operational" E E
+ E E
+100 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 272 72 1 E 660 10 674 24
+6 302
+"RECTANGLE4"
+""
+1 660 10 E E E 1 E 1 E N {0,0,0} E N "Lofar_maintenance" E E
+ E E
+101 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 272 102 1 E 660 10 674 24
+6 303
+"RECTANGLE5"
+""
+1 660 10 E E E 1 E 1 E N {0,0,0} E N "Lofar_suspicious" E E
+ E E
+102 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 272 132 1 E 660 10 674 24
+6 304
+"RECTANGLE6"
+""
+1 660 10 E E E 1 E 1 E N {0,0,0} E N "Lofar_broken" E E
+ E E
+103 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 272 162 1 E 660 10 674 24
+2 305
+"PRIMITIVE_TEXT10"
+""
+1 962 82 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+104 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 962 82 1013 95
+0 2 2 "0s" 0 0 0 192 0 0 962 82 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 7 <= 0.1%
+2 306
+"PRIMITIVE_TEXT14"
+""
+1 912 32 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+105 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 912 32 968 48
+0 2 2 "0s" 0 0 0 192 0 0 912 32 1
+1
+LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 8 legenda:
+2 307
+"PRIMITIVE_TEXT16"
+""
+1 862 114 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+106 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 862 114 904 127
+0 2 2 "0s" 0 0 0 192 0 0 862 114 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 6 > 0.1%
+2 308
+"PRIMITIVE_TEXT17"
+""
+1 862 144 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+107 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 862 144 904 157
+0 2 2 "0s" 0 0 0 192 0 0 862 144 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 6 > 0.5%
+2 309
+"PRIMITIVE_TEXT18"
+""
+1 862 174 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+108 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 862 174 904 187
+0 2 2 "0s" 0 0 0 192 0 0 862 174 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 6 > 5.0%
+2 310
+"PRIMITIVE_TEXT19"
+""
+1 964 114 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+109 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 964 114 1015 127
+0 2 2 "0s" 0 0 0 192 0 0 964 114 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 7 <= 0.5%
+2 311
+"PRIMITIVE_TEXT20"
+""
+1 964 144 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+110 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 964 144 1015 157
+0 2 2 "0s" 0 0 0 192 0 0 964 144 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 7 <= 5.0%
+2 312
+"PRIMITIVE_TEXT21"
+""
+1 964 174 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+111 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 964 174 1015 187
+0 2 2 "0s" 0 0 0 192 0 0 964 174 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 7 <= 0.1%
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+3 0 "PANEL_REF0" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 0 1 0 1 -140 -90
+1
+"$locusNode""1"
+3 1 "PANEL_REF1" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 1 1 0 1 -180 -90
+1
+"$locusNode""2"
+3 2 "PANEL_REF2" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 2 1 0 1 -220 -90
+1
+"$locusNode""3"
+3 3 "PANEL_REF3" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 3 1 0 1 -260 -90
+1
+"$locusNode""4"
+3 4 "PANEL_REF4" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 4 1 0 1 -300 -90
+1
+"$locusNode""5"
+3 5 "PANEL_REF5" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 5 1 0 1 -340 -90
+1
+"$locusNode""6"
+3 6 "PANEL_REF6" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 6 1 0 1 -380 -90
+1
+"$locusNode""7"
+3 7 "PANEL_REF7" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 7 1 0 1 -430 -90
+1
+"$locusNode""8"
+3 8 "PANEL_REF8" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 8 1 0 1 -270 -90
+1
+"$locusNode""9"
+3 9 "PANEL_REF9" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 9 1 0 1 -310 -90
+1
+"$locusNode""10"
+3 10 "PANEL_REF10" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 10 1 0 1 -140 -10
+1
+"$locusNode""11"
+3 11 "PANEL_REF11" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 11 1 0 1 -180 -10
+1
+"$locusNode""12"
+3 12 "PANEL_REF12" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 12 1 0 1 -220 -10
+1
+"$locusNode""13"
+3 13 "PANEL_REF13" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 13 1 0 1 -260 -10
+1
+"$locusNode""14"
+3 14 "PANEL_REF14" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 14 1 0 1 -300 -10
+1
+"$locusNode""15"
+3 15 "PANEL_REF15" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 15 1 0 1 -340 -10
+1
+"$locusNode""16"
+3 16 "PANEL_REF16" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 16 1 0 1 -380 -10
+1
+"$locusNode""17"
+3 17 "PANEL_REF17" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 17 1 0 1 -430 -10
+1
+"$locusNode""18"
+3 18 "PANEL_REF18" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 18 1 0 1 -270 -10
+1
+"$locusNode""19"
+3 19 "PANEL_REF19" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 19 1 0 1 -310 -10
+1
+"$locusNode""20"
+3 20 "PANEL_REF20" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 20 1 0 1 -140 70
+1
+"$locusNode""21"
+3 21 "PANEL_REF21" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 21 1 0 1 -180 70
+1
+"$locusNode""22"
+3 22 "PANEL_REF22" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 22 1 0 1 -220 70
+1
+"$locusNode""23"
+3 23 "PANEL_REF23" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 23 1 0 1 -260 70
+1
+"$locusNode""24"
+3 24 "PANEL_REF24" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 24 1 0 1 -300 70
+1
+"$locusNode""25"
+3 25 "PANEL_REF25" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 25 1 0 1 -340 70
+1
+"$locusNode""26"
+3 26 "PANEL_REF26" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 26 1 0 1 -380 70
+1
+"$locusNode""27"
+3 27 "PANEL_REF27" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 27 1 0 1 -430 70
+1
+"$locusNode""28"
+3 28 "PANEL_REF28" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 28 1 0 1 -270 70
+1
+"$locusNode""29"
+3 29 "PANEL_REF29" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 29 1 0 1 -310 70
+1
+"$locusNode""30"
+3 30 "PANEL_REF30" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 30 1 0 1 -140 150
+1
+"$locusNode""31"
+3 31 "PANEL_REF31" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 31 1 0 1 -180 150
+1
+"$locusNode""32"
+3 32 "PANEL_REF32" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 32 1 0 1 -220 150
+1
+"$locusNode""33"
+3 33 "PANEL_REF33" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 33 1 0 1 -260 150
+1
+"$locusNode""34"
+3 34 "PANEL_REF34" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 34 1 0 1 -300 150
+1
+"$locusNode""35"
+3 35 "PANEL_REF35" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 35 1 0 1 -340 150
+1
+"$locusNode""36"
+3 36 "PANEL_REF36" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 36 1 0 1 -380 150
+1
+"$locusNode""37"
+3 37 "PANEL_REF37" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 37 1 0 1 -430 150
+1
+"$locusNode""38"
+3 38 "PANEL_REF38" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 38 1 0 1 -270 150
+1
+"$locusNode""39"
+3 39 "PANEL_REF39" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 39 1 0 1 -310 150
+1
+"$locusNode""40"
+3 40 "PANEL_REF40" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 40 1 0 1 -140 230
+1
+"$locusNode""41"
+3 41 "PANEL_REF41" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 41 1 0 1 -180 230
+1
+"$locusNode""42"
+3 42 "PANEL_REF42" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 42 1 0 1 -220 230
+1
+"$locusNode""43"
+3 43 "PANEL_REF43" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 43 1 0 1 -260 230
+1
+"$locusNode""44"
+3 44 "PANEL_REF44" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 44 1 0 1 -300 230
+1
+"$locusNode""45"
+3 45 "PANEL_REF45" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 45 1 0 1 -340 230
+1
+"$locusNode""46"
+3 46 "PANEL_REF46" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 46 1 0 1 -380 230
+1
+"$locusNode""47"
+3 47 "PANEL_REF47" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 47 1 0 1 -430 230
+1
+"$locusNode""48"
+3 48 "PANEL_REF48" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 48 1 0 1 -270 230
+1
+"$locusNode""49"
+3 49 "PANEL_REF49" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 49 1 0 1 -310 230
+1
+"$locusNode""50"
+3 50 "PANEL_REF50" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 50 1 0 1 -140 310
+1
+"$locusNode""51"
+3 51 "PANEL_REF51" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 51 1 0 1 -180 310
+1
+"$locusNode""52"
+3 52 "PANEL_REF52" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 52 1 0 1 -220 310
+1
+"$locusNode""53"
+3 53 "PANEL_REF53" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 53 1 0 1 -260 310
+1
+"$locusNode""54"
+3 54 "PANEL_REF54" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 54 1 0 1 -300 310
+1
+"$locusNode""55"
+3 55 "PANEL_REF55" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 55 1 0 1 -340 310
+1
+"$locusNode""56"
+3 56 "PANEL_REF56" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 56 1 0 1 -380 310
+1
+"$locusNode""57"
+3 57 "PANEL_REF57" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 57 1 0 1 -430 310
+1
+"$locusNode""58"
+3 58 "PANEL_REF58" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 58 1 0 1 -270 310
+1
+"$locusNode""59"
+3 59 "PANEL_REF59" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 59 1 0 1 -310 310
+1
+"$locusNode""60"
+3 60 "PANEL_REF60" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 60 1 0 1 -140 390
+1
+"$locusNode""61"
+3 61 "PANEL_REF61" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 61 1 0 1 -180 390
+1
+"$locusNode""62"
+3 62 "PANEL_REF62" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 62 1 0 1 -220 390
+1
+"$locusNode""63"
+3 63 "PANEL_REF63" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 63 1 0 1 -260 390
+1
+"$locusNode""64"
+3 64 "PANEL_REF64" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 64 1 0 1 -300 390
+1
+"$locusNode""65"
+3 65 "PANEL_REF65" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 65 1 0 1 -340 390
+1
+"$locusNode""66"
+3 66 "PANEL_REF66" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 66 1 0 1 -380 390
+1
+"$locusNode""67"
+3 67 "PANEL_REF67" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 67 1 0 1 -430 390
+1
+"$locusNode""68"
+3 68 "PANEL_REF68" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 68 1 0 1 -270 390
+1
+"$locusNode""69"
+3 69 "PANEL_REF69" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 69 1 0 1 -310 390
+1
+"$locusNode""70"
+3 70 "PANEL_REF70" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 70 1 0 1 -140 470
+1
+"$locusNode""71"
+3 71 "PANEL_REF71" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 71 1 0 1 -180 470
+1
+"$locusNode""72"
+3 72 "PANEL_REF72" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 72 1 0 1 -220 470
+1
+"$locusNode""73"
+3 73 "PANEL_REF73" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 73 1 0 1 -260 470
+1
+"$locusNode""74"
+3 74 "PANEL_REF74" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 74 1 0 1 -300 470
+1
+"$locusNode""75"
+3 75 "PANEL_REF75" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 75 1 0 1 -340 470
+1
+"$locusNode""76"
+3 76 "PANEL_REF76" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 76 1 0 1 -380 470
+1
+"$locusNode""77"
+3 77 "PANEL_REF77" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 77 1 0 1 -430 470
+1
+"$locusNode""78"
+3 78 "PANEL_REF78" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 78 1 0 1 -270 470
+1
+"$locusNode""79"
+3 79 "PANEL_REF79" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 79 1 0 1 -310 470
+1
+"$locusNode""80"
+3 80 "PANEL_REF80" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 80 1 0 1 -140 550
+1
+"$locusNode""81"
+3 81 "PANEL_REF81" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 81 1 0 1 -180 550
+1
+"$locusNode""82"
+3 82 "PANEL_REF82" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 82 1 0 1 -220 550
+1
+"$locusNode""83"
+3 83 "PANEL_REF83" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 83 1 0 1 -260 550
+1
+"$locusNode""84"
+3 84 "PANEL_REF84" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 84 1 0 1 -300 550
+1
+"$locusNode""85"
+3 85 "PANEL_REF85" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 85 1 0 1 -340 550
+1
+"$locusNode""86"
+3 86 "PANEL_REF86" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 86 1 0 1 -380 550
+1
+"$locusNode""87"
+3 87 "PANEL_REF87" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 87 1 0 1 -430 550
+1
+"$locusNode""88"
+3 88 "PANEL_REF88" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 88 1 0 1 -270 550
+1
+"$locusNode""89"
+3 89 "PANEL_REF89" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 89 1 0 1 -310 550
+1
+"$locusNode""90"
+3 90 "PANEL_REF90" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 230 170 T 90 1 0 1 -140 630
+1
+"$locusNode""91"
+3 91 "PANEL_REF91" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 350 170 T 91 1 0 1 -180 630
+1
+"$locusNode""92"
+3 92 "PANEL_REF92" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 470 170 T 92 1 0 1 -220 630
+1
+"$locusNode""93"
+3 93 "PANEL_REF93" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 590 170 T 93 1 0 1 -260 630
+1
+"$locusNode""94"
+3 94 "PANEL_REF94" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 710 170 T 94 1 0 1 -300 630
+1
+"$locusNode""95"
+3 95 "PANEL_REF95" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 830 170 T 95 1 0 1 -340 630
+1
+"$locusNode""96"
+3 96 "PANEL_REF96" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 950 170 T 96 1 0 1 -380 630
+1
+"$locusNode""97"
+3 97 "PANEL_REF97" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1080 170 T 97 1 0 1 -430 630
+1
+"$locusNode""98"
+3 98 "PANEL_REF98" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1000 170 T 98 1 0 1 -270 630
+1
+"$locusNode""99"
+3 99 "PANEL_REF99" -1
+"objects\\Processes\\cobaltOutputProc.pnl" 1120 170 T 99 1 0 1 -310 630
+1
+"$locusNode""100"
+0
diff --git a/MAC/Navigator2/panels/Processes/ObservationWEmbedded.pnl b/MAC/Navigator2/panels/Processes/ObservationWEmbedded.pnl
deleted file mode 100644
index d94bdaa0aa86f88549c55b824baa53b6772bf2a3..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Processes/ObservationWEmbedded.pnl
+++ /dev/null
@@ -1,234 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 1200 823 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
- baseDP = g_currentDatapoint;
- dpGet(baseDP+\".observationName\",observationNr);
- observationName=\"Observation\"+observationNr;
- TopLabel.text(observationName+\" Writers\");
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"ObservationWEmbedded.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"ObservationWEmbedded.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
- reload();
- }
-}
-
-void reload() {
-
- navFunct_clearGlobalLists();
-
- addWriters();
-
-}
-
-void addWriters() {
-
- // get all the InputBuffers used by this observation
- writers = navFunct_getWritersForObservation(observationName);
-
-}
-" 0
- E E E E 1 -1 -1 0 200 170
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string baseDP=\"\";
-string observationNr;
-string observationName;
-dyn_string writers;
-" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
-LAYER, 0
-1
-LANG:1 0
-29 0
-"WriterModule"
-""
-1 200 196.8798618588811 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-0 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 0 60 1199 820
-15 Canvas.Canvas.1
-0
-"main(bool enter)
-{
- this.ModuleName = \"WriterModule\";
-
- RootPanelOnModule(\"Processes/ObservationWriters.pnl\",\"\",\"WriterModule\",\"\");
-
-}" 0
-2 30
-"TopLabel"
-""
-1 412 2 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
- E E
-30 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 412 2 570 22
-0 2 2 "0s" 0 0 0 192 0 0 412 2 1
-1
-LANG:1 33 MS Shell Dlg,-1,16,5,75,0,0,0,0,0
-0 1
-LANG:1 19 Observation Writers
-2 31
-"PRIMITIVE_TEXT2"
-""
-1 42 34 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-31 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 42 34 83 47
-0 2 2 "0s" 0 0 0 192 0 0 42 34 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 7 written
-2 32
-"PRIMITIVE_TEXT3"
-""
-1 152 34 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-32 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 152 34 199 47
-0 2 2 "0s" 0 0 0 192 0 0 152 34 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 7 dropped
-2 33
-"PRIMITIVE_TEXT5"
-""
-1 302 34 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-33 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 302 34 355 47
-0 2 2 "0s" 0 0 0 192 0 0 302 34 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 8 dataRate
-2 34
-"PRIMITIVE_TEXT7"
-""
-1 400 34 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-34 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 400 34 498 47
-0 2 2 "0s" 0 0 0 192 0 0 400 34 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 15 dataProductType
-2 35
-"PRIMITIVE_TEXT23"
-""
-1 530 34 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-35 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 530 34 579 47
-0 2 2 "0s" 0 0 0 192 0 0 530 34 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 8 fileName
-0
-LAYER, 1
-1
-LANG:1 0
-0
-LAYER, 2
-1
-LANG:1 0
-0
-LAYER, 3
-1
-LANG:1 0
-0
-LAYER, 4
-1
-LANG:1 0
-0
-LAYER, 5
-1
-LANG:1 0
-0
-LAYER, 6
-1
-LANG:1 0
-0
-LAYER, 7
-1
-LANG:1 0
-0
-0
diff --git a/MAC/Navigator2/panels/Processes/ObservationWriters.pnl b/MAC/Navigator2/panels/Processes/ObservationWriters.pnl
deleted file mode 100644
index 9177325cf9331a9105745bcb0166b9a82395b7c1..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Processes/ObservationWriters.pnl
+++ /dev/null
@@ -1,184 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 1200 7500 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
- baseDP = g_currentDatapoint;
- dpGet(baseDP+\".observationName\",observationNr);
- observationName=\"Observation\"+observationNr;
- strModuleName = myModuleName();
-
- reload();
-
-}
-
-void prepareProcesses() {
- dyn_string result;
- string connectTo=MainDBName+claimManager_nameToRealName(\"LOFAR_ObsSW_\"+observationName);
- dynAppend(result,\",\"+observationName+\",\"+connectTo);
-
- string osnr=\"\";
- string wnr=\"\";
- string oldNr=\"\";
- for (int i=1; i<= dynlen(writers); i++) {
- osnr = substr(writers[i],strpos(writers[i],\"OSLocusNode\")+11,3);
- wnr = substr(writers[i],strpos(writers[i],\"Writer\")+6,2);
- if (osnr != oldNr) {
- dynAppend(result,connectTo+\",IONode\"+osnr+\",\"+CEPDBName+\"LOFAR_ObsSW_OSLocusNode\"+osnr);
- oldNr=osnr;
- }
- dynAppend(result,CEPDBName+\"LOFAR_ObsSW_OSLocusNode\"+osnr+\",_Writer\"+wnr+\",\"+writers[i]);
- dynAppend(g_processesList,writers[i]);
- }
-
- // write result to the db so various panels can reset themselves
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".processesList\",result);
-
- LOG_DEBUG(\"ObservationWriters.pnl:prepareProcesses|processList found: \"+ result);
-
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"ObservationWriters.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"ObservationWriters.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
- reload();
- }
-}
-
-void reload() {
-
- navFunct_clearGlobalLists();
-
- addWriters();
-
- // set the observation selectable items
- prepareProcesses();
-
- redraw();
-
- // set panel to ready
- g_objectReady=true;
-
- // trigger that the panel values are calculated and ready
- navPanel_setEvent(\"ObservationWriters.pnl\",\"Update\");
-}
-
-void addWriters() {
-
- // get all the Writers used by this observation
- writers = navFunct_getWritersForObservation(observationName);
-}" 0
- E E E E 1 -1 -1 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string baseDP=\"\";
-string observationNr;
-string observationName;
-dyn_string writers;
-bool connected = false;
-dyn_string WRefNames;
-string strModuleName;
-
-
-void clearWRefNames() {
- // remove all symbols because new ones will be added
- for (int i=1; i <= dynlen(WRefNames); i++) {
- removeSymbol(strModuleName,\"\",WRefNames[i]);
- }
- dynClear(WRefNames);
-}
-
-void redraw() {
- string barColor = \"_3DFace\";
- if (dynlen(WRefNames) > 0) {
- clearWRefNames();
- }
- int xPos_AddSymbol = 0;
- int yPos_AddSymbol = 0;
- int ref = 1;
- string addPanelName = \"objects/Processes/writerDetail.pnl\";
- //loop over list and prepare panel with all writer objects
- for (int i=1; i<= dynlen(writers); i++) {
- if ((float)i/2. != floor(i/2.)) {
- barColor = \"lightgrey\";
- } else {
- barColor = \"_3DFace\";
- }
- WRefNames[ref]=\"W\"+(ref);
-
- if ( addSymbol( strModuleName, // Stay in this modul
- \"\", // Name of this panel
- addPanelName, // Panel to add
- WRefNames[ref], // Ref of the addedPanel
- makeDynString( \"$writer:\" + writers[i],
- \"$barColor:\" + barColor) , // Define all $values
- xPos_AddSymbol, // Xpos of the AddedSymbol
- yPos_AddSymbol, // Ypos of the AddedSymbol
- 0, // angle
- 1 ,1 // zoomX , zoomY
- ) < 0 ) {
- LOG_ERROR(\"ObservationWriters.pnl:redraw|Error Appending writer for: \" + writers[i] + \" in this panel.\");
- }
- yPos_AddSymbol += 14;
- ref++;
- }
-
-}
-
-
-" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
-LAYER, 0
-1
-LANG:1 0
-0
-LAYER, 1
-1
-LANG:1 0
-0
-LAYER, 2
-1
-LANG:1 0
-0
-LAYER, 3
-1
-LANG:1 0
-0
-LAYER, 4
-1
-LANG:1 0
-0
-LAYER, 5
-1
-LANG:1 0
-0
-LAYER, 6
-1
-LANG:1 0
-0
-LAYER, 7
-1
-LANG:1 0
-0
-0
diff --git a/MAC/Navigator2/panels/Test/test.pnl b/MAC/Navigator2/panels/Test/test.pnl
index 6983cf90138ef4fba62eba5f3f359d56e695531e..3e671f0fd0fb7e48fb280543de59fd201beccab6 100644
--- a/MAC/Navigator2/panels/Test/test.pnl
+++ b/MAC/Navigator2/panels/Test/test.pnl
@@ -5,14 +5,8 @@ LANG:6 0
PANEL,-1 -1 838 396 N "_3DFace" 0
"main()
{
- DebugN(\"MainPanel started\");
- dyn_mapping t1,t2;
- t1 = getUsersInGroupPVSS(0);
- DebugN(t1);
- DebugN(\"mapping len: \", dynlen(t1));
- t2 = getUsersInGroupPVSS(5);
- DebugN(t2);
- DebugN(\"mapping len: \", dynlen(t2));
+ dyn_string aS = makeDynString(\"A\",\"B\",\"kjbdkbdsk\",\"TempObs0123\",\"kjbndkbna\");
+ DebugN(dynPatternMatch(\"TempObs*\", aS));
}" 0
E E E E 1 -1 -1 0 50 30
""0 1
diff --git a/MAC/Navigator2/panels/main.pnl b/MAC/Navigator2/panels/main.pnl
index ec6a360b188f69833db9f293ce62a99021e42d7b..e4b5f0f5554ee4e67cebd95f1781de1bcd43ac75 100644
--- a/MAC/Navigator2/panels/main.pnl
+++ b/MAC/Navigator2/panels/main.pnl
@@ -162,7 +162,7 @@ void addBackLines() {
}
yPos_AddSymbol += 12;
ref++;
- addProcesses(stationList[i]+\":\");
+// addProcesses(stationList[i]+\":\");
}
dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".processesList\",station_result);
}
@@ -779,13 +779,17 @@ LANG:1 5 AardF
0
1 182 4 "" 3
0
-1 183 5 "" 0
+1 183 4 "" 4
0
-1 184 6 "" 1
+1 184 5 "" 0
0
-1 185 6 "" 2
+1 185 5 "" 1
0
-1 186 7 "" 0
+1 186 6 "" 1
+0
+1 187 6 "" 2
+0
+1 188 7 "" 0
0
0
LAYER, 1
diff --git a/MAC/Navigator2/panels/objects/Processes/CCUSWLevelView.pnl b/MAC/Navigator2/panels/objects/Processes/CCUSWLevelView.pnl
index a59d3ec4b34233b73016026a3da6faf26317f04b..0cb6f6ab7932794130b0512508b97e983dd03c60 100644
--- a/MAC/Navigator2/panels/objects/Processes/CCUSWLevelView.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/CCUSWLevelView.pnl
@@ -108,7 +108,7 @@ LANG:1 0
4 24
"swline1"
""
-1 83 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 99 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
31 0 0 0 0 0
E E E
@@ -118,11 +118,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 83 0 83 9
+E E 0 3 1 2 1 E 99 0 99 9
4 25
"swline2"
""
-1 126 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 142 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
32 0 0 0 0 0
E E E
@@ -132,11 +132,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 126 0 126 9
+E E 0 3 1 2 1 E 142 0 142 9
4 26
"swline3"
""
-1 176 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 192 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
33 0 0 0 0 0
E E E
@@ -146,11 +146,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 176 0 176 9
+E E 0 3 1 2 1 E 192 0 192 9
4 27
"swline4"
""
-1 210 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 226 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
34 0 0 0 0 0
E E E
@@ -160,11 +160,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 210 0 210 9
+E E 0 3 1 2 1 E 226 0 226 9
4 28
"swline5"
""
-1 250 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 266 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
35 0 0 0 0 0
E E E
@@ -174,7 +174,7 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 250 0 250 9
+E E 0 3 1 2 1 E 266 0 266 9
4 29
"swline6"
""
@@ -191,6 +191,8 @@ LANG:1 0
E E 0 3 1 2 1 E 370 0 370 9
1 37 14 "" 0
0
+1 38 15 "" 0
+0
0
LAYER, 1
1
@@ -260,4 +262,9 @@ LANG:1 0
2
"$name""PermSW_Daemons_PVSSGateway"
"$station""$station"
+3 15 "PANEL_REF15" -1
+"objects\\Processes\\SWControler_small.pnl" 0 0 T 37 1 0 1 80 0
+2
+"$name""PermSW_Daemons_MessageRouter"
+"$station""$station"
0
diff --git a/MAC/Navigator2/panels/objects/Processes/GPUProcDetail.pnl b/MAC/Navigator2/panels/objects/Processes/GPUProcDetail.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..90f8df236d17d168df6397a4f69816f5c82eff36
--- /dev/null
+++ b/MAC/Navigator2/panels/objects/Processes/GPUProcDetail.pnl
@@ -0,0 +1,335 @@
+V 11
+1
+LANG:1 0
+PANEL,-1 -1 1028 66 N "_3DFace" 3
+"$barColor"
+"$gpuProc"
+"$yPos_AddSymbol"
+"main()
+{
+
+ barColor = $barColor;
+ strModuleName = myModuleName();
+ setValue(\"bar\",\"backCol\",barColor);
+
+ baseDP = g_currentDatapoint;
+ GPUProcDP = $gpuProc;
+
+ // connect to the gpuProcvalues
+ // check if the requiered datapoint for this view are enabled and accessible
+ if (dpExists(GPUProcDP + \".status.state\")) {
+ if (!dpConnect(\"updateGPUProc\", GPUProcDP + \".observationName\",
+ GPUProcDP + \".dataProductType\",
+ GPUProcDP + \".subband\",
+ GPUProcDP + \".dropping\",
+ GPUProcDP + \".written\",
+ GPUProcDP + \".dropped\",
+ GPUProcDP + \".status.state:_online.._invalid\") == -1) {
+ LOG_ERROR(\"GPUProcDetail.pnl:updateTrigger|Couldn't connect to: \"+GPUProcDP+\" \"+getLastError());
+ }
+ } else {
+ LOG_ERROR(\"GPUProcDetail.pnl:updateTrigger|Couldn't find DP to connect to: \"+GPUProcDP);
+ setValue(\"observationName\", \"backCol\", \"Lofar_dpdoesnotexist\");
+ setValue(\"dataProductType\", \"backCol\", \"Lofar_dpdoesnotexist\");
+ setValue(\"subband\", \"backCol\", \"Lofar_dpdoesnotexist\");
+ setValue(\"dropping\", \"backCol\", \"Lofar_dpdoesnotexist\");
+ setValue(\"written\", \"backCol\", \"Lofar_dpdoesnotexist\");
+ setValue(\"dropped\", \"backCol\", \"Lofar_dpdoesnotexist\");
+ }
+
+ // pass baseDP to selfstate Object to work with
+ setValue(\"selfState.light\",\"toolTipText\",GPUProcDP);
+
+ // connect for selfUpdates
+ showSelfState(GPUProcDP);
+}
+
+
+updateGPUProc(string dp1, string observationName,
+ string dp2, string dataProductType,
+ string dp3, dyn_int subband,
+ string dp4, dyn_bool dropping,
+ string dp5, dyn_float written,
+ string dp6, dyn_float dropped,
+ string dp7, bool invalid)
+{
+
+ LOG_DEBUG(\"GPUProcDetail.pnl:update|entered\");
+
+ observation=observationName;
+ string dp = dpSubStr(dp1,DPSUB_DP);
+ string color = \"Lofar_operational\";
+ // get Node and gpu numbers out of the datapoint
+ int cbt = (substr(dp1,strpos(dp1,\"OSCBT\")+5,3));
+ int gpu = (substr(dp1,strpos(dp1,\"CobaltGPUProc\")+13,2));
+ CBTstr.text = cbt;
+ GPUstr.text = gpu;
+
+ if (!invalid) {
+ setValue(\"observationName\", \"text\", observationName);
+ setValue(\"dataProductType\", \"text\", dataProductType);
+ if (dynContains(dropping,\"True\") ) color = \"Lofar_broken\";
+ setValue(\"dropping\", \"backCol\",color);
+
+ } else {
+ setValue(\"observationName\", \"text\", \"\");
+ setValue(\"dataProductType\", \"text\", \"\");
+ setValue(\"written\", \"text\", \"\");
+ setValue(\"dropped\", \"text\", \"\");
+ setValue(\"dropping\", \"backCol\",\"Lofar_invalid\");
+ }
+
+ addSubbands(subband, written, dropped, invalid);
+
+}
+" 0
+ E E E E 1 -1 -1 0 0 0
+""0 1
+E "#uses \"navPanel.ctl\"
+
+string GPUProc=\"\";
+string database=\"\";
+string observation=\"\";
+
+string baseDP = \"\";
+string GPUProcDP=\"\";
+string barColor=\"\";
+
+bool bDoubleClicked = false;
+
+dyn_string oldSubbandRefNames;
+string strModuleName;
+
+
+void clearOldSubbandRefNames() {
+ // remove all symbols because new ones will be added
+ for (int i=1; i <= dynlen(oldSubbandRefNames); i++) {
+ removeSymbol(strModuleName,\"\",oldSubbandRefNames[i]);
+ }
+ dynClear(oldSubbandRefNames);
+}
+
+// routine for single mouse click
+void click(string dp) {
+ // set delay in case double click was meant
+ delay(0, 100);
+ if (!bDoubleClicked) {
+ if (dp == stationDP) {
+ navPanel_setEvent(\"GPUProc\",\"EventClick\");
+ }
+ }
+}
+
+// routine for double mouse click
+void dblClick(string dp) {
+ // indicate this is a doubleClick
+ bDoubleClicked = true;
+
+ if (dpExists(dp) ) {
+ LOG_DEBUG(\"GPUProcDetail.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+dp);
+ g_currentDatapoint=dp;
+ navPanel_setEvent(\"GPUProcDetail.pnl\",\"ChangePanel\");
+ }
+ // set delay to avoid click event will be triggered
+ delay(0, 500);
+ bDoubleClicked = false;
+}
+
+// routine for right mouse click
+void rClick(string dp) {
+ navPanel_setEvent(\"GPUProcDetail.pnl\",\"EventRightClick\");
+}
+
+// add subbandinformation
+void addSubbands(dyn_int subbands, dyn_float written, dyn_float dropped, bool invalid) {
+ LOG_DEBUG(\"GPUProcDetail.pnl:addSubbands\");
+
+ dyn_string subbandRefNames;
+ if (dynlen(oldSubbandRefNames) > 0) {
+ clearOldSubbandRefNames();
+ }
+ int xPos_AddSymbol = 265;
+ int ref = 1;
+ string addPanelName = \"objects/Processes/GPUProcSubbandInfo.pnl\";
+ //loop over list and prepare panel with all subband objects
+ for (int i=1; i<= dynlen(subbands); i++) {
+ subbandRefNames[ref]=\"subband\"+(subbands[i]);
+
+ // sometimes it is possible that the trigger for this function is faster then
+ // cobalt has written all the buffers, so we will get an index out of range
+ // to avoid this we will set the value at the index to 0
+
+ if (dynlen(written) < i) dynAppend(written,0);
+ if (dynlen(dropped) < i) dynAppend(dropped,0);
+
+ if ( addSymbol( strModuleName, // Stay in this modul
+ \"\", // Name of this panel
+ addPanelName, // Panel to add
+ subbandRefNames[ref], // Ref of the addedPanel
+ makeDynString( \"$subband:\" + subbands[i],
+ \"$dropped:\" + dropped[i],
+ \"$written:\" + written[i],
+ \"$observation:\" + observation,
+ \"$invalid:\" + invalid), // Define all $values
+ xPos_AddSymbol, // Xpos of the AddedSymbol
+ $yPos_AddSymbol, // Ypos of the AddedSymbol
+ 0, // angle
+ 1 ,1 // zoomX , zoomY
+ ) < 0 ) {
+ LOG_ERROR(\"GPUProcDetail.pnl:addSubbandsError Appending symbol for: \" + subbands[i] + \" in this panel.\");
+ }
+ xPos_AddSymbol += 14;
+ ref++;
+ }
+ oldSubbandRefNames = subbandRefNames;
+
+
+}
+" 0
+ 2
+"CBRef" "1"
+"EClose" E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+6 16
+"bar"
+""
+1 0 0 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
+ E E
+15 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 1 E 0 3 259 17
+1 25 0 "" 1
+0
+6 18
+"dropping"
+""
+1 90 30 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+ E E
+16 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 155 -25 1 E 90 30 100 40
+2 20
+"observationName"
+""
+1 50 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+17 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 50 4 67 17
+0 2 2 "0s" 0 0 0 192 0 0 50 4 1
+1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 1
+LANG:1 3 obs
+2 22
+"CBTstr"
+""
+1 20 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+18 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 20 4 26 17
+0 2 2 "0s" 0 0 0 192 0 0 20 4 1
+1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 1
+LANG:1 1 1
+2 23
+"GPUstr"
+""
+1 30 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+19 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 30 4 36 17
+0 2 2 "0s" 0 0 0 192 0 0 30 4 1
+1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 1
+LANG:1 1 0
+2 24
+"dataProductType"
+""
+1 102 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+20 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 102 4 222 17
+0 2 2 "0s" 0 0 0 192 0 0 102 4 1
+1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 1
+LANG:1 23 correlated & beamformer
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+3 0 "selfState" -1
+"objects\\lofar_self_state.pnl" 7 18 T 15 0.7142857142857143 0 0.7142857142857143 -4 -9.857142857142858
+0
+0
diff --git a/MAC/Navigator2/panels/objects/Processes/GPUProcSubbandInfo.pnl b/MAC/Navigator2/panels/objects/Processes/GPUProcSubbandInfo.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..20e95bb835f5d9ad5fae0f2f2fbaf77f33232729
--- /dev/null
+++ b/MAC/Navigator2/panels/objects/Processes/GPUProcSubbandInfo.pnl
@@ -0,0 +1,99 @@
+V 11
+1
+LANG:1 0
+PANEL,-1 -1 114 79 N "_3DFace" 5
+"$dropped"
+"$invalid"
+"$observation"
+"$subband"
+"$written"
+"main()
+{
+
+ float dropped = $dropped;
+ float written = $written;
+ if ($invalid) {
+ subbandInfo.backCol(\"Lofar_invalid\");
+ subbandInfo.toolTipText = \"\";
+ } else {
+ // calc % dropped
+ float percdropped = dropped / (written + dropped) * 100;
+ subbandInfo.backCol(getColor(percdropped));
+
+ tooltip = \"Observation: \" + $observation + \"\\n\" +
+ \"Subband: \" + $subband + \"\\n\" +
+ \"Written: \" + $written + \"\\n\" +
+ \"Dropped: \" + $dropped;
+ subbandInfo.toolTipText(tooltip);
+ }
+}
+
+string getColor(float val) {
+ string color = \"Lofar_off\";
+ if (val <= 0.1) color = \"Lofar_operational\";
+ if (val > 0.1 && val <= 0.5) {
+ color = \"Lofar_test\";
+ } else if (val > 0.5 && val <= 5.0) {
+ color = \"Lofar_suspicious\";
+ } else if (val > 5.0) {
+ color = \"Lofar_broken\";
+ }
+ return color;
+}
+" 0
+ E E E E 1 -1 -1 0 0 0
+""0 1
+E "string tooltip = \"\";
+ " 0
+ 2
+"CBRef" "1"
+"EClose" E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+6 0
+"subbandInfo"
+""
+1 270 20 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+ E E
+0 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 -270 -17 1 E 270 20 284 34
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+0
diff --git a/MAC/Navigator2/panels/objects/Processes/MCUSWLevelView.pnl b/MAC/Navigator2/panels/objects/Processes/MCUSWLevelView.pnl
index e27cb15224c3e2720d5975447efa378fa66facd0..a757c4b6320d5bf59500a84af61194edb65e266a 100644
--- a/MAC/Navigator2/panels/objects/Processes/MCUSWLevelView.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/MCUSWLevelView.pnl
@@ -108,7 +108,7 @@ LANG:1 0
4 24
"swline1"
""
-1 68 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 82 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
31 0 0 0 0 0
E E E
@@ -118,11 +118,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 68 0 68 9
+E E 0 3 1 2 1 E 82 0 82 9
4 25
"swline2"
""
-1 126 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 140 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
32 0 0 0 0 0
E E E
@@ -132,11 +132,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 126 0 126 9
+E E 0 3 1 2 1 E 140 0 140 9
4 26
"swline3"
""
-1 176 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 190 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
33 0 0 0 0 0
E E E
@@ -146,11 +146,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 176 0 176 9
+E E 0 3 1 2 1 E 190 0 190 9
4 27
"swline4"
""
-1 210 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 224 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
34 0 0 0 0 0
E E E
@@ -160,11 +160,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 210 0 210 9
+E E 0 3 1 2 1 E 224 0 224 9
4 28
"swline5"
""
-1 250 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
+1 264 0 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
35 0 0 0 0 0
E E E
@@ -174,7 +174,7 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 250 0 250 9
+E E 0 3 1 2 1 E 264 0 264 9
4 30
"swline6"
""
@@ -189,6 +189,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
E E 0 3 1 2 1 E 370 0 370 9
+1 38 14 "" 0
+0
0
LAYER, 1
1
@@ -253,4 +255,9 @@ LANG:1 0
2
"$name""ObservationControl"
"$station""$station"
+3 14 "PANEL_REF14" -1
+"objects\\Processes\\SWControler_small.pnl" 50 0 T 38 1 0 1 14 0
+2
+"$name""PermSW_Daemons_FeedbackService"
+"$station""$station"
0
diff --git a/MAC/Navigator2/panels/objects/Processes/adder.pnl b/MAC/Navigator2/panels/objects/Processes/adder.pnl
deleted file mode 100644
index b657a63e3025b174b46b31a9d9c86f222fa4d7e2..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Processes/adder.pnl
+++ /dev/null
@@ -1,493 +0,0 @@
-V 11
-1
-LANG:1 5 Adder
-PANEL,-1 -1 1047 192 N "_3DFace" 2
-"$adderNumber"
-"$nodeDP"
-"main()
-{
- baseDP = $nodeDP;
-
- // determine adderNumber
- adderNr=$adderNumber;
-
- // baseDp is something like CCU001:LOFAR_PIC_BGP_Midplane[x]_IONode[xx]\"]
- // for the Adders it needs to point to: LOFAR_ObsSW_OSIOnode[xx]_Adder[xx]
-
- int pos = strpos(baseDP,\"IONode\");
- if (pos < 0) {
- LOG_ERROR(\"adder.pnl:main|Couldn't find IONode in baseDP: \"+baseDP);
- return;
- } else {
- string ioNr=substr(baseDP,pos+6,2);
- baseDP=sysName+\"LOFAR_ObsSW_OSIONode\"+ioNr;
- }
-
- adderDP = baseDP+\"_Adder\"+adderNr;
-
- dpGet(adderDP+\".locusNode\",locusNr);
- dpGet(adderDP+\".writer\",writerNr);
-
- setValue(\"addernr_text\",\"text\",adderNr);
-
- writerDP = sysName+\"LOFAR_ObwSW_OSLocusNode\"+navFunct_formatInt(locusNr,999)+\"_Writer\"+navFunct_formatInt(writerNr,99);
- setValue(\"writerNr_text\",\"text\",\"Writer\"+navFunct_formatInt(writerNr,99));
- setValue(\"writerNr_text\",\"toolTipText\",writerDP);
-
-
- LOG_DEBUG(\"adder.pnl:main|adderDP: \"+adderDP);
- LOG_DEBUG(\"adder.pnl:main|writerDP: \"+writerDP);
-
- // connect to the adder values
- // check if the requiered datapoint for this view are enabled and accessible
- if (dpExists(adderDP + \".dropping\")) {
- if (dpConnect(\"updateAdder\", adderDP + \".dropping\",
- adderDP + \".dropped\",
- adderDP + \".process.error\",
- adderDP + \".process.currentAction\",
- adderDP + \".process.logMsg\",
- adderDP + \".dropping:_online.._invalid\") == -1) {
- LOG_ERROR(\"adder.pnl:main|Couldn't connect to: \"+adderDP+\" \"+getLastError());
- }
- } else {
- LOG_ERROR(\"adder.pnl:main|Couldn't find DP to connect to: \"+adderDP + \".dropping\");
- setValue(\"dropping\", \"foreCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"nrBlocksDropped\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",adderDP);
- // connect for selfUpdates
- showSelfState(adderDP);
-
-}
-
-updateAdder(string dp1, bool dropping,
- string dp2, int nrBlocksDropped,
- string dp3, string error,
- string dp4, string currentAction,
- string dp5, string logMsg,
- string dp6, bool invalid)
-{
- LOG_DEBUG(\"adder.pnl:updateAdder|entered\");
- if (!invalid) {
- myTable.deleteAllLines();
- // check if error == \"Not running\";
- // if true then the name of the process is red, otherwise black
- if (error == \"Not running\") {
- addernr_text.foreCol() = \"Lofar_broken\";
- } else {
- addernr_text.foreCol() = \"_3DText\";
- }
- setValue(\"dropping\", \"backCol\", \"_Window\");
- setValue(\"nrBlocksDropped\", \"backCol\", \"_Window\");
-
- myTable.appendLine(\"error\",error,\"currentAction\",currentAction,\"logMsg\",navFunct_getLogColor(logMsg,navFunct_getLogLevel(logMsg)));
- if (dropping) {
- setValue(\"dropping\", \"backCol\", \"red\");
- } else {
- setValue(\"dropping\", \"backCol\", \"green\");
- }
- setValue(\"nrBlocksDropped\", \"text\", nrBlocksDropped);
- } else {
- setValue(\"dropping\", \"backCol\", \"Lofar_invalid\");
- setValue(\"nrBlocksDropped\", \"backCol\", \"Lofar_invalid\");
- }
-}
-" 0
- E "main()
-{
- click(adderDP);
-}" 0
- "main(int row, string column)
-{
- rClick(adderDP);
-}" 0
- "main(int row, string column)
-{
- dblClick(adderDP);
-}" 0
- 1 0 0 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string adder=\"\";
-
-string baseDP = \"\";
-string adderDP=\"\";
-string writerDP=\"\";
-
-
-int adderNr=-1;
-int locusNr=-1;
-int writerNr=-1;
-
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click(string dp) {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- string event=\"\";
- if (dp == writerDP) {
- event = \"Writer\"+navFunct_formatInt(writerNr,99);
- } else if (dp == adderDP) {
- event = \"Adder\"+adderNr;
- } else {
- event = \"adder.pnl\";
- }
- navPanel_setEvent(event,\"EventClick\");
- }
-}
-
-// routine for double mouse click
-void dblClick(string dp) {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(dp) ) {
- LOG_DEBUG(\"adder.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+dp);
- g_currentDatapoint=dp;
- navPanel_setEvent(\"adder.pnl\",\"ChangePanel\");
- }
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick(string dp) {
- navPanel_setEvent(\"adder.pnl\",\"EventRightClick\");
-}
- " 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
-LAYER, 0
-1
-LANG:1 6 Layer1
-6 280
-"writer_highLight"
-""
-1 240 10 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E
- "main()
-{
- rClick(writerDP);
-}" 0
- "main()
-{
- dblClick(writerDP);
-}" 0
-
-208 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-"main()
-{
- dpConnect( \"writerCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
-}
-
-void writerCallback(string dp1, bool aTrig) {
-
- LOG_DEBUG(\"adder.pnl:writerCallback|ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
- LOG_DEBUG(\"adder.pnl:writerCallback|Found highlight : \" + highlight + \" Looking for writer\"+navFunct_formatInt(writerNr,99));
- bool bHighlight=false;
- if (dynContains(highlight,\"Writer\"+navFunct_formatInt(writerNr,99))) {
- bHighlight=true;
- }
- LOG_DEBUG(\"adder.pnl:writerCallback|Highlight request: \"+bHighlight);
- writer_highLight.visible = bHighlight;
-
-}
-
-" 0
- "main()
-{
- click(writerDP);
-}" 0
- 0 1 1 2 1 E 1 0 1 -29 -79 1 E 40 100 119 130
-6 278
-"adder_highLight"
-""
-1 240 10 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E
- "main(int row, string column)
-{
- rClick(adderDP);
-}" 0
- "main(int row, string column)
-{
- dblClick(adderDP);
-}" 0
-
-207 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-"main()
-{
- dpConnect( \"adderCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
-}
-
-void adderCallback(string dp1, bool aTrig) {
-
- LOG_DEBUG(\"adder.pnl:adderCallback|ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
- LOG_DEBUG(\"adder.pnl:adderCallback|Found highlight : \" + highlight + \" Looking for Adder\"+adderNr);
- bool bHighlight=false;
- if (dynContains(highlight,\"Adder\"+adderNr)) {
- bHighlight=true;
- }
- LOG_DEBUG(\"adder.pnl:adderCallback|Highlight request: \"+bHighlight);
- adder_highLight.visible = bHighlight;
-
-}
-
-" 0
- "main()
-{
- click(adderDP);
-}" 0
- 0 1 1 2 1 E 1 0 1 -55 -55 1 E 190 70 1070 107
-6 227
-"RECTANGLE16"
-""
-1 120 180 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- "main(int row, string column)
-{
- rClick(adderDP);
-}" 0
- "main(int row, string column)
-{
- dblClick(adderDP);
-}" 0
-
-134 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(adderDP);
-}" 0
- 0 1 1 2 1 E 0.9775280898876404 0 1 3.146067415730345 0 1 E 140 20 1030 47
-1 281 51 "" 1
-0
-7 266
-"dropping"
-""
-1 270 50 E E E 1 E 1 E N {0,0,0} E N "green" E E
- "main(int row, string column)
-{
- rClick(adderDP);
-}" 0
- "main(int row, string column)
-{
- dblClick(adderDP);
-}" 0
-
-194 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(adderDP);
-}" 0
- 0 1 1 2 1 E 1 0 1 60 5 1 E 120 30 7 7
-14 269
-"nrBlocksDropped"
-""
-1 200 24 E E E 1 E 1 E N "_3DText" E N "_Window" E E
- "main(int row, string column)
-{
- rClick(adderDP);
-}" 0
- "main(int row, string column)
-{
- dblClick(adderDP);
-}" 0
-
-199 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 198 22 312 46
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(adderDP);
-}" 0
- E E
-2 273
-"addernr_text"
-""
-1 123 26 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-203 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 123 26 131 42
-0 2 2 "0s" 0 0 0 192 0 0 123 26 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 1 0
-6 274
-"arrow"
-""
-1 150 40 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
- E E
-204 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 0.4054054054054054 0 0.4054054054054056 77.83783783783784 -77.29729729729735 2 1 0 "pictures/arrowLeft.gif" 4294967295 E 30 240 104 314
-2 275
-"writerNr_text"
-""
-1 20 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main()
-{
- rClick(writerDP);
-}" 0
- "main()
-{
- dblClick(writerDP);
-}" 0
-
-205 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(writerDP);
-}" 0
- 0 1 1 2 1 E U 0 E 20 30 60 46
-0 2 2 "0s" 0 0 0 192 0 0 20 30 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 6 writer
-25 276
-"myTable"
-""
-1 249.8823099816354 -3 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main(int row, string column)
-{
- rClick(adderDP);
-}" 0
- "main(int row, string column)
-{
- dblClick(adderDP);
-}" 0
-
-206 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 318 22 1002 46
-E"main(int row, string column, string value)
-{
- click(adderDP);
-}" 0
- 0 0 1 3 1 "error" 13 1 0 "s" 1
-LANG:1 5 error
-E
-1
-LANG:1 0
-
-125 "currentAction" 13 1 0 "s" 1
-LANG:1 13 currentAction
-E
-1
-LANG:1 0
-
-125 "logMsg" 63 1 0 "s" 1
-LANG:1 6 logMsg
-E
-1
-LANG:1 0
-
-579
-19 19 "" 1 1
-LANG:1 2 #1
-10 150
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 0 0 0 1 7
-1 0
-0
-LAYER, 1
-1
-LANG:1 6 Layer2
-0
-LAYER, 2
-1
-LANG:1 6 Layer3
-0
-LAYER, 3
-1
-LANG:1 6 Layer4
-0
-LAYER, 4
-1
-LANG:1 6 Layer5
-0
-LAYER, 5
-1
-LANG:1 6 Layer6
-0
-LAYER, 6
-1
-LANG:1 6 Layer7
-0
-LAYER, 7
-1
-LANG:1 6 Layer8
-0
-3 51 "selfState" -1
-"objects\\lofar_self_state.pnl" 678 158 T 169 1 0 1 -538 -133
-0
-0
diff --git a/MAC/Navigator2/panels/objects/Processes/adderDetail.pnl b/MAC/Navigator2/panels/objects/Processes/adderDetail.pnl
deleted file mode 100644
index cd57564d3ffa0404b77b86ccc1f56f803e99f18f..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Processes/adderDetail.pnl
+++ /dev/null
@@ -1,317 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 1028 66 N "_3DFace" 2
-"$adder"
-"$barColor"
-"main()
-{
-
- barColor = $barColor;
-
- setValue(\"bar\",\"backCol\",barColor);
-
- baseDP = g_currentDatapoint;
- adderDP = $adder;
-
- // connect to the inputBuffer values
- // check if the requiered datapoint for this view are enabled and accessible
- if (dpExists(adderDP + \".status.state\")) {
- if (!dpConnect(\"updateAdder\", adderDP + \".dropping\",
- adderDP + \".dropped\",
- adderDP + \".dataProductType\",
- adderDP + \".fileName\",
- adderDP + \".locusNode\",
- adderDP + \".directory\",
- adderDP + \".observationName\",
- adderDP + \".writer\",
- adderDP + \".status.state:_online.._invalid\") == -1) {
- LOG_ERROR(\"adderDetail.pnl:updateTrigger|Couldn't connect to: \"+adderDP+\" \"+getLastError());
- }
- } else {
- LOG_ERROR(\"adderDetail.pnl:updateTrigger|Couldn't find DP to connect to: \"+adderDP);
- setValue(\"dropping\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"dropped\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"dataProductType\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"fileName\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"locusNode\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"directory\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"observationName\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"writer\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",adderDP);
-
-
- // connect for selfUpdates
- showSelfState(adderDP);
-}
-
-
-updateAdder(string dp1, bool dropping,
- string dp2, int dropped,
- string dp3, string dataProductType,
- string dp4, string fileName,
- string dp5, int locusNode,
- string dp6, string directory,
- string dp7, string observationName,
- string dp8, int writer,
- string dp9, bool invalid)
-{
-
- LOG_DEBUG(\"adderDetail.pnl:updateAdder|entered\");
-
- if (!invalid) {
- if (dropping) {
- setValue(\"dropping\",\"backCol\",\"red\");
- } else {
- setValue(\"dropping\",\"backCol\",\"green\");
- }
- setValue(\"dropped\", \"text\", dropped);
- setValue(\"dataProductType\", \"text\", dataProductType);
- setValue(\"fileName\", \"text\", fileName);
- setValue(\"locusNode\", \"text\", locusNode);
- setValue(\"directory\", \"text\", directory);
- setValue(\"writer\", \"text\", writer);
- } else {
- setValue(\"dropping\",\"backCol\",\"Lofar_invalid\");
- setValue(\"dropped\", \"text\", \"\");
- setValue(\"dataProductType\", \"text\", \"\");
- setValue(\"fileName\", \"text\", \"\");
- setValue(\"locusNode\", \"text\", \"\");
- setValue(\"directory\", \"text\", \"\");
- setValue(\"writer\", \"text\", \"\");
- }
-}
-" 0
- E E E E 1 -1 -1 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string adder=\"\";
-string database=\"\";
-
-string baseDP = \"\";
-string adderDP=\"\";
-string station=\"\";
-string stationDP=\"\";
-string barColor=\"\";
-
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click(string dp) {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- if (dp == stationDP) {
- navPanel_setEvent(\"Adder\",\"EventClick\");
- }
- }
-}
-
-// routine for double mouse click
-void dblClick(string dp) {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(dp) ) {
- LOG_DEBUG(\"adderDetail.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+dp);
- g_currentDatapoint=dp;
- navPanel_setEvent(\"adderDetail.pnl\",\"ChangePanel\");
- }
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick(string dp) {
- navPanel_setEvent(\"adderDetail.pnl\",\"EventRightClick\");
-}" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
-LAYER, 0
-1
-LANG:1 0
-6 16
-"bar"
-""
-1 0 0 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
- E E
-15 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 0 3 999 17
-2 1
-"dropped"
-""
-1 85 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-1 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 85 4 127 17
-0 2 2 "0s" 0 0 0 192 0 0 85 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 7 0000000
-2 2
-"locusNode"
-""
-1 142 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-2 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 142 4 184 17
-0 2 2 "0s" 0 0 0 192 0 0 142 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 7 0000000
-2 3
-"writer"
-""
-1 209 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-3 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 209 4 245 17
-0 2 2 "0s" 0 0 0 192 0 0 209 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 6 000000
-2 5
-"dataProductType"
-""
-1 264 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-5 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 264 4 300 17
-0 2 2 "0s" 0 0 0 192 0 0 264 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 6 000000
-2 6
-"directory"
-""
-1 379 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-6 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 379 4 415 17
-0 2 2 "0s" 0 0 0 192 0 0 379 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 6 000000
-2 7
-"fileName"
-""
-1 469 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-7 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 469 4 505 17
-0 2 2 "0s" 0 0 0 192 0 0 469 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 6 000000
-1 19 0 "" 1
-0
-6 18
-"dropping"
-""
-1 90 30 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- E E
-16 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -48 -25 1 E 90 30 100 40
-0
-LAYER, 1
-1
-LANG:1 0
-0
-LAYER, 2
-1
-LANG:1 0
-0
-LAYER, 3
-1
-LANG:1 0
-0
-LAYER, 4
-1
-LANG:1 0
-0
-LAYER, 5
-1
-LANG:1 0
-0
-LAYER, 6
-1
-LANG:1 0
-0
-LAYER, 7
-1
-LANG:1 0
-0
-3 0 "selfState" -1
-"objects\\lofar_self_state.pnl" 7 18 T 15 0.7142857142857143 0 0.7142857142857143 -4 -9.857142857142858
-0
-0
diff --git a/MAC/Navigator2/panels/objects/Processes/adderView_small.pnl b/MAC/Navigator2/panels/objects/Processes/adderView_small.pnl
deleted file mode 100644
index 753ea8e0c1ea9b549386f0d7836a406506f9afb3..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Processes/adderView_small.pnl
+++ /dev/null
@@ -1,209 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 382 103 N "_3DFace" 1
-"$observation"
-"main()
-{
- observation = $observation;
- // we just need to make clear the type of this baseDP to get the right panel.
- // The panel itself will sort out the list of adders belonging to it
- baseDP =CEPDBName+\"LOFAR_ObsSW_OSIONode00_Adder0\";
- obsDP=MainDBName+claimManager_nameToRealName(\"LOFAR_ObsSW_\"+observation);
-
- if (navFunct_dpReachable(obsDP)){
- if (dpConnect(\"obsRunning\", obsDP+\".runState:_online.._value\",
- obsDP+\".runState:_online.._invalid\")) {
- setValue(\"adderObject\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
- } else {
- setValue(\"adderObject\", \"backCol\", \"Lofar_dpOffline\");
- }
-}
-
-private void obsRunning(string dp1,string running,
- string dp2,bool invalid) {
-
- if (!invalid) {
- if (strpos(running,\"Running\")>=0) {
- reload();
- } else {
- setValue(\"adderObject\", \"backCol\", \"Lofar_off\");
- }
- } else {
- setValue(\"adderObject\", \"backCol\", \"Lofar_dpOffline\");
- }
-}
-
-private void reload() {
-
- // get all the InputBuffers used by this observation
- adders = navFunct_getAddersForObservation(observation);
-
- // change all found DP's to contain all the elements that contain the .dropping
- if (connected) {
- dpDisconnect(\"adderCB\",connectTo);
- dynClear(connectTo);
- }
-
- for (int i=1; i<= dynlen(adders); i++) {
- dynAppend(connectTo,adders[i]+\".dropping:_online.._value\");
- }
- if (dynlen(adders) > 0) baseDP = adders[1];
-
- // check if the required datapoint for this view are enabled and accessible
- if (navFunct_dpReachable(CEPDBName) && dynlen(connectTo)>0 ){
- if (dpConnect(\"adderCB\", connectTo) == -1) {
- setValue(\"adderObject\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
- } else {
- setValue(\"adderObject\", \"backCol\", \"Lofar_dpOffline\");
- }
-}
-
-void adderCB(dyn_string dps, dyn_bool values)
-{
- // Here we get dropping values. if a station is dropping
- string toolTipText = observation+\" - dropping stations:<br>\";
-
- string color = \"Lofar_operational\";
-
- for (int i = 1; i<= dynlen(values); i++) {
- bool val = values[i];
- string dp = dps[i];
- if (val) {
- color = \"Lofar_broken\";
- string station;
- int nr = substr(dp,strpos(dp,\"OSIONode\")+8,2);
- string IONodeDP = navFunct_IONode2DPName(nr);
- dpGet(IONodeDP+\".usedStation\",station);
- string locusNode=\"\";
- string fileName=\"\";
- int dropped=0;
- dpGet(adders[i]+\".dropped\",dropped);
- dpGet(adders[i]+\".locusNode\",locusNode);
- dpGet(adders[i]+\".fileName\",fileName);
-
- toolTipText+=station+\"</t> :\"+dropped+\" - \"+locusNode+\" - \"+fileName+\"<br>\";
- }
- }
-
- setValue(\"adderObject\",\"toolTipText\",toolTipText);
- setValue(\"adderObject\", \"backCol\", color);
-
- }" 0
- E "main(int x, int y)
-{
- click();
-}" 0
- "main()
-{
- rClick();
-}" 0
- "main(int x, int y)
-{
- dblClick();
-}" 0
- 1 -1 -1 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-string baseDP= \"\";
-string obsDP;
-string observation;
-dyn_string connectTo;
-dyn_string adders;
-bool connected = false;
-
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click() {
-
-}
-
-// routine for double mouse click
-void dblClick() {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(baseDP) ) {
- LOG_DEBUG(\"adderView_small.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+baseDP);
- g_currentDatapoint=baseDP;
- //we also have to set the tabctrl to think this was initiated from the ProcessesTab, otherwise we will get the wrong panel.
- navPanel_setEvent(\"Processes\",\"ChangeTab\");
- }
-
-
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick() {
-
-} " 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
-LAYER, 0
-1
-LANG:1 0
-6 0
-"adderObject"
-""
-1 230 150 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-0 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 0 0 24 13
-0
-LAYER, 1
-1
-LANG:1 0
-0
-LAYER, 2
-1
-LANG:1 0
-0
-LAYER, 3
-1
-LANG:1 0
-0
-LAYER, 4
-1
-LANG:1 0
-0
-LAYER, 5
-1
-LANG:1 0
-0
-LAYER, 6
-1
-LANG:1 0
-0
-LAYER, 7
-1
-LANG:1 0
-0
-0
diff --git a/MAC/Navigator2/panels/objects/Processes/cobaltOutputProc.pnl b/MAC/Navigator2/panels/objects/Processes/cobaltOutputProc.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..00843709b4cd018cfec889cf7b8a53fca9927ba2
--- /dev/null
+++ b/MAC/Navigator2/panels/objects/Processes/cobaltOutputProc.pnl
@@ -0,0 +1,258 @@
+V 11
+1
+LANG:1 0
+PANEL,-1 -1 400 400 N "_3DFace" 1
+"$locusNode"
+"main()
+{
+
+ baseDP = g_currentDatapoint;
+
+ observation = claimManager_realNameToName(navFunct_getPathLessOne(baseDP));
+
+ locusNode = $locusNode;
+
+ LocusNr.text = $locusNode;
+
+ // connect to the outputProc values
+ // check if the requiered datapoint for this view are enabled and accessible
+
+ if (dpExists(baseDP + \".locusNode\")) {
+ if (!dpConnect(\"updateBuffer\", baseDP + \".locusNode\",
+ baseDP + \".dataProductType\",
+ baseDP + \".fileName\",
+ baseDP + \".directory\",
+ baseDP + \".dropping\",
+ baseDP + \".written\",
+ baseDP + \".dropped\",
+ baseDP + \".locusNode:_online.._invalid\") == -1) {
+ LOG_ERROR(\"cobaltOutputProc.pnl:updateTrigger|Couldn't connect to: \"+baseDP+\" \"+getLastError());
+ }
+ } else {
+ LOG_ERROR(\"cobaltOutputProc.pnl:updateTrigger|Couldn't find DP to connect to: \"+baseDP);
+ setValue(\"outputProcObject\", \"backCol\", \"Lofar_dpdoesnotexist\");
+ }
+}
+
+
+updateBuffer(string dp1, dyn_int node,
+ string dp2, dyn_string dataProductType,
+ string dp3, dyn_string fileName,
+ string dp4, dyn_string directory,
+ string dp5, dyn_bool dropping,
+ string dp6, dyn_float written,
+ string dp7, dyn_float dropped,
+ string dp8, bool invalid)
+{
+
+ if (!invalid) {
+ int index = dynContains(node, locusNode);
+ if (index <= 0) {
+ droppingObject.backCol = \"Lofar_off\";
+ outputProcObject.backCol = \"Lofar_off\";
+ outputProcObject.toolTipText = \"\";
+ return;
+ }
+
+ // to keep totals
+ int totdropped = 0;
+ int totwritten = 0;
+ string nodes = \"\";
+ string dpts = \"\";
+ string dirs = \"\";
+ string files = \"\";
+ string writestr = \"\";
+ string droppedstr = \"\";
+ bool totdropping = false;
+
+
+ // since the same locusnode might can be used for multiple files
+ // we need to collect the info for this node in total
+ for (int i = index; i <= dynlen(node); i++) {
+
+ if (node[i] == locusNode) {
+ if (i <= dynlen(dropped)) {
+ totdropped += dropped[i];
+ droppedstr += \" \" + dropped[i];
+ }
+ if (i <= dynlen(written)) {
+ totwritten += written[i];
+ writestr += \" \" + written[i];
+ }
+ if (i <= dynlen(dataProductType)) dpts += \" \" + dataProductType[i];
+ if (i <= dynlen(directory)) dirs += \" \" + directory[i];
+ if (i <= dynlen(fileName)) files += \" \" + fileName[i];
+ if (i <= dynlen(dropping)) if (dropping[i]) totdropping = true;
+ }
+ }
+
+ string tooltext = \"Locusnode : \" + node[index] +
+ \"<br>DataproductType : \" + dpts +
+ \"<br>Directory : \" + dirs +
+ \"<br>Filename : \" + files +
+ \"<br>Written : \" + writestr +
+ \"<br>Dropped : \" + droppedstr;
+
+ outputProcObject.toolTipText = tooltext;
+
+ // calc % dropped
+ float percdropped = 0;
+ float total = totwritten + totdropped;
+ if (total > 0.0) {
+ percdropped = totdropped / (totwritten + totdropped) * 100;
+ }
+ outputProcObject.backCol(getColor(percdropped));
+ if (totdropping) {
+ droppingObject.backCol=\"Lofar_broken\";
+ } else {
+ droppingObject.backCol=\"Lofar_operational\";
+ }
+
+ } else {
+ setValue(\"outputProcObject\", \"backCol\", \"Lofar_invalid\");
+ outputProcObject.toolTipText = \"\";
+
+ }
+}
+
+string getColor(float val) {
+ string color = \"Lofar_off\";
+ if (val <= 0.1) color = \"Lofar_operational\";
+ if (val > 0.1 && val <= 0.5) {
+ color = \"Lofar_test\";
+ } else if (val > 0.5 && val <= 5.0) {
+ color = \"Lofar_suspicious\";
+ } else if (val > 5.0) {
+ color = \"Lofar_broken\";
+ }
+ return color;
+}" 0
+ E E E E 1 -1 -1 0 80 80
+""0 1
+E "#uses \"navPanel.ctl\"
+
+int locusNode=-1;
+string database=\"\";
+string baseDP = \"\";
+string outputProcDP=\"\";
+string observation = \"\";
+
+bool bDoubleClicked = false;
+
+// routine for single mouse click
+void click(string dp) {
+ // set delay in case double click was meant
+ delay(0, 100);
+ if (!bDoubleClicked) {
+ if (dp == stationDP) {
+ navPanel_setEvent(station,\"EventClick\");
+ } else {
+ navPanel_setEvent(\"cobaltOutputProc\",\"EventClick\");
+ }
+ }
+}
+
+// routine for double mouse click
+void dblClick(string dp) {
+ // indicate this is a doubleClick
+ bDoubleClicked = true;
+
+ if (dpExists(dp) ) {
+ LOG_DEBUG(\"cobaltOutputProc.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+dp);
+ g_currentDatapoint=dp;
+ navPanel_setEvent(\"cobaltOutputProc.pnl\",\"ChangePanel\");
+ }
+ // set delay to avoid click event will be triggered
+ delay(0, 500);
+ bDoubleClicked = false;
+}
+
+// routine for right mouse click
+void rClick(string dp) {
+ navPanel_setEvent(\"cobaltOutputProc.pnl\",\"EventRightClick\");
+}" 0
+ 2
+"CBRef" "1"
+"EClose" E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+6 0
+"outputProcObject"
+""
+1 80 80 E E E 1 E 1 E N {0,0,0} E N "Lofar_off" E E
+ E E
+0 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 2 1 2 1 E 1 0 1 -50 -50 1 E 50 50 124 124
+6 2
+"droppingObject"
+""
+1 100 230 E E E 1 E 1 E N {0,0,0} E N "Lofar_off" E E
+ E E
+2 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 2 0 1 E 20 60 49 69
+2 4
+"LocusNr"
+""
+1 30 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+3 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 30 30 38 46
+0 2 2 "0s" 0 0 0 192 0 0 30 30 1
+1
+LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 1 1
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+0
diff --git a/MAC/Navigator2/panels/objects/Processes/inputBuffer.pnl b/MAC/Navigator2/panels/objects/Processes/inputBuffer.pnl
index 3f3d9f5b1cf4ebe796fc0ed870c56e0fc0fab6a7..6a8c198cec7a7995fa615cbdf351f636d96488e8 100644
--- a/MAC/Navigator2/panels/objects/Processes/inputBuffer.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/inputBuffer.pnl
@@ -13,7 +13,6 @@ PANEL,-1 -1 1010 66 N "_3DFace" 2
baseDP = g_currentDatapoint;
inputBufferDP = $inputBuffer;
- DebugN(inputBufferDP);
stationName = strsplit(inputBufferDP,\"_\")[3];
// connect to the inputBuffer values
@@ -96,14 +95,14 @@ updateBuffer(string dp1, string observationName,
setValue(\"observationName\",\"foreCol\", color);
setValue(\"Node\", \"foreCol\", color);
setValue(\"CPU\", \"foreCol\", color);
- setValue(\"stream0_blocksIn\", \"foreCol\", color);
- setValue(\"stream0_rejected\", \"foreCol\", getColor(rejected0,color));
- setValue(\"stream1_blocksIn\", \"foreCol\", color);
- setValue(\"stream1_rejected\", \"foreCol\", getColor(rejected1,color));
- setValue(\"stream2_blocksIn\", \"foreCol\", color);
- setValue(\"stream2_rejected\", \"foreCol\", getColor(rejected2,color));
- setValue(\"stream3_blocksIn\", \"foreCol\", color);
- setValue(\"stream3_rejected\", \"foreCol\", getColor(rejected3,color));
+ setValue(\"stream0_blocksIn\", \"backCol\", color);
+ setValue(\"stream0_rejected\", \"backCol\", getColor(rejected0,color));
+ setValue(\"stream1_blocksIn\", \"backCol\", color);
+ setValue(\"stream1_rejected\", \"backCol\", getColor(rejected1,color));
+ setValue(\"stream2_blocksIn\", \"backCol\", color);
+ setValue(\"stream2_rejected\", \"backCol\", getColor(rejected2,color));
+ setValue(\"stream3_blocksIn\", \"backCol\", color);
+ setValue(\"stream3_rejected\", \"backCol\", getColor(rejected3,color));
setValue(\"error_stream0\", \"backCol\", getColor(rejected0,color));
setValue(\"error_stream1\", \"backCol\", getColor(rejected1,color));
setValue(\"error_stream2\", \"backCol\", getColor(rejected2,color));
@@ -143,6 +142,7 @@ updateBuffer(string dp1, string observationName,
}
string getColor(int val, string color) {
+ if (val == 0) color = \"Lofar_operational\";
if (val > 0 && val < 10) {
color = \"Lofar_test\";
} else if (val >= 10 && val < 25) {
@@ -221,7 +221,63 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 0.8308308308308308 0 1 0 0 1 E 0 3 999 17
+E E 0 1 1 2 1 E 0.8508508508508508 0 1 0 0 1 E 0 3 999 17
+6 18
+"error_stream3"
+""
+1 850 10 E E E 1 E 1 E N {0,0,0} E N "_Transparent" E E
+ E E
+20 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 -160 0 1 E 940 3 994 17
+6 17
+"error_stream2"
+""
+1 850 10 E E E 1 E 1 E N {0,0,0} E N "_Transparent" E E
+ E E
+19 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 -250 0 1 E 910 3 964 17
+6 16
+"error_stream1"
+""
+1 850 10 E E E 1 E 1 E N {0,0,0} E N "_Transparent" E E
+ E E
+18 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1 -340 0 1 E 880 3 934 17
+6 15
+"error_stream0"
+""
+1 850 10 E E E 1 E 1 E N {0,0,0} E N "_Transparent" E E
+ E E
+17 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 1 E 420 3 474 17
2 1
"stationName"
""
@@ -302,7 +358,7 @@ LANG:1 6 000000
2 5
"stream0_rejected"
""
-1 429 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 429 3 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
5 0 0 0 0 0
E E E
@@ -312,8 +368,8 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 429 4 465 17
-0 2 2 "0s" 0 0 0 192 0 0 429 4 1
+E E 0 1 1 2 1 E U 0 E 429 3 465 16
+0 2 2 "0s" 0 0 0 192 0 0 429 3 1
1
LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
0 1
@@ -432,7 +488,7 @@ E E 0 1 1 2 1 E U 0 E 789 4 825 17
LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
0 1
LANG:1 6 000000
-1 14 0 "" 1
+1 19 0 "" 1
0
2 13
"observationName"
@@ -453,62 +509,6 @@ E E 0 1 1 2 1 E U 0 E 90 4 132 17
LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
0 1
LANG:1 7 0000000
-6 15
-"error_stream0"
-""
-1 850 10 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- E E
-17 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 0 -7 1 E 850 10 870 24
-6 16
-"error_stream1"
-""
-1 850 10 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- E E
-18 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 30 -7 1 E 850 10 870 24
-6 17
-"error_stream2"
-""
-1 850 10 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- E E
-19 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 60 -7 1 E 850 10 870 24
-6 18
-"error_stream3"
-""
-1 850 10 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- E E
-20 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 90 -7 1 E 850 10 870 24
0
LAYER, 1
1
diff --git a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltGPUProcs.pnl b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltGPUProcs.pnl
index dec84116f16039500995305dda9f0325f9aa8c4f..af27d587e6ea96f76b734e969e5c418a32f9fac4 100644
--- a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltGPUProcs.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltGPUProcs.pnl
@@ -1,7 +1,7 @@
V 11
1
LANG:1 0
-PANEL,-1 -1 305 78 N "_3DFace" 0
+PANEL,-1 -1 177 78 N "_3DFace" 0
"main()
{
baseDP = \"LOFAR_PermSW\";
@@ -20,7 +20,19 @@ PANEL,-1 -1 305 78 N "_3DFace" 0
}" 0
- E E E E 1 -1 -1 0 0 0
+ E "main(int x, int y)
+{
+ click();
+}" 0
+ "main()
+{
+ rClick();
+}" 0
+ "main(int x, int y)
+{
+ dblClick();
+}" 0
+ 1 -1 -1 0 0 0
""0 1
E "#uses \"navPanel.ctl\"
@@ -36,6 +48,39 @@ bool connectedGPUProcs;
bool selectedObservations=false;
+bool bDoubleClicked = false;
+
+// routine for single mouse click
+void click() {
+ // set delay in case double click was meant
+ delay(0, 100);
+ if (!bDoubleClicked && dynlen(gpuprocs) > 0) {
+ navPanel_setEvent(\"observationFlow_cobaltGPUProcs.pnl\",\"EventClick\");
+ }
+}
+
+// routine for double mouse click
+void dblClick() {
+ // indicate this is a doubleClick
+ bDoubleClicked = true;
+ if (dynlen(gpuprocs) > 0) {
+
+ LOG_DEBUG(\"observationFlow_cobaltGPUProcs.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \" + baseDP);
+ g_currentDatapoint=baseDP;
+ //we also have to set the tabctrl to think this was initiated from the ProcessesTab, otherwise we will get the wrong panel.
+ navPanel_setEvent(\"Processes\",\"ChangeTab\");
+ }
+ // set delay to avoid click event will be triggered
+ delay(0, 500);
+ bDoubleClicked = false;
+}
+
+// routine for right mouse click
+void rClick() {
+ if (dynlen(gpuprocs) > 0) {
+ navPanel_setEvent(\"observationFlow_cobaltGPUProcs.pnl\",\"EventRightClick\");
+ }
+}
void updateActiveObservations(string dp1, dyn_string obs,
string dp2, bool invalid)
@@ -221,7 +266,15 @@ LANG:1 0
"GPUProcsObject"
""
1 20 30 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- E E
+ "main()
+{
+ rClick();
+}" 0
+ "main(int x, int y)
+{
+ dblClick();
+}" 0
+
0 0 0 0 0 0
E E E
0
@@ -230,7 +283,37 @@ LANG:1 69 All GPUProcs involved in the currently(selected) active observations
1
"dashclr"N "_Transparent"
-E E 0 4 1 2 1 E 20 30 50 30
+E "main(int x, int y)
+{
+ click();
+}" 0
+ 0 4 1 2 1 E 20 30 50 30
+6 1
+"RECTANGLE1"
+""
+1 10 10 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
+ "main()
+{
+ rClick();
+}" 0
+ "main(int x, int y)
+{
+ dblClick();
+}" 0
+
+1 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E "main(int x, int y)
+{
+ click();
+}" 0
+ 0 1 1 2 1 E 1 0 1 10 5 0 E 10 10 40 40
0
LAYER, 1
1
diff --git a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltInputStreams.pnl b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltInputStreams.pnl
index 760e0d4db0932dc2fe739b68818b38696509f16c..0dc5b23ca9a0cb509265b07aa660b5aa8406fc54 100644
--- a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltInputStreams.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltInputStreams.pnl
@@ -483,6 +483,32 @@ E "main()
click();
}" 0
0 4 1 2 1 E 10 30 40 30
+6 4
+"RECTANGLE1"
+""
+1 10 10 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
+ "main()
+{
+ rClick();
+}" 0
+ "main()
+{
+ dblClick();
+}" 0
+
+4 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+ click();
+}" 0
+ 0 1 1 2 1 E U 0 E 10 10 40 40
0
LAYER, 1
1
diff --git a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltOutputProc.pnl b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltOutputProc.pnl
index 0ea155420b3cfdaffe998adb87155661a4e12b34..afb7650f46591d2e69c7d443f6e7efda71c1e5ca 100644
--- a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltOutputProc.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltOutputProc.pnl
@@ -4,7 +4,7 @@ LANG:1 0
PANEL,-1 -1 447 41 N "_3DFace" 0
"main()
{
- baseDP = \"LOFAR_PermSW\";
+ baseDP= \"LOFAR_PermSW\";
database=dpSubStr(baseDP,DPSUB_SYS);
activeObsDP =MainDBName+\"LOFAR_PermSW_MACScheduler.activeObservations\";
@@ -20,7 +20,19 @@ PANEL,-1 -1 447 41 N "_3DFace" 0
}
" 0
- E E E E 1 -1 -1 0 0 0
+ E "main(int x, int y)
+{
+ click();
+}" 0
+ "main()
+{
+ rClick();
+}" 0
+ "main(int x, int y)
+{
+ dblClick();
+}" 0
+ 1 -1 -1 0 0 0
""0 1
E "#uses \"navPanel.ctl\"
@@ -37,6 +49,40 @@ bool connectedOutputProcs;
bool selectedObservations=false;
+bool bDoubleClicked = false;
+
+// routine for single mouse click
+void click() {
+ // set delay in case double click was meant
+ delay(0, 100);
+ if (!bDoubleClicked && dynlen(outputProcs) > 0) {
+ navPanel_setEvent(\"observationFlow_cobaltOutputProc.pnl\",\"EventClick\");
+ }
+}
+
+// routine for double mouse click
+void dblClick() {
+ // indicate this is a doubleClick
+ bDoubleClicked = true;
+ if (dynlen(outputProcs) > 0) {
+
+ LOG_DEBUG(\"observationFlow_cobaltOutputProc.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \" + baseDP);
+ g_currentDatapoint=baseDP;
+ //we also have to set the tabctrl to think this was initiated from the ProcessesTab, otherwise we will get the wrong panel.
+ navPanel_setEvent(\"Processes\",\"ChangeTab\");
+ }
+ // set delay to avoid click event will be triggered
+ delay(0, 500);
+ bDoubleClicked = false;
+}
+
+// routine for right mouse click
+void rClick() {
+ if (dynlen(outputProcs) > 0) {
+ navPanel_setEvent(\"observationFlow_cobaltOutputProc.pnl\",\"EventRightClick\");
+ }
+}
+
void updateActiveObservations(string dp1, dyn_string obs,
string dp2, bool invalid)
{
@@ -66,7 +112,7 @@ void updateActiveObservations(string dp1, dyn_string obs,
// because CobaltProcesses claim their datapoints when the observation is actually running we need to connect to all these observations
// and give a signal when the runstate of one of them changes to running to trigger the Cobalt point collection
- LOG_DEBUG(\"ObservationFlow_cobaltGPUProcs.pnl:updateActiveObservations|observationList: \"+observationsList);
+ LOG_DEBUG(\"ObservationFlow_cobaltOutputProcs.pnl:updateActiveObservations|observationList: \"+observationsList);
dyn_string obsConnections = makeDynString();
for (int i = 1; i <= dynlen(observationsList) ; i++) {
@@ -108,6 +154,8 @@ void monitorRunStates(dyn_string dpList,dyn_string runStates) {
// connect to stationInputStreams from the active observations
void connectOutputProcs(string runState) {
+
+ dynClear(outputProcs);
// change all found DP's to contain all the elements that contain the .dropping
if (connectedOutputProcs) {
@@ -131,7 +179,11 @@ void connectOutputProcs(string runState) {
if (! dynContains(connectToOutputProcs,dp+\"_CobaltOutputProc.dropping:_online.._value\")) {
dynAppend(connectToOutputProcs,dp+\"_CobaltOutputProc.dropping:_online.._value\");
}
+ if (! dynContains(outputProcs,dp+\"_CobaltOutputProc\")) {
+ dynAppend(outputProcs, dp+\"_CobaltOutputProc\");
+ }
}
+ if (dynlen(outputProcs) > 0) baseDP = outputProcs[1];
// check if the required datapoint for this view is enabled and accessible
if (navFunct_dpReachable(CEPDBName) && dynlen(connectToOutputProcs)>0 ){
@@ -205,7 +257,15 @@ LANG:1 0
"outputProcsObject"
""
1 20 20 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- E E
+ "main()
+{
+ rClick();
+}" 0
+ "main()
+{
+ dblClick();
+}" 0
+
0 0 0 0 0 0
E E E
0
@@ -214,7 +274,37 @@ LANG:1 72 All OutputProcs involved in the currently(selected) active observatio
1
"dashclr"N "_Transparent"
-E E 0 4 1 2 1 E 20 20 50 20
+E "main()
+{
+ click();
+}" 0
+ 0 4 1 2 1 E 20 20 50 20
+6 1
+"RECTANGLE1"
+""
+1 10 10 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
+ "main()
+{
+ rClick();
+}" 0
+ "main(int x, int y)
+{
+ dblClick();
+}" 0
+
+1 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E "main(int x, int y)
+{
+ click();
+}" 0
+ 0 1 1 2 1 E 1 0 1 10 -7 0 E 10 10 40 40
0
LAYER, 1
1
diff --git a/MAC/Navigator2/panels/objects/Processes/writerDetail.pnl b/MAC/Navigator2/panels/objects/Processes/writerDetail.pnl
deleted file mode 100644
index 84cf36398ae10a4b15f1ebf2623100446fcb4cfc..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Processes/writerDetail.pnl
+++ /dev/null
@@ -1,270 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 1267 66 N "_3DFace" 2
-"$barColor"
-"$writer"
-"main()
-{
-
- barColor = $barColor;
-
- setValue(\"bar\",\"backCol\",barColor);
-
- baseDP = g_currentDatapoint;
- writerDP = $writer;
-
- // connect to the writer values
- // check if the requiered datapoint for this view are enabled and accessible
- if (dpExists(writerDP + \".status.state\")) {
- if (!dpConnect(\"updateWriter\", writerDP + \".written\",
- writerDP + \".dropped\",
- writerDP + \".fileName\",
- writerDP + \".dataRate\",
- writerDP + \".dataProductType\",
- writerDP + \".observationName\",
- writerDP + \".status.state:_online.._invalid\") == -1) {
- LOG_ERROR(\"writerDetail.pnl:updateTrigger|Couldn't connect to: \"+writerDP+\" \"+getLastError());
- }
- } else {
- LOG_ERROR(\"writerDetail.pnl:updateTrigger|Couldn't find DP to connect to: \"+writerDP);
- setValue(\"written\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"dropped\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"fileName\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"dataRate\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"dataProductType\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"observationName\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",writerDP);
-
-
- // connect for selfUpdates
- showSelfState(writerDP);
-}
-
-
-updateWriter(string dp1, int written,
- string dp2, int dropped,
- string dp3, string fileName,
- string dp4, int dataRate,
- string dp5, string dataProductType,
- string dp6, string observationName,
- string dp7, bool invalid)
-{
-
- LOG_DEBUG(\"writerDetail.pnl:updateWriter|entered\");
-
- if (!invalid) {
- setValue(\"written\", \"text\", written);
- setValue(\"dropped\", \"text\", dropped);
- setValue(\"fileName\", \"text\", fileName);
- setValue(\"dataRate\", \"text\", dataRate);
- setValue(\"dataProductType\", \"text\", dataProductType);
- } else {
- setValue(\"written\",\"text\",\"\");
- setValue(\"dropped\", \"text\", \"\");
- setValue(\"fileName\", \"text\", \"\");
- setValue(\"dataRate\", \"text\", \"\");
- setValue(\"dataProductType\", \"text\", \"\");
- }
-}
-" 0
- E E E E 1 -1 -1 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string writer=\"\";
-string database=\"\";
-
-string baseDP = \"\";
-string writerDP=\"\";
-string station=\"\";
-string stationDP=\"\";
-string barColor=\"\";
-
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click(string dp) {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- if (dp == stationDP) {
- navPanel_setEvent(\"Writer\",\"EventClick\");
- }
- }
-}
-
-// routine for double mouse click
-void dblClick(string dp) {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(dp) ) {
- LOG_DEBUG(\"writerDetail.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+dp);
- g_currentDatapoint=dp;
- navPanel_setEvent(\"writerDetail.pnl\",\"ChangePanel\");
- }
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick(string dp) {
- navPanel_setEvent(\"writerDetail.pnl\",\"EventRightClick\");
-}" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
-LAYER, 0
-1
-LANG:1 0
-6 16
-"bar"
-""
-1 0 0 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
- E E
-15 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 0 3 999 17
-2 1
-"written"
-""
-1 40 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-1 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 40 4 82 17
-0 2 2 "0s" 0 0 0 192 0 0 40 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 7 0000000
-2 2
-"dropped"
-""
-1 150 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-2 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 150 4 192 17
-0 2 2 "0s" 0 0 0 192 0 0 150 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 7 0000000
-2 3
-"dataRate"
-""
-1 300 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-3 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 300 4 336 17
-0 2 2 "0s" 0 0 0 192 0 0 300 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 6 000000
-2 4
-"dataProductType"
-""
-1 400 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-4 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 400 4 436 17
-0 2 2 "0s" 0 0 0 192 0 0 400 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 6 000000
-2 5
-"fileName"
-""
-1 530 4 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-5 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 530 4 566 17
-0 2 2 "0s" 0 0 0 192 0 0 530 4 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 6 000000
-1 17 0 "" 1
-0
-0
-LAYER, 1
-1
-LANG:1 0
-0
-LAYER, 2
-1
-LANG:1 0
-0
-LAYER, 3
-1
-LANG:1 0
-0
-LAYER, 4
-1
-LANG:1 0
-0
-LAYER, 5
-1
-LANG:1 0
-0
-LAYER, 6
-1
-LANG:1 0
-0
-LAYER, 7
-1
-LANG:1 0
-0
-3 0 "selfState" -1
-"objects\\lofar_self_state.pnl" 7 18 T 15 0.7142857142857143 0 0.7142857142857143 -4 -9.857142857142858
-0
-0
diff --git a/MAC/Navigator2/panels/objects/Processes/writerDroppedl.pnl b/MAC/Navigator2/panels/objects/Processes/writerDroppedl.pnl
deleted file mode 100644
index 09b393439a67cd21a4ae3abb4bf1c1e20cd92353..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Processes/writerDroppedl.pnl
+++ /dev/null
@@ -1,205 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 430 81 N "_3DFace" 1
-"$observation"
-"main()
-{
- observation = $observation;
-
- obsDP=MainDBName+claimManager_nameToRealName(\"LOFAR_ObsSW_\"+observation);
-
- if (navFunct_dpReachable(obsDP)){
- if (dpConnect(\"obsRunning\", obsDP+\".runState:_online.._value\",
- obsDP+\".runState:_online.._invalid\")){
- setValue(\"writerObject\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
- } else {
- setValue(\"writerObject\", \"backCol\", \"Lofar_dpOffline\");
- }
-}
-
-private void obsRunning(string dp1,string running,
- string dp2,bool invalid) {
-
- if (!invalid) {
- if (strpos(running,\"Running\")>=0) {
- reload();
- } else {
- setValue(\"writerObject\", \"backCol\", \"Lofar_off\");
- }
- } else {
- setValue(\"writerObject\", \"backCol\", \"Lofar_dpOffline\");
- }
-}
-
-private void reload() {
-
- // get all the writers used by this observation
- writers = navFunct_getWritersForObservation(observation);
-
- // change all found DP's to contain all the elements that contain the .dropping
- if (connected) {
- dpDisconnect(\"writerCB\",connectTo);
- dynClear(connectTo);
- }
-
- for (int i=1; i<= dynlen(writers); i++) {
- dynAppend(connectTo,writers[i]+\".dropped:_online.._value\");
- }
- if (dynlen(writers) > 0) baseDP = writers[1];
- // check if the required datapoint for this view are enabled and accessible
- if (navFunct_dpReachable(CEPDBName) && dynlen(connectTo)>0 ){
- if (dpConnect(\"writerCB\", connectTo) == -1) {
- setValue(\"writerObject\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
- } else {
- setValue(\"writerObject\", \"backCol\", \"Lofar_dpOffline\");
- }
-}
-
-void writerCB(dyn_string dps, dyn_int values)
-{
- // Here we get dropped values. if a station is dropping
- string toolTipText = observation;
- string color = \"Lofar_operational\";
- string fileName=\"\";
- int written=0;
- int cnt=0;
-
- for (int i = 1; i<= dynlen(values); i++) {
- int val = values[i];
- dpGet(writers[i]+\".written\",written);
- dpGet(writers[i]+\".fileName\",fileName);
-
- if (val >0) {
- cnt++;
- }
-
- if (val>= written/2) {
- color = \"Lofar_broken\";
- }
- }
- if (cnt >= dynlen(values)/2) {
- color = \"Lofar_broken\";
- }
-
- setValue(\"writerObject\",\"toolTipText\",toolTipText);
- setValue(\"writerObject\", \"backCol\", color);
-
- }" 0
- E "main(int x, int y)
-{
- click();
-}" 0
- "main()
-{
- rClick();
-}" 0
- "main(int x, int y)
-{
- dblClick();
-}" 0
- 1 -1 -1 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string baseDP;
-string obsDP;
-string observation;
-dyn_string connectTo;
-dyn_string writers;
-bool connected = false;
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click() {
-
-}
-
-// routine for double mouse click
-void dblClick() {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(baseDP) ) {
- LOG_DEBUG(\"writerDroppedl.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+baseDP);
- g_currentDatapoint=baseDP;
- //we also have to set the tabctrl to think this was initiated from the ProcessesTab, otherwise we will get the wrong panel.
- navPanel_setEvent(\"Processes\",\"ChangeTab\");
- }
-
-
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick() {
-
-} " 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
-LAYER, 0
-1
-LANG:1 0
-6 0
-"writerObject"
-""
-1 230 150 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-0 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 0 0 24 13
-0
-LAYER, 1
-1
-LANG:1 0
-0
-LAYER, 2
-1
-LANG:1 0
-0
-LAYER, 3
-1
-LANG:1 0
-0
-LAYER, 4
-1
-LANG:1 0
-0
-LAYER, 5
-1
-LANG:1 0
-0
-LAYER, 6
-1
-LANG:1 0
-0
-LAYER, 7
-1
-LANG:1 0
-0
-0
diff --git a/MAC/Navigator2/panels/objects/navigator_headlines.pnl b/MAC/Navigator2/panels/objects/navigator_headlines.pnl
index dded82a67b0e063831e1c6247774f2e92b6076b5..536e6c7a34efbbdf26ef9d3e57bb27ad44e02bc7 100644
--- a/MAC/Navigator2/panels/objects/navigator_headlines.pnl
+++ b/MAC/Navigator2/panels/objects/navigator_headlines.pnl
@@ -1,4 +1,4 @@
-V 10
+V 11
1
LANG:1 8 (NoName)
PANEL,-1 -1 733 56 N "_3DFace" 1
@@ -70,7 +70,24 @@ void doAction(string aDP, string anAction) {
void changeInfo(string aSelection) {
LOG_TRACE(\"navigator_headLines.pnl:changeInfo| entered :\" + aSelection);
string header = \"\";
-
+
+ // check if aSelection contains a TempObs part, if so change the selection to contain the observationname
+ if (strpos(aSelection,\"TempObs\") >= 0) {
+ string newSelection = \"\";
+ dyn_string aS = strsplit(aSelection,\"_\");
+ dyn_string temp = dynPatternMatch(\"TempObs*\",aS);
+ int index = dynContains(aS,temp[1]);
+ string name = strsplit(claimManager_realNameToName(\"LOFAR_ObsSW_\"+aS[index]),\"_\")[3];
+ for (int i = 1; i <= dynlen(aS); i++ ) {
+ if (i > 1) newSelection += \"_\";
+ if (i == index) {
+ newSelection += name;
+ } else {
+ newSelection += aS[i];
+ }
+ }
+ aSelection = newSelection;
+ }
// Tab level is important
if (ACTIVE_TAB == \"Observations\") {
header += \"Observations\";
@@ -164,9 +181,8 @@ LANG:1 0
E E 0 1 1 0 1 E U 0 E 12 12 708 28
1 2 0 "0s" 0 0 0 64 0 0 12 12 1
1
-LANG:1 84 -*-Arial-*-r-normal-*-13-*-100-100-*-*-iso8859-1|-13,0,0,0,404,0,0,0,0,0,0,0,0,Arial
-0 ""
-1
+LANG:1 26 Arial,-1,13,5,40,0,0,0,0,0
+0 1
LANG:1 0
0
LAYER, 1
@@ -197,4 +213,4 @@ LAYER, 7
1
LANG:1 6 Layer8
0
-0
\ No newline at end of file
+0
diff --git a/MAC/Navigator2/scripts/gcf_cwd.ctl b/MAC/Navigator2/scripts/gcf_cwd.ctl
index c4d9dac0a1c23bfb95620f458e0be853541c73c2..3abf40416222c50c60dff6f2ab0e720ea9c57f9a 100644
--- a/MAC/Navigator2/scripts/gcf_cwd.ctl
+++ b/MAC/Navigator2/scripts/gcf_cwd.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/CEP_Processes.ctl b/MAC/Navigator2/scripts/libs/CEP_Processes.ctl
index 756ca71e89a31392ebe7de950c47b6543aff0ab6..94b8456e3d27ef38d4e7e54c292e02623ad86710 100644
--- a/MAC/Navigator2/scripts/libs/CEP_Processes.ctl
+++ b/MAC/Navigator2/scripts/libs/CEP_Processes.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFAlarm.ctl b/MAC/Navigator2/scripts/libs/GCFAlarm.ctl
index cb79aa56ff14d700916d060c70a52084e381b256..dd408e29549572e10363f1f299a78a511ea17e63 100644
--- a/MAC/Navigator2/scripts/libs/GCFAlarm.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFAlarm.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFCWD.ctl b/MAC/Navigator2/scripts/libs/GCFCWD.ctl
index 0c47ff121ddbfcaca91b78f5ed8fb71a1b57f6f3..dca0a8d951c6338366e3c9b64250df564945ef57 100644
--- a/MAC/Navigator2/scripts/libs/GCFCWD.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCWD.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFCommon.ctl b/MAC/Navigator2/scripts/libs/GCFCommon.ctl
index 58da234d3f579c3153db172b20a1582fcded4c13..0fbf30539b65fbd58f32bd1db5d34e492d1bb17a 100644
--- a/MAC/Navigator2/scripts/libs/GCFCommon.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCommon.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl b/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
index eed2eb61caf7c1c66f1288e8b9809cb884dfcf12..05a0917eaac449377fed8135a87192b32f4fbf7a 100644
--- a/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl b/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
index a4c7206d4cb3c7bf513e22f7db871dd47ccb8e5f..7cdb600a36e15e2920b307d884e1561c995785c5 100644
--- a/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFLogging.ctl b/MAC/Navigator2/scripts/libs/GCFLogging.ctl
index d17a91663c46027f50d9292ab285f7ee4dbd3993..d2baa439f5c25f2d00a30b444fb1a51a69528acc 100644
--- a/MAC/Navigator2/scripts/libs/GCFLogging.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFLogging.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl b/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl
index 1d1dca162510e93caca56f0710d52030fdfa9253..509555209e5a805b7a8eda681496b609668c2b3e 100644
--- a/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl
+++ b/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/Station_Processes.ctl b/MAC/Navigator2/scripts/libs/Station_Processes.ctl
index 558bd3ab2d21ccbab8b8434a525326fbd3336965..d330b3f5b1aec15f1822ee2e8a4d4a909abab413 100644
--- a/MAC/Navigator2/scripts/libs/Station_Processes.ctl
+++ b/MAC/Navigator2/scripts/libs/Station_Processes.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/claimManager.ctl b/MAC/Navigator2/scripts/libs/claimManager.ctl
index 81aa9211fb069b0b618de487cb6e17a9a682bd33..b8583737fef8a2690ea8d05fe2c4b71d4cef51d4 100644
--- a/MAC/Navigator2/scripts/libs/claimManager.ctl
+++ b/MAC/Navigator2/scripts/libs/claimManager.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navConfig.ctl b/MAC/Navigator2/scripts/libs/navConfig.ctl
index de42f0f4711ebdb1e0ea38601ea376641192bec7..a8423e23887db8531763a418d22248418835bdf7 100644
--- a/MAC/Navigator2/scripts/libs/navConfig.ctl
+++ b/MAC/Navigator2/scripts/libs/navConfig.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navCtrl.ctl b/MAC/Navigator2/scripts/libs/navCtrl.ctl
index db4588f33bb6c4ff4c1c97c537ef7a84ea5d572e..f359bcdf049bbdb0942c0aab4112fc86d710d0b3 100644
--- a/MAC/Navigator2/scripts/libs/navCtrl.ctl
+++ b/MAC/Navigator2/scripts/libs/navCtrl.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004 // TabChanoged: The Tab has changed, so a new panel needs to be initialized and put in place
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navFunct.ctl b/MAC/Navigator2/scripts/libs/navFunct.ctl
index d48d586307c9d14043de5222f35c675ad19a8053..da9a6481dde1d80e2ed466d669f2d56a318494b9 100644
--- a/MAC/Navigator2/scripts/libs/navFunct.ctl
+++ b/MAC/Navigator2/scripts/libs/navFunct.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -48,7 +48,6 @@
// navFunct_fillStationLists : fill global lists with core/europe and remote stations
// navFunct_findFirstOne : Returns the number of a given array that is true for a certain range
// navFunct_formatInt : returns a string with the int preceeded by zeros
-// navFunct_getAddersForObservation : returns all the Adders that are in use for an observation
// navFunct_getArmFromStation : Returns the armposition code from a stationName
// navFunct_getDPFromTypePath : Returns Dpname derived from currentDatapoint,typeList and chosen type
// navFunct_getDynString : Returns a dynString from a dyn_dyn[index]
@@ -760,12 +759,12 @@ dyn_string navFunct_dpGetFullPathAsTypes(string aDp){
dyn_string splitted = strsplit(dp,"_");
-
string start;
for (int i=1; i <= dynlen(splitted); i++) {
start+=splitted[i];
typePath[i+index] = dpTypeName(systemName+start);
start+="_";
+
}
return typePath;
@@ -1256,6 +1255,8 @@ void navFunct_fillObservationsList() {
// check all available observations
for (int i = 1; i <= dynlen(g_observations["NAME"]); i++) {
+ // only observations!!
+ if (g_observations["STATIONLIST"][i] == "[]") continue;
bool found=false;
string shortObs=g_observations["NAME"][i];
strreplace(shortObs,"LOFAR_ObsSW_","");
@@ -1715,6 +1716,11 @@ void navFunct_fillProcessesTree() {
string fullProcessPath=connectTo;
for (int j=1; j <= dynlen(pathList); j++) {
fullProcessPath+="_"+pathList[j];
+ if (strpos(pathList[j],"TempObs") > -1) {
+ // Observation found, get real name in stead of Tempname
+ string observation = strsplit(claimManager_realNameToName("LOFAR_ObsSW_"+pathList[j]),"_")[3];
+ pathList[j] = observation;
+ }
if (!dynContains(result,connectTo+","+pathList[j]+","+fullProcessPath)) {
dynAppend(result,connectTo+","+pathList[j]+","+fullProcessPath);
}
@@ -1722,7 +1728,7 @@ void navFunct_fillProcessesTree() {
}
}
- LOG_DEBUG("navFunct.ctl:navFunct_fillProcessesTree|result: "+ result);
+ LOG_DEBUG("navFunct.ctl:navFunct_fillProcessesTree|result: "+ result);
dpSet(DPNAME_NAVIGATOR + g_navigatorID + ".processesList",result);
}
@@ -2270,35 +2276,6 @@ dyn_string navFunct_getInputBuffersForStation(string station) {
return inputBuffers;
}
-// ***************************
-// navFunct_getAddersForObservation
-// ***************************
-// obsName : the observation in question
-//
-// Returns a dyn_string containing all Adders used by this observation
-// ***************************
-//
-dyn_string navFunct_getAddersForObservation(string obsName) {
- // we only need the number from the observation
- if (strpos(obsName,"Observation") >= 0) {
- strreplace(obsName,"Observation","");
- }
- dyn_string adders;
- dyn_dyn_anytype tab;
- if (!navFunct_dpReachable(CEPDBName)) return adders;
- string query="SELECT '_online.._value' FROM 'LOFAR_*_Adder*.observationName' REMOTE '"+CEPDBName+"' WHERE '_online.._value' == \""+obsName+"\"";
- //DebugN("query: "+query);
- dpQuery(query,tab);
- //DebugN("Result:"+result);
- for(int z=2;z<=dynlen(tab);z++) {
- string dp=dpSubStr(tab[z][1],DPSUB_SYS_DP);
- // avoid doubles
- dynAppend(adders,dp);
- }
- dynSort(adders);
- return adders;
-}
-
// ***************************
// navFunct_getGPUProcsForObservation
// ***************************
diff --git a/MAC/Navigator2/scripts/libs/navPanel.ctl b/MAC/Navigator2/scripts/libs/navPanel.ctl
index 2512aa11e533af1b02c641ff3dd5a3d0d0af2111..5125f0f0208d76aca9acfa60f665395f60549df8 100644
--- a/MAC/Navigator2/scripts/libs/navPanel.ctl
+++ b/MAC/Navigator2/scripts/libs/navPanel.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navProgressCtrl.ctl b/MAC/Navigator2/scripts/libs/navProgressCtrl.ctl
index addd76e08dbaed71e8eb1233c2b36b9825563a5a..8194d6e30533af0773a3d079e83444972fd13e65 100644
--- a/MAC/Navigator2/scripts/libs/navProgressCtrl.ctl
+++ b/MAC/Navigator2/scripts/libs/navProgressCtrl.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2015
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navTabCtrl.ctl b/MAC/Navigator2/scripts/libs/navTabCtrl.ctl
index d70a427c3cbd92f2a50914b8dd459465e2f57baa..12d0a3837685f53a405e7433761a3ece10ae3e93 100644
--- a/MAC/Navigator2/scripts/libs/navTabCtrl.ctl
+++ b/MAC/Navigator2/scripts/libs/navTabCtrl.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navigator.ctl b/MAC/Navigator2/scripts/libs/navigator.ctl
index d63ebcd1e39fc0560b77dd322697356a25a5ba78..eb719358e7a2e1fc87d59852107acf1a5bfda487 100644
--- a/MAC/Navigator2/scripts/libs/navigator.ctl
+++ b/MAC/Navigator2/scripts/libs/navigator.ctl
@@ -2,7 +2,7 @@
//
// Copyright (C) 2002-2004
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/monitorAlarms.ctl b/MAC/Navigator2/scripts/monitorAlarms.ctl
index 1f446375ea8fc6e6f81a67ff65fc6d591759f624..79ea722ec1f36484982762a1f35ca636f8844361 100644
--- a/MAC/Navigator2/scripts/monitorAlarms.ctl
+++ b/MAC/Navigator2/scripts/monitorAlarms.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/monitorStateChanges.ctl b/MAC/Navigator2/scripts/monitorStateChanges.ctl
index 164054d9a5a9b394781fc7648630a8b0cbed8699..c87f7ab2bc128a380c1916391aca097c788f217d 100644
--- a/MAC/Navigator2/scripts/monitorStateChanges.ctl
+++ b/MAC/Navigator2/scripts/monitorStateChanges.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/monitorStateReset.ctl b/MAC/Navigator2/scripts/monitorStateReset.ctl
index 60be101823799344f41e340df036da37769a3ef3..acf0379decdc7aa4316e384e75bbf9bf2aae8310 100644
--- a/MAC/Navigator2/scripts/monitorStateReset.ctl
+++ b/MAC/Navigator2/scripts/monitorStateReset.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/monitorStationAlarms.ctl b/MAC/Navigator2/scripts/monitorStationAlarms.ctl
index 6fc194030327907d122e74767d7ed59e4f9e523c..00cf522304596733dbc592e4f343abc9e4893999 100644
--- a/MAC/Navigator2/scripts/monitorStationAlarms.ctl
+++ b/MAC/Navigator2/scripts/monitorStationAlarms.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/readStationConfigs.ctl b/MAC/Navigator2/scripts/readStationConfigs.ctl
index 70c16b56641c8f15392c62b3b2d41055ee9777d4..7181cadc85b1b824a646eb02ae3ab39150e7a957 100644
--- a/MAC/Navigator2/scripts/readStationConfigs.ctl
+++ b/MAC/Navigator2/scripts/readStationConfigs.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/readStationConnections.ctl b/MAC/Navigator2/scripts/readStationConnections.ctl
index cfb5c82f552c9eff05924b6c36e589211dc042bb..bd46abc224ad4a7f5e1c029cb3e1c6e6e7d98bf8 100644
--- a/MAC/Navigator2/scripts/readStationConnections.ctl
+++ b/MAC/Navigator2/scripts/readStationConnections.ctl
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/CEP/src/CEPEcho.cc b/MAC/Test/GCF/CEP/src/CEPEcho.cc
index cfd4c9b9b4020398ae88ae679c8d83f0d247e5c4..8b6fbdf2955a8aed1569559ee2a3443122523df6 100644
--- a/MAC/Test/GCF/CEP/src/CEPEcho.cc
+++ b/MAC/Test/GCF/CEP/src/CEPEcho.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/CEP/src/CEPPing.cc b/MAC/Test/GCF/CEP/src/CEPPing.cc
index 0312918cf01ba6a2a50f6734118ff9184cd8e6fb..2c4c115278c87ab628e5b366c2460986a2fea179 100644
--- a/MAC/Test/GCF/CEP/src/CEPPing.cc
+++ b/MAC/Test/GCF/CEP/src/CEPPing.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/CEP/src/DH_EchoPing.cc b/MAC/Test/GCF/CEP/src/DH_EchoPing.cc
index 2411d5c5fcd201be6a1808957f84249ac227d19b..16516a71022fb482cbc07165e8c46cbaa3dda1cf 100644
--- a/MAC/Test/GCF/CEP/src/DH_EchoPing.cc
+++ b/MAC/Test/GCF/CEP/src/DH_EchoPing.cc
@@ -2,7 +2,7 @@
//
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/CEP/src/DH_EchoPing.h b/MAC/Test/GCF/CEP/src/DH_EchoPing.h
index c307597ad913688c91f861e1c9b432c0d2ab8fe9..1ffc90ef7df4e83a861c7a6766b8708ada9a1093 100644
--- a/MAC/Test/GCF/CEP/src/DH_EchoPing.h
+++ b/MAC/Test/GCF/CEP/src/DH_EchoPing.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/MAC/src/PropertyProxy.cc b/MAC/Test/GCF/MAC/src/PropertyProxy.cc
index 82a95fe42fd47d8ec8f5df9dad7d6444945e7fb3..b8eae333fc65584c8566737385c89717e6430571 100644
--- a/MAC/Test/GCF/MAC/src/PropertyProxy.cc
+++ b/MAC/Test/GCF/MAC/src/PropertyProxy.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/MAC/src/PropertyProxy.h b/MAC/Test/GCF/MAC/src/PropertyProxy.h
index 27cc0e5533d571f418886532ad12f0291dff19ed..99a041a5e64082f3ce924885f313e46cea95d4f0 100644
--- a/MAC/Test/GCF/MAC/src/PropertyProxy.h
+++ b/MAC/Test/GCF/MAC/src/PropertyProxy.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/RTC/src/RTEcho.cc b/MAC/Test/GCF/RTC/src/RTEcho.cc
index 3b97fde6e42768c2dd23eff1baea92fe3efb41d8..ee11ca5916c949fbe7ce0bd7dc68f5beb1ef8b21 100644
--- a/MAC/Test/GCF/RTC/src/RTEcho.cc
+++ b/MAC/Test/GCF/RTC/src/RTEcho.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/RTC/src/RTEcho.h b/MAC/Test/GCF/RTC/src/RTEcho.h
index f8854154f167384068be81f5ddd4fb542bae53a4..baa7b91e7546a50c5cdc1536d97ff8c14d172865 100644
--- a/MAC/Test/GCF/RTC/src/RTEcho.h
+++ b/MAC/Test/GCF/RTC/src/RTEcho.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/RTC/src/RTPing.cc b/MAC/Test/GCF/RTC/src/RTPing.cc
index 755ee05d9e4bd847ab9757bf4e795e42bcaa620f..b6baffccfda2fb6931d3447626133ba2c59abd3b 100644
--- a/MAC/Test/GCF/RTC/src/RTPing.cc
+++ b/MAC/Test/GCF/RTC/src/RTPing.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/RTC/src/RTPing.h b/MAC/Test/GCF/RTC/src/RTPing.h
index 0e9772151d1e5381539ffe7760671e94221aaa10..28a12bf072d19bf3e736e09cb16f3986b6c43a34 100644
--- a/MAC/Test/GCF/RTC/src/RTPing.h
+++ b/MAC/Test/GCF/RTC/src/RTPing.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/Event/GCF/GCF_Event.h b/MAC/Test/PROTO/Event/GCF/GCF_Event.h
index 54892a0a10e1bf4fcd79c9a445eacecc7bc148fd..591a4ffe8ea4695388e0c20fd7b18c2c6c52f04e 100644
--- a/MAC/Test/PROTO/Event/GCF/GCF_Event.h
+++ b/MAC/Test/PROTO/Event/GCF/GCF_Event.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/Event/GCF/GCF_TMProtocols.h b/MAC/Test/PROTO/Event/GCF/GCF_TMProtocols.h
index 497b0a6af201dc9cab9fac9ea3084b494c999e85..7d202e4bcd763d3faf8ddbef571c1ae02ef97406 100644
--- a/MAC/Test/PROTO/Event/GCF/GCF_TMProtocols.h
+++ b/MAC/Test/PROTO/Event/GCF/GCF_TMProtocols.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/Event/GCF_Event.cc b/MAC/Test/PROTO/Event/GCF_Event.cc
index ef9f808bc6515fe0a68857e4fe269f54f65383a2..b896e27bb331df08377dd30f087443a146421e6e 100644
--- a/MAC/Test/PROTO/Event/GCF_Event.cc
+++ b/MAC/Test/PROTO/Event/GCF_Event.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/Event/protocol.tpl b/MAC/Test/PROTO/Event/protocol.tpl
index 2ed27b0781eef06ea1326c8803f1dbb14155b8a7..303de983888728b6bbf40e426be226cab44a14f3 100644
--- a/MAC/Test/PROTO/Event/protocol.tpl
+++ b/MAC/Test/PROTO/Event/protocol.tpl
@@ -19,7 +19,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
[+ IF (== autogen-version "5.12") +]
// [+ (lgpl "This program" "ASTRON" "// ") +]
diff --git a/MAC/Test/PROTO/Event/protocol.tpl.ph-only b/MAC/Test/PROTO/Event/protocol.tpl.ph-only
index 4f9c9601c8ff1df32f92c898491411791a816b2c..b6db0a8ee4b5d6e31b6d50f4d2e4e2b9e8847743 100644
--- a/MAC/Test/PROTO/Event/protocol.tpl.ph-only
+++ b/MAC/Test/PROTO/Event/protocol.tpl.ph-only
@@ -19,7 +19,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
[+ (lgpl "This program" "ASTRON" "// ") +]
//
diff --git a/MAC/Test/PROTO/EventExt/GCF/GCF_Event.h b/MAC/Test/PROTO/EventExt/GCF/GCF_Event.h
index 1a80e106df2833560bf2bf86f807cf76bdf906fd..37cdd93a2e3786776975916e3793c3988fd7d395 100644
--- a/MAC/Test/PROTO/EventExt/GCF/GCF_Event.h
+++ b/MAC/Test/PROTO/EventExt/GCF/GCF_Event.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/EventExt/GCF/GCF_TMProtocols.h b/MAC/Test/PROTO/EventExt/GCF/GCF_TMProtocols.h
index 5d1c756180b0c1e29bc380c0a131f36933a3138c..abd99130a1945e23ee991b46ac925158127d2568 100644
--- a/MAC/Test/PROTO/EventExt/GCF/GCF_TMProtocols.h
+++ b/MAC/Test/PROTO/EventExt/GCF/GCF_TMProtocols.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/EventExt/protocol.tpl b/MAC/Test/PROTO/EventExt/protocol.tpl
index dd78a876e343108124d072f356a55ea40ec9725b..def63f915518f23e18678ddc8732f1a6e758e056 100644
--- a/MAC/Test/PROTO/EventExt/protocol.tpl
+++ b/MAC/Test/PROTO/EventExt/protocol.tpl
@@ -27,7 +27,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
[+ IF (== autogen-version "5.12") +]
// [+ (lgpl "This program" "ASTRON" "// ") +]
diff --git a/MAC/Test/PROTO/EventExt/pybind.ph b/MAC/Test/PROTO/EventExt/pybind.ph
index 82c26d798e0fd5e791ca3982d8f4277f49a4c131..493d71f15f66a5d488cab9bc9b98584fadd3f798 100644
--- a/MAC/Test/PROTO/EventExt/pybind.ph
+++ b/MAC/Test/PROTO/EventExt/pybind.ph
@@ -9,7 +9,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff --git a/MAC/Test/PROTO/PI/autogen/protocol.tpl b/MAC/Test/PROTO/PI/autogen/protocol.tpl
index 549218405195f1885b6bec2620d7c787e83229d6..6c71623c60d8962ab97acdf4ac48a9aa77e8fd10 100644
--- a/MAC/Test/PROTO/PI/autogen/protocol.tpl
+++ b/MAC/Test/PROTO/PI/autogen/protocol.tpl
@@ -15,7 +15,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
[+ IF (== autogen-version "5.12") +]
// [+ (lgpl "This program" "ASTRON" "// ") +]
diff --git a/MAC/Test/PROTO/PROP/src/FPBoolValue.cc b/MAC/Test/PROTO/PROP/src/FPBoolValue.cc
index 3d876899a685133095f21c5a764fb69256288806..c47d691f1a4481130c3166a5e6e927082ee957a4 100644
--- a/MAC/Test/PROTO/PROP/src/FPBoolValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPBoolValue.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPBoolValue.h b/MAC/Test/PROTO/PROP/src/FPBoolValue.h
index 03ef718e9aabff556b0d5f2fdd13887f0b59446e..23a1a6231a76f02669d147f01080e6ca4b1336b3 100644
--- a/MAC/Test/PROTO/PROP/src/FPBoolValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPBoolValue.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPByteValue.cc b/MAC/Test/PROTO/PROP/src/FPByteValue.cc
index 3f47822cab81db471466420719c3c1aea491e210..81a07bcddb3ad994f605733547b5219ed22475a0 100644
--- a/MAC/Test/PROTO/PROP/src/FPByteValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPByteValue.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPByteValue.h b/MAC/Test/PROTO/PROP/src/FPByteValue.h
index fff3c34f3fac244b4087cebde6cf211dd59340da..f5023826a6e6493ee220c68ea9431ca3a5d41af4 100644
--- a/MAC/Test/PROTO/PROP/src/FPByteValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPByteValue.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPDWordValue.cc b/MAC/Test/PROTO/PROP/src/FPDWordValue.cc
index 4b8a8dcf044b766b24552007f28f4944042694b7..08b3c33c2f8bc24645bcbcde08edb8a52adc090d 100644
--- a/MAC/Test/PROTO/PROP/src/FPDWordValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPDWordValue.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPDWordValue.h b/MAC/Test/PROTO/PROP/src/FPDWordValue.h
index c7f15544b7affbc9c0af5d4267bdd87ea38b7ad3..98d8787a66139055da6cc6034692bdfb9c5d8c4b 100644
--- a/MAC/Test/PROTO/PROP/src/FPDWordValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPDWordValue.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPDoubleValue.cc b/MAC/Test/PROTO/PROP/src/FPDoubleValue.cc
index 918e2171e696aca19db0345cc5fec94487c45434..852dc6e51361d3a43f47ba57c7f0f45b541e1179 100644
--- a/MAC/Test/PROTO/PROP/src/FPDoubleValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPDoubleValue.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPDoubleValue.h b/MAC/Test/PROTO/PROP/src/FPDoubleValue.h
index 4fe22e4280688aaa548029d1ee02ff4f2d1dc0ea..409cdf541d94d5981bad5369c17b52819c91af16 100644
--- a/MAC/Test/PROTO/PROP/src/FPDoubleValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPDoubleValue.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPFloatValue.cc b/MAC/Test/PROTO/PROP/src/FPFloatValue.cc
index ea379ed9432950cfbe2755a500b85a8eeab4d16a..88142d38ba56233d346bb0b33f657f02873f6d4b 100644
--- a/MAC/Test/PROTO/PROP/src/FPFloatValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPFloatValue.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPFloatValue.h b/MAC/Test/PROTO/PROP/src/FPFloatValue.h
index 5ea1838fc257372e75aa6f2205306a08ab6eff36..9db3ee2703ec2636998ccbe34df8cb20e9bb5c0c 100644
--- a/MAC/Test/PROTO/PROP/src/FPFloatValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPFloatValue.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPLongLongValue.cc b/MAC/Test/PROTO/PROP/src/FPLongLongValue.cc
index 33611d34b51fdd48ac4a41cc014af8e274409331..b28dd0433c22b18c9bf75c67f2a57f791e2964cc 100644
--- a/MAC/Test/PROTO/PROP/src/FPLongLongValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPLongLongValue.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPLongLongValue.h b/MAC/Test/PROTO/PROP/src/FPLongLongValue.h
index 81866f36d7b44b55550190d2a631a460c8f629b4..ee871b3f75baf8840be4947e05c4a7f70d1c5139 100644
--- a/MAC/Test/PROTO/PROP/src/FPLongLongValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPLongLongValue.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPValue.cc b/MAC/Test/PROTO/PROP/src/FPValue.cc
index 59384f10177d413de42ae26aad61074274bbf06b..938d69ce58d12d62b787b1109a962dd956095056 100644
--- a/MAC/Test/PROTO/PROP/src/FPValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPValue.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPValue.h b/MAC/Test/PROTO/PROP/src/FPValue.h
index 909a131bffcc9547b6d9c5a2aed5246681103d64..924fc46670bba4242489c71c3ec5913e28d3bf55 100644
--- a/MAC/Test/PROTO/PROP/src/FPValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPValue.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPWordValue.cc b/MAC/Test/PROTO/PROP/src/FPWordValue.cc
index eab648b86119f57bd90301b3a068224a47fdfe27..8bb4ace9d9a9c773f66de0413a6a3af0f726b759 100644
--- a/MAC/Test/PROTO/PROP/src/FPWordValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPWordValue.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPWordValue.h b/MAC/Test/PROTO/PROP/src/FPWordValue.h
index 237d6e9fdc3e627f385eeaaf5900fab061480392..972aaffe91f71c4bf6444988a198fb6ae84f7798 100644
--- a/MAC/Test/PROTO/PROP/src/FPWordValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPWordValue.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FProperty.cc b/MAC/Test/PROTO/PROP/src/FProperty.cc
index 7b917f82403a25bf6a15ab44ebb83cc33092f2af..0bcd58247207d68ba24bf96084961916f937a75d 100644
--- a/MAC/Test/PROTO/PROP/src/FProperty.cc
+++ b/MAC/Test/PROTO/PROP/src/FProperty.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FProperty.h b/MAC/Test/PROTO/PROP/src/FProperty.h
index 6a3e5a978f00d852c7a3edb9484a78415ee27c54..a8e233d963140ab5d37cac320425347ba45f83ca 100644
--- a/MAC/Test/PROTO/PROP/src/FProperty.h
+++ b/MAC/Test/PROTO/PROP/src/FProperty.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Defines.hxx b/MAC/Test/PROTO/TASK/src/GCF_Defines.hxx
index 46c8735b6eaf5b45a7fbfe990f2cfb4bd4a6e7f8..179ea78e2bec9eb09ae6306711f1a4d0791e4ce1 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Defines.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Defines.hxx
@@ -2,7 +2,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Event.hxx b/MAC/Test/PROTO/TASK/src/GCF_Event.hxx
index c6e4b60c1e350d011153feb69a095011dfd686a2..e5d0d7c11ce1a2815e56941209f79eee4640b003 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Event.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Event.hxx
@@ -2,7 +2,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Fsm.cxx b/MAC/Test/PROTO/TASK/src/GCF_Fsm.cxx
index d7e7f13e934ca005ed0963ed797608b0f3d5392e..f04fbd7f333f438acc1beacbec66fcf81190631b 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Fsm.cxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Fsm.cxx
@@ -2,7 +2,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx b/MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx
index 6fa458e2722ff3e69e4a6e4378dc6d59f7e4e671..a6c4bf9aa0ac0992a52a20f64f415eefd4198f48 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx
@@ -2,7 +2,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx b/MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx
index 2c204b9b2ee45f462dea40a28a615890db220084..34a6206bf8671242274d92cb11ec7ea9f0525b75 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Protocols.cxx b/MAC/Test/PROTO/TASK/src/GCF_Protocols.cxx
index d443f96cbc8a4ba8fc432557281eb19f5c9cd62d..287bddc79604cf44c504887882814e318ae1da12 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Protocols.cxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Protocols.cxx
@@ -2,7 +2,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx b/MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx
index 0ab5abefaea5ae5f164987a902909222ae9fba59..86b81d85058d333cab98dc77ad3a1b3a9b38beaa 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx
@@ -2,7 +2,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Task.cxx b/MAC/Test/PROTO/TASK/src/GCF_Task.cxx
index 73a81ba2d6bc2b2914aec57a3cc557dcd7ac817e..e5302349de54487fde65a4e2cf3f564fb9ce66ba 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Task.cxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Task.cxx
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Task.hxx b/MAC/Test/PROTO/TASK/src/GCF_Task.hxx
index 3751788c927799fc5ff055d305389d0f8eba8159..831905b8f807cedbdb60a7e82fa796646bccc023 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Task.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Task.hxx
@@ -2,7 +2,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THEcho/src/THEcho.cc b/MAC/Test/TestHarness/THEcho/src/THEcho.cc
index 597e2418db20123495feaab4312484b2dbd527b8..e55c055f4c96614c5f608563fae84caeebba4d9c 100644
--- a/MAC/Test/TestHarness/THEcho/src/THEcho.cc
+++ b/MAC/Test/TestHarness/THEcho/src/THEcho.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THEcho/src/THEcho.h b/MAC/Test/TestHarness/THEcho/src/THEcho.h
index 8337cc1a565baedb73894bdb527ec122d040c325..4707979ebb12bf155bcf7a29d1d1681fd6884987 100644
--- a/MAC/Test/TestHarness/THEcho/src/THEcho.h
+++ b/MAC/Test/TestHarness/THEcho/src/THEcho.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THEcho/test/THEchoTest.cc b/MAC/Test/TestHarness/THEcho/test/THEchoTest.cc
index 8dd5a1ed264e342587b06588431d224775b8d542..9d9083257870fa97dd4bb50ce7311517908c8499 100644
--- a/MAC/Test/TestHarness/THEcho/test/THEchoTest.cc
+++ b/MAC/Test/TestHarness/THEcho/test/THEchoTest.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THEcho/test/THEchoTest.h b/MAC/Test/TestHarness/THEcho/test/THEchoTest.h
index fd7d6d8049f750a355e2d7b2d3d62186b9ce984d..c130834681f5cfa6f354da638e1d53c0249ea782 100644
--- a/MAC/Test/TestHarness/THEcho/test/THEchoTest.h
+++ b/MAC/Test/TestHarness/THEcho/test/THEchoTest.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.cc b/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.cc
index 6262719cbb34bec617b2507d6d14fdc1cf71e40f..52055585db8bf43e2a9e91fbb9e7a6e6335a2fa5 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.cc
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.h b/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.h
index d7d11ee9bcff4c3fb14f62bd97d63faefd369319..c217a959045300b6ea074901c05926b81e55506f 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.h
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.cc b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.cc
index 94cac3c84d30fa3f0d16782c8b20a0c475bee97d..a97e6329d437094573094841dc307bccfdea730e 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.cc
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.cc
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.h b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.h
index 3d37226ef0673de68c9e66623e1db3b2481bf2b2..a3eeeb7eb0c75ae9ca7f4375b10856c88240fede 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.h
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.h
@@ -3,7 +3,7 @@
//
// Copyright (C) 2003
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridgeMain.cc b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridgeMain.cc
index 3f672bcfb056f2346c00d2ffe2d197aba29fcbd2..f51419a0e6509b517b23876b59cc0fd33bc83703 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridgeMain.cc
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridgeMain.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/TSE/scripts/MACall.tse.prot b/MAC/Test/TestHarness/TSE/scripts/MACall.tse.prot
index 11317d66ca338f24db22541ac3322679d8939023..1acaaedd0ed5133ec65ace13a8344e23eefd54d5 100644
--- a/MAC/Test/TestHarness/TSE/scripts/MACall.tse.prot
+++ b/MAC/Test/TestHarness/TSE/scripts/MACall.tse.prot
@@ -3,7 +3,7 @@
//
// Copyright (C) 2005
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff --git a/MAC/Test/TestHarness/protconverter/TSE-protocol.tpl b/MAC/Test/TestHarness/protconverter/TSE-protocol.tpl
index f5a6b122865d2e1ca86490cbd39c0d722d7c96cb..61c188273cd78cdc717000919340fade4857e8b9 100755
--- a/MAC/Test/TestHarness/protconverter/TSE-protocol.tpl
+++ b/MAC/Test/TestHarness/protconverter/TSE-protocol.tpl
@@ -16,7 +16,7 @@
//
// Copyright (C) 2005
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
[+ IF (== autogen-version "5.12") +]
// [+ (lgpl "This program" "ASTRON" "// ") +]
diff --git a/MAC/Test/TestHarness/protconverter/protconvert.c b/MAC/Test/TestHarness/protconverter/protconvert.c
index 35bff0a479277639133673e10034cb96728da606..c86c3006eccb4d54883357b92b6dd397d5eece42 100755
--- a/MAC/Test/TestHarness/protconverter/protconvert.c
+++ b/MAC/Test/TestHarness/protconverter/protconvert.c
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/RTCP/Cobalt/CoInterface/src/BudgetTimer.cc b/RTCP/Cobalt/CoInterface/src/BudgetTimer.cc
index 858103d92f69f4af91dcd7f44c6f08cb6057f6bd..497604004d38d3c16cca0851d95847cd6ca18c58 100644
--- a/RTCP/Cobalt/CoInterface/src/BudgetTimer.cc
+++ b/RTCP/Cobalt/CoInterface/src/BudgetTimer.cc
@@ -1,6 +1,6 @@
//# Copyright (C) 2014
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/RTCP/Cobalt/CoInterface/src/BudgetTimer.h b/RTCP/Cobalt/CoInterface/src/BudgetTimer.h
index a1a59c2e4ce9e9a3d11a495d0cb6cafa7208e88e..9f39f493b1783d8d949d520008633351e5257942 100644
--- a/RTCP/Cobalt/CoInterface/src/BudgetTimer.h
+++ b/RTCP/Cobalt/CoInterface/src/BudgetTimer.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/RTCP/Cobalt/CoInterface/src/Queue.h b/RTCP/Cobalt/CoInterface/src/Queue.h
index 5da14b97124c0853a39982b05837c458d25c5512..a249643746865a2dcd3de4d87af105aef514e9ab 100644
--- a/RTCP/Cobalt/CoInterface/src/Queue.h
+++ b/RTCP/Cobalt/CoInterface/src/Queue.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/RTCP/Cobalt/CoInterface/src/Stream.cc b/RTCP/Cobalt/CoInterface/src/Stream.cc
index cc8644bc56710bdb650eabfabb946e7dd5387976..f86a9c37fa04c1b3fc627e174f5e7e8a3f1f6237 100644
--- a/RTCP/Cobalt/CoInterface/src/Stream.cc
+++ b/RTCP/Cobalt/CoInterface/src/Stream.cc
@@ -48,77 +48,6 @@ namespace LOFAR
namespace Cobalt
{
- Stream *createStream(const string &descriptor, bool asServer, time_t deadline)
- {
- if (deadline > 0 && deadline <= std::time(0)) // TODO: doesn't belong here
- THROW(SocketStream::TimeOutException, "createStream deadline passed");
-
- vector<string> split = StringUtil::split(descriptor, ':');
-
- if (descriptor == "null:")
- return new NullStream;
- else if (split.size() == 3 && split[0] == "udp")
- return new SocketStream(split[1].c_str(), boost::lexical_cast<unsigned short>(split[2]), SocketStream::UDP, asServer ? SocketStream::Server : SocketStream::Client, deadline);
- else if (split.size() == 3 && split[0] == "tcp")
- return new SocketStream(split[1].c_str(), boost::lexical_cast<unsigned short>(split[2]), SocketStream::TCP, asServer ? SocketStream::Server : SocketStream::Client, deadline);
- else if (split.size() == 3 && split[0] == "udpkey")
- return new SocketStream(split[1].c_str(), 0, SocketStream::UDP, asServer ? SocketStream::Server : SocketStream::Client, deadline, split[2].c_str());
- else if (split.size() == 4 && split[0] == "tcpbroker")
- return asServer ? static_cast<Stream*>(new PortBroker::ServerStream(split[3])) : static_cast<Stream*>(new PortBroker::ClientStream(split[1], boost::lexical_cast<unsigned short>(split[2]), split[3]));
- else if (split.size() == 3 && split[0] == "tcpkey")
- return new SocketStream(split[1].c_str(), 0, SocketStream::TCP, asServer ? SocketStream::Server : SocketStream::Client, deadline, split[2].c_str());
- else if (split.size() > 1 && split[0] == "file") {
- // don't use split[1] to allow : in filenames
- const string filename = descriptor.substr(5);
- return asServer ? new FileStream(filename.c_str()) : new FileStream(filename.c_str(), 0666);
- } else if (split.size() == 2 && split[0] == "pipe")
- return new NamedPipeStream(split[1].c_str(), asServer);
- else if (split.size() == 2)
- return new SocketStream(split[0].c_str(), boost::lexical_cast<unsigned short>(split[1]), SocketStream::UDP, asServer ? SocketStream::Server : SocketStream::Client, deadline);
- else if (split.size() == 1)
- return asServer ? new FileStream(split[0].c_str()) : new FileStream(split[0].c_str(), 0666);
- else
- THROW(CoInterfaceException, string("createStream unrecognized descriptor format: " + descriptor));
- }
-
- // TODO: this function is an unfinished start to refactor the above.
- enum StreamSpecification::Protocol readProtocol(char **str)
- {
- // The first part can be done with iterators,
- // but the if-nest below becomes tedious. Use C.
- char *base = *str;
- unsigned i = 0;
- while (isalnum(base[i])) {
- i += 1;
- }
-
- enum StreamSpecification::Protocol rv;
- if (strncmp(base, "udp", i) == 0) {
- rv = StreamSpecification::UDP_STREAM;
- } else if (strncmp(base, "tcp", i) == 0) {
- rv = StreamSpecification::TCP_STREAM;
- } else if (strncmp(base, "file", i) == 0) {
- rv = StreamSpecification::FILE_STREAM;
- } else if (strncmp(base, "null", i) == 0) {
- rv = StreamSpecification::NULL_STREAM;
- } else if (strncmp(base, "pipe", i) == 0) {
- rv = StreamSpecification::PIPE_STREAM;
- } else if (strncmp(base, "udpkey", i) == 0) {
- rv = StreamSpecification::UDPKEY_STREAM;
- } else if (strncmp(base, "tcpkey", i) == 0) {
- rv = StreamSpecification::TCPKEY_STREAM;
- } else if (strncmp(base, "tcpbroker", i) == 0) {
- rv = StreamSpecification::TCPBROKER_STREAM;
- } else if (strncmp(base, "factory", i) == 0) {
- rv = StreamSpecification::FACTORY_STREAM;
- } else {
- THROW(CoInterfaceException, string("createStream failed to recognize protocol: ") + *str);
- }
-
- *str += i;
- return rv;
- }
-
uint16 storageBrokerPort(int observationID)
{
return 7000 + observationID % 1000;
@@ -131,6 +60,7 @@ namespace LOFAR
}
+ // The returned descriptor can be supplied to LCS/Stream StreamFactory.h
string getStreamDescriptorBetweenIONandStorage(const Parset &parset, OutputType outputType, unsigned streamNr)
{
string host = parset.getHostName(outputType, streamNr);
diff --git a/RTCP/Cobalt/CoInterface/src/Stream.h b/RTCP/Cobalt/CoInterface/src/Stream.h
index d248559710cbf010e37ca003c978005bb4e31e48..8f4797dc77ff00d327d6ac4b335dbaa126a89e89 100644
--- a/RTCP/Cobalt/CoInterface/src/Stream.h
+++ b/RTCP/Cobalt/CoInterface/src/Stream.h
@@ -27,33 +27,15 @@
#include <CoInterface/Parset.h>
#include <Stream/Stream.h>
-
namespace LOFAR
{
namespace Cobalt
{
- // Create a stream from a descriptor
- Stream *createStream(const std::string &descriptor, bool asReader, time_t deadline = 0);
-
- struct StreamSpecification {
- enum Protocol {
- UNKNOWN_STREAM = 0, UDP_STREAM, TCP_STREAM, FILE_STREAM, NULL_STREAM,
- PIPE_STREAM, UDPKEY_STREAM, TCPKEY_STREAM, TCPBROKER_STREAM, FACTORY_STREAM
- };
-
- Protocol protocol;
- std::string hostname;
- std::string port;
- };
-
- // Returns a supported protocol constant if recognized and updates *str.
- // Throws without changing *str iff no protocol was recognized.
- enum StreamSpecification::Protocol readProtocol(char **str);
-
uint16 storageBrokerPort(int observationID);
std::string getStorageControlDescription(int observationID, int rank);
+ // The returned descriptor can be supplied to LCS/Stream StreamFactory.h
std::string getStreamDescriptorBetweenIONandStorage(const Parset &parset, OutputType outputType, unsigned streamNr);
} // namespace Cobalt
diff --git a/RTCP/Cobalt/CoInterface/src/TABTranspose.cc b/RTCP/Cobalt/CoInterface/src/TABTranspose.cc
index a115b2ff1f38b36b18e6a2aa6b08f4b06b284c2e..3cfc8a2cc5cdbd572e21cb0abee18ade279abb57 100644
--- a/RTCP/Cobalt/CoInterface/src/TABTranspose.cc
+++ b/RTCP/Cobalt/CoInterface/src/TABTranspose.cc
@@ -490,7 +490,7 @@ void Receiver::receiveLoop()
collectors.at(fileIdx)->addSubband(subband);
}
- } catch (Stream::EndOfStreamException &) {
+ } catch (EndOfStreamException &) {
}
}
@@ -552,7 +552,7 @@ void MultiReceiver::listenLoop()
try {
stream = new PortBroker::ServerStream(servicePrefix, true);
- } catch(SocketStream::TimeOutException &) {
+ } catch(TimeOutException &) {
// fail silently if no client connected
LOG_DEBUG_STR("TABTranspose::MultiReceiver: Timed out");
break;
diff --git a/RTCP/Cobalt/CoInterface/test/tTABTranspose.cc b/RTCP/Cobalt/CoInterface/test/tTABTranspose.cc
index dd112c9286450412689d94b3e120be5fd2407545..d343f370bcbbf5d714f36b2119edff1973ddca19 100644
--- a/RTCP/Cobalt/CoInterface/test/tTABTranspose.cc
+++ b/RTCP/Cobalt/CoInterface/test/tTABTranspose.cc
@@ -20,6 +20,8 @@
#include <lofar_config.h>
+#include <ctime>
+
#include <Common/LofarLogger.h>
#include <Common/Timer.h>
#include <Stream/StringStream.h>
@@ -476,8 +478,8 @@ SUITE(MultiReceiver) {
// Connect with multiple clients
{
- PortBroker::ClientStream cs1("localhost", PortBroker::DEFAULT_PORT, "foo-1", 1);
- PortBroker::ClientStream cs2("localhost", PortBroker::DEFAULT_PORT, "foo-2", 1);
+ PortBroker::ClientStream cs1("localhost", PortBroker::DEFAULT_PORT, "foo-1", time(0) + 1);
+ PortBroker::ClientStream cs2("localhost", PortBroker::DEFAULT_PORT, "foo-2", time(0) + 1);
// Disconnect them too! (~cs)
}
@@ -495,7 +497,7 @@ SUITE(MultiReceiver) {
// Connect
{
- PortBroker::ClientStream cs("localhost", PortBroker::DEFAULT_PORT, "foo-1", 1);
+ PortBroker::ClientStream cs("localhost", PortBroker::DEFAULT_PORT, "foo-1", time(0) + 1);
// Send one block
{
diff --git a/RTCP/Cobalt/GPUProc/doc/DAS4-fs5-jenkins-install-instructions.txt b/RTCP/Cobalt/GPUProc/doc/DAS4-fs5-jenkins-install-instructions.txt
index e94d7959c12a60a01bba7884622c8dc6bd99ab79..d7af63b2ccaa9a68952d4dda98690bad25031067 100644
--- a/RTCP/Cobalt/GPUProc/doc/DAS4-fs5-jenkins-install-instructions.txt
+++ b/RTCP/Cobalt/GPUProc/doc/DAS4-fs5-jenkins-install-instructions.txt
@@ -171,11 +171,11 @@ needed for mpi to prevent tons of false positives
Dependency for: running LOFAR tests under valgrind
cd $HOME/root/src
- wget http://valgrind.org/downloads/valgrind-3.9.0.tar.bz2 # or whatever version you like
- tar jxf valgrind-3.9.0.tar.bz2
- cd valgrind-3.9.0
+ wget http://valgrind.org/downloads/valgrind-3.10.1.tar.bz2 # or whatever version you like
+ tar jxf valgrind-3.10.1.tar.bz2
+ cd valgrind-3.10.1
./configure --prefix=$HOME/root --with-mpicc=/cm/shared/apps/openmpi/gcc/64/1.4.4/bin/mpicc
-# on cobalt, use: ./configure --prefix=/globalhome/lofarsystem/cobalt-root --with-mpicc=/opt/openmpi/bin/mpicc
+# on cobalt, use: ./configure --prefix=/localhome/lofar/valgrind-3.10.1 --with-mpicc=/opt/openmpi/bin/mpicc
make -j 8 install
valgrind ls -l # optional (test), should exit 0
diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationCalibration.parset b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationCalibration.parset
index f967245a4a6df938c6f5b94cffac9215b4d713a8..6014e8b9d3fd0ebebeaa3fefda8ae25e365f3e7a 100644
--- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationCalibration.parset
+++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationCalibration.parset
@@ -1,3503 +1,2799 @@
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.phase0.X = -3.075993e-01
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -4.375329e-01
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.delay.X = 4.656609e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.delay.Y = 4.656793e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.phase0.X = -3.075993e-01
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -4.375329e-01
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.delay.X = 4.656609e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.delay.Y = 4.656793e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.phase0.X = -3.075993e-01
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -4.375329e-01
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.delay.X = 4.656609e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.delay.Y = 4.656793e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -3.075993e-01
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -4.375329e-01
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 4.656609e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 4.656793e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -3.075993e-01
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -4.375329e-01
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 4.656609e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 4.656793e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -3.075993e-01
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -4.375329e-01
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 4.656609e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 4.656793e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.phase0.X = -3.075993e-01
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -4.375329e-01
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.delay.X = 4.656609e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.delay.Y = 4.656793e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.phase0.X = -3.075993e-01
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -4.375329e-01
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.delay.X = 4.656609e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.delay.Y = 4.656793e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.phase0.X = -3.075993e-01
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -4.375329e-01
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.delay.X = 4.656609e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.delay.Y = 4.656793e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.phase0.X = -7.209939e-01
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -2.174486e-01
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.delay.X = 4.655675e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.delay.Y = 4.656047e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.phase0.X = -7.209939e-01
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -2.174486e-01
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.delay.X = 4.655675e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.delay.Y = 4.656047e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.phase0.X = -7.209939e-01
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -2.174486e-01
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.delay.X = 4.655675e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.delay.Y = 4.656047e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -7.209939e-01
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -2.174486e-01
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 4.655675e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 4.656047e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -7.209939e-01
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -2.174486e-01
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 4.655675e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 4.656047e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -7.209939e-01
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -2.174486e-01
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 4.655675e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 4.656047e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.phase0.X = -7.209939e-01
-PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.phase0.Y = -2.174486e-01
-PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.delay.X = 4.655675e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.delay.Y = 4.656047e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.phase0.X = -7.209939e-01
-PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.phase0.Y = -2.174486e-01
-PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.delay.X = 4.655675e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.delay.Y = 4.656047e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.phase0.X = -7.209939e-01
-PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.phase0.Y = -2.174486e-01
-PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.delay.X = 4.655675e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.delay.Y = 4.656047e-06
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.delay.X = 4.656295e-06
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.delay.Y = 4.655852e-06
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.delay.X = 4.656295e-06
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.delay.Y = 4.655852e-06
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.delay.X = 4.656295e-06
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.delay.Y = 4.655852e-06
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.delay.X = 4.656295e-06
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.delay.Y = 4.655852e-06
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.delay.X = 4.656295e-06
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.delay.Y = 4.655852e-06
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.delay.X = 4.656295e-06
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.delay.Y = 4.655852e-06
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.delay.X = 4.656295e-06
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.delay.Y = 4.655852e-06
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.delay.X = 4.656295e-06
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.delay.Y = 4.655852e-06
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.delay.X = 4.656321e-06
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.delay.Y = 4.655847e-06
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.delay.X = 4.656321e-06
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.delay.Y = 4.655847e-06
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.delay.X = 4.656321e-06
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.delay.Y = 4.655847e-06
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.delay.X = 4.656321e-06
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.delay.Y = 4.655847e-06
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.delay.X = 4.656321e-06
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.delay.Y = 4.655847e-06
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.delay.X = 4.656321e-06
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.delay.Y = 4.655847e-06
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 4.656321e-06
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 4.655847e-06
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 4.656321e-06
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 4.655847e-06
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 4.656321e-06
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 4.655847e-06
+PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.delay.X = 4.656269e-06
+PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.delay.Y = 4.655857e-06
+PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.delay.X = 4.656269e-06
+PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.delay.Y = 4.655857e-06
+PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.delay.X = 4.656269e-06
+PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.delay.Y = 4.655857e-06
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.delay.X = 4.656269e-06
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.delay.Y = 4.655857e-06
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.delay.X = 4.656269e-06
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.delay.Y = 4.655857e-06
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.delay.X = 4.656269e-06
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.delay.Y = 4.655857e-06
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 4.656269e-06
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 4.655857e-06
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 4.656269e-06
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 4.655857e-06
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 4.656269e-06
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 4.655857e-06
PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.delay.X = 4.657052e-06
-PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.delay.Y = 4.657342e-06
+PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.delay.X = 4.656295e-06
+PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.delay.Y = 4.655852e-06
PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.delay.X = 4.657052e-06
-PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.delay.Y = 4.657342e-06
+PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.delay.X = 4.656295e-06
+PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.delay.Y = 4.655852e-06
PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.delay.X = 4.657052e-06
-PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.delay.Y = 4.657342e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.phase0.X = -1.350000e-02
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.phase0.Y = 2.275000e-01
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.delay.X = 4.651875e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.delay.Y = 4.652082e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.phase0.X = -1.350000e-02
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.phase0.Y = 2.275000e-01
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.delay.X = 4.651875e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.delay.Y = 4.652082e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.phase0.X = -1.350000e-02
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.phase0.Y = 2.275000e-01
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.delay.X = 4.651875e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.delay.Y = 4.652082e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.phase0.X = -1.350000e-02
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.phase0.Y = 2.275000e-01
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.delay.X = 4.651875e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.delay.Y = 4.652082e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.phase0.X = -2.450000e-02
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.phase0.Y = -2.750000e-02
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.delay.X = 4.653100e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.delay.Y = 4.653002e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.phase0.X = -2.450000e-02
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.phase0.Y = -2.750000e-02
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.delay.X = 4.653100e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.delay.Y = 4.653002e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.phase0.X = -2.450000e-02
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.phase0.Y = -2.750000e-02
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.delay.X = 4.653100e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.delay.Y = 4.653002e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.phase0.X = -2.450000e-02
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.phase0.Y = -2.750000e-02
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.delay.X = 4.653100e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.delay.Y = 4.653002e-06
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.phase0.X = -4.138284e-01
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 1.209249e-01
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.876423e-06
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.876275e-06
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_170_230.phase0.X = -4.138284e-01
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 1.209249e-01
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.876423e-06
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.876275e-06
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_210_250.phase0.X = -4.138284e-01
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 1.209249e-01
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.876423e-06
-PIC.Core.CS002HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.876275e-06
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -4.138284e-01
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 1.209249e-01
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.876423e-06
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.876275e-06
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -4.138284e-01
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 1.209249e-01
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.876423e-06
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.876275e-06
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -4.138284e-01
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 1.209249e-01
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.876423e-06
-PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.876275e-06
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_110_190.phase0.X = -4.138284e-01
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 1.209249e-01
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.876423e-06
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.876275e-06
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_170_230.phase0.X = -4.138284e-01
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 1.209249e-01
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.876423e-06
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.876275e-06
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_210_250.phase0.X = -4.138284e-01
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 1.209249e-01
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.876423e-06
-PIC.Core.CS002HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.876275e-06
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_110_190.phase0.X = -5.618056e-01
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -2.193133e-01
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.875538e-06
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.876627e-06
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_170_230.phase0.X = -5.618056e-01
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -2.193133e-01
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.875538e-06
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.876627e-06
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_210_250.phase0.X = -5.618056e-01
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -2.193133e-01
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.875538e-06
-PIC.Core.CS002HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.876627e-06
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -5.618056e-01
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -2.193133e-01
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.875538e-06
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.876627e-06
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -5.618056e-01
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -2.193133e-01
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.875538e-06
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.876627e-06
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -5.618056e-01
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -2.193133e-01
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.875538e-06
-PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.876627e-06
-PIC.Core.CS002HBA1.HBA_ONE.HBA_110_190.phase0.X = -5.618056e-01
-PIC.Core.CS002HBA1.HBA_ONE.HBA_110_190.phase0.Y = -2.193133e-01
-PIC.Core.CS002HBA1.HBA_ONE.HBA_110_190.delay.X = 6.875538e-06
-PIC.Core.CS002HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.876627e-06
-PIC.Core.CS002HBA1.HBA_ONE.HBA_170_230.phase0.X = -5.618056e-01
-PIC.Core.CS002HBA1.HBA_ONE.HBA_170_230.phase0.Y = -2.193133e-01
-PIC.Core.CS002HBA1.HBA_ONE.HBA_170_230.delay.X = 6.875538e-06
-PIC.Core.CS002HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.876627e-06
-PIC.Core.CS002HBA1.HBA_ONE.HBA_210_250.phase0.X = -5.618056e-01
-PIC.Core.CS002HBA1.HBA_ONE.HBA_210_250.phase0.Y = -2.193133e-01
-PIC.Core.CS002HBA1.HBA_ONE.HBA_210_250.delay.X = 6.875538e-06
-PIC.Core.CS002HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.876627e-06
+PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.delay.X = 4.656295e-06
+PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.delay.Y = 4.655852e-06
+PIC.Core.CS002LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS002LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS002LBA.LBA_INNER.LBA_10_70.delay.X = 6.876039e-06
+PIC.Core.CS002LBA.LBA_INNER.LBA_10_70.delay.Y = 6.876581e-06
+PIC.Core.CS002LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS002LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS002LBA.LBA_INNER.LBA_30_70.delay.X = 6.876039e-06
+PIC.Core.CS002LBA.LBA_INNER.LBA_30_70.delay.Y = 6.876581e-06
+PIC.Core.CS002LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS002LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS002LBA.LBA_INNER.LBA_10_90.delay.X = 6.876039e-06
+PIC.Core.CS002LBA.LBA_INNER.LBA_10_90.delay.Y = 6.876581e-06
+PIC.Core.CS002LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS002LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS002LBA.LBA_INNER.LBA_30_90.delay.X = 6.876039e-06
+PIC.Core.CS002LBA.LBA_INNER.LBA_30_90.delay.Y = 6.876581e-06
+PIC.Core.CS002LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS002LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS002LBA.LBA_OUTER.LBA_10_70.delay.X = 6.876039e-06
+PIC.Core.CS002LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.876581e-06
+PIC.Core.CS002LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS002LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS002LBA.LBA_OUTER.LBA_30_70.delay.X = 6.876039e-06
+PIC.Core.CS002LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.876581e-06
+PIC.Core.CS002LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS002LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS002LBA.LBA_OUTER.LBA_10_90.delay.X = 6.876039e-06
+PIC.Core.CS002LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.876581e-06
+PIC.Core.CS002LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS002LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS002LBA.LBA_OUTER.LBA_30_90.delay.X = 6.876039e-06
+PIC.Core.CS002LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.876581e-06
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.875965e-06
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.876319e-06
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.875965e-06
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.876319e-06
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.875965e-06
+PIC.Core.CS002HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.876319e-06
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.875965e-06
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.876319e-06
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.875965e-06
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.876319e-06
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.875965e-06
+PIC.Core.CS002HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.876319e-06
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.875965e-06
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.876319e-06
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.875965e-06
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.876319e-06
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.875965e-06
+PIC.Core.CS002HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.876319e-06
+PIC.Core.CS002HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_ONE.HBA_110_190.delay.X = 6.876113e-06
+PIC.Core.CS002HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.876844e-06
+PIC.Core.CS002HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_ONE.HBA_170_230.delay.X = 6.876113e-06
+PIC.Core.CS002HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.876844e-06
+PIC.Core.CS002HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_ONE.HBA_210_250.delay.X = 6.876113e-06
+PIC.Core.CS002HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.876844e-06
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.876113e-06
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.876844e-06
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.876113e-06
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.876844e-06
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.876113e-06
+PIC.Core.CS002HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.876844e-06
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.876113e-06
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.876844e-06
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.876113e-06
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.876844e-06
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.876113e-06
+PIC.Core.CS002HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.876844e-06
PIC.Core.CS002HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS002HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS002HBA.HBA_JOINED.HBA_110_190.delay.X = 6.875945e-06
-PIC.Core.CS002HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.876411e-06
+PIC.Core.CS002HBA.HBA_JOINED.HBA_110_190.delay.X = 6.876039e-06
+PIC.Core.CS002HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.876581e-06
PIC.Core.CS002HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS002HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS002HBA.HBA_JOINED.HBA_170_230.delay.X = 6.875945e-06
-PIC.Core.CS002HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.876411e-06
+PIC.Core.CS002HBA.HBA_JOINED.HBA_170_230.delay.X = 6.876039e-06
+PIC.Core.CS002HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.876581e-06
PIC.Core.CS002HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS002HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS002HBA.HBA_JOINED.HBA_210_250.delay.X = 6.875945e-06
-PIC.Core.CS002HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.876411e-06
-PIC.Core.CS002LBA.LBA_INNER.LBA_10_70.phase0.X = -2.505000e-01
-PIC.Core.CS002LBA.LBA_INNER.LBA_10_70.phase0.Y = -6.730000e-01
-PIC.Core.CS002LBA.LBA_INNER.LBA_10_70.delay.X = 6.872534e-06
-PIC.Core.CS002LBA.LBA_INNER.LBA_10_70.delay.Y = 6.874456e-06
-PIC.Core.CS002LBA.LBA_INNER.LBA_10_90.phase0.X = -2.505000e-01
-PIC.Core.CS002LBA.LBA_INNER.LBA_10_90.phase0.Y = -6.730000e-01
-PIC.Core.CS002LBA.LBA_INNER.LBA_10_90.delay.X = 6.872534e-06
-PIC.Core.CS002LBA.LBA_INNER.LBA_10_90.delay.Y = 6.874456e-06
-PIC.Core.CS002LBA.LBA_INNER.LBA_30_70.phase0.X = -2.505000e-01
-PIC.Core.CS002LBA.LBA_INNER.LBA_30_70.phase0.Y = -6.730000e-01
-PIC.Core.CS002LBA.LBA_INNER.LBA_30_70.delay.X = 6.872534e-06
-PIC.Core.CS002LBA.LBA_INNER.LBA_30_70.delay.Y = 6.874456e-06
-PIC.Core.CS002LBA.LBA_INNER.LBA_30_90.phase0.X = -2.505000e-01
-PIC.Core.CS002LBA.LBA_INNER.LBA_30_90.phase0.Y = -6.730000e-01
-PIC.Core.CS002LBA.LBA_INNER.LBA_30_90.delay.X = 6.872534e-06
-PIC.Core.CS002LBA.LBA_INNER.LBA_30_90.delay.Y = 6.874456e-06
-PIC.Core.CS002LBA.LBA_OUTER.LBA_10_70.phase0.X = -1.770000e-01
-PIC.Core.CS002LBA.LBA_OUTER.LBA_10_70.phase0.Y = -2.040000e-01
-PIC.Core.CS002LBA.LBA_OUTER.LBA_10_70.delay.X = 6.880244e-06
-PIC.Core.CS002LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.880071e-06
-PIC.Core.CS002LBA.LBA_OUTER.LBA_10_90.phase0.X = -1.770000e-01
-PIC.Core.CS002LBA.LBA_OUTER.LBA_10_90.phase0.Y = -2.040000e-01
-PIC.Core.CS002LBA.LBA_OUTER.LBA_10_90.delay.X = 6.880244e-06
-PIC.Core.CS002LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.880071e-06
-PIC.Core.CS002LBA.LBA_OUTER.LBA_30_70.phase0.X = -1.770000e-01
-PIC.Core.CS002LBA.LBA_OUTER.LBA_30_70.phase0.Y = -2.040000e-01
-PIC.Core.CS002LBA.LBA_OUTER.LBA_30_70.delay.X = 6.880244e-06
-PIC.Core.CS002LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.880071e-06
-PIC.Core.CS002LBA.LBA_OUTER.LBA_30_90.phase0.X = -1.770000e-01
-PIC.Core.CS002LBA.LBA_OUTER.LBA_30_90.phase0.Y = -2.040000e-01
-PIC.Core.CS002LBA.LBA_OUTER.LBA_30_90.delay.X = 6.880244e-06
-PIC.Core.CS002LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.880071e-06
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_110_190.phase0.X = -4.869882e-01
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -5.130354e-01
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_110_190.delay.X = 5.471618e-06
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_110_190.delay.Y = 5.471532e-06
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_170_230.phase0.X = -4.869882e-01
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -5.130354e-01
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_170_230.delay.X = 5.471618e-06
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_170_230.delay.Y = 5.471532e-06
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_210_250.phase0.X = -4.869882e-01
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -5.130354e-01
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_210_250.delay.X = 5.471618e-06
-PIC.Core.CS003HBA0.HBA_DUAL.HBA_210_250.delay.Y = 5.471532e-06
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -4.869882e-01
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -5.130354e-01
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 5.471618e-06
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 5.471532e-06
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -4.869882e-01
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -5.130354e-01
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 5.471618e-06
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 5.471532e-06
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -4.869882e-01
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -5.130354e-01
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 5.471618e-06
-PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 5.471532e-06
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_110_190.phase0.X = -4.869882e-01
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -5.130354e-01
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_110_190.delay.X = 5.471618e-06
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_110_190.delay.Y = 5.471532e-06
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_170_230.phase0.X = -4.869882e-01
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -5.130354e-01
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_170_230.delay.X = 5.471618e-06
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_170_230.delay.Y = 5.471532e-06
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_210_250.phase0.X = -4.869882e-01
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -5.130354e-01
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_210_250.delay.X = 5.471618e-06
-PIC.Core.CS003HBA0.HBA_ZERO.HBA_210_250.delay.Y = 5.471532e-06
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_110_190.phase0.X = -3.306589e-01
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 1.183089e-02
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_110_190.delay.X = 5.471786e-06
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_110_190.delay.Y = 5.471281e-06
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_170_230.phase0.X = -3.306589e-01
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 1.183089e-02
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_170_230.delay.X = 5.471786e-06
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_170_230.delay.Y = 5.471281e-06
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_210_250.phase0.X = -3.306589e-01
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 1.183089e-02
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_210_250.delay.X = 5.471786e-06
-PIC.Core.CS003HBA1.HBA_DUAL.HBA_210_250.delay.Y = 5.471281e-06
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -3.306589e-01
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 1.183089e-02
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 5.471786e-06
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 5.471281e-06
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -3.306589e-01
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 1.183089e-02
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 5.471786e-06
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 5.471281e-06
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -3.306589e-01
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 1.183089e-02
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 5.471786e-06
-PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 5.471281e-06
-PIC.Core.CS003HBA1.HBA_ONE.HBA_110_190.phase0.X = -3.306589e-01
-PIC.Core.CS003HBA1.HBA_ONE.HBA_110_190.phase0.Y = 1.183089e-02
-PIC.Core.CS003HBA1.HBA_ONE.HBA_110_190.delay.X = 5.471786e-06
-PIC.Core.CS003HBA1.HBA_ONE.HBA_110_190.delay.Y = 5.471281e-06
-PIC.Core.CS003HBA1.HBA_ONE.HBA_170_230.phase0.X = -3.306589e-01
-PIC.Core.CS003HBA1.HBA_ONE.HBA_170_230.phase0.Y = 1.183089e-02
-PIC.Core.CS003HBA1.HBA_ONE.HBA_170_230.delay.X = 5.471786e-06
-PIC.Core.CS003HBA1.HBA_ONE.HBA_170_230.delay.Y = 5.471281e-06
-PIC.Core.CS003HBA1.HBA_ONE.HBA_210_250.phase0.X = -3.306589e-01
-PIC.Core.CS003HBA1.HBA_ONE.HBA_210_250.phase0.Y = 1.183089e-02
-PIC.Core.CS003HBA1.HBA_ONE.HBA_210_250.delay.X = 5.471786e-06
-PIC.Core.CS003HBA1.HBA_ONE.HBA_210_250.delay.Y = 5.471281e-06
+PIC.Core.CS002HBA.HBA_JOINED.HBA_210_250.delay.X = 6.876039e-06
+PIC.Core.CS002HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.876581e-06
+PIC.Core.CS003LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS003LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS003LBA.LBA_INNER.LBA_10_70.delay.X = 5.471480e-06
+PIC.Core.CS003LBA.LBA_INNER.LBA_10_70.delay.Y = 5.471185e-06
+PIC.Core.CS003LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS003LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS003LBA.LBA_INNER.LBA_30_70.delay.X = 5.471480e-06
+PIC.Core.CS003LBA.LBA_INNER.LBA_30_70.delay.Y = 5.471185e-06
+PIC.Core.CS003LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS003LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS003LBA.LBA_INNER.LBA_10_90.delay.X = 5.471480e-06
+PIC.Core.CS003LBA.LBA_INNER.LBA_10_90.delay.Y = 5.471185e-06
+PIC.Core.CS003LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS003LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS003LBA.LBA_INNER.LBA_30_90.delay.X = 5.471480e-06
+PIC.Core.CS003LBA.LBA_INNER.LBA_30_90.delay.Y = 5.471185e-06
+PIC.Core.CS003LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS003LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS003LBA.LBA_OUTER.LBA_10_70.delay.X = 5.471480e-06
+PIC.Core.CS003LBA.LBA_OUTER.LBA_10_70.delay.Y = 5.471185e-06
+PIC.Core.CS003LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS003LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS003LBA.LBA_OUTER.LBA_30_70.delay.X = 5.471480e-06
+PIC.Core.CS003LBA.LBA_OUTER.LBA_30_70.delay.Y = 5.471185e-06
+PIC.Core.CS003LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS003LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS003LBA.LBA_OUTER.LBA_10_90.delay.X = 5.471480e-06
+PIC.Core.CS003LBA.LBA_OUTER.LBA_10_90.delay.Y = 5.471185e-06
+PIC.Core.CS003LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS003LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS003LBA.LBA_OUTER.LBA_30_90.delay.X = 5.471480e-06
+PIC.Core.CS003LBA.LBA_OUTER.LBA_30_90.delay.Y = 5.471185e-06
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_110_190.delay.X = 5.471519e-06
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_110_190.delay.Y = 5.471004e-06
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_170_230.delay.X = 5.471519e-06
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_170_230.delay.Y = 5.471004e-06
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_210_250.delay.X = 5.471519e-06
+PIC.Core.CS003HBA0.HBA_ZERO.HBA_210_250.delay.Y = 5.471004e-06
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_110_190.delay.X = 5.471519e-06
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_110_190.delay.Y = 5.471004e-06
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_170_230.delay.X = 5.471519e-06
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_170_230.delay.Y = 5.471004e-06
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_210_250.delay.X = 5.471519e-06
+PIC.Core.CS003HBA0.HBA_DUAL.HBA_210_250.delay.Y = 5.471004e-06
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 5.471519e-06
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 5.471004e-06
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 5.471519e-06
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 5.471004e-06
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 5.471519e-06
+PIC.Core.CS003HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 5.471004e-06
+PIC.Core.CS003HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_ONE.HBA_110_190.delay.X = 5.471440e-06
+PIC.Core.CS003HBA1.HBA_ONE.HBA_110_190.delay.Y = 5.471366e-06
+PIC.Core.CS003HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_ONE.HBA_170_230.delay.X = 5.471440e-06
+PIC.Core.CS003HBA1.HBA_ONE.HBA_170_230.delay.Y = 5.471366e-06
+PIC.Core.CS003HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_ONE.HBA_210_250.delay.X = 5.471440e-06
+PIC.Core.CS003HBA1.HBA_ONE.HBA_210_250.delay.Y = 5.471366e-06
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_110_190.delay.X = 5.471440e-06
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_110_190.delay.Y = 5.471366e-06
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_170_230.delay.X = 5.471440e-06
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_170_230.delay.Y = 5.471366e-06
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_210_250.delay.X = 5.471440e-06
+PIC.Core.CS003HBA1.HBA_DUAL.HBA_210_250.delay.Y = 5.471366e-06
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 5.471440e-06
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 5.471366e-06
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 5.471440e-06
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 5.471366e-06
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 5.471440e-06
+PIC.Core.CS003HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 5.471366e-06
PIC.Core.CS003HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS003HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS003HBA.HBA_JOINED.HBA_110_190.delay.X = 5.470825e-06
-PIC.Core.CS003HBA.HBA_JOINED.HBA_110_190.delay.Y = 5.470525e-06
+PIC.Core.CS003HBA.HBA_JOINED.HBA_110_190.delay.X = 5.471480e-06
+PIC.Core.CS003HBA.HBA_JOINED.HBA_110_190.delay.Y = 5.471185e-06
PIC.Core.CS003HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS003HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS003HBA.HBA_JOINED.HBA_170_230.delay.X = 5.470825e-06
-PIC.Core.CS003HBA.HBA_JOINED.HBA_170_230.delay.Y = 5.470525e-06
+PIC.Core.CS003HBA.HBA_JOINED.HBA_170_230.delay.X = 5.471480e-06
+PIC.Core.CS003HBA.HBA_JOINED.HBA_170_230.delay.Y = 5.471185e-06
PIC.Core.CS003HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS003HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS003HBA.HBA_JOINED.HBA_210_250.delay.X = 5.470825e-06
-PIC.Core.CS003HBA.HBA_JOINED.HBA_210_250.delay.Y = 5.470525e-06
-PIC.Core.CS003LBA.LBA_INNER.LBA_10_70.phase0.X = -1.130000e-01
-PIC.Core.CS003LBA.LBA_INNER.LBA_10_70.phase0.Y = -1.340000e-01
-PIC.Core.CS003LBA.LBA_INNER.LBA_10_70.delay.X = 5.474770e-06
-PIC.Core.CS003LBA.LBA_INNER.LBA_10_70.delay.Y = 5.475645e-06
-PIC.Core.CS003LBA.LBA_INNER.LBA_10_90.phase0.X = -1.130000e-01
-PIC.Core.CS003LBA.LBA_INNER.LBA_10_90.phase0.Y = -1.340000e-01
-PIC.Core.CS003LBA.LBA_INNER.LBA_10_90.delay.X = 5.474770e-06
-PIC.Core.CS003LBA.LBA_INNER.LBA_10_90.delay.Y = 5.475645e-06
-PIC.Core.CS003LBA.LBA_INNER.LBA_30_70.phase0.X = -1.130000e-01
-PIC.Core.CS003LBA.LBA_INNER.LBA_30_70.phase0.Y = -1.340000e-01
-PIC.Core.CS003LBA.LBA_INNER.LBA_30_70.delay.X = 5.474770e-06
-PIC.Core.CS003LBA.LBA_INNER.LBA_30_70.delay.Y = 5.475645e-06
-PIC.Core.CS003LBA.LBA_INNER.LBA_30_90.phase0.X = -1.130000e-01
-PIC.Core.CS003LBA.LBA_INNER.LBA_30_90.phase0.Y = -1.340000e-01
-PIC.Core.CS003LBA.LBA_INNER.LBA_30_90.delay.X = 5.474770e-06
-PIC.Core.CS003LBA.LBA_INNER.LBA_30_90.delay.Y = 5.475645e-06
-PIC.Core.CS003LBA.LBA_OUTER.LBA_10_70.phase0.X = 9.400000e-02
-PIC.Core.CS003LBA.LBA_OUTER.LBA_10_70.phase0.Y = 1.610000e-01
-PIC.Core.CS003LBA.LBA_OUTER.LBA_10_70.delay.X = 5.475315e-06
-PIC.Core.CS003LBA.LBA_OUTER.LBA_10_70.delay.Y = 5.474750e-06
-PIC.Core.CS003LBA.LBA_OUTER.LBA_10_90.phase0.X = 9.400000e-02
-PIC.Core.CS003LBA.LBA_OUTER.LBA_10_90.phase0.Y = 1.610000e-01
-PIC.Core.CS003LBA.LBA_OUTER.LBA_10_90.delay.X = 5.475315e-06
-PIC.Core.CS003LBA.LBA_OUTER.LBA_10_90.delay.Y = 5.474750e-06
-PIC.Core.CS003LBA.LBA_OUTER.LBA_30_70.phase0.X = 9.400000e-02
-PIC.Core.CS003LBA.LBA_OUTER.LBA_30_70.phase0.Y = 1.610000e-01
-PIC.Core.CS003LBA.LBA_OUTER.LBA_30_70.delay.X = 5.475315e-06
-PIC.Core.CS003LBA.LBA_OUTER.LBA_30_70.delay.Y = 5.474750e-06
-PIC.Core.CS003LBA.LBA_OUTER.LBA_30_90.phase0.X = 9.400000e-02
-PIC.Core.CS003LBA.LBA_OUTER.LBA_30_90.phase0.Y = 1.610000e-01
-PIC.Core.CS003LBA.LBA_OUTER.LBA_30_90.delay.X = 5.475315e-06
-PIC.Core.CS003LBA.LBA_OUTER.LBA_30_90.delay.Y = 5.474750e-06
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_110_190.phase0.X = 1.199402e+00
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 9.175347e-01
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.450188e-06
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.451001e-06
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_170_230.phase0.X = 1.199402e+00
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 9.175347e-01
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.450188e-06
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.451001e-06
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_210_250.phase0.X = 1.199402e+00
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 9.175347e-01
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.450188e-06
-PIC.Core.CS004HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.451001e-06
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 1.199402e+00
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 9.175347e-01
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.450188e-06
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.451001e-06
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 1.199402e+00
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 9.175347e-01
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.450188e-06
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.451001e-06
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 1.199402e+00
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 9.175347e-01
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.450188e-06
-PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.451001e-06
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_110_190.phase0.X = 1.199402e+00
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 9.175347e-01
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.450188e-06
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.451001e-06
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_170_230.phase0.X = 1.199402e+00
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 9.175347e-01
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.450188e-06
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.451001e-06
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_210_250.phase0.X = 1.199402e+00
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 9.175347e-01
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.450188e-06
-PIC.Core.CS004HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.451001e-06
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_110_190.phase0.X = 4.717018e-01
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 1.049486e+00
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.449530e-06
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.450133e-06
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_170_230.phase0.X = 4.717018e-01
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 1.049486e+00
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.449530e-06
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.450133e-06
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_210_250.phase0.X = 4.717018e-01
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 1.049486e+00
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.449530e-06
-PIC.Core.CS004HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.450133e-06
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 4.717018e-01
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 1.049486e+00
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.449530e-06
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.450133e-06
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 4.717018e-01
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 1.049486e+00
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.449530e-06
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.450133e-06
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 4.717018e-01
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 1.049486e+00
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.449530e-06
-PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.450133e-06
-PIC.Core.CS004HBA1.HBA_ONE.HBA_110_190.phase0.X = 4.717018e-01
-PIC.Core.CS004HBA1.HBA_ONE.HBA_110_190.phase0.Y = 1.049486e+00
-PIC.Core.CS004HBA1.HBA_ONE.HBA_110_190.delay.X = 6.449530e-06
-PIC.Core.CS004HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.450133e-06
-PIC.Core.CS004HBA1.HBA_ONE.HBA_170_230.phase0.X = 4.717018e-01
-PIC.Core.CS004HBA1.HBA_ONE.HBA_170_230.phase0.Y = 1.049486e+00
-PIC.Core.CS004HBA1.HBA_ONE.HBA_170_230.delay.X = 6.449530e-06
-PIC.Core.CS004HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.450133e-06
-PIC.Core.CS004HBA1.HBA_ONE.HBA_210_250.phase0.X = 4.717018e-01
-PIC.Core.CS004HBA1.HBA_ONE.HBA_210_250.phase0.Y = 1.049486e+00
-PIC.Core.CS004HBA1.HBA_ONE.HBA_210_250.delay.X = 6.449530e-06
-PIC.Core.CS004HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.450133e-06
+PIC.Core.CS003HBA.HBA_JOINED.HBA_210_250.delay.X = 5.471480e-06
+PIC.Core.CS003HBA.HBA_JOINED.HBA_210_250.delay.Y = 5.471185e-06
+PIC.Core.CS004LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS004LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS004LBA.LBA_INNER.LBA_10_70.delay.X = 6.451439e-06
+PIC.Core.CS004LBA.LBA_INNER.LBA_10_70.delay.Y = 6.452039e-06
+PIC.Core.CS004LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS004LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS004LBA.LBA_INNER.LBA_30_70.delay.X = 6.451439e-06
+PIC.Core.CS004LBA.LBA_INNER.LBA_30_70.delay.Y = 6.452039e-06
+PIC.Core.CS004LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS004LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS004LBA.LBA_INNER.LBA_10_90.delay.X = 6.451439e-06
+PIC.Core.CS004LBA.LBA_INNER.LBA_10_90.delay.Y = 6.452039e-06
+PIC.Core.CS004LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS004LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS004LBA.LBA_INNER.LBA_30_90.delay.X = 6.451439e-06
+PIC.Core.CS004LBA.LBA_INNER.LBA_30_90.delay.Y = 6.452039e-06
+PIC.Core.CS004LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS004LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS004LBA.LBA_OUTER.LBA_10_70.delay.X = 6.451439e-06
+PIC.Core.CS004LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.452039e-06
+PIC.Core.CS004LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS004LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS004LBA.LBA_OUTER.LBA_30_70.delay.X = 6.451439e-06
+PIC.Core.CS004LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.452039e-06
+PIC.Core.CS004LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS004LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS004LBA.LBA_OUTER.LBA_10_90.delay.X = 6.451439e-06
+PIC.Core.CS004LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.452039e-06
+PIC.Core.CS004LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS004LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS004LBA.LBA_OUTER.LBA_30_90.delay.X = 6.451439e-06
+PIC.Core.CS004LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.452039e-06
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.451586e-06
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.451887e-06
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.451586e-06
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.451887e-06
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.451586e-06
+PIC.Core.CS004HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.451887e-06
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.451586e-06
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.451887e-06
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.451586e-06
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.451887e-06
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.451586e-06
+PIC.Core.CS004HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.451887e-06
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.451586e-06
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.451887e-06
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.451586e-06
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.451887e-06
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.451586e-06
+PIC.Core.CS004HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.451887e-06
+PIC.Core.CS004HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_ONE.HBA_110_190.delay.X = 6.451293e-06
+PIC.Core.CS004HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.452190e-06
+PIC.Core.CS004HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_ONE.HBA_170_230.delay.X = 6.451293e-06
+PIC.Core.CS004HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.452190e-06
+PIC.Core.CS004HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_ONE.HBA_210_250.delay.X = 6.451293e-06
+PIC.Core.CS004HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.452190e-06
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.451293e-06
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.452190e-06
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.451293e-06
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.452190e-06
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.451293e-06
+PIC.Core.CS004HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.452190e-06
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.451293e-06
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.452190e-06
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.451293e-06
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.452190e-06
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.451293e-06
+PIC.Core.CS004HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.452190e-06
PIC.Core.CS004HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS004HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS004HBA.HBA_JOINED.HBA_110_190.delay.X = 6.449955e-06
-PIC.Core.CS004HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.450678e-06
+PIC.Core.CS004HBA.HBA_JOINED.HBA_110_190.delay.X = 6.451439e-06
+PIC.Core.CS004HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.452039e-06
PIC.Core.CS004HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS004HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS004HBA.HBA_JOINED.HBA_170_230.delay.X = 6.449955e-06
-PIC.Core.CS004HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.450678e-06
+PIC.Core.CS004HBA.HBA_JOINED.HBA_170_230.delay.X = 6.451439e-06
+PIC.Core.CS004HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.452039e-06
PIC.Core.CS004HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS004HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS004HBA.HBA_JOINED.HBA_210_250.delay.X = 6.449955e-06
-PIC.Core.CS004HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.450678e-06
-PIC.Core.CS004LBA.LBA_INNER.LBA_10_70.phase0.X = -4.450000e-02
-PIC.Core.CS004LBA.LBA_INNER.LBA_10_70.phase0.Y = 1.860000e-01
-PIC.Core.CS004LBA.LBA_INNER.LBA_10_70.delay.X = 6.453389e-06
-PIC.Core.CS004LBA.LBA_INNER.LBA_10_70.delay.Y = 6.447939e-06
-PIC.Core.CS004LBA.LBA_INNER.LBA_10_90.phase0.X = -4.450000e-02
-PIC.Core.CS004LBA.LBA_INNER.LBA_10_90.phase0.Y = 1.860000e-01
-PIC.Core.CS004LBA.LBA_INNER.LBA_10_90.delay.X = 6.453389e-06
-PIC.Core.CS004LBA.LBA_INNER.LBA_10_90.delay.Y = 6.447939e-06
-PIC.Core.CS004LBA.LBA_INNER.LBA_30_70.phase0.X = -4.450000e-02
-PIC.Core.CS004LBA.LBA_INNER.LBA_30_70.phase0.Y = 1.860000e-01
-PIC.Core.CS004LBA.LBA_INNER.LBA_30_70.delay.X = 6.453389e-06
-PIC.Core.CS004LBA.LBA_INNER.LBA_30_70.delay.Y = 6.447939e-06
-PIC.Core.CS004LBA.LBA_INNER.LBA_30_90.phase0.X = -4.450000e-02
-PIC.Core.CS004LBA.LBA_INNER.LBA_30_90.phase0.Y = 1.860000e-01
-PIC.Core.CS004LBA.LBA_INNER.LBA_30_90.delay.X = 6.453389e-06
-PIC.Core.CS004LBA.LBA_INNER.LBA_30_90.delay.Y = 6.447939e-06
-PIC.Core.CS004LBA.LBA_OUTER.LBA_10_70.phase0.X = 5.015000e-01
-PIC.Core.CS004LBA.LBA_OUTER.LBA_10_70.phase0.Y = 5.470000e-01
-PIC.Core.CS004LBA.LBA_OUTER.LBA_10_70.delay.X = 6.447334e-06
-PIC.Core.CS004LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.447629e-06
-PIC.Core.CS004LBA.LBA_OUTER.LBA_10_90.phase0.X = 5.015000e-01
-PIC.Core.CS004LBA.LBA_OUTER.LBA_10_90.phase0.Y = 5.470000e-01
-PIC.Core.CS004LBA.LBA_OUTER.LBA_10_90.delay.X = 6.447334e-06
-PIC.Core.CS004LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.447629e-06
-PIC.Core.CS004LBA.LBA_OUTER.LBA_30_70.phase0.X = 5.015000e-01
-PIC.Core.CS004LBA.LBA_OUTER.LBA_30_70.phase0.Y = 5.470000e-01
-PIC.Core.CS004LBA.LBA_OUTER.LBA_30_70.delay.X = 6.447334e-06
-PIC.Core.CS004LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.447629e-06
-PIC.Core.CS004LBA.LBA_OUTER.LBA_30_90.phase0.X = 5.015000e-01
-PIC.Core.CS004LBA.LBA_OUTER.LBA_30_90.phase0.Y = 5.470000e-01
-PIC.Core.CS004LBA.LBA_OUTER.LBA_30_90.delay.X = 6.447334e-06
-PIC.Core.CS004LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.447629e-06
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_110_190.phase0.X = 6.868670e-01
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 5.883642e-01
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_110_190.delay.X = 7.100875e-06
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_110_190.delay.Y = 7.101263e-06
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_170_230.phase0.X = 6.868670e-01
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 5.883642e-01
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_170_230.delay.X = 7.100875e-06
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_170_230.delay.Y = 7.101263e-06
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_210_250.phase0.X = 6.868670e-01
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 5.883642e-01
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_210_250.delay.X = 7.100875e-06
-PIC.Core.CS005HBA0.HBA_DUAL.HBA_210_250.delay.Y = 7.101263e-06
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 6.868670e-01
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 5.883642e-01
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.100875e-06
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.101263e-06
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 6.868670e-01
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 5.883642e-01
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.100875e-06
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.101263e-06
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 6.868670e-01
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 5.883642e-01
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.100875e-06
-PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.101263e-06
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_110_190.phase0.X = 6.868670e-01
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 5.883642e-01
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_110_190.delay.X = 7.100875e-06
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_110_190.delay.Y = 7.101263e-06
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_170_230.phase0.X = 6.868670e-01
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 5.883642e-01
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_170_230.delay.X = 7.100875e-06
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_170_230.delay.Y = 7.101263e-06
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_210_250.phase0.X = 6.868670e-01
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 5.883642e-01
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_210_250.delay.X = 7.100875e-06
-PIC.Core.CS005HBA0.HBA_ZERO.HBA_210_250.delay.Y = 7.101263e-06
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_110_190.phase0.X = 1.062180e+00
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 1.060205e+00
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_110_190.delay.X = 7.101648e-06
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_110_190.delay.Y = 7.101839e-06
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_170_230.phase0.X = 1.062180e+00
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 1.060205e+00
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_170_230.delay.X = 7.101648e-06
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_170_230.delay.Y = 7.101839e-06
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_210_250.phase0.X = 1.062180e+00
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 1.060205e+00
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_210_250.delay.X = 7.101648e-06
-PIC.Core.CS005HBA1.HBA_DUAL.HBA_210_250.delay.Y = 7.101839e-06
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 1.062180e+00
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 1.060205e+00
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.101648e-06
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.101839e-06
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 1.062180e+00
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 1.060205e+00
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.101648e-06
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.101839e-06
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 1.062180e+00
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 1.060205e+00
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.101648e-06
-PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.101839e-06
-PIC.Core.CS005HBA1.HBA_ONE.HBA_110_190.phase0.X = 1.062180e+00
-PIC.Core.CS005HBA1.HBA_ONE.HBA_110_190.phase0.Y = 1.060205e+00
-PIC.Core.CS005HBA1.HBA_ONE.HBA_110_190.delay.X = 7.101648e-06
-PIC.Core.CS005HBA1.HBA_ONE.HBA_110_190.delay.Y = 7.101839e-06
-PIC.Core.CS005HBA1.HBA_ONE.HBA_170_230.phase0.X = 1.062180e+00
-PIC.Core.CS005HBA1.HBA_ONE.HBA_170_230.phase0.Y = 1.060205e+00
-PIC.Core.CS005HBA1.HBA_ONE.HBA_170_230.delay.X = 7.101648e-06
-PIC.Core.CS005HBA1.HBA_ONE.HBA_170_230.delay.Y = 7.101839e-06
-PIC.Core.CS005HBA1.HBA_ONE.HBA_210_250.phase0.X = 1.062180e+00
-PIC.Core.CS005HBA1.HBA_ONE.HBA_210_250.phase0.Y = 1.060205e+00
-PIC.Core.CS005HBA1.HBA_ONE.HBA_210_250.delay.X = 7.101648e-06
-PIC.Core.CS005HBA1.HBA_ONE.HBA_210_250.delay.Y = 7.101839e-06
+PIC.Core.CS004HBA.HBA_JOINED.HBA_210_250.delay.X = 6.451439e-06
+PIC.Core.CS004HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.452039e-06
+PIC.Core.CS005LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS005LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS005LBA.LBA_INNER.LBA_10_70.delay.X = 7.102005e-06
+PIC.Core.CS005LBA.LBA_INNER.LBA_10_70.delay.Y = 7.102630e-06
+PIC.Core.CS005LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS005LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS005LBA.LBA_INNER.LBA_30_70.delay.X = 7.102005e-06
+PIC.Core.CS005LBA.LBA_INNER.LBA_30_70.delay.Y = 7.102630e-06
+PIC.Core.CS005LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS005LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS005LBA.LBA_INNER.LBA_10_90.delay.X = 7.102005e-06
+PIC.Core.CS005LBA.LBA_INNER.LBA_10_90.delay.Y = 7.102630e-06
+PIC.Core.CS005LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS005LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS005LBA.LBA_INNER.LBA_30_90.delay.X = 7.102005e-06
+PIC.Core.CS005LBA.LBA_INNER.LBA_30_90.delay.Y = 7.102630e-06
+PIC.Core.CS005LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS005LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS005LBA.LBA_OUTER.LBA_10_70.delay.X = 7.102005e-06
+PIC.Core.CS005LBA.LBA_OUTER.LBA_10_70.delay.Y = 7.102630e-06
+PIC.Core.CS005LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS005LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS005LBA.LBA_OUTER.LBA_30_70.delay.X = 7.102005e-06
+PIC.Core.CS005LBA.LBA_OUTER.LBA_30_70.delay.Y = 7.102630e-06
+PIC.Core.CS005LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS005LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS005LBA.LBA_OUTER.LBA_10_90.delay.X = 7.102005e-06
+PIC.Core.CS005LBA.LBA_OUTER.LBA_10_90.delay.Y = 7.102630e-06
+PIC.Core.CS005LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS005LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS005LBA.LBA_OUTER.LBA_30_90.delay.X = 7.102005e-06
+PIC.Core.CS005LBA.LBA_OUTER.LBA_30_90.delay.Y = 7.102630e-06
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_110_190.delay.X = 7.101819e-06
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_110_190.delay.Y = 7.102702e-06
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_170_230.delay.X = 7.101819e-06
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_170_230.delay.Y = 7.102702e-06
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_210_250.delay.X = 7.101819e-06
+PIC.Core.CS005HBA0.HBA_ZERO.HBA_210_250.delay.Y = 7.102702e-06
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_110_190.delay.X = 7.101819e-06
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_110_190.delay.Y = 7.102702e-06
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_170_230.delay.X = 7.101819e-06
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_170_230.delay.Y = 7.102702e-06
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_210_250.delay.X = 7.101819e-06
+PIC.Core.CS005HBA0.HBA_DUAL.HBA_210_250.delay.Y = 7.102702e-06
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.101819e-06
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.102702e-06
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.101819e-06
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.102702e-06
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.101819e-06
+PIC.Core.CS005HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.102702e-06
+PIC.Core.CS005HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_ONE.HBA_110_190.delay.X = 7.102190e-06
+PIC.Core.CS005HBA1.HBA_ONE.HBA_110_190.delay.Y = 7.102558e-06
+PIC.Core.CS005HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_ONE.HBA_170_230.delay.X = 7.102190e-06
+PIC.Core.CS005HBA1.HBA_ONE.HBA_170_230.delay.Y = 7.102558e-06
+PIC.Core.CS005HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_ONE.HBA_210_250.delay.X = 7.102190e-06
+PIC.Core.CS005HBA1.HBA_ONE.HBA_210_250.delay.Y = 7.102558e-06
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_110_190.delay.X = 7.102190e-06
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_110_190.delay.Y = 7.102558e-06
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_170_230.delay.X = 7.102190e-06
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_170_230.delay.Y = 7.102558e-06
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_210_250.delay.X = 7.102190e-06
+PIC.Core.CS005HBA1.HBA_DUAL.HBA_210_250.delay.Y = 7.102558e-06
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.102190e-06
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.102558e-06
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.102190e-06
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.102558e-06
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.102190e-06
+PIC.Core.CS005HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.102558e-06
PIC.Core.CS005HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS005HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS005HBA.HBA_JOINED.HBA_110_190.delay.X = 7.101248e-06
-PIC.Core.CS005HBA.HBA_JOINED.HBA_110_190.delay.Y = 7.101554e-06
+PIC.Core.CS005HBA.HBA_JOINED.HBA_110_190.delay.X = 7.102005e-06
+PIC.Core.CS005HBA.HBA_JOINED.HBA_110_190.delay.Y = 7.102630e-06
PIC.Core.CS005HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS005HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS005HBA.HBA_JOINED.HBA_170_230.delay.X = 7.101248e-06
-PIC.Core.CS005HBA.HBA_JOINED.HBA_170_230.delay.Y = 7.101554e-06
+PIC.Core.CS005HBA.HBA_JOINED.HBA_170_230.delay.X = 7.102005e-06
+PIC.Core.CS005HBA.HBA_JOINED.HBA_170_230.delay.Y = 7.102630e-06
PIC.Core.CS005HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS005HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS005HBA.HBA_JOINED.HBA_210_250.delay.X = 7.101248e-06
-PIC.Core.CS005HBA.HBA_JOINED.HBA_210_250.delay.Y = 7.101554e-06
-PIC.Core.CS005LBA.LBA_INNER.LBA_10_70.phase0.X = 3.450000e-02
-PIC.Core.CS005LBA.LBA_INNER.LBA_10_70.phase0.Y = 2.245000e-01
-PIC.Core.CS005LBA.LBA_INNER.LBA_10_70.delay.X = 7.099170e-06
-PIC.Core.CS005LBA.LBA_INNER.LBA_10_70.delay.Y = 7.098215e-06
-PIC.Core.CS005LBA.LBA_INNER.LBA_10_90.phase0.X = 3.450000e-02
-PIC.Core.CS005LBA.LBA_INNER.LBA_10_90.phase0.Y = 2.245000e-01
-PIC.Core.CS005LBA.LBA_INNER.LBA_10_90.delay.X = 7.099170e-06
-PIC.Core.CS005LBA.LBA_INNER.LBA_10_90.delay.Y = 7.098215e-06
-PIC.Core.CS005LBA.LBA_INNER.LBA_30_70.phase0.X = 3.450000e-02
-PIC.Core.CS005LBA.LBA_INNER.LBA_30_70.phase0.Y = 2.245000e-01
-PIC.Core.CS005LBA.LBA_INNER.LBA_30_70.delay.X = 7.099170e-06
-PIC.Core.CS005LBA.LBA_INNER.LBA_30_70.delay.Y = 7.098215e-06
-PIC.Core.CS005LBA.LBA_INNER.LBA_30_90.phase0.X = 3.450000e-02
-PIC.Core.CS005LBA.LBA_INNER.LBA_30_90.phase0.Y = 2.245000e-01
-PIC.Core.CS005LBA.LBA_INNER.LBA_30_90.delay.X = 7.099170e-06
-PIC.Core.CS005LBA.LBA_INNER.LBA_30_90.delay.Y = 7.098215e-06
-PIC.Core.CS005LBA.LBA_OUTER.LBA_10_70.phase0.X = 6.185000e-01
-PIC.Core.CS005LBA.LBA_OUTER.LBA_10_70.phase0.Y = 6.090000e-01
-PIC.Core.CS005LBA.LBA_OUTER.LBA_10_70.delay.X = 7.098085e-06
-PIC.Core.CS005LBA.LBA_OUTER.LBA_10_70.delay.Y = 7.098605e-06
-PIC.Core.CS005LBA.LBA_OUTER.LBA_10_90.phase0.X = 6.185000e-01
-PIC.Core.CS005LBA.LBA_OUTER.LBA_10_90.phase0.Y = 6.090000e-01
-PIC.Core.CS005LBA.LBA_OUTER.LBA_10_90.delay.X = 7.098085e-06
-PIC.Core.CS005LBA.LBA_OUTER.LBA_10_90.delay.Y = 7.098605e-06
-PIC.Core.CS005LBA.LBA_OUTER.LBA_30_70.phase0.X = 6.185000e-01
-PIC.Core.CS005LBA.LBA_OUTER.LBA_30_70.phase0.Y = 6.090000e-01
-PIC.Core.CS005LBA.LBA_OUTER.LBA_30_70.delay.X = 7.098085e-06
-PIC.Core.CS005LBA.LBA_OUTER.LBA_30_70.delay.Y = 7.098605e-06
-PIC.Core.CS005LBA.LBA_OUTER.LBA_30_90.phase0.X = 6.185000e-01
-PIC.Core.CS005LBA.LBA_OUTER.LBA_30_90.phase0.Y = 6.090000e-01
-PIC.Core.CS005LBA.LBA_OUTER.LBA_30_90.delay.X = 7.098085e-06
-PIC.Core.CS005LBA.LBA_OUTER.LBA_30_90.delay.Y = 7.098605e-06
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_110_190.phase0.X = -4.878020e-01
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -3.760361e-01
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.448121e-06
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.448008e-06
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_170_230.phase0.X = -4.878020e-01
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -3.760361e-01
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.448121e-06
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.448008e-06
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_210_250.phase0.X = -4.878020e-01
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -3.760361e-01
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.448121e-06
-PIC.Core.CS006HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.448008e-06
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -4.878020e-01
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -3.760361e-01
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.448121e-06
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.448008e-06
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -4.878020e-01
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -3.760361e-01
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.448121e-06
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.448008e-06
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -4.878020e-01
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -3.760361e-01
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.448121e-06
-PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.448008e-06
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_110_190.phase0.X = -4.878020e-01
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -3.760361e-01
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.448121e-06
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.448008e-06
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_170_230.phase0.X = -4.878020e-01
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -3.760361e-01
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.448121e-06
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.448008e-06
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_210_250.phase0.X = -4.878020e-01
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -3.760361e-01
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.448121e-06
-PIC.Core.CS006HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.448008e-06
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_110_190.phase0.X = -6.056161e-02
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 3.740144e-02
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.448448e-06
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.447785e-06
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_170_230.phase0.X = -6.056161e-02
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 3.740144e-02
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.448448e-06
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.447785e-06
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_210_250.phase0.X = -6.056161e-02
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 3.740144e-02
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.448448e-06
-PIC.Core.CS006HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.447785e-06
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -6.056161e-02
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 3.740144e-02
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.448448e-06
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.447785e-06
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -6.056161e-02
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 3.740144e-02
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.448448e-06
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.447785e-06
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -6.056161e-02
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 3.740144e-02
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.448448e-06
-PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.447785e-06
-PIC.Core.CS006HBA1.HBA_ONE.HBA_110_190.phase0.X = -6.056161e-02
-PIC.Core.CS006HBA1.HBA_ONE.HBA_110_190.phase0.Y = 3.740144e-02
-PIC.Core.CS006HBA1.HBA_ONE.HBA_110_190.delay.X = 6.448448e-06
-PIC.Core.CS006HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.447785e-06
-PIC.Core.CS006HBA1.HBA_ONE.HBA_170_230.phase0.X = -6.056161e-02
-PIC.Core.CS006HBA1.HBA_ONE.HBA_170_230.phase0.Y = 3.740144e-02
-PIC.Core.CS006HBA1.HBA_ONE.HBA_170_230.delay.X = 6.448448e-06
-PIC.Core.CS006HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.447785e-06
-PIC.Core.CS006HBA1.HBA_ONE.HBA_210_250.phase0.X = -6.056161e-02
-PIC.Core.CS006HBA1.HBA_ONE.HBA_210_250.phase0.Y = 3.740144e-02
-PIC.Core.CS006HBA1.HBA_ONE.HBA_210_250.delay.X = 6.448448e-06
-PIC.Core.CS006HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.447785e-06
+PIC.Core.CS005HBA.HBA_JOINED.HBA_210_250.delay.X = 7.102005e-06
+PIC.Core.CS005HBA.HBA_JOINED.HBA_210_250.delay.Y = 7.102630e-06
+PIC.Core.CS006LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS006LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS006LBA.LBA_INNER.LBA_10_70.delay.X = 6.447453e-06
+PIC.Core.CS006LBA.LBA_INNER.LBA_10_70.delay.Y = 6.447862e-06
+PIC.Core.CS006LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS006LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS006LBA.LBA_INNER.LBA_30_70.delay.X = 6.447453e-06
+PIC.Core.CS006LBA.LBA_INNER.LBA_30_70.delay.Y = 6.447862e-06
+PIC.Core.CS006LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS006LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS006LBA.LBA_INNER.LBA_10_90.delay.X = 6.447453e-06
+PIC.Core.CS006LBA.LBA_INNER.LBA_10_90.delay.Y = 6.447862e-06
+PIC.Core.CS006LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS006LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS006LBA.LBA_INNER.LBA_30_90.delay.X = 6.447453e-06
+PIC.Core.CS006LBA.LBA_INNER.LBA_30_90.delay.Y = 6.447862e-06
+PIC.Core.CS006LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS006LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS006LBA.LBA_OUTER.LBA_10_70.delay.X = 6.447453e-06
+PIC.Core.CS006LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.447862e-06
+PIC.Core.CS006LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS006LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS006LBA.LBA_OUTER.LBA_30_70.delay.X = 6.447453e-06
+PIC.Core.CS006LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.447862e-06
+PIC.Core.CS006LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS006LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS006LBA.LBA_OUTER.LBA_10_90.delay.X = 6.447453e-06
+PIC.Core.CS006LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.447862e-06
+PIC.Core.CS006LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS006LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS006LBA.LBA_OUTER.LBA_30_90.delay.X = 6.447453e-06
+PIC.Core.CS006LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.447862e-06
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.447259e-06
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.447846e-06
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.447259e-06
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.447846e-06
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.447259e-06
+PIC.Core.CS006HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.447846e-06
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.447259e-06
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.447846e-06
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.447259e-06
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.447846e-06
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.447259e-06
+PIC.Core.CS006HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.447846e-06
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.447259e-06
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.447846e-06
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.447259e-06
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.447846e-06
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.447259e-06
+PIC.Core.CS006HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.447846e-06
+PIC.Core.CS006HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_ONE.HBA_110_190.delay.X = 6.447646e-06
+PIC.Core.CS006HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.447877e-06
+PIC.Core.CS006HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_ONE.HBA_170_230.delay.X = 6.447646e-06
+PIC.Core.CS006HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.447877e-06
+PIC.Core.CS006HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_ONE.HBA_210_250.delay.X = 6.447646e-06
+PIC.Core.CS006HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.447877e-06
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.447646e-06
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.447877e-06
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.447646e-06
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.447877e-06
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.447646e-06
+PIC.Core.CS006HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.447877e-06
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.447646e-06
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.447877e-06
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.447646e-06
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.447877e-06
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.447646e-06
+PIC.Core.CS006HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.447877e-06
PIC.Core.CS006HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS006HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS006HBA.HBA_JOINED.HBA_110_190.delay.X = 6.447623e-06
-PIC.Core.CS006HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.447286e-06
+PIC.Core.CS006HBA.HBA_JOINED.HBA_110_190.delay.X = 6.447453e-06
+PIC.Core.CS006HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.447862e-06
PIC.Core.CS006HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS006HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS006HBA.HBA_JOINED.HBA_170_230.delay.X = 6.447623e-06
-PIC.Core.CS006HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.447286e-06
+PIC.Core.CS006HBA.HBA_JOINED.HBA_170_230.delay.X = 6.447453e-06
+PIC.Core.CS006HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.447862e-06
PIC.Core.CS006HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS006HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS006HBA.HBA_JOINED.HBA_210_250.delay.X = 6.447623e-06
-PIC.Core.CS006HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.447286e-06
-PIC.Core.CS006LBA.LBA_INNER.LBA_10_70.phase0.X = 1.101500e+00
-PIC.Core.CS006LBA.LBA_INNER.LBA_10_70.phase0.Y = -1.419500e+00
-PIC.Core.CS006LBA.LBA_INNER.LBA_10_70.delay.X = 6.448303e-06
-PIC.Core.CS006LBA.LBA_INNER.LBA_10_70.delay.Y = 6.442242e-06
-PIC.Core.CS006LBA.LBA_INNER.LBA_10_90.phase0.X = 1.101500e+00
-PIC.Core.CS006LBA.LBA_INNER.LBA_10_90.phase0.Y = -1.419500e+00
-PIC.Core.CS006LBA.LBA_INNER.LBA_10_90.delay.X = 6.448303e-06
-PIC.Core.CS006LBA.LBA_INNER.LBA_10_90.delay.Y = 6.442242e-06
-PIC.Core.CS006LBA.LBA_INNER.LBA_30_70.phase0.X = 1.101500e+00
-PIC.Core.CS006LBA.LBA_INNER.LBA_30_70.phase0.Y = -1.419500e+00
-PIC.Core.CS006LBA.LBA_INNER.LBA_30_70.delay.X = 6.448303e-06
-PIC.Core.CS006LBA.LBA_INNER.LBA_30_70.delay.Y = 6.442242e-06
-PIC.Core.CS006LBA.LBA_INNER.LBA_30_90.phase0.X = 1.101500e+00
-PIC.Core.CS006LBA.LBA_INNER.LBA_30_90.phase0.Y = -1.419500e+00
-PIC.Core.CS006LBA.LBA_INNER.LBA_30_90.delay.X = 6.448303e-06
-PIC.Core.CS006LBA.LBA_INNER.LBA_30_90.delay.Y = 6.442242e-06
-PIC.Core.CS006LBA.LBA_OUTER.LBA_10_70.phase0.X = 2.100000e-02
-PIC.Core.CS006LBA.LBA_OUTER.LBA_10_70.phase0.Y = 1.650000e-02
-PIC.Core.CS006LBA.LBA_OUTER.LBA_10_70.delay.X = 6.445128e-06
-PIC.Core.CS006LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.445222e-06
-PIC.Core.CS006LBA.LBA_OUTER.LBA_10_90.phase0.X = 2.100000e-02
-PIC.Core.CS006LBA.LBA_OUTER.LBA_10_90.phase0.Y = 1.650000e-02
-PIC.Core.CS006LBA.LBA_OUTER.LBA_10_90.delay.X = 6.445128e-06
-PIC.Core.CS006LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.445222e-06
-PIC.Core.CS006LBA.LBA_OUTER.LBA_30_70.phase0.X = 2.100000e-02
-PIC.Core.CS006LBA.LBA_OUTER.LBA_30_70.phase0.Y = 1.650000e-02
-PIC.Core.CS006LBA.LBA_OUTER.LBA_30_70.delay.X = 6.445128e-06
-PIC.Core.CS006LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.445222e-06
-PIC.Core.CS006LBA.LBA_OUTER.LBA_30_90.phase0.X = 2.100000e-02
-PIC.Core.CS006LBA.LBA_OUTER.LBA_30_90.phase0.Y = 1.650000e-02
-PIC.Core.CS006LBA.LBA_OUTER.LBA_30_90.delay.X = 6.445128e-06
-PIC.Core.CS006LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.445222e-06
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_110_190.phase0.X = -2.328832e-01
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 8.151644e-02
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.476040e-06
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.475619e-06
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_170_230.phase0.X = -2.328832e-01
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 8.151644e-02
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.476040e-06
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.475619e-06
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_210_250.phase0.X = -2.328832e-01
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 8.151644e-02
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.476040e-06
-PIC.Core.CS007HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.475619e-06
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -2.328832e-01
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 8.151644e-02
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.476040e-06
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.475619e-06
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -2.328832e-01
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 8.151644e-02
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.476040e-06
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.475619e-06
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -2.328832e-01
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 8.151644e-02
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.476040e-06
-PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.475619e-06
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_110_190.phase0.X = -2.328832e-01
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 8.151644e-02
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.476040e-06
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.475619e-06
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_170_230.phase0.X = -2.328832e-01
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 8.151644e-02
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.476040e-06
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.475619e-06
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_210_250.phase0.X = -2.328832e-01
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 8.151644e-02
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.476040e-06
-PIC.Core.CS007HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.475619e-06
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_110_190.phase0.X = -4.216939e-01
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -3.081482e-02
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.477219e-06
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.476877e-06
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_170_230.phase0.X = -4.216939e-01
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -3.081482e-02
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.477219e-06
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.476877e-06
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_210_250.phase0.X = -4.216939e-01
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -3.081482e-02
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.477219e-06
-PIC.Core.CS007HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.476877e-06
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -4.216939e-01
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -3.081482e-02
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.477219e-06
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.476877e-06
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -4.216939e-01
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -3.081482e-02
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.477219e-06
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.476877e-06
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -4.216939e-01
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -3.081482e-02
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.477219e-06
-PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.476877e-06
-PIC.Core.CS007HBA1.HBA_ONE.HBA_110_190.phase0.X = -4.216939e-01
-PIC.Core.CS007HBA1.HBA_ONE.HBA_110_190.phase0.Y = -3.081482e-02
-PIC.Core.CS007HBA1.HBA_ONE.HBA_110_190.delay.X = 6.477219e-06
-PIC.Core.CS007HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.476877e-06
-PIC.Core.CS007HBA1.HBA_ONE.HBA_170_230.phase0.X = -4.216939e-01
-PIC.Core.CS007HBA1.HBA_ONE.HBA_170_230.phase0.Y = -3.081482e-02
-PIC.Core.CS007HBA1.HBA_ONE.HBA_170_230.delay.X = 6.477219e-06
-PIC.Core.CS007HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.476877e-06
-PIC.Core.CS007HBA1.HBA_ONE.HBA_210_250.phase0.X = -4.216939e-01
-PIC.Core.CS007HBA1.HBA_ONE.HBA_210_250.phase0.Y = -3.081482e-02
-PIC.Core.CS007HBA1.HBA_ONE.HBA_210_250.delay.X = 6.477219e-06
-PIC.Core.CS007HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.476877e-06
+PIC.Core.CS006HBA.HBA_JOINED.HBA_210_250.delay.X = 6.447453e-06
+PIC.Core.CS006HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.447862e-06
+PIC.Core.CS007LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS007LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS007LBA.LBA_INNER.LBA_10_70.delay.X = 6.476847e-06
+PIC.Core.CS007LBA.LBA_INNER.LBA_10_70.delay.Y = 6.476400e-06
+PIC.Core.CS007LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS007LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS007LBA.LBA_INNER.LBA_30_70.delay.X = 6.476847e-06
+PIC.Core.CS007LBA.LBA_INNER.LBA_30_70.delay.Y = 6.476400e-06
+PIC.Core.CS007LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS007LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS007LBA.LBA_INNER.LBA_10_90.delay.X = 6.476847e-06
+PIC.Core.CS007LBA.LBA_INNER.LBA_10_90.delay.Y = 6.476400e-06
+PIC.Core.CS007LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS007LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS007LBA.LBA_INNER.LBA_30_90.delay.X = 6.476847e-06
+PIC.Core.CS007LBA.LBA_INNER.LBA_30_90.delay.Y = 6.476400e-06
+PIC.Core.CS007LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS007LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS007LBA.LBA_OUTER.LBA_10_70.delay.X = 6.476847e-06
+PIC.Core.CS007LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.476400e-06
+PIC.Core.CS007LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS007LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS007LBA.LBA_OUTER.LBA_30_70.delay.X = 6.476847e-06
+PIC.Core.CS007LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.476400e-06
+PIC.Core.CS007LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS007LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS007LBA.LBA_OUTER.LBA_10_90.delay.X = 6.476847e-06
+PIC.Core.CS007LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.476400e-06
+PIC.Core.CS007LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS007LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS007LBA.LBA_OUTER.LBA_30_90.delay.X = 6.476847e-06
+PIC.Core.CS007LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.476400e-06
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.476597e-06
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.476583e-06
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.476597e-06
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.476583e-06
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.476597e-06
+PIC.Core.CS007HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.476583e-06
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.476597e-06
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.476583e-06
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.476597e-06
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.476583e-06
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.476597e-06
+PIC.Core.CS007HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.476583e-06
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.476597e-06
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.476583e-06
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.476597e-06
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.476583e-06
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.476597e-06
+PIC.Core.CS007HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.476583e-06
+PIC.Core.CS007HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_ONE.HBA_110_190.delay.X = 6.477097e-06
+PIC.Core.CS007HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.476217e-06
+PIC.Core.CS007HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_ONE.HBA_170_230.delay.X = 6.477097e-06
+PIC.Core.CS007HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.476217e-06
+PIC.Core.CS007HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_ONE.HBA_210_250.delay.X = 6.477097e-06
+PIC.Core.CS007HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.476217e-06
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.477097e-06
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.476217e-06
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.477097e-06
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.476217e-06
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.477097e-06
+PIC.Core.CS007HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.476217e-06
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.477097e-06
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.476217e-06
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.477097e-06
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.476217e-06
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.477097e-06
+PIC.Core.CS007HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.476217e-06
PIC.Core.CS007HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS007HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS007HBA.HBA_JOINED.HBA_110_190.delay.X = 6.477687e-06
-PIC.Core.CS007HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.477254e-06
+PIC.Core.CS007HBA.HBA_JOINED.HBA_110_190.delay.X = 6.476847e-06
+PIC.Core.CS007HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.476400e-06
PIC.Core.CS007HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS007HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS007HBA.HBA_JOINED.HBA_170_230.delay.X = 6.477687e-06
-PIC.Core.CS007HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.477254e-06
+PIC.Core.CS007HBA.HBA_JOINED.HBA_170_230.delay.X = 6.476847e-06
+PIC.Core.CS007HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.476400e-06
PIC.Core.CS007HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS007HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS007HBA.HBA_JOINED.HBA_210_250.delay.X = 6.477687e-06
-PIC.Core.CS007HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.477254e-06
-PIC.Core.CS007LBA.LBA_INNER.LBA_10_70.phase0.X = 5.150000e-02
-PIC.Core.CS007LBA.LBA_INNER.LBA_10_70.phase0.Y = 3.070000e-01
-PIC.Core.CS007LBA.LBA_INNER.LBA_10_70.delay.X = 6.479202e-06
-PIC.Core.CS007LBA.LBA_INNER.LBA_10_70.delay.Y = 6.479000e-06
-PIC.Core.CS007LBA.LBA_INNER.LBA_10_90.phase0.X = 5.150000e-02
-PIC.Core.CS007LBA.LBA_INNER.LBA_10_90.phase0.Y = 3.070000e-01
-PIC.Core.CS007LBA.LBA_INNER.LBA_10_90.delay.X = 6.479202e-06
-PIC.Core.CS007LBA.LBA_INNER.LBA_10_90.delay.Y = 6.479000e-06
-PIC.Core.CS007LBA.LBA_INNER.LBA_30_70.phase0.X = 5.150000e-02
-PIC.Core.CS007LBA.LBA_INNER.LBA_30_70.phase0.Y = 3.070000e-01
-PIC.Core.CS007LBA.LBA_INNER.LBA_30_70.delay.X = 6.479202e-06
-PIC.Core.CS007LBA.LBA_INNER.LBA_30_70.delay.Y = 6.479000e-06
-PIC.Core.CS007LBA.LBA_INNER.LBA_30_90.phase0.X = 5.150000e-02
-PIC.Core.CS007LBA.LBA_INNER.LBA_30_90.phase0.Y = 3.070000e-01
-PIC.Core.CS007LBA.LBA_INNER.LBA_30_90.delay.X = 6.479202e-06
-PIC.Core.CS007LBA.LBA_INNER.LBA_30_90.delay.Y = 6.479000e-06
-PIC.Core.CS007LBA.LBA_OUTER.LBA_10_70.phase0.X = -1.930000e-01
-PIC.Core.CS007LBA.LBA_OUTER.LBA_10_70.phase0.Y = -2.220000e-01
-PIC.Core.CS007LBA.LBA_OUTER.LBA_10_70.delay.X = 6.482327e-06
-PIC.Core.CS007LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.482160e-06
-PIC.Core.CS007LBA.LBA_OUTER.LBA_10_90.phase0.X = -1.930000e-01
-PIC.Core.CS007LBA.LBA_OUTER.LBA_10_90.phase0.Y = -2.220000e-01
-PIC.Core.CS007LBA.LBA_OUTER.LBA_10_90.delay.X = 6.482327e-06
-PIC.Core.CS007LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.482160e-06
-PIC.Core.CS007LBA.LBA_OUTER.LBA_30_70.phase0.X = -1.930000e-01
-PIC.Core.CS007LBA.LBA_OUTER.LBA_30_70.phase0.Y = -2.220000e-01
-PIC.Core.CS007LBA.LBA_OUTER.LBA_30_70.delay.X = 6.482327e-06
-PIC.Core.CS007LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.482160e-06
-PIC.Core.CS007LBA.LBA_OUTER.LBA_30_90.phase0.X = -1.930000e-01
-PIC.Core.CS007LBA.LBA_OUTER.LBA_30_90.phase0.Y = -2.220000e-01
-PIC.Core.CS007LBA.LBA_OUTER.LBA_30_90.delay.X = 6.482327e-06
-PIC.Core.CS007LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.482160e-06
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_110_190.phase0.X = 6.240903e-01
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 3.871049e-01
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_110_190.delay.X = 7.467597e-06
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_110_190.delay.Y = 7.468816e-06
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_170_230.phase0.X = 6.240903e-01
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 3.871049e-01
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_170_230.delay.X = 7.467597e-06
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_170_230.delay.Y = 7.468816e-06
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_210_250.phase0.X = 6.240903e-01
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 3.871049e-01
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_210_250.delay.X = 7.467597e-06
-PIC.Core.CS011HBA0.HBA_DUAL.HBA_210_250.delay.Y = 7.468816e-06
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 6.240903e-01
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 3.871049e-01
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.467597e-06
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.468816e-06
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 6.240903e-01
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 3.871049e-01
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.467597e-06
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.468816e-06
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 6.240903e-01
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 3.871049e-01
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.467597e-06
-PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.468816e-06
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_110_190.phase0.X = 6.240903e-01
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 3.871049e-01
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_110_190.delay.X = 7.467597e-06
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_110_190.delay.Y = 7.468816e-06
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_170_230.phase0.X = 6.240903e-01
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 3.871049e-01
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_170_230.delay.X = 7.467597e-06
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_170_230.delay.Y = 7.468816e-06
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_210_250.phase0.X = 6.240903e-01
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 3.871049e-01
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_210_250.delay.X = 7.467597e-06
-PIC.Core.CS011HBA0.HBA_ZERO.HBA_210_250.delay.Y = 7.468816e-06
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_110_190.phase0.X = 7.160055e-01
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 5.717171e-01
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_110_190.delay.X = 7.467816e-06
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_110_190.delay.Y = 7.469000e-06
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_170_230.phase0.X = 7.160055e-01
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 5.717171e-01
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_170_230.delay.X = 7.467816e-06
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_170_230.delay.Y = 7.469000e-06
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_210_250.phase0.X = 7.160055e-01
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 5.717171e-01
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_210_250.delay.X = 7.467816e-06
-PIC.Core.CS011HBA1.HBA_DUAL.HBA_210_250.delay.Y = 7.469000e-06
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 7.160055e-01
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 5.717171e-01
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.467816e-06
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.469000e-06
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 7.160055e-01
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 5.717171e-01
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.467816e-06
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.469000e-06
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 7.160055e-01
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 5.717171e-01
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.467816e-06
-PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.469000e-06
-PIC.Core.CS011HBA1.HBA_ONE.HBA_110_190.phase0.X = 7.160055e-01
-PIC.Core.CS011HBA1.HBA_ONE.HBA_110_190.phase0.Y = 5.717171e-01
-PIC.Core.CS011HBA1.HBA_ONE.HBA_110_190.delay.X = 7.467816e-06
-PIC.Core.CS011HBA1.HBA_ONE.HBA_110_190.delay.Y = 7.469000e-06
-PIC.Core.CS011HBA1.HBA_ONE.HBA_170_230.phase0.X = 7.160055e-01
-PIC.Core.CS011HBA1.HBA_ONE.HBA_170_230.phase0.Y = 5.717171e-01
-PIC.Core.CS011HBA1.HBA_ONE.HBA_170_230.delay.X = 7.467816e-06
-PIC.Core.CS011HBA1.HBA_ONE.HBA_170_230.delay.Y = 7.469000e-06
-PIC.Core.CS011HBA1.HBA_ONE.HBA_210_250.phase0.X = 7.160055e-01
-PIC.Core.CS011HBA1.HBA_ONE.HBA_210_250.phase0.Y = 5.717171e-01
-PIC.Core.CS011HBA1.HBA_ONE.HBA_210_250.delay.X = 7.467816e-06
-PIC.Core.CS011HBA1.HBA_ONE.HBA_210_250.delay.Y = 7.469000e-06
+PIC.Core.CS007HBA.HBA_JOINED.HBA_210_250.delay.X = 6.476847e-06
+PIC.Core.CS007HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.476400e-06
+PIC.Core.CS011LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS011LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS011LBA.LBA_INNER.LBA_10_70.delay.X = 7.468948e-06
+PIC.Core.CS011LBA.LBA_INNER.LBA_10_70.delay.Y = 7.469310e-06
+PIC.Core.CS011LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS011LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS011LBA.LBA_INNER.LBA_30_70.delay.X = 7.468948e-06
+PIC.Core.CS011LBA.LBA_INNER.LBA_30_70.delay.Y = 7.469310e-06
+PIC.Core.CS011LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS011LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS011LBA.LBA_INNER.LBA_10_90.delay.X = 7.468948e-06
+PIC.Core.CS011LBA.LBA_INNER.LBA_10_90.delay.Y = 7.469310e-06
+PIC.Core.CS011LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS011LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS011LBA.LBA_INNER.LBA_30_90.delay.X = 7.468948e-06
+PIC.Core.CS011LBA.LBA_INNER.LBA_30_90.delay.Y = 7.469310e-06
+PIC.Core.CS011LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS011LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS011LBA.LBA_OUTER.LBA_10_70.delay.X = 7.468948e-06
+PIC.Core.CS011LBA.LBA_OUTER.LBA_10_70.delay.Y = 7.469310e-06
+PIC.Core.CS011LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS011LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS011LBA.LBA_OUTER.LBA_30_70.delay.X = 7.468948e-06
+PIC.Core.CS011LBA.LBA_OUTER.LBA_30_70.delay.Y = 7.469310e-06
+PIC.Core.CS011LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS011LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS011LBA.LBA_OUTER.LBA_10_90.delay.X = 7.468948e-06
+PIC.Core.CS011LBA.LBA_OUTER.LBA_10_90.delay.Y = 7.469310e-06
+PIC.Core.CS011LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS011LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS011LBA.LBA_OUTER.LBA_30_90.delay.X = 7.468948e-06
+PIC.Core.CS011LBA.LBA_OUTER.LBA_30_90.delay.Y = 7.469310e-06
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_110_190.delay.X = 7.468901e-06
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_110_190.delay.Y = 7.469469e-06
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_170_230.delay.X = 7.468901e-06
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_170_230.delay.Y = 7.469469e-06
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_210_250.delay.X = 7.468901e-06
+PIC.Core.CS011HBA0.HBA_ZERO.HBA_210_250.delay.Y = 7.469469e-06
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_110_190.delay.X = 7.468901e-06
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_110_190.delay.Y = 7.469469e-06
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_170_230.delay.X = 7.468901e-06
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_170_230.delay.Y = 7.469469e-06
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_210_250.delay.X = 7.468901e-06
+PIC.Core.CS011HBA0.HBA_DUAL.HBA_210_250.delay.Y = 7.469469e-06
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.468901e-06
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.469469e-06
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.468901e-06
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.469469e-06
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.468901e-06
+PIC.Core.CS011HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.469469e-06
+PIC.Core.CS011HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_ONE.HBA_110_190.delay.X = 7.468994e-06
+PIC.Core.CS011HBA1.HBA_ONE.HBA_110_190.delay.Y = 7.469150e-06
+PIC.Core.CS011HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_ONE.HBA_170_230.delay.X = 7.468994e-06
+PIC.Core.CS011HBA1.HBA_ONE.HBA_170_230.delay.Y = 7.469150e-06
+PIC.Core.CS011HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_ONE.HBA_210_250.delay.X = 7.468994e-06
+PIC.Core.CS011HBA1.HBA_ONE.HBA_210_250.delay.Y = 7.469150e-06
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_110_190.delay.X = 7.468994e-06
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_110_190.delay.Y = 7.469150e-06
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_170_230.delay.X = 7.468994e-06
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_170_230.delay.Y = 7.469150e-06
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_210_250.delay.X = 7.468994e-06
+PIC.Core.CS011HBA1.HBA_DUAL.HBA_210_250.delay.Y = 7.469150e-06
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.468994e-06
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.469150e-06
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.468994e-06
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.469150e-06
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.468994e-06
+PIC.Core.CS011HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.469150e-06
PIC.Core.CS011HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS011HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS011HBA.HBA_JOINED.HBA_110_190.delay.X = 7.467456e-06
-PIC.Core.CS011HBA.HBA_JOINED.HBA_110_190.delay.Y = 7.468607e-06
+PIC.Core.CS011HBA.HBA_JOINED.HBA_110_190.delay.X = 7.468948e-06
+PIC.Core.CS011HBA.HBA_JOINED.HBA_110_190.delay.Y = 7.469310e-06
PIC.Core.CS011HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS011HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS011HBA.HBA_JOINED.HBA_170_230.delay.X = 7.467456e-06
-PIC.Core.CS011HBA.HBA_JOINED.HBA_170_230.delay.Y = 7.468607e-06
+PIC.Core.CS011HBA.HBA_JOINED.HBA_170_230.delay.X = 7.468948e-06
+PIC.Core.CS011HBA.HBA_JOINED.HBA_170_230.delay.Y = 7.469310e-06
PIC.Core.CS011HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS011HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS011HBA.HBA_JOINED.HBA_210_250.delay.X = 7.467456e-06
-PIC.Core.CS011HBA.HBA_JOINED.HBA_210_250.delay.Y = 7.468607e-06
-PIC.Core.CS011LBA.LBA_INNER.LBA_10_70.phase0.X = 3.300000e-01
-PIC.Core.CS011LBA.LBA_INNER.LBA_10_70.phase0.Y = 4.830000e-01
-PIC.Core.CS011LBA.LBA_INNER.LBA_10_70.delay.X = 7.464993e-06
-PIC.Core.CS011LBA.LBA_INNER.LBA_10_70.delay.Y = 7.465375e-06
-PIC.Core.CS011LBA.LBA_INNER.LBA_10_90.phase0.X = 3.300000e-01
-PIC.Core.CS011LBA.LBA_INNER.LBA_10_90.phase0.Y = 4.830000e-01
-PIC.Core.CS011LBA.LBA_INNER.LBA_10_90.delay.X = 7.464993e-06
-PIC.Core.CS011LBA.LBA_INNER.LBA_10_90.delay.Y = 7.465375e-06
-PIC.Core.CS011LBA.LBA_INNER.LBA_30_70.phase0.X = 3.300000e-01
-PIC.Core.CS011LBA.LBA_INNER.LBA_30_70.phase0.Y = 4.830000e-01
-PIC.Core.CS011LBA.LBA_INNER.LBA_30_70.delay.X = 7.464993e-06
-PIC.Core.CS011LBA.LBA_INNER.LBA_30_70.delay.Y = 7.465375e-06
-PIC.Core.CS011LBA.LBA_INNER.LBA_30_90.phase0.X = 3.300000e-01
-PIC.Core.CS011LBA.LBA_INNER.LBA_30_90.phase0.Y = 4.830000e-01
-PIC.Core.CS011LBA.LBA_INNER.LBA_30_90.delay.X = 7.464993e-06
-PIC.Core.CS011LBA.LBA_INNER.LBA_30_90.delay.Y = 7.465375e-06
-PIC.Core.CS011LBA.LBA_OUTER.LBA_10_70.phase0.X = -8.050000e-02
-PIC.Core.CS011LBA.LBA_OUTER.LBA_10_70.phase0.Y = -7.800000e-02
-PIC.Core.CS011LBA.LBA_OUTER.LBA_10_70.delay.X = 7.465413e-06
-PIC.Core.CS011LBA.LBA_OUTER.LBA_10_70.delay.Y = 7.465725e-06
-PIC.Core.CS011LBA.LBA_OUTER.LBA_10_90.phase0.X = -8.050000e-02
-PIC.Core.CS011LBA.LBA_OUTER.LBA_10_90.phase0.Y = -7.800000e-02
-PIC.Core.CS011LBA.LBA_OUTER.LBA_10_90.delay.X = 7.465413e-06
-PIC.Core.CS011LBA.LBA_OUTER.LBA_10_90.delay.Y = 7.465725e-06
-PIC.Core.CS011LBA.LBA_OUTER.LBA_30_70.phase0.X = -8.050000e-02
-PIC.Core.CS011LBA.LBA_OUTER.LBA_30_70.phase0.Y = -7.800000e-02
-PIC.Core.CS011LBA.LBA_OUTER.LBA_30_70.delay.X = 7.465413e-06
-PIC.Core.CS011LBA.LBA_OUTER.LBA_30_70.delay.Y = 7.465725e-06
-PIC.Core.CS011LBA.LBA_OUTER.LBA_30_90.phase0.X = -8.050000e-02
-PIC.Core.CS011LBA.LBA_OUTER.LBA_30_90.phase0.Y = -7.800000e-02
-PIC.Core.CS011LBA.LBA_OUTER.LBA_30_90.delay.X = 7.465413e-06
-PIC.Core.CS011LBA.LBA_OUTER.LBA_30_90.delay.Y = 7.465725e-06
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_110_190.phase0.X = 1.178751e-01
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -5.616410e-02
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_110_190.delay.X = 8.689643e-06
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_110_190.delay.Y = 8.689828e-06
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_170_230.phase0.X = 1.178751e-01
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -5.616410e-02
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_170_230.delay.X = 8.689643e-06
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_170_230.delay.Y = 8.689828e-06
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_210_250.phase0.X = 1.178751e-01
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -5.616410e-02
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_210_250.delay.X = 8.689643e-06
-PIC.Core.CS013HBA0.HBA_DUAL.HBA_210_250.delay.Y = 8.689828e-06
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 1.178751e-01
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -5.616410e-02
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 8.689643e-06
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 8.689828e-06
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 1.178751e-01
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -5.616410e-02
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 8.689643e-06
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 8.689828e-06
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 1.178751e-01
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -5.616410e-02
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 8.689643e-06
-PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 8.689828e-06
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_110_190.phase0.X = 1.178751e-01
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -5.616410e-02
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_110_190.delay.X = 8.689643e-06
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_110_190.delay.Y = 8.689828e-06
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_170_230.phase0.X = 1.178751e-01
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -5.616410e-02
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_170_230.delay.X = 8.689643e-06
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_170_230.delay.Y = 8.689828e-06
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_210_250.phase0.X = 1.178751e-01
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -5.616410e-02
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_210_250.delay.X = 8.689643e-06
-PIC.Core.CS013HBA0.HBA_ZERO.HBA_210_250.delay.Y = 8.689828e-06
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_110_190.phase0.X = 3.515312e-02
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 1.096128e-01
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_110_190.delay.X = 8.689883e-06
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_110_190.delay.Y = 8.690101e-06
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_170_230.phase0.X = 3.515312e-02
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 1.096128e-01
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_170_230.delay.X = 8.689883e-06
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_170_230.delay.Y = 8.690101e-06
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_210_250.phase0.X = 3.515312e-02
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 1.096128e-01
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_210_250.delay.X = 8.689883e-06
-PIC.Core.CS013HBA1.HBA_DUAL.HBA_210_250.delay.Y = 8.690101e-06
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 3.515312e-02
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 1.096128e-01
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 8.689883e-06
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 8.690101e-06
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 3.515312e-02
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 1.096128e-01
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 8.689883e-06
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 8.690101e-06
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 3.515312e-02
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 1.096128e-01
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 8.689883e-06
-PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 8.690101e-06
-PIC.Core.CS013HBA1.HBA_ONE.HBA_110_190.phase0.X = 3.515312e-02
-PIC.Core.CS013HBA1.HBA_ONE.HBA_110_190.phase0.Y = 1.096128e-01
-PIC.Core.CS013HBA1.HBA_ONE.HBA_110_190.delay.X = 8.689883e-06
-PIC.Core.CS013HBA1.HBA_ONE.HBA_110_190.delay.Y = 8.690101e-06
-PIC.Core.CS013HBA1.HBA_ONE.HBA_170_230.phase0.X = 3.515312e-02
-PIC.Core.CS013HBA1.HBA_ONE.HBA_170_230.phase0.Y = 1.096128e-01
-PIC.Core.CS013HBA1.HBA_ONE.HBA_170_230.delay.X = 8.689883e-06
-PIC.Core.CS013HBA1.HBA_ONE.HBA_170_230.delay.Y = 8.690101e-06
-PIC.Core.CS013HBA1.HBA_ONE.HBA_210_250.phase0.X = 3.515312e-02
-PIC.Core.CS013HBA1.HBA_ONE.HBA_210_250.phase0.Y = 1.096128e-01
-PIC.Core.CS013HBA1.HBA_ONE.HBA_210_250.delay.X = 8.689883e-06
-PIC.Core.CS013HBA1.HBA_ONE.HBA_210_250.delay.Y = 8.690101e-06
+PIC.Core.CS011HBA.HBA_JOINED.HBA_210_250.delay.X = 7.468948e-06
+PIC.Core.CS011HBA.HBA_JOINED.HBA_210_250.delay.Y = 7.469310e-06
+PIC.Core.CS013LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS013LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS013LBA.LBA_INNER.LBA_10_70.delay.X = 8.689485e-06
+PIC.Core.CS013LBA.LBA_INNER.LBA_10_70.delay.Y = 8.689511e-06
+PIC.Core.CS013LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS013LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS013LBA.LBA_INNER.LBA_30_70.delay.X = 8.689485e-06
+PIC.Core.CS013LBA.LBA_INNER.LBA_30_70.delay.Y = 8.689511e-06
+PIC.Core.CS013LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS013LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS013LBA.LBA_INNER.LBA_10_90.delay.X = 8.689485e-06
+PIC.Core.CS013LBA.LBA_INNER.LBA_10_90.delay.Y = 8.689511e-06
+PIC.Core.CS013LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS013LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS013LBA.LBA_INNER.LBA_30_90.delay.X = 8.689485e-06
+PIC.Core.CS013LBA.LBA_INNER.LBA_30_90.delay.Y = 8.689511e-06
+PIC.Core.CS013LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS013LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS013LBA.LBA_OUTER.LBA_10_70.delay.X = 8.689485e-06
+PIC.Core.CS013LBA.LBA_OUTER.LBA_10_70.delay.Y = 8.689511e-06
+PIC.Core.CS013LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS013LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS013LBA.LBA_OUTER.LBA_30_70.delay.X = 8.689485e-06
+PIC.Core.CS013LBA.LBA_OUTER.LBA_30_70.delay.Y = 8.689511e-06
+PIC.Core.CS013LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS013LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS013LBA.LBA_OUTER.LBA_10_90.delay.X = 8.689485e-06
+PIC.Core.CS013LBA.LBA_OUTER.LBA_10_90.delay.Y = 8.689511e-06
+PIC.Core.CS013LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS013LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS013LBA.LBA_OUTER.LBA_30_90.delay.X = 8.689485e-06
+PIC.Core.CS013LBA.LBA_OUTER.LBA_30_90.delay.Y = 8.689511e-06
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_110_190.delay.X = 8.689572e-06
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_110_190.delay.Y = 8.689498e-06
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_170_230.delay.X = 8.689572e-06
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_170_230.delay.Y = 8.689498e-06
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_210_250.delay.X = 8.689572e-06
+PIC.Core.CS013HBA0.HBA_ZERO.HBA_210_250.delay.Y = 8.689498e-06
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_110_190.delay.X = 8.689572e-06
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_110_190.delay.Y = 8.689498e-06
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_170_230.delay.X = 8.689572e-06
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_170_230.delay.Y = 8.689498e-06
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_210_250.delay.X = 8.689572e-06
+PIC.Core.CS013HBA0.HBA_DUAL.HBA_210_250.delay.Y = 8.689498e-06
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 8.689572e-06
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 8.689498e-06
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 8.689572e-06
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 8.689498e-06
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 8.689572e-06
+PIC.Core.CS013HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 8.689498e-06
+PIC.Core.CS013HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_ONE.HBA_110_190.delay.X = 8.689397e-06
+PIC.Core.CS013HBA1.HBA_ONE.HBA_110_190.delay.Y = 8.689523e-06
+PIC.Core.CS013HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_ONE.HBA_170_230.delay.X = 8.689397e-06
+PIC.Core.CS013HBA1.HBA_ONE.HBA_170_230.delay.Y = 8.689523e-06
+PIC.Core.CS013HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_ONE.HBA_210_250.delay.X = 8.689397e-06
+PIC.Core.CS013HBA1.HBA_ONE.HBA_210_250.delay.Y = 8.689523e-06
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_110_190.delay.X = 8.689397e-06
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_110_190.delay.Y = 8.689523e-06
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_170_230.delay.X = 8.689397e-06
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_170_230.delay.Y = 8.689523e-06
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_210_250.delay.X = 8.689397e-06
+PIC.Core.CS013HBA1.HBA_DUAL.HBA_210_250.delay.Y = 8.689523e-06
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 8.689397e-06
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 8.689523e-06
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 8.689397e-06
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 8.689523e-06
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 8.689397e-06
+PIC.Core.CS013HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 8.689523e-06
PIC.Core.CS013HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS013HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS013HBA.HBA_JOINED.HBA_110_190.delay.X = 8.690730e-06
-PIC.Core.CS013HBA.HBA_JOINED.HBA_110_190.delay.Y = 8.690902e-06
+PIC.Core.CS013HBA.HBA_JOINED.HBA_110_190.delay.X = 8.689485e-06
+PIC.Core.CS013HBA.HBA_JOINED.HBA_110_190.delay.Y = 8.689511e-06
PIC.Core.CS013HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS013HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS013HBA.HBA_JOINED.HBA_170_230.delay.X = 8.690730e-06
-PIC.Core.CS013HBA.HBA_JOINED.HBA_170_230.delay.Y = 8.690902e-06
+PIC.Core.CS013HBA.HBA_JOINED.HBA_170_230.delay.X = 8.689485e-06
+PIC.Core.CS013HBA.HBA_JOINED.HBA_170_230.delay.Y = 8.689511e-06
PIC.Core.CS013HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS013HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS013HBA.HBA_JOINED.HBA_210_250.delay.X = 8.690730e-06
-PIC.Core.CS013HBA.HBA_JOINED.HBA_210_250.delay.Y = 8.690902e-06
-PIC.Core.CS013LBA.LBA_INNER.LBA_10_70.phase0.X = -6.135000e-01
-PIC.Core.CS013LBA.LBA_INNER.LBA_10_70.phase0.Y = -6.790000e-01
-PIC.Core.CS013LBA.LBA_INNER.LBA_10_70.delay.X = 8.694035e-06
-PIC.Core.CS013LBA.LBA_INNER.LBA_10_70.delay.Y = 8.693866e-06
-PIC.Core.CS013LBA.LBA_INNER.LBA_10_90.phase0.X = -6.135000e-01
-PIC.Core.CS013LBA.LBA_INNER.LBA_10_90.phase0.Y = -6.790000e-01
-PIC.Core.CS013LBA.LBA_INNER.LBA_10_90.delay.X = 8.694035e-06
-PIC.Core.CS013LBA.LBA_INNER.LBA_10_90.delay.Y = 8.693866e-06
-PIC.Core.CS013LBA.LBA_INNER.LBA_30_70.phase0.X = -6.135000e-01
-PIC.Core.CS013LBA.LBA_INNER.LBA_30_70.phase0.Y = -6.790000e-01
-PIC.Core.CS013LBA.LBA_INNER.LBA_30_70.delay.X = 8.694035e-06
-PIC.Core.CS013LBA.LBA_INNER.LBA_30_70.delay.Y = 8.693866e-06
-PIC.Core.CS013LBA.LBA_INNER.LBA_30_90.phase0.X = -6.135000e-01
-PIC.Core.CS013LBA.LBA_INNER.LBA_30_90.phase0.Y = -6.790000e-01
-PIC.Core.CS013LBA.LBA_INNER.LBA_30_90.delay.X = 8.694035e-06
-PIC.Core.CS013LBA.LBA_INNER.LBA_30_90.delay.Y = 8.693866e-06
-PIC.Core.CS013LBA.LBA_OUTER.LBA_10_70.phase0.X = -2.025000e-01
-PIC.Core.CS013LBA.LBA_OUTER.LBA_10_70.phase0.Y = -2.250000e-01
-PIC.Core.CS013LBA.LBA_OUTER.LBA_10_70.delay.X = 8.691155e-06
-PIC.Core.CS013LBA.LBA_OUTER.LBA_10_70.delay.Y = 8.691156e-06
-PIC.Core.CS013LBA.LBA_OUTER.LBA_10_90.phase0.X = -2.025000e-01
-PIC.Core.CS013LBA.LBA_OUTER.LBA_10_90.phase0.Y = -2.250000e-01
-PIC.Core.CS013LBA.LBA_OUTER.LBA_10_90.delay.X = 8.691155e-06
-PIC.Core.CS013LBA.LBA_OUTER.LBA_10_90.delay.Y = 8.691156e-06
-PIC.Core.CS013LBA.LBA_OUTER.LBA_30_70.phase0.X = -2.025000e-01
-PIC.Core.CS013LBA.LBA_OUTER.LBA_30_70.phase0.Y = -2.250000e-01
-PIC.Core.CS013LBA.LBA_OUTER.LBA_30_70.delay.X = 8.691155e-06
-PIC.Core.CS013LBA.LBA_OUTER.LBA_30_70.delay.Y = 8.691156e-06
-PIC.Core.CS013LBA.LBA_OUTER.LBA_30_90.phase0.X = -2.025000e-01
-PIC.Core.CS013LBA.LBA_OUTER.LBA_30_90.phase0.Y = -2.250000e-01
-PIC.Core.CS013LBA.LBA_OUTER.LBA_30_90.delay.X = 8.691155e-06
-PIC.Core.CS013LBA.LBA_OUTER.LBA_30_90.delay.Y = 8.691156e-06
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_110_190.phase0.X = 6.452002e-01
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -4.442210e-01
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.532071e-05
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.531924e-05
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_170_230.phase0.X = 6.452002e-01
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -4.442210e-01
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.532071e-05
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.531924e-05
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_210_250.phase0.X = 6.452002e-01
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -4.442210e-01
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.532071e-05
-PIC.Core.CS017HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.531924e-05
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 6.452002e-01
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -4.442210e-01
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.532071e-05
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.531924e-05
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 6.452002e-01
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -4.442210e-01
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.532071e-05
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.531924e-05
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 6.452002e-01
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -4.442210e-01
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.532071e-05
-PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.531924e-05
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_110_190.phase0.X = 6.452002e-01
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -4.442210e-01
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.532071e-05
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.531924e-05
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_170_230.phase0.X = 6.452002e-01
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -4.442210e-01
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.532071e-05
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.531924e-05
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_210_250.phase0.X = 6.452002e-01
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -4.442210e-01
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.532071e-05
-PIC.Core.CS017HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.531924e-05
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_110_190.phase0.X = 4.474833e-01
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -2.044513e-01
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.532094e-05
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.531939e-05
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_170_230.phase0.X = 4.474833e-01
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -2.044513e-01
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.532094e-05
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.531939e-05
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_210_250.phase0.X = 4.474833e-01
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -2.044513e-01
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.532094e-05
-PIC.Core.CS017HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.531939e-05
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 4.474833e-01
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -2.044513e-01
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.532094e-05
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.531939e-05
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 4.474833e-01
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -2.044513e-01
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.532094e-05
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.531939e-05
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 4.474833e-01
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -2.044513e-01
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.532094e-05
-PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.531939e-05
-PIC.Core.CS017HBA1.HBA_ONE.HBA_110_190.phase0.X = 4.474833e-01
-PIC.Core.CS017HBA1.HBA_ONE.HBA_110_190.phase0.Y = -2.044513e-01
-PIC.Core.CS017HBA1.HBA_ONE.HBA_110_190.delay.X = 1.532094e-05
-PIC.Core.CS017HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.531939e-05
-PIC.Core.CS017HBA1.HBA_ONE.HBA_170_230.phase0.X = 4.474833e-01
-PIC.Core.CS017HBA1.HBA_ONE.HBA_170_230.phase0.Y = -2.044513e-01
-PIC.Core.CS017HBA1.HBA_ONE.HBA_170_230.delay.X = 1.532094e-05
-PIC.Core.CS017HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.531939e-05
-PIC.Core.CS017HBA1.HBA_ONE.HBA_210_250.phase0.X = 4.474833e-01
-PIC.Core.CS017HBA1.HBA_ONE.HBA_210_250.phase0.Y = -2.044513e-01
-PIC.Core.CS017HBA1.HBA_ONE.HBA_210_250.delay.X = 1.532094e-05
-PIC.Core.CS017HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.531939e-05
+PIC.Core.CS013HBA.HBA_JOINED.HBA_210_250.delay.X = 8.689485e-06
+PIC.Core.CS013HBA.HBA_JOINED.HBA_210_250.delay.Y = 8.689511e-06
+PIC.Core.CS017LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS017LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS017LBA.LBA_INNER.LBA_10_70.delay.X = 1.532258e-05
+PIC.Core.CS017LBA.LBA_INNER.LBA_10_70.delay.Y = 1.532111e-05
+PIC.Core.CS017LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS017LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS017LBA.LBA_INNER.LBA_30_70.delay.X = 1.532258e-05
+PIC.Core.CS017LBA.LBA_INNER.LBA_30_70.delay.Y = 1.532111e-05
+PIC.Core.CS017LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS017LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS017LBA.LBA_INNER.LBA_10_90.delay.X = 1.532258e-05
+PIC.Core.CS017LBA.LBA_INNER.LBA_10_90.delay.Y = 1.532111e-05
+PIC.Core.CS017LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS017LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS017LBA.LBA_INNER.LBA_30_90.delay.X = 1.532258e-05
+PIC.Core.CS017LBA.LBA_INNER.LBA_30_90.delay.Y = 1.532111e-05
+PIC.Core.CS017LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS017LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS017LBA.LBA_OUTER.LBA_10_70.delay.X = 1.532258e-05
+PIC.Core.CS017LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.532111e-05
+PIC.Core.CS017LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS017LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS017LBA.LBA_OUTER.LBA_30_70.delay.X = 1.532258e-05
+PIC.Core.CS017LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.532111e-05
+PIC.Core.CS017LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS017LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS017LBA.LBA_OUTER.LBA_10_90.delay.X = 1.532258e-05
+PIC.Core.CS017LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.532111e-05
+PIC.Core.CS017LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS017LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS017LBA.LBA_OUTER.LBA_30_90.delay.X = 1.532258e-05
+PIC.Core.CS017LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.532111e-05
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.532263e-05
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.532123e-05
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.532263e-05
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.532123e-05
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.532263e-05
+PIC.Core.CS017HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.532123e-05
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.532263e-05
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.532123e-05
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.532263e-05
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.532123e-05
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.532263e-05
+PIC.Core.CS017HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.532123e-05
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.532263e-05
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.532123e-05
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.532263e-05
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.532123e-05
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.532263e-05
+PIC.Core.CS017HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.532123e-05
+PIC.Core.CS017HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_ONE.HBA_110_190.delay.X = 1.532252e-05
+PIC.Core.CS017HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.532100e-05
+PIC.Core.CS017HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_ONE.HBA_170_230.delay.X = 1.532252e-05
+PIC.Core.CS017HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.532100e-05
+PIC.Core.CS017HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_ONE.HBA_210_250.delay.X = 1.532252e-05
+PIC.Core.CS017HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.532100e-05
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.532252e-05
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.532100e-05
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.532252e-05
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.532100e-05
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.532252e-05
+PIC.Core.CS017HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.532100e-05
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.532252e-05
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.532100e-05
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.532252e-05
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.532100e-05
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.532252e-05
+PIC.Core.CS017HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.532100e-05
PIC.Core.CS017HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS017HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS017HBA.HBA_JOINED.HBA_110_190.delay.X = 1.532097e-05
-PIC.Core.CS017HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.531948e-05
+PIC.Core.CS017HBA.HBA_JOINED.HBA_110_190.delay.X = 1.532258e-05
+PIC.Core.CS017HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.532111e-05
PIC.Core.CS017HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS017HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS017HBA.HBA_JOINED.HBA_170_230.delay.X = 1.532097e-05
-PIC.Core.CS017HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.531948e-05
+PIC.Core.CS017HBA.HBA_JOINED.HBA_170_230.delay.X = 1.532258e-05
+PIC.Core.CS017HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.532111e-05
PIC.Core.CS017HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS017HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS017HBA.HBA_JOINED.HBA_210_250.delay.X = 1.532097e-05
-PIC.Core.CS017HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.531948e-05
-PIC.Core.CS017LBA.LBA_INNER.LBA_10_70.phase0.X = 3.190000e-01
-PIC.Core.CS017LBA.LBA_INNER.LBA_10_70.phase0.Y = 7.225000e-01
-PIC.Core.CS017LBA.LBA_INNER.LBA_10_70.delay.X = 1.531738e-05
-PIC.Core.CS017LBA.LBA_INNER.LBA_10_70.delay.Y = 1.531655e-05
-PIC.Core.CS017LBA.LBA_INNER.LBA_10_90.phase0.X = 3.190000e-01
-PIC.Core.CS017LBA.LBA_INNER.LBA_10_90.phase0.Y = 7.225000e-01
-PIC.Core.CS017LBA.LBA_INNER.LBA_10_90.delay.X = 1.531738e-05
-PIC.Core.CS017LBA.LBA_INNER.LBA_10_90.delay.Y = 1.531655e-05
-PIC.Core.CS017LBA.LBA_INNER.LBA_30_70.phase0.X = 3.190000e-01
-PIC.Core.CS017LBA.LBA_INNER.LBA_30_70.phase0.Y = 7.225000e-01
-PIC.Core.CS017LBA.LBA_INNER.LBA_30_70.delay.X = 1.531738e-05
-PIC.Core.CS017LBA.LBA_INNER.LBA_30_70.delay.Y = 1.531655e-05
-PIC.Core.CS017LBA.LBA_INNER.LBA_30_90.phase0.X = 3.190000e-01
-PIC.Core.CS017LBA.LBA_INNER.LBA_30_90.phase0.Y = 7.225000e-01
-PIC.Core.CS017LBA.LBA_INNER.LBA_30_90.delay.X = 1.531738e-05
-PIC.Core.CS017LBA.LBA_INNER.LBA_30_90.delay.Y = 1.531655e-05
-PIC.Core.CS017LBA.LBA_OUTER.LBA_10_70.phase0.X = 1.650000e-02
-PIC.Core.CS017LBA.LBA_OUTER.LBA_10_70.phase0.Y = 2.450000e-02
-PIC.Core.CS017LBA.LBA_OUTER.LBA_10_70.delay.X = 1.531887e-05
-PIC.Core.CS017LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.531837e-05
-PIC.Core.CS017LBA.LBA_OUTER.LBA_10_90.phase0.X = 1.650000e-02
-PIC.Core.CS017LBA.LBA_OUTER.LBA_10_90.phase0.Y = 2.450000e-02
-PIC.Core.CS017LBA.LBA_OUTER.LBA_10_90.delay.X = 1.531887e-05
-PIC.Core.CS017LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.531837e-05
-PIC.Core.CS017LBA.LBA_OUTER.LBA_30_70.phase0.X = 1.650000e-02
-PIC.Core.CS017LBA.LBA_OUTER.LBA_30_70.phase0.Y = 2.450000e-02
-PIC.Core.CS017LBA.LBA_OUTER.LBA_30_70.delay.X = 1.531887e-05
-PIC.Core.CS017LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.531837e-05
-PIC.Core.CS017LBA.LBA_OUTER.LBA_30_90.phase0.X = 1.650000e-02
-PIC.Core.CS017LBA.LBA_OUTER.LBA_30_90.phase0.Y = 2.450000e-02
-PIC.Core.CS017LBA.LBA_OUTER.LBA_30_90.delay.X = 1.531887e-05
-PIC.Core.CS017LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.531837e-05
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_110_190.phase0.X = -7.396260e-01
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -5.097447e-01
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_110_190.delay.X = 5.959594e-06
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_110_190.delay.Y = 5.960084e-06
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_170_230.phase0.X = -7.396260e-01
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -5.097447e-01
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_170_230.delay.X = 5.959594e-06
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_170_230.delay.Y = 5.960084e-06
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_210_250.phase0.X = -7.396260e-01
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -5.097447e-01
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_210_250.delay.X = 5.959594e-06
-PIC.Core.CS021HBA0.HBA_DUAL.HBA_210_250.delay.Y = 5.960084e-06
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -7.396260e-01
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -5.097447e-01
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 5.959594e-06
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 5.960084e-06
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -7.396260e-01
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -5.097447e-01
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 5.959594e-06
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 5.960084e-06
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -7.396260e-01
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -5.097447e-01
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 5.959594e-06
-PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 5.960084e-06
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_110_190.phase0.X = -7.396260e-01
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -5.097447e-01
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_110_190.delay.X = 5.959594e-06
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_110_190.delay.Y = 5.960084e-06
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_170_230.phase0.X = -7.396260e-01
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -5.097447e-01
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_170_230.delay.X = 5.959594e-06
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_170_230.delay.Y = 5.960084e-06
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_210_250.phase0.X = -7.396260e-01
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -5.097447e-01
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_210_250.delay.X = 5.959594e-06
-PIC.Core.CS021HBA0.HBA_ZERO.HBA_210_250.delay.Y = 5.960084e-06
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_110_190.phase0.X = -6.460536e-01
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -3.725514e-01
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_110_190.delay.X = 5.959306e-06
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_110_190.delay.Y = 5.959870e-06
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_170_230.phase0.X = -6.460536e-01
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -3.725514e-01
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_170_230.delay.X = 5.959306e-06
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_170_230.delay.Y = 5.959870e-06
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_210_250.phase0.X = -6.460536e-01
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -3.725514e-01
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_210_250.delay.X = 5.959306e-06
-PIC.Core.CS021HBA1.HBA_DUAL.HBA_210_250.delay.Y = 5.959870e-06
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -6.460536e-01
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -3.725514e-01
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 5.959306e-06
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 5.959870e-06
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -6.460536e-01
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -3.725514e-01
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 5.959306e-06
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 5.959870e-06
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -6.460536e-01
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -3.725514e-01
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 5.959306e-06
-PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 5.959870e-06
-PIC.Core.CS021HBA1.HBA_ONE.HBA_110_190.phase0.X = -6.460536e-01
-PIC.Core.CS021HBA1.HBA_ONE.HBA_110_190.phase0.Y = -3.725514e-01
-PIC.Core.CS021HBA1.HBA_ONE.HBA_110_190.delay.X = 5.959306e-06
-PIC.Core.CS021HBA1.HBA_ONE.HBA_110_190.delay.Y = 5.959870e-06
-PIC.Core.CS021HBA1.HBA_ONE.HBA_170_230.phase0.X = -6.460536e-01
-PIC.Core.CS021HBA1.HBA_ONE.HBA_170_230.phase0.Y = -3.725514e-01
-PIC.Core.CS021HBA1.HBA_ONE.HBA_170_230.delay.X = 5.959306e-06
-PIC.Core.CS021HBA1.HBA_ONE.HBA_170_230.delay.Y = 5.959870e-06
-PIC.Core.CS021HBA1.HBA_ONE.HBA_210_250.phase0.X = -6.460536e-01
-PIC.Core.CS021HBA1.HBA_ONE.HBA_210_250.phase0.Y = -3.725514e-01
-PIC.Core.CS021HBA1.HBA_ONE.HBA_210_250.delay.X = 5.959306e-06
-PIC.Core.CS021HBA1.HBA_ONE.HBA_210_250.delay.Y = 5.959870e-06
+PIC.Core.CS017HBA.HBA_JOINED.HBA_210_250.delay.X = 1.532258e-05
+PIC.Core.CS017HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.532111e-05
+PIC.Core.CS021LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS021LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS021LBA.LBA_INNER.LBA_10_70.delay.X = 5.959107e-06
+PIC.Core.CS021LBA.LBA_INNER.LBA_10_70.delay.Y = 5.959842e-06
+PIC.Core.CS021LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS021LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS021LBA.LBA_INNER.LBA_30_70.delay.X = 5.959107e-06
+PIC.Core.CS021LBA.LBA_INNER.LBA_30_70.delay.Y = 5.959842e-06
+PIC.Core.CS021LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS021LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS021LBA.LBA_INNER.LBA_10_90.delay.X = 5.959107e-06
+PIC.Core.CS021LBA.LBA_INNER.LBA_10_90.delay.Y = 5.959842e-06
+PIC.Core.CS021LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS021LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS021LBA.LBA_INNER.LBA_30_90.delay.X = 5.959107e-06
+PIC.Core.CS021LBA.LBA_INNER.LBA_30_90.delay.Y = 5.959842e-06
+PIC.Core.CS021LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS021LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS021LBA.LBA_OUTER.LBA_10_70.delay.X = 5.959107e-06
+PIC.Core.CS021LBA.LBA_OUTER.LBA_10_70.delay.Y = 5.959842e-06
+PIC.Core.CS021LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS021LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS021LBA.LBA_OUTER.LBA_30_70.delay.X = 5.959107e-06
+PIC.Core.CS021LBA.LBA_OUTER.LBA_30_70.delay.Y = 5.959842e-06
+PIC.Core.CS021LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS021LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS021LBA.LBA_OUTER.LBA_10_90.delay.X = 5.959107e-06
+PIC.Core.CS021LBA.LBA_OUTER.LBA_10_90.delay.Y = 5.959842e-06
+PIC.Core.CS021LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS021LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS021LBA.LBA_OUTER.LBA_30_90.delay.X = 5.959107e-06
+PIC.Core.CS021LBA.LBA_OUTER.LBA_30_90.delay.Y = 5.959842e-06
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_110_190.delay.X = 5.959155e-06
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_110_190.delay.Y = 5.959660e-06
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_170_230.delay.X = 5.959155e-06
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_170_230.delay.Y = 5.959660e-06
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_210_250.delay.X = 5.959155e-06
+PIC.Core.CS021HBA0.HBA_ZERO.HBA_210_250.delay.Y = 5.959660e-06
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_110_190.delay.X = 5.959155e-06
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_110_190.delay.Y = 5.959660e-06
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_170_230.delay.X = 5.959155e-06
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_170_230.delay.Y = 5.959660e-06
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_210_250.delay.X = 5.959155e-06
+PIC.Core.CS021HBA0.HBA_DUAL.HBA_210_250.delay.Y = 5.959660e-06
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 5.959155e-06
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 5.959660e-06
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 5.959155e-06
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 5.959660e-06
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 5.959155e-06
+PIC.Core.CS021HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 5.959660e-06
+PIC.Core.CS021HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_ONE.HBA_110_190.delay.X = 5.959058e-06
+PIC.Core.CS021HBA1.HBA_ONE.HBA_110_190.delay.Y = 5.960023e-06
+PIC.Core.CS021HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_ONE.HBA_170_230.delay.X = 5.959058e-06
+PIC.Core.CS021HBA1.HBA_ONE.HBA_170_230.delay.Y = 5.960023e-06
+PIC.Core.CS021HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_ONE.HBA_210_250.delay.X = 5.959058e-06
+PIC.Core.CS021HBA1.HBA_ONE.HBA_210_250.delay.Y = 5.960023e-06
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_110_190.delay.X = 5.959058e-06
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_110_190.delay.Y = 5.960023e-06
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_170_230.delay.X = 5.959058e-06
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_170_230.delay.Y = 5.960023e-06
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_210_250.delay.X = 5.959058e-06
+PIC.Core.CS021HBA1.HBA_DUAL.HBA_210_250.delay.Y = 5.960023e-06
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 5.959058e-06
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 5.960023e-06
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 5.959058e-06
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 5.960023e-06
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 5.959058e-06
+PIC.Core.CS021HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 5.960023e-06
PIC.Core.CS021HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS021HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS021HBA.HBA_JOINED.HBA_110_190.delay.X = 5.958240e-06
-PIC.Core.CS021HBA.HBA_JOINED.HBA_110_190.delay.Y = 5.958792e-06
+PIC.Core.CS021HBA.HBA_JOINED.HBA_110_190.delay.X = 5.959107e-06
+PIC.Core.CS021HBA.HBA_JOINED.HBA_110_190.delay.Y = 5.959842e-06
PIC.Core.CS021HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS021HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS021HBA.HBA_JOINED.HBA_170_230.delay.X = 5.958240e-06
-PIC.Core.CS021HBA.HBA_JOINED.HBA_170_230.delay.Y = 5.958792e-06
+PIC.Core.CS021HBA.HBA_JOINED.HBA_170_230.delay.X = 5.959107e-06
+PIC.Core.CS021HBA.HBA_JOINED.HBA_170_230.delay.Y = 5.959842e-06
PIC.Core.CS021HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS021HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS021HBA.HBA_JOINED.HBA_210_250.delay.X = 5.958240e-06
-PIC.Core.CS021HBA.HBA_JOINED.HBA_210_250.delay.Y = 5.958792e-06
-PIC.Core.CS021LBA.LBA_INNER.LBA_10_70.phase0.X = -2.635000e-01
-PIC.Core.CS021LBA.LBA_INNER.LBA_10_70.phase0.Y = -7.650000e-02
-PIC.Core.CS021LBA.LBA_INNER.LBA_10_70.delay.X = 5.954767e-06
-PIC.Core.CS021LBA.LBA_INNER.LBA_10_70.delay.Y = 5.955057e-06
-PIC.Core.CS021LBA.LBA_INNER.LBA_10_90.phase0.X = -2.635000e-01
-PIC.Core.CS021LBA.LBA_INNER.LBA_10_90.phase0.Y = -7.650000e-02
-PIC.Core.CS021LBA.LBA_INNER.LBA_10_90.delay.X = 5.954767e-06
-PIC.Core.CS021LBA.LBA_INNER.LBA_10_90.delay.Y = 5.955057e-06
-PIC.Core.CS021LBA.LBA_INNER.LBA_30_70.phase0.X = -2.635000e-01
-PIC.Core.CS021LBA.LBA_INNER.LBA_30_70.phase0.Y = -7.650000e-02
-PIC.Core.CS021LBA.LBA_INNER.LBA_30_70.delay.X = 5.954767e-06
-PIC.Core.CS021LBA.LBA_INNER.LBA_30_70.delay.Y = 5.955057e-06
-PIC.Core.CS021LBA.LBA_INNER.LBA_30_90.phase0.X = -2.635000e-01
-PIC.Core.CS021LBA.LBA_INNER.LBA_30_90.phase0.Y = -7.650000e-02
-PIC.Core.CS021LBA.LBA_INNER.LBA_30_90.delay.X = 5.954767e-06
-PIC.Core.CS021LBA.LBA_INNER.LBA_30_90.delay.Y = 5.955057e-06
-PIC.Core.CS021LBA.LBA_OUTER.LBA_10_70.phase0.X = -1.815000e-01
-PIC.Core.CS021LBA.LBA_OUTER.LBA_10_70.phase0.Y = -5.700000e-02
-PIC.Core.CS021LBA.LBA_OUTER.LBA_10_70.delay.X = 5.956417e-06
-PIC.Core.CS021LBA.LBA_OUTER.LBA_10_70.delay.Y = 5.955272e-06
-PIC.Core.CS021LBA.LBA_OUTER.LBA_10_90.phase0.X = -1.815000e-01
-PIC.Core.CS021LBA.LBA_OUTER.LBA_10_90.phase0.Y = -5.700000e-02
-PIC.Core.CS021LBA.LBA_OUTER.LBA_10_90.delay.X = 5.956417e-06
-PIC.Core.CS021LBA.LBA_OUTER.LBA_10_90.delay.Y = 5.955272e-06
-PIC.Core.CS021LBA.LBA_OUTER.LBA_30_70.phase0.X = -1.815000e-01
-PIC.Core.CS021LBA.LBA_OUTER.LBA_30_70.phase0.Y = -5.700000e-02
-PIC.Core.CS021LBA.LBA_OUTER.LBA_30_70.delay.X = 5.956417e-06
-PIC.Core.CS021LBA.LBA_OUTER.LBA_30_70.delay.Y = 5.955272e-06
-PIC.Core.CS021LBA.LBA_OUTER.LBA_30_90.phase0.X = -1.815000e-01
-PIC.Core.CS021LBA.LBA_OUTER.LBA_30_90.phase0.Y = -5.700000e-02
-PIC.Core.CS021LBA.LBA_OUTER.LBA_30_90.delay.X = 5.956417e-06
-PIC.Core.CS021LBA.LBA_OUTER.LBA_30_90.delay.Y = 5.955272e-06
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_110_190.phase0.X = 7.982781e-01
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 1.994030e-01
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_110_190.delay.X = 4.553446e-06
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_110_190.delay.Y = 4.553094e-06
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_170_230.phase0.X = 7.982781e-01
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 1.994030e-01
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_170_230.delay.X = 4.553446e-06
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_170_230.delay.Y = 4.553094e-06
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_210_250.phase0.X = 7.982781e-01
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 1.994030e-01
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_210_250.delay.X = 4.553446e-06
-PIC.Core.CS024HBA0.HBA_DUAL.HBA_210_250.delay.Y = 4.553094e-06
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 7.982781e-01
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 1.994030e-01
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 4.553446e-06
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 4.553094e-06
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 7.982781e-01
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 1.994030e-01
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 4.553446e-06
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 4.553094e-06
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 7.982781e-01
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 1.994030e-01
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 4.553446e-06
-PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 4.553094e-06
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_110_190.phase0.X = 7.982781e-01
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 1.994030e-01
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_110_190.delay.X = 4.553446e-06
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_110_190.delay.Y = 4.553094e-06
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_170_230.phase0.X = 7.982781e-01
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 1.994030e-01
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_170_230.delay.X = 4.553446e-06
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_170_230.delay.Y = 4.553094e-06
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_210_250.phase0.X = 7.982781e-01
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 1.994030e-01
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_210_250.delay.X = 4.553446e-06
-PIC.Core.CS024HBA0.HBA_ZERO.HBA_210_250.delay.Y = 4.553094e-06
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_110_190.phase0.X = 3.331064e-01
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 5.782262e-01
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_110_190.delay.X = 4.554434e-06
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_110_190.delay.Y = 4.554180e-06
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_170_230.phase0.X = 3.331064e-01
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 5.782262e-01
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_170_230.delay.X = 4.554434e-06
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_170_230.delay.Y = 4.554180e-06
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_210_250.phase0.X = 3.331064e-01
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 5.782262e-01
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_210_250.delay.X = 4.554434e-06
-PIC.Core.CS024HBA1.HBA_DUAL.HBA_210_250.delay.Y = 4.554180e-06
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 3.331064e-01
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 5.782262e-01
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 4.554434e-06
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 4.554180e-06
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 3.331064e-01
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 5.782262e-01
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 4.554434e-06
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 4.554180e-06
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 3.331064e-01
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 5.782262e-01
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 4.554434e-06
-PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 4.554180e-06
-PIC.Core.CS024HBA1.HBA_ONE.HBA_110_190.phase0.X = 3.331064e-01
-PIC.Core.CS024HBA1.HBA_ONE.HBA_110_190.phase0.Y = 5.782262e-01
-PIC.Core.CS024HBA1.HBA_ONE.HBA_110_190.delay.X = 4.554434e-06
-PIC.Core.CS024HBA1.HBA_ONE.HBA_110_190.delay.Y = 4.554180e-06
-PIC.Core.CS024HBA1.HBA_ONE.HBA_170_230.phase0.X = 3.331064e-01
-PIC.Core.CS024HBA1.HBA_ONE.HBA_170_230.phase0.Y = 5.782262e-01
-PIC.Core.CS024HBA1.HBA_ONE.HBA_170_230.delay.X = 4.554434e-06
-PIC.Core.CS024HBA1.HBA_ONE.HBA_170_230.delay.Y = 4.554180e-06
-PIC.Core.CS024HBA1.HBA_ONE.HBA_210_250.phase0.X = 3.331064e-01
-PIC.Core.CS024HBA1.HBA_ONE.HBA_210_250.phase0.Y = 5.782262e-01
-PIC.Core.CS024HBA1.HBA_ONE.HBA_210_250.delay.X = 4.554434e-06
-PIC.Core.CS024HBA1.HBA_ONE.HBA_210_250.delay.Y = 4.554180e-06
+PIC.Core.CS021HBA.HBA_JOINED.HBA_210_250.delay.X = 5.959107e-06
+PIC.Core.CS021HBA.HBA_JOINED.HBA_210_250.delay.Y = 5.959842e-06
+PIC.Core.CS024LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS024LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS024LBA.LBA_INNER.LBA_10_70.delay.X = 4.555559e-06
+PIC.Core.CS024LBA.LBA_INNER.LBA_10_70.delay.Y = 4.554567e-06
+PIC.Core.CS024LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS024LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS024LBA.LBA_INNER.LBA_30_70.delay.X = 4.555559e-06
+PIC.Core.CS024LBA.LBA_INNER.LBA_30_70.delay.Y = 4.554567e-06
+PIC.Core.CS024LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS024LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS024LBA.LBA_INNER.LBA_10_90.delay.X = 4.555559e-06
+PIC.Core.CS024LBA.LBA_INNER.LBA_10_90.delay.Y = 4.554567e-06
+PIC.Core.CS024LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS024LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS024LBA.LBA_INNER.LBA_30_90.delay.X = 4.555559e-06
+PIC.Core.CS024LBA.LBA_INNER.LBA_30_90.delay.Y = 4.554567e-06
+PIC.Core.CS024LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS024LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS024LBA.LBA_OUTER.LBA_10_70.delay.X = 4.555559e-06
+PIC.Core.CS024LBA.LBA_OUTER.LBA_10_70.delay.Y = 4.554567e-06
+PIC.Core.CS024LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS024LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS024LBA.LBA_OUTER.LBA_30_70.delay.X = 4.555559e-06
+PIC.Core.CS024LBA.LBA_OUTER.LBA_30_70.delay.Y = 4.554567e-06
+PIC.Core.CS024LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS024LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS024LBA.LBA_OUTER.LBA_10_90.delay.X = 4.555559e-06
+PIC.Core.CS024LBA.LBA_OUTER.LBA_10_90.delay.Y = 4.554567e-06
+PIC.Core.CS024LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS024LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS024LBA.LBA_OUTER.LBA_30_90.delay.X = 4.555559e-06
+PIC.Core.CS024LBA.LBA_OUTER.LBA_30_90.delay.Y = 4.554567e-06
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_110_190.delay.X = 4.555545e-06
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_110_190.delay.Y = 4.554490e-06
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_170_230.delay.X = 4.555545e-06
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_170_230.delay.Y = 4.554490e-06
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_210_250.delay.X = 4.555545e-06
+PIC.Core.CS024HBA0.HBA_ZERO.HBA_210_250.delay.Y = 4.554490e-06
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_110_190.delay.X = 4.555545e-06
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_110_190.delay.Y = 4.554490e-06
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_170_230.delay.X = 4.555545e-06
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_170_230.delay.Y = 4.554490e-06
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_210_250.delay.X = 4.555545e-06
+PIC.Core.CS024HBA0.HBA_DUAL.HBA_210_250.delay.Y = 4.554490e-06
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 4.555545e-06
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 4.554490e-06
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 4.555545e-06
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 4.554490e-06
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 4.555545e-06
+PIC.Core.CS024HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 4.554490e-06
+PIC.Core.CS024HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_ONE.HBA_110_190.delay.X = 4.555573e-06
+PIC.Core.CS024HBA1.HBA_ONE.HBA_110_190.delay.Y = 4.554644e-06
+PIC.Core.CS024HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_ONE.HBA_170_230.delay.X = 4.555573e-06
+PIC.Core.CS024HBA1.HBA_ONE.HBA_170_230.delay.Y = 4.554644e-06
+PIC.Core.CS024HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_ONE.HBA_210_250.delay.X = 4.555573e-06
+PIC.Core.CS024HBA1.HBA_ONE.HBA_210_250.delay.Y = 4.554644e-06
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_110_190.delay.X = 4.555573e-06
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_110_190.delay.Y = 4.554644e-06
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_170_230.delay.X = 4.555573e-06
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_170_230.delay.Y = 4.554644e-06
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_210_250.delay.X = 4.555573e-06
+PIC.Core.CS024HBA1.HBA_DUAL.HBA_210_250.delay.Y = 4.554644e-06
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 4.555573e-06
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 4.554644e-06
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 4.555573e-06
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 4.554644e-06
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 4.555573e-06
+PIC.Core.CS024HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 4.554644e-06
PIC.Core.CS024HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS024HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS024HBA.HBA_JOINED.HBA_110_190.delay.X = 4.554242e-06
-PIC.Core.CS024HBA.HBA_JOINED.HBA_110_190.delay.Y = 4.553917e-06
+PIC.Core.CS024HBA.HBA_JOINED.HBA_110_190.delay.X = 4.555559e-06
+PIC.Core.CS024HBA.HBA_JOINED.HBA_110_190.delay.Y = 4.554567e-06
PIC.Core.CS024HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS024HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS024HBA.HBA_JOINED.HBA_170_230.delay.X = 4.554242e-06
-PIC.Core.CS024HBA.HBA_JOINED.HBA_170_230.delay.Y = 4.553917e-06
+PIC.Core.CS024HBA.HBA_JOINED.HBA_170_230.delay.X = 4.555559e-06
+PIC.Core.CS024HBA.HBA_JOINED.HBA_170_230.delay.Y = 4.554567e-06
PIC.Core.CS024HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS024HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS024HBA.HBA_JOINED.HBA_210_250.delay.X = 4.554242e-06
-PIC.Core.CS024HBA.HBA_JOINED.HBA_210_250.delay.Y = 4.553917e-06
-PIC.Core.CS024LBA.LBA_INNER.LBA_10_70.phase0.X = -1.500000e-03
-PIC.Core.CS024LBA.LBA_INNER.LBA_10_70.phase0.Y = -1.225000e-01
-PIC.Core.CS024LBA.LBA_INNER.LBA_10_70.delay.X = 4.559254e-06
-PIC.Core.CS024LBA.LBA_INNER.LBA_10_70.delay.Y = 4.559647e-06
-PIC.Core.CS024LBA.LBA_INNER.LBA_10_90.phase0.X = -1.500000e-03
-PIC.Core.CS024LBA.LBA_INNER.LBA_10_90.phase0.Y = -1.225000e-01
-PIC.Core.CS024LBA.LBA_INNER.LBA_10_90.delay.X = 4.559254e-06
-PIC.Core.CS024LBA.LBA_INNER.LBA_10_90.delay.Y = 4.559647e-06
-PIC.Core.CS024LBA.LBA_INNER.LBA_30_70.phase0.X = -1.500000e-03
-PIC.Core.CS024LBA.LBA_INNER.LBA_30_70.phase0.Y = -1.225000e-01
-PIC.Core.CS024LBA.LBA_INNER.LBA_30_70.delay.X = 4.559254e-06
-PIC.Core.CS024LBA.LBA_INNER.LBA_30_70.delay.Y = 4.559647e-06
-PIC.Core.CS024LBA.LBA_INNER.LBA_30_90.phase0.X = -1.500000e-03
-PIC.Core.CS024LBA.LBA_INNER.LBA_30_90.phase0.Y = -1.225000e-01
-PIC.Core.CS024LBA.LBA_INNER.LBA_30_90.delay.X = 4.559254e-06
-PIC.Core.CS024LBA.LBA_INNER.LBA_30_90.delay.Y = 4.559647e-06
-PIC.Core.CS024LBA.LBA_OUTER.LBA_10_70.phase0.X = -4.625000e-01
-PIC.Core.CS024LBA.LBA_OUTER.LBA_10_70.phase0.Y = -5.035000e-01
-PIC.Core.CS024LBA.LBA_OUTER.LBA_10_70.delay.X = 4.560779e-06
-PIC.Core.CS024LBA.LBA_OUTER.LBA_10_70.delay.Y = 4.560482e-06
-PIC.Core.CS024LBA.LBA_OUTER.LBA_10_90.phase0.X = -4.625000e-01
-PIC.Core.CS024LBA.LBA_OUTER.LBA_10_90.phase0.Y = -5.035000e-01
-PIC.Core.CS024LBA.LBA_OUTER.LBA_10_90.delay.X = 4.560779e-06
-PIC.Core.CS024LBA.LBA_OUTER.LBA_10_90.delay.Y = 4.560482e-06
-PIC.Core.CS024LBA.LBA_OUTER.LBA_30_70.phase0.X = -4.625000e-01
-PIC.Core.CS024LBA.LBA_OUTER.LBA_30_70.phase0.Y = -5.035000e-01
-PIC.Core.CS024LBA.LBA_OUTER.LBA_30_70.delay.X = 4.560779e-06
-PIC.Core.CS024LBA.LBA_OUTER.LBA_30_70.delay.Y = 4.560482e-06
-PIC.Core.CS024LBA.LBA_OUTER.LBA_30_90.phase0.X = -4.625000e-01
-PIC.Core.CS024LBA.LBA_OUTER.LBA_30_90.phase0.Y = -5.035000e-01
-PIC.Core.CS024LBA.LBA_OUTER.LBA_30_90.delay.X = 4.560779e-06
-PIC.Core.CS024LBA.LBA_OUTER.LBA_30_90.delay.Y = 4.560482e-06
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_110_190.phase0.X = 5.689193e-01
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 8.021924e-01
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.610906e-05
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.610900e-05
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_170_230.phase0.X = 5.689193e-01
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 8.021924e-01
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.610906e-05
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.610900e-05
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_210_250.phase0.X = 5.689193e-01
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 8.021924e-01
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.610906e-05
-PIC.Core.CS026HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.610900e-05
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 5.689193e-01
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 8.021924e-01
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.610906e-05
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.610900e-05
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 5.689193e-01
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 8.021924e-01
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.610906e-05
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.610900e-05
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 5.689193e-01
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 8.021924e-01
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.610906e-05
-PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.610900e-05
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_110_190.phase0.X = 5.689193e-01
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 8.021924e-01
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.610906e-05
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.610900e-05
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_170_230.phase0.X = 5.689193e-01
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 8.021924e-01
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.610906e-05
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.610900e-05
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_210_250.phase0.X = 5.689193e-01
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 8.021924e-01
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.610906e-05
-PIC.Core.CS026HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.610900e-05
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_110_190.phase0.X = 6.247366e-02
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -5.833125e-01
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.610859e-05
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.610858e-05
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_170_230.phase0.X = 6.247366e-02
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -5.833125e-01
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.610859e-05
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.610858e-05
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_210_250.phase0.X = 6.247366e-02
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -5.833125e-01
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.610859e-05
-PIC.Core.CS026HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.610858e-05
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 6.247366e-02
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -5.833125e-01
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.610859e-05
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.610858e-05
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 6.247366e-02
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -5.833125e-01
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.610859e-05
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.610858e-05
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 6.247366e-02
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -5.833125e-01
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.610859e-05
-PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.610858e-05
-PIC.Core.CS026HBA1.HBA_ONE.HBA_110_190.phase0.X = 6.247366e-02
-PIC.Core.CS026HBA1.HBA_ONE.HBA_110_190.phase0.Y = -5.833125e-01
-PIC.Core.CS026HBA1.HBA_ONE.HBA_110_190.delay.X = 1.610859e-05
-PIC.Core.CS026HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.610858e-05
-PIC.Core.CS026HBA1.HBA_ONE.HBA_170_230.phase0.X = 6.247366e-02
-PIC.Core.CS026HBA1.HBA_ONE.HBA_170_230.phase0.Y = -5.833125e-01
-PIC.Core.CS026HBA1.HBA_ONE.HBA_170_230.delay.X = 1.610859e-05
-PIC.Core.CS026HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.610858e-05
-PIC.Core.CS026HBA1.HBA_ONE.HBA_210_250.phase0.X = 6.247366e-02
-PIC.Core.CS026HBA1.HBA_ONE.HBA_210_250.phase0.Y = -5.833125e-01
-PIC.Core.CS026HBA1.HBA_ONE.HBA_210_250.delay.X = 1.610859e-05
-PIC.Core.CS026HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.610858e-05
+PIC.Core.CS024HBA.HBA_JOINED.HBA_210_250.delay.X = 4.555559e-06
+PIC.Core.CS024HBA.HBA_JOINED.HBA_210_250.delay.Y = 4.554567e-06
+PIC.Core.CS026LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS026LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS026LBA.LBA_INNER.LBA_10_70.delay.X = 1.611022e-05
+PIC.Core.CS026LBA.LBA_INNER.LBA_10_70.delay.Y = 1.611064e-05
+PIC.Core.CS026LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS026LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS026LBA.LBA_INNER.LBA_30_70.delay.X = 1.611022e-05
+PIC.Core.CS026LBA.LBA_INNER.LBA_30_70.delay.Y = 1.611064e-05
+PIC.Core.CS026LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS026LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS026LBA.LBA_INNER.LBA_10_90.delay.X = 1.611022e-05
+PIC.Core.CS026LBA.LBA_INNER.LBA_10_90.delay.Y = 1.611064e-05
+PIC.Core.CS026LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS026LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS026LBA.LBA_INNER.LBA_30_90.delay.X = 1.611022e-05
+PIC.Core.CS026LBA.LBA_INNER.LBA_30_90.delay.Y = 1.611064e-05
+PIC.Core.CS026LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS026LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS026LBA.LBA_OUTER.LBA_10_70.delay.X = 1.611022e-05
+PIC.Core.CS026LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.611064e-05
+PIC.Core.CS026LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS026LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS026LBA.LBA_OUTER.LBA_30_70.delay.X = 1.611022e-05
+PIC.Core.CS026LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.611064e-05
+PIC.Core.CS026LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS026LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS026LBA.LBA_OUTER.LBA_10_90.delay.X = 1.611022e-05
+PIC.Core.CS026LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.611064e-05
+PIC.Core.CS026LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS026LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS026LBA.LBA_OUTER.LBA_30_90.delay.X = 1.611022e-05
+PIC.Core.CS026LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.611064e-05
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.611013e-05
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.611050e-05
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.611013e-05
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.611050e-05
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.611013e-05
+PIC.Core.CS026HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.611050e-05
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.611013e-05
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.611050e-05
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.611013e-05
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.611050e-05
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.611013e-05
+PIC.Core.CS026HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.611050e-05
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.611013e-05
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.611050e-05
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.611013e-05
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.611050e-05
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.611013e-05
+PIC.Core.CS026HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.611050e-05
+PIC.Core.CS026HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_ONE.HBA_110_190.delay.X = 1.611031e-05
+PIC.Core.CS026HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.611078e-05
+PIC.Core.CS026HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_ONE.HBA_170_230.delay.X = 1.611031e-05
+PIC.Core.CS026HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.611078e-05
+PIC.Core.CS026HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_ONE.HBA_210_250.delay.X = 1.611031e-05
+PIC.Core.CS026HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.611078e-05
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.611031e-05
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.611078e-05
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.611031e-05
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.611078e-05
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.611031e-05
+PIC.Core.CS026HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.611078e-05
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.611031e-05
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.611078e-05
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.611031e-05
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.611078e-05
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.611031e-05
+PIC.Core.CS026HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.611078e-05
PIC.Core.CS026HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS026HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS026HBA.HBA_JOINED.HBA_110_190.delay.X = 1.610935e-05
-PIC.Core.CS026HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.610934e-05
+PIC.Core.CS026HBA.HBA_JOINED.HBA_110_190.delay.X = 1.611022e-05
+PIC.Core.CS026HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.611064e-05
PIC.Core.CS026HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS026HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS026HBA.HBA_JOINED.HBA_170_230.delay.X = 1.610935e-05
-PIC.Core.CS026HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.610934e-05
+PIC.Core.CS026HBA.HBA_JOINED.HBA_170_230.delay.X = 1.611022e-05
+PIC.Core.CS026HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.611064e-05
PIC.Core.CS026HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS026HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS026HBA.HBA_JOINED.HBA_210_250.delay.X = 1.610935e-05
-PIC.Core.CS026HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.610934e-05
-PIC.Core.CS026LBA.LBA_INNER.LBA_10_70.phase0.X = -1.380000e-01
-PIC.Core.CS026LBA.LBA_INNER.LBA_10_70.phase0.Y = -3.450000e-02
-PIC.Core.CS026LBA.LBA_INNER.LBA_10_70.delay.X = 1.611422e-05
-PIC.Core.CS026LBA.LBA_INNER.LBA_10_70.delay.Y = 1.611493e-05
-PIC.Core.CS026LBA.LBA_INNER.LBA_10_90.phase0.X = -1.380000e-01
-PIC.Core.CS026LBA.LBA_INNER.LBA_10_90.phase0.Y = -3.450000e-02
-PIC.Core.CS026LBA.LBA_INNER.LBA_10_90.delay.X = 1.611422e-05
-PIC.Core.CS026LBA.LBA_INNER.LBA_10_90.delay.Y = 1.611493e-05
-PIC.Core.CS026LBA.LBA_INNER.LBA_30_70.phase0.X = -1.380000e-01
-PIC.Core.CS026LBA.LBA_INNER.LBA_30_70.phase0.Y = -3.450000e-02
-PIC.Core.CS026LBA.LBA_INNER.LBA_30_70.delay.X = 1.611422e-05
-PIC.Core.CS026LBA.LBA_INNER.LBA_30_70.delay.Y = 1.611493e-05
-PIC.Core.CS026LBA.LBA_INNER.LBA_30_90.phase0.X = -1.380000e-01
-PIC.Core.CS026LBA.LBA_INNER.LBA_30_90.phase0.Y = -3.450000e-02
-PIC.Core.CS026LBA.LBA_INNER.LBA_30_90.delay.X = 1.611422e-05
-PIC.Core.CS026LBA.LBA_INNER.LBA_30_90.delay.Y = 1.611493e-05
-PIC.Core.CS026LBA.LBA_OUTER.LBA_10_70.phase0.X = -2.230000e-01
-PIC.Core.CS026LBA.LBA_OUTER.LBA_10_70.phase0.Y = -2.405000e-01
-PIC.Core.CS026LBA.LBA_OUTER.LBA_10_70.delay.X = 1.611543e-05
-PIC.Core.CS026LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.611498e-05
-PIC.Core.CS026LBA.LBA_OUTER.LBA_10_90.phase0.X = -2.230000e-01
-PIC.Core.CS026LBA.LBA_OUTER.LBA_10_90.phase0.Y = -2.405000e-01
-PIC.Core.CS026LBA.LBA_OUTER.LBA_10_90.delay.X = 1.611543e-05
-PIC.Core.CS026LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.611498e-05
-PIC.Core.CS026LBA.LBA_OUTER.LBA_30_70.phase0.X = -2.230000e-01
-PIC.Core.CS026LBA.LBA_OUTER.LBA_30_70.phase0.Y = -2.405000e-01
-PIC.Core.CS026LBA.LBA_OUTER.LBA_30_70.delay.X = 1.611543e-05
-PIC.Core.CS026LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.611498e-05
-PIC.Core.CS026LBA.LBA_OUTER.LBA_30_90.phase0.X = -2.230000e-01
-PIC.Core.CS026LBA.LBA_OUTER.LBA_30_90.phase0.Y = -2.405000e-01
-PIC.Core.CS026LBA.LBA_OUTER.LBA_30_90.delay.X = 1.611543e-05
-PIC.Core.CS026LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.611498e-05
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_110_190.phase0.X = 2.288367e-01
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 1.208559e-01
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.685920e-05
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.685955e-05
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_170_230.phase0.X = 2.288367e-01
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 1.208559e-01
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.685920e-05
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.685955e-05
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_210_250.phase0.X = 2.288367e-01
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 1.208559e-01
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.685920e-05
-PIC.Core.CS028HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.685955e-05
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 2.288367e-01
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 1.208559e-01
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.685920e-05
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.685955e-05
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 2.288367e-01
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 1.208559e-01
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.685920e-05
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.685955e-05
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 2.288367e-01
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 1.208559e-01
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.685920e-05
-PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.685955e-05
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_110_190.phase0.X = 2.288367e-01
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 1.208559e-01
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.685920e-05
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.685955e-05
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_170_230.phase0.X = 2.288367e-01
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 1.208559e-01
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.685920e-05
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.685955e-05
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_210_250.phase0.X = 2.288367e-01
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 1.208559e-01
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.685920e-05
-PIC.Core.CS028HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.685955e-05
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_110_190.phase0.X = -8.222739e-02
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -3.313507e-01
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.685911e-05
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.685947e-05
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_170_230.phase0.X = -8.222739e-02
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -3.313507e-01
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.685911e-05
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.685947e-05
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_210_250.phase0.X = -8.222739e-02
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -3.313507e-01
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.685911e-05
-PIC.Core.CS028HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.685947e-05
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -8.222739e-02
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -3.313507e-01
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.685911e-05
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.685947e-05
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -8.222739e-02
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -3.313507e-01
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.685911e-05
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.685947e-05
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -8.222739e-02
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -3.313507e-01
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.685911e-05
-PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.685947e-05
-PIC.Core.CS028HBA1.HBA_ONE.HBA_110_190.phase0.X = -8.222739e-02
-PIC.Core.CS028HBA1.HBA_ONE.HBA_110_190.phase0.Y = -3.313507e-01
-PIC.Core.CS028HBA1.HBA_ONE.HBA_110_190.delay.X = 1.685911e-05
-PIC.Core.CS028HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.685947e-05
-PIC.Core.CS028HBA1.HBA_ONE.HBA_170_230.phase0.X = -8.222739e-02
-PIC.Core.CS028HBA1.HBA_ONE.HBA_170_230.phase0.Y = -3.313507e-01
-PIC.Core.CS028HBA1.HBA_ONE.HBA_170_230.delay.X = 1.685911e-05
-PIC.Core.CS028HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.685947e-05
-PIC.Core.CS028HBA1.HBA_ONE.HBA_210_250.phase0.X = -8.222739e-02
-PIC.Core.CS028HBA1.HBA_ONE.HBA_210_250.phase0.Y = -3.313507e-01
-PIC.Core.CS028HBA1.HBA_ONE.HBA_210_250.delay.X = 1.685911e-05
-PIC.Core.CS028HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.685947e-05
+PIC.Core.CS026HBA.HBA_JOINED.HBA_210_250.delay.X = 1.611022e-05
+PIC.Core.CS026HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.611064e-05
+PIC.Core.CS028LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS028LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS028LBA.LBA_INNER.LBA_10_70.delay.X = 1.685917e-05
+PIC.Core.CS028LBA.LBA_INNER.LBA_10_70.delay.Y = 1.686041e-05
+PIC.Core.CS028LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS028LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS028LBA.LBA_INNER.LBA_30_70.delay.X = 1.685917e-05
+PIC.Core.CS028LBA.LBA_INNER.LBA_30_70.delay.Y = 1.686041e-05
+PIC.Core.CS028LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS028LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS028LBA.LBA_INNER.LBA_10_90.delay.X = 1.685917e-05
+PIC.Core.CS028LBA.LBA_INNER.LBA_10_90.delay.Y = 1.686041e-05
+PIC.Core.CS028LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS028LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS028LBA.LBA_INNER.LBA_30_90.delay.X = 1.685917e-05
+PIC.Core.CS028LBA.LBA_INNER.LBA_30_90.delay.Y = 1.686041e-05
+PIC.Core.CS028LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS028LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS028LBA.LBA_OUTER.LBA_10_70.delay.X = 1.685917e-05
+PIC.Core.CS028LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.686041e-05
+PIC.Core.CS028LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS028LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS028LBA.LBA_OUTER.LBA_30_70.delay.X = 1.685917e-05
+PIC.Core.CS028LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.686041e-05
+PIC.Core.CS028LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS028LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS028LBA.LBA_OUTER.LBA_10_90.delay.X = 1.685917e-05
+PIC.Core.CS028LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.686041e-05
+PIC.Core.CS028LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS028LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS028LBA.LBA_OUTER.LBA_30_90.delay.X = 1.685917e-05
+PIC.Core.CS028LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.686041e-05
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.685917e-05
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.686043e-05
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.685917e-05
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.686043e-05
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.685917e-05
+PIC.Core.CS028HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.686043e-05
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.685917e-05
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.686043e-05
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.685917e-05
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.686043e-05
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.685917e-05
+PIC.Core.CS028HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.686043e-05
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.685917e-05
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.686043e-05
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.685917e-05
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.686043e-05
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.685917e-05
+PIC.Core.CS028HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.686043e-05
+PIC.Core.CS028HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_ONE.HBA_110_190.delay.X = 1.685917e-05
+PIC.Core.CS028HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.686040e-05
+PIC.Core.CS028HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_ONE.HBA_170_230.delay.X = 1.685917e-05
+PIC.Core.CS028HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.686040e-05
+PIC.Core.CS028HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_ONE.HBA_210_250.delay.X = 1.685917e-05
+PIC.Core.CS028HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.686040e-05
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.685917e-05
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.686040e-05
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.685917e-05
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.686040e-05
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.685917e-05
+PIC.Core.CS028HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.686040e-05
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.685917e-05
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.686040e-05
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.685917e-05
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.686040e-05
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.685917e-05
+PIC.Core.CS028HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.686040e-05
PIC.Core.CS028HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS028HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS028HBA.HBA_JOINED.HBA_110_190.delay.X = 1.685864e-05
-PIC.Core.CS028HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.685901e-05
+PIC.Core.CS028HBA.HBA_JOINED.HBA_110_190.delay.X = 1.685917e-05
+PIC.Core.CS028HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.686041e-05
PIC.Core.CS028HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS028HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS028HBA.HBA_JOINED.HBA_170_230.delay.X = 1.685864e-05
-PIC.Core.CS028HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.685901e-05
+PIC.Core.CS028HBA.HBA_JOINED.HBA_170_230.delay.X = 1.685917e-05
+PIC.Core.CS028HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.686041e-05
PIC.Core.CS028HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS028HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS028HBA.HBA_JOINED.HBA_210_250.delay.X = 1.685864e-05
-PIC.Core.CS028HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.685901e-05
-PIC.Core.CS028LBA.LBA_INNER.LBA_10_70.phase0.X = -1.250000e-01
-PIC.Core.CS028LBA.LBA_INNER.LBA_10_70.phase0.Y = 7.000000e-02
-PIC.Core.CS028LBA.LBA_INNER.LBA_10_70.delay.X = 1.686534e-05
-PIC.Core.CS028LBA.LBA_INNER.LBA_10_70.delay.Y = 1.686538e-05
-PIC.Core.CS028LBA.LBA_INNER.LBA_10_90.phase0.X = -1.250000e-01
-PIC.Core.CS028LBA.LBA_INNER.LBA_10_90.phase0.Y = 7.000000e-02
-PIC.Core.CS028LBA.LBA_INNER.LBA_10_90.delay.X = 1.686534e-05
-PIC.Core.CS028LBA.LBA_INNER.LBA_10_90.delay.Y = 1.686538e-05
-PIC.Core.CS028LBA.LBA_INNER.LBA_30_70.phase0.X = -1.250000e-01
-PIC.Core.CS028LBA.LBA_INNER.LBA_30_70.phase0.Y = 7.000000e-02
-PIC.Core.CS028LBA.LBA_INNER.LBA_30_70.delay.X = 1.686534e-05
-PIC.Core.CS028LBA.LBA_INNER.LBA_30_70.delay.Y = 1.686538e-05
-PIC.Core.CS028LBA.LBA_INNER.LBA_30_90.phase0.X = -1.250000e-01
-PIC.Core.CS028LBA.LBA_INNER.LBA_30_90.phase0.Y = 7.000000e-02
-PIC.Core.CS028LBA.LBA_INNER.LBA_30_90.delay.X = 1.686534e-05
-PIC.Core.CS028LBA.LBA_INNER.LBA_30_90.delay.Y = 1.686538e-05
-PIC.Core.CS028LBA.LBA_OUTER.LBA_10_70.phase0.X = -3.675000e-01
-PIC.Core.CS028LBA.LBA_OUTER.LBA_10_70.phase0.Y = -2.655000e-01
-PIC.Core.CS028LBA.LBA_OUTER.LBA_10_70.delay.X = 1.686380e-05
-PIC.Core.CS028LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.686330e-05
-PIC.Core.CS028LBA.LBA_OUTER.LBA_10_90.phase0.X = -3.675000e-01
-PIC.Core.CS028LBA.LBA_OUTER.LBA_10_90.phase0.Y = -2.655000e-01
-PIC.Core.CS028LBA.LBA_OUTER.LBA_10_90.delay.X = 1.686380e-05
-PIC.Core.CS028LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.686330e-05
-PIC.Core.CS028LBA.LBA_OUTER.LBA_30_70.phase0.X = -3.675000e-01
-PIC.Core.CS028LBA.LBA_OUTER.LBA_30_70.phase0.Y = -2.655000e-01
-PIC.Core.CS028LBA.LBA_OUTER.LBA_30_70.delay.X = 1.686380e-05
-PIC.Core.CS028LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.686330e-05
-PIC.Core.CS028LBA.LBA_OUTER.LBA_30_90.phase0.X = -3.675000e-01
-PIC.Core.CS028LBA.LBA_OUTER.LBA_30_90.phase0.Y = -2.655000e-01
-PIC.Core.CS028LBA.LBA_OUTER.LBA_30_90.delay.X = 1.686380e-05
-PIC.Core.CS028LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.686330e-05
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_110_190.phase0.X = -7.309020e-01
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -4.425193e-01
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_110_190.delay.X = 9.626132e-06
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_110_190.delay.Y = 9.626357e-06
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_170_230.phase0.X = -7.309020e-01
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -4.425193e-01
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_170_230.delay.X = 9.626132e-06
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_170_230.delay.Y = 9.626357e-06
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_210_250.phase0.X = -7.309020e-01
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -4.425193e-01
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_210_250.delay.X = 9.626132e-06
-PIC.Core.CS030HBA0.HBA_DUAL.HBA_210_250.delay.Y = 9.626357e-06
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -7.309020e-01
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -4.425193e-01
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 9.626132e-06
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 9.626357e-06
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -7.309020e-01
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -4.425193e-01
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 9.626132e-06
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 9.626357e-06
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -7.309020e-01
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -4.425193e-01
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 9.626132e-06
-PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 9.626357e-06
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_110_190.phase0.X = -7.309020e-01
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -4.425193e-01
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_110_190.delay.X = 9.626132e-06
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_110_190.delay.Y = 9.626357e-06
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_170_230.phase0.X = -7.309020e-01
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -4.425193e-01
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_170_230.delay.X = 9.626132e-06
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_170_230.delay.Y = 9.626357e-06
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_210_250.phase0.X = -7.309020e-01
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -4.425193e-01
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_210_250.delay.X = 9.626132e-06
-PIC.Core.CS030HBA0.HBA_ZERO.HBA_210_250.delay.Y = 9.626357e-06
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_110_190.phase0.X = -1.180985e-01
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -1.228407e-01
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_110_190.delay.X = 9.625667e-06
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_110_190.delay.Y = 9.625937e-06
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_170_230.phase0.X = -1.180985e-01
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -1.228407e-01
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_170_230.delay.X = 9.625667e-06
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_170_230.delay.Y = 9.625937e-06
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_210_250.phase0.X = -1.180985e-01
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -1.228407e-01
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_210_250.delay.X = 9.625667e-06
-PIC.Core.CS030HBA1.HBA_DUAL.HBA_210_250.delay.Y = 9.625937e-06
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -1.180985e-01
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -1.228407e-01
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 9.625667e-06
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 9.625937e-06
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -1.180985e-01
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -1.228407e-01
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 9.625667e-06
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 9.625937e-06
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -1.180985e-01
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -1.228407e-01
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 9.625667e-06
-PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 9.625937e-06
-PIC.Core.CS030HBA1.HBA_ONE.HBA_110_190.phase0.X = -1.180985e-01
-PIC.Core.CS030HBA1.HBA_ONE.HBA_110_190.phase0.Y = -1.228407e-01
-PIC.Core.CS030HBA1.HBA_ONE.HBA_110_190.delay.X = 9.625667e-06
-PIC.Core.CS030HBA1.HBA_ONE.HBA_110_190.delay.Y = 9.625937e-06
-PIC.Core.CS030HBA1.HBA_ONE.HBA_170_230.phase0.X = -1.180985e-01
-PIC.Core.CS030HBA1.HBA_ONE.HBA_170_230.phase0.Y = -1.228407e-01
-PIC.Core.CS030HBA1.HBA_ONE.HBA_170_230.delay.X = 9.625667e-06
-PIC.Core.CS030HBA1.HBA_ONE.HBA_170_230.delay.Y = 9.625937e-06
-PIC.Core.CS030HBA1.HBA_ONE.HBA_210_250.phase0.X = -1.180985e-01
-PIC.Core.CS030HBA1.HBA_ONE.HBA_210_250.phase0.Y = -1.228407e-01
-PIC.Core.CS030HBA1.HBA_ONE.HBA_210_250.delay.X = 9.625667e-06
-PIC.Core.CS030HBA1.HBA_ONE.HBA_210_250.delay.Y = 9.625937e-06
+PIC.Core.CS028HBA.HBA_JOINED.HBA_210_250.delay.X = 1.685917e-05
+PIC.Core.CS028HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.686041e-05
+PIC.Core.CS030LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS030LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS030LBA.LBA_INNER.LBA_10_70.delay.X = 9.625541e-06
+PIC.Core.CS030LBA.LBA_INNER.LBA_10_70.delay.Y = 9.625413e-06
+PIC.Core.CS030LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS030LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS030LBA.LBA_INNER.LBA_30_70.delay.X = 9.625541e-06
+PIC.Core.CS030LBA.LBA_INNER.LBA_30_70.delay.Y = 9.625413e-06
+PIC.Core.CS030LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS030LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS030LBA.LBA_INNER.LBA_10_90.delay.X = 9.625541e-06
+PIC.Core.CS030LBA.LBA_INNER.LBA_10_90.delay.Y = 9.625413e-06
+PIC.Core.CS030LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS030LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS030LBA.LBA_INNER.LBA_30_90.delay.X = 9.625541e-06
+PIC.Core.CS030LBA.LBA_INNER.LBA_30_90.delay.Y = 9.625413e-06
+PIC.Core.CS030LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS030LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS030LBA.LBA_OUTER.LBA_10_70.delay.X = 9.625541e-06
+PIC.Core.CS030LBA.LBA_OUTER.LBA_10_70.delay.Y = 9.625413e-06
+PIC.Core.CS030LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS030LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS030LBA.LBA_OUTER.LBA_30_70.delay.X = 9.625541e-06
+PIC.Core.CS030LBA.LBA_OUTER.LBA_30_70.delay.Y = 9.625413e-06
+PIC.Core.CS030LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS030LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS030LBA.LBA_OUTER.LBA_10_90.delay.X = 9.625541e-06
+PIC.Core.CS030LBA.LBA_OUTER.LBA_10_90.delay.Y = 9.625413e-06
+PIC.Core.CS030LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS030LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS030LBA.LBA_OUTER.LBA_30_90.delay.X = 9.625541e-06
+PIC.Core.CS030LBA.LBA_OUTER.LBA_30_90.delay.Y = 9.625413e-06
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_110_190.delay.X = 9.625532e-06
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_110_190.delay.Y = 9.625262e-06
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_170_230.delay.X = 9.625532e-06
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_170_230.delay.Y = 9.625262e-06
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_210_250.delay.X = 9.625532e-06
+PIC.Core.CS030HBA0.HBA_ZERO.HBA_210_250.delay.Y = 9.625262e-06
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_110_190.delay.X = 9.625532e-06
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_110_190.delay.Y = 9.625262e-06
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_170_230.delay.X = 9.625532e-06
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_170_230.delay.Y = 9.625262e-06
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_210_250.delay.X = 9.625532e-06
+PIC.Core.CS030HBA0.HBA_DUAL.HBA_210_250.delay.Y = 9.625262e-06
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 9.625532e-06
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 9.625262e-06
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 9.625532e-06
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 9.625262e-06
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 9.625532e-06
+PIC.Core.CS030HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 9.625262e-06
+PIC.Core.CS030HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_ONE.HBA_110_190.delay.X = 9.625551e-06
+PIC.Core.CS030HBA1.HBA_ONE.HBA_110_190.delay.Y = 9.625565e-06
+PIC.Core.CS030HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_ONE.HBA_170_230.delay.X = 9.625551e-06
+PIC.Core.CS030HBA1.HBA_ONE.HBA_170_230.delay.Y = 9.625565e-06
+PIC.Core.CS030HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_ONE.HBA_210_250.delay.X = 9.625551e-06
+PIC.Core.CS030HBA1.HBA_ONE.HBA_210_250.delay.Y = 9.625565e-06
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_110_190.delay.X = 9.625551e-06
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_110_190.delay.Y = 9.625565e-06
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_170_230.delay.X = 9.625551e-06
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_170_230.delay.Y = 9.625565e-06
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_210_250.delay.X = 9.625551e-06
+PIC.Core.CS030HBA1.HBA_DUAL.HBA_210_250.delay.Y = 9.625565e-06
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 9.625551e-06
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 9.625565e-06
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 9.625551e-06
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 9.625565e-06
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 9.625551e-06
+PIC.Core.CS030HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 9.625565e-06
PIC.Core.CS030HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS030HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS030HBA.HBA_JOINED.HBA_110_190.delay.X = 9.625186e-06
-PIC.Core.CS030HBA.HBA_JOINED.HBA_110_190.delay.Y = 9.625385e-06
+PIC.Core.CS030HBA.HBA_JOINED.HBA_110_190.delay.X = 9.625541e-06
+PIC.Core.CS030HBA.HBA_JOINED.HBA_110_190.delay.Y = 9.625413e-06
PIC.Core.CS030HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS030HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS030HBA.HBA_JOINED.HBA_170_230.delay.X = 9.625186e-06
-PIC.Core.CS030HBA.HBA_JOINED.HBA_170_230.delay.Y = 9.625385e-06
+PIC.Core.CS030HBA.HBA_JOINED.HBA_170_230.delay.X = 9.625541e-06
+PIC.Core.CS030HBA.HBA_JOINED.HBA_170_230.delay.Y = 9.625413e-06
PIC.Core.CS030HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS030HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS030HBA.HBA_JOINED.HBA_210_250.delay.X = 9.625186e-06
-PIC.Core.CS030HBA.HBA_JOINED.HBA_210_250.delay.Y = 9.625385e-06
-PIC.Core.CS030LBA.LBA_INNER.LBA_10_70.phase0.X = -2.335000e-01
-PIC.Core.CS030LBA.LBA_INNER.LBA_10_70.phase0.Y = -2.520000e-01
-PIC.Core.CS030LBA.LBA_INNER.LBA_10_70.delay.X = 9.622241e-06
-PIC.Core.CS030LBA.LBA_INNER.LBA_10_70.delay.Y = 9.621938e-06
-PIC.Core.CS030LBA.LBA_INNER.LBA_10_90.phase0.X = -2.335000e-01
-PIC.Core.CS030LBA.LBA_INNER.LBA_10_90.phase0.Y = -2.520000e-01
-PIC.Core.CS030LBA.LBA_INNER.LBA_10_90.delay.X = 9.622241e-06
-PIC.Core.CS030LBA.LBA_INNER.LBA_10_90.delay.Y = 9.621938e-06
-PIC.Core.CS030LBA.LBA_INNER.LBA_30_70.phase0.X = -2.335000e-01
-PIC.Core.CS030LBA.LBA_INNER.LBA_30_70.phase0.Y = -2.520000e-01
-PIC.Core.CS030LBA.LBA_INNER.LBA_30_70.delay.X = 9.622241e-06
-PIC.Core.CS030LBA.LBA_INNER.LBA_30_70.delay.Y = 9.621938e-06
-PIC.Core.CS030LBA.LBA_INNER.LBA_30_90.phase0.X = -2.335000e-01
-PIC.Core.CS030LBA.LBA_INNER.LBA_30_90.phase0.Y = -2.520000e-01
-PIC.Core.CS030LBA.LBA_INNER.LBA_30_90.delay.X = 9.622241e-06
-PIC.Core.CS030LBA.LBA_INNER.LBA_30_90.delay.Y = 9.621938e-06
-PIC.Core.CS030LBA.LBA_OUTER.LBA_10_70.phase0.X = 2.225000e-01
-PIC.Core.CS030LBA.LBA_OUTER.LBA_10_70.phase0.Y = 2.170000e-01
-PIC.Core.CS030LBA.LBA_OUTER.LBA_10_70.delay.X = 9.621926e-06
-PIC.Core.CS030LBA.LBA_OUTER.LBA_10_70.delay.Y = 9.622283e-06
-PIC.Core.CS030LBA.LBA_OUTER.LBA_10_90.phase0.X = 2.225000e-01
-PIC.Core.CS030LBA.LBA_OUTER.LBA_10_90.phase0.Y = 2.170000e-01
-PIC.Core.CS030LBA.LBA_OUTER.LBA_10_90.delay.X = 9.621926e-06
-PIC.Core.CS030LBA.LBA_OUTER.LBA_10_90.delay.Y = 9.622283e-06
-PIC.Core.CS030LBA.LBA_OUTER.LBA_30_70.phase0.X = 2.225000e-01
-PIC.Core.CS030LBA.LBA_OUTER.LBA_30_70.phase0.Y = 2.170000e-01
-PIC.Core.CS030LBA.LBA_OUTER.LBA_30_70.delay.X = 9.621926e-06
-PIC.Core.CS030LBA.LBA_OUTER.LBA_30_70.delay.Y = 9.622283e-06
-PIC.Core.CS030LBA.LBA_OUTER.LBA_30_90.phase0.X = 2.225000e-01
-PIC.Core.CS030LBA.LBA_OUTER.LBA_30_90.phase0.Y = 2.170000e-01
-PIC.Core.CS030LBA.LBA_OUTER.LBA_30_90.delay.X = 9.621926e-06
-PIC.Core.CS030LBA.LBA_OUTER.LBA_30_90.delay.Y = 9.622283e-06
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_110_190.phase0.X = 2.505493e-01
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 5.343697e-02
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.267866e-06
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.267324e-06
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_170_230.phase0.X = 2.505493e-01
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 5.343697e-02
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.267866e-06
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.267324e-06
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_210_250.phase0.X = 2.505493e-01
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 5.343697e-02
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.267866e-06
-PIC.Core.CS031HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.267324e-06
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 2.505493e-01
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 5.343697e-02
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.267866e-06
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.267324e-06
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 2.505493e-01
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 5.343697e-02
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.267866e-06
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.267324e-06
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 2.505493e-01
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 5.343697e-02
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.267866e-06
-PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.267324e-06
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_110_190.phase0.X = 2.505493e-01
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 5.343697e-02
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.267866e-06
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.267324e-06
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_170_230.phase0.X = 2.505493e-01
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 5.343697e-02
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.267866e-06
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.267324e-06
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_210_250.phase0.X = 2.505493e-01
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 5.343697e-02
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.267866e-06
-PIC.Core.CS031HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.267324e-06
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_110_190.phase0.X = 8.267125e-01
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 1.985220e-01
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.267214e-06
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.266613e-06
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_170_230.phase0.X = 8.267125e-01
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 1.985220e-01
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.267214e-06
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.266613e-06
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_210_250.phase0.X = 8.267125e-01
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 1.985220e-01
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.267214e-06
-PIC.Core.CS031HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.266613e-06
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 8.267125e-01
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 1.985220e-01
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.267214e-06
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.266613e-06
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 8.267125e-01
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 1.985220e-01
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.267214e-06
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.266613e-06
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 8.267125e-01
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 1.985220e-01
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.267214e-06
-PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.266613e-06
-PIC.Core.CS031HBA1.HBA_ONE.HBA_110_190.phase0.X = 8.267125e-01
-PIC.Core.CS031HBA1.HBA_ONE.HBA_110_190.phase0.Y = 1.985220e-01
-PIC.Core.CS031HBA1.HBA_ONE.HBA_110_190.delay.X = 6.267214e-06
-PIC.Core.CS031HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.266613e-06
-PIC.Core.CS031HBA1.HBA_ONE.HBA_170_230.phase0.X = 8.267125e-01
-PIC.Core.CS031HBA1.HBA_ONE.HBA_170_230.phase0.Y = 1.985220e-01
-PIC.Core.CS031HBA1.HBA_ONE.HBA_170_230.delay.X = 6.267214e-06
-PIC.Core.CS031HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.266613e-06
-PIC.Core.CS031HBA1.HBA_ONE.HBA_210_250.phase0.X = 8.267125e-01
-PIC.Core.CS031HBA1.HBA_ONE.HBA_210_250.phase0.Y = 1.985220e-01
-PIC.Core.CS031HBA1.HBA_ONE.HBA_210_250.delay.X = 6.267214e-06
-PIC.Core.CS031HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.266613e-06
+PIC.Core.CS030HBA.HBA_JOINED.HBA_210_250.delay.X = 9.625541e-06
+PIC.Core.CS030HBA.HBA_JOINED.HBA_210_250.delay.Y = 9.625413e-06
+PIC.Core.CS031LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS031LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS031LBA.LBA_INNER.LBA_10_70.delay.X = 6.265210e-06
+PIC.Core.CS031LBA.LBA_INNER.LBA_10_70.delay.Y = 6.264419e-06
+PIC.Core.CS031LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS031LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS031LBA.LBA_INNER.LBA_30_70.delay.X = 6.265210e-06
+PIC.Core.CS031LBA.LBA_INNER.LBA_30_70.delay.Y = 6.264419e-06
+PIC.Core.CS031LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS031LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS031LBA.LBA_INNER.LBA_10_90.delay.X = 6.265210e-06
+PIC.Core.CS031LBA.LBA_INNER.LBA_10_90.delay.Y = 6.264419e-06
+PIC.Core.CS031LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS031LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS031LBA.LBA_INNER.LBA_30_90.delay.X = 6.265210e-06
+PIC.Core.CS031LBA.LBA_INNER.LBA_30_90.delay.Y = 6.264419e-06
+PIC.Core.CS031LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS031LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS031LBA.LBA_OUTER.LBA_10_70.delay.X = 6.265210e-06
+PIC.Core.CS031LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.264419e-06
+PIC.Core.CS031LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS031LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS031LBA.LBA_OUTER.LBA_30_70.delay.X = 6.265210e-06
+PIC.Core.CS031LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.264419e-06
+PIC.Core.CS031LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS031LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS031LBA.LBA_OUTER.LBA_10_90.delay.X = 6.265210e-06
+PIC.Core.CS031LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.264419e-06
+PIC.Core.CS031LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS031LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS031LBA.LBA_OUTER.LBA_30_90.delay.X = 6.265210e-06
+PIC.Core.CS031LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.264419e-06
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_110_190.delay.X = 6.265290e-06
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_110_190.delay.Y = 6.264480e-06
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_170_230.delay.X = 6.265290e-06
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_170_230.delay.Y = 6.264480e-06
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_210_250.delay.X = 6.265290e-06
+PIC.Core.CS031HBA0.HBA_ZERO.HBA_210_250.delay.Y = 6.264480e-06
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_110_190.delay.X = 6.265290e-06
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_110_190.delay.Y = 6.264480e-06
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_170_230.delay.X = 6.265290e-06
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_170_230.delay.Y = 6.264480e-06
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_210_250.delay.X = 6.265290e-06
+PIC.Core.CS031HBA0.HBA_DUAL.HBA_210_250.delay.Y = 6.264480e-06
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.265290e-06
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.264480e-06
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.265290e-06
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.264480e-06
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.265290e-06
+PIC.Core.CS031HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.264480e-06
+PIC.Core.CS031HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_ONE.HBA_110_190.delay.X = 6.265130e-06
+PIC.Core.CS031HBA1.HBA_ONE.HBA_110_190.delay.Y = 6.264357e-06
+PIC.Core.CS031HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_ONE.HBA_170_230.delay.X = 6.265130e-06
+PIC.Core.CS031HBA1.HBA_ONE.HBA_170_230.delay.Y = 6.264357e-06
+PIC.Core.CS031HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_ONE.HBA_210_250.delay.X = 6.265130e-06
+PIC.Core.CS031HBA1.HBA_ONE.HBA_210_250.delay.Y = 6.264357e-06
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_110_190.delay.X = 6.265130e-06
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_110_190.delay.Y = 6.264357e-06
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_170_230.delay.X = 6.265130e-06
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_170_230.delay.Y = 6.264357e-06
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_210_250.delay.X = 6.265130e-06
+PIC.Core.CS031HBA1.HBA_DUAL.HBA_210_250.delay.Y = 6.264357e-06
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 6.265130e-06
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 6.264357e-06
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 6.265130e-06
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 6.264357e-06
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 6.265130e-06
+PIC.Core.CS031HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 6.264357e-06
PIC.Core.CS031HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS031HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS031HBA.HBA_JOINED.HBA_110_190.delay.X = 6.265489e-06
-PIC.Core.CS031HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.264919e-06
+PIC.Core.CS031HBA.HBA_JOINED.HBA_110_190.delay.X = 6.265210e-06
+PIC.Core.CS031HBA.HBA_JOINED.HBA_110_190.delay.Y = 6.264419e-06
PIC.Core.CS031HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS031HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS031HBA.HBA_JOINED.HBA_170_230.delay.X = 6.265489e-06
-PIC.Core.CS031HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.264919e-06
+PIC.Core.CS031HBA.HBA_JOINED.HBA_170_230.delay.X = 6.265210e-06
+PIC.Core.CS031HBA.HBA_JOINED.HBA_170_230.delay.Y = 6.264419e-06
PIC.Core.CS031HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS031HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS031HBA.HBA_JOINED.HBA_210_250.delay.X = 6.265489e-06
-PIC.Core.CS031HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.264919e-06
-PIC.Core.CS031LBA.LBA_INNER.LBA_10_70.phase0.X = -4.205000e-01
-PIC.Core.CS031LBA.LBA_INNER.LBA_10_70.phase0.Y = -4.255000e-01
-PIC.Core.CS031LBA.LBA_INNER.LBA_10_70.delay.X = 6.273400e-06
-PIC.Core.CS031LBA.LBA_INNER.LBA_10_70.delay.Y = 6.273164e-06
-PIC.Core.CS031LBA.LBA_INNER.LBA_10_90.phase0.X = -4.205000e-01
-PIC.Core.CS031LBA.LBA_INNER.LBA_10_90.phase0.Y = -4.255000e-01
-PIC.Core.CS031LBA.LBA_INNER.LBA_10_90.delay.X = 6.273400e-06
-PIC.Core.CS031LBA.LBA_INNER.LBA_10_90.delay.Y = 6.273164e-06
-PIC.Core.CS031LBA.LBA_INNER.LBA_30_70.phase0.X = -4.205000e-01
-PIC.Core.CS031LBA.LBA_INNER.LBA_30_70.phase0.Y = -4.255000e-01
-PIC.Core.CS031LBA.LBA_INNER.LBA_30_70.delay.X = 6.273400e-06
-PIC.Core.CS031LBA.LBA_INNER.LBA_30_70.delay.Y = 6.273164e-06
-PIC.Core.CS031LBA.LBA_INNER.LBA_30_90.phase0.X = -4.205000e-01
-PIC.Core.CS031LBA.LBA_INNER.LBA_30_90.phase0.Y = -4.255000e-01
-PIC.Core.CS031LBA.LBA_INNER.LBA_30_90.delay.X = 6.273400e-06
-PIC.Core.CS031LBA.LBA_INNER.LBA_30_90.delay.Y = 6.273164e-06
-PIC.Core.CS031LBA.LBA_OUTER.LBA_10_70.phase0.X = 1.450000e-01
-PIC.Core.CS031LBA.LBA_OUTER.LBA_10_70.phase0.Y = 1.625000e-01
-PIC.Core.CS031LBA.LBA_OUTER.LBA_10_70.delay.X = 6.273150e-06
-PIC.Core.CS031LBA.LBA_OUTER.LBA_10_70.delay.Y = 6.272994e-06
-PIC.Core.CS031LBA.LBA_OUTER.LBA_10_90.phase0.X = 1.450000e-01
-PIC.Core.CS031LBA.LBA_OUTER.LBA_10_90.phase0.Y = 1.625000e-01
-PIC.Core.CS031LBA.LBA_OUTER.LBA_10_90.delay.X = 6.273150e-06
-PIC.Core.CS031LBA.LBA_OUTER.LBA_10_90.delay.Y = 6.272994e-06
-PIC.Core.CS031LBA.LBA_OUTER.LBA_30_70.phase0.X = 1.450000e-01
-PIC.Core.CS031LBA.LBA_OUTER.LBA_30_70.phase0.Y = 1.625000e-01
-PIC.Core.CS031LBA.LBA_OUTER.LBA_30_70.delay.X = 6.273150e-06
-PIC.Core.CS031LBA.LBA_OUTER.LBA_30_70.delay.Y = 6.272994e-06
-PIC.Core.CS031LBA.LBA_OUTER.LBA_30_90.phase0.X = 1.450000e-01
-PIC.Core.CS031LBA.LBA_OUTER.LBA_30_90.phase0.Y = 1.625000e-01
-PIC.Core.CS031LBA.LBA_OUTER.LBA_30_90.delay.X = 6.273150e-06
-PIC.Core.CS031LBA.LBA_OUTER.LBA_30_90.delay.Y = 6.272994e-06
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_110_190.phase0.X = 2.270297e-01
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 1.469542e-01
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_110_190.delay.X = 8.457750e-06
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_110_190.delay.Y = 8.457275e-06
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_170_230.phase0.X = 2.270297e-01
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 1.469542e-01
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_170_230.delay.X = 8.457750e-06
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_170_230.delay.Y = 8.457275e-06
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_210_250.phase0.X = 2.270297e-01
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 1.469542e-01
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_210_250.delay.X = 8.457750e-06
-PIC.Core.CS032HBA0.HBA_DUAL.HBA_210_250.delay.Y = 8.457275e-06
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 2.270297e-01
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 1.469542e-01
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 8.457750e-06
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 8.457275e-06
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 2.270297e-01
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 1.469542e-01
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 8.457750e-06
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 8.457275e-06
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 2.270297e-01
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 1.469542e-01
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 8.457750e-06
-PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 8.457275e-06
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_110_190.phase0.X = 2.270297e-01
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 1.469542e-01
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_110_190.delay.X = 8.457750e-06
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_110_190.delay.Y = 8.457275e-06
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_170_230.phase0.X = 2.270297e-01
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 1.469542e-01
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_170_230.delay.X = 8.457750e-06
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_170_230.delay.Y = 8.457275e-06
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_210_250.phase0.X = 2.270297e-01
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 1.469542e-01
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_210_250.delay.X = 8.457750e-06
-PIC.Core.CS032HBA0.HBA_ZERO.HBA_210_250.delay.Y = 8.457275e-06
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_110_190.phase0.X = -7.785203e-01
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -3.954846e-01
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_110_190.delay.X = 8.457315e-06
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_110_190.delay.Y = 8.456854e-06
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_170_230.phase0.X = -7.785203e-01
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -3.954846e-01
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_170_230.delay.X = 8.457315e-06
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_170_230.delay.Y = 8.456854e-06
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_210_250.phase0.X = -7.785203e-01
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -3.954846e-01
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_210_250.delay.X = 8.457315e-06
-PIC.Core.CS032HBA1.HBA_DUAL.HBA_210_250.delay.Y = 8.456854e-06
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -7.785203e-01
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -3.954846e-01
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 8.457315e-06
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 8.456854e-06
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -7.785203e-01
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -3.954846e-01
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 8.457315e-06
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 8.456854e-06
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -7.785203e-01
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -3.954846e-01
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 8.457315e-06
-PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 8.456854e-06
-PIC.Core.CS032HBA1.HBA_ONE.HBA_110_190.phase0.X = -7.785203e-01
-PIC.Core.CS032HBA1.HBA_ONE.HBA_110_190.phase0.Y = -3.954846e-01
-PIC.Core.CS032HBA1.HBA_ONE.HBA_110_190.delay.X = 8.457315e-06
-PIC.Core.CS032HBA1.HBA_ONE.HBA_110_190.delay.Y = 8.456854e-06
-PIC.Core.CS032HBA1.HBA_ONE.HBA_170_230.phase0.X = -7.785203e-01
-PIC.Core.CS032HBA1.HBA_ONE.HBA_170_230.phase0.Y = -3.954846e-01
-PIC.Core.CS032HBA1.HBA_ONE.HBA_170_230.delay.X = 8.457315e-06
-PIC.Core.CS032HBA1.HBA_ONE.HBA_170_230.delay.Y = 8.456854e-06
-PIC.Core.CS032HBA1.HBA_ONE.HBA_210_250.phase0.X = -7.785203e-01
-PIC.Core.CS032HBA1.HBA_ONE.HBA_210_250.phase0.Y = -3.954846e-01
-PIC.Core.CS032HBA1.HBA_ONE.HBA_210_250.delay.X = 8.457315e-06
-PIC.Core.CS032HBA1.HBA_ONE.HBA_210_250.delay.Y = 8.456854e-06
+PIC.Core.CS031HBA.HBA_JOINED.HBA_210_250.delay.X = 6.265210e-06
+PIC.Core.CS031HBA.HBA_JOINED.HBA_210_250.delay.Y = 6.264419e-06
+PIC.Core.CS032LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS032LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS032LBA.LBA_INNER.LBA_10_70.delay.X = 8.456112e-06
+PIC.Core.CS032LBA.LBA_INNER.LBA_10_70.delay.Y = 8.456084e-06
+PIC.Core.CS032LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS032LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS032LBA.LBA_INNER.LBA_30_70.delay.X = 8.456112e-06
+PIC.Core.CS032LBA.LBA_INNER.LBA_30_70.delay.Y = 8.456084e-06
+PIC.Core.CS032LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS032LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS032LBA.LBA_INNER.LBA_10_90.delay.X = 8.456112e-06
+PIC.Core.CS032LBA.LBA_INNER.LBA_10_90.delay.Y = 8.456084e-06
+PIC.Core.CS032LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS032LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS032LBA.LBA_INNER.LBA_30_90.delay.X = 8.456112e-06
+PIC.Core.CS032LBA.LBA_INNER.LBA_30_90.delay.Y = 8.456084e-06
+PIC.Core.CS032LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS032LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS032LBA.LBA_OUTER.LBA_10_70.delay.X = 8.456112e-06
+PIC.Core.CS032LBA.LBA_OUTER.LBA_10_70.delay.Y = 8.456084e-06
+PIC.Core.CS032LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS032LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS032LBA.LBA_OUTER.LBA_30_70.delay.X = 8.456112e-06
+PIC.Core.CS032LBA.LBA_OUTER.LBA_30_70.delay.Y = 8.456084e-06
+PIC.Core.CS032LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS032LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS032LBA.LBA_OUTER.LBA_10_90.delay.X = 8.456112e-06
+PIC.Core.CS032LBA.LBA_OUTER.LBA_10_90.delay.Y = 8.456084e-06
+PIC.Core.CS032LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS032LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS032LBA.LBA_OUTER.LBA_30_90.delay.X = 8.456112e-06
+PIC.Core.CS032LBA.LBA_OUTER.LBA_30_90.delay.Y = 8.456084e-06
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_110_190.delay.X = 8.456099e-06
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_110_190.delay.Y = 8.456126e-06
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_170_230.delay.X = 8.456099e-06
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_170_230.delay.Y = 8.456126e-06
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_210_250.delay.X = 8.456099e-06
+PIC.Core.CS032HBA0.HBA_ZERO.HBA_210_250.delay.Y = 8.456126e-06
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_110_190.delay.X = 8.456099e-06
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_110_190.delay.Y = 8.456126e-06
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_170_230.delay.X = 8.456099e-06
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_170_230.delay.Y = 8.456126e-06
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_210_250.delay.X = 8.456099e-06
+PIC.Core.CS032HBA0.HBA_DUAL.HBA_210_250.delay.Y = 8.456126e-06
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 8.456099e-06
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 8.456126e-06
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 8.456099e-06
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 8.456126e-06
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 8.456099e-06
+PIC.Core.CS032HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_ONE.HBA_110_190.delay.X = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_ONE.HBA_110_190.delay.Y = 8.456042e-06
+PIC.Core.CS032HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_ONE.HBA_170_230.delay.X = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_ONE.HBA_170_230.delay.Y = 8.456042e-06
+PIC.Core.CS032HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_ONE.HBA_210_250.delay.X = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_ONE.HBA_210_250.delay.Y = 8.456042e-06
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_110_190.delay.X = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_110_190.delay.Y = 8.456042e-06
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_170_230.delay.X = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_170_230.delay.Y = 8.456042e-06
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_210_250.delay.X = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_DUAL.HBA_210_250.delay.Y = 8.456042e-06
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 8.456042e-06
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 8.456042e-06
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 8.456126e-06
+PIC.Core.CS032HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 8.456042e-06
PIC.Core.CS032HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS032HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS032HBA.HBA_JOINED.HBA_110_190.delay.X = 8.456663e-06
-PIC.Core.CS032HBA.HBA_JOINED.HBA_110_190.delay.Y = 8.456229e-06
+PIC.Core.CS032HBA.HBA_JOINED.HBA_110_190.delay.X = 8.456112e-06
+PIC.Core.CS032HBA.HBA_JOINED.HBA_110_190.delay.Y = 8.456084e-06
PIC.Core.CS032HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS032HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS032HBA.HBA_JOINED.HBA_170_230.delay.X = 8.456663e-06
-PIC.Core.CS032HBA.HBA_JOINED.HBA_170_230.delay.Y = 8.456229e-06
+PIC.Core.CS032HBA.HBA_JOINED.HBA_170_230.delay.X = 8.456112e-06
+PIC.Core.CS032HBA.HBA_JOINED.HBA_170_230.delay.Y = 8.456084e-06
PIC.Core.CS032HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS032HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS032HBA.HBA_JOINED.HBA_210_250.delay.X = 8.456663e-06
-PIC.Core.CS032HBA.HBA_JOINED.HBA_210_250.delay.Y = 8.456229e-06
-PIC.Core.CS032LBA.LBA_INNER.LBA_10_70.phase0.X = 7.350000e-02
-PIC.Core.CS032LBA.LBA_INNER.LBA_10_70.phase0.Y = 4.840000e-01
-PIC.Core.CS032LBA.LBA_INNER.LBA_10_70.delay.X = 8.452892e-06
-PIC.Core.CS032LBA.LBA_INNER.LBA_10_70.delay.Y = 8.452489e-06
-PIC.Core.CS032LBA.LBA_INNER.LBA_10_90.phase0.X = 7.350000e-02
-PIC.Core.CS032LBA.LBA_INNER.LBA_10_90.phase0.Y = 4.840000e-01
-PIC.Core.CS032LBA.LBA_INNER.LBA_10_90.delay.X = 8.452892e-06
-PIC.Core.CS032LBA.LBA_INNER.LBA_10_90.delay.Y = 8.452489e-06
-PIC.Core.CS032LBA.LBA_INNER.LBA_30_70.phase0.X = 7.350000e-02
-PIC.Core.CS032LBA.LBA_INNER.LBA_30_70.phase0.Y = 4.840000e-01
-PIC.Core.CS032LBA.LBA_INNER.LBA_30_70.delay.X = 8.452892e-06
-PIC.Core.CS032LBA.LBA_INNER.LBA_30_70.delay.Y = 8.452489e-06
-PIC.Core.CS032LBA.LBA_INNER.LBA_30_90.phase0.X = 7.350000e-02
-PIC.Core.CS032LBA.LBA_INNER.LBA_30_90.phase0.Y = 4.840000e-01
-PIC.Core.CS032LBA.LBA_INNER.LBA_30_90.delay.X = 8.452892e-06
-PIC.Core.CS032LBA.LBA_INNER.LBA_30_90.delay.Y = 8.452489e-06
-PIC.Core.CS032LBA.LBA_OUTER.LBA_10_70.phase0.X = -1.370000e-01
-PIC.Core.CS032LBA.LBA_OUTER.LBA_10_70.phase0.Y = -1.735000e-01
-PIC.Core.CS032LBA.LBA_OUTER.LBA_10_70.delay.X = 8.453602e-06
-PIC.Core.CS032LBA.LBA_OUTER.LBA_10_70.delay.Y = 8.454259e-06
-PIC.Core.CS032LBA.LBA_OUTER.LBA_10_90.phase0.X = -1.370000e-01
-PIC.Core.CS032LBA.LBA_OUTER.LBA_10_90.phase0.Y = -1.735000e-01
-PIC.Core.CS032LBA.LBA_OUTER.LBA_10_90.delay.X = 8.453602e-06
-PIC.Core.CS032LBA.LBA_OUTER.LBA_10_90.delay.Y = 8.454259e-06
-PIC.Core.CS032LBA.LBA_OUTER.LBA_30_70.phase0.X = -1.370000e-01
-PIC.Core.CS032LBA.LBA_OUTER.LBA_30_70.phase0.Y = -1.735000e-01
-PIC.Core.CS032LBA.LBA_OUTER.LBA_30_70.delay.X = 8.453602e-06
-PIC.Core.CS032LBA.LBA_OUTER.LBA_30_70.delay.Y = 8.454259e-06
-PIC.Core.CS032LBA.LBA_OUTER.LBA_30_90.phase0.X = -1.370000e-01
-PIC.Core.CS032LBA.LBA_OUTER.LBA_30_90.phase0.Y = -1.735000e-01
-PIC.Core.CS032LBA.LBA_OUTER.LBA_30_90.delay.X = 8.453602e-06
-PIC.Core.CS032LBA.LBA_OUTER.LBA_30_90.delay.Y = 8.454259e-06
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_110_190.phase0.X = 4.936689e-01
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 5.780991e-01
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.505258e-05
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.505287e-05
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_170_230.phase0.X = 4.936689e-01
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 5.780991e-01
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.505258e-05
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.505287e-05
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_210_250.phase0.X = 4.936689e-01
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 5.780991e-01
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.505258e-05
-PIC.Core.CS101HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.505287e-05
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 4.936689e-01
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 5.780991e-01
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.505258e-05
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.505287e-05
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 4.936689e-01
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 5.780991e-01
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.505258e-05
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.505287e-05
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 4.936689e-01
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 5.780991e-01
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.505258e-05
-PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.505287e-05
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_110_190.phase0.X = 4.936689e-01
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 5.780991e-01
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.505258e-05
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.505287e-05
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_170_230.phase0.X = 4.936689e-01
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 5.780991e-01
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.505258e-05
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.505287e-05
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_210_250.phase0.X = 4.936689e-01
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 5.780991e-01
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.505258e-05
-PIC.Core.CS101HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.505287e-05
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_110_190.phase0.X = 5.302861e-01
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 2.015104e-01
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.505294e-05
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.505317e-05
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_170_230.phase0.X = 5.302861e-01
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 2.015104e-01
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.505294e-05
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.505317e-05
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_210_250.phase0.X = 5.302861e-01
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 2.015104e-01
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.505294e-05
-PIC.Core.CS101HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.505317e-05
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 5.302861e-01
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 2.015104e-01
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.505294e-05
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.505317e-05
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 5.302861e-01
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 2.015104e-01
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.505294e-05
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.505317e-05
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 5.302861e-01
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 2.015104e-01
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.505294e-05
-PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.505317e-05
-PIC.Core.CS101HBA1.HBA_ONE.HBA_110_190.phase0.X = 5.302861e-01
-PIC.Core.CS101HBA1.HBA_ONE.HBA_110_190.phase0.Y = 2.015104e-01
-PIC.Core.CS101HBA1.HBA_ONE.HBA_110_190.delay.X = 1.505294e-05
-PIC.Core.CS101HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.505317e-05
-PIC.Core.CS101HBA1.HBA_ONE.HBA_170_230.phase0.X = 5.302861e-01
-PIC.Core.CS101HBA1.HBA_ONE.HBA_170_230.phase0.Y = 2.015104e-01
-PIC.Core.CS101HBA1.HBA_ONE.HBA_170_230.delay.X = 1.505294e-05
-PIC.Core.CS101HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.505317e-05
-PIC.Core.CS101HBA1.HBA_ONE.HBA_210_250.phase0.X = 5.302861e-01
-PIC.Core.CS101HBA1.HBA_ONE.HBA_210_250.phase0.Y = 2.015104e-01
-PIC.Core.CS101HBA1.HBA_ONE.HBA_210_250.delay.X = 1.505294e-05
-PIC.Core.CS101HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.505317e-05
+PIC.Core.CS032HBA.HBA_JOINED.HBA_210_250.delay.X = 8.456112e-06
+PIC.Core.CS032HBA.HBA_JOINED.HBA_210_250.delay.Y = 8.456084e-06
+PIC.Core.CS101LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS101LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS101LBA.LBA_INNER.LBA_10_70.delay.X = 1.505483e-05
+PIC.Core.CS101LBA.LBA_INNER.LBA_10_70.delay.Y = 1.505451e-05
+PIC.Core.CS101LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS101LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS101LBA.LBA_INNER.LBA_30_70.delay.X = 1.505483e-05
+PIC.Core.CS101LBA.LBA_INNER.LBA_30_70.delay.Y = 1.505451e-05
+PIC.Core.CS101LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS101LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS101LBA.LBA_INNER.LBA_10_90.delay.X = 1.505483e-05
+PIC.Core.CS101LBA.LBA_INNER.LBA_10_90.delay.Y = 1.505451e-05
+PIC.Core.CS101LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS101LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS101LBA.LBA_INNER.LBA_30_90.delay.X = 1.505483e-05
+PIC.Core.CS101LBA.LBA_INNER.LBA_30_90.delay.Y = 1.505451e-05
+PIC.Core.CS101LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS101LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS101LBA.LBA_OUTER.LBA_10_70.delay.X = 1.505483e-05
+PIC.Core.CS101LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.505451e-05
+PIC.Core.CS101LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS101LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS101LBA.LBA_OUTER.LBA_30_70.delay.X = 1.505483e-05
+PIC.Core.CS101LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.505451e-05
+PIC.Core.CS101LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS101LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS101LBA.LBA_OUTER.LBA_10_90.delay.X = 1.505483e-05
+PIC.Core.CS101LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.505451e-05
+PIC.Core.CS101LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS101LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS101LBA.LBA_OUTER.LBA_30_90.delay.X = 1.505483e-05
+PIC.Core.CS101LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.505451e-05
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.505479e-05
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.505447e-05
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.505479e-05
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.505447e-05
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.505479e-05
+PIC.Core.CS101HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.505447e-05
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.505479e-05
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.505447e-05
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.505479e-05
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.505447e-05
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.505479e-05
+PIC.Core.CS101HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.505447e-05
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.505479e-05
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.505447e-05
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.505479e-05
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.505447e-05
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.505479e-05
+PIC.Core.CS101HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.505447e-05
+PIC.Core.CS101HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_ONE.HBA_110_190.delay.X = 1.505488e-05
+PIC.Core.CS101HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.505454e-05
+PIC.Core.CS101HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_ONE.HBA_170_230.delay.X = 1.505488e-05
+PIC.Core.CS101HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.505454e-05
+PIC.Core.CS101HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_ONE.HBA_210_250.delay.X = 1.505488e-05
+PIC.Core.CS101HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.505454e-05
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.505488e-05
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.505454e-05
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.505488e-05
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.505454e-05
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.505488e-05
+PIC.Core.CS101HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.505454e-05
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.505488e-05
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.505454e-05
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.505488e-05
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.505454e-05
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.505488e-05
+PIC.Core.CS101HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.505454e-05
PIC.Core.CS101HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS101HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS101HBA.HBA_JOINED.HBA_110_190.delay.X = 1.505272e-05
-PIC.Core.CS101HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.505296e-05
+PIC.Core.CS101HBA.HBA_JOINED.HBA_110_190.delay.X = 1.505483e-05
+PIC.Core.CS101HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.505451e-05
PIC.Core.CS101HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS101HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS101HBA.HBA_JOINED.HBA_170_230.delay.X = 1.505272e-05
-PIC.Core.CS101HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.505296e-05
+PIC.Core.CS101HBA.HBA_JOINED.HBA_170_230.delay.X = 1.505483e-05
+PIC.Core.CS101HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.505451e-05
PIC.Core.CS101HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS101HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS101HBA.HBA_JOINED.HBA_210_250.delay.X = 1.505272e-05
-PIC.Core.CS101HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.505296e-05
-PIC.Core.CS101LBA.LBA_INNER.LBA_10_70.phase0.X = -2.810000e-01
-PIC.Core.CS101LBA.LBA_INNER.LBA_10_70.phase0.Y = 1.265000e-01
-PIC.Core.CS101LBA.LBA_INNER.LBA_10_70.delay.X = 1.505404e-05
-PIC.Core.CS101LBA.LBA_INNER.LBA_10_70.delay.Y = 1.505303e-05
-PIC.Core.CS101LBA.LBA_INNER.LBA_10_90.phase0.X = -2.810000e-01
-PIC.Core.CS101LBA.LBA_INNER.LBA_10_90.phase0.Y = 1.265000e-01
-PIC.Core.CS101LBA.LBA_INNER.LBA_10_90.delay.X = 1.505404e-05
-PIC.Core.CS101LBA.LBA_INNER.LBA_10_90.delay.Y = 1.505303e-05
-PIC.Core.CS101LBA.LBA_INNER.LBA_30_70.phase0.X = -2.810000e-01
-PIC.Core.CS101LBA.LBA_INNER.LBA_30_70.phase0.Y = 1.265000e-01
-PIC.Core.CS101LBA.LBA_INNER.LBA_30_70.delay.X = 1.505404e-05
-PIC.Core.CS101LBA.LBA_INNER.LBA_30_70.delay.Y = 1.505303e-05
-PIC.Core.CS101LBA.LBA_INNER.LBA_30_90.phase0.X = -2.810000e-01
-PIC.Core.CS101LBA.LBA_INNER.LBA_30_90.phase0.Y = 1.265000e-01
-PIC.Core.CS101LBA.LBA_INNER.LBA_30_90.delay.X = 1.505404e-05
-PIC.Core.CS101LBA.LBA_INNER.LBA_30_90.delay.Y = 1.505303e-05
-PIC.Core.CS101LBA.LBA_OUTER.LBA_10_70.phase0.X = 1.450000e-02
-PIC.Core.CS101LBA.LBA_OUTER.LBA_10_70.phase0.Y = -5.000000e-02
-PIC.Core.CS101LBA.LBA_OUTER.LBA_10_70.delay.X = 1.505076e-05
-PIC.Core.CS101LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.505105e-05
-PIC.Core.CS101LBA.LBA_OUTER.LBA_10_90.phase0.X = 1.450000e-02
-PIC.Core.CS101LBA.LBA_OUTER.LBA_10_90.phase0.Y = -5.000000e-02
-PIC.Core.CS101LBA.LBA_OUTER.LBA_10_90.delay.X = 1.505076e-05
-PIC.Core.CS101LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.505105e-05
-PIC.Core.CS101LBA.LBA_OUTER.LBA_30_70.phase0.X = 1.450000e-02
-PIC.Core.CS101LBA.LBA_OUTER.LBA_30_70.phase0.Y = -5.000000e-02
-PIC.Core.CS101LBA.LBA_OUTER.LBA_30_70.delay.X = 1.505076e-05
-PIC.Core.CS101LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.505105e-05
-PIC.Core.CS101LBA.LBA_OUTER.LBA_30_90.phase0.X = 1.450000e-02
-PIC.Core.CS101LBA.LBA_OUTER.LBA_30_90.phase0.Y = -5.000000e-02
-PIC.Core.CS101LBA.LBA_OUTER.LBA_30_90.delay.X = 1.505076e-05
-PIC.Core.CS101LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.505105e-05
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_110_190.phase0.X = -1.244444e-01
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 2.512881e-01
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_110_190.delay.X = 3.540007e-05
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_110_190.delay.Y = 3.539982e-05
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_170_230.phase0.X = -1.244444e-01
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 2.512881e-01
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_170_230.delay.X = 3.540007e-05
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_170_230.delay.Y = 3.539982e-05
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_210_250.phase0.X = -1.244444e-01
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 2.512881e-01
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_210_250.delay.X = 3.540007e-05
-PIC.Core.CS103HBA0.HBA_DUAL.HBA_210_250.delay.Y = 3.539982e-05
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -1.244444e-01
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 2.512881e-01
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 3.540007e-05
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 3.539982e-05
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -1.244444e-01
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 2.512881e-01
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 3.540007e-05
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 3.539982e-05
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -1.244444e-01
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 2.512881e-01
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 3.540007e-05
-PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 3.539982e-05
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_110_190.phase0.X = -1.244444e-01
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 2.512881e-01
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_110_190.delay.X = 3.540007e-05
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_110_190.delay.Y = 3.539982e-05
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_170_230.phase0.X = -1.244444e-01
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 2.512881e-01
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_170_230.delay.X = 3.540007e-05
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_170_230.delay.Y = 3.539982e-05
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_210_250.phase0.X = -1.244444e-01
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 2.512881e-01
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_210_250.delay.X = 3.540007e-05
-PIC.Core.CS103HBA0.HBA_ZERO.HBA_210_250.delay.Y = 3.539982e-05
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_110_190.phase0.X = -5.758714e-02
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -1.382039e-01
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_110_190.delay.X = 3.539992e-05
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_110_190.delay.Y = 3.539958e-05
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_170_230.phase0.X = -5.758714e-02
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -1.382039e-01
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_170_230.delay.X = 3.539992e-05
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_170_230.delay.Y = 3.539958e-05
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_210_250.phase0.X = -5.758714e-02
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -1.382039e-01
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_210_250.delay.X = 3.539992e-05
-PIC.Core.CS103HBA1.HBA_DUAL.HBA_210_250.delay.Y = 3.539958e-05
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -5.758714e-02
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -1.382039e-01
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 3.539992e-05
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 3.539958e-05
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -5.758714e-02
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -1.382039e-01
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 3.539992e-05
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 3.539958e-05
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -5.758714e-02
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -1.382039e-01
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 3.539992e-05
-PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 3.539958e-05
-PIC.Core.CS103HBA1.HBA_ONE.HBA_110_190.phase0.X = -5.758714e-02
-PIC.Core.CS103HBA1.HBA_ONE.HBA_110_190.phase0.Y = -1.382039e-01
-PIC.Core.CS103HBA1.HBA_ONE.HBA_110_190.delay.X = 3.539992e-05
-PIC.Core.CS103HBA1.HBA_ONE.HBA_110_190.delay.Y = 3.539958e-05
-PIC.Core.CS103HBA1.HBA_ONE.HBA_170_230.phase0.X = -5.758714e-02
-PIC.Core.CS103HBA1.HBA_ONE.HBA_170_230.phase0.Y = -1.382039e-01
-PIC.Core.CS103HBA1.HBA_ONE.HBA_170_230.delay.X = 3.539992e-05
-PIC.Core.CS103HBA1.HBA_ONE.HBA_170_230.delay.Y = 3.539958e-05
-PIC.Core.CS103HBA1.HBA_ONE.HBA_210_250.phase0.X = -5.758714e-02
-PIC.Core.CS103HBA1.HBA_ONE.HBA_210_250.phase0.Y = -1.382039e-01
-PIC.Core.CS103HBA1.HBA_ONE.HBA_210_250.delay.X = 3.539992e-05
-PIC.Core.CS103HBA1.HBA_ONE.HBA_210_250.delay.Y = 3.539958e-05
+PIC.Core.CS101HBA.HBA_JOINED.HBA_210_250.delay.X = 1.505483e-05
+PIC.Core.CS101HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.505451e-05
+PIC.Core.CS103LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS103LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS103LBA.LBA_INNER.LBA_10_70.delay.X = 3.539926e-05
+PIC.Core.CS103LBA.LBA_INNER.LBA_10_70.delay.Y = 3.539874e-05
+PIC.Core.CS103LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS103LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS103LBA.LBA_INNER.LBA_30_70.delay.X = 3.539926e-05
+PIC.Core.CS103LBA.LBA_INNER.LBA_30_70.delay.Y = 3.539874e-05
+PIC.Core.CS103LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS103LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS103LBA.LBA_INNER.LBA_10_90.delay.X = 3.539926e-05
+PIC.Core.CS103LBA.LBA_INNER.LBA_10_90.delay.Y = 3.539874e-05
+PIC.Core.CS103LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS103LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS103LBA.LBA_INNER.LBA_30_90.delay.X = 3.539926e-05
+PIC.Core.CS103LBA.LBA_INNER.LBA_30_90.delay.Y = 3.539874e-05
+PIC.Core.CS103LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS103LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS103LBA.LBA_OUTER.LBA_10_70.delay.X = 3.539926e-05
+PIC.Core.CS103LBA.LBA_OUTER.LBA_10_70.delay.Y = 3.539874e-05
+PIC.Core.CS103LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS103LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS103LBA.LBA_OUTER.LBA_30_70.delay.X = 3.539926e-05
+PIC.Core.CS103LBA.LBA_OUTER.LBA_30_70.delay.Y = 3.539874e-05
+PIC.Core.CS103LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS103LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS103LBA.LBA_OUTER.LBA_10_90.delay.X = 3.539926e-05
+PIC.Core.CS103LBA.LBA_OUTER.LBA_10_90.delay.Y = 3.539874e-05
+PIC.Core.CS103LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS103LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS103LBA.LBA_OUTER.LBA_30_90.delay.X = 3.539926e-05
+PIC.Core.CS103LBA.LBA_OUTER.LBA_30_90.delay.Y = 3.539874e-05
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_110_190.delay.X = 3.539919e-05
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_110_190.delay.Y = 3.539868e-05
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_170_230.delay.X = 3.539919e-05
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_170_230.delay.Y = 3.539868e-05
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_210_250.delay.X = 3.539919e-05
+PIC.Core.CS103HBA0.HBA_ZERO.HBA_210_250.delay.Y = 3.539868e-05
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_110_190.delay.X = 3.539919e-05
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_110_190.delay.Y = 3.539868e-05
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_170_230.delay.X = 3.539919e-05
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_170_230.delay.Y = 3.539868e-05
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_210_250.delay.X = 3.539919e-05
+PIC.Core.CS103HBA0.HBA_DUAL.HBA_210_250.delay.Y = 3.539868e-05
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 3.539919e-05
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 3.539868e-05
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 3.539919e-05
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 3.539868e-05
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 3.539919e-05
+PIC.Core.CS103HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 3.539868e-05
+PIC.Core.CS103HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_ONE.HBA_110_190.delay.X = 3.539934e-05
+PIC.Core.CS103HBA1.HBA_ONE.HBA_110_190.delay.Y = 3.539880e-05
+PIC.Core.CS103HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_ONE.HBA_170_230.delay.X = 3.539934e-05
+PIC.Core.CS103HBA1.HBA_ONE.HBA_170_230.delay.Y = 3.539880e-05
+PIC.Core.CS103HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_ONE.HBA_210_250.delay.X = 3.539934e-05
+PIC.Core.CS103HBA1.HBA_ONE.HBA_210_250.delay.Y = 3.539880e-05
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_110_190.delay.X = 3.539934e-05
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_110_190.delay.Y = 3.539880e-05
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_170_230.delay.X = 3.539934e-05
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_170_230.delay.Y = 3.539880e-05
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_210_250.delay.X = 3.539934e-05
+PIC.Core.CS103HBA1.HBA_DUAL.HBA_210_250.delay.Y = 3.539880e-05
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 3.539934e-05
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 3.539880e-05
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 3.539934e-05
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 3.539880e-05
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 3.539934e-05
+PIC.Core.CS103HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 3.539880e-05
PIC.Core.CS103HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS103HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS103HBA.HBA_JOINED.HBA_110_190.delay.X = 3.540396e-05
-PIC.Core.CS103HBA.HBA_JOINED.HBA_110_190.delay.Y = 3.540363e-05
+PIC.Core.CS103HBA.HBA_JOINED.HBA_110_190.delay.X = 3.539926e-05
+PIC.Core.CS103HBA.HBA_JOINED.HBA_110_190.delay.Y = 3.539874e-05
PIC.Core.CS103HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS103HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS103HBA.HBA_JOINED.HBA_170_230.delay.X = 3.540396e-05
-PIC.Core.CS103HBA.HBA_JOINED.HBA_170_230.delay.Y = 3.540363e-05
+PIC.Core.CS103HBA.HBA_JOINED.HBA_170_230.delay.X = 3.539926e-05
+PIC.Core.CS103HBA.HBA_JOINED.HBA_170_230.delay.Y = 3.539874e-05
PIC.Core.CS103HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS103HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS103HBA.HBA_JOINED.HBA_210_250.delay.X = 3.540396e-05
-PIC.Core.CS103HBA.HBA_JOINED.HBA_210_250.delay.Y = 3.540363e-05
-PIC.Core.CS103LBA.LBA_INNER.LBA_10_70.phase0.X = 4.700000e-02
-PIC.Core.CS103LBA.LBA_INNER.LBA_10_70.phase0.Y = -5.100000e-02
-PIC.Core.CS103LBA.LBA_INNER.LBA_10_70.delay.X = 3.540199e-05
-PIC.Core.CS103LBA.LBA_INNER.LBA_10_70.delay.Y = 3.540251e-05
-PIC.Core.CS103LBA.LBA_INNER.LBA_10_90.phase0.X = 4.700000e-02
-PIC.Core.CS103LBA.LBA_INNER.LBA_10_90.phase0.Y = -5.100000e-02
-PIC.Core.CS103LBA.LBA_INNER.LBA_10_90.delay.X = 3.540199e-05
-PIC.Core.CS103LBA.LBA_INNER.LBA_10_90.delay.Y = 3.540251e-05
-PIC.Core.CS103LBA.LBA_INNER.LBA_30_70.phase0.X = 4.700000e-02
-PIC.Core.CS103LBA.LBA_INNER.LBA_30_70.phase0.Y = -5.100000e-02
-PIC.Core.CS103LBA.LBA_INNER.LBA_30_70.delay.X = 3.540199e-05
-PIC.Core.CS103LBA.LBA_INNER.LBA_30_70.delay.Y = 3.540251e-05
-PIC.Core.CS103LBA.LBA_INNER.LBA_30_90.phase0.X = 4.700000e-02
-PIC.Core.CS103LBA.LBA_INNER.LBA_30_90.phase0.Y = -5.100000e-02
-PIC.Core.CS103LBA.LBA_INNER.LBA_30_90.delay.X = 3.540199e-05
-PIC.Core.CS103LBA.LBA_INNER.LBA_30_90.delay.Y = 3.540251e-05
-PIC.Core.CS103LBA.LBA_OUTER.LBA_10_70.phase0.X = -2.690000e-01
-PIC.Core.CS103LBA.LBA_OUTER.LBA_10_70.phase0.Y = -2.320000e-01
-PIC.Core.CS103LBA.LBA_OUTER.LBA_10_70.delay.X = 3.539942e-05
-PIC.Core.CS103LBA.LBA_OUTER.LBA_10_70.delay.Y = 3.539937e-05
-PIC.Core.CS103LBA.LBA_OUTER.LBA_10_90.phase0.X = -2.690000e-01
-PIC.Core.CS103LBA.LBA_OUTER.LBA_10_90.phase0.Y = -2.320000e-01
-PIC.Core.CS103LBA.LBA_OUTER.LBA_10_90.delay.X = 3.539942e-05
-PIC.Core.CS103LBA.LBA_OUTER.LBA_10_90.delay.Y = 3.539937e-05
-PIC.Core.CS103LBA.LBA_OUTER.LBA_30_70.phase0.X = -2.690000e-01
-PIC.Core.CS103LBA.LBA_OUTER.LBA_30_70.phase0.Y = -2.320000e-01
-PIC.Core.CS103LBA.LBA_OUTER.LBA_30_70.delay.X = 3.539942e-05
-PIC.Core.CS103LBA.LBA_OUTER.LBA_30_70.delay.Y = 3.539937e-05
-PIC.Core.CS103LBA.LBA_OUTER.LBA_30_90.phase0.X = -2.690000e-01
-PIC.Core.CS103LBA.LBA_OUTER.LBA_30_90.phase0.Y = -2.320000e-01
-PIC.Core.CS103LBA.LBA_OUTER.LBA_30_90.delay.X = 3.539942e-05
-PIC.Core.CS103LBA.LBA_OUTER.LBA_30_90.delay.Y = 3.539937e-05
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_110_190.phase0.X = 2.436740e-01
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -3.553777e-02
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.735901e-05
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.735872e-05
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_170_230.phase0.X = 2.436740e-01
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -3.553777e-02
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.735901e-05
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.735872e-05
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_210_250.phase0.X = 2.436740e-01
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -3.553777e-02
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.735901e-05
-PIC.Core.CS201HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.735872e-05
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 2.436740e-01
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -3.553777e-02
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.735901e-05
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.735872e-05
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 2.436740e-01
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -3.553777e-02
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.735901e-05
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.735872e-05
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 2.436740e-01
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -3.553777e-02
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.735901e-05
-PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.735872e-05
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_110_190.phase0.X = 2.436740e-01
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -3.553777e-02
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.735901e-05
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.735872e-05
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_170_230.phase0.X = 2.436740e-01
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -3.553777e-02
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.735901e-05
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.735872e-05
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_210_250.phase0.X = 2.436740e-01
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -3.553777e-02
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.735901e-05
-PIC.Core.CS201HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.735872e-05
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_110_190.phase0.X = 3.837943e-01
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 2.484557e-01
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.735841e-05
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.735791e-05
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_170_230.phase0.X = 3.837943e-01
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 2.484557e-01
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.735841e-05
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.735791e-05
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_210_250.phase0.X = 3.837943e-01
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 2.484557e-01
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.735841e-05
-PIC.Core.CS201HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.735791e-05
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 3.837943e-01
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 2.484557e-01
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.735841e-05
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.735791e-05
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 3.837943e-01
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 2.484557e-01
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.735841e-05
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.735791e-05
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 3.837943e-01
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 2.484557e-01
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.735841e-05
-PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.735791e-05
-PIC.Core.CS201HBA1.HBA_ONE.HBA_110_190.phase0.X = 3.837943e-01
-PIC.Core.CS201HBA1.HBA_ONE.HBA_110_190.phase0.Y = 2.484557e-01
-PIC.Core.CS201HBA1.HBA_ONE.HBA_110_190.delay.X = 1.735841e-05
-PIC.Core.CS201HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.735791e-05
-PIC.Core.CS201HBA1.HBA_ONE.HBA_170_230.phase0.X = 3.837943e-01
-PIC.Core.CS201HBA1.HBA_ONE.HBA_170_230.phase0.Y = 2.484557e-01
-PIC.Core.CS201HBA1.HBA_ONE.HBA_170_230.delay.X = 1.735841e-05
-PIC.Core.CS201HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.735791e-05
-PIC.Core.CS201HBA1.HBA_ONE.HBA_210_250.phase0.X = 3.837943e-01
-PIC.Core.CS201HBA1.HBA_ONE.HBA_210_250.phase0.Y = 2.484557e-01
-PIC.Core.CS201HBA1.HBA_ONE.HBA_210_250.delay.X = 1.735841e-05
-PIC.Core.CS201HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.735791e-05
+PIC.Core.CS103HBA.HBA_JOINED.HBA_210_250.delay.X = 3.539926e-05
+PIC.Core.CS103HBA.HBA_JOINED.HBA_210_250.delay.Y = 3.539874e-05
+PIC.Core.CS201LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS201LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS201LBA.LBA_INNER.LBA_10_70.delay.X = 1.736016e-05
+PIC.Core.CS201LBA.LBA_INNER.LBA_10_70.delay.Y = 1.735989e-05
+PIC.Core.CS201LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS201LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS201LBA.LBA_INNER.LBA_30_70.delay.X = 1.736016e-05
+PIC.Core.CS201LBA.LBA_INNER.LBA_30_70.delay.Y = 1.735989e-05
+PIC.Core.CS201LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS201LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS201LBA.LBA_INNER.LBA_10_90.delay.X = 1.736016e-05
+PIC.Core.CS201LBA.LBA_INNER.LBA_10_90.delay.Y = 1.735989e-05
+PIC.Core.CS201LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS201LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS201LBA.LBA_INNER.LBA_30_90.delay.X = 1.736016e-05
+PIC.Core.CS201LBA.LBA_INNER.LBA_30_90.delay.Y = 1.735989e-05
+PIC.Core.CS201LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS201LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS201LBA.LBA_OUTER.LBA_10_70.delay.X = 1.736016e-05
+PIC.Core.CS201LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.735989e-05
+PIC.Core.CS201LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS201LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS201LBA.LBA_OUTER.LBA_30_70.delay.X = 1.736016e-05
+PIC.Core.CS201LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.735989e-05
+PIC.Core.CS201LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS201LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS201LBA.LBA_OUTER.LBA_10_90.delay.X = 1.736016e-05
+PIC.Core.CS201LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.735989e-05
+PIC.Core.CS201LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS201LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS201LBA.LBA_OUTER.LBA_30_90.delay.X = 1.736016e-05
+PIC.Core.CS201LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.735989e-05
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.736022e-05
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.736002e-05
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.736022e-05
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.736002e-05
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.736022e-05
+PIC.Core.CS201HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.736002e-05
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.736022e-05
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.736002e-05
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.736022e-05
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.736002e-05
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.736022e-05
+PIC.Core.CS201HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.736002e-05
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.736022e-05
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.736002e-05
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.736022e-05
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.736002e-05
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.736022e-05
+PIC.Core.CS201HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.736002e-05
+PIC.Core.CS201HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_ONE.HBA_110_190.delay.X = 1.736010e-05
+PIC.Core.CS201HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.735976e-05
+PIC.Core.CS201HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_ONE.HBA_170_230.delay.X = 1.736010e-05
+PIC.Core.CS201HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.735976e-05
+PIC.Core.CS201HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_ONE.HBA_210_250.delay.X = 1.736010e-05
+PIC.Core.CS201HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.735976e-05
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.736010e-05
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.735976e-05
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.736010e-05
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.735976e-05
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.736010e-05
+PIC.Core.CS201HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.735976e-05
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.736010e-05
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.735976e-05
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.736010e-05
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.735976e-05
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.736010e-05
+PIC.Core.CS201HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.735976e-05
PIC.Core.CS201HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS201HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS201HBA.HBA_JOINED.HBA_110_190.delay.X = 1.736120e-05
-PIC.Core.CS201HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.736082e-05
+PIC.Core.CS201HBA.HBA_JOINED.HBA_110_190.delay.X = 1.736016e-05
+PIC.Core.CS201HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.735989e-05
PIC.Core.CS201HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS201HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS201HBA.HBA_JOINED.HBA_170_230.delay.X = 1.736120e-05
-PIC.Core.CS201HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.736082e-05
+PIC.Core.CS201HBA.HBA_JOINED.HBA_170_230.delay.X = 1.736016e-05
+PIC.Core.CS201HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.735989e-05
PIC.Core.CS201HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS201HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS201HBA.HBA_JOINED.HBA_210_250.delay.X = 1.736120e-05
-PIC.Core.CS201HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.736082e-05
-PIC.Core.CS201LBA.LBA_INNER.LBA_10_70.phase0.X = -1.150000e-02
-PIC.Core.CS201LBA.LBA_INNER.LBA_10_70.phase0.Y = 7.650000e-02
-PIC.Core.CS201LBA.LBA_INNER.LBA_10_70.delay.X = 1.736304e-05
-PIC.Core.CS201LBA.LBA_INNER.LBA_10_70.delay.Y = 1.736434e-05
-PIC.Core.CS201LBA.LBA_INNER.LBA_10_90.phase0.X = -1.150000e-02
-PIC.Core.CS201LBA.LBA_INNER.LBA_10_90.phase0.Y = 7.650000e-02
-PIC.Core.CS201LBA.LBA_INNER.LBA_10_90.delay.X = 1.736304e-05
-PIC.Core.CS201LBA.LBA_INNER.LBA_10_90.delay.Y = 1.736434e-05
-PIC.Core.CS201LBA.LBA_INNER.LBA_30_70.phase0.X = -1.150000e-02
-PIC.Core.CS201LBA.LBA_INNER.LBA_30_70.phase0.Y = 7.650000e-02
-PIC.Core.CS201LBA.LBA_INNER.LBA_30_70.delay.X = 1.736304e-05
-PIC.Core.CS201LBA.LBA_INNER.LBA_30_70.delay.Y = 1.736434e-05
-PIC.Core.CS201LBA.LBA_INNER.LBA_30_90.phase0.X = -1.150000e-02
-PIC.Core.CS201LBA.LBA_INNER.LBA_30_90.phase0.Y = 7.650000e-02
-PIC.Core.CS201LBA.LBA_INNER.LBA_30_90.delay.X = 1.736304e-05
-PIC.Core.CS201LBA.LBA_INNER.LBA_30_90.delay.Y = 1.736434e-05
-PIC.Core.CS201LBA.LBA_OUTER.LBA_10_70.phase0.X = -7.800000e-02
-PIC.Core.CS201LBA.LBA_OUTER.LBA_10_70.phase0.Y = -1.630000e-01
-PIC.Core.CS201LBA.LBA_OUTER.LBA_10_70.delay.X = 1.736464e-05
-PIC.Core.CS201LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.736513e-05
-PIC.Core.CS201LBA.LBA_OUTER.LBA_10_90.phase0.X = -7.800000e-02
-PIC.Core.CS201LBA.LBA_OUTER.LBA_10_90.phase0.Y = -1.630000e-01
-PIC.Core.CS201LBA.LBA_OUTER.LBA_10_90.delay.X = 1.736464e-05
-PIC.Core.CS201LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.736513e-05
-PIC.Core.CS201LBA.LBA_OUTER.LBA_30_70.phase0.X = -7.800000e-02
-PIC.Core.CS201LBA.LBA_OUTER.LBA_30_70.phase0.Y = -1.630000e-01
-PIC.Core.CS201LBA.LBA_OUTER.LBA_30_70.delay.X = 1.736464e-05
-PIC.Core.CS201LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.736513e-05
-PIC.Core.CS201LBA.LBA_OUTER.LBA_30_90.phase0.X = -7.800000e-02
-PIC.Core.CS201LBA.LBA_OUTER.LBA_30_90.phase0.Y = -1.630000e-01
-PIC.Core.CS201LBA.LBA_OUTER.LBA_30_90.delay.X = 1.736464e-05
-PIC.Core.CS201LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.736513e-05
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_110_190.phase0.X = -6.847185e-01
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -6.477767e-01
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_110_190.delay.X = 7.601698e-06
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_110_190.delay.Y = 7.601860e-06
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_170_230.phase0.X = -6.847185e-01
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -6.477767e-01
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_170_230.delay.X = 7.601698e-06
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_170_230.delay.Y = 7.601860e-06
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_210_250.phase0.X = -6.847185e-01
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -6.477767e-01
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_210_250.delay.X = 7.601698e-06
-PIC.Core.CS301HBA0.HBA_DUAL.HBA_210_250.delay.Y = 7.601860e-06
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -6.847185e-01
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -6.477767e-01
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.601698e-06
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.601860e-06
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -6.847185e-01
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -6.477767e-01
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.601698e-06
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.601860e-06
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -6.847185e-01
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -6.477767e-01
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.601698e-06
-PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.601860e-06
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_110_190.phase0.X = -6.847185e-01
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -6.477767e-01
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_110_190.delay.X = 7.601698e-06
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_110_190.delay.Y = 7.601860e-06
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_170_230.phase0.X = -6.847185e-01
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -6.477767e-01
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_170_230.delay.X = 7.601698e-06
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_170_230.delay.Y = 7.601860e-06
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_210_250.phase0.X = -6.847185e-01
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -6.477767e-01
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_210_250.delay.X = 7.601698e-06
-PIC.Core.CS301HBA0.HBA_ZERO.HBA_210_250.delay.Y = 7.601860e-06
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_110_190.phase0.X = -3.963811e-01
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -2.710341e-01
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_110_190.delay.X = 7.601811e-06
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_110_190.delay.Y = 7.601916e-06
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_170_230.phase0.X = -3.963811e-01
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -2.710341e-01
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_170_230.delay.X = 7.601811e-06
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_170_230.delay.Y = 7.601916e-06
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_210_250.phase0.X = -3.963811e-01
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -2.710341e-01
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_210_250.delay.X = 7.601811e-06
-PIC.Core.CS301HBA1.HBA_DUAL.HBA_210_250.delay.Y = 7.601916e-06
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -3.963811e-01
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -2.710341e-01
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.601811e-06
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.601916e-06
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -3.963811e-01
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -2.710341e-01
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.601811e-06
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.601916e-06
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -3.963811e-01
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -2.710341e-01
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.601811e-06
-PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.601916e-06
-PIC.Core.CS301HBA1.HBA_ONE.HBA_110_190.phase0.X = -3.963811e-01
-PIC.Core.CS301HBA1.HBA_ONE.HBA_110_190.phase0.Y = -2.710341e-01
-PIC.Core.CS301HBA1.HBA_ONE.HBA_110_190.delay.X = 7.601811e-06
-PIC.Core.CS301HBA1.HBA_ONE.HBA_110_190.delay.Y = 7.601916e-06
-PIC.Core.CS301HBA1.HBA_ONE.HBA_170_230.phase0.X = -3.963811e-01
-PIC.Core.CS301HBA1.HBA_ONE.HBA_170_230.phase0.Y = -2.710341e-01
-PIC.Core.CS301HBA1.HBA_ONE.HBA_170_230.delay.X = 7.601811e-06
-PIC.Core.CS301HBA1.HBA_ONE.HBA_170_230.delay.Y = 7.601916e-06
-PIC.Core.CS301HBA1.HBA_ONE.HBA_210_250.phase0.X = -3.963811e-01
-PIC.Core.CS301HBA1.HBA_ONE.HBA_210_250.phase0.Y = -2.710341e-01
-PIC.Core.CS301HBA1.HBA_ONE.HBA_210_250.delay.X = 7.601811e-06
-PIC.Core.CS301HBA1.HBA_ONE.HBA_210_250.delay.Y = 7.601916e-06
+PIC.Core.CS201HBA.HBA_JOINED.HBA_210_250.delay.X = 1.736016e-05
+PIC.Core.CS201HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.735989e-05
+PIC.Core.CS301LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS301LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS301LBA.LBA_INNER.LBA_10_70.delay.X = 7.599883e-06
+PIC.Core.CS301LBA.LBA_INNER.LBA_10_70.delay.Y = 7.600549e-06
+PIC.Core.CS301LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS301LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS301LBA.LBA_INNER.LBA_30_70.delay.X = 7.599883e-06
+PIC.Core.CS301LBA.LBA_INNER.LBA_30_70.delay.Y = 7.600549e-06
+PIC.Core.CS301LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS301LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS301LBA.LBA_INNER.LBA_10_90.delay.X = 7.599883e-06
+PIC.Core.CS301LBA.LBA_INNER.LBA_10_90.delay.Y = 7.600549e-06
+PIC.Core.CS301LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS301LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS301LBA.LBA_INNER.LBA_30_90.delay.X = 7.599883e-06
+PIC.Core.CS301LBA.LBA_INNER.LBA_30_90.delay.Y = 7.600549e-06
+PIC.Core.CS301LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS301LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS301LBA.LBA_OUTER.LBA_10_70.delay.X = 7.599883e-06
+PIC.Core.CS301LBA.LBA_OUTER.LBA_10_70.delay.Y = 7.600549e-06
+PIC.Core.CS301LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS301LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS301LBA.LBA_OUTER.LBA_30_70.delay.X = 7.599883e-06
+PIC.Core.CS301LBA.LBA_OUTER.LBA_30_70.delay.Y = 7.600549e-06
+PIC.Core.CS301LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS301LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS301LBA.LBA_OUTER.LBA_10_90.delay.X = 7.599883e-06
+PIC.Core.CS301LBA.LBA_OUTER.LBA_10_90.delay.Y = 7.600549e-06
+PIC.Core.CS301LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS301LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS301LBA.LBA_OUTER.LBA_30_90.delay.X = 7.599883e-06
+PIC.Core.CS301LBA.LBA_OUTER.LBA_30_90.delay.Y = 7.600549e-06
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_110_190.delay.X = 7.599886e-06
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_110_190.delay.Y = 7.600516e-06
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_170_230.delay.X = 7.599886e-06
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_170_230.delay.Y = 7.600516e-06
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_210_250.delay.X = 7.599886e-06
+PIC.Core.CS301HBA0.HBA_ZERO.HBA_210_250.delay.Y = 7.600516e-06
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_110_190.delay.X = 7.599886e-06
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_110_190.delay.Y = 7.600516e-06
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_170_230.delay.X = 7.599886e-06
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_170_230.delay.Y = 7.600516e-06
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_210_250.delay.X = 7.599886e-06
+PIC.Core.CS301HBA0.HBA_DUAL.HBA_210_250.delay.Y = 7.600516e-06
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.599886e-06
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.600516e-06
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.599886e-06
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.600516e-06
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.599886e-06
+PIC.Core.CS301HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.600516e-06
+PIC.Core.CS301HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_ONE.HBA_110_190.delay.X = 7.599879e-06
+PIC.Core.CS301HBA1.HBA_ONE.HBA_110_190.delay.Y = 7.600581e-06
+PIC.Core.CS301HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_ONE.HBA_170_230.delay.X = 7.599879e-06
+PIC.Core.CS301HBA1.HBA_ONE.HBA_170_230.delay.Y = 7.600581e-06
+PIC.Core.CS301HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_ONE.HBA_210_250.delay.X = 7.599879e-06
+PIC.Core.CS301HBA1.HBA_ONE.HBA_210_250.delay.Y = 7.600581e-06
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_110_190.delay.X = 7.599879e-06
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_110_190.delay.Y = 7.600581e-06
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_170_230.delay.X = 7.599879e-06
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_170_230.delay.Y = 7.600581e-06
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_210_250.delay.X = 7.599879e-06
+PIC.Core.CS301HBA1.HBA_DUAL.HBA_210_250.delay.Y = 7.600581e-06
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.599879e-06
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.600581e-06
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.599879e-06
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.600581e-06
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.599879e-06
+PIC.Core.CS301HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.600581e-06
PIC.Core.CS301HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS301HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS301HBA.HBA_JOINED.HBA_110_190.delay.X = 7.601185e-06
-PIC.Core.CS301HBA.HBA_JOINED.HBA_110_190.delay.Y = 7.601339e-06
+PIC.Core.CS301HBA.HBA_JOINED.HBA_110_190.delay.X = 7.599883e-06
+PIC.Core.CS301HBA.HBA_JOINED.HBA_110_190.delay.Y = 7.600549e-06
PIC.Core.CS301HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS301HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS301HBA.HBA_JOINED.HBA_170_230.delay.X = 7.601185e-06
-PIC.Core.CS301HBA.HBA_JOINED.HBA_170_230.delay.Y = 7.601339e-06
+PIC.Core.CS301HBA.HBA_JOINED.HBA_170_230.delay.X = 7.599883e-06
+PIC.Core.CS301HBA.HBA_JOINED.HBA_170_230.delay.Y = 7.600549e-06
PIC.Core.CS301HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS301HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS301HBA.HBA_JOINED.HBA_210_250.delay.X = 7.601185e-06
-PIC.Core.CS301HBA.HBA_JOINED.HBA_210_250.delay.Y = 7.601339e-06
-PIC.Core.CS301LBA.LBA_INNER.LBA_10_70.phase0.X = 2.350000e-01
-PIC.Core.CS301LBA.LBA_INNER.LBA_10_70.phase0.Y = 2.800000e-01
-PIC.Core.CS301LBA.LBA_INNER.LBA_10_70.delay.X = 7.596328e-06
-PIC.Core.CS301LBA.LBA_INNER.LBA_10_70.delay.Y = 7.596884e-06
-PIC.Core.CS301LBA.LBA_INNER.LBA_10_90.phase0.X = 2.350000e-01
-PIC.Core.CS301LBA.LBA_INNER.LBA_10_90.phase0.Y = 2.800000e-01
-PIC.Core.CS301LBA.LBA_INNER.LBA_10_90.delay.X = 7.596328e-06
-PIC.Core.CS301LBA.LBA_INNER.LBA_10_90.delay.Y = 7.596884e-06
-PIC.Core.CS301LBA.LBA_INNER.LBA_30_70.phase0.X = 2.350000e-01
-PIC.Core.CS301LBA.LBA_INNER.LBA_30_70.phase0.Y = 2.800000e-01
-PIC.Core.CS301LBA.LBA_INNER.LBA_30_70.delay.X = 7.596328e-06
-PIC.Core.CS301LBA.LBA_INNER.LBA_30_70.delay.Y = 7.596884e-06
-PIC.Core.CS301LBA.LBA_INNER.LBA_30_90.phase0.X = 2.350000e-01
-PIC.Core.CS301LBA.LBA_INNER.LBA_30_90.phase0.Y = 2.800000e-01
-PIC.Core.CS301LBA.LBA_INNER.LBA_30_90.delay.X = 7.596328e-06
-PIC.Core.CS301LBA.LBA_INNER.LBA_30_90.delay.Y = 7.596884e-06
-PIC.Core.CS301LBA.LBA_OUTER.LBA_10_70.phase0.X = -1.900000e-01
-PIC.Core.CS301LBA.LBA_OUTER.LBA_10_70.phase0.Y = -2.315000e-01
-PIC.Core.CS301LBA.LBA_OUTER.LBA_10_70.delay.X = 7.596188e-06
-PIC.Core.CS301LBA.LBA_OUTER.LBA_10_70.delay.Y = 7.597899e-06
-PIC.Core.CS301LBA.LBA_OUTER.LBA_10_90.phase0.X = -1.900000e-01
-PIC.Core.CS301LBA.LBA_OUTER.LBA_10_90.phase0.Y = -2.315000e-01
-PIC.Core.CS301LBA.LBA_OUTER.LBA_10_90.delay.X = 7.596188e-06
-PIC.Core.CS301LBA.LBA_OUTER.LBA_10_90.delay.Y = 7.597899e-06
-PIC.Core.CS301LBA.LBA_OUTER.LBA_30_70.phase0.X = -1.900000e-01
-PIC.Core.CS301LBA.LBA_OUTER.LBA_30_70.phase0.Y = -2.315000e-01
-PIC.Core.CS301LBA.LBA_OUTER.LBA_30_70.delay.X = 7.596188e-06
-PIC.Core.CS301LBA.LBA_OUTER.LBA_30_70.delay.Y = 7.597899e-06
-PIC.Core.CS301LBA.LBA_OUTER.LBA_30_90.phase0.X = -1.900000e-01
-PIC.Core.CS301LBA.LBA_OUTER.LBA_30_90.phase0.Y = -2.315000e-01
-PIC.Core.CS301LBA.LBA_OUTER.LBA_30_90.delay.X = 7.596188e-06
-PIC.Core.CS301LBA.LBA_OUTER.LBA_30_90.delay.Y = 7.597899e-06
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_110_190.phase0.X = -1.224487e+00
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -1.004963e+00
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.223381e-05
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.223364e-05
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_170_230.phase0.X = -1.224487e+00
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -1.004963e+00
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.223381e-05
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.223364e-05
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_210_250.phase0.X = -1.224487e+00
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -1.004963e+00
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.223381e-05
-PIC.Core.CS302HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.223364e-05
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -1.224487e+00
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -1.004963e+00
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.223381e-05
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.223364e-05
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -1.224487e+00
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -1.004963e+00
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.223381e-05
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.223364e-05
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -1.224487e+00
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -1.004963e+00
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.223381e-05
-PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.223364e-05
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_110_190.phase0.X = -1.224487e+00
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -1.004963e+00
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.223381e-05
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.223364e-05
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_170_230.phase0.X = -1.224487e+00
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -1.004963e+00
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.223381e-05
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.223364e-05
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_210_250.phase0.X = -1.224487e+00
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -1.004963e+00
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.223381e-05
-PIC.Core.CS302HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.223364e-05
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_110_190.phase0.X = -7.951238e-01
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -8.659981e-01
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.223363e-05
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.223353e-05
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_170_230.phase0.X = -7.951238e-01
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -8.659981e-01
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.223363e-05
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.223353e-05
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_210_250.phase0.X = -7.951238e-01
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -8.659981e-01
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.223363e-05
-PIC.Core.CS302HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.223353e-05
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -7.951238e-01
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -8.659981e-01
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.223363e-05
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.223353e-05
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -7.951238e-01
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -8.659981e-01
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.223363e-05
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.223353e-05
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -7.951238e-01
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -8.659981e-01
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.223363e-05
-PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.223353e-05
-PIC.Core.CS302HBA1.HBA_ONE.HBA_110_190.phase0.X = -7.951238e-01
-PIC.Core.CS302HBA1.HBA_ONE.HBA_110_190.phase0.Y = -8.659981e-01
-PIC.Core.CS302HBA1.HBA_ONE.HBA_110_190.delay.X = 1.223363e-05
-PIC.Core.CS302HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.223353e-05
-PIC.Core.CS302HBA1.HBA_ONE.HBA_170_230.phase0.X = -7.951238e-01
-PIC.Core.CS302HBA1.HBA_ONE.HBA_170_230.phase0.Y = -8.659981e-01
-PIC.Core.CS302HBA1.HBA_ONE.HBA_170_230.delay.X = 1.223363e-05
-PIC.Core.CS302HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.223353e-05
-PIC.Core.CS302HBA1.HBA_ONE.HBA_210_250.phase0.X = -7.951238e-01
-PIC.Core.CS302HBA1.HBA_ONE.HBA_210_250.phase0.Y = -8.659981e-01
-PIC.Core.CS302HBA1.HBA_ONE.HBA_210_250.delay.X = 1.223363e-05
-PIC.Core.CS302HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.223353e-05
+PIC.Core.CS301HBA.HBA_JOINED.HBA_210_250.delay.X = 7.599883e-06
+PIC.Core.CS301HBA.HBA_JOINED.HBA_210_250.delay.Y = 7.600549e-06
+PIC.Core.CS302LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS302LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS302LBA.LBA_INNER.LBA_10_70.delay.X = 1.223101e-05
+PIC.Core.CS302LBA.LBA_INNER.LBA_10_70.delay.Y = 1.223091e-05
+PIC.Core.CS302LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS302LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS302LBA.LBA_INNER.LBA_30_70.delay.X = 1.223101e-05
+PIC.Core.CS302LBA.LBA_INNER.LBA_30_70.delay.Y = 1.223091e-05
+PIC.Core.CS302LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS302LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS302LBA.LBA_INNER.LBA_10_90.delay.X = 1.223101e-05
+PIC.Core.CS302LBA.LBA_INNER.LBA_10_90.delay.Y = 1.223091e-05
+PIC.Core.CS302LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS302LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS302LBA.LBA_INNER.LBA_30_90.delay.X = 1.223101e-05
+PIC.Core.CS302LBA.LBA_INNER.LBA_30_90.delay.Y = 1.223091e-05
+PIC.Core.CS302LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS302LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS302LBA.LBA_OUTER.LBA_10_70.delay.X = 1.223101e-05
+PIC.Core.CS302LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.223091e-05
+PIC.Core.CS302LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS302LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS302LBA.LBA_OUTER.LBA_30_70.delay.X = 1.223101e-05
+PIC.Core.CS302LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.223091e-05
+PIC.Core.CS302LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS302LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS302LBA.LBA_OUTER.LBA_10_90.delay.X = 1.223101e-05
+PIC.Core.CS302LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.223091e-05
+PIC.Core.CS302LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS302LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS302LBA.LBA_OUTER.LBA_30_90.delay.X = 1.223101e-05
+PIC.Core.CS302LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.223091e-05
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.223101e-05
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.223097e-05
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.223101e-05
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.223097e-05
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.223101e-05
+PIC.Core.CS302HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.223097e-05
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.223101e-05
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.223097e-05
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.223101e-05
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.223097e-05
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.223101e-05
+PIC.Core.CS302HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.223097e-05
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.223101e-05
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.223097e-05
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.223101e-05
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.223097e-05
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.223101e-05
+PIC.Core.CS302HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.223097e-05
+PIC.Core.CS302HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_ONE.HBA_110_190.delay.X = 1.223100e-05
+PIC.Core.CS302HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.223084e-05
+PIC.Core.CS302HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_ONE.HBA_170_230.delay.X = 1.223100e-05
+PIC.Core.CS302HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.223084e-05
+PIC.Core.CS302HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_ONE.HBA_210_250.delay.X = 1.223100e-05
+PIC.Core.CS302HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.223084e-05
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.223100e-05
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.223084e-05
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.223100e-05
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.223084e-05
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.223100e-05
+PIC.Core.CS302HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.223084e-05
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.223100e-05
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.223084e-05
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.223100e-05
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.223084e-05
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.223100e-05
+PIC.Core.CS302HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.223084e-05
PIC.Core.CS302HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS302HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS302HBA.HBA_JOINED.HBA_110_190.delay.X = 1.223332e-05
-PIC.Core.CS302HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.223312e-05
+PIC.Core.CS302HBA.HBA_JOINED.HBA_110_190.delay.X = 1.223101e-05
+PIC.Core.CS302HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.223091e-05
PIC.Core.CS302HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS302HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS302HBA.HBA_JOINED.HBA_170_230.delay.X = 1.223332e-05
-PIC.Core.CS302HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.223312e-05
+PIC.Core.CS302HBA.HBA_JOINED.HBA_170_230.delay.X = 1.223101e-05
+PIC.Core.CS302HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.223091e-05
PIC.Core.CS302HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS302HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS302HBA.HBA_JOINED.HBA_210_250.delay.X = 1.223332e-05
-PIC.Core.CS302HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.223312e-05
-PIC.Core.CS302LBA.LBA_INNER.LBA_10_70.phase0.X = 7.100000e-02
-PIC.Core.CS302LBA.LBA_INNER.LBA_10_70.phase0.Y = 8.450000e-02
-PIC.Core.CS302LBA.LBA_INNER.LBA_10_70.delay.X = 1.223318e-05
-PIC.Core.CS302LBA.LBA_INNER.LBA_10_70.delay.Y = 1.224098e-05
-PIC.Core.CS302LBA.LBA_INNER.LBA_10_90.phase0.X = 7.100000e-02
-PIC.Core.CS302LBA.LBA_INNER.LBA_10_90.phase0.Y = 8.450000e-02
-PIC.Core.CS302LBA.LBA_INNER.LBA_10_90.delay.X = 1.223318e-05
-PIC.Core.CS302LBA.LBA_INNER.LBA_10_90.delay.Y = 1.224098e-05
-PIC.Core.CS302LBA.LBA_INNER.LBA_30_70.phase0.X = 7.100000e-02
-PIC.Core.CS302LBA.LBA_INNER.LBA_30_70.phase0.Y = 8.450000e-02
-PIC.Core.CS302LBA.LBA_INNER.LBA_30_70.delay.X = 1.223318e-05
-PIC.Core.CS302LBA.LBA_INNER.LBA_30_70.delay.Y = 1.224098e-05
-PIC.Core.CS302LBA.LBA_INNER.LBA_30_90.phase0.X = 7.100000e-02
-PIC.Core.CS302LBA.LBA_INNER.LBA_30_90.phase0.Y = 8.450000e-02
-PIC.Core.CS302LBA.LBA_INNER.LBA_30_90.delay.X = 1.223318e-05
-PIC.Core.CS302LBA.LBA_INNER.LBA_30_90.delay.Y = 1.224098e-05
-PIC.Core.CS302LBA.LBA_OUTER.LBA_10_70.phase0.X = -1.015000e-01
-PIC.Core.CS302LBA.LBA_OUTER.LBA_10_70.phase0.Y = -1.470000e-01
-PIC.Core.CS302LBA.LBA_OUTER.LBA_10_70.delay.X = 1.223143e-05
-PIC.Core.CS302LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.223156e-05
-PIC.Core.CS302LBA.LBA_OUTER.LBA_10_90.phase0.X = -1.015000e-01
-PIC.Core.CS302LBA.LBA_OUTER.LBA_10_90.phase0.Y = -1.470000e-01
-PIC.Core.CS302LBA.LBA_OUTER.LBA_10_90.delay.X = 1.223143e-05
-PIC.Core.CS302LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.223156e-05
-PIC.Core.CS302LBA.LBA_OUTER.LBA_30_70.phase0.X = -1.015000e-01
-PIC.Core.CS302LBA.LBA_OUTER.LBA_30_70.phase0.Y = -1.470000e-01
-PIC.Core.CS302LBA.LBA_OUTER.LBA_30_70.delay.X = 1.223143e-05
-PIC.Core.CS302LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.223156e-05
-PIC.Core.CS302LBA.LBA_OUTER.LBA_30_90.phase0.X = -1.015000e-01
-PIC.Core.CS302LBA.LBA_OUTER.LBA_30_90.phase0.Y = -1.470000e-01
-PIC.Core.CS302LBA.LBA_OUTER.LBA_30_90.delay.X = 1.223143e-05
-PIC.Core.CS302LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.223156e-05
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_110_190.phase0.X = -6.215366e-01
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -3.990518e-01
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_110_190.delay.X = 7.834650e-06
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_110_190.delay.Y = 7.834612e-06
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_170_230.phase0.X = -6.215366e-01
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -3.990518e-01
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_170_230.delay.X = 7.834650e-06
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_170_230.delay.Y = 7.834612e-06
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_210_250.phase0.X = -6.215366e-01
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -3.990518e-01
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_210_250.delay.X = 7.834650e-06
-PIC.Core.CS401HBA0.HBA_DUAL.HBA_210_250.delay.Y = 7.834612e-06
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = -6.215366e-01
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -3.990518e-01
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.834650e-06
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.834612e-06
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = -6.215366e-01
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -3.990518e-01
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.834650e-06
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.834612e-06
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = -6.215366e-01
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -3.990518e-01
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.834650e-06
-PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.834612e-06
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_110_190.phase0.X = -6.215366e-01
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -3.990518e-01
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_110_190.delay.X = 7.834650e-06
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_110_190.delay.Y = 7.834612e-06
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_170_230.phase0.X = -6.215366e-01
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -3.990518e-01
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_170_230.delay.X = 7.834650e-06
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_170_230.delay.Y = 7.834612e-06
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_210_250.phase0.X = -6.215366e-01
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -3.990518e-01
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_210_250.delay.X = 7.834650e-06
-PIC.Core.CS401HBA0.HBA_ZERO.HBA_210_250.delay.Y = 7.834612e-06
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_110_190.phase0.X = -4.770013e-01
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_110_190.phase0.Y = -2.666178e-01
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_110_190.delay.X = 7.833998e-06
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_110_190.delay.Y = 7.833805e-06
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_170_230.phase0.X = -4.770013e-01
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_170_230.phase0.Y = -2.666178e-01
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_170_230.delay.X = 7.833998e-06
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_170_230.delay.Y = 7.833805e-06
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_210_250.phase0.X = -4.770013e-01
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_210_250.phase0.Y = -2.666178e-01
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_210_250.delay.X = 7.833998e-06
-PIC.Core.CS401HBA1.HBA_DUAL.HBA_210_250.delay.Y = 7.833805e-06
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = -4.770013e-01
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -2.666178e-01
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.833998e-06
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.833805e-06
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = -4.770013e-01
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -2.666178e-01
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.833998e-06
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.833805e-06
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = -4.770013e-01
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -2.666178e-01
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.833998e-06
-PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.833805e-06
-PIC.Core.CS401HBA1.HBA_ONE.HBA_110_190.phase0.X = -4.770013e-01
-PIC.Core.CS401HBA1.HBA_ONE.HBA_110_190.phase0.Y = -2.666178e-01
-PIC.Core.CS401HBA1.HBA_ONE.HBA_110_190.delay.X = 7.833998e-06
-PIC.Core.CS401HBA1.HBA_ONE.HBA_110_190.delay.Y = 7.833805e-06
-PIC.Core.CS401HBA1.HBA_ONE.HBA_170_230.phase0.X = -4.770013e-01
-PIC.Core.CS401HBA1.HBA_ONE.HBA_170_230.phase0.Y = -2.666178e-01
-PIC.Core.CS401HBA1.HBA_ONE.HBA_170_230.delay.X = 7.833998e-06
-PIC.Core.CS401HBA1.HBA_ONE.HBA_170_230.delay.Y = 7.833805e-06
-PIC.Core.CS401HBA1.HBA_ONE.HBA_210_250.phase0.X = -4.770013e-01
-PIC.Core.CS401HBA1.HBA_ONE.HBA_210_250.phase0.Y = -2.666178e-01
-PIC.Core.CS401HBA1.HBA_ONE.HBA_210_250.delay.X = 7.833998e-06
-PIC.Core.CS401HBA1.HBA_ONE.HBA_210_250.delay.Y = 7.833805e-06
+PIC.Core.CS302HBA.HBA_JOINED.HBA_210_250.delay.X = 1.223101e-05
+PIC.Core.CS302HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.223091e-05
+PIC.Core.CS401LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS401LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS401LBA.LBA_INNER.LBA_10_70.delay.X = 7.833150e-06
+PIC.Core.CS401LBA.LBA_INNER.LBA_10_70.delay.Y = 7.833323e-06
+PIC.Core.CS401LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS401LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS401LBA.LBA_INNER.LBA_30_70.delay.X = 7.833150e-06
+PIC.Core.CS401LBA.LBA_INNER.LBA_30_70.delay.Y = 7.833323e-06
+PIC.Core.CS401LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS401LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS401LBA.LBA_INNER.LBA_10_90.delay.X = 7.833150e-06
+PIC.Core.CS401LBA.LBA_INNER.LBA_10_90.delay.Y = 7.833323e-06
+PIC.Core.CS401LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS401LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS401LBA.LBA_INNER.LBA_30_90.delay.X = 7.833150e-06
+PIC.Core.CS401LBA.LBA_INNER.LBA_30_90.delay.Y = 7.833323e-06
+PIC.Core.CS401LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS401LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS401LBA.LBA_OUTER.LBA_10_70.delay.X = 7.833150e-06
+PIC.Core.CS401LBA.LBA_OUTER.LBA_10_70.delay.Y = 7.833323e-06
+PIC.Core.CS401LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS401LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS401LBA.LBA_OUTER.LBA_30_70.delay.X = 7.833150e-06
+PIC.Core.CS401LBA.LBA_OUTER.LBA_30_70.delay.Y = 7.833323e-06
+PIC.Core.CS401LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS401LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS401LBA.LBA_OUTER.LBA_10_90.delay.X = 7.833150e-06
+PIC.Core.CS401LBA.LBA_OUTER.LBA_10_90.delay.Y = 7.833323e-06
+PIC.Core.CS401LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS401LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS401LBA.LBA_OUTER.LBA_30_90.delay.X = 7.833150e-06
+PIC.Core.CS401LBA.LBA_OUTER.LBA_30_90.delay.Y = 7.833323e-06
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_110_190.delay.X = 7.833050e-06
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_110_190.delay.Y = 7.833413e-06
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_170_230.delay.X = 7.833050e-06
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_170_230.delay.Y = 7.833413e-06
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_210_250.delay.X = 7.833050e-06
+PIC.Core.CS401HBA0.HBA_ZERO.HBA_210_250.delay.Y = 7.833413e-06
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_110_190.delay.X = 7.833050e-06
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_110_190.delay.Y = 7.833413e-06
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_170_230.delay.X = 7.833050e-06
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_170_230.delay.Y = 7.833413e-06
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_210_250.delay.X = 7.833050e-06
+PIC.Core.CS401HBA0.HBA_DUAL.HBA_210_250.delay.Y = 7.833413e-06
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.833050e-06
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.833413e-06
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.833050e-06
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.833413e-06
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.833050e-06
+PIC.Core.CS401HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.833413e-06
+PIC.Core.CS401HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_ONE.HBA_110_190.delay.X = 7.833250e-06
+PIC.Core.CS401HBA1.HBA_ONE.HBA_110_190.delay.Y = 7.833232e-06
+PIC.Core.CS401HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_ONE.HBA_170_230.delay.X = 7.833250e-06
+PIC.Core.CS401HBA1.HBA_ONE.HBA_170_230.delay.Y = 7.833232e-06
+PIC.Core.CS401HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_ONE.HBA_210_250.delay.X = 7.833250e-06
+PIC.Core.CS401HBA1.HBA_ONE.HBA_210_250.delay.Y = 7.833232e-06
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_110_190.delay.X = 7.833250e-06
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_110_190.delay.Y = 7.833232e-06
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_170_230.delay.X = 7.833250e-06
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_170_230.delay.Y = 7.833232e-06
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_210_250.delay.X = 7.833250e-06
+PIC.Core.CS401HBA1.HBA_DUAL.HBA_210_250.delay.Y = 7.833232e-06
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 7.833250e-06
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 7.833232e-06
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 7.833250e-06
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 7.833232e-06
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 7.833250e-06
+PIC.Core.CS401HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 7.833232e-06
PIC.Core.CS401HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS401HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS401HBA.HBA_JOINED.HBA_110_190.delay.X = 7.833219e-06
-PIC.Core.CS401HBA.HBA_JOINED.HBA_110_190.delay.Y = 7.833306e-06
+PIC.Core.CS401HBA.HBA_JOINED.HBA_110_190.delay.X = 7.833150e-06
+PIC.Core.CS401HBA.HBA_JOINED.HBA_110_190.delay.Y = 7.833323e-06
PIC.Core.CS401HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS401HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS401HBA.HBA_JOINED.HBA_170_230.delay.X = 7.833219e-06
-PIC.Core.CS401HBA.HBA_JOINED.HBA_170_230.delay.Y = 7.833306e-06
+PIC.Core.CS401HBA.HBA_JOINED.HBA_170_230.delay.X = 7.833150e-06
+PIC.Core.CS401HBA.HBA_JOINED.HBA_170_230.delay.Y = 7.833323e-06
PIC.Core.CS401HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS401HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS401HBA.HBA_JOINED.HBA_210_250.delay.X = 7.833219e-06
-PIC.Core.CS401HBA.HBA_JOINED.HBA_210_250.delay.Y = 7.833306e-06
-PIC.Core.CS401LBA.LBA_INNER.LBA_10_70.phase0.X = 2.050000e-01
-PIC.Core.CS401LBA.LBA_INNER.LBA_10_70.phase0.Y = 4.115000e-01
-PIC.Core.CS401LBA.LBA_INNER.LBA_10_70.delay.X = 7.829430e-06
-PIC.Core.CS401LBA.LBA_INNER.LBA_10_70.delay.Y = 7.829528e-06
-PIC.Core.CS401LBA.LBA_INNER.LBA_10_90.phase0.X = 2.050000e-01
-PIC.Core.CS401LBA.LBA_INNER.LBA_10_90.phase0.Y = 4.115000e-01
-PIC.Core.CS401LBA.LBA_INNER.LBA_10_90.delay.X = 7.829430e-06
-PIC.Core.CS401LBA.LBA_INNER.LBA_10_90.delay.Y = 7.829528e-06
-PIC.Core.CS401LBA.LBA_INNER.LBA_30_70.phase0.X = 2.050000e-01
-PIC.Core.CS401LBA.LBA_INNER.LBA_30_70.phase0.Y = 4.115000e-01
-PIC.Core.CS401LBA.LBA_INNER.LBA_30_70.delay.X = 7.829430e-06
-PIC.Core.CS401LBA.LBA_INNER.LBA_30_70.delay.Y = 7.829528e-06
-PIC.Core.CS401LBA.LBA_INNER.LBA_30_90.phase0.X = 2.050000e-01
-PIC.Core.CS401LBA.LBA_INNER.LBA_30_90.phase0.Y = 4.115000e-01
-PIC.Core.CS401LBA.LBA_INNER.LBA_30_90.delay.X = 7.829430e-06
-PIC.Core.CS401LBA.LBA_INNER.LBA_30_90.delay.Y = 7.829528e-06
-PIC.Core.CS401LBA.LBA_OUTER.LBA_10_70.phase0.X = 8.660000e-01
-PIC.Core.CS401LBA.LBA_OUTER.LBA_10_70.phase0.Y = 8.805000e-01
-PIC.Core.CS401LBA.LBA_OUTER.LBA_10_70.delay.X = 7.830220e-06
-PIC.Core.CS401LBA.LBA_OUTER.LBA_10_70.delay.Y = 7.830098e-06
-PIC.Core.CS401LBA.LBA_OUTER.LBA_10_90.phase0.X = 8.660000e-01
-PIC.Core.CS401LBA.LBA_OUTER.LBA_10_90.phase0.Y = 8.805000e-01
-PIC.Core.CS401LBA.LBA_OUTER.LBA_10_90.delay.X = 7.830220e-06
-PIC.Core.CS401LBA.LBA_OUTER.LBA_10_90.delay.Y = 7.830098e-06
-PIC.Core.CS401LBA.LBA_OUTER.LBA_30_70.phase0.X = 8.660000e-01
-PIC.Core.CS401LBA.LBA_OUTER.LBA_30_70.phase0.Y = 8.805000e-01
-PIC.Core.CS401LBA.LBA_OUTER.LBA_30_70.delay.X = 7.830220e-06
-PIC.Core.CS401LBA.LBA_OUTER.LBA_30_70.delay.Y = 7.830098e-06
-PIC.Core.CS401LBA.LBA_OUTER.LBA_30_90.phase0.X = 8.660000e-01
-PIC.Core.CS401LBA.LBA_OUTER.LBA_30_90.phase0.Y = 8.805000e-01
-PIC.Core.CS401LBA.LBA_OUTER.LBA_30_90.delay.X = 7.830220e-06
-PIC.Core.CS401LBA.LBA_OUTER.LBA_30_90.delay.Y = 7.830098e-06
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_110_190.phase0.X = 1.279712e-01
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_110_190.phase0.Y = -1.477017e-01
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.649397e-05
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.649421e-05
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_170_230.phase0.X = 1.279712e-01
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_170_230.phase0.Y = -1.477017e-01
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.649397e-05
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.649421e-05
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_210_250.phase0.X = 1.279712e-01
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_210_250.phase0.Y = -1.477017e-01
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.649397e-05
-PIC.Core.CS501HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.649421e-05
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 1.279712e-01
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = -1.477017e-01
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.649397e-05
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.649421e-05
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 1.279712e-01
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = -1.477017e-01
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.649397e-05
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.649421e-05
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 1.279712e-01
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = -1.477017e-01
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.649397e-05
-PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.649421e-05
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_110_190.phase0.X = 1.279712e-01
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_110_190.phase0.Y = -1.477017e-01
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.649397e-05
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.649421e-05
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_170_230.phase0.X = 1.279712e-01
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_170_230.phase0.Y = -1.477017e-01
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.649397e-05
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.649421e-05
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_210_250.phase0.X = 1.279712e-01
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_210_250.phase0.Y = -1.477017e-01
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.649397e-05
-PIC.Core.CS501HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.649421e-05
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_110_190.phase0.X = 4.195143e-01
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 7.170644e-01
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.649338e-05
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.649355e-05
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_170_230.phase0.X = 4.195143e-01
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 7.170644e-01
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.649338e-05
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.649355e-05
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_210_250.phase0.X = 4.195143e-01
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 7.170644e-01
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.649338e-05
-PIC.Core.CS501HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.649355e-05
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 4.195143e-01
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 7.170644e-01
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.649338e-05
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.649355e-05
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 4.195143e-01
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 7.170644e-01
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.649338e-05
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.649355e-05
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 4.195143e-01
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 7.170644e-01
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.649338e-05
-PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.649355e-05
-PIC.Core.CS501HBA1.HBA_ONE.HBA_110_190.phase0.X = 4.195143e-01
-PIC.Core.CS501HBA1.HBA_ONE.HBA_110_190.phase0.Y = 7.170644e-01
-PIC.Core.CS501HBA1.HBA_ONE.HBA_110_190.delay.X = 1.649338e-05
-PIC.Core.CS501HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.649355e-05
-PIC.Core.CS501HBA1.HBA_ONE.HBA_170_230.phase0.X = 4.195143e-01
-PIC.Core.CS501HBA1.HBA_ONE.HBA_170_230.phase0.Y = 7.170644e-01
-PIC.Core.CS501HBA1.HBA_ONE.HBA_170_230.delay.X = 1.649338e-05
-PIC.Core.CS501HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.649355e-05
-PIC.Core.CS501HBA1.HBA_ONE.HBA_210_250.phase0.X = 4.195143e-01
-PIC.Core.CS501HBA1.HBA_ONE.HBA_210_250.phase0.Y = 7.170644e-01
-PIC.Core.CS501HBA1.HBA_ONE.HBA_210_250.delay.X = 1.649338e-05
-PIC.Core.CS501HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.649355e-05
+PIC.Core.CS401HBA.HBA_JOINED.HBA_210_250.delay.X = 7.833150e-06
+PIC.Core.CS401HBA.HBA_JOINED.HBA_210_250.delay.Y = 7.833323e-06
+PIC.Core.CS501LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS501LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS501LBA.LBA_INNER.LBA_10_70.delay.X = 1.649365e-05
+PIC.Core.CS501LBA.LBA_INNER.LBA_10_70.delay.Y = 1.649365e-05
+PIC.Core.CS501LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS501LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS501LBA.LBA_INNER.LBA_30_70.delay.X = 1.649365e-05
+PIC.Core.CS501LBA.LBA_INNER.LBA_30_70.delay.Y = 1.649365e-05
+PIC.Core.CS501LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS501LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS501LBA.LBA_INNER.LBA_10_90.delay.X = 1.649365e-05
+PIC.Core.CS501LBA.LBA_INNER.LBA_10_90.delay.Y = 1.649365e-05
+PIC.Core.CS501LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS501LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS501LBA.LBA_INNER.LBA_30_90.delay.X = 1.649365e-05
+PIC.Core.CS501LBA.LBA_INNER.LBA_30_90.delay.Y = 1.649365e-05
+PIC.Core.CS501LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.CS501LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.CS501LBA.LBA_OUTER.LBA_10_70.delay.X = 1.649365e-05
+PIC.Core.CS501LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.649365e-05
+PIC.Core.CS501LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.CS501LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.CS501LBA.LBA_OUTER.LBA_30_70.delay.X = 1.649365e-05
+PIC.Core.CS501LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.649365e-05
+PIC.Core.CS501LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.CS501LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.CS501LBA.LBA_OUTER.LBA_10_90.delay.X = 1.649365e-05
+PIC.Core.CS501LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.649365e-05
+PIC.Core.CS501LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.CS501LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.CS501LBA.LBA_OUTER.LBA_30_90.delay.X = 1.649365e-05
+PIC.Core.CS501LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.649365e-05
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_110_190.delay.X = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_110_190.delay.Y = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_170_230.delay.X = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_170_230.delay.Y = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_210_250.delay.X = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_ZERO.HBA_210_250.delay.Y = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_110_190.delay.X = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_110_190.delay.Y = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_170_230.delay.X = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_170_230.delay.Y = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_210_250.delay.X = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL.HBA_210_250.delay.Y = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.649378e-05
+PIC.Core.CS501HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.649378e-05
+PIC.Core.CS501HBA1.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_ONE.HBA_110_190.delay.X = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_ONE.HBA_110_190.delay.Y = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_ONE.HBA_170_230.delay.X = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_ONE.HBA_170_230.delay.Y = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_ONE.HBA_210_250.delay.X = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_ONE.HBA_210_250.delay.Y = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_110_190.delay.X = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_110_190.delay.Y = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_170_230.delay.X = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_170_230.delay.Y = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_210_250.delay.X = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL.HBA_210_250.delay.Y = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.649352e-05
+PIC.Core.CS501HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.649352e-05
PIC.Core.CS501HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.CS501HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.CS501HBA.HBA_JOINED.HBA_110_190.delay.X = 1.649254e-05
-PIC.Core.CS501HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.649262e-05
+PIC.Core.CS501HBA.HBA_JOINED.HBA_110_190.delay.X = 1.649365e-05
+PIC.Core.CS501HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.649365e-05
PIC.Core.CS501HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
PIC.Core.CS501HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.CS501HBA.HBA_JOINED.HBA_170_230.delay.X = 1.649254e-05
-PIC.Core.CS501HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.649262e-05
+PIC.Core.CS501HBA.HBA_JOINED.HBA_170_230.delay.X = 1.649365e-05
+PIC.Core.CS501HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.649365e-05
PIC.Core.CS501HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.CS501HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.CS501HBA.HBA_JOINED.HBA_210_250.delay.X = 1.649254e-05
-PIC.Core.CS501HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.649262e-05
-PIC.Core.CS501LBA.LBA_INNER.LBA_10_70.phase0.X = 4.250000e-02
-PIC.Core.CS501LBA.LBA_INNER.LBA_10_70.phase0.Y = 1.825000e-01
-PIC.Core.CS501LBA.LBA_INNER.LBA_10_70.delay.X = 1.648966e-05
-PIC.Core.CS501LBA.LBA_INNER.LBA_10_70.delay.Y = 1.649017e-05
-PIC.Core.CS501LBA.LBA_INNER.LBA_10_90.phase0.X = 4.250000e-02
-PIC.Core.CS501LBA.LBA_INNER.LBA_10_90.phase0.Y = 1.825000e-01
-PIC.Core.CS501LBA.LBA_INNER.LBA_10_90.delay.X = 1.648966e-05
-PIC.Core.CS501LBA.LBA_INNER.LBA_10_90.delay.Y = 1.649017e-05
-PIC.Core.CS501LBA.LBA_INNER.LBA_30_70.phase0.X = 4.250000e-02
-PIC.Core.CS501LBA.LBA_INNER.LBA_30_70.phase0.Y = 1.825000e-01
-PIC.Core.CS501LBA.LBA_INNER.LBA_30_70.delay.X = 1.648966e-05
-PIC.Core.CS501LBA.LBA_INNER.LBA_30_70.delay.Y = 1.649017e-05
-PIC.Core.CS501LBA.LBA_INNER.LBA_30_90.phase0.X = 4.250000e-02
-PIC.Core.CS501LBA.LBA_INNER.LBA_30_90.phase0.Y = 1.825000e-01
-PIC.Core.CS501LBA.LBA_INNER.LBA_30_90.delay.X = 1.648966e-05
-PIC.Core.CS501LBA.LBA_INNER.LBA_30_90.delay.Y = 1.649017e-05
-PIC.Core.CS501LBA.LBA_OUTER.LBA_10_70.phase0.X = 1.870000e-01
-PIC.Core.CS501LBA.LBA_OUTER.LBA_10_70.phase0.Y = 2.020000e-01
-PIC.Core.CS501LBA.LBA_OUTER.LBA_10_70.delay.X = 1.649072e-05
-PIC.Core.CS501LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.649006e-05
-PIC.Core.CS501LBA.LBA_OUTER.LBA_10_90.phase0.X = 1.870000e-01
-PIC.Core.CS501LBA.LBA_OUTER.LBA_10_90.phase0.Y = 2.020000e-01
-PIC.Core.CS501LBA.LBA_OUTER.LBA_10_90.delay.X = 1.649072e-05
-PIC.Core.CS501LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.649006e-05
-PIC.Core.CS501LBA.LBA_OUTER.LBA_30_70.phase0.X = 1.870000e-01
-PIC.Core.CS501LBA.LBA_OUTER.LBA_30_70.phase0.Y = 2.020000e-01
-PIC.Core.CS501LBA.LBA_OUTER.LBA_30_70.delay.X = 1.649072e-05
-PIC.Core.CS501LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.649006e-05
-PIC.Core.CS501LBA.LBA_OUTER.LBA_30_90.phase0.X = 1.870000e-01
-PIC.Core.CS501LBA.LBA_OUTER.LBA_30_90.phase0.Y = 2.020000e-01
-PIC.Core.CS501LBA.LBA_OUTER.LBA_30_90.delay.X = 1.649072e-05
-PIC.Core.CS501LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.649006e-05
-PIC.Core.DE601HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL.HBA_110_190.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL.HBA_110_190.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL.HBA_170_230.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL.HBA_170_230.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL.HBA_210_250.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL.HBA_210_250.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_JOINED.HBA_110_190.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_JOINED.HBA_170_230.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_JOINED.HBA_210_250.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ONE.HBA_110_190.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ONE.HBA_110_190.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ONE.HBA_170_230.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ONE.HBA_170_230.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ONE.HBA_210_250.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ONE.HBA_210_250.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ZERO.HBA_110_190.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ZERO.HBA_110_190.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ZERO.HBA_170_230.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ZERO.HBA_170_230.delay.Y = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE601HBA.HBA_ZERO.HBA_210_250.delay.X = 1.100000e-06
-PIC.Core.DE601HBA.HBA_ZERO.HBA_210_250.delay.Y = 1.100000e-06
-PIC.Core.DE601LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE601LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE601LBA.LBA_INNER.LBA_10_70.delay.X = 1.100000e-06
-PIC.Core.DE601LBA.LBA_INNER.LBA_10_70.delay.Y = 1.100000e-06
-PIC.Core.DE601LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE601LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE601LBA.LBA_INNER.LBA_10_90.delay.X = 1.100000e-06
-PIC.Core.DE601LBA.LBA_INNER.LBA_10_90.delay.Y = 1.100000e-06
-PIC.Core.DE601LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE601LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE601LBA.LBA_INNER.LBA_30_70.delay.X = 1.100000e-06
-PIC.Core.DE601LBA.LBA_INNER.LBA_30_70.delay.Y = 1.100000e-06
-PIC.Core.DE601LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE601LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE601LBA.LBA_INNER.LBA_30_90.delay.X = 1.100000e-06
-PIC.Core.DE601LBA.LBA_INNER.LBA_30_90.delay.Y = 1.100000e-06
-PIC.Core.DE601LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE601LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE601LBA.LBA_OUTER.LBA_10_70.delay.X = 1.100000e-06
-PIC.Core.DE601LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.100000e-06
-PIC.Core.DE601LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE601LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE601LBA.LBA_OUTER.LBA_10_90.delay.X = 1.100000e-06
-PIC.Core.DE601LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.100000e-06
-PIC.Core.DE601LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE601LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE601LBA.LBA_OUTER.LBA_30_70.delay.X = 1.100000e-06
-PIC.Core.DE601LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.100000e-06
-PIC.Core.DE601LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE601LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE601LBA.LBA_OUTER.LBA_30_90.delay.X = 1.100000e-06
-PIC.Core.DE601LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.100000e-06
-PIC.Core.DE602HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE602HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE602LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE603HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE603LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE604HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE604LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE605HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE605LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.DE609HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.DE609LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.FR606HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.FR606LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS106HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.CS501HBA.HBA_JOINED.HBA_210_250.delay.X = 1.649365e-05
+PIC.Core.CS501HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.649365e-05
PIC.Core.RS106LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS106LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS106LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS106LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS106LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS106LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS106LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS106LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS106LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -3506,42 +2802,110 @@ PIC.Core.RS106LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS106LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS106LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS106LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS106LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS106LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS106LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS106LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS106LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS106LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS106HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.RS205LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
PIC.Core.RS205HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.RS205HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
PIC.Core.RS205HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
@@ -3554,18 +2918,18 @@ PIC.Core.RS205HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.RS205HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
PIC.Core.RS205HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
PIC.Core.RS205HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS205HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS205HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.RS205HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
PIC.Core.RS205HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
@@ -3578,110 +2942,42 @@ PIC.Core.RS205HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.RS205HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
PIC.Core.RS205HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
PIC.Core.RS205HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.RS205LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS208HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS205HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS208LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS208LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS208LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS208LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS208LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS208LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS208LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS208LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -3690,90 +2986,90 @@ PIC.Core.RS208LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS208LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS208LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS208LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS208LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS208LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS208LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS208LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS208LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS208LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS210HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS208HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS210LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS210LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS210LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS210LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS210LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS210LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS210LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS210LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -3782,90 +3078,90 @@ PIC.Core.RS210LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS210LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS210LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS210LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS210LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS210LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS210LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS210LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS210LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS210LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS305HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS210HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS305LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS305LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS305LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS305LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS305LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS305LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS305LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS305LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -3874,90 +3170,90 @@ PIC.Core.RS305LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS305LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS305LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS305LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS305LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS305LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS305LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS305LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS305LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS305LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS306HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS305HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS306LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS306LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS306LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS306LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS306LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS306LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS306LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS306LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -3966,90 +3262,90 @@ PIC.Core.RS306LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS306LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS306LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS306LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS306LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS306LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS306LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS306LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS306LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS306LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS307HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS306HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS307LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS307LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS307LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS307LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS307LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS307LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS307LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS307LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -4058,90 +3354,90 @@ PIC.Core.RS307LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS307LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS307LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS307LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS307LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS307LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS307LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS307LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS307LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS307LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS310HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS307HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS310LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS310LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS310LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS310LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS310LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS310LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS310LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS310LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -4150,90 +3446,90 @@ PIC.Core.RS310LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS310LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS310LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS310LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS310LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS310LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS310LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS310LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS310LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS310LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS406HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS310HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS406LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS406LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS406LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS406LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS406LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS406LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS406LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS406LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -4242,90 +3538,90 @@ PIC.Core.RS406LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS406LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS406LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS406LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS406LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS406LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS406LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS406LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS406LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS406LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS407HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS406HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS407LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS407LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS407LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS407LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS407LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS407LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS407LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS407LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -4334,182 +3630,182 @@ PIC.Core.RS407LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS407LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS407LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS407LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS407LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS407LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS407LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS407LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS407LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS407LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS409HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.RS409LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS503HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS407HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.RS409LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS409HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS503LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS503LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS503LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS503LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS503LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS503LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS503LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS503LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -4518,42 +3814,110 @@ PIC.Core.RS503LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS503LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS503LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS503LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS503LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS503LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS503LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS503LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS503LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS503LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS503HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.RS508LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
PIC.Core.RS508HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.RS508HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
PIC.Core.RS508HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
@@ -4566,18 +3930,18 @@ PIC.Core.RS508HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.RS508HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
PIC.Core.RS508HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
PIC.Core.RS508HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS508HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS508HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
PIC.Core.RS508HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
PIC.Core.RS508HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
@@ -4590,110 +3954,42 @@ PIC.Core.RS508HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
PIC.Core.RS508HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
PIC.Core.RS508HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
PIC.Core.RS508HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
-PIC.Core.RS508LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.RS509HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS508HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS509LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS509LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS509LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS509LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS509LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS509LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS509LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS509LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -4702,90 +3998,642 @@ PIC.Core.RS509LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.RS509LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.RS509LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.RS509LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.RS509LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.RS509LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.RS509LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.RS509LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.RS509LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.RS509LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.SE607HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.RS509HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE601LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE601LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE601LBA.LBA_INNER.LBA_10_70.delay.X = 1.100000e-06
+PIC.Core.DE601LBA.LBA_INNER.LBA_10_70.delay.Y = 1.100000e-06
+PIC.Core.DE601LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE601LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE601LBA.LBA_INNER.LBA_30_70.delay.X = 1.100000e-06
+PIC.Core.DE601LBA.LBA_INNER.LBA_30_70.delay.Y = 1.100000e-06
+PIC.Core.DE601LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE601LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE601LBA.LBA_INNER.LBA_10_90.delay.X = 1.100000e-06
+PIC.Core.DE601LBA.LBA_INNER.LBA_10_90.delay.Y = 1.100000e-06
+PIC.Core.DE601LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE601LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE601LBA.LBA_INNER.LBA_30_90.delay.X = 1.100000e-06
+PIC.Core.DE601LBA.LBA_INNER.LBA_30_90.delay.Y = 1.100000e-06
+PIC.Core.DE601LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE601LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE601LBA.LBA_OUTER.LBA_10_70.delay.X = 1.100000e-06
+PIC.Core.DE601LBA.LBA_OUTER.LBA_10_70.delay.Y = 1.100000e-06
+PIC.Core.DE601LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE601LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE601LBA.LBA_OUTER.LBA_30_70.delay.X = 1.100000e-06
+PIC.Core.DE601LBA.LBA_OUTER.LBA_30_70.delay.Y = 1.100000e-06
+PIC.Core.DE601LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE601LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE601LBA.LBA_OUTER.LBA_10_90.delay.X = 1.100000e-06
+PIC.Core.DE601LBA.LBA_OUTER.LBA_10_90.delay.Y = 1.100000e-06
+PIC.Core.DE601LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE601LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE601LBA.LBA_OUTER.LBA_30_90.delay.X = 1.100000e-06
+PIC.Core.DE601LBA.LBA_OUTER.LBA_30_90.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_JOINED.HBA_110_190.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_JOINED.HBA_110_190.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_JOINED.HBA_170_230.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_JOINED.HBA_170_230.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_JOINED.HBA_210_250.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_JOINED.HBA_210_250.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL.HBA_110_190.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL.HBA_110_190.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL.HBA_170_230.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL.HBA_170_230.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL.HBA_210_250.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL.HBA_210_250.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ZERO.HBA_110_190.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ZERO.HBA_110_190.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ZERO.HBA_170_230.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ZERO.HBA_170_230.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ZERO.HBA_210_250.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ZERO.HBA_210_250.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ONE.HBA_110_190.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ONE.HBA_110_190.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ONE.HBA_170_230.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ONE.HBA_170_230.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_ONE.HBA_210_250.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_ONE.HBA_210_250.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 1.100000e-06
+PIC.Core.DE601HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 1.100000e-06
+PIC.Core.DE602LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.DE602LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE602HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.DE603LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE603HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.DE604LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE604HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.DE605LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.DE605HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_INNER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
+PIC.Core.FR606LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.FR606HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.SE607LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.SE607LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.SE607LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.SE607LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.SE607LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.SE607LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.SE607LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.SE607LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -4794,90 +4642,90 @@ PIC.Core.SE607LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.SE607LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.SE607LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.SE607LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.SE607LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.SE607LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.SE607LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.SE607LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.SE607LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.SE607LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
-PIC.Core.UK608HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.SE607HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.UK608LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.UK608LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.UK608LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.UK608LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.UK608LBA.LBA_INNER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.UK608LBA.LBA_INNER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.UK608LBA.LBA_INNER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.UK608LBA.LBA_INNER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_INNER.LBA_30_90.delay.X = 0.000000e+00
@@ -4886,15 +4734,75 @@ PIC.Core.UK608LBA.LBA_OUTER.LBA_10_70.phase0.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_10_70.phase0.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_10_70.delay.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.000000e+00
-PIC.Core.UK608LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
-PIC.Core.UK608LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
-PIC.Core.UK608LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
-PIC.Core.UK608LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_30_70.phase0.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_30_70.phase0.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_30_70.delay.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.000000e+00
+PIC.Core.UK608LBA.LBA_OUTER.LBA_10_90.phase0.X = 0.000000e+00
+PIC.Core.UK608LBA.LBA_OUTER.LBA_10_90.phase0.Y = 0.000000e+00
+PIC.Core.UK608LBA.LBA_OUTER.LBA_10_90.delay.X = 0.000000e+00
+PIC.Core.UK608LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_30_90.phase0.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_30_90.phase0.Y = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_30_90.delay.X = 0.000000e+00
PIC.Core.UK608LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_JOINED.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ZERO.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_ONE.HBA_210_250.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_110_190.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_110_190.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_170_230.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_170_230.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_210_250.phase0.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_210_250.phase0.Y = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.000000e+00
+PIC.Core.UK608HBA.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.000000e+00
diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset
index 7b95957742bfeba7f8f4b223a740c6dd352914bc..f4b00e107f039c0db22daec8a29d4f09e3e3f868 100644
--- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset
+++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset
@@ -212,9 +212,9 @@ PIC.Core.DE605HBA.RSP.receiver = cbt008_1
PIC.Core.DE605LBA.RSP.ports = [udp:10.211.5.50:16050, udp:10.212.5.50:16051, udp:10.213.5.50:16052, udp:10.214.5.50:16053]
PIC.Core.DE605LBA.RSP.receiver = cbt008_1
PIC.Core.DE609HBA.RSP.ports = [udp:10.200.91.50:16090, udp:10.200.91.50:16091, udp:10.200.92.50:16092, udp:10.200.92.50:16093]
-PIC.Core.DE609HBA.RSP.receiver = cbt005_1
+PIC.Core.DE609HBA.RSP.receiver = cbt008_1
PIC.Core.DE609LBA.RSP.ports = [udp:10.200.91.50:16090, udp:10.200.91.50:16091, udp:10.200.92.50:16092, udp:10.200.92.50:16093]
-PIC.Core.DE609LBA.RSP.receiver = cbt005_1
+PIC.Core.DE609LBA.RSP.receiver = cbt008_1
PIC.Core.FR606HBA.RSP.ports = [udp:10.211.6.50:16060, udp:10.212.6.50:16061, udp:10.213.6.50:16062, udp:10.214.6.50:16063]
PIC.Core.FR606HBA.RSP.receiver = cbt005_1
PIC.Core.FR606LBA.RSP.ports = [udp:10.211.6.50:16060, udp:10.212.6.50:16061, udp:10.213.6.50:16062, udp:10.214.6.50:16063]
@@ -247,10 +247,10 @@ PIC.Core.RS306HBA.RSP.ports = [udp:cbt005-10GB01:13060, udp:cbt005-10GB01:13
PIC.Core.RS306HBA.RSP.receiver = cbt005_0
PIC.Core.RS306LBA.RSP.ports = [udp:cbt005-10GB01:13060, udp:cbt005-10GB01:13061, udp:cbt005-10GB01:13062, udp:cbt005-10GB01:13063]
PIC.Core.RS306LBA.RSP.receiver = cbt005_0
-PIC.Core.RS307HBA.RSP.ports = [udp:cbt008-10GB04:13070, udp:cbt008-10GB04:13071, udp:cbt008-10GB04:13072, udp:cbt008-10GB04:13073]
-PIC.Core.RS307HBA.RSP.receiver = cbt008_1
-PIC.Core.RS307LBA.RSP.ports = [udp:cbt008-10GB04:13070, udp:cbt008-10GB04:13071, udp:cbt008-10GB04:13072, udp:cbt008-10GB04:13073]
-PIC.Core.RS307LBA.RSP.receiver = cbt008_1
+PIC.Core.RS307HBA.RSP.ports = [udp:cbt008-10GB01:13070, udp:cbt008-10GB01:13071, udp:cbt008-10GB01:13072, udp:cbt008-10GB01:13073]
+PIC.Core.RS307HBA.RSP.receiver = cbt008_0
+PIC.Core.RS307LBA.RSP.ports = [udp:cbt008-10GB01:13070, udp:cbt008-10GB01:13071, udp:cbt008-10GB01:13072, udp:cbt008-10GB01:13073]
+PIC.Core.RS307LBA.RSP.receiver = cbt008_0
PIC.Core.RS310HBA.RSP.ports = [udp:cbt002-10GB04:13100, udp:cbt002-10GB04:13101, udp:cbt002-10GB04:13102, udp:cbt002-10GB04:13103]
PIC.Core.RS310HBA.RSP.receiver = cbt002_1
PIC.Core.RS310LBA.RSP.ports = [udp:cbt002-10GB04:13100, udp:cbt002-10GB04:13101, udp:cbt002-10GB04:13102, udp:cbt002-10GB04:13103]
diff --git a/RTCP/Cobalt/GPUProc/src/CommandThread.cc b/RTCP/Cobalt/GPUProc/src/CommandThread.cc
index 810709a56edeaf12159d09ac741891f7c1684830..be0349f946c982999e5f1adbe83c414c71a7eb07 100644
--- a/RTCP/Cobalt/GPUProc/src/CommandThread.cc
+++ b/RTCP/Cobalt/GPUProc/src/CommandThread.cc
@@ -23,8 +23,8 @@
#include "CommandThread.h"
#include <Common/LofarLogger.h>
+#include <Stream/StreamFactory.h>
#include <CoInterface/MultiDimArray.h>
-#include <CoInterface/Stream.h>
#include <InputProc/Transpose/MPIProtocol.h>
#include <InputProc/Transpose/MPIUtil.h>
@@ -59,7 +59,7 @@ namespace LOFAR {
LOG_INFO_STR("[CommandThread] Received command: '" << command << "'");
return command;
- } catch(Stream::EndOfStreamException &) {
+ } catch(EndOfStreamException &) {
LOG_INFO("[CommandThread] Connection reset by peer");
} catch(OMPThreadSet::CannotStartException &) {
/* stop() was called */
diff --git a/RTCP/Cobalt/GPUProc/src/Station/StationInput.cc b/RTCP/Cobalt/GPUProc/src/Station/StationInput.cc
index a459da0af621d9f4de2c6d9352b6d4373d86b4af..d762ff061d658c292954c1aad8b99aac70711ac2 100644
--- a/RTCP/Cobalt/GPUProc/src/Station/StationInput.cc
+++ b/RTCP/Cobalt/GPUProc/src/Station/StationInput.cc
@@ -39,6 +39,7 @@
#include <Common/LofarLogger.h>
#include <Common/Timer.h>
#include <Stream/FileStream.h>
+#include <Stream/StreamFactory.h>
#include <CoInterface/Parset.h>
#include <CoInterface/OMPThread.h>
#include <CoInterface/TimeFuncs.h>
@@ -289,7 +290,7 @@ namespace LOFAR {
outputQueue.append(rspData);
}
- } catch (Stream::EndOfStreamException &ex) {
+ } catch (EndOfStreamException &ex) {
// Ran out of data
LOG_INFO_STR( logPrefix << "End of stream");
@@ -404,7 +405,7 @@ namespace LOFAR {
// Retry until we have a valid packet
while (!readers[board]->readPacket(last_packets[board]))
;
- } catch (Stream::EndOfStreamException &ex) {
+ } catch (EndOfStreamException &ex) {
// Ran out of data
LOG_INFO_STR( logPrefix << "End of stream");
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/Pipelines/Pipeline.cc b/RTCP/Cobalt/GPUProc/src/cuda/Pipelines/Pipeline.cc
index 942726e88376f83d45e3265646612f5080d5bfb4..9ff49da785934ee2f3e09f69e84c45e7dac719bd 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/Pipelines/Pipeline.cc
+++ b/RTCP/Cobalt/GPUProc/src/cuda/Pipelines/Pipeline.cc
@@ -33,6 +33,7 @@
#include <Stream/Stream.h>
#include <Stream/FileStream.h>
#include <Stream/NullStream.h>
+#include <Stream/StreamFactory.h>
#include <CoInterface/Align.h>
#include <CoInterface/BudgetTimer.h>
diff --git a/RTCP/Cobalt/GPUProc/src/opencl/Pipelines/CorrelatorPipeline.cc b/RTCP/Cobalt/GPUProc/src/opencl/Pipelines/CorrelatorPipeline.cc
index 0b27e32f09a838e2e5a20a071f073ec9260a4241..dca433a4d19e0c130bd0a505e174a6a82c5473c9 100644
--- a/RTCP/Cobalt/GPUProc/src/opencl/Pipelines/CorrelatorPipeline.cc
+++ b/RTCP/Cobalt/GPUProc/src/opencl/Pipelines/CorrelatorPipeline.cc
@@ -29,6 +29,7 @@
#include <Stream/Stream.h>
#include <Stream/FileStream.h>
#include <Stream/NullStream.h>
+#include <Stream/StreamDescriptor.h>
#include <CoInterface/CorrelatedData.h>
#include <CoInterface/Stream.h>
diff --git a/RTCP/Cobalt/GPUProc/src/scripts/record_raw_data.sh b/RTCP/Cobalt/GPUProc/src/scripts/record_raw_data.sh
index 6d2e362d4ad972e7a0bef50a5bb246ec73c86f3b..ac5778c593be0636791f2ff41449739fc40d7ed2 100755
--- a/RTCP/Cobalt/GPUProc/src/scripts/record_raw_data.sh
+++ b/RTCP/Cobalt/GPUProc/src/scripts/record_raw_data.sh
@@ -178,13 +178,22 @@ do
DESTPORT=$((LOCUS_FIRST_PORT + LOCUSIDX))
LOCUSIDX=$((LOCUSIDX + 1))
+ # The interface Cobalt uses to connect to the given locus node:
+ # locus001..025 -> 10GB01
+ # locus026..050 -> 10GB02
+ # locus051..075 -> 10GB03
+ # locus076..100 -> 10GB04
+ LOCUS_COBALT_IFACE_NR=`echo "(${LOCUS_NODES[$DESTNODENR]}-1) / 25 + 1" | bc`
+ COBALT_NODE=`echo $IFACE | cut -d- -f 1`
+ LOCUS_COBALT_IFACE="${COBALT_NODE}-10GB0${LOCUS_COBALT_IFACE_NR}"
+
OUTSTREAM="tcp:$DESTNODE:$DESTPORT"
FILESTREAM="file:/data/raw-$NAME-$NOW-$s-$b.udp"
echo "# stream $s board $b [$OUTSTREAM -> $FILESTREAM]" >> record-locus.sh
echo ssh $DESTNODE \"/globalhome/romein/bin.x86_64/udp-copy tcp:0:$DESTPORT $FILESTREAM\" "&" >> record-locus.sh
- OBS_INSTREAM="tcp:$IFACE:$DESTPORT"
+ OBS_INSTREAM="tcp:$LOCUS_COBALT_IFACE:$DESTPORT"
echo "ssh $DESTNODE \"/globalhome/romein/bin.x86_64/udp-copy $FILESTREAM $OBS_INSTREAM \"" "&" >> replay.sh
;;
esac
diff --git a/RTCP/Cobalt/InputProc/src/Station/Generator.cc b/RTCP/Cobalt/InputProc/src/Station/Generator.cc
index 31e55581597542359ba2843e8319d44a951b6cfc..dcc2c6355218b4aab9dffb533124ea6e923ca2a4 100644
--- a/RTCP/Cobalt/InputProc/src/Station/Generator.cc
+++ b/RTCP/Cobalt/InputProc/src/Station/Generator.cc
@@ -85,7 +85,7 @@ namespace LOFAR
current += packet.header.nrBlocks;
}
- } catch (Stream::EndOfStreamException &ex) {
+ } catch (EndOfStreamException &ex) {
LOG_INFO_STR( logPrefix << "End of stream");
} catch (SystemCallException &ex) {
if (ex.error == EINTR)
diff --git a/RTCP/Cobalt/InputProc/src/Station/filterRSP.cc b/RTCP/Cobalt/InputProc/src/Station/filterRSP.cc
index e979ffc278ccd09fe0d80654350c83080e6bbfd4..c3972602f95e75e4cdb0a47f2bcbe0b723c8af0f 100644
--- a/RTCP/Cobalt/InputProc/src/Station/filterRSP.cc
+++ b/RTCP/Cobalt/InputProc/src/Station/filterRSP.cc
@@ -30,8 +30,8 @@
#include <Common/Thread/Queue.h>
#include <Common/Thread/Thread.h>
#include <Common/LofarLogger.h>
+#include <Stream/StreamFactory.h>
#include <ApplCommon/PosixTime.h>
-#include <CoInterface/Stream.h>
#include <CoInterface/SmartPtr.h>
#include "RSP.h"
#include "PacketReader.h"
@@ -171,7 +171,7 @@ int main(int argc, char **argv)
reader.readPackets(p->packets);
writeQueue.append(p);
}
- } catch(Stream::EndOfStreamException&) {
+ } catch(EndOfStreamException&) {
}
writeQueue.append(NULL);
diff --git a/RTCP/Cobalt/InputProc/src/Station/generate.cc b/RTCP/Cobalt/InputProc/src/Station/generate.cc
index 6687344c1d76baf605309884a1e7b0bfa6bb3c00..a4b8b47d7e917874ecb84a1bf3665bd26393058c 100644
--- a/RTCP/Cobalt/InputProc/src/Station/generate.cc
+++ b/RTCP/Cobalt/InputProc/src/Station/generate.cc
@@ -25,7 +25,7 @@
#include <omp.h>
#include <Common/LofarLogger.h>
-#include <CoInterface/Stream.h>
+#include <Stream/StreamFactory.h>
#include <InputProc/Station/PacketFactory.h>
#include <InputProc/Station/Generator.h>
diff --git a/RTCP/Cobalt/InputProc/src/Station/generateRSP.cc b/RTCP/Cobalt/InputProc/src/Station/generateRSP.cc
index b11e6f65da29872f58c2cace93e08696214bea5c..7d03614d4580ffdc2815feb6be083f16dd090ad6 100644
--- a/RTCP/Cobalt/InputProc/src/Station/generateRSP.cc
+++ b/RTCP/Cobalt/InputProc/src/Station/generateRSP.cc
@@ -31,8 +31,8 @@
#include <Common/LofarLogger.h>
#include <ApplCommon/PosixTime.h>
+#include <Stream/StreamFactory.h>
#include <CoInterface/SmartPtr.h>
-#include <CoInterface/Stream.h>
#include <InputProc/Buffer/BoardMode.h>
#include <InputProc/RSPTimeStamp.h>
#include <InputProc/Station/RSP.h>
diff --git a/RTCP/Cobalt/InputProc/src/Station/printRSP.cc b/RTCP/Cobalt/InputProc/src/Station/printRSP.cc
index 7adc2a17838414a901b11cd5fde3d652f416e39d..7b22f4e70f142b23acbc39617cab0bc606ccb7ea 100644
--- a/RTCP/Cobalt/InputProc/src/Station/printRSP.cc
+++ b/RTCP/Cobalt/InputProc/src/Station/printRSP.cc
@@ -68,7 +68,7 @@ void report( const string &filename )
// read payload
f.read( &packet.payload, packet.packetSize() - sizeof (RSP::Header) );
}
- } catch(Stream::EndOfStreamException &) {
+ } catch(EndOfStreamException &) {
}
}
diff --git a/RTCP/Cobalt/InputProc/src/Station/repairRSP.cc b/RTCP/Cobalt/InputProc/src/Station/repairRSP.cc
index ec50ac68fba14fa8699b75f05391bb6fb8f626b2..650de89400f52831fb74bdcfa0d2ef61df82e174 100644
--- a/RTCP/Cobalt/InputProc/src/Station/repairRSP.cc
+++ b/RTCP/Cobalt/InputProc/src/Station/repairRSP.cc
@@ -31,7 +31,7 @@
#include <Common/Thread/Thread.h>
#include <Common/LofarLogger.h>
#include <ApplCommon/PosixTime.h>
-#include <CoInterface/Stream.h>
+#include <Stream/StreamFactory.h>
#include <CoInterface/SmartPtr.h>
#include "RSP.h"
#include "PacketReader.h"
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
// Write packet
outputStream->write(&packet, packet.packetSize());
}
- } catch(Stream::EndOfStreamException&) {
+ } catch(EndOfStreamException&) {
}
}
diff --git a/RTCP/Cobalt/InputProc/test/tGenerator.cc b/RTCP/Cobalt/InputProc/test/tGenerator.cc
index ebd38d779781fcc44a57af9c8b699ddebb9daf84..8ffc79708f0423a8c131c2563e9f412f2dec95b6 100644
--- a/RTCP/Cobalt/InputProc/test/tGenerator.cc
+++ b/RTCP/Cobalt/InputProc/test/tGenerator.cc
@@ -26,7 +26,7 @@
#include <omp.h>
#include <Common/LofarLogger.h>
-#include <CoInterface/Stream.h>
+#include <Stream/StreamFactory.h>
#include <CoInterface/OMPThread.h>
#include <InputProc/Station/PacketFactory.h>
diff --git a/RTCP/Cobalt/InputProc/test/tPacketReader.cc b/RTCP/Cobalt/InputProc/test/tPacketReader.cc
index ae0333a6b051c44018d55eb158e1d24d929e9040..a689800de0a9123c892c5068d12d9f77ea6ca34b 100644
--- a/RTCP/Cobalt/InputProc/test/tPacketReader.cc
+++ b/RTCP/Cobalt/InputProc/test/tPacketReader.cc
@@ -51,7 +51,7 @@ void test(const std::string &filename, unsigned bitmode, unsigned nrPackets)
for( size_t i = 0; i < 3; ++i) {
try {
ASSERT( !reader.readPacket(packet) );
- } catch (Stream::EndOfStreamException &ex) {
+ } catch (EndOfStreamException &ex) {
// expected
}
}
diff --git a/RTCP/Cobalt/InputProc/test/t_generateRSP.cc b/RTCP/Cobalt/InputProc/test/t_generateRSP.cc
index 0bbe4525cb616a39803e1525e65be61ad225a855..119467fbf92c22698e61ef04a96a6737c10e1e30 100644
--- a/RTCP/Cobalt/InputProc/test/t_generateRSP.cc
+++ b/RTCP/Cobalt/InputProc/test/t_generateRSP.cc
@@ -85,7 +85,7 @@ void read_rsp(Stream& is, ostream& os, unsigned bitMode, unsigned nrSubbands)
}
os << endl;
}
- } catch (Stream::EndOfStreamException&) { }
+ } catch (EndOfStreamException&) { }
}
int main()
diff --git a/RTCP/Cobalt/OutputProc/src/InputThread.cc b/RTCP/Cobalt/OutputProc/src/InputThread.cc
index e636374c33e074c9af41d87b7aae29887b670db5..f520d26ddbeed9c844aa5f8d1354aacb7687bbbb 100644
--- a/RTCP/Cobalt/OutputProc/src/InputThread.cc
+++ b/RTCP/Cobalt/OutputProc/src/InputThread.cc
@@ -26,6 +26,7 @@
#include <Common/Timer.h>
#include <Stream/NullStream.h>
#include <Stream/SocketStream.h>
+#include <Stream/StreamFactory.h>
#include <CoInterface/Stream.h>
@@ -57,9 +58,9 @@ namespace LOFAR
LOG_DEBUG_STR(itsLogPrefix << "Read block with seqno = " << data->sequenceNumber());
}
- } catch (SocketStream::TimeOutException &) {
+ } catch (TimeOutException &) {
LOG_WARN_STR(itsLogPrefix << "Connection from " << itsInputDescriptor << " timed out");
- } catch (Stream::EndOfStreamException &) {
+ } catch (EndOfStreamException &) {
LOG_INFO_STR(itsLogPrefix << "Connection from " << itsInputDescriptor << " closed");
} catch (SystemCallException &ex) {
LOG_WARN_STR(itsLogPrefix << "Connection from " << itsInputDescriptor << " failed: " << ex.text());
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Writer.cc b/RTCP/Cobalt/OutputProc/src/TBB_Writer.cc
index 15fc6a768ec068d68d8acefcefe3e5dcdeeba58a..6ff57faea260c9462cc668b131df931cb53c6421 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_Writer.cc
+++ b/RTCP/Cobalt/OutputProc/src/TBB_Writer.cc
@@ -52,9 +52,8 @@
#include <Common/StringUtil.h>
#include <Common/StreamUtil.h>
#include <ApplCommon/AntField.h>
-#include <Stream/SocketStream.h>
+#include <Stream/StreamFactory.h>
#include <CoInterface/Exceptions.h>
-#include <CoInterface/Stream.h>
#include <dal/lofar/StationNames.h>
@@ -1061,7 +1060,7 @@ namespace LOFAR
} catch (exception& exc) {
LOG_WARN_STR(itsLogPrefix << "may have lost a frame buffer (1): " << exc.what());
}
- } catch (Stream::EndOfStreamException& ) { // after end of stream, for input from file or pipe
+ } catch (EndOfStreamException& ) { // after end of stream, for input from file or pipe
break;
} catch (exception& exc) {
LOG_FATAL_STR(itsLogPrefix << exc.what());
diff --git a/RTCP/Cobalt/OutputProc/src/plotMS.cc b/RTCP/Cobalt/OutputProc/src/plotMS.cc
index 226ee955ba47d42f607eafc7121e49c642f4a625..504da3040c1f1e5eeb48c95d38a785b281f40f68 100644
--- a/RTCP/Cobalt/OutputProc/src/plotMS.cc
+++ b/RTCP/Cobalt/OutputProc/src/plotMS.cc
@@ -195,7 +195,7 @@ int main(int argc, char *argv[])
for(;; ) {
try {
data->read(&datafile, true, 512);
- } catch (Stream::EndOfStreamException &) {
+ } catch (EndOfStreamException &) {
break;
}
//data->peerMagicNumber = 0xda7a0000; // fake wrong endianness to circumvent bug
diff --git a/RTCP/Cobalt/OutputProc/test/tSubbandWriter.cc b/RTCP/Cobalt/OutputProc/test/tSubbandWriter.cc
index 02d5cd431e7757627926383bc6386980a210c2c8..f68e6fea6d00e8075ba67ee05737e836b2fddcc0 100644
--- a/RTCP/Cobalt/OutputProc/test/tSubbandWriter.cc
+++ b/RTCP/Cobalt/OutputProc/test/tSubbandWriter.cc
@@ -22,14 +22,17 @@
#include <string>
#include <cstdlib>
+#include <string>
#include <omp.h>
-#include <UnitTest++.h>
+
#include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
+#include <Stream/StreamFactory.h>
+#include <Stream/PortBroker.h>
#include <CoInterface/CorrelatedData.h>
#include <CoInterface/Stream.h>
#include <OutputProc/SubbandWriter.h>
-#include <Stream/PortBroker.h>
#include <MSLofar/FailedTileInfo.h>
#include <tables/Tables/Table.h>
@@ -37,8 +40,7 @@
#include <tables/Tables/ArrayColumn.h>
#include <casa/Quanta/MVTime.h>
-#include <boost/lexical_cast.hpp>
-#include <string>
+#include <UnitTest++.h>
using namespace std;
using namespace LOFAR;
diff --git a/SAS/OTB/OTB-distribution/pom.xml b/SAS/OTB/OTB-distribution/pom.xml
index 15c2c4d1404c0da27f1009871d0c35ed5e8ff9a2..6238f720a3504922073c07b2ff6140a2ac4f1741 100644
--- a/SAS/OTB/OTB-distribution/pom.xml
+++ b/SAS/OTB/OTB-distribution/pom.xml
@@ -10,18 +10,18 @@
<parent>
<groupId>nl.astron.lofar.sas.otb</groupId>
<artifactId>otb-parent</artifactId>
- <version>2.2.0</version>
+ <version>2.8.1-SNAPSHOT</version>
</parent>
<artifactId>OTB-distribution</artifactId>
- <version>2.2.0</version>
+ <version>2.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
<scm>
- <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/OTB-distribution</connection>
- <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/OTB-distribution</developerConnection>
+ <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-1.17.4/OTB-distribution</connection>
+ <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-1.17.4/OTB-distribution</developerConnection>
</scm>
diff --git a/SAS/OTB/OTB/pom.xml b/SAS/OTB/OTB/pom.xml
index 3cd1c5efe646c79e125e3e5124052f348bbb3472..302bb749833f0702f39d771c4bd142c6b787c3d4 100644
--- a/SAS/OTB/OTB/pom.xml
+++ b/SAS/OTB/OTB/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>nl.astron.lofar.sas.otb</groupId>
<artifactId>otb-parent</artifactId>
- <version>2.2.0</version>
+ <version>2.8.1-SNAPSHOT</version>
</parent>
<artifactId>OTB</artifactId>
@@ -23,8 +23,8 @@
<!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
<scm>
- <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/OTB</connection>
- <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/OTB</developerConnection>
+ <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/OTB</connection>
+ <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/OTB</developerConnection>
</scm>
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/Main.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/Main.java
index 2cef4d74e31142d629b5c5c7373e843d53d1293f..80f5059c0c3b09e4f7afdf0d75990b00a05abd37 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/Main.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/Main.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java
index f4d0bf82ebc2189eca109e70d5334ac092ece713..c3de11c8b1cc1033b32f029a7cb2abc60360bc1e 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/SharedVars.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/SharedVars.java
index a39470a0bf576bb57b01fefd5b52542c4e96e30a..e139703c44adf674846efa51ce68080c27e8bca1 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/SharedVars.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/SharedVars.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ConnectionFailedException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ConnectionFailedException.java
index e2727a69c8793ba8b24ca35c3207c33595150e83..c7563cd0ad5356d06eeaa51eea23d8bec4256595 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ConnectionFailedException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ConnectionFailedException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoAccessException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoAccessException.java
index 237f1e397f1f44adcd541bb950e6f7ee2315f23a..18809c0272915a63f8b10049a6e6bf7b45d68929 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoAccessException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoAccessException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoDatabaseException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoDatabaseException.java
index 4a32aac237f95431dc529376aba4e7bb3b9fb94e..c80fc24587deec5b67c4b924c6328adc9eb509f7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoDatabaseException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoDatabaseException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoServerConnectionException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoServerConnectionException.java
index 33f46f151dd988a3cb801a500dd4692a98ba1347..adb42b4e8c22bf3febb937046a43ae1f1744d131 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoServerConnectionException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoServerConnectionException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NotLoggedInException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NotLoggedInException.java
index dedab5855ab25925ee1945679ce06a0c16b3625a..10f6b8642bf279f1cc94f5f39426941647dc6451 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NotLoggedInException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NotLoggedInException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ParmDBConfigurationException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ParmDBConfigurationException.java
index e3b6eb124dd5fb7f2565ec8310b9fa9e1934f7a6..212dfc48cbcbc3d6e3ce7f2948c903dce5edab5c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ParmDBConfigurationException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ParmDBConfigurationException.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
index 7c0d7cb8d22336d4b192eebb0e6fc2b1e859698b..e6e7a97360c6f72b24525f1dda85679f7c9ce2d1 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/IPluginPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/IPluginPanel.java
index c26c87e2ab483df62efa15867e78f808a3a6cbf4..9937d01318884e0a369cf4346de0105906dcec91 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/IPluginPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/IPluginPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java
index 0cbdbd3bb6e075359221d7a76fd86508d1ce4d08..0b76b7eaaf103537540d7522f8c1ec0cfb170fb9 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java
index bc01ecbf79f89e872edd5389c6cb8977239ebc23..70b2fe3ff557b2f6f15f4a018e6c989c6fff401a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/SamplePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/SamplePanel.java
index 7568e25aae8831f44a7aa14004e735e538037adb..a3ece61072333242a3dbea3f0eaa0e71eb26035f 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/SamplePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/SamplePanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
index 60dc5902f240be6e3b34c95881bdadc9fd5d6efb..4c069bac2f4cef18f4bfcd357cf126f30802393a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/AccessRights.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/AccessRights.java
index d8a94056e6bf62904ee168d66ad3554fd153c748..619784321fb903b15cab45abe1da5e0c91229b52 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/AccessRights.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/AccessRights.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/CmdExec.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/CmdExec.java
index f056d3d62b3372b67548a27b905c31a9b8685ef9..4764a1fd77558d798e5e0169d80be8c846d44041 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/CmdExec.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/CmdExec.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ConfigPanelHelper.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ConfigPanelHelper.java
index 5a7b24bcdbd0ef95bf43d9e3459af883b41bfe59..ccb884f88019a2b7641464658bab0262493ede39 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ConfigPanelHelper.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ConfigPanelHelper.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/IViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/IViewPanel.java
index 0e7d862a6883e06bf2db7b22839117ab5258da2c..86ef14e478207705f2fa9a769753cd5d7055dedf 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/IViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/IViewPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/OtdbRmi.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/OtdbRmi.java
index 099129741c677a0c18274309c69f7fc0dce36312..cb44d8fd21a354a656ccea167cd4aeec6e9237e0 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/OtdbRmi.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/OtdbRmi.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ParmDBConfigurationHelper.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ParmDBConfigurationHelper.java
index f660c0b023ac18117e98e595e996d9ce0c4cfebe..b3323efa74d2d00cbe03969640e9b27743684f52 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ParmDBConfigurationHelper.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ParmDBConfigurationHelper.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ResultPanelHelper.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ResultPanelHelper.java
index 9b5bb4d6d5cbf71967e65847865ca905e2f6c222..f52a2b01214c83ec1e8e2f7bd23ed45aa27889c5 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ResultPanelHelper.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ResultPanelHelper.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/SerializableFileContents.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/SerializableFileContents.java
index 60a7e94adb12e8694af0d8e96b16e168e06acc17..075ae3f4b5ea673e09adb4cf59b6fdc7c2214331 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/SerializableFileContents.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/SerializableFileContents.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/StorageLocation.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/StorageLocation.java
index 5295de35d569f5c89fb21307cee22812e153cefb..b933f42ddb4fe881b88fbadfb27b9848250d2838 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/StorageLocation.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/StorageLocation.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/UserAccount.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/UserAccount.java
index d34bf839ba9d435f43634559e2bb99cb8267f383..a184ea46791b165821fd62abbecc93e614d51842 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/UserAccount.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/UserAccount.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/jParmDBnode.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/jParmDBnode.java
index 1a258236e8871235fca05abf46b8ba81f766b6c6..a82cf0c73db014d06807c306078f3b19344cf1aa 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/jParmDBnode.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/jParmDBnode.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotDataAccessParmDBImpl.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotDataAccessParmDBImpl.java
index 73fe928907365de89e517f9f4f936b89c37b89e0..198360b0835c722916f3b0e6ddc5e1f8db2d813d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotDataAccessParmDBImpl.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotDataAccessParmDBImpl.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroup.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroup.java
index 8d92d31f04d1f0b805c1befa426fb0e9d7d647eb..61cf1a47bcda6faea843ad1b1e576013943f4266 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroup.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroup.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupConfiguration.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupConfiguration.java
index 7b8d39d99cb47ea96550e5764f62ceff78665b35..ec7b0d73c75f19b43dd57f6e05c1eca1d3099540 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupConfiguration.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupConfiguration.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupManager.java
index a7f2387caf891b36cca67fac3559dd8ac1a5040a..0474f8bda62dc01108d1bc8b9ef72b319b6158b0 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlot.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlot.java
index 9adf9a043808dbc925ed241a99f00095b01dd6a8..40c8d318ae8fae04bdcb6a67cf284eab356da6ac 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlot.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlot.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotListener.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotListener.java
index 96fbc69f14865c78526a5a979f170274ded6e1d2..fc1e309968bcde45086a2af56ba75a23ae49b0e6 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotListener.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotListener.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotManager.java
index 67a604ef0c8ca862268a12d5d7918624d36e7596..a4e9e3267865dc50ab48cdb9d285c80d2d916bb1 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotViewFrame.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotViewFrame.java
index f9cd27cc073da3c377e1cbfcac90ce2c5a0a1442..72be636dbc6116f9dd47d45d1cc4f28322dcade2 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotViewFrame.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotViewFrame.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotsPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotsPanel.java
index 56225e56781947c3e035e6eff3a2acd877289f4d..48ffea689f5bde695d9a5989ecb7db1ea9074f79 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotsPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotsPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/AnaBeamConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/AnaBeamConfigurationTableModel.java
index 456a0e44bb4354cf28937705b8a8c4d84c6d569e..edb5c29528d6803fc6fab2194b13dd291d12ae3a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/AnaBeamConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/AnaBeamConfigurationTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2010
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamConfigurationTableModel.java
index 637c406b936468e7cd8e559624f782582bf263e7..4fa4ee39cfc869ea3a89d4bef3709d88f798624b 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamConfigurationTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamformerConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamformerConfigurationTableModel.java
index 0fdaa9cbde9f80a4c930b13bdf4aaebe9470c63e..3d8fdb122cb0c9a34884d71e65867b7cedad9fb9 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamformerConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamformerConfigurationTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ComponentTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ComponentTableModel.java
index bfa32636e2ef240b312b7a87301eda4cc0e1cc33..333020214757d1c4f6cffd6e1dfa34d39b15955d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ComponentTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ComponentTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/DefaultTemplatetableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/DefaultTemplatetableModel.java
index b0134ef1a0a878d8843457dc95c9a461014a018d..8214bc29d9183ed9cedf13208a858b5780751f55 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/DefaultTemplatetableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/DefaultTemplatetableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/InputNodeMACTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/InputNodeMACTableModel.java
index 1a0d200d6a153962880d84d08640707bc156eb5a..f48cb39849c847fe79ae2e6cb35f879308cd30a1 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/InputNodeMACTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/InputNodeMACTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/LogParamTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/LogParamTableModel.java
index ea5f871a912e5067f15db8e3bfa4e0a9b2f0a755..8dea4c33f944bdc5cc19c6c59bfb82165538bd75 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/LogParamTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/LogParamTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/MetadataTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/MetadataTableModel.java
index 03ef8aaa8933ce9e53c49306fc04195f6e531634..be347c623b34b7e0c6740afd7a681adf46398b54 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/MetadataTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/MetadataTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PICtableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PICtableModel.java
index 526f309b56a459df333f743f70bdd9687a9da93a..eb02dadb7db5d44fd129404133969ca2754c2c38 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PICtableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PICtableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ParamExtensionTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ParamExtensionTableModel.java
index 04b250b6cf6cc0162cae87d4ec964de01369c053..268a004a3f2e88310a67ada4252eb863ab20a999 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ParamExtensionTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ParamExtensionTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PencilConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PencilConfigurationTableModel.java
index 057cd2c837088f3a7efb2efa051019f6c0c8a0d2..eae98395df7bed87cbd6704d46186772fc5d5e07 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PencilConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PencilConfigurationTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/RSPMACTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/RSPMACTableModel.java
index 9a6f7c58685b57455989430fcdc96c486f1307b8..22461bb48d05684592237f314d26002d1eef91f1 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/RSPMACTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/RSPMACTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StateChangeHistoryTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StateChangeHistoryTableModel.java
index 09fd0b6b95104ad7f6f9ee604532b39dcc96a074..bbab68522da8c33a4cba14eb92c559c3bb18e2ef 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StateChangeHistoryTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StateChangeHistoryTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StationPositionsTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StationPositionsTableModel.java
index eaff7941e8ca0aaf01bde426d37a11bf58a2b13e..efb40165298b96f81887c310ec10071da3708c0c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StationPositionsTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StationPositionsTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/SubbandFreqTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/SubbandFreqTableModel.java
index f89f516c7794d2dd5931b38cc33cec0674bd6715..a89aee04669a49f75e930588ce640c461069fdab 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/SubbandFreqTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/SubbandFreqTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TBBConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TBBConfigurationTableModel.java
index 4a46bb748a517edd1cb5613e612eba969fbf6ca2..95d06b46639bf02ffec094d23b9e3ddb453b0a3f 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TBBConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TBBConfigurationTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TemplatetableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TemplatetableModel.java
index a68b81b9f7c7a07f37e42ed312243448dab2d072..580d964829a8df5ab831a7f84dae118a0f8949d3 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TemplatetableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TemplatetableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TiedArrayBeamConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TiedArrayBeamConfigurationTableModel.java
index 38d659eedd49583b36d299e00e9c7d932798a599..cda14abc32c2d57957821fa25663b396121e5121 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TiedArrayBeamConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TiedArrayBeamConfigurationTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2010
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/GenericTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/GenericTreeManager.java
index 021d1453f07d8059bbd4fce418ba4bb53bb66401..cd98dc87f7d1f1c951c3cd10fd89d85ebf947c54 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/GenericTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/GenericTreeManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java
index 51bdb26801fc1e70f826b993b70f91a539ebc00d..642da22dc862c75f4eebdf526becadade74d3dc7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java
index dcc5316b687536567ae21dd2e69211db2ec5684f..cccdbe84bc776eaa79fad4de5cec3e3a40f4ee53 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java
index f3df191aac18d9a224abda7dd47663ce929112d5..e80224247e726f395efc76159f19a10a34ae7bd9 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ResultTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ResultTreeManager.java
index 75c3e2d4b6cf7c5cb66c8bda089c091c65f28d61..7debe0fdd42d1856723bc086afd54d3837ba49c1 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ResultTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ResultTreeManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/TemplateTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/TemplateTreeManager.java
index 5a9fa1078dd43507f2ae83b986e8c04846efddee..34a323fa56bb1d34a8e05de35e0006f5ee2fc24d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/TemplateTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/TemplateTreeManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treenodes/TreeNode.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treenodes/TreeNode.java
index c5c6e923de17e68a78b721c420fe5c7176760d92..1f636a149eec87fb0b95f6be3a67da4545398b67 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treenodes/TreeNode.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treenodes/TreeNode.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.java
index 7cdc6e7f97fd6563daa3c574da0394e40881f518..0b9150c6552b9517c8278c7b96bcd6f9ef9b6cc2 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java
index 60c7b3ddd62ff1f43306b89adc25768e985a5dba..cc136e2adc854c5aacce98edb20dc7071e14d2f5 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamFileDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamFileDialog.java
index cce05850589c8e195c09f7ac73490b694035b9ef..4a136e307a9bb1a16b1ea0cf0c28e69286b0ee14 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamFileDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamFileDialog.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ButtonPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ButtonPanel.java
index 7b3de11c2a121d4f55cae689144475da78b0afdf..94f63350f1e93790afbdf5ef3dbd4969ec9dca61 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ButtonPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ButtonPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CampaignInfoDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CampaignInfoDialog.java
index 48292d8d8ad10f9540a7560c2aa06bb2f4869828..ed065ab55e95f7830a4438806cbb2081106a85d7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CampaignInfoDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CampaignInfoDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ComponentPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ComponentPanel.java
index b09f7c775903b0e93606fdd640ee4bc64e5bbfb9..3df05089f253e76b12821e3ae802bdaa3947dc26 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ComponentPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ComponentPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CoordConversionDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CoordConversionDialog.java
index cdddb8c541eed1e24cfe894f0dda2e9a1c98937a..fd09b00e0e869771a0ac2973d87a2373b55b3c95 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CoordConversionDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CoordConversionDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.java
index c19b6155fffdb1bf1b2d0d701ac587d0f06c88a0..25fe2e479b7b9416741fe16fec28e0379c3b2654 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListDialog.java
index 3a4d80404fc4225757f22d14208d244801cf92d8..a046bc233c97e5fb71c09cb591f65b25b7e13610 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListPanel.java
index 1d18f7e5f29ba911ebba778d2652cf53bc995e51..e6ffc14cfbd2a1a74e31da2d41b7782f5eb21f75 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoadFileDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoadFileDialog.java
index 1b535aee6bd40d4bfee269d35e7e845a6cbce386..1c49b7f14afa885134ab25931044038f901e31fe 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoadFileDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoadFileDialog.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LogParamPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LogParamPanel.java
index 7506058ca58a9d3033328453ed12eb07d41d52ec..49752a485e7c758b1b9b5bc7b57c82ea22e6b1b5 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LogParamPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LogParamPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoginDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoginDialog.java
index ede60c9e06f6a12bc28ac10b62211cf87062b0ec..58f6473dc5799436c99b348e99b14551f33084b9 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoginDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoginDialog.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MetadataDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MetadataDialog.java
index 0ed67833249f5a33bc51dca570a2841c1deec605..1c738ef9472ae86ca8e9d09caefa00965767932b 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MetadataDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MetadataDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java
index 3548258f48c60a330f0b27b37278203b8f4e6c99..42f92a121842f4e2c04e923cee6e31d814592aa9 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.java
index c11c3389939c1af7b1681034cb1a39f82e217c8b..cc92618a877e1f0cbc9e99623cea539edc7e075d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetMetaViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetMetaViewPanel.java
index badd9d073f8bde0db4fc886db8ea6035eb20be93..5503c84f520bcc86e75ae882df11824eac30b497 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetMetaViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetMetaViewPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetViewPanel.java
index 4117a31b25720123304542df325c5014b48fc8a0..a0134d653cfb592230906e1bac062630d4fbec59 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetViewPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParamExtensionDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParamExtensionDialog.java
index b338925e885d1babf8551c3f2ad5c9e09e8b0735..3f9e74af258fd63b066f48832838025c5c58137d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParamExtensionDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParamExtensionDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParameterViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParameterViewPanel.java
index 01240a57910dfec948c6730a0e43e68f92e4be03..b3cebbd229611104287f1155316207c1f43faaa8 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParameterViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParameterViewPanel.java
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBConfigPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBConfigPanel.java
index 90e905ac2d94825e345971f0304725d74dd40c3d..feb0e1f42bbd3e3aafb1c3bcab58029c5d676a79 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBConfigPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBConfigPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java
index 163884c845631fad817cc8ae4ef69cee5c69f135..64cf9eda421be932fc818af6b6632e13c2ed1221 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/PencilDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/PencilDialog.java
index dd9e4cd552e43d483388069622fc8424479b0901..2160769d794f2c36c2b653323538f1755ce58dd2 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/PencilDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/PencilDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/SetServerDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/SetServerDialog.java
index 1122a267a47058822d741505ac284b45c25883fe..531b14109c5ecaa9622a251856fd706ae7168dbf 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/SetServerDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/SetServerDialog.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StationSelectionPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StationSelectionPanel.java
index 90e8b54dd2d4e1763c8ea838b33b3a049f364ce3..bcc0f2b2bc349987e5cd8a7ef8a7303209f50165 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StationSelectionPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StationSelectionPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StatusPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StatusPanel.java
index 9b9eeeab077d7d0b98b665b1dbd99d38b5192458..abf35835f56145f55e9f355d3a9aa32b653c0329 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StatusPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StorageSelectionPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StorageSelectionPanel.java
index b540652df8b034f046902da2ea720f6e8c77eab0..e291795455cda373527f998324f36cf374a5820f 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StorageSelectionPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StorageSelectionPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TableDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TableDialog.java
index 1fd7c5dab469c0ea78d27b7673085cc5093f94f9..768d56d097c0167917ba34d9ef45c52972c98e49 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TableDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TableDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TiedArrayBeamDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TiedArrayBeamDialog.java
index 92fb8392d68fde2f497a91d672ba026a0caa1d05..77c82effa36f6e028964eec5f7c5718e9ed06ed8 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TiedArrayBeamDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TiedArrayBeamDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreeInfoDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreeInfoDialog.java
index a73f7393c0b86b5f0fb93d8e6f352fa92067cb26..8e33dee37dde5410f3efd41813aee5bafe9457aa 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreeInfoDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreeInfoDialog.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreePanel.java
index 9602ef3b52b581c77ca39a3176a9a8d8ef0c6030..4d687af7e99815fb4263fd590dd8bab2f17892fa 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreePanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VICnodeDefViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VICnodeDefViewPanel.java
index b6925af81fdd28efecb22b27c1a718b24f1dba61..fd77188a04e088fdcdc6d003eae953425182edac 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VICnodeDefViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VICnodeDefViewPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VerticalButtonPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VerticalButtonPanel.java
index 2a9621e84efb413db1df5bd26dba9a265b84d33d..7306f9f8efdb40527ce63f98bf5401e1fe61642b 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VerticalButtonPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VerticalButtonPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java
index dca180ef8df24f4f0b8529985779564a8a2cf0df..3690a9868baf25bb0a6a0f73834e5e2763390f7c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java
index 67238db3231efb6b36b5f8bae6da35a982c2c6ae..f4e0215fe02c82f9d49564486982caf631b363a7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStep.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStep.java
index b44f04209edb458caa06d9c48f091075ebb8e819..8900b9c326ef6b05337014c92ff82640b3235098 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStep.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStep.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepData.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepData.java
index 9dd917c50525269dd655dd5273ce19562414eb80..42eb4b045084a8a0f715c88ffd3669d021c1d1be 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepData.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepData.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepDataManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepDataManager.java
index 7228237e7ee060581dd87476de85c52ec074a7db..c41ce754ae3e262496254761b87e4c40d99b2d06 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepDataManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepDataManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java
index 0d49e6b48025f4007844f886a5e3ea6b43ed9659..c23c68756c0ad111718706e2d02189fd45109438 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepInputDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepInputDialog.java
index 27d6faffe890717d098d4c1d039269937a516f9a..dc958cb234759051a8b90776ac9c844c2ab5d982 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepInputDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepInputDialog.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepNode.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepNode.java
index 1628fed34a900a863001d7e4e74c28368983632f..8f9cb584439a024b5036926ccd77598459fd22bf 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepNode.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepNode.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepTreeManager.java
index 5acc4794172773a56d77526ff5b61942ee28521d..4a2eeed1d705a760e64b52db0cdceea001df0975 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepTreeManager.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStrategy.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStrategy.java
index 5ecc2a3d03c0c0e84d590e805805c6cc0d0e5aeb..3e31eb8e3ad13d85626c88723912c0a30c7d601a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStrategy.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStrategy.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/BBSStepOperationPanelSolveImpl.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/BBSStepOperationPanelSolveImpl.java
index e395213199d809e502e0e8b25432a9c019e1c460..8ce181921e22b855e4ef69178f617d0c5209850a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/BBSStepOperationPanelSolveImpl.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/BBSStepOperationPanelSolveImpl.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/IBBSStepOperationPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/IBBSStepOperationPanel.java
index d568d1d34443a0e5db135472a058df90736807e4..4b281cff24757a390598a315782334f6db803de8 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/IBBSStepOperationPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/IBBSStepOperationPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/CobaltPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/CobaltPanel.java
index 6c679abdef8f89561f2b3be08fef1c474fc8cfc6..810671d8ea2971afee09befdea6e992a355b936e 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/CobaltPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/CobaltPanel.java
@@ -2,7 +2,7 @@
* CobaltPanel.java
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ImagerPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ImagerPanel.java
index 06b604fb0afb8f964bf517c582f029dd3a53a602..c3c5cfcf4212b362e962e19e4bdfede7522e276a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ImagerPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ImagerPanel.java
@@ -2,7 +2,7 @@
* ImagerPanel.java
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
index ca82a9a65cc6f2d857d7c962640b52f180355d70..5719d0f8a07ed439a9fb1dbc6ce654eeff04e221 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
@@ -2,7 +2,7 @@
* ObservationPanel.java
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/TBBConfigPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/TBBConfigPanel.java
index fed7ed40457736861239e0907d44226cc25db046..5528a47b2a04b0ae9c70f42762b93250d7ce8fa7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/TBBConfigPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/TBBConfigPanel.java
@@ -2,7 +2,7 @@
* TBBConfigPanel.java
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/pom.xml b/SAS/OTB/RSP/pom.xml
index 95ceec32cb7ad81ad400c1bc9e832abeb0fdcc2b..15bba982ebd63a8d581b384dcb897d3e1b6d9214 100644
--- a/SAS/OTB/RSP/pom.xml
+++ b/SAS/OTB/RSP/pom.xml
@@ -9,16 +9,16 @@
<parent>
<groupId>nl.astron.lofar.sas.otb</groupId>
<artifactId>otb-parent</artifactId>
- <version>2.2.0</version>
+ <version>2.8.1-SNAPSHOT</version>
</parent>
<artifactId>RSP</artifactId>
- <version>2.2.0</version>
+ <version>1.17.4</version>
<!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
<scm>
- <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/RSP</connection>
- <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/RSP</developerConnection>
+ <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-1.17.4/RSP</connection>
+ <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-1.17.4/RSP</developerConnection>
</scm>
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ControlPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ControlPanel.java
index 63947a441c5a0bb2513e51ed4e441ef3dca662a0..bfa704f9600dfacba4db40caf7894aaab3f5e19a 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ControlPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ControlPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ITabPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ITabPanel.java
index a5ca8eddc697b3e4ee94b4f55da1803c63c4c550..2f8b22bee3e263354f6a5adb13a618c55982afc9 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ITabPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ITabPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ListPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ListPanel.java
index 0bffe8b12b62a70d4c681ed09fd39ddeb4512342..4380e0d32ed005f11648a4fd2b823ab1a568f75d 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ListPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ListPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MainPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MainPanel.java
index 11b672422c0fe29ce8c705ddb700f84191f02765..0efba20cf6d28dde930889de769f7e6de4a8ae2f 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MainPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MainPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MaskSelectionPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MaskSelectionPanel.java
index 361d7105af3274f67fcef728eb5ca6551d995ae9..7da8cbbfd0d92b980a78d3e6333bb0e5b2aaa553 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MaskSelectionPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MaskSelectionPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotContainer.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotContainer.java
index 59345c7408e15addb3bf1bfdd845c3e0d2a6cec4..3b10d617b2ca1beeff8337b08e1d2a14225e2fb5 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotContainer.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotContainer.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotDataModel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotDataModel.java
index 4adddce285b50568f9a9544cac1a9bf248bc8759..c61f3331f9d8d0b5eb2ac201be6f078cd450bc45 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotDataModel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotDataModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/beamletstats/BeamletStatsPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/beamletstats/BeamletStatsPanel.java
index 55139bcd3708b02a2b5806a7fd4d146c8970e3e5..2d80b2aaf4d50b8c84b4c713b07cdec6d2ada451 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/beamletstats/BeamletStatsPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/beamletstats/BeamletStatsPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/control/RSPControlPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/control/RSPControlPanel.java
index 894871acc9844520eebf3eaca2e77ddb978812d4..6112684209335bb69651d0c4c36f0c5bcc65e484 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/control/RSPControlPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/control/RSPControlPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ADOStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ADOStatusPanel.java
index 65a1a15d181a6a3ec64756058f27f572b0da2dec..1c1695f16a2a5a902819a5f60fe083fdd6feab06 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ADOStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ADOStatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/DIAGStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/DIAGStatusPanel.java
index 1c3c0655b9701a4357b6e6d100114b23cc350989..5a260ad0a0dbabdb9c32687bf7965505e69d134f 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/DIAGStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/DIAGStatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ETHStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ETHStatusPanel.java
index 3ae6aae133eab07b95db0b2d12e7ca3b2cc9f24b..6175d8962626d410cdbb9a0b4f3d0c18a6dd37f6 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ETHStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ETHStatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/MEPStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/MEPStatusPanel.java
index c677a47ef627c90f1577d2c4a042e5956795e60a..3fc52de3ac6b3ba661b84f0f23e13b07fe8f1377 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/MEPStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/MEPStatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RCUStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RCUStatusPanel.java
index 4234a86ae6ce8b86d7b3927ad6d08837e45210e3..9baa1b26029a587a587fffde50a1a7183546d346 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RCUStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RCUStatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSPStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSPStatusPanel.java
index 79cfd3b36baa4126b52ffa2a619f0116b0bc7093..e3eb3a2f5ead6c47c76ebde80c38eb54120f8dd7 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSPStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSPStatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSUStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSUStatusPanel.java
index f214b2b2b41b62cbf8a64f50fcf4e5800d6040ab..60ae617efcd354ac2d861ad0e5c3deee6524f2a2 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSUStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSUStatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/StatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/StatusPanel.java
index b99e9416b0b92534ec4820de1959fbb2f4ae1aa2..98694e76893c8f586b8fc9b8ddf9634460d4feae 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/StatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/StatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/SyncStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/SyncStatusPanel.java
index 312b9ad569de3f92fd4a76c866151990baad729e..beaea547571573dc9b61f1c47d87ca396a569519 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/SyncStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/SyncStatusPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPanel.java
index d93f88cb63df5a7212a89650ffe0d1c9cbd68099..ccff8d7c2c26d3c3fcf71630c9acc9bace7a017b 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPlotPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPlotPanel.java
index dc582032990b103c52dcf119895f6f77fa48b726..d1c2ded9ca7d6e706e613b24ebcbac013807b6b0 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPlotPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPlotPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsInputPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsInputPanel.java
index 743fb1546bb16869f9efd0a90de1235858b26e0a..affa94e38afed60cc6dfe9ce4c91e2f382c2c880 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsInputPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsInputPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsListPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsListPanel.java
index 989f99da47fcf73542e42edfc6d9052a83f883c3..0b6fe045284df204ac114cae5de96c7f29dffd9f 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsListPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsListPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsPanel.java
index 687d9a9dd51db980af18c1fd10f7aa29b99efc6f..8fbe33d4daccf1cdfbcb4a9c86026bf08616bf09 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsPanel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformTableModel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformTableModel.java
index c8b6aafe16cef0d32794425d15a8e734310be0c0..a08cae0e4163476b3234d2ae7a054da44be41fb6 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformTableModel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformTableModel.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCommon.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCommon.h
index 85e2d99428505cac16d34792bb1f38762988f100..ad7daefc1aa9cd9721003031906b999e5ff75588 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCommon.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCommon.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/pom.xml b/SAS/OTB/jOTDB3/pom.xml
index 7e22079dd9eede19b2a26a6a2b9263b464473209..7cd8eacd04fe79e321d2fb5a3210f665fb821dde 100644
--- a/SAS/OTB/jOTDB3/pom.xml
+++ b/SAS/OTB/jOTDB3/pom.xml
@@ -10,15 +10,15 @@
<parent>
<groupId>nl.astron.lofar.sas.otb</groupId>
<artifactId>otb-parent</artifactId>
- <version>2.2.0</version>
+ <version>2.8.1-SNAPSHOT</version>
</parent>
<artifactId>jOTDB3</artifactId>
<!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
<scm>
- <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/jOTDB3</connection>
- <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/jOTDB3</developerConnection>
+ <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jOTDB3</connection>
+ <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jOTDB3</developerConnection>
</scm>
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaign.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaign.java
index 098ad78b19288444757b03c4325f59bad0b62a09..d44f211c3f1ff099de542fe5ebe2886c60027fed 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaign.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaign.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInfo.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInfo.java
index 7bf2121678f4871db307d8c1ffb0b344b3a3945c..6a77e6e50c84d397ad1dea88da4026a2fa923144 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInfo.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInfo.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInterface.java
index 90fa56b0aeb6ef4804cc305618e2bbfe016be387..3deaaff820cac43704dccdfba2d224253f734c2d 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInterface.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jClassifConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jClassifConv.java
index ea5da67827457033b9fab795fc99b6ffad917c98..ea8bc70cd8a63904fd666d3dfcf870ee55bb730f 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jClassifConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jClassifConv.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jConverterInterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jConverterInterface.java
index e9f7c59ee80952c96b6b94d8c7ed656a7695c084..be523e5193c73aef5e195b13a72fbea84adbd8e5 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jConverterInterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jConverterInterface.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jDefaultTemplate.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jDefaultTemplate.java
index 8138b984a7ca6079856233829b68ecbbb4e25aef..dbeb35698e06c2ee2f60442596b76d62f9a26aad 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jDefaultTemplate.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jDefaultTemplate.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jInitCPPLogger.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jInitCPPLogger.java
index ea29dd7f9365cf6fb1e3af4decf37746dcf9f611..397a698e126d0f4fd91a8ed2f074aab9ef887d44 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jInitCPPLogger.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jInitCPPLogger.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBaccess.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBaccess.java
index c8a3a83b5a114d6f1334229fff8c3c550e0eabf1..60f661d3a1b68e14f1f7da94bc8b340b558ddb02 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBaccess.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBaccess.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBconnection.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBconnection.java
index c094316af36d2b8852cc6ce2caa303921572c186..b7bcc71d5c3ffb2ece50bf4942f9fc6eafcfa000 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBconnection.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBconnection.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBinterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBinterface.java
index 618b4dd5884ab7a19f32fe96447c7e3619124af7..5d74ecb0cea919da8febbeb75f1fde39c893f57e 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBinterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBinterface.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBnode.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBnode.java
index 1bacd7c92fd54caf09af0382b26f9c9f89b93f5d..13e88a5c972d322a1b8595041aa84bca176965e2 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBnode.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBnode.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBparam.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBparam.java
index b2c710894bcd65059c0c50434238c2da98f5fa0d..1cfa5f7fc2b2cc19562e9ffccae7a3778ba695f3 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBparam.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBparam.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBserver.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBserver.java
index 4832d9facd8b53a38cb997abcdb7bb554c6e5ce5..8a04c189badd44cb65b9e0ec29251c1d55e53ae4 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBserver.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBserver.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBtree.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBtree.java
index bef05619f00df31865f489f0de54dd7be41ba439..df89585fb0c78e3923644c477a66d2822d0c9384 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBtree.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBtree.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBvalue.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBvalue.java
index 9c0d6bc790c7d4c82e7963bf3a88057ea7385c76..d0a111e7dbaea89d0a5b6975d066dea88c0b653a 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBvalue.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBvalue.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jParamTypeConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jParamTypeConv.java
index aaeecab06ef3d43069f982edee71e8a0865d2e42..0df8fb2e79710215a4157f52b353001d411160e1 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jParamTypeConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jParamTypeConv.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenance.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenance.java
index ffd289b6f9051a44d42ba4936ae083e000b77f5c..2180049fd384bc4fe3f744172805989969ef8b67 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenance.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenance.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenanceInterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenanceInterface.java
index f9aa436e6348aaadb40f6018279415e0e8df7698..82b55257dbc64cb24daeee5ba979a4bf0e9565fb 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenanceInterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenanceInterface.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeState.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeState.java
index 7e626667267574dcbd75c80508eb17d5f2c1d853..876e911a946715fcefe9fec08c42eff58fa9100f 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeState.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeState.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeStateConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeStateConv.java
index 114a6dba4433e269a35bb905adb7cca6be08d4ec..4e9fb132a0f755d3ab812ed45d74e3daa1ef22c5 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeStateConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeStateConv.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeTypeConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeTypeConv.java
index fe5fccb2d94431131005d0b08dff68cc01ff0b28..870ea7409f8d1bce46588742ad9d5911ae59e7e8 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeTypeConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeTypeConv.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValue.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValue.java
index 52e47272bea71d5a420465b07cb94941b1756475..556aa090324022b34f3aa855bb5868075cc6308d 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValue.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValue.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValueInterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValueInterface.java
index 43cf15a83b2430f0cbfc98b74543ac0b6a77cf70..ad68de1580d2bab97db6a6b83b95de01f8d687f3 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValueInterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValueInterface.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jUnitConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jUnitConv.java
index 97a06a0586e13255a66da8739c62ad4d1b2e3852..c16106d4c099f5f695324e7484b1d1e26ae33939 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jUnitConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jUnitConv.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jVICnodeDef.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jVICnodeDef.java
index c4dd83cf9fcd8eb4ac00cde0abc1170cf49854a7..bafbe58ded54bb238b9762d67ffabc48e525bc7f 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jVICnodeDef.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jVICnodeDef.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCampaign.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCampaign.cc
index dde35e40e6f8da6c5b414b588b78266fee62b651..2e18aa7f5c9a41ac6ade36d919df50c05887a49b 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCampaign.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCampaign.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.cc
index 23ccf516a7af26ff83168b38d2913f3c478780a4..5c32dfa3dc7fb1edc09cfdd50725d1b053e2d6f0 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCommon.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCommon.cc
index aa24f69d4a90b2862b28a3be632d922b4447105a..b55cbeff3c5b535cf2c487982617ac98b2177a84 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCommon.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCommon.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.cc
index 98aba37b3f2b027200877fb7bca710ff759a8f72..99ba5e03edb20bef4cbd2868648fb529210c3969 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jOTDBconnection.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jOTDBconnection.cc
index 61b3c3f64728a69f558d7ac1d0e07099eb417ccf..54f6c30acf573c233dbeafaa018df46ef434a49a 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jOTDBconnection.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jOTDBconnection.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.cc
index 2d8f471d65b618dd9419f79388df3d324582bf9f..b596af845a65922871a04f31e7005275f52d9218 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.cc
index 1409abe630343cabbcfedcee504e0ac8c4cfc8ab..76cb955fd31b6aa0e2bed1c3367e770025416bbf 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.cc
index 56ed5cbfea7c160a17b48b7b7562b7c3521ff54d..df27517226eb5b3dc6f6c3ffdaf37f46c46d627e 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2005
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.cc
index 0539b7bd79fc0041fc262cd4ba7fe09288e1d2b3..c1585ff892d7c16bb6b819c61ab0df4232ef1e69 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.cc
index 11e8baa6e89844d1b1ea6bb1cd5ba45706fa8b18..d11c712b62e42beadde97ede83664af118d27eb1 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.cc
index a28d3db79d4262d368398a75e5c1a0011538829b..1cd62a839b5c334cd70d3b606b73decb60689ba1 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar b/SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar
index 5e32dffb0d76e4afa412fe7288be5f283c3967d6..f1572f5486110132ca21f98df94a5c125ca59574 100644
Binary files a/SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar and b/SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar differ
diff --git a/SAS/OTB/jParmFacade/pom.xml b/SAS/OTB/jParmFacade/pom.xml
index 7491761651211d71c8336aa89fdf90e7b198d5e1..4104c124930521ca6a8095904bf084d9687587c9 100644
--- a/SAS/OTB/jParmFacade/pom.xml
+++ b/SAS/OTB/jParmFacade/pom.xml
@@ -10,15 +10,15 @@
<parent>
<groupId>nl.astron.lofar.sas.otb</groupId>
<artifactId>otb-parent</artifactId>
- <version>2.2.0</version>
+ <version>2.8.1-SNAPSHOT</version>
</parent>
<artifactId>jParmFacade</artifactId>
<!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
<scm>
- <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/jParmFacade</connection>
- <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/jParmFacade</developerConnection>
+ <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jParmFacade</connection>
+ <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jParmFacade</developerConnection>
</scm>
diff --git a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacade.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacade.java
index 8bd4b07817500b9bbdea19eeac00c692ebc6cc5d..65ac554c92605cec38b862a7278af1ba9ed5a695 100644
--- a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacade.java
+++ b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacade.java
@@ -2,7 +2,7 @@
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeAdapter.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeAdapter.java
index e07ff4eeed62eda969f107472b3b17977ae6622c..4958ea7ac4cc91aea7b9a19024639ab6d21ddc25 100644
--- a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeAdapter.java
+++ b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeAdapter.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeInterface.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeInterface.java
index 4df6058ba9f37095a3fee412b4952922d9ebfd86..1bc403d12952ee809083033f5ec5d099e9644fe3 100644
--- a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeInterface.java
+++ b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeInterface.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeServer.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeServer.java
index 2821229e900352d1c183e9020ed470f33c9b1c53..ece35f19c23c6da5e023e88e78dec2276234e61f 100644
--- a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeServer.java
+++ b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeServer.java
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc b/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc
index dbafddcd7a0f6eef6a6277a45b9e7254443b484b..2856cc85c5e216d781e02d35d59f3998fe5511b7 100644
--- a/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc
+++ b/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc
@@ -3,7 +3,7 @@
//#
//# Copyright (C) 2005-2007
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tParmFacade.java b/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tParmFacade.java
index bdadb58f463ff1dee1c3be298cee316208c9b0b6..f85d40f752a18e9d7d818212ddf2c36579eec98c 100644
--- a/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tParmFacade.java
+++ b/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tParmFacade.java
@@ -6,7 +6,7 @@ package nl.astron.lofar.sas.otb.jparmfacade.test;
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tRemoteParmFacade.java b/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tRemoteParmFacade.java
index 081c036569fa3841aff6cc87d8f5a48f48bd11da..e10eccf9c89d52a81e5fa09f6695b27f2b61e8c7 100644
--- a/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tRemoteParmFacade.java
+++ b/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tRemoteParmFacade.java
@@ -6,7 +6,7 @@ package nl.astron.lofar.sas.otb.jparmfacade.test;
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/pom.xml b/SAS/OTB/jRSP/pom.xml
index 463f369a4374e3c3b1b252a99b22a82a5d35fb0f..77c8fc12b8103776750ce7b7086e6a56ea00b9ad 100644
--- a/SAS/OTB/jRSP/pom.xml
+++ b/SAS/OTB/jRSP/pom.xml
@@ -9,15 +9,15 @@
<parent>
<groupId>nl.astron.lofar.sas.otb</groupId>
<artifactId>otb-parent</artifactId>
- <version>2.2.0</version>
+ <version>2.8.1-SNAPSHOT</version>
</parent>
<artifactId>jRSP</artifactId>
<!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
<scm>
- <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/jRSP</connection>
- <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0/jRSP</developerConnection>
+ <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jRSP</connection>
+ <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/OTB/jRSP</developerConnection>
</scm>
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/ADOStatus.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/ADOStatus.java
index 7b6443e411bbe23bc30badf72d97fb03ee706f4b..d287318bfd2964559d8e384bd5e88e03c0c8816d 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/ADOStatus.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/ADOStatus.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/Board.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/Board.java
index 146b0b5106b6558dcde26fd5644ec4c6a0ae0512..0cc1d7610165a747b3de2489f8a960ecd3c15f74 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/Board.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/Board.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/BoardStatus.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/BoardStatus.java
index b1def5cf512f45d43e6d8aeda9c0d3fe2f489aa1..1af57bf6426d2402c7b1f6470e8f589da73e6a74 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/BoardStatus.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/BoardStatus.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/IMask.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/IMask.java
index c756d05947e0b37270c6164c2f399576ca797520..a24a8774b35dc39279340c183e579ae459670169 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/IMask.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/IMask.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUMask.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUMask.java
index 832952f05882fcde485473c0e1ac29e8f73d580a..9cf8b075023eb19a22dfb639256925489f053173 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUMask.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUMask.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUStatus.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUStatus.java
index ba812ed5ccfbab4e3f45e6d7228e22077ac36c18..e868eaa5bc56b17878f1173070b711285266c61f 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUStatus.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUStatus.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RSPMask.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RSPMask.java
index c193faba4150a1af96d45eefe50d025ffb0e86e1..7f11fa8387654328480562d300fe32ae3df95d5b 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RSPMask.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RSPMask.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/SyncStatus.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/SyncStatus.java
index bad400251b4cbf9a0e56176ad751e1e26a78c1f4..bf16334ea0b379c8019c4670f494db26d92450da 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/SyncStatus.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/SyncStatus.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/WGRegisterType.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/WGRegisterType.java
index 56b357c9c5c68e2c98e30d9a4a4ae246b1ba1e7e..f19c5fa037024bfaaef9128d07d97513ab2f612b 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/WGRegisterType.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/WGRegisterType.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/pom.xml b/SAS/OTB/pom.xml
index c44de00a74d7624be146142bf233611f811feddc..3f8d9281b9f838ae1e4021b07aaf72b56d415b0a 100644
--- a/SAS/OTB/pom.xml
+++ b/SAS/OTB/pom.xml
@@ -15,7 +15,7 @@
<groupId>nl.astron.lofar.sas.otb</groupId>
<artifactId>otb-parent</artifactId>
- <version>2.2.0</version>
+ <version>2.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -28,8 +28,8 @@
<!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
<scm>
- <connection>scm:svn:http://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0</connection>
- <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.2.0</developerConnection>
+ <connection>scm:svn:http://svn.astron.nl/LOFAR/trunk/SAS/OTB</connection>
+ <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB</developerConnection>
</scm>
@@ -145,7 +145,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>OTB-distribution</artifactId>
- <version>2.2.0</version>
+ <version>2.8.1-SNAPSHOT</version>
</dependency>
<!-- Import the group 'nl.astron.lofar.lib' -->
diff --git a/SAS/OTDB/include/OTDB/Campaign.h b/SAS/OTDB/include/OTDB/Campaign.h
index 657e629dfcaee7967b42b29b900feb6872e247d8..23fe68717a26178f025b7315147d7c23423bab9e 100644
--- a/SAS/OTDB/include/OTDB/Campaign.h
+++ b/SAS/OTDB/include/OTDB/Campaign.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/CampaignInfo.h b/SAS/OTDB/include/OTDB/CampaignInfo.h
index 05e849699a2c8ba3c6bf7159c5e57a0d552956bd..13a134ef9917e40d6fe7e86a7d376f090da65178 100644
--- a/SAS/OTDB/include/OTDB/CampaignInfo.h
+++ b/SAS/OTDB/include/OTDB/CampaignInfo.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/ClassifConv.h b/SAS/OTDB/include/OTDB/ClassifConv.h
index a7600876fc6f3cb2a93795ad8e5237f5c765f2d0..56e7fddb7ef345ded1cb6cc0c0b155cbc9807005 100644
--- a/SAS/OTDB/include/OTDB/ClassifConv.h
+++ b/SAS/OTDB/include/OTDB/ClassifConv.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/Converter.h b/SAS/OTDB/include/OTDB/Converter.h
index 74240d53534377e5090adc314ceed1a3586c5835..66a233369fe0b8af05395f71880b6f103751b873 100644
--- a/SAS/OTDB/include/OTDB/Converter.h
+++ b/SAS/OTDB/include/OTDB/Converter.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/DefaultTemplate.h b/SAS/OTDB/include/OTDB/DefaultTemplate.h
index 47ebe27cb6949d055d4c9a7afd661979094de9a3..5efa62bae8bd16435abdcee6af2a56838e62636f 100644
--- a/SAS/OTDB/include/OTDB/DefaultTemplate.h
+++ b/SAS/OTDB/include/OTDB/DefaultTemplate.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBaction.h b/SAS/OTDB/include/OTDB/OTDBaction.h
index be62bea0b9ad2b16c847525528a5c8913b6deee7..976d59012a2db102eeefcdde1fb55fbcac571cd2 100644
--- a/SAS/OTDB/include/OTDB/OTDBaction.h
+++ b/SAS/OTDB/include/OTDB/OTDBaction.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBactionList.h b/SAS/OTDB/include/OTDB/OTDBactionList.h
index c067e8f5e0dc11a53d5742c015df20966f177a39..14f27e32b3d7f61682f769f95e7c09f79bd0b4ae 100644
--- a/SAS/OTDB/include/OTDB/OTDBactionList.h
+++ b/SAS/OTDB/include/OTDB/OTDBactionList.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBconnection.h b/SAS/OTDB/include/OTDB/OTDBconnection.h
index 52a4fc2b7cb80f18b2c561e3ea13db380cde31d5..f47b0e6c3d42e2fb9bc46701e9aa66a7013d29db 100644
--- a/SAS/OTDB/include/OTDB/OTDBconnection.h
+++ b/SAS/OTDB/include/OTDB/OTDBconnection.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBconstants.h b/SAS/OTDB/include/OTDB/OTDBconstants.h
index 781cde5538e1693362fa7409c469982d7e18bd09..2ef08e5ce8abc4d834adf0f838e50216e962d1a0 100644
--- a/SAS/OTDB/include/OTDB/OTDBconstants.h
+++ b/SAS/OTDB/include/OTDB/OTDBconstants.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBcontrol.h b/SAS/OTDB/include/OTDB/OTDBcontrol.h
index 30bf05e693a26dc52c9edd7415695fd90f327092..b820e50eb933ea1c28efef23d001e0e52c286b1d 100644
--- a/SAS/OTDB/include/OTDB/OTDBcontrol.h
+++ b/SAS/OTDB/include/OTDB/OTDBcontrol.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBevent.h b/SAS/OTDB/include/OTDB/OTDBevent.h
index 270a4ee58134d494cc75dd3558537a8acf05e4ff..019e815c8571fe378f6944e5a1c406e4bb5f477f 100644
--- a/SAS/OTDB/include/OTDB/OTDBevent.h
+++ b/SAS/OTDB/include/OTDB/OTDBevent.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBeventList.h b/SAS/OTDB/include/OTDB/OTDBeventList.h
index ea8968cae8b5503f5afe6439859de6001a56fba7..baf06a52e42900344995d5a7ecb0c6f66cfdfe44 100644
--- a/SAS/OTDB/include/OTDB/OTDBeventList.h
+++ b/SAS/OTDB/include/OTDB/OTDBeventList.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBnode.h b/SAS/OTDB/include/OTDB/OTDBnode.h
index 1985bf1c8acdeedb64620cee096405598f053d63..6a351dd5b0a9063ee1d4a63e2f8f23c2a1dea978 100644
--- a/SAS/OTDB/include/OTDB/OTDBnode.h
+++ b/SAS/OTDB/include/OTDB/OTDBnode.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBparam.h b/SAS/OTDB/include/OTDB/OTDBparam.h
index b5a403bec80bb2da6fe3cb942fd548c7d08e8aff..d2f4ca86c4765d446a08a79d984807b17ef8aea0 100644
--- a/SAS/OTDB/include/OTDB/OTDBparam.h
+++ b/SAS/OTDB/include/OTDB/OTDBparam.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBtree.h b/SAS/OTDB/include/OTDB/OTDBtree.h
index c8f846cc847d94ffff77ac63f60d652f9a889d45..ff39e7e44897cced7f0b0021ffd70f5730eb110b 100644
--- a/SAS/OTDB/include/OTDB/OTDBtree.h
+++ b/SAS/OTDB/include/OTDB/OTDBtree.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBtypes.h b/SAS/OTDB/include/OTDB/OTDBtypes.h
index 501a67f53ab09e775b41461d4ed94e3f43865305..48fa0161e9c0fe599001f53f68cfb18b2cde4029 100644
--- a/SAS/OTDB/include/OTDB/OTDBtypes.h
+++ b/SAS/OTDB/include/OTDB/OTDBtypes.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBvalue.h b/SAS/OTDB/include/OTDB/OTDBvalue.h
index 885e3436ac4ac74c01cda5285dec5ad51abdacd2..79bdbc151e0ebff44e0ce729b51d7b4dfda432db 100644
--- a/SAS/OTDB/include/OTDB/OTDBvalue.h
+++ b/SAS/OTDB/include/OTDB/OTDBvalue.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/ParamTypeConv.h b/SAS/OTDB/include/OTDB/ParamTypeConv.h
index 2b600196f452f6163c44010ba8aeefa3baa6740a..38c182b5001691fcaf550d427ff2a43873937b1e 100644
--- a/SAS/OTDB/include/OTDB/ParamTypeConv.h
+++ b/SAS/OTDB/include/OTDB/ParamTypeConv.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeMaintenance.h b/SAS/OTDB/include/OTDB/TreeMaintenance.h
index 30d01030bf4ac5f5a9e39615f52d6b50d88bdb0a..e1d0c80ff1f677ea847b7ddae41f11f2038e6109 100644
--- a/SAS/OTDB/include/OTDB/TreeMaintenance.h
+++ b/SAS/OTDB/include/OTDB/TreeMaintenance.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeState.h b/SAS/OTDB/include/OTDB/TreeState.h
index 212f11af7fbadee524e9bdb4177f2ae16700e399..3e74248729c41f299355fcf263d373b856ea1045 100644
--- a/SAS/OTDB/include/OTDB/TreeState.h
+++ b/SAS/OTDB/include/OTDB/TreeState.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeStateConv.h b/SAS/OTDB/include/OTDB/TreeStateConv.h
index 4314b131a07191c8a98bee9f13f357e987afd696..7da3d7ae2f6ed4cd7d89691abf4b0155f05ff366 100644
--- a/SAS/OTDB/include/OTDB/TreeStateConv.h
+++ b/SAS/OTDB/include/OTDB/TreeStateConv.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeTypeConv.h b/SAS/OTDB/include/OTDB/TreeTypeConv.h
index 5900a3eaeca08db46b2305c1ebebeae0301d3e56..f99e69daf0c42e8fc0165d63b62d727b25fb054d 100644
--- a/SAS/OTDB/include/OTDB/TreeTypeConv.h
+++ b/SAS/OTDB/include/OTDB/TreeTypeConv.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeValue.h b/SAS/OTDB/include/OTDB/TreeValue.h
index b4a8fee96f1b2571f03386f760ddf6ecc89aa239..f394fe63c1e9f7271c8ded4a94495ca07192e050 100644
--- a/SAS/OTDB/include/OTDB/TreeValue.h
+++ b/SAS/OTDB/include/OTDB/TreeValue.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/UnitConv.h b/SAS/OTDB/include/OTDB/UnitConv.h
index 377775495ff50b858aaea250cfa467e6df153c0d..af31e0f45ffb8b7c400182590b74a9fce92d5931 100644
--- a/SAS/OTDB/include/OTDB/UnitConv.h
+++ b/SAS/OTDB/include/OTDB/UnitConv.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/VICnodeDef.h b/SAS/OTDB/include/OTDB/VICnodeDef.h
index 9b0cf656b643c0ef327994ce557a01594dae1d58..6a815a9402e9677f76024d7ef77738d014cd09e6 100644
--- a/SAS/OTDB/include/OTDB/VICnodeDef.h
+++ b/SAS/OTDB/include/OTDB/VICnodeDef.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/misc.h b/SAS/OTDB/include/OTDB/misc.h
index f1c42693875609ab0ae970e63de39fea7fd82273..b0381dbf0a536661b0f4ca571e06f1b9951d378c 100644
--- a/SAS/OTDB/include/OTDB/misc.h
+++ b/SAS/OTDB/include/OTDB/misc.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/wSpaceSplit.h b/SAS/OTDB/include/OTDB/wSpaceSplit.h
index fcb40efbe0e74c464d4eea4a870b5d12033414b0..d0ba6e179e5dcc87ad91a78a1c3e4d5599e66ef4 100644
--- a/SAS/OTDB/include/OTDB/wSpaceSplit.h
+++ b/SAS/OTDB/include/OTDB/wSpaceSplit.h
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/addComponentToVT_func.sql b/SAS/OTDB/sql/addComponentToVT_func.sql
index 18d947d140c77449735de45bab43feed63689fad..4a982fff4e3de2cd76c20b81e48ee29312e6cda6 100644
--- a/SAS/OTDB/sql/addComponentToVT_func.sql
+++ b/SAS/OTDB/sql/addComponentToVT_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/addKVT_func.sql b/SAS/OTDB/sql/addKVT_func.sql
index 30e1bf83707284b3b4d550869119d4b0aee7a15e..9e38f06c5d4433e5e0af6254a826b4d7de829d06 100644
--- a/SAS/OTDB/sql/addKVT_func.sql
+++ b/SAS/OTDB/sql/addKVT_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/addPICparam_func.sql b/SAS/OTDB/sql/addPICparam_func.sql
index 8c3d019c02f469af0f8ca6e41f9b43fd9bcb152a..c826879bb41c2e0bb5816ab7b264777fa9ff0182 100644
--- a/SAS/OTDB/sql/addPICparam_func.sql
+++ b/SAS/OTDB/sql/addPICparam_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/addTreeState_func.sql b/SAS/OTDB/sql/addTreeState_func.sql
index 0962f9bb1e208461a55df2f20a7022c96ed24a61..4ada8a77b1173f8f5ba3b0767b8fdd933c02d49f 100644
--- a/SAS/OTDB/sql/addTreeState_func.sql
+++ b/SAS/OTDB/sql/addTreeState_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/assignProcessType_func.sql b/SAS/OTDB/sql/assignProcessType_func.sql
index 5e7fa8831df684d18051f98c160ff140c5ecfcd5..3687a84bbf30bd4c5322f9035995d66467f8c8fb 100644
--- a/SAS/OTDB/sql/assignProcessType_func.sql
+++ b/SAS/OTDB/sql/assignProcessType_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2011
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/buildTemplateTree_func.sql b/SAS/OTDB/sql/buildTemplateTree_func.sql
index 93dd697172ec99545d9e21255ea781cfda780924..bfc9a1b4b59a47490f65351be6fb8b0ed231d801 100644
--- a/SAS/OTDB/sql/buildTemplateTree_func.sql
+++ b/SAS/OTDB/sql/buildTemplateTree_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/campaignAPI.sql b/SAS/OTDB/sql/campaignAPI.sql
index 4db18fc2412c53b8fb91c1a399f149d45d188a96..7611bbf10f3a939ad0763b711f6bac53da514da5 100644
--- a/SAS/OTDB/sql/campaignAPI.sql
+++ b/SAS/OTDB/sql/campaignAPI.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2010
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/classify_func.sql b/SAS/OTDB/sql/classify_func.sql
index f409354f15539770a7afadcfe4beb3ad30175077..209248c70f8a51d1808c039eade573adde8fda3b 100644
--- a/SAS/OTDB/sql/classify_func.sql
+++ b/SAS/OTDB/sql/classify_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/copyTree_func.sql b/SAS/OTDB/sql/copyTree_func.sql
index 1a1a5eba896320ed2a82c74390ec603f85ff758f..66015bb08174c8e6f9e175741aba4f9fe5b54057 100644
--- a/SAS/OTDB/sql/copyTree_func.sql
+++ b/SAS/OTDB/sql/copyTree_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/copyVHtree_func.sql b/SAS/OTDB/sql/copyVHtree_func.sql
index c9fefab06dea12fa6087ebb87ba4e3ef92becda8..ea003f7bcece81ead0c2ea9d737eb8743e8c0a9d 100644
--- a/SAS/OTDB/sql/copyVHtree_func.sql
+++ b/SAS/OTDB/sql/copyVHtree_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/copyVTtree_func.sql b/SAS/OTDB/sql/copyVTtree_func.sql
index 5713219f3d7ffb7948d23fb6682caccb2bd674f7..2f903e64a6c9195f46335da6ccf77ea1ba317d2c 100644
--- a/SAS/OTDB/sql/copyVTtree_func.sql
+++ b/SAS/OTDB/sql/copyVTtree_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_PIC_tables.sql b/SAS/OTDB/sql/create_PIC_tables.sql
index 409d96721935e5ba5072a6e63596c9b452b3bcd1..732edb89e4f2f1d852113b38d38ac55925ae280b 100644
--- a/SAS/OTDB/sql/create_PIC_tables.sql
+++ b/SAS/OTDB/sql/create_PIC_tables.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_VIC_tables.sql b/SAS/OTDB/sql/create_VIC_tables.sql
index edc6143f982d7fc1b2f7ef94f0482cae9abf9ef3..b0267841271bc834b8295962517739c3231ebb8b 100644
--- a/SAS/OTDB/sql/create_VIC_tables.sql
+++ b/SAS/OTDB/sql/create_VIC_tables.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_base_tables.sql b/SAS/OTDB/sql/create_base_tables.sql
index 4aaa49f053a4137f9b41c5cfb9c272cb835f1c69..ffdd15974233d62a206bed8e5ad2ef6aa1656d78 100644
--- a/SAS/OTDB/sql/create_base_tables.sql
+++ b/SAS/OTDB/sql/create_base_tables.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_event_action.sql b/SAS/OTDB/sql/create_event_action.sql
index 9477106657eb87d4810b42822ca0aeb3806c7e60..1d1b2ec324fee144db83e1d9184d6cb9e89a5efc 100644
--- a/SAS/OTDB/sql/create_event_action.sql
+++ b/SAS/OTDB/sql/create_event_action.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_log_system.sql b/SAS/OTDB/sql/create_log_system.sql
index 70cc90478cb7bead3024ad8be308bc09f0f44357..89737bc54fb09e75eddb00f224d3d3a511268ccf 100644
--- a/SAS/OTDB/sql/create_log_system.sql
+++ b/SAS/OTDB/sql/create_log_system.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_rules.sql b/SAS/OTDB/sql/create_rules.sql
index e3888ca23e09af68ca89df4f9f59cefc12ddcb9d..6b6ca99770970f0ff8e9afa1f646b4636f6bf1fe 100644
--- a/SAS/OTDB/sql/create_rules.sql
+++ b/SAS/OTDB/sql/create_rules.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2012
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_security.sql b/SAS/OTDB/sql/create_security.sql
index eeeb0ad8c9f4189a24bbff0067e14f1219dba120..03b22168cd1bd24c67f085cff1f76f4fef41a990 100644
--- a/SAS/OTDB/sql/create_security.sql
+++ b/SAS/OTDB/sql/create_security.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_tree_table.sql b/SAS/OTDB/sql/create_tree_table.sql
index 90ffbbf53a29bd4c44adf0d8d9fe1050edde0f34..cd314a101bc809348499a6c9a56d2f4c2e613580 100644
--- a/SAS/OTDB/sql/create_tree_table.sql
+++ b/SAS/OTDB/sql/create_tree_table.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_types.sql b/SAS/OTDB/sql/create_types.sql
index 92730d73c18bf114f14083d19655078f47ea491b..049eded2fd901c754b80468c90196756e1689923 100644
--- a/SAS/OTDB/sql/create_types.sql
+++ b/SAS/OTDB/sql/create_types.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/deleteTree_func.sql b/SAS/OTDB/sql/deleteTree_func.sql
index c66cd2d44d1271361eeb1b318dd3f2de843ec30b..0068a4c91c6b42313aac21246c7629db9c630972 100644
--- a/SAS/OTDB/sql/deleteTree_func.sql
+++ b/SAS/OTDB/sql/deleteTree_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/deleteVCnode_func.sql b/SAS/OTDB/sql/deleteVCnode_func.sql
index 66e30f06fd8cc5f0edac3291f12f61002a709925..9f4fd433de46c505efb97731c7e02b82213dd866 100644
--- a/SAS/OTDB/sql/deleteVCnode_func.sql
+++ b/SAS/OTDB/sql/deleteVCnode_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/deleteVTnode_func.sql b/SAS/OTDB/sql/deleteVTnode_func.sql
index 9cdeb895f1ec0120b7ea71009ec475c64459c089..81d4c7aa0e8d10a3f3afdb570a130352ba8d6580 100644
--- a/SAS/OTDB/sql/deleteVTnode_func.sql
+++ b/SAS/OTDB/sql/deleteVTnode_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/dupVTnode_func.sql b/SAS/OTDB/sql/dupVTnode_func.sql
index c06e89342e3bf974cdd036de1e0697282d11b46c..60cf069df7555b1709850453ecc110e4cd7acbe3 100644
--- a/SAS/OTDB/sql/dupVTnode_func.sql
+++ b/SAS/OTDB/sql/dupVTnode_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/exportMetadata_func.sql b/SAS/OTDB/sql/exportMetadata_func.sql
index 49c51727cbfc2460bb13290fc74bff9249bf40be..a9a9e4b222a3cda7ebec8923656fddeb6215de18 100644
--- a/SAS/OTDB/sql/exportMetadata_func.sql
+++ b/SAS/OTDB/sql/exportMetadata_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2013
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/exportResultTree_func.sql b/SAS/OTDB/sql/exportResultTree_func.sql
index 4bdf45db1be68eb17850ff6005371f79bdec5e77..bc031f2333c8fbe847aa0cc6396de46c6681e7fc 100644
--- a/SAS/OTDB/sql/exportResultTree_func.sql
+++ b/SAS/OTDB/sql/exportResultTree_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/exportTree_func.sql b/SAS/OTDB/sql/exportTree_func.sql
index fde3d84133b1283d9dfc6734150107656f1fa771..71a729345d6842c9a20f799ecabec303d1bb75c8 100644
--- a/SAS/OTDB/sql/exportTree_func.sql
+++ b/SAS/OTDB/sql/exportTree_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getAllTaskID_func.sql b/SAS/OTDB/sql/getAllTaskID_func.sql
index 22f13b4847aef9d762b25aca8dbead17a07e8864..3587d015b2de9ba84e3b898f138fbc8ffc3fd78f 100644
--- a/SAS/OTDB/sql/getAllTaskID_func.sql
+++ b/SAS/OTDB/sql/getAllTaskID_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2010
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getBrokenHardware_func.sql b/SAS/OTDB/sql/getBrokenHardware_func.sql
index 7112549dbea6b2314d617dbad8b4b49c6e129a6b..ed6bcd14da522ec8224116fa1a991ba631247935 100644
--- a/SAS/OTDB/sql/getBrokenHardware_func.sql
+++ b/SAS/OTDB/sql/getBrokenHardware_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2011
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getDefaultTemplates_func.sql b/SAS/OTDB/sql/getDefaultTemplates_func.sql
index 0bc0bf84d521ac6d9fb0d2acc55e2e457bb77897..cba5df5f1ff70dcb688279e70604657219bc36a5 100644
--- a/SAS/OTDB/sql/getDefaultTemplates_func.sql
+++ b/SAS/OTDB/sql/getDefaultTemplates_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getExecutableTrees_func.sql b/SAS/OTDB/sql/getExecutableTrees_func.sql
index 027c50ee576ee3a859c83c64baf2634f5919e6ae..dca6b9ab52f8d3bb3f60f18b382971f2ea30892e 100644
--- a/SAS/OTDB/sql/getExecutableTrees_func.sql
+++ b/SAS/OTDB/sql/getExecutableTrees_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getModifiedTrees_func.sql b/SAS/OTDB/sql/getModifiedTrees_func.sql
index 259226e90b936ef7850ee790567f38f669b36274..b7c1da39f149c07aa4e2464874bc957568637cdc 100644
--- a/SAS/OTDB/sql/getModifiedTrees_func.sql
+++ b/SAS/OTDB/sql/getModifiedTrees_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2012
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getMomID2treeID_func.sql b/SAS/OTDB/sql/getMomID2treeID_func.sql
index decc5d1b700d566fba14460ffe9b27b165992c93..b8fdc492228151c46597abd8628b755c6c9e05c4 100644
--- a/SAS/OTDB/sql/getMomID2treeID_func.sql
+++ b/SAS/OTDB/sql/getMomID2treeID_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2012
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getNode_func.sql b/SAS/OTDB/sql/getNode_func.sql
index 85162cee3651fee82e302c196258928acc212df8..505bcde0be1322aab71c3a766e9a042f00e13e82 100644
--- a/SAS/OTDB/sql/getNode_func.sql
+++ b/SAS/OTDB/sql/getNode_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getPICitemList_func.sql b/SAS/OTDB/sql/getPICitemList_func.sql
index de59fdcfc6bdf12a311c71057eee98b5d27b7600..71b8f96084455058a8d8097c0553e9d742148da6 100644
--- a/SAS/OTDB/sql/getPICitemList_func.sql
+++ b/SAS/OTDB/sql/getPICitemList_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getPICparamDef_func.sql b/SAS/OTDB/sql/getPICparamDef_func.sql
index 3af44c4432cc05ac447ec508d9249e1ec2d5615d..39d2bcf71c2a6c892557fc4152d9450a6044b963 100644
--- a/SAS/OTDB/sql/getPICparamDef_func.sql
+++ b/SAS/OTDB/sql/getPICparamDef_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getSchedulerInfo_func.sql b/SAS/OTDB/sql/getSchedulerInfo_func.sql
index afe05f8c336e98c436c8ed07e7bea4cbc6cbc8b2..eacfccf193e5a39f1c3ed2cf86798e27b05b944d 100644
--- a/SAS/OTDB/sql/getSchedulerInfo_func.sql
+++ b/SAS/OTDB/sql/getSchedulerInfo_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2010
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getStateList_func.sql b/SAS/OTDB/sql/getStateList_func.sql
index 1d96d64a6cd0ef6fc691d5aafebe9957807d1613..7296f028cbc31866474a31aa12f4268713c08861 100644
--- a/SAS/OTDB/sql/getStateList_func.sql
+++ b/SAS/OTDB/sql/getStateList_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTopNode_func.sql b/SAS/OTDB/sql/getTopNode_func.sql
index 3056ce01d9e0fead427a5cb432490c0f2010e7fc..2b318c8ffe0f54debdde56959ead75bce625ca5c 100644
--- a/SAS/OTDB/sql/getTopNode_func.sql
+++ b/SAS/OTDB/sql/getTopNode_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTreeGroup_func.sql b/SAS/OTDB/sql/getTreeGroup_func.sql
index 4e32f1f8c09724b322492252106285867966a770..013d505bae4f48b8df2b338c8c621f3c9e8bdfab 100644
--- a/SAS/OTDB/sql/getTreeGroup_func.sql
+++ b/SAS/OTDB/sql/getTreeGroup_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTreeInfo_func.sql b/SAS/OTDB/sql/getTreeInfo_func.sql
index 1ce3214ef3923b8ffdd4f424e64f9478d455d428..962ace7a17723a222db6bbe281255f1f1d7835a2 100644
--- a/SAS/OTDB/sql/getTreeInfo_func.sql
+++ b/SAS/OTDB/sql/getTreeInfo_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTreeList_func.sql b/SAS/OTDB/sql/getTreeList_func.sql
index 5ead542cab7f5fca4e8ca1d0385534fcb8aff3cb..22cb9094cfe5a9f0e92e7774581bca0e13a8065c 100644
--- a/SAS/OTDB/sql/getTreeList_func.sql
+++ b/SAS/OTDB/sql/getTreeList_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTreesInPeriod_func.sql b/SAS/OTDB/sql/getTreesInPeriod_func.sql
index d071a34bec5fff1b33e698d54eef7d9bfede5165..8476ec106512509bd53adc7573d374331f816023 100644
--- a/SAS/OTDB/sql/getTreesInPeriod_func.sql
+++ b/SAS/OTDB/sql/getTreesInPeriod_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVCNodeList_func.sql b/SAS/OTDB/sql/getVCNodeList_func.sql
index 6ac239f0205291f2e58097ea38eb9094f9dadd6c..8bda0a63061c90f8f18c1a79b739b7b1ba6e4999 100644
--- a/SAS/OTDB/sql/getVCNodeList_func.sql
+++ b/SAS/OTDB/sql/getVCNodeList_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVCparams_func.sql b/SAS/OTDB/sql/getVCparams_func.sql
index 29c4ae5283bea6a0fb5c8e4bf94c4c9ae70c43f1..1aba8c091816412e803fd05ab188ed237f16050f 100644
--- a/SAS/OTDB/sql/getVCparams_func.sql
+++ b/SAS/OTDB/sql/getVCparams_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVHitemList_func.sql b/SAS/OTDB/sql/getVHitemList_func.sql
index a3afc89059341e493fb0834d8d4b85e9cf36f31d..980e3f0e8219e0392a7241b96cced26d6ae25606 100644
--- a/SAS/OTDB/sql/getVHitemList_func.sql
+++ b/SAS/OTDB/sql/getVHitemList_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVICnodeDef_func.sql b/SAS/OTDB/sql/getVICnodeDef_func.sql
index ca012acfcd70563f8bd49f56418a467529e9d0e8..a825eaff05b448c77850768f00a1e9d42a887e67 100644
--- a/SAS/OTDB/sql/getVICnodeDef_func.sql
+++ b/SAS/OTDB/sql/getVICnodeDef_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVICparamDef_func.sql b/SAS/OTDB/sql/getVICparamDef_func.sql
index 8ce28fd22f4fc6395b4caf613204c1c54e57db69..32f4ed51762c9190af8207f40c149d49f970d306 100644
--- a/SAS/OTDB/sql/getVICparamDef_func.sql
+++ b/SAS/OTDB/sql/getVICparamDef_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVTchildren_func.sql b/SAS/OTDB/sql/getVTchildren_func.sql
index 105017cb321455bd4111a34a7abf9f9e69fb6ee6..8fb5533d30302b42dd0163cf0a03502c659bac22 100644
--- a/SAS/OTDB/sql/getVTchildren_func.sql
+++ b/SAS/OTDB/sql/getVTchildren_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVTitemList_func.sql b/SAS/OTDB/sql/getVTitemList_func.sql
index 40637ec8891efaf44f48d496d186675381ca58be..b72dea44d21187bd4ee0fd92a86f9b557a1876f5 100644
--- a/SAS/OTDB/sql/getVTitemList_func.sql
+++ b/SAS/OTDB/sql/getVTitemList_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVTitem_func.sql b/SAS/OTDB/sql/getVTitem_func.sql
index aa9e3b7b0a0d962122337383c6d7df782cd7608b..0c130cacee9bef9cb26985bfe83c9c69cb2f84e7 100644
--- a/SAS/OTDB/sql/getVTitem_func.sql
+++ b/SAS/OTDB/sql/getVTitem_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2011
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/hVICsearchParamID_func.sql b/SAS/OTDB/sql/hVICsearchParamID_func.sql
index adb7cce96f17f6746e086f5aa20ffa605d6bc9fb..eff4692d54f9e97a6021f1a283b1540b16c3498d 100644
--- a/SAS/OTDB/sql/hVICsearchParamID_func.sql
+++ b/SAS/OTDB/sql/hVICsearchParamID_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/instanciateTree_func.sql b/SAS/OTDB/sql/instanciateTree_func.sql
index 5da72dfb3ee08670f8044a2713984b9af7e8f802..1b96e0900e7c5f4fe083cb7c39f609a70af768d9 100644
--- a/SAS/OTDB/sql/instanciateTree_func.sql
+++ b/SAS/OTDB/sql/instanciateTree_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/isTopComponent_func.sql b/SAS/OTDB/sql/isTopComponent_func.sql
index 78b086471a75769b1737082aab9694f00ee0268b..98e285f9a0bd3a322d7b3086597527699450196e 100644
--- a/SAS/OTDB/sql/isTopComponent_func.sql
+++ b/SAS/OTDB/sql/isTopComponent_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/misc_func.sql b/SAS/OTDB/sql/misc_func.sql
index 453140a226882c776ebaf366cbe567cadd165dc7..9327c931293bec18433fb964400a83459f83f807 100644
--- a/SAS/OTDB/sql/misc_func.sql
+++ b/SAS/OTDB/sql/misc_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/newTree_func.sql b/SAS/OTDB/sql/newTree_func.sql
index b0495585eebc8cc5750bcd0fb09529f6c28c1419..34cb74e94f230bb6b2162ded13d2f9382d32712e 100644
--- a/SAS/OTDB/sql/newTree_func.sql
+++ b/SAS/OTDB/sql/newTree_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/saveSchedulerInfo_func.sql b/SAS/OTDB/sql/saveSchedulerInfo_func.sql
index 26367abc81d4456d8d57a94af29a10bdca67e82f..8fbd82dc047dbf5d90b0e60cc28d375af3f123e8 100644
--- a/SAS/OTDB/sql/saveSchedulerInfo_func.sql
+++ b/SAS/OTDB/sql/saveSchedulerInfo_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2010
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/saveVCnode_func.sql b/SAS/OTDB/sql/saveVCnode_func.sql
index 63bbd27e833785b27b1c94dc96987655881c0c7b..730c6c0fb4c67e30f9d1a3e6db2c59ec22109af3 100644
--- a/SAS/OTDB/sql/saveVCnode_func.sql
+++ b/SAS/OTDB/sql/saveVCnode_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/saveVICparamDef_func.sql b/SAS/OTDB/sql/saveVICparamDef_func.sql
index faf557cff7b8ca5edecb8bf681bf8998f2ed4048..3484860b3745fd329f74e571d8d347e07f2233df 100644
--- a/SAS/OTDB/sql/saveVICparamDef_func.sql
+++ b/SAS/OTDB/sql/saveVICparamDef_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/searchPICinPeriod_func.sql b/SAS/OTDB/sql/searchPICinPeriod_func.sql
index 8fd0e44ed820440e5c9551ba4fe8c396f25b92c1..5862c655352e2bdeb2d4c152f4985c53692c4c5d 100644
--- a/SAS/OTDB/sql/searchPICinPeriod_func.sql
+++ b/SAS/OTDB/sql/searchPICinPeriod_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/searchVHinPeriod_func.sql b/SAS/OTDB/sql/searchVHinPeriod_func.sql
index cbbf4fbf2b0fa079a93bae13f4a00c56c55cb1e5..fddde3c9a5b5635d2b782f432087a42c685b49ee 100644
--- a/SAS/OTDB/sql/searchVHinPeriod_func.sql
+++ b/SAS/OTDB/sql/searchVHinPeriod_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/security_func.sql b/SAS/OTDB/sql/security_func.sql
index bfed36af51aec07de38cebc51abe66f9cf2669e2..e6d0c2f94a259d8c8995911ae588900d1016ec14 100644
--- a/SAS/OTDB/sql/security_func.sql
+++ b/SAS/OTDB/sql/security_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/setDescription_func.sql b/SAS/OTDB/sql/setDescription_func.sql
index 2bbda61ffcfe71cfc5c2b0d1bb3817f13454980c..387a7ac12104585aecf7f46d5233b7c1d30f7630 100644
--- a/SAS/OTDB/sql/setDescription_func.sql
+++ b/SAS/OTDB/sql/setDescription_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2006
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/setMomInfo_func.sql b/SAS/OTDB/sql/setMomInfo_func.sql
index caaac5c1bf836ad40a94698bae2f4fbb4d84270d..90b64fef1fd4c6412671e9704decb7164e812bd4 100644
--- a/SAS/OTDB/sql/setMomInfo_func.sql
+++ b/SAS/OTDB/sql/setMomInfo_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/setSchedule_func.sql b/SAS/OTDB/sql/setSchedule_func.sql
index eb74f2d48b032987338f96190883f7e5d6781c6b..3598556ef25fdfdffc511f99efd314ea1d4c539d 100644
--- a/SAS/OTDB/sql/setSchedule_func.sql
+++ b/SAS/OTDB/sql/setSchedule_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2006
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/setTreeState_func.sql b/SAS/OTDB/sql/setTreeState_func.sql
index 04e5c624f579607981168b3d679eab5a3bf30f86..bca0a7855ecc93ddf2859207c5547b8f0850f6f8 100644
--- a/SAS/OTDB/sql/setTreeState_func.sql
+++ b/SAS/OTDB/sql/setTreeState_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005-2013
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/updateVTnode_func.sql b/SAS/OTDB/sql/updateVTnode_func.sql
index bd80cdafda3b252ededfa392e157e44a9dc0c631..bf0dc53bf725f1ec934a6fb17cad89182f8685bd 100644
--- a/SAS/OTDB/sql/updateVTnode_func.sql
+++ b/SAS/OTDB/sql/updateVTnode_func.sql
@@ -3,7 +3,7 @@
--
-- Copyright (C) 2005
-- ASTRON (Netherlands Foundation for Research in Astronomy)
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/Campaign.cc b/SAS/OTDB/src/Campaign.cc
index 3a3846fb4d13099e9607cc4062847423ee1afa29..0d5a9b44e0c62633de755af9b9ac63d9751838fb 100644
--- a/SAS/OTDB/src/Campaign.cc
+++ b/SAS/OTDB/src/Campaign.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/CampaignInfo.cc b/SAS/OTDB/src/CampaignInfo.cc
index 1e9564f18a6fba2eaaeeaffec198b6e9b573b8a2..0d1bd7ebd15da912743cb508cb38c11c17341b17 100644
--- a/SAS/OTDB/src/CampaignInfo.cc
+++ b/SAS/OTDB/src/CampaignInfo.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/Converter.cc b/SAS/OTDB/src/Converter.cc
index a035e490d6f23ef7f2cd2e9479ddba8a9d800b51..99db2e1f7eab4b8a3620ac8143c8822a100cc87c 100644
--- a/SAS/OTDB/src/Converter.cc
+++ b/SAS/OTDB/src/Converter.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/DefaultTemplate.cc b/SAS/OTDB/src/DefaultTemplate.cc
index 79fe77d437b8a404768c4407b200042f87428242..6a97e3896277b0b86d8bd864b73476bb914cc3ca 100644
--- a/SAS/OTDB/src/DefaultTemplate.cc
+++ b/SAS/OTDB/src/DefaultTemplate.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBaction.cc b/SAS/OTDB/src/OTDBaction.cc
index 4c1c631c995f1a8374b659d7027cb2e2fc143b42..a08376ddc8fc9d25960e25062088c26d91873506 100644
--- a/SAS/OTDB/src/OTDBaction.cc
+++ b/SAS/OTDB/src/OTDBaction.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBactionList.cc b/SAS/OTDB/src/OTDBactionList.cc
index 483f2b6075c8bc8ca4b622e4695afe7b30d02477..ea21751dcd6f97caa9eef256109f63478a534701 100644
--- a/SAS/OTDB/src/OTDBactionList.cc
+++ b/SAS/OTDB/src/OTDBactionList.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBconnection.cc b/SAS/OTDB/src/OTDBconnection.cc
index a2cb26e17641723b480a82eee640f8d8ffa3c8bf..0c11207bed196f6f4b472079c11f03515735dc1d 100644
--- a/SAS/OTDB/src/OTDBconnection.cc
+++ b/SAS/OTDB/src/OTDBconnection.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBcontrol.cc b/SAS/OTDB/src/OTDBcontrol.cc
index 44ffae46cca0ace859ad8faa912392ab8bcf7c9e..1123c58db96c1d95639b8503cb34fbed1b415427 100644
--- a/SAS/OTDB/src/OTDBcontrol.cc
+++ b/SAS/OTDB/src/OTDBcontrol.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBevent.cc b/SAS/OTDB/src/OTDBevent.cc
index bb54c19b153640195871db6a238d521853b76721..ccd7a01e3d3d26678a570e24f53b89b022ce7f15 100644
--- a/SAS/OTDB/src/OTDBevent.cc
+++ b/SAS/OTDB/src/OTDBevent.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBeventList.cc b/SAS/OTDB/src/OTDBeventList.cc
index be0d32047e5e7233fd751dd3b10afdfe550c3731..42e42eff7ac33a8b8c9dece135ccd831d9f924f4 100644
--- a/SAS/OTDB/src/OTDBeventList.cc
+++ b/SAS/OTDB/src/OTDBeventList.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBnode.cc b/SAS/OTDB/src/OTDBnode.cc
index fb9f15e2a890f2d813792a12fa05c1597913203c..6d1aea3a4e376ff2580a089fd501f4353cbf8df7 100644
--- a/SAS/OTDB/src/OTDBnode.cc
+++ b/SAS/OTDB/src/OTDBnode.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBparam.cc b/SAS/OTDB/src/OTDBparam.cc
index 8fd13bb0c1c55628ab94aea50ab906e3038ac284..cc114f8a9c9b244860f78028d41bd1a78b3c4c5a 100644
--- a/SAS/OTDB/src/OTDBparam.cc
+++ b/SAS/OTDB/src/OTDBparam.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBtree.cc b/SAS/OTDB/src/OTDBtree.cc
index 099d51da4b7d8d88632fa490264e278b56fbfd4d..8e77d37245d3e798c8677739927bbed412abcd8f 100644
--- a/SAS/OTDB/src/OTDBtree.cc
+++ b/SAS/OTDB/src/OTDBtree.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2011
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBvalue.cc b/SAS/OTDB/src/OTDBvalue.cc
index dbc869b1a9389e0d49b7de5b3784b8ec3c32a0ed..b0350c98c75958d838b321dfdce5883f64793fa4 100644
--- a/SAS/OTDB/src/OTDBvalue.cc
+++ b/SAS/OTDB/src/OTDBvalue.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/TreeMaintenance.cc b/SAS/OTDB/src/TreeMaintenance.cc
index 73106a57471c65c3a91ada9ba2e893b9ed7f1c3b..0ac93e6459740965942458bd6c3ef207d88b4293 100644
--- a/SAS/OTDB/src/TreeMaintenance.cc
+++ b/SAS/OTDB/src/TreeMaintenance.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/TreeState.cc b/SAS/OTDB/src/TreeState.cc
index 4763b63bfe897b4b014fa7d9191dde58931c812c..3715969d4d5236992c146da1739b65128c62fe4d 100644
--- a/SAS/OTDB/src/TreeState.cc
+++ b/SAS/OTDB/src/TreeState.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/TreeValue.cc b/SAS/OTDB/src/TreeValue.cc
index 3f0839b832e675ab87d429d7c2f1e24c6db69480..b68a431fcd5239b86ff54f84aa36e8bc43ad307d 100644
--- a/SAS/OTDB/src/TreeValue.cc
+++ b/SAS/OTDB/src/TreeValue.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/VICnodeDef.cc b/SAS/OTDB/src/VICnodeDef.cc
index 8d2a42638f7a1d957384378ff807cedec88563df..b2eae7d642e1238e23b520cafa410c599cbf4ba7 100644
--- a/SAS/OTDB/src/VICnodeDef.cc
+++ b/SAS/OTDB/src/VICnodeDef.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/loadCompFile.cc b/SAS/OTDB/src/loadCompFile.cc
index 8dcfa6feb6b39baf6a163aa6e9467f7b73ebbdf8..9ea7db2e8a9cbe593408730cd888c685c555764f 100644
--- a/SAS/OTDB/src/loadCompFile.cc
+++ b/SAS/OTDB/src/loadCompFile.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/misc.cc b/SAS/OTDB/src/misc.cc
index 461b8f663ef0e91b42f7b4d7587758ec97cc04bb..5abc49d5909fd3f5d47e8ae43a7463079c90e8a6 100644
--- a/SAS/OTDB/src/misc.cc
+++ b/SAS/OTDB/src/misc.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/setStatus.cc b/SAS/OTDB/src/setStatus.cc
index ef460f9f3332ceae6c4d89dc191b412de74adb4a..5d8f89a43a6165701d2f875029cc937dbd33271a 100644
--- a/SAS/OTDB/src/setStatus.cc
+++ b/SAS/OTDB/src/setStatus.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2004-2012
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/wSpaceSplit.cc b/SAS/OTDB/src/wSpaceSplit.cc
index 9ea8ad2f269376419b45f8c61b65dee722af7bf3..f38f66c107cb038193aedbef789f4641b77c599d 100644
--- a/SAS/OTDB/src/wSpaceSplit.cc
+++ b/SAS/OTDB/src/wSpaceSplit.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tBrokenHardware.cc b/SAS/OTDB/test/tBrokenHardware.cc
index c1d50159dcbd27d41a8a2f1a1b8a4a2f0a7e9fcb..fa89b774081d2d8cf7cb9b474ac202a95c4cf376 100644
--- a/SAS/OTDB/test/tBrokenHardware.cc
+++ b/SAS/OTDB/test/tBrokenHardware.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tCampaign.cc b/SAS/OTDB/test/tCampaign.cc
index 2fc62047d491452a4b023481126f2b9e6fe3af14..3392933258ac829a977c7bb77eef48af88111962 100644
--- a/SAS/OTDB/test/tCampaign.cc
+++ b/SAS/OTDB/test/tCampaign.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2010
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tConnection.cc b/SAS/OTDB/test/tConnection.cc
index 942254b3e9270a5733e29db7f9ed6d5a20031596..ed45c9032701646ea2607625d07a9a751aafd7de 100644
--- a/SAS/OTDB/test/tConnection.cc
+++ b/SAS/OTDB/test/tConnection.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tMetadata.cc b/SAS/OTDB/test/tMetadata.cc
index d1159d9f28cfa9149246c481aec87dc1d16a22af..878157a9f45bfc792f2c58a90c81500054cd422b 100644
--- a/SAS/OTDB/test/tMetadata.cc
+++ b/SAS/OTDB/test/tMetadata.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tPICtree.cc b/SAS/OTDB/test/tPICtree.cc
index 870b2ca4401c3c7d688a0377fa0d874608591773..7e2d181e46dd8453872f9fe5353aad4426371575 100644
--- a/SAS/OTDB/test/tPICtree.cc
+++ b/SAS/OTDB/test/tPICtree.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tPICvalue.cc b/SAS/OTDB/test/tPICvalue.cc
index fcb3095d5c940468d03cbd1cf60dded8dc75e6bb..63bce0bb228678e831d029936e2d46d7c718d220 100644
--- a/SAS/OTDB/test/tPICvalue.cc
+++ b/SAS/OTDB/test/tPICvalue.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tParamTypeConv.cc b/SAS/OTDB/test/tParamTypeConv.cc
index 990514c8ae0a86c0f6639f85d163a3c59dc6604d..ddf65b0343b4c137ec740ac38f59c8d8b94ab4a8 100644
--- a/SAS/OTDB/test/tParamTypeConv.cc
+++ b/SAS/OTDB/test/tParamTypeConv.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tQueryPIC.cc b/SAS/OTDB/test/tQueryPIC.cc
index b3acaea190ce523ff7ab2eaceb63a4e9a1ef2d06..63da8aca3d4e374b895398933cea54a35e2d62f2 100644
--- a/SAS/OTDB/test/tQueryPIC.cc
+++ b/SAS/OTDB/test/tQueryPIC.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tVHtree.cc b/SAS/OTDB/test/tVHtree.cc
index 1f1bf323fd780c53612908691169be5deaebfe1e..456f970d53a83814f11f4516fb51dda3a1be37b5 100644
--- a/SAS/OTDB/test/tVHtree.cc
+++ b/SAS/OTDB/test/tVHtree.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tVHvalue.cc b/SAS/OTDB/test/tVHvalue.cc
index 10e7047521ece408d629d53dbb0a88918d371829..f615f16d5fef5d0d43176365b794a68f67aa3dc9 100644
--- a/SAS/OTDB/test/tVHvalue.cc
+++ b/SAS/OTDB/test/tVHvalue.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tVICcomp.cc b/SAS/OTDB/test/tVICcomp.cc
index a1dfefac19f7a5b561b36216fa1449e7133abb95..6c006868d57c82d18ad5965a5d481f08065b32b0 100644
--- a/SAS/OTDB/test/tVICcomp.cc
+++ b/SAS/OTDB/test/tVICcomp.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tVTtree.cc b/SAS/OTDB/test/tVTtree.cc
index 3a16cb8e338c820cbd2893577e4a14836de87916..b15b10597419f478576e83a66f37901277648a0b 100644
--- a/SAS/OTDB/test/tVTtree.cc
+++ b/SAS/OTDB/test/tVTtree.cc
@@ -2,7 +2,7 @@
//#
//# Copyright (C) 2002-2004
//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//#
//# This program is free software; you can redistribute it and/or modify
//# it under the terms of the GNU General Public License as published by
diff --git a/SubSystems/Online_Cobalt/validation/system/network/routes.cbt005 b/SubSystems/Online_Cobalt/validation/system/network/routes.cbt005
index d70e1a803fe7cdd7da82d267af53f0b3e53ea916..4f801991ad1f844f099c23bbc3468242c2e11c08 100644
--- a/SubSystems/Online_Cobalt/validation/system/network/routes.cbt005
+++ b/SubSystems/Online_Cobalt/validation/system/network/routes.cbt005
@@ -44,8 +44,6 @@ default via 10.151.255.254 dev eth0 metric 100
10.175.255.202 dev eth3 scope link
10.175.255.203 dev eth4 scope link
10.175.255.204 dev eth5 scope link
-10.200.91.0/24 dev vlan2091 proto kernel scope link src 10.200.91.50
-10.200.92.0/24 dev vlan2092 proto kernel scope link src 10.200.92.50
10.211.0.0/16 dev vlan2011 proto kernel scope link src 10.211.8.50
10.212.0.0/16 dev vlan2012 proto kernel scope link src 10.212.8.50
10.213.0.0/16 dev vlan2013 proto kernel scope link src 10.213.8.50
diff --git a/SubSystems/Online_Cobalt/validation/system/network/routes.cbt008 b/SubSystems/Online_Cobalt/validation/system/network/routes.cbt008
index ca2d0b9c291b1be2b10a4218e7d67f5efee23c89..1f6a228bc2d479b077a1faa94ae54314f821eef8 100644
--- a/SubSystems/Online_Cobalt/validation/system/network/routes.cbt008
+++ b/SubSystems/Online_Cobalt/validation/system/network/routes.cbt008
@@ -28,10 +28,10 @@ default via 10.151.255.254 dev eth0 metric 100
10.175.134.2 dev eth4 scope link
10.175.134.3 dev eth4 scope link
10.175.134.4 dev eth4 scope link
-10.175.167.1 dev eth5 scope link
-10.175.167.2 dev eth5 scope link
-10.175.167.3 dev eth5 scope link
-10.175.167.4 dev eth5 scope link
+10.175.167.1 dev eth2 scope link
+10.175.167.2 dev eth2 scope link
+10.175.167.3 dev eth2 scope link
+10.175.167.4 dev eth2 scope link
10.175.200.1 dev eth4 scope link
10.175.200.2 dev eth4 scope link
10.175.200.3 dev eth4 scope link
@@ -40,6 +40,8 @@ default via 10.151.255.254 dev eth0 metric 100
10.175.255.202 dev eth3 scope link
10.175.255.203 dev eth4 scope link
10.175.255.204 dev eth5 scope link
+10.200.91.0/24 dev vlan2091 proto kernel scope link src 10.200.91.50
+10.200.92.0/24 dev vlan2092 proto kernel scope link src 10.200.92.50
10.211.0.0/16 dev vlan2011 proto kernel scope link src 10.211.1.50
10.212.0.0/16 dev vlan2012 proto kernel scope link src 10.212.1.50
10.213.0.0/16 dev vlan2013 proto kernel scope link src 10.213.1.50
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/BaseSimTreeModel.java b/support/tools/BaseSimGUI/src/org/astron/basesim/BaseSimTreeModel.java
index 5599f812612e1c9c1154acbd9c18aeb7ab04454b..cf524da06a1afc8d2057842a7cfdc8f344efe18a 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/BaseSimTreeModel.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/BaseSimTreeModel.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/Configuration.java b/support/tools/BaseSimGUI/src/org/astron/basesim/Configuration.java
index 720b4ad4fd1b18cef41acde8788318007706102d..6eef6d3ce3d1c738ed00bc2becb45b1a0042ecd7 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/Configuration.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/Configuration.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/Connection.java b/support/tools/BaseSimGUI/src/org/astron/basesim/Connection.java
index 0fd78af408b7545491be46707d24271dbaef975f..20fa3df57554e5b11406b4a231e51394e57de9db 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/Connection.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/Connection.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/ConnectionStep.java b/support/tools/BaseSimGUI/src/org/astron/basesim/ConnectionStep.java
index d9c1418e4657114c064aad9920793636d4fffa6c..2d5c4c934a9bff810ba34383ff5e689a0a60ce73 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/ConnectionStep.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/ConnectionStep.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/ContHandlerSim.java b/support/tools/BaseSimGUI/src/org/astron/basesim/ContHandlerSim.java
index 3ea3029a0c40913904179c1bd9f5440e61f673f7..a3ce7a7e69780a798099369b6cb7597541e5b07d 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/ContHandlerSim.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/ContHandlerSim.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/ErrorHandlerSim.java b/support/tools/BaseSimGUI/src/org/astron/basesim/ErrorHandlerSim.java
index 24a25c124bf2a791389200dd20e5450b1c0b0d00..8e5ec0f1c3e2a7b2a6f954f171621e8ab5b7b587 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/ErrorHandlerSim.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/ErrorHandlerSim.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/Graph.java b/support/tools/BaseSimGUI/src/org/astron/basesim/Graph.java
index 030d64fb04d46a3e401edaa2f37f41472d928526..d09ff17303a22709a04b32eb3a9cafbfb5e30304 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/Graph.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/Graph.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionEvent.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionEvent.java
index 459b4776e3a456dbcf8bb6c8db0c5591655bcd53..1ec12c2257c6fb41f7405a808d43001c6fb70951 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionEvent.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionEvent.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionListener.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionListener.java
index 2fefee1443a234db5e21dbe0cdcb9c220031678d..0717fd81a2304feeb5e81eede2024d995e98751e 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionListener.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionListener.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphComposite.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphComposite.java
index 9e7a9e9b4d43f6d657118f62258cf6118aca4050..c6b852d63aaa79f71f24fa93979ab03c6d5a8e06 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphComposite.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphComposite.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDataHolder.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDataHolder.java
index 3c40336275c17b129af99e5be3f82a9930f9a819..fe60d2ef3310b7cc95e521c99130d469d1515efd 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDataHolder.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDataHolder.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDiagram.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDiagram.java
index dd7fcb9afa149212852691f469765380dcedc0d4..ae892549eec65b3842b527ee792ffd240b0b445b 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDiagram.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDiagram.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphException.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphException.java
index f09d6325d6f816a7bd86a021672e63a1e82003d0..ea943be94e11b36641e1e9143a5761dbb5b3924a 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphException.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphException.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphManager.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphManager.java
index e66dbd592c1ec1ff3e59562dbb3b98a3710df2ee..6b992342aee05212d18dd30618b717af64124c31 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphManager.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphManager.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphParamHolder.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphParamHolder.java
index 8c28a9b6a48feff66c26bdd79ed8f1b89ffb38fb..d568c56c55fd40e6cb186e1f4bf6fa0b3e2415b9 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphParamHolder.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphParamHolder.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphSimul.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphSimul.java
index b2806057dbcb6fe4beb60c3fb4b3e958615ab221..9c924c25d7880f0da4bd19560f3f1c5e2d42c8b2 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphSimul.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphSimul.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphStep.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphStep.java
index f4a52369b8f08a5fcc0798a1141f7bbda9aba44c..21cd645c39b74f5404eec665f28f744ce9af3eaf 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphStep.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphStep.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphWorkHolder.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphWorkHolder.java
index b0ce7043dd0698330498a5d02dd30752b422c5cb..24adaededf6cf72210c7407a73e728c7c7e563b0 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphWorkHolder.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphWorkHolder.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/JBaseSim.java b/support/tools/BaseSimGUI/src/org/astron/basesim/JBaseSim.java
index 435209aba3874f61811856ec9cbd29652b3f23ff..cf764f95a793d14d5f4bf134e94d30e57300810e 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/JBaseSim.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/JBaseSim.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/JTestGraph.java b/support/tools/BaseSimGUI/src/org/astron/basesim/JTestGraph.java
index d2704dd9ba4639458267bf0a71033a7f0e8be314..932cca88bd5d11eed4aeb13feb374b8a5ecaff08 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/JTestGraph.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/JTestGraph.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutCentered.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutCentered.java
index b5ed54c5fb87f79faf0de62cd7da9c22ca07557c..54ae6611a4e5b9228242415005a8d4d3cc44217b 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutCentered.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutCentered.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutController.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutController.java
index 3bb602903f3edb688ab22bcaec8b8d7a3ec8ee05..65424dc3b7640e67253b6a13417337d0dbd9840d 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutController.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutController.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutDataHolder.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutDataHolder.java
index 38ac77958bca61ada3b81918635978d14b8ba082..e8dd796c2dbc1c161818f54a29d9baa019660c37 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutDataHolder.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutDataHolder.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutFlow.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutFlow.java
index 19b00ec0879e101273cfea49d6fe54bf58993597..008c1153641ea05c4456582a6f900499805a387b 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutFlow.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutFlow.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutSimul.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutSimul.java
index 9494265f7ffc832111e458d8e3a5b16dff99e9e6..1a513214230064a28b81b6e40f96a323ed222589 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutSimul.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutSimul.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/Main.java b/support/tools/BaseSimGUI/src/org/astron/basesim/Main.java
index 7a50710714f2e8c4842b7629b97632208ca7642d..6ffcb1cbdc3792f73c6430c2d9c0fb226d137fac 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/Main.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/Main.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/MessageGraph.java b/support/tools/BaseSimGUI/src/org/astron/basesim/MessageGraph.java
index 784136aab01a7dde16067b844a19eb56ce92909d..7bed92fb79de77cc18358670452118763cf1cde5 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/MessageGraph.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/MessageGraph.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/MessageXML.java b/support/tools/BaseSimGUI/src/org/astron/basesim/MessageXML.java
index 2f4af65289ffb5b5bedf4a31c15861788ba76dc8..eeae71bd6da57e2a3108d731c7f911b006e189e7 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/MessageXML.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/MessageXML.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/SelectionManager.java b/support/tools/BaseSimGUI/src/org/astron/basesim/SelectionManager.java
index 4d58a0f276bc5db9228f4329b7fb86336e722b41..d64b6f48cfe8986c51fb1bd53c797a912ad22349 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/SelectionManager.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/SelectionManager.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/TestMain.java b/support/tools/BaseSimGUI/src/org/astron/basesim/TestMain.java
index 1550b634ab88df4308569529bfe4b8d82228318b..403a73f83d887a905f3fc1698b2784a9f7c4f513 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/TestMain.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/TestMain.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/util/Sample.java b/support/tools/BaseSimGUI/src/org/astron/util/Sample.java
index e769ad9bbaeca75967dfacc52e2672b60d73392f..6c7ed1cb738be50d91ad4162a984330fd4cb2e03 100644
--- a/support/tools/BaseSimGUI/src/org/astron/util/Sample.java
+++ b/support/tools/BaseSimGUI/src/org/astron/util/Sample.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/util/gui/JNotifier.java b/support/tools/BaseSimGUI/src/org/astron/util/gui/JNotifier.java
index 018f107bd4f2ba87df4541d66abc085c3f7db5df..d690ad6796f10fabcb08fccdd8cd3c6ab38316ff 100644
--- a/support/tools/BaseSimGUI/src/org/astron/util/gui/JNotifier.java
+++ b/support/tools/BaseSimGUI/src/org/astron/util/gui/JNotifier.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageEvent.java b/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageEvent.java
index 520e2f506c225f049f40a41e1de420e2abe87dfc..34310511c195ccce8adc8e8f43759b57aeb60bc1 100644
--- a/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageEvent.java
+++ b/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageEvent.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageListener.java b/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageListener.java
index 730ae3d7be7c880aea4cb3cda372df497a094b68..e505de4e0c9ea6a37447cbc40b254cd35a506fb3 100644
--- a/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageListener.java
+++ b/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageListener.java
@@ -1,6 +1,6 @@
// Copyright (C) 2000, 2001
// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/support/tools/wrapexec/src/wrapexec.cc b/support/tools/wrapexec/src/wrapexec.cc
index 5db159493437aa2dd5781847fe8695ba94526439..bdcdc17826f971d5581d85f53b0e1f671eb23202 100644
--- a/support/tools/wrapexec/src/wrapexec.cc
+++ b/support/tools/wrapexec/src/wrapexec.cc
@@ -13,7 +13,7 @@
*
* Copyright (C) 2000,2001,2002
* ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by