diff --git a/.gitattributes b/.gitattributes
index 3526c9411f187e9650a8b23abd52c068c40e1f35..597dcb1ae3ad971f2d094615721d3d129a22817b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2637,6 +2637,7 @@ MAC/Deployment/data/Coordinates/ETRF_FILES/RS306/rs306-antenna-positions-etrs.cs
MAC/Deployment/data/Coordinates/ETRF_FILES/RS307/rs307-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS406/rs406-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS407/rs407-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/RS409/rs409-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS503/rs503-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS508/rs508-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS509/rs509-antenna-positions-etrs.csv -text
@@ -2743,6 +2744,8 @@ MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-hba-solution.li
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-lba-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS407/rs407-hba-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS407/rs407-lba-core-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/RS409/rs409-hba-core-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/RS409/rs409-lba-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS503/rs503-core-solution-hba.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS503/rs503-core-solution-lba.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS508/rs508-hba-solution.lisp -text
@@ -2945,6 +2948,7 @@ MAC/Deployment/data/StaticMetaData/AntennaFields/RS305-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS306-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS307-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf -text
+MAC/Deployment/data/StaticMetaData/AntennaFields/RS409-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS503-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS508-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS509-AntennaField.conf -text
@@ -3011,6 +3015,7 @@ MAC/Deployment/data/StaticMetaData/iHBADeltas/RS305-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS306-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS307-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf -text
+MAC/Deployment/data/StaticMetaData/iHBADeltas/RS409-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS503-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS508-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS509-iHBADeltas.conf -text
diff --git a/CEP/Pipeline/framework/lofarpipe/support/remotecommand.py b/CEP/Pipeline/framework/lofarpipe/support/remotecommand.py
index 2f4442ef2ff4c2b5a821cc51d466692c760327ca..421abd59cba46c7e489b84a0c0afd5f6693157d7 100644
--- a/CEP/Pipeline/framework/lofarpipe/support/remotecommand.py
+++ b/CEP/Pipeline/framework/lofarpipe/support/remotecommand.py
@@ -57,7 +57,7 @@ class ParamikoWrapper(object):
def kill(self):
self.chan.close()
-def run_remote_command(config, logger, host, command, env, arguments = None):
+def run_remote_command(config, logger, host, command, env, arguments=None):
"""
Run command on host, passing it arguments from the arguments list and
exporting key/value pairs from env(a dictionary).
@@ -101,7 +101,7 @@ def run_via_mpirun(logger, host, command, environment, arguments):
mpi_cmd.extend(str(arg) for arg in arguments)
env = os.environ
env.update(environment)
- process = spawn_process(mpi_cmd, logger, env = env)
+ process = spawn_process(mpi_cmd, logger, env=env)
# mpirun should be killed with a SIGTERM to enable it to shut down the
# remote command.
process.kill = lambda : os.kill(process.pid, signal.SIGTERM)
@@ -135,7 +135,7 @@ def run_via_paramiko(logger, host, command, environment, arguments, key_filename
import paramiko
client = paramiko.SSHClient()
client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
- client.connect(host, key_filename = key_filename)
+ client.connect(host, key_filename=key_filename)
commandstring = ["%s=%s" % (key, value) for key, value in environment.items()]
commandstring.append(command)
commandstring.extend(re.escape(str(arg)) for arg in arguments)
@@ -152,7 +152,7 @@ class ProcessLimiter(defaultdict):
:param nproc: Bound value for semaphore (ie, maximum number of jobs)
:type nproc: integer or none
"""
- def __init__(self, nproc = None):
+ def __init__(self, nproc=None):
if nproc:
super(ProcessLimiter, self).__init__(
lambda: BoundedSemaphore(int(nproc))
@@ -177,11 +177,13 @@ class ComputeJob(object):
:param command: Full path to command to be run on target host
:param arguments: List of arguments which will be passed to command
"""
- def __init__(self, host, command, arguments = []):
+ def __init__(self, host, command, arguments=[]):
self.host = host
self.command = command
self.arguments = arguments
self.results = {}
+ self.results['returncode'] = 123456 # Default to obscure code to allow
+ # test of failing ssh connections
def dispatch(self, logger, config, limiter, id, jobhost, jobport, error, killswitch):
@@ -208,7 +210,7 @@ class ComputeJob(object):
"PYTHONPATH": os.environ.get('PYTHONPATH'),
"LD_LIBRARY_PATH": os.environ.get('LD_LIBRARY_PATH')
},
- arguments = [id, jobhost, jobport]
+ arguments=[id, jobhost, jobport]
)
# Wait for process to finish. In the meantime, if the killswitch
# is set (by an exception in the main thread), forcibly kill our
@@ -277,7 +279,7 @@ class RemoteCommandRecipeMixIn(object):
"""
Mix-in for recipes to dispatch jobs using the remote command mechanism.
"""
- def _schedule_jobs(self, jobs, max_per_node = None):
+ def _schedule_jobs(self, jobs, max_per_node=None):
"""
Schedule a series of compute jobs. Blocks until completion.
@@ -300,8 +302,8 @@ class RemoteCommandRecipeMixIn(object):
jobpool[job_id] = job
threadpool.append(
threading.Thread(
- target = job.dispatch,
- args = (
+ target=job.dispatch,
+ args=(
self.logger, self.config, limiter, job_id,
jobhost, jobport, self.error, killswitch
)
diff --git a/CEP/Pipeline/recipes/sip/master/setupparmdb.py b/CEP/Pipeline/recipes/sip/master/setupparmdb.py
index 0931ec90e35776e10dece8d66690790fe92cbf6c..84f0da193d77da2379d0e013e7869e5f23dd1f4f 100644
--- a/CEP/Pipeline/recipes/sip/master/setupparmdb.py
+++ b/CEP/Pipeline/recipes/sip/master/setupparmdb.py
@@ -152,7 +152,13 @@ class setupparmdb(BaseRecipe, RemoteCommandRecipeMixIn):
)
self._schedule_jobs(jobs, max_per_node=self.inputs['nproc'])
for job, outp in zip(jobs, outdata):
- if job.results['returncode'] != 0:
+ # If the returncode is 123456, failing ssh
+ if job.results['returncode'] == 123456:
+ self.logger.warning("ssh connection with {0} failed."
+ "Skipping further work on this task".format(outp.host))
+ self.logger.warning("Error code 123456.")
+ outp.skip = True
+ elif job.results['returncode'] != 0:
outp.skip = True
# *********************************************************************
diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java
index 42236b227516251c93ed7b74a2bd9a6b77b408d3..18d8fcbc8b1c0ac707fd6cd3a0fa7572bfbd9e8e 100644
--- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java
+++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java
@@ -309,34 +309,6 @@ public abstract class LofarUtils {
aComboBox.validate();
}
- static public BitSet beamletToBitSet(String aS) {
-
- BitSet aBitSet = new BitSet(216);
-
- if (aS == null || aS.length() <= 2) {
- return aBitSet;
- }
- //remove [] from string
- String beamlets = aS.substring(aS.indexOf("[") + 1, aS.lastIndexOf("]"));
-
- // split into seperate beamlet nr's
- String[] beamletList = beamlets.split("[,]");
-
- //fill bitset
-
- for (int j = 0; j < beamletList.length; j++) {
- int val;
- try {
- val = Integer.parseInt(beamletList[j]);
- aBitSet.set(val);
- } catch (NumberFormatException ex) {
- System.out.println("Error converting beamlet numbers");
-
- }
- }
- return aBitSet;
- }
-
static public String ltrim(String aS, String matchSet) {
String reg = "^[" + matchSet + "]*";
return Pattern.compile(reg).matcher(aS).replaceAll("");
diff --git a/MAC/APL/APLCommon/src/swlevel.conf b/MAC/APL/APLCommon/src/swlevel.conf
index 48ee9d1b738d2853d2880ac4d660afe5c0f6a54f..5ffd797cad27a3737f2f25e0b085ce30e300b456 100644
--- a/MAC/APL/APLCommon/src/swlevel.conf
+++ b/MAC/APL/APLCommon/src/swlevel.conf
@@ -10,8 +10,7 @@
#1:u:d:::LogClient
1:u:d:::CEPlogProcessor
1:u:d:::ServiceBroker
-1:u:d:::SoftwareMonitor
-1:u:d:::SASGateway
+#1:u:d:::SASGateway
1:u:d:::ACDaemon
#
2:u:d:r::_EPAStub
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
index 61e13a626d0d398ac93e2aef947eca31050eb38c..6eaaed5618060f2f38d7b8d84b3e4794321de319 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
@@ -614,7 +614,7 @@ GCFEvent::TResult OnlineControl::finishing_state(GCFEvent& event, GCFPortInterfa
int32 result = system (startCmd.c_str());
LOG_INFO_STR ("Result of command = " << result);
- itsTimerPort->setTimer(2.0);
+ itsTimerPort->setTimer(302.0); // IONProc, and thus CEPlogProcessor, can take up to 5 minutes to wrap up
break;
}
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.cc b/MAC/APL/StationCU/src/StationControl/StationControl.cc
index 26f69d44602708016157ffdf4039fff306a4d8b7..798f6c779acd78e76d1b23b3d576350a35d52f2f 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.cc
@@ -848,6 +848,7 @@ GCFEvent::TResult StationControl::startObservation_state(GCFEvent& event, GCFPor
LOG_INFO_STR("new observation also uses clock " << itsClock);
itsTimerPort->setTimer(0.0);
}
+ break;
}
case 1: {
@@ -866,6 +867,7 @@ GCFEvent::TResult StationControl::startObservation_state(GCFEvent& event, GCFPor
CLKCTRLSetSplittersEvent setEvent;
setEvent.splittersOn = splitterState;
itsClkCtrlPort->send(setEvent); // will result in CLKCTRL_SET_SPLITTERS_ACK
+ break;
}
case 2: {
@@ -897,6 +899,7 @@ GCFEvent::TResult StationControl::startObservation_state(GCFEvent& event, GCFPor
LOG_INFO_STR("new observation also uses bitmode " << itsBitmode);
itsTimerPort->setTimer(0.0);
}
+ break;
}
default: {
@@ -908,6 +911,7 @@ GCFEvent::TResult StationControl::startObservation_state(GCFEvent& event, GCFPor
LOG_INFO("Going back to operational state");
itsStartingObs = itsObsMap.end();
TRAN(StationControl::operational_state);
+ break;
}
}
}
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/DE601/de601-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE601/de601-antenna-positions-etrs.csv
index 95c1d80e70e0fad76cd99ff4aaa5641b7fd010d3..7cf6e72c4d0aa95960da3afe9d570363ea19b72e 100644
--- a/MAC/Deployment/data/Coordinates/ETRF_FILES/DE601/de601-antenna-positions-etrs.csv
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE601/de601-antenna-positions-etrs.csv
@@ -1,195 +1,195 @@
NAME,ETRS-X,ETRS-Y,ETRS-Z,STATION-P,STATION-Q,STATION-R,RCU-X,RCU-Y
-L0,4034032.589,487014.603,4900286.169,0.000,0.000,0.000,0,1
-L1,4034028.615,487021.301,4900288.802,0.000,0.000,0.000,2,3
-L2,4034029.615,487014.879,4900288.607,0.000,0.000,0.000,4,5
-L3,4034026.109,487020.500,4900290.936,0.000,0.000,0.000,6,7
-L4,4034042.526,487046.121,4900274.944,0.000,0.000,0.000,8,9
-L5,4034038.984,487050.856,4900277.379,0.000,0.000,0.000,10,11
-L6,4034048.639,487048.323,4900269.705,0.000,0.000,0.000,12,13
-L7,4034046.510,487052.713,4900270.876,0.000,0.000,0.000,14,15
-L8,4034030.103,487009.566,4900288.716,0.000,0.000,0.000,16,17
-L9,4034032.210,487003.034,4900287.622,0.000,0.000,0.000,18,19
-L10,4034029.716,487000.764,4900289.887,0.000,0.000,0.000,20,21
-L11,4034026.803,487002.628,4900292.127,0.000,0.000,0.000,22,23
-L12,4034038.949,487031.324,4900279.278,0.000,0.000,0.000,24,25
-L13,4034034.912,487029.350,4900282.826,0.000,0.000,0.000,26,27
-L14,4034033.375,487032.204,4900283.843,0.000,0.000,0.000,28,29
-L15,4034035.439,487036.048,4900281.765,0.000,0.000,0.000,30,31
-L16,4034030.654,487032.610,4900286.026,0.000,0.000,0.000,32,33
-L17,4034028.327,487028.765,4900288.278,0.000,0.000,0.000,34,35
-L18,4034025.961,487037.029,4900289.417,0.000,0.000,0.000,36,37
-L19,4034023.360,487033.948,4900291.819,0.000,0.000,0.000,38,39
-L20,4034053.160,487017.493,4900269.063,0.000,0.000,0.000,40,41
-L21,4034051.449,487008.936,4900271.245,0.000,0.000,0.000,42,43
-L22,4034059.737,487013.311,4900264.031,0.000,0.000,0.000,44,45
-L23,4034054.189,487004.109,4900269.529,0.000,0.000,0.000,46,47
-L24,4034038.550,487013.464,4900281.377,0.000,0.000,0.000,48,49
-L25,4034036.259,487010.726,4900283.526,0.000,0.000,0.000,50,51
-L26,4034041.143,487010.526,4900279.587,0.000,0.000,0.000,52,53
-L27,4034042.347,487006.721,4900278.963,0.000,0.000,0.000,54,55
-L28,4034052.698,487033.105,4900267.910,0.000,0.000,0.000,56,57
-L29,4034054.777,487035.754,4900265.914,0.000,0.000,0.000,58,59
-L30,4034057.657,487026.323,4900264.580,0.000,0.000,0.000,60,61
-L31,4034060.772,487030.455,4900261.562,0.000,0.000,0.000,62,63
-L32,4034025.183,487040.883,4900289.677,0.000,0.000,0.000,64,65
-L33,4034027.334,487046.664,4900287.363,0.000,0.000,0.000,66,67
-L34,4034022.066,487054.293,4900290.896,0.000,0.000,0.000,68,69
-L35,4034019.508,487048.928,4900293.538,0.000,0.000,0.000,70,71
-L36,4034042.641,487029.867,4900276.392,0.000,0.000,0.000,72,73
-L37,4034041.123,487035.304,4900277.113,0.000,0.000,0.000,74,75
-L38,4034045.556,487031.099,4900273.916,0.000,0.000,0.000,76,77
-L39,4034045.144,487034.822,4900273.889,0.000,0.000,0.000,78,79
-L40,4034021.053,487014.712,4900295.668,0.000,0.000,0.000,80,81
-L41,4034019.264,487024.597,4900296.201,0.000,0.000,0.000,82,83
-L42,4034015.174,487017.511,4900300.236,0.000,0.000,0.000,84,85
-L43,4034014.327,487028.039,4900299.892,0.000,0.000,0.000,86,87
-L44,4034043.193,487023.368,4900276.602,0.000,0.000,0.000,88,89
-L45,4034046.220,487024.185,4900274.060,0.000,0.000,0.000,90,91
-L46,4034043.538,487018.600,4900276.831,0.000,0.000,0.000,92,93
-L47,4034047.349,487020.174,4900273.576,0.000,0.000,0.000,94,95
-L48,4034037.383,487044.515,4900279.315,0.000,0.000,0.000,96,97
-L49,4034053.712,487024.159,4900268.009,0.000,0.000,0.000,98,99
-L50,4034037.332,487055.411,4900278.230,0.000,0.000,0.000,100,101
-L51,4034030.042,487046.841,4900285.166,0.000,0.000,0.000,102,103
-L52,4034046.066,487003.251,4900276.231,0.000,0.000,0.000,104,105
-L53,4034062.090,487020.191,4900261.481,0.000,0.000,0.000,106,107
-L54,4034029.449,487054.389,4900284.859,0.000,0.000,0.000,108,109
-L55,4034038.482,487034.671,4900279.358,0.000,0.000,0.000,110,111
-L56,4034021.334,487007.812,4900296.149,0.000,0.000,0.000,112,113
-L57,4034047.189,487009.882,4900274.657,0.000,0.000,0.000,114,115
-L58,4034035.197,487007.095,4900284.728,0.000,0.000,0.000,116,117
-L59,4034058.716,487040.001,4900262.196,0.000,0.000,0.000,118,119
-L60,4034050.985,487026.532,4900269.955,0.000,0.000,0.000,120,121
-L61,4034047.382,487013.686,4900274.166,0.000,0.000,0.000,122,123
-L62,4034022.551,487024.910,4900293.400,0.000,0.000,0.000,124,125
-L63,4034032.612,487026.243,4900285.015,0.000,0.000,0.000,126,127
-L64,4034041.195,487040.904,4900276.526,0.000,0.000,0.000,128,129
-L65,4034035.163,487019.979,4900283.510,0.000,0.000,0.000,130,131
-L66,4034051.788,487040.342,4900267.838,0.000,0.000,0.000,132,133
-L67,4034048.393,487034.349,4900271.230,0.000,0.000,0.000,134,135
-L68,4034039.452,487002.925,4900281.672,0.000,0.000,0.000,136,137
-L69,4034037.337,487001.134,4900283.604,0.000,0.000,0.000,138,139
-L70,4034038.988,487021.971,4900280.238,0.000,0.000,0.000,140,141
-L71,4034024.438,487016.325,4900292.763,0.000,0.000,0.000,142,143
-L72,4034047.837,487027.119,4900272.438,0.000,0.000,0.000,144,145
-L73,4034031.686,487042.061,4900284.268,0.000,0.000,0.000,146,147
-L74,4034043.911,487040.675,4900274.285,0.000,0.000,0.000,148,149
-L75,4034032.219,487054.560,4900282.540,0.000,0.000,0.000,150,151
-L76,4034038.058,487017.005,4900281.451,0.000,0.000,0.000,152,153
-L77,4034050.331,487021.534,4900271.006,0.000,0.000,0.000,154,155
-L78,4034027.162,487009.289,4900291.124,0.000,0.000,0.000,156,157
-L79,4034018.875,487032.963,4900295.647,0.000,0.000,0.000,158,159
-L80,4034024.633,487029.369,4900291.272,0.000,0.000,0.000,160,161
-L81,4034036.094,487048.600,4900279.992,0.000,0.000,0.000,162,163
-L82,4034028.952,487036.628,4900287.020,0.000,0.000,0.000,164,165
-L83,4034035.184,487023.576,4900283.147,0.000,0.000,0.000,166,167
-L84,4034057.422,487017.640,4900265.545,0.000,0.000,0.000,168,169
-L85,4034041.871,487026.592,4900277.349,0.000,0.000,0.000,170,171
-L86,4034054.037,487049.436,4900265.046,0.000,0.000,0.000,172,173
-L87,4034049.584,487042.294,4900269.452,0.000,0.000,0.000,174,175
-L88,4034030.009,487025.945,4900287.165,0.000,0.000,0.000,176,177
-L89,4034014.675,487038.852,4900298.535,0.000,0.000,0.000,178,179
-L90,4034032.997,487018.079,4900285.459,0.000,0.000,0.000,180,181
-L91,4034048.531,487002.313,4900274.328,0.000,0.000,0.000,182,183
-L92,4034021.476,487039.937,4900292.808,0.000,0.000,0.000,184,185
-L93,4034040.305,487018.862,4900279.436,0.000,0.000,0.000,186,187
-L94,4034043.897,487015.074,4900276.922,0.000,0.000,0.000,188,189
-L95,4034034.383,487039.267,4900282.315,0.000,0.000,0.000,190,191
-H0,4034121.951,486997.788,4900215.290,0.000,0.000,0.000,0,1
-H1,4034122.448,487002.827,4900214.390,0.000,0.000,0.000,2,3
-H2,4034122.945,487007.871,4900213.494,0.000,0.000,0.000,4,5
-H3,4034123.431,487012.914,4900212.592,0.000,0.000,0.000,6,7
-H4,4034123.919,487017.954,4900211.693,0.000,0.000,0.000,8,9
-H5,4034117.494,486993.700,4900219.334,0.000,0.000,0.000,10,11
-H6,4034117.995,486998.744,4900218.434,0.000,0.000,0.000,12,13
-H7,4034118.486,487003.792,4900217.534,0.000,0.000,0.000,14,15
-H8,4034118.985,487008.838,4900216.630,0.000,0.000,0.000,16,17
-H9,4034119.469,487013.873,4900215.726,0.000,0.000,0.000,18,19
-H10,4034119.970,487018.899,4900214.834,0.000,0.000,0.000,20,21
-H11,4034120.460,487023.952,4900213.931,0.000,0.000,0.000,22,23
-H12,4034113.037,486989.604,4900223.364,0.000,0.000,0.000,24,25
-H13,4034113.537,486994.656,4900222.457,0.000,0.000,0.000,26,27
-H14,4034114.041,486999.717,4900221.553,0.000,0.000,0.000,28,29
-H15,4034114.535,487004.757,4900220.669,0.000,0.000,0.000,30,31
-H16,4034115.018,487009.801,4900219.772,0.000,0.000,0.000,32,33
-H17,4034115.502,487014.834,4900218.867,0.000,0.000,0.000,34,35
-H18,4034115.998,487019.857,4900217.971,0.000,0.000,0.000,36,37
-H19,4034116.494,487024.899,4900217.069,0.000,0.000,0.000,38,39
-H20,4034116.977,487029.920,4900216.144,0.000,0.000,0.000,40,41
-H21,4034109.077,486990.559,4900226.518,0.000,0.000,0.000,42,43
-H22,4034109.580,486995.610,4900225.612,0.000,0.000,0.000,44,45
-H23,4034110.077,487000.672,4900224.697,0.000,0.000,0.000,46,47
-H24,4034110.583,487005.718,4900223.809,0.000,0.000,0.000,48,49
-H25,4034111.071,487010.754,4900222.906,0.000,0.000,0.000,50,51
-H26,4034111.560,487015.791,4900221.998,0.000,0.000,0.000,52,53
-H27,4034112.045,487020.803,4900221.117,0.000,0.000,0.000,54,55
-H28,4034112.527,487025.833,4900220.227,0.000,0.000,0.000,56,57
-H29,4034113.031,487030.872,4900219.310,0.000,0.000,0.000,58,59
-H30,4034105.127,486991.513,4900229.661,0.000,0.000,0.000,60,61
-H31,4034105.613,486996.563,4900228.773,0.000,0.000,0.000,62,63
-H32,4034106.106,487001.641,4900227.861,0.000,0.000,0.000,64,65
-H33,4034106.609,487006.679,4900226.958,0.000,0.000,0.000,66,67
-H34,4034107.108,487011.700,4900226.054,0.000,0.000,0.000,68,69
-H35,4034107.592,487016.735,4900225.162,0.000,0.000,0.000,70,71
-H36,4034108.076,487021.754,4900224.273,0.000,0.000,0.000,72,73
-H37,4034108.568,487026.782,4900223.379,0.000,0.000,0.000,74,75
-H38,4034109.068,487031.829,4900222.466,0.000,0.000,0.000,76,77
-H39,4034101.167,486992.451,4900232.824,0.000,0.000,0.000,78,79
-H40,4034101.649,486997.507,4900231.923,0.000,0.000,0.000,80,81
-H41,4034102.145,487002.578,4900231.017,0.000,0.000,0.000,82,83
-H42,4034102.634,487007.632,4900230.118,0.000,0.000,0.000,84,85
-H43,4034103.121,487012.652,4900229.214,0.000,0.000,0.000,86,87
-H44,4034103.614,487017.684,4900228.320,0.000,0.000,0.000,88,89
-H45,4034104.093,487022.708,4900227.435,0.000,0.000,0.000,90,91
-H46,4034104.592,487027.742,4900226.535,0.000,0.000,0.000,92,93
-H47,4034105.093,487032.791,4900225.594,0.000,0.000,0.000,94,95
-H48,4034097.189,486993.399,4900235.993,0.000,0.000,0.000,96,97
-H49,4034097.675,486998.482,4900235.085,0.000,0.000,0.000,98,99
-H50,4034098.174,487003.548,4900234.157,0.000,0.000,0.000,100,101
-H51,4034098.676,487008.588,4900233.250,0.000,0.000,0.000,102,103
-H52,4034099.179,487013.605,4900232.352,0.000,0.000,0.000,104,105
-H53,4034099.672,487018.632,4900231.452,0.000,0.000,0.000,106,107
-H54,4034100.157,487023.650,4900230.572,0.000,0.000,0.000,108,109
-H55,4034100.628,487028.676,4900229.684,0.000,0.000,0.000,110,111
-H56,4034101.094,487033.750,4900228.748,0.000,0.000,0.000,112,113
-H57,4034093.231,486994.345,4900239.147,0.000,0.000,0.000,114,115
-H58,4034093.715,486999.410,4900238.235,0.000,0.000,0.000,116,117
-H59,4034094.206,487004.499,4900237.320,0.000,0.000,0.000,118,119
-H60,4034094.711,487009.545,4900236.415,0.000,0.000,0.000,120,121
-H61,4034095.199,487014.564,4900235.513,0.000,0.000,0.000,122,123
-H62,4034095.686,487019.595,4900234.616,0.000,0.000,0.000,124,125
-H63,4034096.176,487024.602,4900233.725,0.000,0.000,0.000,126,127
-H64,4034096.673,487029.637,4900232.821,0.000,0.000,0.000,128,129
-H65,4034097.142,487034.700,4900231.876,0.000,0.000,0.000,130,131
-H66,4034089.267,486995.304,4900242.275,0.000,0.000,0.000,132,133
-H67,4034089.750,487000.340,4900241.377,0.000,0.000,0.000,134,135
-H68,4034090.236,487005.426,4900240.475,0.000,0.000,0.000,136,137
-H69,4034090.741,487010.486,4900239.565,0.000,0.000,0.000,138,139
-H70,4034091.242,487015.521,4900238.655,0.000,0.000,0.000,140,141
-H71,4034091.726,487020.540,4900237.767,0.000,0.000,0.000,142,143
-H72,4034092.208,487025.559,4900236.869,0.000,0.000,0.000,144,145
-H73,4034092.705,487030.615,4900235.948,0.000,0.000,0.000,146,147
-H74,4034093.181,487035.647,4900235.019,0.000,0.000,0.000,148,149
-H75,4034085.305,486996.259,4900245.426,0.000,0.000,0.000,150,151
-H76,4034085.790,487001.280,4900244.528,0.000,0.000,0.000,152,153
-H77,4034086.275,487006.377,4900243.609,0.000,0.000,0.000,154,155
-H78,4034086.774,487011.448,4900242.704,0.000,0.000,0.000,156,157
-H79,4034087.271,487016.459,4900241.805,0.000,0.000,0.000,158,159
-H80,4034087.746,487021.459,4900240.925,0.000,0.000,0.000,160,161
-H81,4034088.238,487026.518,4900240.014,0.000,0.000,0.000,162,163
-H82,4034088.748,487031.583,4900239.079,0.000,0.000,0.000,164,165
-H83,4034089.244,487036.617,4900238.164,0.000,0.000,0.000,166,167
-H84,4034081.842,487002.237,4900247.654,0.000,0.000,0.000,168,169
-H85,4034082.322,487007.302,4900246.744,0.000,0.000,0.000,170,171
-H86,4034082.806,487012.386,4900245.848,0.000,0.000,0.000,172,173
-H87,4034083.298,487017.412,4900244.955,0.000,0.000,0.000,174,175
-H88,4034083.791,487022.403,4900244.060,0.000,0.000,0.000,176,177
-H89,4034084.299,487027.474,4900243.134,0.000,0.000,0.000,178,179
-H90,4034084.778,487032.536,4900242.193,0.000,0.000,0.000,180,181
-H91,4034078.371,487008.219,4900249.884,0.000,0.000,0.000,182,183
-H92,4034078.851,487013.309,4900248.986,0.000,0.000,0.000,184,185
-H93,4034079.351,487018.345,4900248.095,0.000,0.000,0.000,186,187
-H94,4034079.839,487023.355,4900247.197,0.000,0.000,0.000,188,189
-H95,4034080.324,487028.407,4900246.288,0.000,0.000,0.000,190,191
-CLBA 4034037.877,487026.935,4900280.635,0.000,0.000,0.000,-1,-1
-CHBA,4034101.143,487013.113,4900230.789,0.000,0.000,0.000,-1,-1
+L0,4034033.347,487013.892,4900285.590,0.000,0.000,0.000,0,1
+L1,4034029.374,487020.589,4900288.223,0.000,0.000,0.000,2,3
+L2,4034030.373,487014.167,4900288.028,0.000,0.000,0.000,4,5
+L3,4034026.867,487019.788,4900290.357,0.000,0.000,0.000,6,7
+L4,4034043.285,487045.409,4900274.365,0.000,0.000,0.000,8,9
+L5,4034039.743,487050.144,4900276.800,0.000,0.000,0.000,10,11
+L6,4034049.398,487047.611,4900269.126,0.000,0.000,0.000,12,13
+L7,4034047.268,487052.001,4900270.298,0.000,0.000,0.000,14,15
+L8,4034030.861,487008.854,4900288.138,0.000,0.000,0.000,16,17
+L9,4034032.968,487002.322,4900287.043,0.000,0.000,0.000,18,19
+L10,4034030.474,487000.052,4900289.308,0.000,0.000,0.000,20,21
+L11,4034027.561,487001.916,4900291.548,0.000,0.000,0.000,22,23
+L12,4034039.707,487030.613,4900278.699,0.000,0.000,0.000,24,25
+L13,4034035.670,487028.638,4900282.247,0.000,0.000,0.000,26,27
+L14,4034034.133,487031.493,4900283.264,0.000,0.000,0.000,28,29
+L15,4034036.197,487035.336,4900281.186,0.000,0.000,0.000,30,31
+L16,4034031.412,487031.898,4900285.447,0.000,0.000,0.000,32,33
+L17,4034029.085,487028.053,4900287.700,0.000,0.000,0.000,34,35
+L18,4034026.720,487036.318,4900288.838,0.000,0.000,0.000,36,37
+L19,4034024.119,487033.236,4900291.240,0.000,0.000,0.000,38,39
+L20,4034053.919,487016.781,4900268.485,0.000,0.000,0.000,40,41
+L21,4034052.207,487008.224,4900270.666,0.000,0.000,0.000,42,43
+L22,4034060.495,487012.599,4900263.452,0.000,0.000,0.000,44,45
+L23,4034054.947,487003.398,4900268.951,0.000,0.000,0.000,46,47
+L24,4034039.309,487012.752,4900280.798,0.000,0.000,0.000,48,49
+L25,4034037.017,487010.014,4900282.947,0.000,0.000,0.000,50,51
+L26,4034041.901,487009.815,4900279.008,0.000,0.000,0.000,52,53
+L27,4034043.105,487006.009,4900278.384,0.000,0.000,0.000,54,55
+L28,4034053.457,487032.393,4900267.331,0.000,0.000,0.000,56,57
+L29,4034055.536,487035.042,4900265.336,0.000,0.000,0.000,58,59
+L30,4034058.415,487025.612,4900264.001,0.000,0.000,0.000,60,61
+L31,4034061.530,487029.743,4900260.984,0.000,0.000,0.000,62,63
+L32,4034025.941,487040.171,4900289.098,0.000,0.000,0.000,64,65
+L33,4034028.092,487045.952,4900286.784,0.000,0.000,0.000,66,67
+L34,4034022.824,487053.581,4900290.317,0.000,0.000,0.000,68,69
+L35,4034020.266,487048.216,4900292.959,0.000,0.000,0.000,70,71
+L36,4034043.400,487029.155,4900275.814,0.000,0.000,0.000,72,73
+L37,4034041.882,487034.592,4900276.534,0.000,0.000,0.000,74,75
+L38,4034046.314,487030.388,4900273.337,0.000,0.000,0.000,76,77
+L39,4034045.902,487034.110,4900273.310,0.000,0.000,0.000,78,79
+L40,4034021.811,487014.001,4900295.090,0.000,0.000,0.000,80,81
+L41,4034020.023,487023.885,4900295.622,0.000,0.000,0.000,82,83
+L42,4034015.932,487016.799,4900299.658,0.000,0.000,0.000,84,85
+L43,4034015.086,487027.327,4900299.313,0.000,0.000,0.000,86,87
+L44,4034043.951,487022.656,4900276.024,0.000,0.000,0.000,88,89
+L45,4034046.978,487023.474,4900273.481,0.000,0.000,0.000,90,91
+L46,4034044.297,487017.889,4900276.252,0.000,0.000,0.000,92,93
+L47,4034048.107,487019.463,4900272.998,0.000,0.000,0.000,94,95
+L48,4034038.141,487043.803,4900278.736,0.000,0.000,0.000,96,97
+L49,4034054.470,487023.447,4900267.430,0.000,0.000,0.000,98,99
+L50,4034038.090,487054.699,4900277.651,0.000,0.000,0.000,100,101
+L51,4034030.801,487046.129,4900284.587,0.000,0.000,0.000,102,103
+L52,4034046.825,487002.539,4900275.652,0.000,0.000,0.000,104,105
+L53,4034062.848,487019.479,4900260.902,0.000,0.000,0.000,106,107
+L54,4034030.207,487053.677,4900284.281,0.000,0.000,0.000,108,109
+L55,4034039.240,487033.959,4900278.779,0.000,0.000,0.000,110,111
+L56,4034022.092,487007.100,4900295.570,0.000,0.000,0.000,112,113
+L57,4034047.947,487009.170,4900274.079,0.000,0.000,0.000,114,115
+L58,4034035.955,487006.383,4900284.149,0.000,0.000,0.000,116,117
+L59,4034059.474,487039.290,4900261.617,0.000,0.000,0.000,118,119
+L60,4034051.743,487025.820,4900269.377,0.000,0.000,0.000,120,121
+L61,4034048.140,487012.974,4900273.587,0.000,0.000,0.000,122,123
+L62,4034023.309,487024.198,4900292.821,0.000,0.000,0.000,124,125
+L63,4034033.370,487025.532,4900284.437,0.000,0.000,0.000,126,127
+L64,4034041.953,487040.192,4900275.947,0.000,0.000,0.000,128,129
+L65,4034035.921,487019.267,4900282.931,0.000,0.000,0.000,130,131
+L66,4034052.546,487039.630,4900267.259,0.000,0.000,0.000,132,133
+L67,4034049.152,487033.638,4900270.651,0.000,0.000,0.000,134,135
+L68,4034040.211,487002.213,4900281.093,0.000,0.000,0.000,136,137
+L69,4034038.095,487000.422,4900283.026,0.000,0.000,0.000,138,139
+L70,4034039.746,487021.259,4900279.660,0.000,0.000,0.000,140,141
+L71,4034025.196,487015.613,4900292.184,0.000,0.000,0.000,142,143
+L72,4034048.596,487026.407,4900271.859,0.000,0.000,0.000,144,145
+L73,4034032.445,487041.349,4900283.689,0.000,0.000,0.000,146,147
+L74,4034044.669,487039.963,4900273.706,0.000,0.000,0.000,148,149
+L75,4034032.977,487053.849,4900281.961,0.000,0.000,0.000,150,151
+L76,4034038.816,487016.294,4900280.872,0.000,0.000,0.000,152,153
+L77,4034051.089,487020.822,4900270.427,0.000,0.000,0.000,154,155
+L78,4034027.920,487008.577,4900290.545,0.000,0.000,0.000,156,157
+L79,4034019.633,487032.252,4900295.069,0.000,0.000,0.000,158,159
+L80,4034025.391,487028.657,4900290.693,0.000,0.000,0.000,160,161
+L81,4034036.852,487047.888,4900279.413,0.000,0.000,0.000,162,163
+L82,4034029.710,487035.916,4900286.441,0.000,0.000,0.000,164,165
+L83,4034035.942,487022.864,4900282.568,0.000,0.000,0.000,166,167
+L84,4034058.181,487016.929,4900264.967,0.000,0.000,0.000,168,169
+L85,4034042.629,487025.880,4900276.770,0.000,0.000,0.000,170,171
+L86,4034054.796,487048.725,4900264.467,0.000,0.000,0.000,172,173
+L87,4034050.342,487041.582,4900268.873,0.000,0.000,0.000,174,175
+L88,4034030.768,487025.234,4900286.586,0.000,0.000,0.000,176,177
+L89,4034015.433,487038.140,4900297.956,0.000,0.000,0.000,178,179
+L90,4034033.755,487017.367,4900284.880,0.000,0.000,0.000,180,181
+L91,4034049.289,487001.601,4900273.749,0.000,0.000,0.000,182,183
+L92,4034022.234,487039.225,4900292.229,0.000,0.000,0.000,184,185
+L93,4034041.064,487018.150,4900278.858,0.000,0.000,0.000,186,187
+L94,4034044.655,487014.362,4900276.344,0.000,0.000,0.000,188,189
+L95,4034035.142,487038.556,4900281.737,0.000,0.000,0.000,190,191
+H0,4034122.709,486997.076,4900214.711,0.000,0.000,0.000,0,1
+H1,4034123.206,487002.115,4900213.812,0.000,0.000,0.000,2,3
+H2,4034123.703,487007.159,4900212.916,0.000,0.000,0.000,4,5
+H3,4034124.189,487012.202,4900212.013,0.000,0.000,0.000,6,7
+H4,4034124.677,487017.242,4900211.114,0.000,0.000,0.000,8,9
+H5,4034118.252,486992.988,4900218.755,0.000,0.000,0.000,10,11
+H6,4034118.753,486998.032,4900217.855,0.000,0.000,0.000,12,13
+H7,4034119.244,487003.080,4900216.956,0.000,0.000,0.000,14,15
+H8,4034119.743,487008.127,4900216.051,0.000,0.000,0.000,16,17
+H9,4034120.227,487013.161,4900215.147,0.000,0.000,0.000,18,19
+H10,4034120.728,487018.187,4900214.255,0.000,0.000,0.000,20,21
+H11,4034121.218,487023.240,4900213.352,0.000,0.000,0.000,22,23
+H12,4034113.795,486988.892,4900222.785,0.000,0.000,0.000,24,25
+H13,4034114.295,486993.944,4900221.878,0.000,0.000,0.000,26,27
+H14,4034114.799,486999.005,4900220.975,0.000,0.000,0.000,28,29
+H15,4034115.293,487004.045,4900220.091,0.000,0.000,0.000,30,31
+H16,4034115.776,487009.089,4900219.193,0.000,0.000,0.000,32,33
+H17,4034116.260,487014.122,4900218.289,0.000,0.000,0.000,34,35
+H18,4034116.756,487019.145,4900217.392,0.000,0.000,0.000,36,37
+H19,4034117.252,487024.187,4900216.491,0.000,0.000,0.000,38,39
+H20,4034117.735,487029.208,4900215.565,0.000,0.000,0.000,40,41
+H21,4034109.835,486989.847,4900225.939,0.000,0.000,0.000,42,43
+H22,4034110.338,486994.898,4900225.034,0.000,0.000,0.000,44,45
+H23,4034110.835,486999.960,4900224.118,0.000,0.000,0.000,46,47
+H24,4034111.341,487005.006,4900223.230,0.000,0.000,0.000,48,49
+H25,4034111.829,487010.042,4900222.328,0.000,0.000,0.000,50,51
+H26,4034112.318,487015.079,4900221.420,0.000,0.000,0.000,52,53
+H27,4034112.803,487020.091,4900220.539,0.000,0.000,0.000,54,55
+H28,4034113.285,487025.121,4900219.649,0.000,0.000,0.000,56,57
+H29,4034113.789,487030.160,4900218.731,0.000,0.000,0.000,58,59
+H30,4034105.885,486990.801,4900229.083,0.000,0.000,0.000,60,61
+H31,4034106.371,486995.851,4900228.195,0.000,0.000,0.000,62,63
+H32,4034106.864,487000.929,4900227.282,0.000,0.000,0.000,64,65
+H33,4034107.367,487005.967,4900226.380,0.000,0.000,0.000,66,67
+H34,4034107.866,487010.988,4900225.475,0.000,0.000,0.000,68,69
+H35,4034108.350,487016.023,4900224.583,0.000,0.000,0.000,70,71
+H36,4034108.834,487021.042,4900223.694,0.000,0.000,0.000,72,73
+H37,4034109.326,487026.070,4900222.800,0.000,0.000,0.000,74,75
+H38,4034109.826,487031.117,4900221.888,0.000,0.000,0.000,76,77
+H39,4034101.925,486991.739,4900232.246,0.000,0.000,0.000,78,79
+H40,4034102.408,486996.795,4900231.344,0.000,0.000,0.000,80,81
+H41,4034102.903,487001.866,4900230.439,0.000,0.000,0.000,82,83
+H42,4034103.392,487006.920,4900229.540,0.000,0.000,0.000,84,85
+H43,4034103.879,487011.940,4900228.636,0.000,0.000,0.000,86,87
+H44,4034104.372,487016.972,4900227.742,0.000,0.000,0.000,88,89
+H45,4034104.851,487021.996,4900226.856,0.000,0.000,0.000,90,91
+H46,4034105.350,487027.030,4900225.957,0.000,0.000,0.000,92,93
+H47,4034105.851,487032.079,4900225.015,0.000,0.000,0.000,94,95
+H48,4034097.947,486992.687,4900235.414,0.000,0.000,0.000,96,97
+H49,4034098.433,486997.770,4900234.506,0.000,0.000,0.000,98,99
+H50,4034098.932,487002.836,4900233.578,0.000,0.000,0.000,100,101
+H51,4034099.434,487007.876,4900232.671,0.000,0.000,0.000,102,103
+H52,4034099.937,487012.893,4900231.774,0.000,0.000,0.000,104,105
+H53,4034100.430,487017.920,4900230.873,0.000,0.000,0.000,106,107
+H54,4034100.915,487022.938,4900229.993,0.000,0.000,0.000,108,109
+H55,4034101.386,487027.964,4900229.106,0.000,0.000,0.000,110,111
+H56,4034101.852,487033.038,4900228.170,0.000,0.000,0.000,112,113
+H57,4034093.989,486993.634,4900238.568,0.000,0.000,0.000,114,115
+H58,4034094.473,486998.699,4900237.656,0.000,0.000,0.000,116,117
+H59,4034094.964,487003.787,4900236.742,0.000,0.000,0.000,118,119
+H60,4034095.469,487008.833,4900235.837,0.000,0.000,0.000,120,121
+H61,4034095.957,487013.852,4900234.935,0.000,0.000,0.000,122,123
+H62,4034096.444,487018.883,4900234.038,0.000,0.000,0.000,124,125
+H63,4034096.934,487023.890,4900233.147,0.000,0.000,0.000,126,127
+H64,4034097.431,487028.925,4900232.242,0.000,0.000,0.000,128,129
+H65,4034097.900,487033.988,4900231.297,0.000,0.000,0.000,130,131
+H66,4034090.025,486994.592,4900241.696,0.000,0.000,0.000,132,133
+H67,4034090.508,486999.628,4900240.799,0.000,0.000,0.000,134,135
+H68,4034090.994,487004.714,4900239.897,0.000,0.000,0.000,136,137
+H69,4034091.499,487009.774,4900238.986,0.000,0.000,0.000,138,139
+H70,4034092.000,487014.809,4900238.077,0.000,0.000,0.000,140,141
+H71,4034092.484,487019.828,4900237.188,0.000,0.000,0.000,142,143
+H72,4034092.966,487024.847,4900236.290,0.000,0.000,0.000,144,145
+H73,4034093.463,487029.903,4900235.370,0.000,0.000,0.000,146,147
+H74,4034093.939,487034.935,4900234.441,0.000,0.000,0.000,148,149
+H75,4034086.063,486995.547,4900244.847,0.000,0.000,0.000,150,151
+H76,4034086.548,487000.568,4900243.949,0.000,0.000,0.000,152,153
+H77,4034087.033,487005.665,4900243.030,0.000,0.000,0.000,154,155
+H78,4034087.532,487010.736,4900242.125,0.000,0.000,0.000,156,157
+H79,4034088.029,487015.747,4900241.226,0.000,0.000,0.000,158,159
+H80,4034088.504,487020.747,4900240.346,0.000,0.000,0.000,160,161
+H81,4034088.996,487025.806,4900239.435,0.000,0.000,0.000,162,163
+H82,4034089.506,487030.871,4900238.500,0.000,0.000,0.000,164,165
+H83,4034090.002,487035.905,4900237.585,0.000,0.000,0.000,166,167
+H84,4034082.601,487001.525,4900247.076,0.000,0.000,0.000,168,169
+H85,4034083.081,487006.590,4900246.166,0.000,0.000,0.000,170,171
+H86,4034083.564,487011.674,4900245.269,0.000,0.000,0.000,172,173
+H87,4034084.056,487016.700,4900244.376,0.000,0.000,0.000,174,175
+H88,4034084.549,487021.691,4900243.481,0.000,0.000,0.000,176,177
+H89,4034085.058,487026.762,4900242.555,0.000,0.000,0.000,178,179
+H90,4034085.536,487031.824,4900241.615,0.000,0.000,0.000,180,181
+H91,4034079.129,487007.507,4900249.306,0.000,0.000,0.000,182,183
+H92,4034079.609,487012.597,4900248.407,0.000,0.000,0.000,184,185
+H93,4034080.109,487017.633,4900247.516,0.000,0.000,0.000,186,187
+H94,4034080.597,487022.643,4900246.619,0.000,0.000,0.000,188,189
+H95,4034081.082,487027.695,4900245.710,0.000,0.000,0.000,190,191
+CLBA,4034038.635,487026.223,4900280.057,0.000,0.000,0.000,-1,-1
+CHBA,4034101.901,487012.401,4900230.210,0.000,0.000,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/RS409/rs409-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/RS409/rs409-antenna-positions-etrs.csv
new file mode 100644
index 0000000000000000000000000000000000000000..f9206ee2e1afc0fe077f86c5fbeb9f5f151b75ef
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/RS409/rs409-antenna-positions-etrs.csv
@@ -0,0 +1,149 @@
+NAME,ETRS-X,ETRS-Y,ETRS-Z,STATION-P,STATION-Q,STATION-R,RCU-X,RCU-Y
+L0,3824756.246,426178.523,5069289.608,0.000,0.000,0.000,0,1
+L1,3824754.227,426178.280,5069291.146,0.000,2.550,0.000,2,3
+L2,3824754.908,426180.628,5069290.422,2.250,1.350,0.000,4,5
+L3,3824757.046,426180.886,5069288.794,2.250,-1.350,0.000,6,7
+L4,3824758.265,426178.766,5069288.070,0.000,-2.550,0.000,8,9
+L5,3824757.584,426176.418,5069288.794,-2.250,-1.350,0.000,10,11
+L6,3824755.446,426176.160,5069290.422,-2.250,1.350,0.000,12,13
+L7,3824753.609,426183.456,5069291.142,5.213,2.543,0.000,14,15
+L8,3824756.684,426184.244,5069288.762,5.628,-1.403,0.000,16,17
+L9,3824759.554,426182.355,5069286.778,3.409,-4.692,0.000,18,19
+L10,3824760.877,426178.673,5069286.119,-0.405,-5.786,0.000,20,21
+L11,3824760.032,426174.921,5069287.092,-4.029,-4.172,0.000,22,23
+L12,3824757.416,426172.854,5069289.242,-5.768,-0.606,0.000,24,25
+L13,3824754.253,426173.440,5069291.564,-4.808,3.243,0.000,26,27
+L14,3824752.022,426176.404,5069292.970,-1.599,5.575,0.000,28,29
+L15,3824751.767,426180.359,5069292.804,2.359,5.299,0.000,30,31
+L16,3824749.246,426182.236,5069294.527,4.524,8.156,0.000,32,33
+L17,3824750.375,426185.522,5069293.382,7.651,6.258,0.000,34,35
+L18,3824753.539,426188.422,5069290.745,10.152,1.885,0.000,36,37
+L19,3824759.357,426187.597,5069286.453,8.637,-5.232,0.000,38,39
+L20,3824761.581,426185.810,5069284.945,6.596,-7.733,0.000,40,41
+L21,3824763.595,426182.208,5069283.759,2.779,-9.699,0.000,42,43
+L22,3824763.644,426177.963,5069284.105,-1.441,-9.124,0.000,44,45
+L23,3824761.959,426172.700,5069285.846,-6.465,-6.238,0.000,46,47
+L24,3824759.446,426169.271,5069288.042,-9.568,-2.596,0.000,48,49
+L25,3824756.029,426168.494,5069290.678,-9.931,1.774,0.000,50,51
+L26,3824753.146,426170.295,5069292.679,-7.798,5.092,0.000,52,53
+L27,3824750.301,426173.776,5069294.499,-4.002,8.111,0.000,54,55
+L28,3824748.905,426178.179,5069295.150,0.537,9.189,0.000,56,57
+L29,3824745.916,426185.477,5069296.734,8.140,11.815,0.000,58,59
+L30,3824747.299,426188.775,5069295.397,11.249,9.599,0.000,60,61
+L31,3824749.434,426190.255,5069293.660,12.463,6.719,0.000,62,63
+L32,3824755.660,426191.682,5069288.858,13.135,-1.244,0.000,64,65
+L33,3824757.536,426193.415,5069287.294,14.631,-3.838,0.000,66,67
+L34,3824762.485,426188.863,5069283.991,9.519,-9.315,0.000,68,69
+L35,3824765.146,426184.862,5069282.354,5.229,-12.028,0.000,70,71
+L36,3824768.090,426180.842,5069280.508,0.886,-15.089,0.000,72,73
+L37,3824767.059,426177.823,5069281.555,-1.988,-13.353,0.000,74,75
+L38,3824766.039,426173.332,5069282.726,-6.325,-11.411,0.000,76,77
+L39,3824762.861,426167.797,5069285.612,-11.440,-6.625,0.000,78,79
+L40,3824761.249,426165.985,5069286.986,-13.046,-4.347,0.000,80,81
+L41,3824757.052,426165.293,5069290.199,-13.231,0.980,0.000,82,83
+L42,3824753.985,426163.897,5069292.627,-14.251,5.007,0.000,84,85
+L43,3824748.117,426169.264,5069296.547,-8.220,11.506,0.000,86,87
+L44,3824746.389,426172.717,5069297.532,-4.585,13.139,0.000,88,89
+L45,3824744.702,426177.873,5069298.332,0.736,14.465,0.000,90,91
+L46,3824797.767,426196.371,5069256.828,12.753,-54.355,0.000,92,93
+L47,3824771.578,426127.521,5069282.709,-52.470,-11.436,0.000,94,95
+L48,3824741.909,426180.879,5069300.157,4.054,17.491,0.000,1,0
+L49,3824740.308,426183.312,5069301.138,6.661,19.119,0.000,3,2
+L50,3824747.005,426195.890,5069294.975,18.348,8.898,0.000,5,4
+L51,3824759.756,426197.538,5069285.255,18.459,-7.219,0.000,7,6
+L52,3824763.628,426196.320,5069282.458,16.786,-11.856,0.000,9,8
+L53,3824769.263,426186.091,5069279.153,5.957,-17.336,0.000,11,10
+L54,3824770.068,426172.845,5069279.746,-7.291,-16.352,0.000,13,12
+L55,3824769.115,426165.068,5069281.164,-14.898,-14.000,0.000,15,14
+L56,3824758.347,426160.579,5069289.653,-18.067,0.075,0.000,17,16
+L57,3824751.876,426159.794,5069294.581,-18.072,8.247,0.000,19,18
+L58,3824745.520,426166.203,5069298.773,-10.949,15.197,0.000,21,20
+L59,3824738.986,426167.377,5069303.571,-9.001,23.154,0.000,23,22
+L60,3824736.234,426180.064,5069304.490,3.924,24.677,0.000,25,24
+L61,3824738.651,426192.369,5069301.564,15.851,19.824,0.000,27,26
+L62,3824741.540,426197.285,5069298.951,20.386,15.491,0.000,29,28
+L63,3824746.388,426202.815,5069294.812,25.297,8.628,0.000,31,30
+L64,3824760.510,426201.502,5069284.331,22.304,-8.752,0.000,33,32
+L65,3824766.559,426198.541,5069280.058,18.641,-15.837,0.000,35,34
+L66,3824774.966,426188.968,5069274.612,8.131,-24.866,0.000,37,36
+L67,3824776.297,426174.822,5069274.892,-6.073,-24.401,0.000,39,38
+L68,3824774.960,426165.791,5069276.712,-14.879,-21.383,0.000,41,40
+L69,3824768.251,426158.060,5069282.446,-21.752,-11.874,0.000,43,42
+L70,3824756.734,426151.582,5069291.677,-26.806,3.432,0.000,45,44
+L71,3824743.207,426157.912,5069301.258,-18.903,19.319,0.000,47,46
+L72,3824732.524,426162.220,5069308.887,-13.348,31.969,0.000,49,48
+L73,3824731.238,426177.064,5069308.511,1.543,31.344,0.000,51,50
+L74,3824732.878,426191.367,5069305.988,15.547,27.159,0.000,53,52
+L75,3824734.915,426198.791,5069303.787,22.674,23.510,0.000,55,54
+L76,3824747.402,426208.591,5069293.528,30.910,6.499,0.000,57,56
+L77,3824761.510,426211.563,5069282.670,32.173,-11.506,0.000,59,58
+L78,3824770.649,426206.390,5069276.278,25.944,-22.104,0.000,61,60
+L79,3824773.817,426197.720,5069274.684,16.957,-24.748,0.000,63,62
+L80,3824782.343,426187.119,5069269.242,5.413,-33.770,0.000,65,64
+L81,3824782.529,426168.171,5069270.816,-13.422,-31.160,0.000,67,66
+L82,3824779.706,426160.148,5069273.660,-21.049,-26.444,0.000,69,68
+L83,3824771.441,426148.584,5069280.909,-31.542,-14.423,0.000,71,70
+L84,3824764.948,426147.606,5069285.870,-31.736,-6.196,0.000,73,72
+L85,3824748.480,426147.327,5069298.257,-30.043,14.343,0.000,75,74
+L86,3824744.699,426152.340,5069300.642,-24.614,18.297,0.000,77,76
+L87,3824741.206,426148.076,5069303.649,-28.429,23.284,0.000,79,78
+L88,3824722.788,426180.941,5069314.504,6.403,41.281,0.000,81,80
+L89,3824730.553,426204.070,5069306.584,28.437,28.148,0.000,83,82
+L90,3824741.994,426217.349,5069296.797,40.252,11.918,0.000,85,84
+L91,3824754.749,426218.735,5069287.097,40.102,-4.166,0.000,87,86
+L92,3824786.005,426194.178,5069265.856,11.983,-39.386,0.000,89,88
+L93,3824785.292,426171.958,5069268.399,-9.992,-35.168,0.000,91,90
+L94,3824784.871,426155.690,5069270.186,-26.093,-32.204,0.000,93,92
+L95,3824753.308,426140.271,5069295.271,-37.626,9.392,0.000,95,94
+H0,3824798.058,426125.046,5069263.168,-3.135,19.358,0.000,0,1
+H1,3824798.447,426130.126,5069262.418,1.862,18.113,0.000,2,3
+H2,3824798.836,426135.206,5069261.666,6.859,16.867,0.000,4,5
+H3,3824799.225,426140.286,5069260.915,11.856,15.621,0.000,6,7
+H4,3824802.165,426124.286,5069260.155,-4.381,14.361,0.000,8,9
+H5,3824802.553,426129.366,5069259.404,0.616,13.116,0.000,10,11
+H6,3824802.942,426134.446,5069258.653,5.613,11.870,0.000,12,13
+H7,3824803.331,426139.526,5069257.901,10.610,10.624,0.000,14,15
+H8,3824805.493,426113.366,5069258.644,-15.621,11.856,0.000,16,17
+H9,3824805.882,426118.446,5069257.892,-10.624,10.610,0.000,18,19
+H10,3824806.271,426123.526,5069257.141,-5.627,9.364,0.000,20,21
+H11,3824806.660,426128.606,5069256.390,-0.630,8.118,0.000,22,23
+H12,3824807.049,426133.686,5069255.639,4.367,6.873,0.000,24,25
+H13,3824807.438,426138.766,5069254.888,9.364,5.627,0.000,26,27
+H14,3824807.827,426143.846,5069254.137,14.361,4.381,0.000,28,29
+H15,3824808.216,426148.926,5069253.385,19.358,3.135,0.000,30,31
+H16,3824809.599,426112.606,5069255.630,-16.867,6.859,0.000,32,33
+H17,3824809.988,426117.686,5069254.879,-11.870,5.613,0.000,34,35
+H18,3824810.378,426122.766,5069254.127,-6.873,4.367,0.000,36,37
+H19,3824810.767,426127.846,5069253.376,-1.876,3.121,0.000,38,39
+H20,3824811.155,426132.926,5069252.625,3.121,1.876,0.000,40,41
+H21,3824811.544,426138.006,5069251.874,8.118,0.630,0.000,42,43
+H22,3824811.933,426143.087,5069251.123,13.116,-0.616,0.000,44,45
+H23,3824812.322,426148.167,5069250.372,18.113,-1.862,0.000,46,47
+H24,3824813.706,426111.845,5069252.616,-18.113,1.862,0.000,48,49
+H25,3824814.095,426116.925,5069251.865,-13.116,0.616,0.000,50,51
+H26,3824814.484,426122.006,5069251.114,-8.118,-0.630,0.000,52,53
+H27,3824814.873,426127.086,5069250.363,-3.121,-1.876,0.000,54,55
+H28,3824815.261,426132.166,5069249.612,1.876,-3.121,0.000,56,57
+H29,3824815.650,426137.246,5069248.861,6.873,-4.367,0.000,58,59
+H30,3824816.040,426142.326,5069248.109,11.870,-5.613,0.000,60,61
+H31,3824816.429,426147.406,5069247.358,16.867,-6.859,0.000,62,63
+H32,3824817.812,426111.086,5069249.603,-19.358,-3.135,0.000,64,65
+H33,3824818.201,426116.166,5069248.851,-14.361,-4.381,0.000,66,67
+H34,3824818.590,426121.246,5069248.100,-9.364,-5.627,0.000,68,69
+H35,3824818.979,426126.326,5069247.349,-4.367,-6.873,0.000,70,71
+H36,3824819.368,426131.406,5069246.598,0.630,-8.118,0.000,72,73
+H37,3824819.757,426136.486,5069245.847,5.627,-9.364,0.000,74,75
+H38,3824820.146,426141.566,5069245.096,10.624,-10.610,0.000,76,77
+H39,3824820.535,426146.646,5069244.344,15.621,-11.856,0.000,78,79
+H40,3824822.697,426120.486,5069245.087,-10.610,-10.624,0.000,80,81
+H41,3824823.086,426125.566,5069244.335,-5.613,-11.870,0.000,82,83
+H42,3824823.475,426130.646,5069243.584,-0.616,-13.116,0.000,84,85
+H43,3824823.863,426135.726,5069242.833,4.381,-14.361,0.000,86,87
+H44,3824826.803,426119.726,5069242.073,-11.856,-15.621,0.000,88,89
+H45,3824827.192,426124.806,5069241.322,-6.859,-16.867,0.000,90,91
+H46,3824827.581,426129.886,5069240.570,-1.862,-18.113,0.000,92,93
+H47,3824827.970,426134.966,5069239.820,3.135,-19.358,0.000,94,95
+CLBA,3824756.246,426178.523,5069289.608,0.000,0.000,0.000,-1,-1
+CHBA,3824813.014,426130.006,5069251.494,0.000,0.000,0.000,-1,-1
+0.000,0.000,0.000,0.000,0.000,0.000,0.000,-1,-1
+0.000,0.000,0.000,0.000,0.000,0.000,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/data/hba-rotations.csv b/MAC/Deployment/data/Coordinates/data/hba-rotations.csv
index 7ccb46d63c707815511ee218a2a62efede6286ab..e2774cadeeee5cc84679947c3b241705921563fc 100644
--- a/MAC/Deployment/data/Coordinates/data/hba-rotations.csv
+++ b/MAC/Deployment/data/Coordinates/data/hba-rotations.csv
@@ -45,7 +45,7 @@ RS410,44,
RS503,78,
RS508,26,
RS509,40,
-DE601,-74,
+DE601,196,
DE602,60,
DE603,120,
DE604,0,
diff --git a/MAC/Deployment/data/Coordinates/data/normal_vectors.dat b/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
index 437de58fd4316118919097071e92742ce0ba1994..209041f4e04d21086c432a2082b6c9bef2a230b2 100644
--- a/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
+++ b/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
@@ -1,115 +1,117 @@
#
# station, type, normal-vector(3x float)
#
-rs305, lba , 0.598460, 0.072037, 0.797907
-rs305, hba , 0.598753, 0.072099, 0.797682
-rs106, lba , 0.598753, 0.072099, 0.797682
-rs106, hba , 0.598753, 0.072099, 0.797682
-cs302, lba , 0.598753, 0.072099, 0.797682
-cs302, hba0, 0.598753, 0.072099, 0.797682
-cs302, hba1, 0.598753, 0.072099, 0.797682
-se607, lba , 0.530119, 0.108953, 0.840894
-se607, hba , 0.529311, 0.111871, 0.841020
-cs201, lba , 0.598753, 0.072099, 0.797682
-cs201, hba0, 0.598753, 0.072099, 0.797682
-cs201, hba1, 0.598753, 0.072099, 0.797682
-cs026, lba , 0.598753, 0.072099, 0.797682
-cs026, hba0, 0.598753, 0.072099, 0.797682
-cs026, hba1, 0.598753, 0.072099, 0.797682
-cs013, lba , 0.598753, 0.072099, 0.797682
-cs013, hba0, 0.598753, 0.072099, 0.797682
-cs013, hba1, 0.598753, 0.072099, 0.797682
-cs103, lba , 0.598753, 0.072099, 0.797682
-cs103, hba0, 0.598753, 0.072099, 0.797682
-cs103, hba1, 0.598753, 0.072099, 0.797682
+cs301, lba , 0.598753, 0.072099, 0.797682
+cs301, hba0, 0.598753, 0.072099, 0.797682
+cs301, hba1, 0.598753, 0.072099, 0.797682
+cs024, lba , 0.598753, 0.072099, 0.797682
+cs024, hba0, 0.598753, 0.072099, 0.797682
+cs024, hba1, 0.598753, 0.072099, 0.797682
cs007, lba , 0.598753, 0.072099, 0.797682
cs007, hba0, 0.598753, 0.072099, 0.797682
cs007, hba1, 0.598753, 0.072099, 0.797682
-rs503, lba , 0.598753, 0.072099, 0.797682
-rs503, hba , 0.598753, 0.072099, 0.797682
rs406, lba , 0.591206, 0.077240, 0.802814
rs406, hba , 0.591206, 0.077240, 0.802814
-rs306, lba , 0.598753, 0.072099, 0.797682
-rs306, hba , 0.598753, 0.072099, 0.797682
-rs509, lba , 0.598753, 0.072099, 0.797682
-rs509, hba , 0.598753, 0.072099, 0.797682
+rs205, lba , 0.598753, 0.072099, 0.797682
+rs205, hba , 0.598753, 0.072099, 0.797682
+cs201, lba , 0.598753, 0.072099, 0.797682
+cs201, hba0, 0.598753, 0.072099, 0.797682
+cs201, hba1, 0.598753, 0.072099, 0.797682
+de604, lba , 0.601156, 0.153890, 0.784175
+de604, hba , 0.601146, 0.153897, 0.784181
+cs004, lba , 0.598753, 0.072099, 0.797682
+cs004, hba0, 0.598753, 0.072099, 0.797682
+cs004, hba1, 0.598753, 0.072099, 0.797682
+cs021, lba , 0.598753, 0.072099, 0.797682
+cs021, hba0, 0.598753, 0.072099, 0.797682
+cs021, hba1, 0.598753, 0.072099, 0.797682
+cs028, lba , 0.598753, 0.072099, 0.797682
+cs028, hba0, 0.598753, 0.072099, 0.797682
+cs028, hba1, 0.598753, 0.072099, 0.797682
cs002, lba , 0.598753, 0.072099, 0.797682
cs002, hba0, 0.598753, 0.072099, 0.797682
cs002, hba1, 0.598753, 0.072099, 0.797682
-cs011, lba , 0.598753, 0.072099, 0.797682
-cs011, hba0, 0.598753, 0.072099, 0.797682
-cs011, hba1, 0.598753, 0.072099, 0.797682
-cs006, lba , 0.598753, 0.072099, 0.797682
-cs006, hba0, 0.598753, 0.072099, 0.797682
-cs006, hba1, 0.598753, 0.072099, 0.797682
+cs003, lba , 0.598753, 0.072099, 0.797682
+cs003, hba0, 0.598753, 0.072099, 0.797682
+cs003, hba1, 0.598753, 0.072099, 0.797682
rs407, lba , 0.598753, 0.072099, 0.797682
rs407, hba , 0.598753, 0.072099, 0.797682
+rs306, lba , 0.598753, 0.072099, 0.797682
+rs306, hba , 0.598753, 0.072099, 0.797682
+de605, lba , 0.628982, 0.049468, 0.775844
+de605, hba , 0.628965, 0.049472, 0.775858
rs508, lba , 0.593792, 0.070643, 0.801512
rs508, hba , 0.593792, 0.070643, 0.801512
-de604, lba , 0.601156, 0.153890, 0.784175
-de604, hba , 0.601146, 0.153897, 0.784181
-cs101, lba , 0.598753, 0.072099, 0.797682
-cs101, hba0, 0.598753, 0.072099, 0.797682
-cs101, hba1, 0.598753, 0.072099, 0.797682
-cs001, lba , 0.598753, 0.072099, 0.797682
-cs001, hba0, 0.598753, 0.072099, 0.797682
-cs001, hba1, 0.598753, 0.072099, 0.797682
-de603, lba , 0.601391, 0.095614, 0.793213
-de603, hba , 0.601456, 0.095645, 0.793160
cs031, lba , 0.598753, 0.072099, 0.797682
cs031, hba0, 0.598753, 0.072099, 0.797682
cs031, hba1, 0.598753, 0.072099, 0.797682
-cs301, lba , 0.598753, 0.072099, 0.797682
-cs301, hba0, 0.598753, 0.072099, 0.797682
-cs301, hba1, 0.598753, 0.072099, 0.797682
-cs004, lba , 0.598753, 0.072099, 0.797682
-cs004, hba0, 0.598753, 0.072099, 0.797682
-cs004, hba1, 0.598753, 0.072099, 0.797682
-cs024, lba , 0.598753, 0.072099, 0.797682
-cs024, hba0, 0.598753, 0.072099, 0.797682
-cs024, hba1, 0.598753, 0.072099, 0.797682
+cs001, lba , 0.598753, 0.072099, 0.797682
+cs001, hba0, 0.598753, 0.072099, 0.797682
+cs001, hba1, 0.598753, 0.072099, 0.797682
+rs409, lba , 0.598753, 0.072099, 0.797682
+rs409, hba , 0.598753, 0.072099, 0.797682
+cs026, lba , 0.598753, 0.072099, 0.797682
+cs026, hba0, 0.598753, 0.072099, 0.797682
+cs026, hba1, 0.598753, 0.072099, 0.797682
+FI609, lba , 0.333971, 0.126638, 0.934037
+FI609, hba , 0.334119, 0.126625, 0.933987
+cs302, lba , 0.598753, 0.072099, 0.797682
+cs302, hba0, 0.598753, 0.072099, 0.797682
+cs302, hba1, 0.598753, 0.072099, 0.797682
+rs509, lba , 0.598753, 0.072099, 0.797682
+rs509, hba , 0.598753, 0.072099, 0.797682
+de602, lba , 0.662887, 0.109694, 0.740641
+de602, hba , 0.649782, 0.129703, 0.748973
de601, lba , 0.632827, 0.078099, 0.770344
de601, hba , 0.631584, 0.076814, 0.771493
-cs032, lba , 0.598753, 0.072099, 0.797682
-cs032, hba0, 0.598753, 0.072099, 0.797682
-cs032, hba1, 0.598753, 0.072099, 0.797682
-de605, lba , 0.628982, 0.049468, 0.775844
-de605, hba , 0.628965, 0.049472, 0.775858
-cs003, lba , 0.598753, 0.072099, 0.797682
-cs003, hba0, 0.598753, 0.072099, 0.797682
-cs003, hba1, 0.598753, 0.072099, 0.797682
-uk608, lba , 0.626845, -0.014960, 0.779000
-uk608, hba , 0.627506, -0.014332, 0.778480
+rs307, lba , 0.598753, 0.072099, 0.797682
+rs307, hba , 0.598753, 0.072099, 0.797682
+cs006, lba , 0.598753, 0.072099, 0.797682
+cs006, hba0, 0.598753, 0.072099, 0.797682
+cs006, hba1, 0.598753, 0.072099, 0.797682
rs208, lba , 0.601735, 0.072879, 0.795364
rs208, hba , 0.598753, 0.072099, 0.797682
-cs501, lba , 0.598753, 0.072099, 0.797682
-cs501, hba0, 0.598753, 0.072099, 0.797682
-cs501, hba1, 0.598753, 0.072099, 0.797682
-FI609, lba , 0.333971, 0.126638, 0.934037
-FI609, hba , 0.334119, 0.126625, 0.933987
+cs011, lba , 0.598753, 0.072099, 0.797682
+cs011, hba0, 0.598753, 0.072099, 0.797682
+cs011, hba1, 0.598753, 0.072099, 0.797682
cs017, lba , 0.598753, 0.072099, 0.797682
cs017, hba0, 0.598753, 0.072099, 0.797682
cs017, hba1, 0.598753, 0.072099, 0.797682
-cs028, lba , 0.598753, 0.072099, 0.797682
-cs028, hba0, 0.598753, 0.072099, 0.797682
-cs028, hba1, 0.598753, 0.072099, 0.797682
-de602, lba , 0.662887, 0.109694, 0.740641
-de602, hba , 0.649782, 0.129703, 0.748973
-rs307, lba , 0.598753, 0.072099, 0.797682
-rs307, hba , 0.598753, 0.072099, 0.797682
-fr606, lba , 0.677163, 0.025597, 0.735388
-fr606, hba , 0.677451, 0.025924, 0.735111
-cs030, lba , 0.598753, 0.072099, 0.797682
-cs030, hba0, 0.598753, 0.072099, 0.797682
-cs030, hba1, 0.598753, 0.072099, 0.797682
+cs013, lba , 0.598753, 0.072099, 0.797682
+cs013, hba0, 0.598753, 0.072099, 0.797682
+cs013, hba1, 0.598753, 0.072099, 0.797682
+se607, lba , 0.530119, 0.108953, 0.840894
+se607, hba , 0.529311, 0.111871, 0.841020
cs005, lba , 0.598753, 0.072099, 0.797682
cs005, hba0, 0.598753, 0.072099, 0.797682
cs005, hba1, 0.598753, 0.072099, 0.797682
-rs205, lba , 0.598753, 0.072099, 0.797682
-rs205, hba , 0.598753, 0.072099, 0.797682
-cs021, lba , 0.598753, 0.072099, 0.797682
-cs021, hba0, 0.598753, 0.072099, 0.797682
-cs021, hba1, 0.598753, 0.072099, 0.797682
+de603, lba , 0.601391, 0.095614, 0.793213
+de603, hba , 0.601456, 0.095645, 0.793160
+uk608, lba , 0.626845, -0.014960, 0.779000
+uk608, hba , 0.627506, -0.014332, 0.778480
+fr606, lba , 0.677163, 0.025597, 0.735388
+fr606, hba , 0.677451, 0.025924, 0.735111
+cs103, lba , 0.598753, 0.072099, 0.797682
+cs103, hba0, 0.598753, 0.072099, 0.797682
+cs103, hba1, 0.598753, 0.072099, 0.797682
+cs101, lba , 0.598753, 0.072099, 0.797682
+cs101, hba0, 0.598753, 0.072099, 0.797682
+cs101, hba1, 0.598753, 0.072099, 0.797682
+rs305, lba , 0.598460, 0.072037, 0.797907
+rs305, hba , 0.598753, 0.072099, 0.797682
cs401, lba , 0.598753, 0.072099, 0.797682
cs401, hba0, 0.598753, 0.072099, 0.797682
cs401, hba1, 0.598753, 0.072099, 0.797682
+cs501, lba , 0.598753, 0.072099, 0.797682
+cs501, hba0, 0.598753, 0.072099, 0.797682
+cs501, hba1, 0.598753, 0.072099, 0.797682
+rs503, lba , 0.598753, 0.072099, 0.797682
+rs503, hba , 0.598753, 0.072099, 0.797682
+cs030, lba , 0.598753, 0.072099, 0.797682
+cs030, hba0, 0.598753, 0.072099, 0.797682
+cs030, hba1, 0.598753, 0.072099, 0.797682
+rs106, lba , 0.598753, 0.072099, 0.797682
+rs106, hba , 0.598753, 0.072099, 0.797682
+cs032, lba , 0.598753, 0.072099, 0.797682
+cs032, hba0, 0.598753, 0.072099, 0.797682
+cs032, hba1, 0.598753, 0.072099, 0.797682
diff --git a/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat b/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
index 0f4945e5ab3f3303f52c8a0f72d78182acdf9754..bde6b3b662b8c1d275905663b7d6c41aed865b78 100644
--- a/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
+++ b/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
@@ -1,115 +1,117 @@
#
# station, type, station-pqr-to-etrs-matrix(9x float)
#
-rs305, lba , -0.1195794394, -0.7921780051, 0.5984603294, 0.9928246344, -0.0954456149, 0.0720373503, 0.0000540097, 0.6027803438, 0.7979071715
-rs305, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs106, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs106, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs302, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs302, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs302, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-se607, lba , -0.1434910187, -0.8356935828, 0.5301193858, 0.9889342437, -0.1006885919, 0.1089535179, -0.0376747812, 0.5398870652, 0.8408939099
-se607, hba , -0.1450609384, -0.8359350936, 0.5293107248, 0.9886054814, -0.1007176904, 0.1118711263, -0.0402060468, 0.5395076145, 0.8410202184
-cs201, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs201, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs201, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs026, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs026, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs026, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs013, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs013, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs013, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs103, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs103, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs103, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs301, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs301, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs301, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs024, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs024, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs024, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs007, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs007, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs007, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs503, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs503, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
rs406, lba , -0.1231490036, -0.7970634976, 0.5912056357, 0.9923766349, -0.0960342438, 0.0772401358, -0.0047893066, 0.5962107051, 0.8028137130
rs406, hba , -0.1231490036, -0.7970634976, 0.5912056357, 0.9923766349, -0.0960342438, 0.0772401358, -0.0047893066, 0.5962107051, 0.8028137130
-rs306, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs306, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs509, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs509, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs205, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs205, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs201, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs201, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs201, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+de604, lba , -0.1687911945, -0.7811027607, 0.6011555621, 0.9835959335, -0.0941112134, 0.1538899575, -0.0636283913, 0.6172694361, 0.7841746433
+de604, hba , -0.1687955875, -0.7811092351, 0.6011459161, 0.9835947185, -0.0941119935, 0.1538972464, -0.0636355199, 0.6172611243, 0.7841806074
+cs004, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs004, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs004, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs021, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs021, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs021, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs028, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs028, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs028, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs002, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs002, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs002, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs011, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs011, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs011, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs006, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs006, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs006, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs003, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs003, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs003, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
rs407, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
rs407, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs306, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs306, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+de605, lba , -0.1032226072, -0.7705364038, 0.6289823080, 0.9944515889, -0.0928381253, 0.0494683717, 0.0202763571, 0.6305987099, 0.7758441444
+de605, hba , -0.1032262224, -0.7705496189, 0.6289655251, 0.9944512868, -0.0928397175, 0.0494714567, 0.0202727695, 0.6305823274, 0.7758575534
rs508, lba , -0.1190892356, -0.7957570796, 0.5937915663, 0.9928832966, -0.0958768399, 0.0706426986, 0.0007164314, 0.5979785128, 0.8015118121
rs508, hba , -0.1190892356, -0.7957570796, 0.5937915663, 0.9928832966, -0.0958768399, 0.0706426986, 0.0007164314, 0.5979785128, 0.8015118121
-de604, lba , -0.1687911945, -0.7811027607, 0.6011555621, 0.9835959335, -0.0941112134, 0.1538899575, -0.0636283913, 0.6172694361, 0.7841746433
-de604, hba , -0.1687955875, -0.7811092351, 0.6011459161, 0.9835947185, -0.0941119935, 0.1538972464, -0.0636355199, 0.6172611243, 0.7841806074
-cs101, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs101, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs101, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs001, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs001, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs001, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-de603, lba , -0.1334809156, -0.7877259031, 0.6013906773, 0.9908835110, -0.0949092031, 0.0956143863, -0.0182404188, 0.6086708016, 0.7932131759
-de603, hba , -0.1334960861, -0.7876731599, 0.6014563893, 0.9908811597, -0.0949028483, 0.0956450562, -0.0182571191, 0.6087400452, 0.7931596529
cs031, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs031, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs031, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs301, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs301, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs301, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs004, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs004, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs004, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs024, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs024, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs024, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs001, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs001, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs001, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs409, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs409, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs026, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs026, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs026, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+FI609, lba , -0.1488161195, -0.9307614981, 0.3339712506, 0.9855896004, -0.1121428554, 0.1266377496, -0.0804170519, 0.3480043299, 0.9340375175
+FI609, hba , -0.1488182628, -0.9307082344, 0.3341187022, 0.9855919695, -0.1121364380, 0.1266249936, -0.0803840431, 0.3481488213, 0.9339865116
+cs302, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs302, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs302, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs509, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs509, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+de602, lba , -0.1393102433, -0.7356454341, 0.6628864544, 0.9900056752, -0.0886342847, 0.1096937857, -0.0219412659, 0.6715428198, 0.7406408185
+de602, hba , -0.1529874576, -0.7445656232, 0.6497821716, 0.9874864006, -0.0897090342, 0.1297031138, -0.0382811487, 0.6614940075, 0.7489727844
de601, lba , -0.1214634323, -0.7647321881, 0.6328271882, 0.9925955423, -0.0928219139, 0.0780991312, -0.0008509017, 0.6376274561, 0.7703442292
de601, hba , -0.1198066951, -0.7659948264, 0.6315838092, 0.9927969403, -0.0919453659, 0.0768144370, -0.0007688588, 0.6362373579, 0.7714929904
-cs032, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs032, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs032, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-de605, lba , -0.1032226072, -0.7705364038, 0.6289823080, 0.9944515889, -0.0928381253, 0.0494683717, 0.0202763571, 0.6305987099, 0.7758441444
-de605, hba , -0.1032262224, -0.7705496189, 0.6289655251, 0.9944512868, -0.0928397175, 0.0494714567, 0.0202727695, 0.6305823274, 0.7758575534
-cs003, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs003, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs003, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-uk608, lba , -0.0635635542, -0.7765468618, 0.6268449936, 0.9955010195, -0.0935622956, -0.0149605152, 0.0702665977, 0.6230738867, 0.7790003447
-uk608, hba , -0.0638438351, -0.7759896972, 0.6275061391, 0.9955165671, -0.0934951656, -0.0143324330, 0.0697906108, 0.6237777199, 0.7784796894
+rs307, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs307, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs006, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs006, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs006, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
rs208, lba , -0.1198462583, -0.7896526923, 0.6017354069, 0.9927924178, -0.0951413524, 0.0728789281, -0.0002991213, 0.6061326163, 0.7953635407
rs208, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs501, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs501, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs501, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-FI609, lba , -0.1488161195, -0.9307614981, 0.3339712506, 0.9855896004, -0.1121428554, 0.1266377496, -0.0804170519, 0.3480043299, 0.9340375175
-FI609, hba , -0.1488182628, -0.9307082344, 0.3341187022, 0.9855919695, -0.1121364380, 0.1266249936, -0.0803840431, 0.3481488213, 0.9339865116
+cs011, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs011, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs011, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs017, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs017, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs017, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs028, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs028, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs028, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-de602, lba , -0.1393102433, -0.7356454341, 0.6628864544, 0.9900056752, -0.0886342847, 0.1096937857, -0.0219412659, 0.6715428198, 0.7406408185
-de602, hba , -0.1529874576, -0.7445656232, 0.6497821716, 0.9874864006, -0.0897090342, 0.1297031138, -0.0382811487, 0.6614940075, 0.7489727844
-rs307, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs307, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-fr606, lba , -0.0821044514, -0.7312384111, 0.6771626431, 0.9957823947, -0.0881033042, 0.0255974649, 0.0409424168, 0.6764083041, 0.7353880096
-fr606, hba , -0.0822838356, -0.7309509762, 0.6774511354, 0.9957770021, -0.0880686726, 0.0259243331, 0.0407128056, 0.6767234142, 0.7351107999
-cs030, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs030, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs030, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs013, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs013, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs013, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+se607, lba , -0.1434910187, -0.8356935828, 0.5301193858, 0.9889342437, -0.1006885919, 0.1089535179, -0.0376747812, 0.5398870652, 0.8408939099
+se607, hba , -0.1450609384, -0.8359350936, 0.5293107248, 0.9886054814, -0.1007176904, 0.1118711263, -0.0402060468, 0.5395076145, 0.8410202184
cs005, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs005, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs005, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs205, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs205, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs021, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs021, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs021, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+de603, lba , -0.1334809156, -0.7877259031, 0.6013906773, 0.9908835110, -0.0949092031, 0.0956143863, -0.0182404188, 0.6086708016, 0.7932131759
+de603, hba , -0.1334960861, -0.7876731599, 0.6014563893, 0.9908811597, -0.0949028483, 0.0956450562, -0.0182571191, 0.6087400452, 0.7931596529
+uk608, lba , -0.0635635542, -0.7765468618, 0.6268449936, 0.9955010195, -0.0935622956, -0.0149605152, 0.0702665977, 0.6230738867, 0.7790003447
+uk608, hba , -0.0638438351, -0.7759896972, 0.6275061391, 0.9955165671, -0.0934951656, -0.0143324330, 0.0697906108, 0.6237777199, 0.7784796894
+fr606, lba , -0.0821044514, -0.7312384111, 0.6771626431, 0.9957823947, -0.0881033042, 0.0255974649, 0.0409424168, 0.6764083041, 0.7353880096
+fr606, hba , -0.0822838356, -0.7309509762, 0.6774511354, 0.9957770021, -0.0880686726, 0.0259243331, 0.0407128056, 0.6767234142, 0.7351107999
+cs103, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs103, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs103, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs101, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs101, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs101, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs305, lba , -0.1195794394, -0.7921780051, 0.5984603294, 0.9928246344, -0.0954456149, 0.0720373503, 0.0000540097, 0.6027803438, 0.7979071715
+rs305, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs401, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs401, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs401, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs501, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs501, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs501, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs503, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs503, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs030, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs030, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs030, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs106, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs106, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs032, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs032, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs032, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-hba-solution.lisp
index 8227db52bb4af5f1305e6ff48716f46c0f6f9bc8..8301fdbbfd76de176c918e547b5c36ff4092abf6 100644
--- a/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-hba-solution.lisp
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-hba-solution.lisp
@@ -1,12 +1,12 @@
-(discarded-points
- NIL)
-(reduced-chi-squared 0.009967096579413644)
-(normal-vector (0.6315838091894460 0.0768144370032466 0.7714929904002105))
-(normal-vector-uncertainties (0.0000019 0.0000032 0.0000015))
-(normal-vector-direction-uncertainties-arcsec :max 0.65 :rms 0.48 :avg 0.45)
-(reference-point :etrs (4034101.143 487013.113 4900230.789)
- :station-pqr (0.0 0.0 0.0))
-(station-pqr-to-etrs-matrix
- #2A((-0.1198066951176159 -0.7659948264431504 0.6315838091894460)
- (0.9927969402960025 -0.0919453659417217 0.0768144370032466)
- (-0.0007688587789930 0.6362373578658382 0.7714929904002105)))
+(discarded-points
+ NIL)
+(reduced-chi-squared 0.009967096579413644)
+(normal-vector (0.6315838091894460 0.0768144370032466 0.7714929904002105))
+(normal-vector-uncertainties (0.0000019 0.0000032 0.0000015))
+(normal-vector-direction-uncertainties-arcsec :max 0.65 :rms 0.48 :avg 0.45)
+(reference-point :etrs (4034101.901 487012.401 4900230.210)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.1198066951176159 -0.7659948264431504 0.6315838091894460)
+ (0.9927969402960025 -0.0919453659417217 0.0768144370032466)
+ (-0.0007688587789930 0.6362373578658382 0.7714929904002105)))
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-lba-solution.lisp
index 532e7b863e5995ad5dc28945b2c50a8716c029df..5ab4802c75d7b4feccb7ad0398c689e5f3db5cf4 100644
--- a/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-lba-solution.lisp
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-lba-solution.lisp
@@ -1,12 +1,12 @@
-(discarded-points
- NIL)
-(reduced-chi-squared 0.000001820887470935997)
-(normal-vector (0.6328271882340650 0.0780991312002186 0.7703442292333122))
-(normal-vector-uncertainties (0.0000120 0.0001073 0.0000108))
-(normal-vector-direction-uncertainties-arcsec :max 22.14 :rms 12.93 :avg 8.95)
-(reference-point :etrs (4034037.877 487026.935 4900280.635)
- :station-pqr (0.0 0.0 0.0))
-(station-pqr-to-etrs-matrix
- #2A((-0.1214634322601195 -0.7647321881206433 0.6328271882340650)
- (0.9925955422980562 -0.0928219139137982 0.0780991312002186)
- (-0.0008509016506948 0.6376274560819920 0.7703442292333122)))
+(discarded-points
+ NIL)
+(reduced-chi-squared 0.000001820887470935997)
+(normal-vector (0.6328271882340650 0.0780991312002186 0.7703442292333122))
+(normal-vector-uncertainties (0.0000120 0.0001073 0.0000108))
+(normal-vector-direction-uncertainties-arcsec :max 22.14 :rms 12.93 :avg 8.95)
+(reference-point :etrs (4034038.635 487026.223 4900280.057)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.1214634322601195 -0.7647321881206433 0.6328271882340650)
+ (0.9925955422980562 -0.0928219139137982 0.0780991312002186)
+ (-0.0008509016506948 0.6376274560819920 0.7703442292333122)))
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS409/rs409-hba-core-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS409/rs409-hba-core-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..8f58eb5d21e60c92d2023a06fb455d26b855d68d
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS409/rs409-hba-core-solution.lisp
@@ -0,0 +1,8 @@
+(normal-vector (0.598753 0.072099 0.797682))
+(reference-point :etrs (3824813.014 426130.006 5069251.494)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.11959510541518863d0 -0.7919544517060547d0 0.5987530018160178d0)
+ (0.9928227483621251d0 -0.09541868004821492d0 0.07209900021867627d0)
+ (3.3096921454367496d-5 0.6030782883845335d0 0.7976820024193695d0)))
+
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS409/rs409-lba-core-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS409/rs409-lba-core-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..89a76da8834abe37c4b1180c154192db3d613145
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS409/rs409-lba-core-solution.lisp
@@ -0,0 +1,8 @@
+(normal-vector (0.598753 0.072099 0.797682))
+(reference-point :etrs (3824756.246 426178.523 5069289.608)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.11959510541518863d0 -0.7919544517060547d0 0.5987530018160178d0)
+ (0.9928227483621251d0 -0.09541868004821492d0 0.07209900021867627d0)
+ (3.3096921454367496d-5 0.6030782883845335d0 0.7976820024193695d0)))
+
diff --git a/MAC/Deployment/data/OTDB/CoherentStokesBeam.comp b/MAC/Deployment/data/OTDB/CoherentStokesBeam.comp
index 945c5b7b2ccfe636d3ac751158dc429f4928875c..0500359ce8db63f762b73c2ec89a5ac75e1a0ac2 100644
--- a/MAC/Deployment/data/OTDB/CoherentStokesBeam.comp
+++ b/MAC/Deployment/data/OTDB/CoherentStokesBeam.comp
@@ -64,7 +64,7 @@ node CoherentStokesBeam 4.0.0 development 'node constraint' "CoherentStokes
#--------------------------------------------------------------------------------------------------------
par SAP O uint - 10 0 0 - 'Index of SubArrayPointing'
par TAB O uint - 10 0 0 - 'Index of TiedArrayBeam within SubArrayPointing'
-par samplingTime O dbl s 10 0 0 - 'Duration of one sample'
+par samplingTime O dbl seconds 10 0 0 - 'Duration of one sample'
par dispersionMeasure O dbl - 10 0 0 - ''
par nrSubbands O uint - 10 0 0 - ''
par stationSubbands O vint - 10 0 '[]' - 'Index of subband on the station, selects freq. range'
diff --git a/MAC/Deployment/data/OTDB/FlysEyeBeam.comp b/MAC/Deployment/data/OTDB/FlysEyeBeam.comp
index 1055a53b2c904408f2b7617d72044c33f94e8b6a..337026f9808433a568f6e431a0d36851f7d6f7da 100644
--- a/MAC/Deployment/data/OTDB/FlysEyeBeam.comp
+++ b/MAC/Deployment/data/OTDB/FlysEyeBeam.comp
@@ -39,7 +39,7 @@ node FlysEyeBeam 4.0.0 development 'node constraint' "FlysEyeBeam specifica
#--------------------------------------------------------------------------------------------------------
par SAP O uint - 10 0 0 - 'Index of SubArrayPointing'
par TAB O uint - 10 0 0 - 'Index of TiedArrayBeam within SubArrayPointing'
-par samplingTime O dbl s 10 0 0 - 'Duration of one sample'
+par samplingTime O dbl seconds 10 0 0 - 'Duration of one sample'
par dispersionMeasure O dbl - 10 0 0 - ''
par nrSubbands O uint - 10 0 0 - ''
par stationSubbands O vint - 10 0 '[]' - 'Index of subband on the station, selects freq. range'
diff --git a/MAC/Deployment/data/OTDB/IncoherentStokesBeam.comp b/MAC/Deployment/data/OTDB/IncoherentStokesBeam.comp
index c145cd44d4157a14cb99093ac655e8d9f60ac71f..d47c31844973516814e90bc5a38b9a0aa2e829c1 100644
--- a/MAC/Deployment/data/OTDB/IncoherentStokesBeam.comp
+++ b/MAC/Deployment/data/OTDB/IncoherentStokesBeam.comp
@@ -38,7 +38,7 @@ node IncoherentStokesBeam 4.0.0 development 'node constraint' "IncoherentSt
#--------------------------------------------------------------------------------------------------------
par SAP O uint - 10 0 0 - 'Index of SubArrayPointing'
par TAB O uint - 10 0 0 - 'Index of TiedArrayBeam within SubArrayPointing'
-par samplingTime O dbl s 10 0 0 - 'Duration of one sample'
+par samplingTime O dbl seconds 10 0 0 - 'Duration of one sample'
par dispersionMeasure O dbl - 10 0 0 - ''
par nrSubbands O uint - 10 0 0 - ''
par stationSubbands O vint - 10 0 '[]' - 'Index of subband on the station, selects freq. range'
diff --git a/MAC/Deployment/data/PVSS/bin/create_db_files b/MAC/Deployment/data/PVSS/bin/create_db_files
index 4654f5814f2e772ad094f10a63c9f2dececb1b24..5c9a9c76402c650efc861c6295c0dabfe2943d66 100755
--- a/MAC/Deployment/data/PVSS/bin/create_db_files
+++ b/MAC/Deployment/data/PVSS/bin/create_db_files
@@ -1308,8 +1308,8 @@ elif [ "$DBTYPE" == "C" ]; then
fi
else
check_start_dir
- configdir="../.."
- dpdefdir="../data"
+ configdir="../../"
+ dpdefdir="../data/"
STNNAME=$DBTYPENAME
fi
@@ -1358,14 +1358,12 @@ rm -f ${TMP_FILE}
# Creating the c++ header file is for development hosts, only; in that case
# the $dpdefdir is an empty string
-if [ "${dpdefdir}" == "" ]; then
- (
+(
echo -n "// This file was generated by $(basename $0) ${VERSION} on " ; date
echo ""
- ) >${DESTDIR}/${CPP_HEADERFILE}
- create_cpp_headerfile ${INPUTFILE} ${DBTYPE}
- echo "created: ${DESTDIR}/${CPP_HEADERFILE}"
- mkdir -p ../../../../installed/gnu_debug/include/Deployment/
- cp ${DESTDIR}/${CPP_HEADERFILE} ../../../../installed/gnu_debug/include/Deployment/
-fi
+) >${DESTDIR}/${CPP_HEADERFILE}
+create_cpp_headerfile ${INPUTFILE} ${DBTYPE}
+echo "created: ${DESTDIR}/${CPP_HEADERFILE}"
+mkdir -p ../../../../installed/gnu_debug/include/Deployment/
+cp ${DESTDIR}/${CPP_HEADERFILE} ../../../../installed/gnu_debug/include/Deployment/
diff --git a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
index d7ebb363914233dbd41e6fac09a91b27d68fd3c9..d63395a9f834ce2820610c2000ac34eb6317d02a 100644
--- a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
+++ b/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
@@ -37,8 +37,8 @@ LogProcessor - M Y LOFAR_PermSW_Daemons_LogProcessor
ServiceBroker - M Y LOFAR_PermSW_Daemons_ServiceBroker
SASGateway - M Y LOFAR_PermSW_Daemons_SASGateway
KeyValueLogger - M Y LOFAR_PermSW_Daemons_KeyValueLogger
+SoftwareMonitor - M Y LOFAR_PermSW_Daemons_SoftwareMonitor
CTStartDaemon - M Y LOFAR_PermSW_CTStartDaemon
-SoftwareMonitor - M Y LOFAR_PermSW_SoftwareMonitor
MACScheduler MS M Y LOFAR_PermSW_MACScheduler
CRTriggerControl CRT M Y LOFAR_PermSW_CRTriggerControl
ObsSW - M N LOFAR_ObsSW
@@ -63,14 +63,14 @@ OSRack - C N LOFAR_PIC_@osrack@
LocusNode LCN C Y LOFAR_PIC_@osrack@_@locusnode@
CEPPermSW - C N LOFAR_PermSW
CEPHardwareMonitor CHM C Y LOFAR_PermSW_CEPHardwareMonitor
-SoftwareMonitor - C Y LOFAR_PermSW_SoftwareMonitor
Daemons - C N LOFAR_PermSW_Daemons
PVSS00pmon - C Y LOFAR_PermSW_Daemons_PVSS00pmon
LogProcessor - C Y LOFAR_PermSW_Daemons_LogProcessor
CEPlogProcessor - C Y LOFAR_PermSW_Daemons_CEPlogProcessor
ServiceBroker - C Y LOFAR_PermSW_Daemons_ServiceBroker
-CTStartDaemon - C Y LOFAR_PermSW_CTStartDaemon
+SoftwareMonitor - C Y LOFAR_PermSW_Daemons_SoftwareMonitor
SASGateway - C Y LOFAR_PermSW_Daemons_SASGateway
+CTStartDaemon - C Y LOFAR_PermSW_CTStartDaemon
CEPObsSW - C N LOFAR_ObsSW
CEPObservation - C N LOFAR_ObsSW_@observation@
OnlineControl - C N LOFAR_ObsSW_@observation@_OnlineControl
@@ -96,15 +96,15 @@ Daemons - S N LOFAR_PermSW_Daemons
PVSS00pmon - S Y LOFAR_PermSW_Daemons_PVSS00pmon
LogProcessor LGP S Y LOFAR_PermSW_Daemons_LogProcessor
ServiceBroker - S Y LOFAR_PermSW_Daemons_ServiceBroker
-CTStartDaemon - S Y LOFAR_PermSW_CTStartDaemon
SASGateway SGW S Y LOFAR_PermSW_Daemons_SASGateway
+SoftwareMonitor SWM S Y LOFAR_PermSW_Daemons_SoftwareMonitor
+CTStartDaemon - S Y LOFAR_PermSW_CTStartDaemon
RSPDriver - S Y LOFAR_PermSW_RSPDriver
TBBDriver - S Y LOFAR_PermSW_TBBDriver
AMCServer - S Y LOFAR_PermSW_AMCServer
BeamServer - S Y LOFAR_PermSW_BeamServer
CalServer - S Y LOFAR_PermSW_CalServer
HardwareMonitor HWM S Y LOFAR_PermSW_HardwareMonitor
-SoftwareMonitor SWM S Y LOFAR_PermSW_SoftwareMonitor
SHMInfoServer MIS S Y LOFAR_PermSW_SHMInfoServer
StationControl SC S Y LOFAR_PermSW_StationControl
ClockControl CLC S Y LOFAR_PermSW_ClockControl
diff --git a/MAC/Deployment/data/PVSS/data/SoftwareMonitor.dpdef b/MAC/Deployment/data/PVSS/data/SoftwareMonitor.dpdef
index 82564f4365bb59c826be3b77322f7392a6c7dfc4..2e2c2dd09e6aafb69399d5dafb7256192168e488 100644
--- a/MAC/Deployment/data/PVSS/data/SoftwareMonitor.dpdef
+++ b/MAC/Deployment/data/PVSS/data/SoftwareMonitor.dpdef
@@ -2,6 +2,6 @@
SWLevel int
!# DbArchiveInfo
-!ElementName TypeName DetailNr _archive.._type _archive.._archive
-!_mp_SoftwareMonitor.SWLevel SoftwareMonitor 45 1
+!ElementName TypeName DetailNr _archive.._type _archive.._archive _archive.._class
+!_mp_SoftwareMonitor.SWLevel SoftwareMonitor 45 1
!_mp_SoftwareMonitor.SWLevel SoftwareMonitor 1 15 _ValueArchive_2
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/DE601-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/DE601-AntennaField.conf
index 884e4bc40ec2613b9e956956e5eba1be80f3a985..bdd0afe5040cd127d47dc6423ce6c84842f15e2a 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: 2012-11-08 20:42:18
+# Created: 2012-11-22 13:33:45
#
NORMAL_VECTOR LBA
@@ -15,104 +15,104 @@ ROTATION_MATRIX LBA
]
LBA
-3 [ 4034036.395510000 487026.791083000 4900279.047 ]
+3 [ 4034038.246510000 487026.564083000 4900280.329 ]
96 x 2 x 3 [
- -4.195000 -11.847000 7.394000 -4.195000 -11.847000 7.394000
- -8.169000 -5.149000 10.027000 -8.169000 -5.149000 10.027000
- -7.169000 -11.571000 9.832000 -7.169000 -11.571000 9.832000
--10.675000 -5.950001 12.161000 -10.675000 -5.950001 12.161000
- 5.742000 19.671001 -3.831000 5.742000 19.671001 -3.831000
- 2.200000 24.406000 -1.396000 2.200000 24.406000 -1.396000
- 11.855000 21.873001 -9.070000 11.855000 21.873001 -9.070000
- 9.726000 26.263001 -7.899000 9.726000 26.263001 -7.899000
- -6.681000 -16.884000 9.941000 -6.681000 -16.884000 9.941000
- -4.574000 -23.416000 8.847000 -4.574000 -23.416000 8.847000
- -7.068000 -25.686000 11.112000 -7.068000 -25.686000 11.112000
- -9.981000 -23.822001 13.352000 -9.981000 -23.822001 13.352000
- 2.165000 4.874000 0.503000 2.165000 4.874000 0.503000
- -1.872000 2.900000 4.051000 -1.872000 2.900000 4.051000
- -3.409000 5.754000 5.068000 -3.409000 5.754000 5.068000
- -1.345000 9.598000 2.990000 -1.345000 9.598000 2.990000
- -6.130000 6.160000 7.251000 -6.130000 6.160000 7.251000
- -8.457000 2.315000 9.503000 -8.457000 2.315000 9.503000
--10.823000 10.578999 10.642000 -10.823000 10.578999 10.642000
--13.424000 7.497999 13.044000 -13.424000 7.497999 13.044000
- 16.376000 -8.956998 -9.712000 16.376000 -8.956998 -9.712000
- 14.665000 -17.513998 -7.530000 14.665000 -17.513998 -7.530000
- 22.953000 -13.138998 -14.743990 22.953000 -13.138998 -14.743990
- 17.405000 -22.340998 -9.246000 17.405000 -22.340998 -9.246000
- 1.766000 -12.986000 2.602000 1.766000 -12.986000 2.602000
- -0.525000 -15.724000 4.751000 -0.525000 -15.724000 4.751000
- 4.359000 -15.923999 0.812000 4.359000 -15.923999 0.812000
- 5.563000 -19.728999 0.188000 5.563000 -19.728999 0.188000
- 15.914000 6.655002 -10.865000 15.914000 6.655002 -10.865000
- 17.993000 9.304002 -12.861000 17.993000 9.304002 -12.861000
- 20.873000 -0.126998 -14.194990 20.873000 -0.126998 -14.194990
- 23.988000 4.005002 -17.212990 23.988000 4.005002 -17.212990
--11.601000 14.432999 10.902000 -11.601000 14.432999 10.902000
- -9.450000 20.213999 8.588000 -9.450000 20.213999 8.588000
--14.718000 27.842999 12.121000 -14.718000 27.842999 12.121000
--17.276000 22.477999 14.763000 -17.276000 22.477999 14.763000
- 5.857000 3.417001 -2.383000 5.857000 3.417001 -2.383000
- 4.339000 8.854001 -1.662000 4.339000 8.854001 -1.662000
- 8.772000 4.649001 -4.859000 8.772000 4.649001 -4.859000
- 8.360000 8.372001 -4.886000 8.360000 8.372001 -4.886000
--15.731000 -11.738001 16.893000 -15.731000 -11.738001 16.893000
--17.520000 -1.853001 17.426000 -17.520000 -1.853001 17.426000
--21.610000 -8.939002 21.461000 -21.610000 -8.939002 21.461000
--22.457000 1.588998 21.117000 -22.457000 1.588998 21.117000
- 6.409000 -3.081999 -2.173000 6.409000 -3.081999 -2.173000
- 9.436000 -2.264999 -4.715000 9.436000 -2.264999 -4.715000
- 6.754000 -7.849999 -1.944000 6.754000 -7.849999 -1.944000
- 10.565000 -6.275999 -5.199000 10.565000 -6.275999 -5.199000
- 0.599000 18.065000 0.540000 0.599000 18.065000 0.540000
- 16.928000 -2.290998 -10.766000 16.928000 -2.290998 -10.766000
- 0.548000 28.961000 -0.545000 0.548000 28.961000 -0.545000
- -6.742000 20.391000 6.391000 -6.742000 20.391000 6.391000
- 9.282000 -23.198999 -2.544000 9.282000 -23.198999 -2.544000
- 25.306000 -6.258998 -17.293990 25.306000 -6.258998 -17.293990
- -7.335000 27.939000 6.084000 -7.335000 27.939000 6.084000
- 1.698000 8.221000 0.583000 1.698000 8.221000 0.583000
--15.450000 -18.638001 17.374000 -15.450000 -18.638001 17.374000
- 10.405000 -16.567999 -4.118000 10.405000 -16.567999 -4.118000
- -1.587000 -19.355000 5.953000 -1.587000 -19.355000 5.953000
- 21.932000 13.551002 -16.578990 21.932000 13.551002 -16.578990
- 14.201000 0.082001 -8.820000 14.201000 0.082001 -8.820000
- 10.598000 -12.763999 -4.609000 10.598000 -12.763999 -4.609000
--14.233000 -1.540001 14.625000 -14.233000 -1.540001 14.625000
- -4.172000 -0.207000 6.240000 -4.172000 -0.207000 6.240000
- 4.411000 14.454001 -2.249000 4.411000 14.454001 -2.249000
- -1.621000 -6.471000 4.735000 -1.621000 -6.471000 4.735000
- 15.004000 13.892002 -10.937000 15.004000 13.892002 -10.937000
- 11.609000 7.899001 -7.545000 11.609000 7.899001 -7.545000
- 2.668000 -23.524999 2.897000 2.668000 -23.524999 2.897000
- 0.553000 -25.316000 4.829000 0.553000 -25.316000 4.829000
- 2.204000 -4.479000 1.463000 2.204000 -4.479000 1.463000
--12.346000 -10.125001 13.988000 -12.346000 -10.125001 13.988000
- 11.053000 0.669001 -6.337000 11.053000 0.669001 -6.337000
- -5.098000 15.611000 5.493000 -5.098000 15.611000 5.493000
- 7.127000 14.225001 -4.490000 7.127000 14.225001 -4.490000
- -4.565000 28.110000 3.765000 -4.565000 28.110000 3.765000
- 1.274000 -9.445000 2.676000 1.274000 -9.445000 2.676000
- 13.547000 -4.915999 -7.769000 13.547000 -4.915999 -7.769000
- -9.622000 -17.161001 12.349000 -9.622000 -17.161001 12.349000
--17.909000 6.512999 16.872000 -17.909000 6.512999 16.872000
--12.151000 2.918999 12.497000 -12.151000 2.918999 12.497000
- -0.690000 22.150000 1.217000 -0.690000 22.150000 1.217000
- -7.832000 10.178000 8.245000 -7.832000 10.178000 8.245000
- -1.600000 -2.874000 4.372000 -1.600000 -2.874000 4.372000
- 20.638000 -8.809998 -13.229990 20.638000 -8.809998 -13.229990
- 5.087000 0.142001 -1.426000 5.087000 0.142001 -1.426000
- 17.253000 22.986002 -13.729000 17.253000 22.986002 -13.729000
- 12.800000 15.844001 -9.323000 12.800000 15.844001 -9.323000
- -6.775000 -0.505000 8.390000 -6.775000 -0.505000 8.390000
--22.109000 12.401998 19.760000 -22.109000 12.401998 19.760000
- -3.787000 -8.371000 6.684000 -3.787000 -8.371000 6.684000
- 11.747000 -24.136999 -4.447000 11.747000 -24.136999 -4.447000
--15.308000 13.486999 14.033000 -15.308000 13.486999 14.033000
- 3.521000 -7.587999 0.661000 3.521000 -7.587999 0.661000
- 7.113000 -11.375999 -1.853000 7.113000 -11.375999 -1.853000
- -2.401000 12.817000 3.540000 -2.401000 12.817000 3.540000
+ -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
+-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
+ -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
+ 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
+ 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
+ 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
+ -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
+ 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
+ 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.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
]
NORMAL_VECTOR HBA
@@ -126,102 +126,102 @@ ROTATION_MATRIX HBA
]
HBA
-3 [ 4034100.754510000 487013.454089000 4900231.061 ]
+3 [ 4034101.512510000 487012.742089000 4900230.482 ]
96 x 2 x 3 [
- 20.808010 -15.324999 -15.499000 20.808010 -15.324999 -15.499000
- 21.305010 -10.285999 -16.399000 21.305010 -10.285999 -16.399000
- 21.802010 -5.241998 -17.295000 21.802010 -5.241998 -17.295000
+ 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.255000 17.343010 -9.320999 -13.255000
- 17.842010 -4.274999 -14.159000 17.842010 -4.274999 -14.159000
+ 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.236000 12.898010 -13.395999 -9.236000
- 13.392010 -8.355999 -10.120000 13.392010 -8.355999 -10.120000
+ 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.922000 14.359010 1.721001 -11.922000
+ 14.359010 1.721001 -11.921000 14.359010 1.721001 -11.921000
14.855000 6.744001 -12.818000 14.855000 6.744001 -12.818000
- 15.351000 11.786001 -13.720000 15.351000 11.786001 -13.720000
+ 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.177000 8.437010 -17.503000 -5.177000
- 8.934010 -12.441000 -6.092000 8.934010 -12.441000 -6.092000
- 9.440010 -7.395000 -6.980000 9.440010 -7.395000 -6.980000
- 9.928010 -2.358999 -7.883000 9.928010 -2.358999 -7.883000
- 10.417000 2.678001 -8.791000 10.417000 2.678001 -8.791000
- 10.902000 7.690001 -9.672000 10.902000 7.690001 -9.672000
- 11.384000 12.720001 -10.562000 11.384000 12.720001 -10.562000
+ 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
+ 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.128000 3.984010 -21.600000 -1.128000
- 4.470010 -16.550000 -2.016000 4.470010 -16.550000 -2.016000
+ 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.831000 5.466010 -6.434000 -3.831000
+ 5.466010 -6.434000 -3.830000 5.466010 -6.434000 -3.830000
5.965010 -1.413000 -4.735000 5.965010 -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.323000 7.925000 18.716000 -8.323000
- 0.024010 -20.662000 2.035000 0.024010 -20.662000 2.035000
- 0.506010 -15.606000 1.134000 0.506010 -15.606000 1.134000
- 1.002010 -10.535000 0.228000 1.002010 -10.535000 0.228000
- 1.491010 -5.481000 -0.671000 1.491010 -5.481000 -0.671000
- 1.978000 -0.461000 -1.575000 1.978000 -0.461000 -1.575000
- 2.471000 4.571000 -2.469000 2.471000 4.571000 -2.469000
+ 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
+ 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.254000 3.449000 14.629000 -4.254000
+ 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.565001 3.368000 -2.968990 -9.565001 3.368000
- -2.467000 -4.525001 2.461000 -2.467000 -4.525001 2.461000
- -1.964000 0.492000 1.563000 -1.964000 0.492000 1.563000
+ -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
-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.105000 -0.515000 15.563000 -1.105000
- -0.049000 20.637000 -2.041000 -0.049000 20.637000 -2.041000
- -7.911990 -18.768001 8.358000 -7.911990 -18.768001 8.358000
- -7.427990 -13.703001 7.446000 -7.427990 -13.703001 7.446000
- -6.936990 -8.614001 6.531000 -6.936990 -8.614001 6.531000
- -6.432000 -3.568001 5.626000 -6.432000 -3.568001 5.626000
- -5.944000 1.450999 4.724000 -5.944000 1.450999 4.724000
- -5.457000 6.481999 3.827000 -5.457000 6.481999 3.827000
- -4.967000 11.488999 2.936000 -4.967000 11.488999 2.936000
+ -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
+ -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.588000 -11.392990 -12.773001 10.588000
--10.907000 -7.687001 9.686000 -10.907000 -7.687001 9.686000
+-11.392990 -12.773001 10.589000 -11.392990 -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.866000 -9.901000 2.407999 7.866000
+ -9.901000 2.407999 7.867000 -9.901000 2.407999 7.867000
-9.417000 7.426999 6.978000 -9.417000 7.426999 6.978000
-8.935000 12.445999 6.080000 -8.935000 12.445999 6.080000
- -8.438000 17.501999 5.159000 -8.438000 17.501999 5.159000
- -7.962000 22.533999 4.230000 -7.962000 22.533999 4.230000
+ -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.353000 -11.833002 13.739000 -15.353000 -11.833002 13.739000
--14.868000 -6.736002 12.820000 -14.868000 -6.736002 12.820000
--14.369000 -1.665002 11.915000 -14.369000 -1.665002 11.915000
+-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
-11.899000 23.503999 7.375000 -11.899000 23.503999 7.375000
--19.301000 -10.876002 16.865000 -19.301000 -10.876002 16.865000
--18.821000 -5.811002 15.955000 -18.821000 -5.811002 15.955000
+-19.300000 -10.876002 16.866000 -19.300000 -10.876002 16.866000
+-18.820000 -5.811002 15.956000 -18.820000 -5.811002 15.956000
-18.337000 -0.727002 15.059000 -18.337000 -0.727002 15.059000
-17.845000 4.298998 14.166000 -17.845000 4.298998 14.166000
-17.352000 9.289998 13.271000 -17.352000 9.289998 13.271000
--16.844000 14.360998 12.345000 -16.844000 14.360998 12.345000
--16.365000 19.422998 11.404000 -16.365000 19.422998 11.404000
--22.772000 -4.894002 19.095000 -22.772000 -4.894002 19.095000
+-16.843000 14.360998 12.345000 -16.843000 14.360998 12.345000
+-16.365000 19.422998 11.405000 -16.365000 19.422998 11.405000
+-22.772000 -4.894002 19.096000 -22.772000 -4.894002 19.096000
-22.292000 0.195998 18.197000 -22.292000 0.195998 18.197000
-21.792000 5.231998 17.306000 -21.792000 5.231998 17.306000
--21.304000 10.241998 16.408000 -21.304000 10.241998 16.408000
--20.819000 15.293998 15.499000 -20.819000 15.293998 15.499000
+-21.304000 10.241998 16.409000 -21.304000 10.241998 16.409000
+-20.819000 15.293998 15.500000 -20.819000 15.293998 15.500000
]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS409-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS409-AntennaField.conf
new file mode 100644
index 0000000000000000000000000000000000000000..b1af4d8519d19fef86201f8245954653330b0e2b
--- /dev/null
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS409-AntennaField.conf
@@ -0,0 +1,179 @@
+#
+# AntennaPositions for RS409
+# ITRF2005 target_date = 2012.5
+# Created: 2012-11-26 21:32:24
+#
+
+NORMAL_VECTOR LBA
+3 [ 0.598753 0.072099 0.797682 ]
+
+ROTATION_MATRIX LBA
+3 x 3 [
+ -0.1195950000 -0.7919540000 0.5987530000
+ 0.9928230000 -0.0954190000 0.0720990000
+ 0.0000330000 0.6030780000 0.7976820000
+]
+
+LBA
+3 [ 3824755.852950000 426178.846504000 5069289.868 ]
+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
+ -0.800000 -2.363000 0.814000 -0.800000 -2.363000 0.814000
+ -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.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
+ -4.224000 -2.119000 3.362000 -4.224000 -2.119000 3.362000
+ -4.479000 1.836000 3.196000 -4.479000 1.836000 3.196000
+ -7.000000 3.712999 4.919000 -7.000000 3.712999 4.919000
+ -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
+ 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
+ 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
+ -5.945000 -4.747001 4.891000 -5.945000 -4.747001 4.891000
+ -7.341000 -0.344001 5.542000 -7.341000 -0.344001 5.542000
+-10.330000 6.953999 7.126000 -10.330000 6.953999 7.126000
+ -8.947000 10.251999 5.789000 -8.947000 10.251999 5.789000
+ -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
+ 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
+ -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
+ 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
+ -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
+-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
+ -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
+ -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
+ 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
+ -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
+]
+
+NORMAL_VECTOR HBA
+3 [ 0.598753 0.072099 0.797682 ]
+
+ROTATION_MATRIX HBA
+3 x 3 [
+ -0.1195950000 -0.7919540000 0.5987530000
+ 0.9928230000 -0.0954190000 0.0720990000
+ 0.0000330000 0.6030780000 0.7976820000
+]
+
+HBA
+3 [ 3824812.620960000 426130.329509000 5069251.754 ]
+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
+-14.178000 5.199999 10.172000 -14.178000 5.199999 10.172000
+-13.789000 10.279999 9.421000 -13.789000 10.279999 9.421000
+-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
+ -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
+ -2.247000 -2.160000 1.882000 -2.247000 -2.160000 1.882000
+ -1.859000 2.920000 1.131000 -1.859000 2.920000 1.131000
+ -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
+ 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
+]
diff --git a/MAC/Deployment/data/StaticMetaData/StationInfo.dat b/MAC/Deployment/data/StaticMetaData/StationInfo.dat
index 71c301f53c9e39b6093c423b4935404fcea46660..4f842649958033700a5942e45ab4ef8aed8d3276 100644
--- a/MAC/Deployment/data/StaticMetaData/StationInfo.dat
+++ b/MAC/Deployment/data/StaticMetaData/StationInfo.dat
@@ -134,7 +134,7 @@ RS405 165 R 0.0 0.0 0 12 6 96 48 N
RS406 166 R 6.7505064 53.0183578 65.62 12 6 96 48 No Yes
RS407 167 R 6.7848725 53.0923619 49.64 12 6 96 48 No Yes
RS408 168 R 0.0 0.0 0 12 6 96 48 No Yes
-RS409 169 R 6.32235 53.01043 0 12 6 96 48 No Yes
+RS409 169 R 6.3574842 52.9804722 59.65 12 6 96 48 No Yes
RS410 170 R 5.83021 52.99421 0 12 6 96 48 No Yes
RS411 171 R 6.692146 53.040486 0 12 6 96 48 No Yes
RS412 172 R 0.0 0.0 0 12 6 96 48 No Yes
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE601-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE601-iHBADeltas.conf
index 2e78ea39982fabd9a7d9769ab248fabe5ad861c0..adc93d8f04823a2db70d3562a8b8d24fcc8ed29b 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE601-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/DE601-iHBADeltas.conf
@@ -1,23 +1,23 @@
#
# HBADeltas for DE601
-# Created: 2012-11-08 20:42:18
+# Created: 2012-11-22 13:33:45
#
HBADeltas
16 x 3 [
- 1.622 1.490 -1.477
- 1.503 0.265 -1.256
- 1.383 -0.960 -1.036
- 1.263 -2.184 -0.816
- 0.661 1.721 -0.712
- 0.541 0.497 -0.492
- 0.421 -0.728 -0.272
- 0.301 -1.953 -0.052
- -0.301 1.953 0.052
- -0.421 0.728 0.272
- -0.541 -0.497 0.492
- -0.661 -1.721 0.712
-1.263 2.184 0.816
+ -0.301 1.953 0.052
+ 0.661 1.721 -0.712
+ 1.622 1.490 -1.477
-1.383 0.960 1.036
+ -0.421 0.728 0.272
+ 0.541 0.497 -0.492
+ 1.503 0.265 -1.256
-1.503 -0.265 1.256
+ -0.541 -0.497 0.492
+ 0.421 -0.728 -0.272
+ 1.383 -0.960 -1.036
-1.622 -1.490 1.477
+ -0.661 -1.721 0.712
+ 0.301 -1.953 -0.052
+ 1.263 -2.184 -0.816
]
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS409-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS409-iHBADeltas.conf
new file mode 100644
index 0000000000000000000000000000000000000000..10bc25b731bdb69efcf6788e7815d31e6b39c414
--- /dev/null
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS409-iHBADeltas.conf
@@ -0,0 +1,23 @@
+#
+# HBADeltas for RS409
+# Created: 2012-11-26 21:32:24
+#
+HBADeltas
+16 x 3 [
+ -1.637 -1.573 1.371
+ -1.542 -0.340 1.188
+ -1.448 0.893 1.006
+ -1.353 2.126 0.824
+ -0.640 -1.757 0.639
+ -0.546 -0.524 0.457
+ -0.451 0.709 0.275
+ -0.357 1.942 0.092
+ 0.357 -1.942 -0.092
+ 0.451 -0.709 -0.275
+ 0.546 0.524 -0.457
+ 0.640 1.757 -0.639
+ 1.353 -2.126 -0.824
+ 1.448 -0.893 -1.006
+ 1.542 0.340 -1.188
+ 1.637 1.573 -1.371
+]
diff --git a/RTCP/IONProc/src/Job.cc b/RTCP/IONProc/src/Job.cc
index 57e64552bd7a4567fe9a5f5162872bd71c236c49..8d111bc2cbc03192f1ccc3a9bc99eb605694d55a 100644
--- a/RTCP/IONProc/src/Job.cc
+++ b/RTCP/IONProc/src/Job.cc
@@ -594,6 +594,8 @@ void Job::jobThread()
barrier();
// PLC: RELEASE phase
+ itsIsRunning = false;
+ jobQueue.itsReevaluate.broadcast();
if (myPsetNumber == 0) {
forwardFinalMetaData();
diff --git a/RTCP/IONProc/src/SSH.cc b/RTCP/IONProc/src/SSH.cc
index a73c165bbd91707aca071ad876d8590c8e14819c..f1c7a21e34a38798f5f09f29ae61722bb78111ce 100644
--- a/RTCP/IONProc/src/SSH.cc
+++ b/RTCP/IONProc/src/SSH.cc
@@ -60,6 +60,36 @@ namespace RTCP {
Mutex coutMutex;
#endif
+void free_session( LIBSSH2_SESSION *session )
+{
+ ScopedDelayCancellation dc;
+
+ if (!session)
+ return;
+
+ libssh2_session_free(session);
+}
+
+void free_channel( LIBSSH2_CHANNEL *channel )
+{
+ ScopedDelayCancellation dc;
+
+ if (!channel)
+ return;
+
+ libssh2_channel_free(channel);
+}
+
+typedef SmartPtr<LIBSSH2_SESSION, SmartPtrFreeFunc<LIBSSH2_SESSION, free_session> > session_t;
+typedef SmartPtr<LIBSSH2_CHANNEL, SmartPtrFreeFunc<LIBSSH2_CHANNEL, free_channel> > channel_t;
+
+/*
+ * Make sure we ScopedDelayCancellation around calls to libssh2 because
+ * it is an external library.
+ *
+ * Note that waitsocket() is a forced cancellation point.
+ */
+
SSHconnection::SSHconnection(const string &logPrefix, const string &hostname, const string &commandline, const string &username, const string &sshkey, bool captureStdout)
:
itsLogPrefix(logPrefix),
@@ -126,30 +156,15 @@ std::string SSHconnection::stdoutBuffer() const
return itsStdoutBuffer.str();
}
-void SSHconnection::free_session( LIBSSH2_SESSION *session )
+LIBSSH2_SESSION *SSHconnection::open_session( FileDescriptorBasedStream &sock )
{
- if (!session)
- return;
+ ScopedDelayCancellation dc;
- libssh2_session_disconnect(session, "Normal Shutdown, Thank you for playing");
- libssh2_session_free(session);
-}
-
-void SSHconnection::free_channel( LIBSSH2_CHANNEL *channel )
-{
- if (!channel)
- return;
-
- libssh2_channel_free(channel);
-}
-
-bool SSHconnection::open_session( FileDescriptorBasedStream &sock )
-{
int rc;
/* Create a session instance */
- session = libssh2_session_init();
- if (!session) {
+ session_t session = libssh2_session_init();
+ if (!session.get()) {
LOG_ERROR_STR( itsLogPrefix << "Cannot create SSH session object" );
return false;
}
@@ -162,12 +177,14 @@ bool SSHconnection::open_session( FileDescriptorBasedStream &sock )
*/
while ((rc = libssh2_session_handshake(session, sock.fd)) ==
LIBSSH2_ERROR_EAGAIN) {
- waitsocket(sock);
+ waitsocket(session, sock);
}
+ /* NOTE: libssh2 now holds a copy of sock.fd, so don't invalidate it! */
+
if (rc) {
- LOG_ERROR_STR( itsLogPrefix << "Failure establishing SSH session: " << rc);
- return false;
+ LOG_ERROR_STR( itsLogPrefix << "Failure establishing SSH session: " << rc << " (" << explainLibSSH2Error(rc) << ")");
+ return NULL;
}
/* Authenticate by public key */
@@ -178,54 +195,86 @@ bool SSHconnection::open_session( FileDescriptorBasedStream &sock )
NULL // password
)) ==
LIBSSH2_ERROR_EAGAIN) {
- waitsocket(sock);
+ waitsocket(session, sock);
}
if (rc) {
- LOG_ERROR_STR( itsLogPrefix << "Authentication by public key failed: " << rc);
+ LOG_ERROR_STR( itsLogPrefix << "Authentication by public key failed: " << rc << " (" << explainLibSSH2Error(rc) << ")");
// unrecoverable errors
if (rc == LIBSSH2_ERROR_FILE)
THROW(SSHException, "Error reading read key file " << itsSSHKey);
- return false;
+ return NULL;
}
- return true;
+ return session.release();
+}
+
+void SSHconnection::close_session( LIBSSH2_SESSION *session, FileDescriptorBasedStream &sock )
+{
+ ScopedDelayCancellation dc;
+
+ int rc;
+
+ while ((rc = libssh2_session_disconnect(session, "Normal Shutdown, Thank you for playing")) ==
+ LIBSSH2_ERROR_EAGAIN) {
+ waitsocket(session, sock);
+ }
+
+ if (rc)
+ {
+ LOG_ERROR_STR( itsLogPrefix << "Failure closing session: " << rc << " (" << explainLibSSH2Error(rc) << ")");
+ return;
+ }
}
-bool SSHconnection::open_channel( FileDescriptorBasedStream &sock )
+LIBSSH2_CHANNEL *SSHconnection::open_channel( LIBSSH2_SESSION *session, FileDescriptorBasedStream &sock )
{
+ ScopedDelayCancellation dc;
+
+ channel_t channel;
+
/* Exec non-blocking on the remote host */
while( (channel = libssh2_channel_open_session(session)) == NULL &&
libssh2_session_last_error(session,NULL,NULL,0) ==
LIBSSH2_ERROR_EAGAIN )
{
- waitsocket(sock);
+ waitsocket(session, sock);
}
- if (!channel)
+ if (!channel.get())
{
LOG_ERROR_STR( itsLogPrefix << "Could not set up SSH channel" );
- return false;
+ return NULL;
}
- return true;
+ return channel.release();
}
-bool SSHconnection::close_channel( FileDescriptorBasedStream &sock )
+void SSHconnection::close_channel( LIBSSH2_SESSION *session, LIBSSH2_CHANNEL *channel, FileDescriptorBasedStream &sock )
{
+ ScopedDelayCancellation dc;
+
int rc;
while( (rc = libssh2_channel_close(channel)) == LIBSSH2_ERROR_EAGAIN ) {
- waitsocket(sock);
+ waitsocket(session, sock);
}
- return true;
+ if (rc)
+ {
+ LOG_ERROR_STR( itsLogPrefix << "Failure closing channel: " << rc << " (" << explainLibSSH2Error(rc) << ")");
+ return;
+ }
}
-bool SSHconnection::waitsocket( FileDescriptorBasedStream &sock )
+bool SSHconnection::waitsocket( LIBSSH2_SESSION *session, FileDescriptorBasedStream &sock )
{
+ // we manually control the cancellation points, so make sure
+ // cancellation is actually disabled.
+ ScopedDelayCancellation dc;
+
struct timeval timeout;
int rc;
fd_set fd;
@@ -272,7 +321,18 @@ void SSHconnection::commThread()
int rc;
int exitcode;
char *exitsignal = 0;
+
+ // WARNING: Make sure sock stays alive while a session is active, because the session
+ // will retain a copy of sock.fd so we can't invalidate it. We don't want to
+ // (for example) send a libssh2_session_disconnect to a sock.fd that has been
+ // reused by the system!
+
+ // Declaring sock before session will cause ~sock to be called after
+ // ~session.
+
SmartPtr<SocketStream> sock;
+ session_t session;
+ channel_t channel;
for(;;) {
// keep trying to connect
@@ -287,11 +347,21 @@ void SSHconnection::commThread()
Cancellation::point();
- if (!open_session(*sock))
+ // TODO: add a delay if opening session or channel fails
+
+ session = open_session(*sock);
+
+ if (!session.get())
continue;
- if (!open_channel(*sock))
+ channel = open_channel(session, *sock);
+
+ if (!channel.get()) {
+ close_session(session, *sock);
+
+ session = 0;
continue;
+ }
}
break;
@@ -302,12 +372,12 @@ void SSHconnection::commThread()
while( (rc = libssh2_channel_exec(channel, itsCommandLine.c_str())) ==
LIBSSH2_ERROR_EAGAIN )
{
- waitsocket(*sock);
+ waitsocket(session, *sock);
}
if (rc)
{
- LOG_ERROR_STR( itsLogPrefix << "Failure starting remote command: " << rc);
+ LOG_ERROR_STR( itsLogPrefix << "Failure starting remote command: " << rc << " (" << explainLibSSH2Error(rc) << ")");
return;
}
@@ -342,7 +412,7 @@ void SSHconnection::commThread()
/* loop until we block */
do {
- rc = libssh2_channel_read_ex( channel, s, data[s], sizeof data[s] );
+ rc = libssh2_channel_read_ex(channel, s, data[s], sizeof data[s]);
if( rc > 0 )
{
if (s == 0 && itsCaptureStdout) {
@@ -391,7 +461,7 @@ void SSHconnection::commThread()
} else {
if( rc < 0 && rc != LIBSSH2_ERROR_EAGAIN ) {
/* no need to output this for the EAGAIN case */
- LOG_ERROR_STR( itsLogPrefix << "libssh2_channel_read_ex returned " << rc << " for channel " << s);
+ LOG_ERROR_STR( itsLogPrefix << "libssh2_channel_read_ex returned " << rc << " (" << explainLibSSH2Error(rc) << ") for channel " << s);
}
}
} while( rc > 0 );
@@ -406,22 +476,24 @@ void SSHconnection::commThread()
}
if (nrOpenStreams > 0)
- waitsocket(*sock);
+ waitsocket(session, *sock);
}
LOG_DEBUG_STR( itsLogPrefix << "Disconnecting" );
- close_channel(*sock);
+ close_channel(session, channel, *sock);
if (rc == 0)
{
- exitcode = libssh2_channel_get_exit_status( channel );
+ exitcode = libssh2_channel_get_exit_status(channel);
libssh2_channel_get_exit_signal(channel, &exitsignal,
NULL, NULL, NULL, NULL, NULL);
} else {
exitcode = 127;
}
+ close_session(session, *sock);
+
if (exitsignal) {
LOG_ERROR_STR(itsLogPrefix << "SSH was killed by signal " << exitsignal);
} else if(exitcode > 0) {
@@ -430,6 +502,70 @@ void SSHconnection::commThread()
LOG_INFO_STR(itsLogPrefix << "Terminated normally");
}
}
+
+
+const char *explainLibSSH2Error( int error )
+{
+ const char *explanation;
+
+ switch(error) {
+ default:
+ explanation = "??";
+ break;
+
+ case LIBSSH2_ERROR_NONE: explanation ="LIBSSH2_ERROR_NONE"; break;
+ case LIBSSH2_ERROR_SOCKET_NONE: explanation ="LIBSSH2_ERROR_SOCKET_NONE"; break;
+ case LIBSSH2_ERROR_BANNER_RECV: explanation ="LIBSSH2_ERROR_BANNER_RECV"; break;
+ case LIBSSH2_ERROR_BANNER_SEND: explanation ="LIBSSH2_ERROR_BANNER_SEND"; break;
+ case LIBSSH2_ERROR_INVALID_MAC: explanation ="LIBSSH2_ERROR_INVALID_MAC"; break;
+ case LIBSSH2_ERROR_KEX_FAILURE: explanation ="LIBSSH2_ERROR_KEX_FAILURE"; break;
+ case LIBSSH2_ERROR_ALLOC: explanation ="LIBSSH2_ERROR_ALLOC"; break;
+ case LIBSSH2_ERROR_SOCKET_SEND: explanation ="LIBSSH2_ERROR_SOCKET_SEND"; break;
+ case LIBSSH2_ERROR_KEY_EXCHANGE_FAILURE: explanation ="LIBSSH2_ERROR_KEY_EXCHANGE_FAILURE"; break;
+ case LIBSSH2_ERROR_TIMEOUT: explanation ="LIBSSH2_ERROR_TIMEOUT"; break;
+ case LIBSSH2_ERROR_HOSTKEY_INIT: explanation ="LIBSSH2_ERROR_HOSTKEY_INIT"; break;
+ case LIBSSH2_ERROR_HOSTKEY_SIGN: explanation ="LIBSSH2_ERROR_HOSTKEY_SIGN"; break;
+ case LIBSSH2_ERROR_DECRYPT: explanation ="LIBSSH2_ERROR_DECRYPT"; break;
+ case LIBSSH2_ERROR_SOCKET_DISCONNECT: explanation ="LIBSSH2_ERROR_SOCKET_DISCONNECT"; break;
+ case LIBSSH2_ERROR_PROTO: explanation ="LIBSSH2_ERROR_PROTO"; break;
+ case LIBSSH2_ERROR_PASSWORD_EXPIRED: explanation ="LIBSSH2_ERROR_PASSWORD_EXPIRED"; break;
+ case LIBSSH2_ERROR_FILE: explanation ="LIBSSH2_ERROR_FILE"; break;
+ case LIBSSH2_ERROR_METHOD_NONE: explanation ="LIBSSH2_ERROR_METHOD_NONE"; break;
+ case LIBSSH2_ERROR_AUTHENTICATION_FAILED: explanation ="LIBSSH2_ERROR_AUTHENTICATION_FAILED"; break;
+ //case LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED: explanation ="LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED"; break;
+ case LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED: explanation ="LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED"; break;
+ case LIBSSH2_ERROR_CHANNEL_OUTOFORDER: explanation ="LIBSSH2_ERROR_CHANNEL_OUTOFORDER"; break;
+ case LIBSSH2_ERROR_CHANNEL_FAILURE: explanation ="LIBSSH2_ERROR_CHANNEL_FAILURE"; break;
+ case LIBSSH2_ERROR_CHANNEL_REQUEST_DENIED: explanation ="LIBSSH2_ERROR_CHANNEL_REQUEST_DENIED"; break;
+ case LIBSSH2_ERROR_CHANNEL_UNKNOWN: explanation ="LIBSSH2_ERROR_CHANNEL_UNKNOWN"; break;
+ case LIBSSH2_ERROR_CHANNEL_WINDOW_EXCEEDED: explanation ="LIBSSH2_ERROR_CHANNEL_WINDOW_EXCEEDED"; break;
+ case LIBSSH2_ERROR_CHANNEL_PACKET_EXCEEDED: explanation ="LIBSSH2_ERROR_CHANNEL_PACKET_EXCEEDED"; break;
+ case LIBSSH2_ERROR_CHANNEL_CLOSED: explanation ="LIBSSH2_ERROR_CHANNEL_CLOSED"; break;
+ case LIBSSH2_ERROR_CHANNEL_EOF_SENT: explanation ="LIBSSH2_ERROR_CHANNEL_EOF_SENT"; break;
+ case LIBSSH2_ERROR_SCP_PROTOCOL: explanation ="LIBSSH2_ERROR_SCP_PROTOCOL"; break;
+ case LIBSSH2_ERROR_ZLIB: explanation ="LIBSSH2_ERROR_ZLIB"; break;
+ case LIBSSH2_ERROR_SOCKET_TIMEOUT: explanation ="LIBSSH2_ERROR_SOCKET_TIMEOUT"; break;
+ case LIBSSH2_ERROR_SFTP_PROTOCOL: explanation ="LIBSSH2_ERROR_SFTP_PROTOCOL"; break;
+ case LIBSSH2_ERROR_REQUEST_DENIED: explanation ="LIBSSH2_ERROR_REQUEST_DENIED"; break;
+ case LIBSSH2_ERROR_METHOD_NOT_SUPPORTED: explanation ="LIBSSH2_ERROR_METHOD_NOT_SUPPORTED"; break;
+ case LIBSSH2_ERROR_INVAL: explanation ="LIBSSH2_ERROR_INVAL"; break;
+ case LIBSSH2_ERROR_INVALID_POLL_TYPE: explanation ="LIBSSH2_ERROR_INVALID_POLL_TYPE"; break;
+ case LIBSSH2_ERROR_PUBLICKEY_PROTOCOL: explanation ="LIBSSH2_ERROR_PUBLICKEY_PROTOCOL"; break;
+ case LIBSSH2_ERROR_EAGAIN: explanation ="LIBSSH2_ERROR_EAGAIN"; break;
+ case LIBSSH2_ERROR_BUFFER_TOO_SMALL: explanation ="LIBSSH2_ERROR_BUFFER_TOO_SMALL"; break;
+ case LIBSSH2_ERROR_BAD_USE: explanation ="LIBSSH2_ERROR_BAD_USE"; break;
+ case LIBSSH2_ERROR_COMPRESS: explanation ="LIBSSH2_ERROR_COMPRESS"; break;
+ case LIBSSH2_ERROR_OUT_OF_BOUNDARY: explanation ="LIBSSH2_ERROR_OUT_OF_BOUNDARY"; break;
+ case LIBSSH2_ERROR_AGENT_PROTOCOL: explanation ="LIBSSH2_ERROR_AGENT_PROTOCOL"; break;
+ case LIBSSH2_ERROR_SOCKET_RECV: explanation ="LIBSSH2_ERROR_SOCKET_RECV"; break;
+ case LIBSSH2_ERROR_ENCRYPT: explanation ="LIBSSH2_ERROR_ENCRYPT"; break;
+ case LIBSSH2_ERROR_BAD_SOCKET: explanation ="LIBSSH2_ERROR_BAD_SOCKET"; break;
+ case LIBSSH2_ERROR_KNOWN_HOSTS: explanation ="LIBSSH2_ERROR_KNOWN_HOSTS"; break;
+ //case LIBSSH2_ERROR_BANNER_NONE: explanation ="LIBSSH2_ERROR_BANNER_NONE"; break;
+ }
+
+ return explanation;
+}
#include <openssl/crypto.h>
diff --git a/RTCP/IONProc/src/SSH.h b/RTCP/IONProc/src/SSH.h
index e9bf02c471de229fd5c669bfa5eca0b3cbf5046a..db69c12429d4098f140fc6fc5c71a19dacb84a05 100644
--- a/RTCP/IONProc/src/SSH.h
+++ b/RTCP/IONProc/src/SSH.h
@@ -50,7 +50,7 @@ class SSHconnection {
public:
EXCEPTION_CLASS(SSHException, LOFAR::Exception);
- SSHconnection(const string &logPrefix, const string &hostname, const string &commandline, const string &username, const string &sshkey, bool captureStdout = false);
+ SSHconnection(const std::string &logPrefix, const std::string &hostname, const std::string &commandline, const std::string &username, const std::string &sshkey, bool captureStdout = false);
~SSHconnection();
@@ -61,7 +61,7 @@ public:
bool isDone();
- string stdoutBuffer() const;
+ std::string stdoutBuffer() const;
private:
const string itsLogPrefix;
@@ -72,23 +72,20 @@ private:
SmartPtr<Thread> itsThread;
const bool itsCaptureStdout;
- stringstream itsStdoutBuffer;
+ std::stringstream itsStdoutBuffer;
- static void free_session( LIBSSH2_SESSION *session );
- static void free_channel( LIBSSH2_CHANNEL *channel );
+ bool waitsocket( LIBSSH2_SESSION *session, FileDescriptorBasedStream &sock );
- SmartPtr<LIBSSH2_SESSION, SmartPtrFreeFunc<LIBSSH2_SESSION, free_session> > session;
- SmartPtr<LIBSSH2_CHANNEL, SmartPtrFreeFunc<LIBSSH2_CHANNEL, free_channel> > channel;
-
- bool waitsocket( FileDescriptorBasedStream &sock );
-
- bool open_session( FileDescriptorBasedStream &sock );
- bool open_channel( FileDescriptorBasedStream &sock );
- bool close_channel( FileDescriptorBasedStream &sock );
+ LIBSSH2_SESSION *open_session( FileDescriptorBasedStream &sock );
+ void close_session( LIBSSH2_SESSION *session, FileDescriptorBasedStream &sock );
+ LIBSSH2_CHANNEL *open_channel( LIBSSH2_SESSION *session, FileDescriptorBasedStream &sock );
+ void close_channel( LIBSSH2_SESSION *session, LIBSSH2_CHANNEL *channel, FileDescriptorBasedStream &sock );
void commThread();
};
+const char *explainLibSSH2Error( int error );
+
#endif
pid_t forkSSH(const std::string &logPrefix, const char *hostName, const char * const extraParams[], const char *userName, const char *sshKey);
diff --git a/RTCP/Run/src/OLAP.parset b/RTCP/Run/src/OLAP.parset
index 996e102fc7890bad24118b6923e61ecf1cec92db..e61e31865cefe93a69f54f92e1d50cdc43e91dfd 100644
--- a/RTCP/Run/src/OLAP.parset
+++ b/RTCP/Run/src/OLAP.parset
@@ -7,122 +7,122 @@ OLAP.correctClocks = T
# Fibre length corrections for core stations using
# a single clock.
#
-PIC.Core.CS002LBA.clockCorrectionTime = 8.318569e-06
+PIC.Core.CS001LBA.clockCorrectionTime = 4.755947e-06
+PIC.Core.CS001HBA0.clockCorrectionTime = 4.759754e-06
+PIC.Core.CS001HBA1.clockCorrectionTime = 4.759754e-06
+PIC.Core.CS001HBA.clockCorrectionTime = 4.759754e-06
+
+PIC.Core.CS002LBA.clockCorrectionTime = 8.32233e-06
PIC.Core.CS002HBA0.clockCorrectionTime = 8.318834e-06
PIC.Core.CS002HBA1.clockCorrectionTime = 8.318304e-06
PIC.Core.CS002HBA.clockCorrectionTime = 8.318569e-06
-PIC.Core.CS003LBA.clockCorrectionTime = 6.917899e-06
+PIC.Core.CS003LBA.clockCorrectionTime = 6.921444e-06
PIC.Core.CS003HBA0.clockCorrectionTime = 6.917926e-06
PIC.Core.CS003HBA1.clockCorrectionTime = 6.917872e-06
PIC.Core.CS003HBA.clockCorrectionTime = 6.917899e-06
-PIC.Core.CS004LBA.clockCorrectionTime = 7.889733e-06
+PIC.Core.CS004LBA.clockCorrectionTime = 7.884847e-06
PIC.Core.CS004HBA0.clockCorrectionTime = 7.889961e-06
PIC.Core.CS004HBA1.clockCorrectionTime = 7.889505e-06
PIC.Core.CS004HBA.clockCorrectionTime = 7.889733e-06
-PIC.Core.CS005LBA.clockCorrectionTime = 8.541942e-06
+PIC.Core.CS005LBA.clockCorrectionTime = 8.537828e-06
PIC.Core.CS005HBA0.clockCorrectionTime = 8.542093e-06
PIC.Core.CS005HBA1.clockCorrectionTime = 8.541791e-06
PIC.Core.CS005HBA.clockCorrectionTime = 8.541942e-06
-PIC.Core.CS006LBA.clockCorrectionTime = 7.882660e-06
-PIC.Core.CS006HBA0.clockCorrectionTime = 7.882360e-06
-PIC.Core.CS006HBA1.clockCorrectionTime = 7.882960e-06
-PIC.Core.CS006HBA.clockCorrectionTime = 7.882660e-06
+PIC.Core.CS006LBA.clockCorrectionTime = 7.880705e-06
+PIC.Core.CS006HBA0.clockCorrectionTime = 7.882892e-06
+PIC.Core.CS006HBA1.clockCorrectionTime = 7.883396e-06
+PIC.Core.CS006HBA.clockCorrectionTime = 7.883150e-06
-PIC.Core.CS007LBA.clockCorrectionTime = 7.913140e-06
+PIC.Core.CS007LBA.clockCorrectionTime = 7.916458e-06
PIC.Core.CS007HBA0.clockCorrectionTime = 7.913020e-06
PIC.Core.CS007HBA1.clockCorrectionTime = 7.913260e-06
PIC.Core.CS007HBA.clockCorrectionTime = 7.913140e-06
-PIC.Core.CS001LBA.clockCorrectionTime = 4.759754e-06
-PIC.Core.CS001HBA0.clockCorrectionTime = 4.759754e-06
-PIC.Core.CS001HBA1.clockCorrectionTime = 4.759754e-06
-PIC.Core.CS001HBA.clockCorrectionTime = 4.759754e-06
-
-PIC.Core.CS011LBA.clockCorrectionTime = 7.55795e-06
-PIC.Core.CS011HBA0.clockCorrectionTime = 7.55795e-06
-PIC.Core.CS011HBA1.clockCorrectionTime = 7.55795e-06
-PIC.Core.CS011HBA.clockCorrectionTime = 7.55795e-06
+PIC.Core.CS011LBA.clockCorrectionTime = 7.55500e-06
+PIC.Core.CS011HBA0.clockCorrectionTime = 7.55852e-06
+PIC.Core.CS011HBA1.clockCorrectionTime = 7.55852e-06
+PIC.Core.CS011HBA.clockCorrectionTime = 7.55852e-06
PIC.Core.CS013LBA.clockCorrectionTime = 1.639118e-05
PIC.Core.CS013HBA0.clockCorrectionTime = 1.639118e-05
PIC.Core.CS013HBA1.clockCorrectionTime = 1.639118e-05
PIC.Core.CS013HBA.clockCorrectionTime = 1.639118e-05
-PIC.Core.CS017LBA.clockCorrectionTime = 1.541095e-05
+PIC.Core.CS017LBA.clockCorrectionTime = 1.540812e-05
PIC.Core.CS017HBA0.clockCorrectionTime = 1.541095e-05
PIC.Core.CS017HBA1.clockCorrectionTime = 1.541095e-05
PIC.Core.CS017HBA.clockCorrectionTime = 1.541095e-05
-PIC.Core.CS021LBA.clockCorrectionTime = 6.04963e-06
+PIC.Core.CS021LBA.clockCorrectionTime = 6.044335e-06
PIC.Core.CS021HBA0.clockCorrectionTime = 6.04963e-06
PIC.Core.CS021HBA1.clockCorrectionTime = 6.04963e-06
PIC.Core.CS021HBA.clockCorrectionTime = 6.04963e-06
-PIC.Core.CS024LBA.clockCorrectionTime = 4.65818e-06
-PIC.Core.CS024HBA0.clockCorrectionTime = 4.65818e-06
-PIC.Core.CS024HBA1.clockCorrectionTime = 4.65818e-06
-PIC.Core.CS024HBA.clockCorrectionTime = 4.65818e-06
+PIC.Core.CS024LBA.clockCorrectionTime = 4.66335e-06
+PIC.Core.CS024HBA0.clockCorrectionTime = 4.65857e-06
+PIC.Core.CS024HBA1.clockCorrectionTime = 4.65857e-06
+PIC.Core.CS024HBA.clockCorrectionTime = 4.65857e-06
-PIC.Core.CS026LBA.clockCorrectionTime = 1.619948e-05
+PIC.Core.CS026LBA.clockCorrectionTime = 1.620482e-05
PIC.Core.CS026HBA0.clockCorrectionTime = 1.619948e-05
PIC.Core.CS026HBA1.clockCorrectionTime = 1.619948e-05
PIC.Core.CS026HBA.clockCorrectionTime = 1.619948e-05
-PIC.Core.CS028LBA.clockCorrectionTime = 1.6962571e-05
+PIC.Core.CS028LBA.clockCorrectionTime = 1.6967048e-05
PIC.Core.CS028HBA0.clockCorrectionTime = 1.6962571e-05
PIC.Core.CS028HBA1.clockCorrectionTime = 1.6962571e-05
PIC.Core.CS028HBA.clockCorrectionTime = 1.6962571e-05
-PIC.Core.CS030LBA.clockCorrectionTime = 9.7160576e-06
+PIC.Core.CS030LBA.clockCorrectionTime = 9.7110576e-06
PIC.Core.CS030HBA0.clockCorrectionTime = 9.7160576e-06
PIC.Core.CS030HBA1.clockCorrectionTime = 9.7160576e-06
PIC.Core.CS030HBA.clockCorrectionTime = 9.7160576e-06
-PIC.Core.CS031LBA.clockCorrectionTime = 6.370090e-06
+PIC.Core.CS031LBA.clockCorrectionTime = 6.375533e-06
PIC.Core.CS031HBA0.clockCorrectionTime = 6.370090e-06
PIC.Core.CS031HBA1.clockCorrectionTime = 6.370090e-06
PIC.Core.CS031HBA.clockCorrectionTime = 6.370090e-06
-PIC.Core.CS032LBA.clockCorrectionTime = 8.546255e-06
+PIC.Core.CS032LBA.clockCorrectionTime = 8.541675e-06
PIC.Core.CS032HBA0.clockCorrectionTime = 8.546255e-06
PIC.Core.CS032HBA1.clockCorrectionTime = 8.546255e-06
PIC.Core.CS032HBA.clockCorrectionTime = 8.546255e-06
-PIC.Core.CS101LBA.clockCorrectionTime = 1.5157971e-05
+PIC.Core.CS101LBA.clockCorrectionTime = 1.5155471e-05
PIC.Core.CS101HBA0.clockCorrectionTime = 1.5157971e-05
PIC.Core.CS101HBA1.clockCorrectionTime = 1.5157971e-05
PIC.Core.CS101HBA.clockCorrectionTime = 1.5157971e-05
-PIC.Core.CS103LBA.clockCorrectionTime = 3.5500922e-05
+PIC.Core.CS103LBA.clockCorrectionTime = 3.5503206e-05
PIC.Core.CS103HBA0.clockCorrectionTime = 3.5500922e-05
PIC.Core.CS103HBA1.clockCorrectionTime = 3.5500922e-05
PIC.Core.CS103HBA.clockCorrectionTime = 3.5500922e-05
-PIC.Core.CS201LBA.clockCorrectionTime = 1.744924e-05
+PIC.Core.CS201LBA.clockCorrectionTime = 1.745439e-05
PIC.Core.CS201HBA0.clockCorrectionTime = 1.744924e-05
PIC.Core.CS201HBA1.clockCorrectionTime = 1.744924e-05
PIC.Core.CS201HBA.clockCorrectionTime = 1.744924e-05
-PIC.Core.CS301LBA.clockCorrectionTime = 7.690431e-06
+PIC.Core.CS301LBA.clockCorrectionTime = 7.685249e-06
PIC.Core.CS301HBA0.clockCorrectionTime = 7.690431e-06
PIC.Core.CS301HBA1.clockCorrectionTime = 7.690431e-06
PIC.Core.CS301HBA.clockCorrectionTime = 7.690431e-06
-PIC.Core.CS302LBA.clockCorrectionTime = 1.5062785e-05
-PIC.Core.CS302HBA0.clockCorrectionTime = 1.5062785e-05
-PIC.Core.CS302HBA1.clockCorrectionTime = 1.5062785e-05
-PIC.Core.CS302HBA.clockCorrectionTime = 1.5062785e-05
+PIC.Core.CS302LBA.clockCorrectionTime = 1.2317004e-05
+PIC.Core.CS302HBA0.clockCorrectionTime = 1.2321604e-05
+PIC.Core.CS302HBA1.clockCorrectionTime = 1.2321604e-05
+PIC.Core.CS302HBA.clockCorrectionTime = 1.2321604e-05
-PIC.Core.CS401LBA.clockCorrectionTime = 8.051870e-06
+PIC.Core.CS401LBA.clockCorrectionTime = 8.052200e-06
PIC.Core.CS401HBA0.clockCorrectionTime = 8.057504e-06
PIC.Core.CS401HBA1.clockCorrectionTime = 8.057770e-06
PIC.Core.CS401HBA.clockCorrectionTime = 8.057637e-06
-PIC.Core.CS501LBA.clockCorrectionTime = 1.65842e-05
+PIC.Core.CS501LBA.clockCorrectionTime = 1.65797e-05
PIC.Core.CS501HBA0.clockCorrectionTime = 1.65842e-05
PIC.Core.CS501HBA1.clockCorrectionTime = 1.65842e-05
PIC.Core.CS501HBA.clockCorrectionTime = 1.65842e-05
@@ -351,6 +351,12 @@ PIC.Core.RS307HBA.phaseCenter = [3837964.520, 449627.261, 5057357.585]
PIC.Core.RS406LBA.phaseCenter = [3818467.634, 451974.601, 5071790.597]
PIC.Core.RS406HBA.phaseCenter = [3818424.939, 452020.269, 5071817.644]
+PIC.Core.RS407LBA.phaseCenter = [3811595.861, 453444.681, 5076770.429]
+PIC.Core.RS407HBA.phaseCenter = [3811649.455, 453459.894, 5076728.952]
+
+PIC.Core.RS409LBA.phaseCenter = [3824755.853, 426178.847, 5069289.868]
+PIC.Core.RS409HBA.phaseCenter = [3824812.621, 426130.330, 5069251.754]
+
PIC.Core.RS503LBA.phaseCenter = [3824090.452, 459438.282, 5066898.190]
PIC.Core.RS503HBA.phaseCenter = [3824138.566, 459476.972, 5066858.578]
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 6ac2428fa51b69552271284520bbd6091b724255..acabf1aa000153d94f8ddfd3f3684c09e721f962 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
@@ -132,7 +132,7 @@ public class Main {
if (f.exists()) {
PropertyConfigurator.configure(logConfig);
} else {
- logConfig = File.separator+"opt"+File.separator+"sas"+File.separator+logConfig;
+ logConfig = File.separator+"opt"+File.separator+"sas"+File.separator+"otb"+File.separator+"etc"+File.separator+logConfig;
f = new File(logConfig);
if (f.exists()) {
PropertyConfigurator.configure(logConfig);
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/objects/Beam.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/objects/Beam.java
index 34e73be9933788ba7b8b6cfd3c0c09ca0a11f081..0f94989641516003b1d7084fb7a271063cf22f3e 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/objects/Beam.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/objects/Beam.java
@@ -5,8 +5,6 @@
package nl.astron.lofar.sas.otb.objects;
import java.util.ArrayList;
-import java.util.BitSet;
-import nl.astron.lofar.lofarutils.LofarUtils;
import nl.astron.lofar.sas.otb.util.IBeam;
/**
@@ -37,14 +35,6 @@ public class Beam implements IBeam {
this.itsAngle2 = anAngle2;
}
- public String getBeamletList() {
- return itsBeamletList;
- }
-
- public void setBeamletList(String aBeamletList) {
- this.itsBeamletList = aBeamletList;
- }
-
public String getDirectionType() {
return itsDirectionType;
}
@@ -144,9 +134,6 @@ public class Beam implements IBeam {
this.itsDirectionTypeChoices = directionTypeChoices;
}
- public BitSet getBeamletBitSet() {
- return LofarUtils.beamletToBitSet(LofarUtils.expandedArrayString(itsBeamletList));
- }
public String getTreeType() {
return itsTreeType;
@@ -170,7 +157,6 @@ public class Beam implements IBeam {
clone.itsStartTime = itsStartTime;
clone.itsDuration = itsDuration;
clone.itsSubbandList = itsSubbandList;
- clone.itsBeamletList = itsBeamletList;
clone.itsMomID = itsMomID;
clone.itsNrTiedArrayBeams = itsNrTiedArrayBeams; //
clone.itsNrTabRings = itsNrTabRings;
@@ -196,7 +182,6 @@ public class Beam implements IBeam {
private String itsStartTime;
private String itsDuration;
private String itsSubbandList;
- private String itsBeamletList;
private String itsMomID;
private String itsNrTiedArrayBeams="1"; //
private String itsNrTabRings;
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.form
index d46ba8550624ef751927142c2842bbcc6f0e61c7..e56c37918ecd9b3ad4c7a530103c3d29e83019fa 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.form
@@ -10,7 +10,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-37,0,0,2,84"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-37,0,0,3,116"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
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 d105bc665b4c8f20f873b898ffa99d33a003833a..9cacee43595bf88042c8e0a7e4f15c52687ee612 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
@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
-
package nl.astron.lofar.sas.otb.panels;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -62,8 +62,8 @@ import org.apache.log4j.Logger;
* @version $Id$
* @updated deleteComponentNode added to component panel
*/
-public class MainPanel extends javax.swing.JPanel
- implements IPluginPanel {
+public class MainPanel extends javax.swing.JPanel
+ implements IPluginPanel {
static Logger logger = Logger.getLogger(MainPanel.class);
static String name = "Home";
@@ -73,8 +73,7 @@ public class MainPanel extends javax.swing.JPanel
initComponents();
initializeButtons();
}
-
-
+
/**
* Initializes the buttonpanel. Every tab has different buttons
*/
@@ -83,111 +82,114 @@ public class MainPanel extends javax.swing.JPanel
switch (itsTabFocus) {
case "PIC":
buttonPanel1.addButton("State History");
- buttonPanel1.setButtonIcon("State History",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_info.gif")));
+ buttonPanel1.setButtonIcon("State History", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_info.gif")));
buttonPanel1.addButton("Query Panel");
- buttonPanel1.setButtonIcon("Query Panel",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_help.png")));
+ buttonPanel1.setButtonIcon("Query Panel", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_help.png")));
buttonPanel1.addButton("New");
- buttonPanel1.setButtonIcon("New",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_new.png")));
+ buttonPanel1.setButtonIcon("New", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_new.png")));
buttonPanel1.addButton("Delete");
- buttonPanel1.setButtonIcon("Delete",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_delete.png")));
+ buttonPanel1.setButtonIcon("Delete", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_delete.png")));
buttonPanel1.addButton("Refresh");
- buttonPanel1.setButtonIcon("Refresh",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
+ buttonPanel1.setButtonIcon("Refresh", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
buttonPanel1.addButton("View");
- buttonPanel1.setButtonIcon("View",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
+ buttonPanel1.setButtonIcon("View", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
buttonPanel1.addButton("Info");
- buttonPanel1.setButtonIcon("Info",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_fileopen.gif")));
- buttonPanel1.setButtonEnabled("Delete",false);
- buttonPanel1.setButtonEnabled("View",false);
- buttonPanel1.setButtonEnabled("Info",false);
- buttonPanel1.setButtonEnabled("State History",false);
+ buttonPanel1.setButtonIcon("Info", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_fileopen.gif")));
+ buttonPanel1.setButtonEnabled("Delete", false);
+ buttonPanel1.setButtonEnabled("View", false);
+ buttonPanel1.setButtonEnabled("Info", false);
+ buttonPanel1.setButtonEnabled("State History", false);
break;
case "VIC":
buttonPanel1.addButton("State History");
- buttonPanel1.setButtonIcon("State History",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_info.gif")));
+ buttonPanel1.setButtonIcon("State History", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_info.gif")));
buttonPanel1.addButton("Query Panel");
- buttonPanel1.setButtonIcon("Query Panel",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_help.png")));
+ buttonPanel1.setButtonIcon("Query Panel", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_help.png")));
buttonPanel1.addButton("Delete");
- buttonPanel1.setButtonIcon("Delete",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_delete.png")));
+ buttonPanel1.setButtonIcon("Delete", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_delete.png")));
buttonPanel1.addButton("Refresh");
- buttonPanel1.setButtonIcon("Refresh",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
+ buttonPanel1.setButtonIcon("Refresh", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
buttonPanel1.addButton("View");
- buttonPanel1.setButtonIcon("View",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
+ buttonPanel1.setButtonIcon("View", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
buttonPanel1.addButton("Schedule");
- buttonPanel1.setButtonIcon("Schedule",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_fileopen.gif")));
- buttonPanel1.setButtonEnabled("State History",false);
- buttonPanel1.setButtonEnabled("Delete",false);
- buttonPanel1.setButtonEnabled("View",false);
- buttonPanel1.setButtonEnabled("Schedule",false);
+ buttonPanel1.setButtonIcon("Schedule", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_fileopen.gif")));
+ buttonPanel1.setButtonEnabled("State History", false);
+ buttonPanel1.setButtonEnabled("Delete", false);
+ buttonPanel1.setButtonEnabled("View", false);
+ buttonPanel1.setButtonEnabled("Schedule", false);
break;
case "Templates":
buttonPanel1.addButton("State History");
- buttonPanel1.setButtonIcon("State History",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_info.gif")));
+ buttonPanel1.setButtonIcon("State History", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_info.gif")));
buttonPanel1.addButton("Query Panel");
- buttonPanel1.setButtonIcon("Query Panel",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_help.png")));
+ buttonPanel1.setButtonIcon("Query Panel", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_help.png")));
buttonPanel1.addButton("Duplicate");
- buttonPanel1.setButtonIcon("Duplicate",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_copy.png")));
+ buttonPanel1.setButtonIcon("Duplicate", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_copy.png")));
buttonPanel1.addButton("Modify");
- buttonPanel1.setButtonIcon("Modify",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
+ buttonPanel1.setButtonIcon("Modify", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
buttonPanel1.addButton("Delete");
- buttonPanel1.setButtonIcon("Delete",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_delete.png")));
+ buttonPanel1.setButtonIcon("Delete", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_delete.png")));
buttonPanel1.addButton("Refresh");
- buttonPanel1.setButtonIcon("Refresh",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
+ buttonPanel1.setButtonIcon("Refresh", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
buttonPanel1.addButton("Build VIC tree");
- buttonPanel1.setButtonIcon("Build VIC tree",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_new.png")));
+ buttonPanel1.setButtonIcon("Build VIC tree", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_new.png")));
buttonPanel1.addButton("Change Status");
- buttonPanel1.setButtonIcon("Change Status",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_fileopen.gif")));
+ buttonPanel1.setButtonIcon("Change Status", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_fileopen.gif")));
buttonPanel1.addButton("MultiEdit");
- buttonPanel1.setButtonIcon("MultiEdit",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif" )));
+ buttonPanel1.setButtonIcon("MultiEdit", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
buttonPanel1.addButton("Set to Default");
- buttonPanel1.setButtonIcon("Set to Default",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_redo.png")));
- buttonPanel1.setButtonEnabled("Duplicate",false);
- buttonPanel1.setButtonEnabled("Modify",false);
- buttonPanel1.setButtonEnabled("Delete",false);
- buttonPanel1.setButtonEnabled("Build VIC tree",false);
- buttonPanel1.setButtonEnabled("Change Status",false);
- buttonPanel1.setButtonEnabled("MultiEdit",false);
- buttonPanel1.setButtonEnabled("Set to Default",false);
- buttonPanel1.setButtonEnabled("State History",false);
+ buttonPanel1.setButtonIcon("Set to Default", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_redo.png")));
+ buttonPanel1.setButtonEnabled("Duplicate", false);
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("Delete", false);
+ buttonPanel1.setButtonEnabled("Build VIC tree", false);
+ buttonPanel1.setButtonEnabled("Change Status", false);
+ buttonPanel1.setButtonEnabled("MultiEdit", false);
+ buttonPanel1.setButtonEnabled("Set to Default", false);
+ buttonPanel1.setButtonEnabled("State History", false);
break;
case "Default Templates":
buttonPanel1.addButton("State History");
- buttonPanel1.setButtonIcon("State History",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_info.gif")));
+ buttonPanel1.setButtonIcon("State History", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_info.gif")));
buttonPanel1.addButton("Duplicate");
- buttonPanel1.setButtonIcon("Duplicate",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_copy.png")));
+ buttonPanel1.setButtonIcon("Duplicate", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_copy.png")));
buttonPanel1.addButton("Modify");
- buttonPanel1.setButtonIcon("Modify",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
+ buttonPanel1.setButtonIcon("Modify", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
buttonPanel1.addButton("Refresh");
- buttonPanel1.setButtonIcon("Refresh",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
+ buttonPanel1.setButtonIcon("Refresh", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
+ buttonPanel1.addButton("Remove from Default");
+ buttonPanel1.setButtonIcon("Remove from Default", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_delete.png")));
buttonPanel1.addButton("Change Status");
- buttonPanel1.setButtonIcon("Change Status",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_fileopen.gif")));
- buttonPanel1.setButtonEnabled("Modify",false);
- buttonPanel1.setButtonEnabled("Duplicate",false);
- buttonPanel1.setButtonEnabled("Change Status",false);
- buttonPanel1.setButtonEnabled("State History",false);
+ buttonPanel1.setButtonIcon("Change Status", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_fileopen.gif")));
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("Duplicate", false);
+ buttonPanel1.setButtonEnabled("Remove from Default", false);
+ buttonPanel1.setButtonEnabled("Change Status", false);
+ buttonPanel1.setButtonEnabled("State History", false);
break;
case "Components":
buttonPanel1.addButton("Query Panel");
- buttonPanel1.setButtonIcon("Query Panel",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_help.png")));
+ buttonPanel1.setButtonIcon("Query Panel", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_help.png")));
buttonPanel1.addButton("New");
- buttonPanel1.setButtonIcon("New",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_new.png")));
+ buttonPanel1.setButtonIcon("New", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_new.png")));
buttonPanel1.addButton("Modify");
- buttonPanel1.setButtonIcon("Modify",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
+ buttonPanel1.setButtonIcon("Modify", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_edit.gif")));
buttonPanel1.addButton("Delete");
- buttonPanel1.setButtonIcon("Delete",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_delete.png")));
+ buttonPanel1.setButtonIcon("Delete", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_delete.png")));
buttonPanel1.addButton("Refresh");
- buttonPanel1.setButtonIcon("Refresh",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
+ buttonPanel1.setButtonIcon("Refresh", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_refresh_e.gif")));
buttonPanel1.addButton("Build TemplateTree");
- buttonPanel1.setButtonIcon("Build TemplateTree",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_redo.png")));
+ buttonPanel1.setButtonIcon("Build TemplateTree", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_redo.png")));
// buttonPanel1.setButtonEnabled("Delete",false);
- buttonPanel1.setButtonEnabled("Modify",false);
- buttonPanel1.setButtonEnabled("Build TemplateTree",false);
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("Build TemplateTree", false);
break;
case "Query Results":
break;
}
buttonPanel1.addButton("Quit");
- buttonPanel1.setButtonIcon("Quit",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_exit2.png")));
- buttonsInitialized=true;
+ buttonPanel1.setButtonIcon("Quit", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_exit2.png")));
+ buttonsInitialized = true;
}
/**
@@ -199,25 +201,25 @@ public class MainPanel extends javax.swing.JPanel
*/
public boolean initializePlugin(MainFrame mainframe) {
itsMainFrame = mainframe;
-
+
// check access
UserAccount userAccount = itsMainFrame.getUserAccount();
- if(userAccount.isAdministrator()) {
+ if (userAccount.isAdministrator()) {
// enable/disable certain controls
}
- if(userAccount.isAstronomer()) {
+ if (userAccount.isAstronomer()) {
// enable/disable certain controls
}
- if(userAccount.isInstrumentScientist()) {
+ if (userAccount.isInstrumentScientist()) {
// enable/disable certain controls
}
-
+
initializeTabs();
-
+
return true;
-
+
}
-
+
/**
* Initializes the tab-panels. Each tab has a specific table model that
* contains the data for the table in the tab
@@ -226,45 +228,45 @@ public class MainPanel extends javax.swing.JPanel
PICtableModel PICmodel = new PICtableModel(SharedVars.getOTDBrmi());
PICPanel.setTableModel(PICmodel);
PICPanel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- PICPanel.setColumnSize("ID",35);
- PICPanel.setColumnSize("Description",700);
+ PICPanel.setColumnSize("ID", 35);
+ PICPanel.setColumnSize("Description", 700);
PICPanel.setAutoCreateRowSorter(true);
PICPanel.setTableCellAlignment(JLabel.LEFT);
-
+
VICtableModel VICmodel = new VICtableModel(SharedVars.getOTDBrmi());
VICPanel.setTableModel(VICmodel);
VICPanel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
- VICPanel.setColumnSize("ID",40);
+ VICPanel.setColumnSize("ID", 40);
VICPanel.setColumnSize("PType", 60);
VICPanel.setColumnSize("PStype", 60);
VICPanel.setColumnSize("Strat", 60);
- VICPanel.setColumnSize("StartTime",150);
- VICPanel.setColumnSize("StopTime",150);
- VICPanel.setColumnSize("Description",300);
+ VICPanel.setColumnSize("StartTime", 150);
+ VICPanel.setColumnSize("StopTime", 150);
+ VICPanel.setColumnSize("Description", 300);
VICPanel.setAutoCreateRowSorter(true);
VICPanel.setTableCellAlignment(JLabel.LEFT);
-
+
TemplatetableModel Templatemodel = new TemplatetableModel(SharedVars.getOTDBrmi());
TemplatesPanel.setTableModel(Templatemodel);
TemplatesPanel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
- TemplatesPanel.setColumnSize("ID",40);
+ TemplatesPanel.setColumnSize("ID", 40);
TemplatesPanel.setColumnSize("PType", 60);
TemplatesPanel.setColumnSize("PStype", 60);
TemplatesPanel.setColumnSize("Strat", 60);
- TemplatesPanel.setColumnSize("Description",300);
+ TemplatesPanel.setColumnSize("Description", 300);
TemplatesPanel.setAutoCreateRowSorter(true);
TemplatesPanel.setTableCellAlignment(JLabel.LEFT);
DefaultTemplatetableModel DefaultTemplatemodel = new DefaultTemplatetableModel(SharedVars.getOTDBrmi());
DefaultTemplatesPanel.setTableModel(DefaultTemplatemodel);
- DefaultTemplatesPanel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- DefaultTemplatesPanel.setColumnSize("ID",40);
- DefaultTemplatesPanel.setColumnSize("Name",150);
+ DefaultTemplatesPanel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ DefaultTemplatesPanel.setColumnSize("ID", 40);
+ DefaultTemplatesPanel.setColumnSize("Name", 150);
DefaultTemplatesPanel.setColumnSize("PType", 60);
DefaultTemplatesPanel.setColumnSize("PStype", 60);
DefaultTemplatesPanel.setColumnSize("Strat", 60);
- DefaultTemplatesPanel.setColumnSize("Description",300);
+ DefaultTemplatesPanel.setColumnSize("Description", 300);
DefaultTemplatesPanel.setAutoCreateRowSorter(true);
DefaultTemplatesPanel.setTableCellAlignment(JLabel.LEFT);
@@ -272,14 +274,14 @@ public class MainPanel extends javax.swing.JPanel
ComponentTableModel Componentmodel = new ComponentTableModel(SharedVars.getOTDBrmi());
ComponentsPanel.setTableModel(Componentmodel);
ComponentsPanel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
- ComponentsPanel.setColumnSize("ID",50);
- ComponentsPanel.setColumnSize("Description",685);
+ ComponentsPanel.setColumnSize("ID", 50);
+ ComponentsPanel.setColumnSize("Description", 685);
ComponentsPanel.setAutoCreateRowSorter(true);
ComponentsPanel.setTableCellAlignment(JLabel.LEFT);
-
+
//TODO: do the same for the other tabs
}
-
+
/**
* Returns the human-readable name of this panel
*
@@ -288,16 +290,15 @@ public class MainPanel extends javax.swing.JPanel
public String getFriendlyName() {
return getFriendlyNameStatic();
}
-
+
public boolean hasChanged() {
return changed;
}
-
+
public void setChanged(boolean flag) {
changed = flag;
}
-
public void checkChanged() {
if (inputFieldBuilder.currentInputField != null) {
inputFieldBuilder.currentInputField.checkPopup();
@@ -305,31 +306,31 @@ public class MainPanel extends javax.swing.JPanel
logger.debug("Check Changed status");
if (this.hasChanged()) {
// keep selected tree
- int aSavedID=itsMainFrame.getSharedVars().getTreeID();
+ int aSavedID = itsMainFrame.getSharedVars().getTreeID();
itsMainFrame.setHourglassCursor();
switch (itsTabFocus) {
case "PIC":
- if (!((PICtableModel)PICPanel.getTableModel()).fillTable()) {
+ if (!((PICtableModel) PICPanel.getTableModel()).fillTable()) {
logger.error("error filling PICtable");
}
break;
case "VIC":
- if (!((VICtableModel)VICPanel.getTableModel()).fillTable()) {
+ if (!((VICtableModel) VICPanel.getTableModel()).fillTable()) {
logger.error("error filling VICtable");
}
break;
case "Templates":
- if (!((TemplatetableModel)TemplatesPanel.getTableModel()).fillTable()) {
+ if (!((TemplatetableModel) TemplatesPanel.getTableModel()).fillTable()) {
logger.error("error filling templateTable");
}
break;
case "Default Templates":
- if (!((DefaultTemplatetableModel)DefaultTemplatesPanel.getTableModel()).fillTable()) {
+ if (!((DefaultTemplatetableModel) DefaultTemplatesPanel.getTableModel()).fillTable()) {
logger.error("error filling Default templateTable");
}
break;
case "Components":
- if (!((ComponentTableModel)ComponentsPanel.getTableModel()).fillTable()) {
+ if (!((ComponentTableModel) ComponentsPanel.getTableModel()).fillTable()) {
logger.error("error filling ComponentsTable");
}
break;
@@ -337,14 +338,14 @@ public class MainPanel extends javax.swing.JPanel
if (aSavedID > 0) {
itsMainFrame.getSharedVars().setTreeID(aSavedID);
this.setSelectedID(aSavedID);
- }
+ }
this.setChanged(false);
this.validate();
this.validateButtons();
itsMainFrame.setNormalCursor();
- }
+ }
}
-
+
/**
* Static method that returns the human-readable name of this panel
*
@@ -353,7 +354,7 @@ public class MainPanel extends javax.swing.JPanel
public static String getFriendlyNameStatic() {
return name;
}
-
+
/** This method is called from within the constructor to
* initialize the form.
* WARNING: Do NOT modify this code. The content of this method is
@@ -444,15 +445,14 @@ public class MainPanel extends javax.swing.JPanel
}//GEN-LAST:event_jTabbedPane1PropertyChange
private void QueryResultsPanelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_QueryResultsPanelMouseClicked
- if(evt.getClickCount() == 1) {
+ if (evt.getClickCount() == 1) {
validateButtons();
} else {
-
}
}//GEN-LAST:event_QueryResultsPanelMouseClicked
private void ComponentsPanelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_ComponentsPanelMouseClicked
- if(evt.getClickCount() == 1) {
+ if (evt.getClickCount() == 1) {
validateButtons();
} else {
if (buttonPanel1.isButtonEnabled("Modify") && buttonPanel1.isButtonVisible("Modify")) {
@@ -462,7 +462,7 @@ public class MainPanel extends javax.swing.JPanel
}//GEN-LAST:event_ComponentsPanelMouseClicked
private void TemplatesPanelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_TemplatesPanelMouseClicked
- if(evt.getClickCount() == 1) {
+ if (evt.getClickCount() == 1) {
validateButtons();
} else {
if (buttonPanel1.isButtonEnabled("Modify") && buttonPanel1.isButtonVisible("Modify")) {
@@ -472,7 +472,7 @@ public class MainPanel extends javax.swing.JPanel
}//GEN-LAST:event_TemplatesPanelMouseClicked
private void VICPanelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_VICPanelMouseClicked
- if(evt.getClickCount() == 1) {
+ if (evt.getClickCount() == 1) {
validateButtons();
} else {
if (buttonPanel1.isButtonEnabled("View") && buttonPanel1.isButtonVisible("View")) {
@@ -482,7 +482,7 @@ public class MainPanel extends javax.swing.JPanel
}//GEN-LAST:event_VICPanelMouseClicked
private void PICPanelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_PICPanelMouseClicked
- if(evt.getClickCount() == 1) {
+ if (evt.getClickCount() == 1) {
validateButtons();
} else {
if (buttonPanel1.isButtonEnabled("View") && buttonPanel1.isButtonVisible("View")) {
@@ -493,19 +493,19 @@ public class MainPanel extends javax.swing.JPanel
private void jTabbedPane1StateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_jTabbedPane1StateChanged
if (!itsTabFocus.equals(jTabbedPane1.getTitleAt(jTabbedPane1.getSelectedIndex()))) {
- itsTabFocus=jTabbedPane1.getTitleAt(jTabbedPane1.getSelectedIndex());
+ itsTabFocus = jTabbedPane1.getTitleAt(jTabbedPane1.getSelectedIndex());
// force reload
- logger.debug("Tab changed, force reload: "+ itsTabFocus);
+ logger.debug("Tab changed, force reload: " + itsTabFocus);
this.setChanged(true);
}
- if (buttonsInitialized) {
+ if (buttonsInitialized) {
initializeButtons();
validateButtons();
- // Force a refresh since MoM/scheduler might have added something to the trees
- //set changed flag, we want to refresh the tree
- logger.debug("Refresh table");
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
+ // Force a refresh since MoM/scheduler might have added something to the trees
+ //set changed flag, we want to refresh the tree
+ logger.debug("Refresh table");
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
}
@@ -517,7 +517,7 @@ public class MainPanel extends javax.swing.JPanel
}//GEN-LAST:event_buttonPanel1ActionPerformed
private void DefaultTemplatesPanelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_DefaultTemplatesPanelMouseClicked
- if(evt.getClickCount() == 1) {
+ if (evt.getClickCount() == 1) {
validateButtons();
} else {
if (buttonPanel1.isButtonEnabled("Modify") && buttonPanel1.isButtonVisible("Modify")) {
@@ -525,10 +525,10 @@ public class MainPanel extends javax.swing.JPanel
}
}
}//GEN-LAST:event_DefaultTemplatesPanelMouseClicked
-
+
/** Returns the selected row in the present tree */
private int getSelectedRow() {
- int aRow=-1;
+ int aRow = -1;
switch (itsTabFocus) {
case "PIC":
aRow = PICPanel.getSelectedRow();
@@ -551,7 +551,7 @@ public class MainPanel extends javax.swing.JPanel
/** Returns the selected rows in the present tree */
private int[] getSelectedRows() {
- int [] rows=null;
+ int[] rows = null;
switch (itsTabFocus) {
case "PIC":
rows = PICPanel.getSelectedRows();
@@ -594,51 +594,51 @@ public class MainPanel extends javax.swing.JPanel
}
}
}
-
+
/** Returns the ids of the selected Trees in case of a multiple selection */
- private int [] getSelectedTreeIDs() {
- int [] rows=this.getSelectedRows();
- int [] treeIDs=new int[rows.length];
+ private int[] getSelectedTreeIDs() {
+ int[] rows = this.getSelectedRows();
+ int[] treeIDs = new int[rows.length];
switch (itsTabFocus) {
case "PIC":
- for (int i=0; i < rows.length; i++) {
- treeIDs[i] = ((Integer)PICPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
+ for (int i = 0; i < rows.length; i++) {
+ treeIDs[i] = ((Integer) PICPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
}
break;
case "VIC":
- for (int i=0; i < rows.length; i++) {
- treeIDs[i] = ((Integer)VICPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
+ for (int i = 0; i < rows.length; i++) {
+ treeIDs[i] = ((Integer) VICPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
}
break;
case "Templates":
- for (int i=0; i < rows.length; i++) {
- treeIDs[i] = ((Integer)TemplatesPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
+ for (int i = 0; i < rows.length; i++) {
+ treeIDs[i] = ((Integer) TemplatesPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
}
break;
case "Default Templates":
- for (int i=0; i < rows.length; i++) {
- treeIDs[i] = ((Integer)DefaultTemplatesPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
+ for (int i = 0; i < rows.length; i++) {
+ treeIDs[i] = ((Integer) DefaultTemplatesPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
}
break;
case "Components":
- for (int i=0; i < rows.length; i++) {
+ for (int i = 0; i < rows.length; i++) {
// is the node ID in the case of Components
- treeIDs[i] = ((Integer)ComponentsPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
+ treeIDs[i] = ((Integer) ComponentsPanel.getTableModel().getValueAt(rows[i], 0)).intValue();
}
break;
}
- return treeIDs;
+ return treeIDs;
}
/** Returns the id of the selected Tree */
private int getSelectedTreeID() {
- int treeID=0;
- int aRow=this.getSelectedRow();
+ int treeID = 0;
+ int aRow = this.getSelectedRow();
switch (itsTabFocus) {
case "PIC":
- if ( aRow > -1) {
- treeID = ((Integer)PICPanel.getTableModel().getValueAt(aRow, 0)).intValue();
+ if (aRow > -1) {
+ treeID = ((Integer) PICPanel.getTableModel().getValueAt(aRow, 0)).intValue();
if (treeID > 0) {
itsMainFrame.getSharedVars().setTreeID(treeID);
} else {
@@ -647,8 +647,8 @@ public class MainPanel extends javax.swing.JPanel
}
break;
case "VIC":
- if ( aRow > -1) {
- treeID = ((Integer)VICPanel.getTableModel().getValueAt(aRow, 0)).intValue();
+ if (aRow > -1) {
+ treeID = ((Integer) VICPanel.getTableModel().getValueAt(aRow, 0)).intValue();
if (treeID > 0) {
itsMainFrame.getSharedVars().setTreeID(treeID);
} else {
@@ -657,8 +657,8 @@ public class MainPanel extends javax.swing.JPanel
}
break;
case "Templates":
- if ( aRow > -1) {
- treeID = ((Integer)TemplatesPanel.getTableModel().getValueAt(aRow, 0)).intValue();
+ if (aRow > -1) {
+ treeID = ((Integer) TemplatesPanel.getTableModel().getValueAt(aRow, 0)).intValue();
if (treeID > 0) {
itsMainFrame.getSharedVars().setTreeID(treeID);
} else {
@@ -667,8 +667,8 @@ public class MainPanel extends javax.swing.JPanel
}
break;
case "Default Templates":
- if ( aRow > -1) {
- treeID = ((Integer)DefaultTemplatesPanel.getTableModel().getValueAt(aRow, 0)).intValue();
+ if (aRow > -1) {
+ treeID = ((Integer) DefaultTemplatesPanel.getTableModel().getValueAt(aRow, 0)).intValue();
if (treeID > 0) {
itsMainFrame.getSharedVars().setTreeID(treeID);
} else {
@@ -677,9 +677,9 @@ public class MainPanel extends javax.swing.JPanel
}
break;
case "Components":
- if ( aRow > -1) {
+ if (aRow > -1) {
// is the node ID in the case of Components
- treeID = ((Integer)ComponentsPanel.getTableModel().getValueAt(aRow, 0)).intValue();
+ treeID = ((Integer) ComponentsPanel.getTableModel().getValueAt(aRow, 0)).intValue();
if (treeID > 0) {
itsMainFrame.getSharedVars().setComponentID(treeID);
} else {
@@ -690,24 +690,24 @@ public class MainPanel extends javax.swing.JPanel
}
return treeID;
}
-
+
/** Perform actions depending on the Button pressed and the Tab active
*
* @param aButton Name of the pressed button
*/
private void buttonPanelAction(String aButton) {
- logger.debug("Button pressed: "+aButton+ " ActiveTab: " + itsTabFocus);
+ logger.debug("Button pressed: " + aButton + " ActiveTab: " + itsTabFocus);
if (inputFieldBuilder.currentInputField != null) {
inputFieldBuilder.currentInputField.checkPopup();
}
- int treeID=getSelectedTreeID();
+ int treeID = getSelectedTreeID();
switch (aButton) {
case "Quit":
itsMainFrame.exit();
return;
case "Refresh":
//set changed flag, we want to refresh the tree
- itsMainFrame.setChanged(this.getFriendlyName(),true);
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
checkChanged();
return;
}
@@ -716,576 +716,604 @@ public class MainPanel extends javax.swing.JPanel
if (treeID > 0) {
itsMainFrame.getSharedVars().setTreeID(treeID);
} else if (!aButton.equals("New")) {
- LofarUtils.showErrorPanel(this,"You didn't select a tree",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, "You didn't select a tree", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
return;
}
- switch (aButton) {
- case "Query Panel":
- // TODO open Query Panel
- itsMainFrame.ToDo();
- break;
- case "State History":
- if (treeID > 0) {
- viewStateChanges(treeID);
- }
- break;
- case "New":
- if (getFile("PIC-tree")) {
- try {
- // the file obviously resides at the client side, and needs to be transfered to the server side.
- byte uldata[] = new byte[(int)itsNewFile.length()];
- try (BufferedInputStream input = new BufferedInputStream(new FileInputStream(itsNewFile))) {
- input.read(uldata,0,uldata.length);
- }
- String aFileName= "/tmp/"+itsMainFrame.getUserAccount().getUserName()+"_"+itsNewFile.getName();
- if (OtdbRmi.getRemoteFileTrans().uploadFile(uldata,aFileName)) {
- logger.debug("upload finished");
- // Create a new Tree from the found file.
- int aTreeID=OtdbRmi.getRemoteMaintenance().loadMasterFile(aFileName);
- if (aTreeID < 1) {
- String aS="Error on fileLoad: " + aFileName;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } else {
- // set changed flag to reload mainpanel
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- // set the new created TreeID to active and fill description stuff if needed
- itsMainFrame.getSharedVars().setTreeID(aTreeID);
- checkChanged();
- if (!itsFileDescription.equals("")) {
- if (!OtdbRmi.getRemoteMaintenance().setDescription(aTreeID,itsFileDescription)) {
- String aS="Error during setDescription in Tree "+OtdbRmi.getRemoteMaintenance().errorMsg();
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- }
-
- if (!itsFileStatus.equals("")) {
- if (!OtdbRmi.getRemoteMaintenance().setTreeState(aTreeID,OtdbRmi.getRemoteTypes().getTreeState(itsFileStatus))) {
- String aS="Error during setStatus in Tree "+OtdbRmi.getRemoteMaintenance().errorMsg();
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- }
- }
- ResultBrowserPanel aP=(ResultBrowserPanel)itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ResultBrowserPanel", true, true);
- if (aP != null) {
- itsMainFrame.showPanel(aP.getFriendlyName());
- }
+ switch (aButton) {
+ case "Query Panel":
+ // TODO open Query Panel
+ itsMainFrame.ToDo();
+ break;
+ case "State History":
+ if (treeID > 0) {
+ viewStateChanges(treeID);
}
- } catch (RemoteException ex) {
- String aS="Error during newPICTree creation: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } catch (FileNotFoundException ex) {
- String aS="Error during newPICTree creation: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } catch (IOException ex) {
- String aS="Error during newPICTree creation: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- }
- break;
- case "Delete":
- if (JOptionPane.showConfirmDialog(this,"Are you sure you want to delete this tree(s): ?","Delete Tree",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
- try {
- int[] treeIDs=getSelectedTreeIDs();
- for (int i=0;i< treeIDs.length;i++) {
- if (!OtdbRmi.getRemoteMaintenance().deleteTree(treeIDs[i])) {
- String aS="Failed to delete tree: "+treeIDs[i];
+ break;
+ case "New":
+ if (getFile("PIC-tree")) {
+ try {
+ // the file obviously resides at the client side, and needs to be transfered to the server side.
+ byte uldata[] = new byte[(int) itsNewFile.length()];
+ try (BufferedInputStream input = new BufferedInputStream(new FileInputStream(itsNewFile))) {
+ input.read(uldata, 0, uldata.length);
+ }
+ String aFileName = "/tmp/" + itsMainFrame.getUserAccount().getUserName() + "_" + itsNewFile.getName();
+ if (OtdbRmi.getRemoteFileTrans().uploadFile(uldata, aFileName)) {
+ logger.debug("upload finished");
+ // Create a new Tree from the found file.
+ int aTreeID = OtdbRmi.getRemoteMaintenance().loadMasterFile(aFileName);
+ if (aTreeID < 1) {
+ String aS = "Error on fileLoad: " + aFileName;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } else {
+ // set changed flag to reload mainpanel
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ // set the new created TreeID to active and fill description stuff if needed
+ itsMainFrame.getSharedVars().setTreeID(aTreeID);
+ checkChanged();
+ if (!itsFileDescription.equals("")) {
+ if (!OtdbRmi.getRemoteMaintenance().setDescription(aTreeID, itsFileDescription)) {
+ String aS = "Error during setDescription in Tree " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+
+ if (!itsFileStatus.equals("")) {
+ if (!OtdbRmi.getRemoteMaintenance().setTreeState(aTreeID, OtdbRmi.getRemoteTypes().getTreeState(itsFileStatus))) {
+ String aS = "Error during setStatus in Tree " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ }
+ ResultBrowserPanel aP = (ResultBrowserPanel) itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ResultBrowserPanel", true, true);
+ if (aP != null) {
+ itsMainFrame.showPanel(aP.getFriendlyName());
+ }
+ }
+ } catch (RemoteException ex) {
+ String aS = "Error during newPICTree creation: " + ex;
logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } catch (FileNotFoundException ex) {
+ String aS = "Error during newPICTree creation: " + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } catch (IOException ex) {
+ String aS = "Error during newPICTree creation: " + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
}
- } catch (RemoteException ex) {
- String aS="Remote error during deleteTree: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- itsMainFrame.setHourglassCursor();
- ((PICtableModel)PICPanel.getTableModel()).fillTable();
- itsMainFrame.setNormalCursor();
- }
- break;
- case "View":
- ResultBrowserPanel aP=(ResultBrowserPanel)itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ResultBrowserPanel", true, true);
- if (aP != null) {
- itsMainFrame.showPanel(aP.getFriendlyName());
- }
- break;
- case "Info":
- if (treeID > 0) {
- int [] id=new int[1];
- id[0]=treeID;
- if (viewInfo(id)) {
-
- logger.debug("Tree has been changed, reloading tableline");
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
- }
+ break;
+ case "Delete":
+ if (JOptionPane.showConfirmDialog(this, "Are you sure you want to delete this tree(s): ?", "Delete Tree", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
+ try {
+ int[] treeIDs = getSelectedTreeIDs();
+ for (int i = 0; i < treeIDs.length; i++) {
+ if (!OtdbRmi.getRemoteMaintenance().deleteTree(treeIDs[i])) {
+ String aS = "Failed to delete tree: " + treeIDs[i];
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ } catch (RemoteException ex) {
+ String aS = "Remote error during deleteTree: " + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ itsMainFrame.setHourglassCursor();
+ ((PICtableModel) PICPanel.getTableModel()).fillTable();
+ itsMainFrame.setNormalCursor();
+ }
+ break;
+ case "View":
+ ResultBrowserPanel aP = (ResultBrowserPanel) itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ResultBrowserPanel", true, true);
+ if (aP != null) {
+ itsMainFrame.showPanel(aP.getFriendlyName());
+ }
+ break;
+ case "Info":
+ if (treeID > 0) {
+ int[] id = new int[1];
+ id[0] = treeID;
+ if (viewInfo(id)) {
+
+ logger.debug("Tree has been changed, reloading tableline");
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
+ }
+ }
+ break;
}
break;
- }
- break;
case "VIC":
if (treeID > 0) {
itsMainFrame.getSharedVars().setTreeID(treeID);
} else {
- LofarUtils.showErrorPanel(this, "You didn't select a tree",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, "You didn't select a tree", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
return;
}
- switch (aButton) {
- case "Query Panel":
- // TODO open Query Panel
- itsMainFrame.ToDo();
- break;
- case "State History":
- if (treeID > 0) {
- viewStateChanges(treeID);
- }
- break;
- case "Delete":
- if (JOptionPane.showConfirmDialog(this,"Are you sure you want to delete this tree(s): ?","Delete Tree",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
- try {
- int[] treeIDs=getSelectedTreeIDs();
- for (int i=0;i< treeIDs.length;i++) {
- if (!OtdbRmi.getRemoteMaintenance().deleteTree(treeIDs[i])) {
- String aS="Failed to delete tree: "+treeIDs[i];
+ switch (aButton) {
+ case "Query Panel":
+ // TODO open Query Panel
+ itsMainFrame.ToDo();
+ break;
+ case "State History":
+ if (treeID > 0) {
+ viewStateChanges(treeID);
+ }
+ break;
+ case "Delete":
+ if (JOptionPane.showConfirmDialog(this, "Are you sure you want to delete this tree(s): ?", "Delete Tree", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
+ try {
+ int[] treeIDs = getSelectedTreeIDs();
+ for (int i = 0; i < treeIDs.length; i++) {
+ if (!OtdbRmi.getRemoteMaintenance().deleteTree(treeIDs[i])) {
+ String aS = "Failed to delete tree: " + treeIDs[i];
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ } catch (RemoteException ex) {
+ String aS = "Remote error during deleteTree: " + ex;
logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
+ itsMainFrame.setHourglassCursor();
+ ((VICtableModel) VICPanel.getTableModel()).fillTable();
+ itsMainFrame.setNormalCursor();
}
- } catch (RemoteException ex) {
- String aS="Remote error during deleteTree: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this, aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- itsMainFrame.setHourglassCursor();
- ((VICtableModel)VICPanel.getTableModel()).fillTable();
- itsMainFrame.setNormalCursor();
- }
- break;
- case "View":
- ResultBrowserPanel aP=(ResultBrowserPanel)itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ResultBrowserPanel", true, true);
- if (aP != null) {
- itsMainFrame.showPanel(aP.getFriendlyName());
+ break;
+ case "View":
+ ResultBrowserPanel aP = (ResultBrowserPanel) itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ResultBrowserPanel", true, true);
+ if (aP != null) {
+ itsMainFrame.showPanel(aP.getFriendlyName());
+ }
+ break;
+ case "Schedule":
+ // in case of VICtree we have the possibility of changing a multiple selection
+ // so things like start and/or stoptimes can be set for a few entries at once
+ if (this.VICPanel.getSelectedRowCount() > 0) {
+ if (viewInfo(this.getSelectedTreeIDs())) {
+ logger.debug("Tree has been changed, reloading tableline");
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
+ }
+
+ }
+ break;
}
break;
- case "Schedule":
- // in case of VICtree we have the possibility of changing a multiple selection
- // so things like start and/or stoptimes can be set for a few entries at once
- if (this.VICPanel.getSelectedRowCount() > 0) {
- if (viewInfo(this.getSelectedTreeIDs()) ) {
- logger.debug("Tree has been changed, reloading tableline");
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
+ case "Templates": {
+ jOTDBtree aTree = null;
+ String aTreeState = "";
+ if (treeID > 0) {
+ itsMainFrame.getSharedVars().setTreeID(treeID);
+ try {
+ aTree = OtdbRmi.getRemoteOTDB().getTreeInfo(treeID, false);
+ aTreeState = OtdbRmi.getRemoteTypes().getTreeState(aTree.state);
+ } catch (RemoteException ex) {
+ String aS = "Error during Remote treeMaintenance";
+ logger.debug(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
-
+ } else {
+
+ LofarUtils.showErrorPanel(this, "You didn't select a tree", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ return;
}
- break;
- }
- break;
- case "Templates":
- {
- jOTDBtree aTree=null;
- String aTreeState="";
- if (treeID > 0) {
- itsMainFrame.getSharedVars().setTreeID(treeID);
- try {
- aTree = OtdbRmi.getRemoteOTDB().getTreeInfo(treeID,false);
- aTreeState=OtdbRmi.getRemoteTypes().getTreeState(aTree.state);
- } catch (RemoteException ex) {
- String aS="Error during Remote treeMaintenance";
- logger.debug(aS);
- LofarUtils.showErrorPanel(this, aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ switch (aButton) {
+ case "Query Panel":
+ itsMainFrame.ToDo();
+ break;
+ case "State History":
+ if (treeID > 0) {
+ viewStateChanges(treeID);
}
- } else {
+ break;
+ case "Duplicate":
+ if (treeID < 1) {
+ LofarUtils.showErrorPanel(this, "You didn't select a tree", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } else {
+ try {
+ int newTreeID = OtdbRmi.getRemoteMaintenance().copyTemplateTree(treeID);
+ if (newTreeID > 0) {
+ JOptionPane.showMessageDialog(this, "New Tree created with ID: " + newTreeID,
+ "New Tree Message",
+ JOptionPane.INFORMATION_MESSAGE);
+ // set back treestate to described
+ jOTDBtree aT = OtdbRmi.getRemoteOTDB().getTreeInfo(newTreeID, false);
+ if (aT.state != OtdbRmi.getRemoteTypes().getTreeState("described")) {
+ aT.state = OtdbRmi.getRemoteTypes().getTreeState("described");
+ if (!OtdbRmi.getRemoteMaintenance().setTreeState(aT.treeID(), aT.state)) {
+ String aS = "Error during setTreeState: " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ // check momID, if not zero set to zero
+ if (aT.momID() != 0) {
+ if (!OtdbRmi.getRemoteMaintenance().setMomInfo(aT.treeID(), 0, aT.groupID, aT.campaign)) {
+ String aS = "Error during setMomInfo: " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.debug(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
- LofarUtils.showErrorPanel(this, "You didn't select a tree",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- return;
- }
- switch (aButton) {
- case "Query Panel":
- itsMainFrame.ToDo();
- break;
- case "State History":
- if (treeID > 0) {
- viewStateChanges(treeID);
- }
- break;
- case "Duplicate":
- if (treeID < 1) {
- LofarUtils.showErrorPanel(this, "You didn't select a tree",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } else {
- try {
- int newTreeID=OtdbRmi.getRemoteMaintenance().copyTemplateTree(treeID);
- if (newTreeID > 0) {
- JOptionPane.showMessageDialog(this,"New Tree created with ID: "+newTreeID,
- "New Tree Message",
- JOptionPane.INFORMATION_MESSAGE);
- // set back treestate to described
- jOTDBtree aT=OtdbRmi.getRemoteOTDB().getTreeInfo(newTreeID, false);
- if (aT.state != OtdbRmi.getRemoteTypes().getTreeState("described") ) {
- aT.state=OtdbRmi.getRemoteTypes().getTreeState("described");
- if (!OtdbRmi.getRemoteMaintenance().setTreeState(aT.treeID(), aT.state)) {
- String aS="Error during setTreeState: "+OtdbRmi.getRemoteMaintenance().errorMsg();
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
+ itsMainFrame.getSharedVars().setTreeID(newTreeID);
+ // set changed flag to reload mainpanel
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
+ } else {
+ logger.debug("No Template Tree created!!!");
}
- // check momID, if not zero set to zero
- if (aT.momID() != 0) {
- if (!OtdbRmi.getRemoteMaintenance().setMomInfo(aT.treeID(),0,aT.groupID,aT.campaign)) {
- String aS="Error during setMomInfo: "+OtdbRmi.getRemoteMaintenance().errorMsg();
- logger.debug(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
+ } catch (RemoteException ex) {
+ String aS = "Remote error during Build TemplateTree: " + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ break;
+ case "Modify":
+ TemplateMaintenancePanel aP = (TemplateMaintenancePanel) itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.TemplateMaintenancePanel", true, true);
+ if (aP != null) {
+ itsMainFrame.showPanel(aP.getFriendlyName());
+ }
+ break;
+ case "Delete":
+ if (JOptionPane.showConfirmDialog(this, "Are you sure you want to delete this tree(s) ?", "Delete Tree", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
+ try {
+ int[] treeIDs = getSelectedTreeIDs();
+ for (int i = 0; i < treeIDs.length; i++) {
+ if (!OtdbRmi.getRemoteMaintenance().deleteTree(treeIDs[i])) {
+ String aS = "Failed to delete tree: " + treeIDs[i];
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
}
- itsMainFrame.getSharedVars().setTreeID(newTreeID);
- // set changed flag to reload mainpanel
- itsMainFrame.setChanged(this.getFriendlyName(),true);
+ } catch (RemoteException ex) {
+ String aS = "Remote error during deleteTree: " + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ itsMainFrame.getSharedVars().setTreeID(-1);
+ itsMainFrame.setHourglassCursor();
+ ((TemplatetableModel) TemplatesPanel.getTableModel()).fillTable();
+ itsMainFrame.setNormalCursor();
+ // set changed flag to reload mainpanel
+ // itsMainFrame.setChanged(this.getFriendlyName(),true);
+ // checkChanged();
+ }
+ break;
+ case "Build VIC tree":
+ if (treeID < 1) {
+ LofarUtils.showErrorPanel(this, "You didn't select a tree", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } else {
+ try {
+ int newTreeID = OtdbRmi.getRemoteMaintenance().instanciateTree(itsMainFrame.getSharedVars().getTreeID());
+ if (newTreeID > 0) {
+ JOptionPane.showMessageDialog(this, "New VICTree created with ID: " + newTreeID,
+ "New Tree Message",
+ JOptionPane.INFORMATION_MESSAGE);
+ itsMainFrame.getSharedVars().setTreeID(newTreeID);
+ // set changed flag to reload mainpanel
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
+ } else {
+ String aS = "No VIC Tree created!!! : " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+
+ } catch (RemoteException ex) {
+ String aS = "Remote error during Build VICTree: " + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ break;
+ case "Change Status":
+ // in case of templatetree we have the possibility of changing a multiple selection
+ // so things like status can be set for a few entries at once
+ if (TemplatesPanel.getSelectedRowCount() > 0) {
+ if (viewInfo(this.getSelectedTreeIDs())) {
+ logger.debug("Tree has been changed, reloading tableline");
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
checkChanged();
- } else {
- logger.debug("No Template Tree created!!!");
}
-
- } catch (RemoteException ex) {
- String aS="Remote error during Build TemplateTree: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+
}
- }
- break;
- case "Modify":
- TemplateMaintenancePanel aP =(TemplateMaintenancePanel)itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.TemplateMaintenancePanel", true, true);
- if (aP != null) {
- itsMainFrame.showPanel(aP.getFriendlyName());
- }
- break;
- case "Delete":
- if (JOptionPane.showConfirmDialog(this,"Are you sure you want to delete this tree(s) ?","Delete Tree",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
- try {
- int[] treeIDs=getSelectedTreeIDs();
- for (int i=0;i< treeIDs.length;i++) {
- if (!OtdbRmi.getRemoteMaintenance().deleteTree(treeIDs[i])) {
- String aS="Failed to delete tree: "+treeIDs[i];
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- }
- } catch (RemoteException ex) {
- String aS="Remote error during deleteTree: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this, aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- itsMainFrame.getSharedVars().setTreeID(-1);
- itsMainFrame.setHourglassCursor();
- ((TemplatetableModel)TemplatesPanel.getTableModel()).fillTable();
- itsMainFrame.setNormalCursor();
- // set changed flag to reload mainpanel
- // itsMainFrame.setChanged(this.getFriendlyName(),true);
- // checkChanged();
- }break;
- case "Build VIC tree":
- if (treeID < 1) {
- LofarUtils.showErrorPanel(this, "You didn't select a tree",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } else {
- try {
- int newTreeID=OtdbRmi.getRemoteMaintenance().instanciateTree(itsMainFrame.getSharedVars().getTreeID());
- if (newTreeID > 0) {
- JOptionPane.showMessageDialog(this,"New VICTree created with ID: "+newTreeID,
- "New Tree Message",
- JOptionPane.INFORMATION_MESSAGE);
- itsMainFrame.getSharedVars().setTreeID(newTreeID);
- // set changed flag to reload mainpanel
- itsMainFrame.setChanged(this.getFriendlyName(),true);
+ break;
+ case "MultiEdit":
+ // in case of templatetree we have the possibility to change a few crucial settings for all trees chosen
+ if (TemplatesPanel.getSelectedRowCount() > 0) {
+ if (viewMultiEditDialog(this.getSelectedTreeIDs())) {
+ logger.debug("Trees have been changed, reloading tablelines");
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
checkChanged();
- } else {
- String aS="No VIC Tree created!!! : "+ OtdbRmi.getRemoteMaintenance().errorMsg();
+ }
+
+ }
+ break;
+ case "Set to Default":
+ if (itsMainFrame.getSharedVars().getTreeID() > 0) {
+ try {
+ ArrayList<jDefaultTemplate> aDFList = new ArrayList(OtdbRmi.getRemoteOTDB().getDefaultTemplates());
+ if (createDefaultTemplateDialog(aTree, aDFList)) {
+ // check momID, if not zero set to zero
+ if (aTree.momID() != 0) {
+ if (!OtdbRmi.getRemoteMaintenance().setMomInfo(aTree.treeID(), 0, aTree.groupID, aTree.campaign)) {
+ String aS = "Error during setMomInfo: " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
+ }
+ } catch (RemoteException ex) {
+ String aS = "Error during Remote treeMaintenance" + ex;
logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
-
- } catch (RemoteException ex) {
- String aS="Remote error during Build VICTree: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
+ break;
+ }
+ break;
+ }
+ case "Default Templates": {
+ jOTDBtree aTree = null;
+ String aTreeState = "";
+ if (treeID > 0) {
+ itsMainFrame.getSharedVars().setTreeID(treeID);
+ try {
+ aTree = OtdbRmi.getRemoteOTDB().getTreeInfo(treeID, false);
+ aTreeState = OtdbRmi.getRemoteTypes().getTreeState(aTree.state);
+ } catch (RemoteException ex) {
+ String aS = "Error during Remote treeMaintenance" + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
- break;
- case "Change Status":
- // in case of templatetree we have the possibility of changing a multiple selection
- // so things status can be set for a few entries at once
- if (TemplatesPanel.getSelectedRowCount() > 0) {
- if (viewInfo(this.getSelectedTreeIDs()) ) {
- logger.debug("Tree has been changed, reloading tableline");
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
+ } else {
+ LofarUtils.showErrorPanel(this, "You didn't select a tree", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ return;
+ }
+ switch (aButton) {
+ case "Query Panel":
+ itsMainFrame.ToDo();
+ break;
+ case "State History":
+ if (treeID > 0) {
+ viewStateChanges(treeID);
}
+ break;
+ case "Duplicate":
+ if (treeID < 1) {
+ LofarUtils.showErrorPanel(this, "You didn't select a tree", new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } else {
+ try {
+ int newTreeID = OtdbRmi.getRemoteMaintenance().copyTemplateTree(treeID);
+ if (newTreeID > 0) {
+ JOptionPane.showMessageDialog(this, "New Tree (Not Default!!!) created with ID: " + newTreeID,
+ "New Tree Message",
+ JOptionPane.INFORMATION_MESSAGE);
+ // set back treestate to described
+ jOTDBtree aT = OtdbRmi.getRemoteOTDB().getTreeInfo(newTreeID, false);
+ if (aT.state != OtdbRmi.getRemoteTypes().getTreeState("described")) {
+ aT.state = OtdbRmi.getRemoteTypes().getTreeState("described");
+ if (!OtdbRmi.getRemoteMaintenance().setTreeState(aT.treeID(), aT.state)) {
+ String aS = "Error during setTreeState: " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ // check momID, if not zero set to zero
+ if (aT.momID() != 0) {
+ if (!OtdbRmi.getRemoteMaintenance().setMomInfo(aT.treeID(), 0, aT.groupID, aT.campaign)) {
+ String aS = "Error during setMomInfo: " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
- }
- break;
- case "MultiEdit":
- // in case of templatetree we have the possibility to change a few crucial settings for all trees chosen
- if (TemplatesPanel.getSelectedRowCount() > 0) {
- if (viewMultiEditDialog(this.getSelectedTreeIDs()) ) {
- logger.debug("Trees have been changed, reloading tablelines");
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
+ }
+ itsMainFrame.getSharedVars().setTreeID(newTreeID);
+ // set changed flag to reload mainpanel
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
+ } else {
+ String aS = "No Template Tree created!!!";
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+
+ } catch (RemoteException ex) {
+ String aS = "Remote error during Build TemplateTree: " + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ break;
+ case "Modify":
+ TemplateMaintenancePanel aP = (TemplateMaintenancePanel) itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.TemplateMaintenancePanel", true, true);
+ if (aP != null) {
+ itsMainFrame.showPanel(aP.getFriendlyName());
}
+ break;
+ case "Remove from Default":
+ if (JOptionPane.showConfirmDialog(this, "Are you sure you want to move this default template(s) to an ordinary template ?", "Remove template from Default templates", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
+ try {
+ int[] treeIDs = getSelectedTreeIDs();
+ for (int i = 0; i < treeIDs.length; i++) {
+ jOTDBtree tmpTree = OtdbRmi.getRemoteOTDB().getTreeInfo(treeIDs[i], false);
- }
- break;
- case "Set to Default":
- if (itsMainFrame.getSharedVars().getTreeID() > 0) {
- try {
- ArrayList<jDefaultTemplate> aDFList = new ArrayList(OtdbRmi.getRemoteOTDB().getDefaultTemplates());
- if (createDefaultTemplateDialog(aTree, aDFList)) {
- // check momID, if not zero set to zero
- if (aTree.momID() != 0) {
- if (!OtdbRmi.getRemoteMaintenance().setMomInfo(aTree.treeID(), 0, aTree.groupID, aTree.campaign)) {
- String aS = "Error during setMomInfo: " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ if (!OtdbRmi.getRemoteMaintenance().assignTemplateName(tmpTree.treeID(), "")) {
+ String aS = "Error during assignTemplateName(" + tmpTree.treeID() + ", ): " + OtdbRmi.getRemoteMaintenance().errorMsg();
logger.error(aS);
LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } else {
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
}
}
+ } catch (RemoteException ex) {
+ try {
+ String aS = "RemoteExceptionError while setting TemplateName " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } catch (RemoteException ex1) {
+ String aS = "Remote Exception Error getting the remote errorMessage";
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ }
+ break;
+ case "Change Status":
+ if (itsMainFrame.getSharedVars().getTreeID() > 0) {
+ int[] id = new int[1];
+ id[0] = itsMainFrame.getSharedVars().getTreeID();
+ if (viewInfo(id)) {
+ logger.debug("Tree has been changed, reloading table line");
itsMainFrame.setChanged(this.getFriendlyName(), true);
checkChanged();
}
- } catch (RemoteException ex) {
- String aS="Error during Remote treeMaintenance" + ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
- }
- break;
- }
- break;
+ break;
}
- case "Default Templates":
- {
- jOTDBtree aTree=null;
- String aTreeState="";
- if (treeID > 0) {
- itsMainFrame.getSharedVars().setTreeID(treeID);
- try {
- aTree = OtdbRmi.getRemoteOTDB().getTreeInfo(treeID,false);
- aTreeState=OtdbRmi.getRemoteTypes().getTreeState(aTree.state);
- } catch (RemoteException ex) {
- String aS="Error during Remote treeMaintenance" + ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- } else {
- LofarUtils.showErrorPanel(this, "You didn't select a tree",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- return;
- }
- switch (aButton) {
- case "Query Panel":
- itsMainFrame.ToDo();
- break;
- case "State History":
- if (treeID > 0) {
- viewStateChanges(treeID);
- }
- break;
- case "Duplicate":
- if (treeID < 1) {
- LofarUtils.showErrorPanel(this, "You didn't select a tree",new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } else {
- try {
- int newTreeID=OtdbRmi.getRemoteMaintenance().copyTemplateTree(treeID);
- if (newTreeID > 0) {
- JOptionPane.showMessageDialog(this,"New Tree (Not Default!!!) created with ID: "+newTreeID,
- "New Tree Message",
- JOptionPane.INFORMATION_MESSAGE);
- // set back treestate to described
- jOTDBtree aT=OtdbRmi.getRemoteOTDB().getTreeInfo(newTreeID, false);
- if (aT.state != OtdbRmi.getRemoteTypes().getTreeState("described") ) {
- aT.state=OtdbRmi.getRemoteTypes().getTreeState("described");
- if (!OtdbRmi.getRemoteMaintenance().setTreeState(aT.treeID(), aT.state)) {
- String aS="Error during setTreeState: "+OtdbRmi.getRemoteMaintenance().errorMsg();
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
+ break;
+ }
+ case "Components":
+ switch (aButton) {
+ case "Query Panel":
+ itsMainFrame.ToDo();
+ break;
+ case "New":
+ if (getFile("VIC-component")) {
+ try {
+ // the file obviously resides at the client side, and needs to be transfered to the server side.
+ byte uldata[] = new byte[(int) itsNewFile.length()];
+ try (BufferedInputStream input = new BufferedInputStream(new FileInputStream(itsNewFile))) {
+ input.read(uldata, 0, uldata.length);
}
- // check momID, if not zero set to zero
- if (aT.momID() != 0) {
- if (!OtdbRmi.getRemoteMaintenance().setMomInfo(aT.treeID(),0, aT.groupID, aT.campaign)) {
- String aS="Error during setMomInfo: "+OtdbRmi.getRemoteMaintenance().errorMsg();
+ String aFileName = "/tmp/" + itsMainFrame.getUserAccount().getUserName() + "_" + itsNewFile.getName();
+ if (OtdbRmi.getRemoteFileTrans().uploadFile(uldata, aFileName)) {
+ logger.debug("upload finished");
+ // Create a new Tree from the found file.
+ int anID = OtdbRmi.getRemoteMaintenance().loadComponentFile(aFileName, "", "");
+ if (anID < 1) {
+ String aS = "Error on ComponentfileLoad: " + itsNewFile.getPath();
logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } else {
+ // set the new created fill description stuff if needed
+ itsMainFrame.getSharedVars().setComponentID(anID);
+ if (!itsFileDescription.equals("")) {
+ jVICnodeDef aND = OtdbRmi.getRemoteMaintenance().getComponentNode(anID);
+ aND.description = itsFileDescription;
+ if (!OtdbRmi.getRemoteMaintenance().saveComponentNode(aND)) {
+ String aS = "Error during setDescription in Component " + OtdbRmi.getRemoteMaintenance().errorMsg();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ }
+ }
+ // set changed flag to reload mainpanel
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
}
-
+ ComponentMaintenancePanel aP = (ComponentMaintenancePanel) itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ComponentMaintenancePanel", true, true);
+ if (aP != null) {
+ itsMainFrame.showPanel(aP.getFriendlyName());
+ }
+ } else {
+ String aS = "upload failed";
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/tb/icons/16_warn.gif")));
}
- itsMainFrame.getSharedVars().setTreeID(newTreeID);
- // set changed flag to reload mainpanel
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
- } else {
- String aS="No Template Tree created!!!";
+ } catch (FileNotFoundException ex) {
+ String aS = "Error during new Component creation: " + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } catch (RemoteException ex) {
+ String aS = "Error during new Component creation: " + ex;
logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } catch (IOException ex) {
+ String aS = "Error during new Component creation: " + ex;
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
-
- } catch (RemoteException ex) {
- String aS="Remote error during Build TemplateTree: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
- }
- break;
- case "Modify":
- TemplateMaintenancePanel aP =(TemplateMaintenancePanel)itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.TemplateMaintenancePanel", true, true);
- if (aP != null) {
- itsMainFrame.showPanel(aP.getFriendlyName());
- }
- break;
- case "Change Status":
- if (itsMainFrame.getSharedVars().getTreeID() > 0) {
- int [] id = new int[1];
- id[0]=itsMainFrame.getSharedVars().getTreeID();
- if (viewInfo(id)) {
- logger.debug("Tree has been changed, reloading table line");
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
+ break;
+ case "Modify":
+ ComponentMaintenancePanel aP = (ComponentMaintenancePanel) itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ComponentMaintenancePanel", true, true);
+ if (aP != null) {
+ itsMainFrame.showPanel(aP.getFriendlyName());
}
- }
- break;
- }
- break;
- }
- case "Components":
- switch (aButton) {
- case "Query Panel":
- itsMainFrame.ToDo();
- break;
- case "New":
- if (getFile("VIC-component") ) {
- try {
- // the file obviously resides at the client side, and needs to be transfered to the server side.
- byte uldata[] = new byte[(int)itsNewFile.length()];
- try (BufferedInputStream input = new BufferedInputStream(new FileInputStream(itsNewFile))) {
- input.read(uldata,0,uldata.length);
- }
- String aFileName= "/tmp/"+itsMainFrame.getUserAccount().getUserName()+"_"+itsNewFile.getName();
- if (OtdbRmi.getRemoteFileTrans().uploadFile(uldata,aFileName)) {
- logger.debug("upload finished");
- // Create a new Tree from the found file.
- int anID=OtdbRmi.getRemoteMaintenance().loadComponentFile(aFileName,"","");
- if (anID < 1) {
- String aS="Error on ComponentfileLoad: " + itsNewFile.getPath();
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } else {
- // set the new created fill description stuff if needed
- itsMainFrame.getSharedVars().setComponentID(anID);
- if (!itsFileDescription.equals("")) {
- jVICnodeDef aND=OtdbRmi.getRemoteMaintenance().getComponentNode(anID);
- aND.description=itsFileDescription;
- if (!OtdbRmi.getRemoteMaintenance().saveComponentNode(aND)) {
- String aS="Error during setDescription in Component "+OtdbRmi.getRemoteMaintenance().errorMsg();
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
+ break;
+ case "Build TemplateTree":
+ int nodeID = itsMainFrame.getSharedVars().getComponentID();
+ short classifID;
+ try {
+ classifID = OtdbRmi.getRemoteTypes().getClassif("operational");
+ if (OtdbRmi.getRemoteMaintenance().isTopComponent(nodeID)) {
+ int newTreeID = OtdbRmi.getRemoteMaintenance().buildTemplateTree(nodeID, classifID);
+ if (newTreeID > 0) {
+ JOptionPane.showMessageDialog(this, "New Tree created with ID: " + newTreeID,
+ "New Tree Message",
+ JOptionPane.INFORMATION_MESSAGE);
+ itsMainFrame.getSharedVars().setTreeID(newTreeID);
+ // set changed flag to reload mainpanel
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
+ } else {
+ String aS = "No Template Tree created!!!";
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
- // set changed flag to reload mainpanel
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
- }
- ComponentMaintenancePanel aP=(ComponentMaintenancePanel)itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ComponentMaintenancePanel", true, true);
- if (aP != null) {
- itsMainFrame.showPanel(aP.getFriendlyName());
}
- } else {
- String aS="upload failed";
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/tb/icons/16_warn.gif")));
- }
- } catch (FileNotFoundException ex) {
- String aS="Error during new Component creation: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } catch (RemoteException ex) {
- String aS="Error during new Component creation: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } catch (IOException ex) {
- String aS="Error during new Component creation: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- }
- break;
- case "Modify":
- ComponentMaintenancePanel aP = (ComponentMaintenancePanel)itsMainFrame.registerPlugin("nl.astron.lofar.sas.otb.panels.ComponentMaintenancePanel", true, true);
- if (aP != null) {
- itsMainFrame.showPanel(aP.getFriendlyName());
- }
- break;
- case "Build TemplateTree":
- int nodeID=itsMainFrame.getSharedVars().getComponentID();
- short classifID;
- try {
- classifID = OtdbRmi.getRemoteTypes().getClassif("operational");
- if (OtdbRmi.getRemoteMaintenance().isTopComponent(nodeID)) {
- int newTreeID=OtdbRmi.getRemoteMaintenance().buildTemplateTree(nodeID,classifID);
- if (newTreeID > 0) {
- JOptionPane.showMessageDialog(this,"New Tree created with ID: "+newTreeID,
- "New Tree Message",
- JOptionPane.INFORMATION_MESSAGE);
- itsMainFrame.getSharedVars().setTreeID(newTreeID);
- // set changed flag to reload mainpanel
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
- } else {
- String aS="No Template Tree created!!!";
+ } catch (RemoteException ex) {
+ String aS = "Remote error during Build TemplateTree: " + ex;
logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
- }
- } catch (RemoteException ex) {
- String aS="Remote error during Build TemplateTree: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- break;
- case "Delete":
- if (JOptionPane.showConfirmDialog(this,"Are you sure you want to delete this component(s): ?","Delete Component",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
- try {
- int[] componentIDs=getSelectedTreeIDs();
- for (int i=0;i< componentIDs.length;i++) {
- if (!OtdbRmi.getRemoteMaintenance().deleteComponentNode(componentIDs[i])) {
- String aS="Failed to delete component: "+componentIDs[i];
+ break;
+ case "Delete":
+ if (JOptionPane.showConfirmDialog(this, "Are you sure you want to delete this component(s): ?", "Delete Component", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
+ try {
+ int[] componentIDs = getSelectedTreeIDs();
+ for (int i = 0; i < componentIDs.length; i++) {
+ if (!OtdbRmi.getRemoteMaintenance().deleteComponentNode(componentIDs[i])) {
+ String aS = "Failed to delete component: " + componentIDs[i];
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ } else {
+ // set changed flag to reload mainpanel
+ itsMainFrame.setChanged(this.getFriendlyName(), true);
+ checkChanged();
+ }
+ }
+ } catch (RemoteException ex) {
+ String aS = "Remote error during deleteComponents: " + ex;
logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- } else {
- // set changed flag to reload mainpanel
- itsMainFrame.setChanged(this.getFriendlyName(),true);
- checkChanged();
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
+ itsMainFrame.setHourglassCursor();
+ ((ComponentTableModel) ComponentsPanel.getTableModel()).fillTable();
+ itsMainFrame.setNormalCursor();
}
- } catch (RemoteException ex) {
- String aS="Remote error during deleteComponents: "+ ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- }
- itsMainFrame.setHourglassCursor();
- ((ComponentTableModel)ComponentsPanel.getTableModel()).fillTable();
- itsMainFrame.setNormalCursor();
+ break;
}
break;
- }
- break;
case "Query Results":
itsMainFrame.ToDo();
break;
default:
- logger.debug("Other command found: "+aButton);
+ logger.debug("Other command found: " + aButton);
break;
}
}
@@ -1296,10 +1324,10 @@ public class MainPanel extends javax.swing.JPanel
*/
private void viewStateChanges(int treeID) {
// create tableModel
- itsStateChangeModel = new StateChangeHistoryTableModel(SharedVars.getOTDBrmi(),treeID);
+ itsStateChangeModel = new StateChangeHistoryTableModel(SharedVars.getOTDBrmi(), treeID);
// showstateChangeInfo
if (stateChangeHistoryDialog == null) {
- stateChangeHistoryDialog = new TableDialog(itsMainFrame,true,itsStateChangeModel, "State change history");
+ stateChangeHistoryDialog = new TableDialog(itsMainFrame, true, itsStateChangeModel, "State change history");
} else {
itsStateChangeModel.setTree(treeID);
stateChangeHistoryDialog.setModel(itsStateChangeModel);
@@ -1312,7 +1340,6 @@ public class MainPanel extends javax.swing.JPanel
}
-
/** Launch multiEditDialog,
*
* @param treeIDs The IDs of the chosen trees.
@@ -1320,13 +1347,13 @@ public class MainPanel extends javax.swing.JPanel
private boolean viewInfo(int[] treeIDs) {
logger.debug("viewInfo for treeID: " + treeIDs);
//get the selected tree from the database
- boolean multiple=false;
+ boolean multiple = false;
if (treeIDs.length > 0) {
// show treeInfo dialog
- if (treeInfoDialog == null ) {
- treeInfoDialog = new TreeInfoDialog(true,treeIDs, itsMainFrame);
+ if (treeInfoDialog == null) {
+ treeInfoDialog = new TreeInfoDialog(true, treeIDs, itsMainFrame);
} else {
treeInfoDialog.setTree(treeIDs);
}
@@ -1352,11 +1379,11 @@ public class MainPanel extends javax.swing.JPanel
private boolean viewMultiEditDialog(int[] treeIDs) {
logger.debug("viewMultiEditDialog for treeID: " + treeIDs);
//get the selected tree from the database
-
+
if (treeIDs.length > 0) {
// show multiEdit dialog
- if (multiEditDialog == null ) {
- multiEditDialog = new MultiEditDialog(true,treeIDs, itsMainFrame);
+ if (multiEditDialog == null) {
+ multiEditDialog = new MultiEditDialog(true, treeIDs, itsMainFrame);
} else {
multiEditDialog.setTree(treeIDs);
}
@@ -1368,7 +1395,7 @@ public class MainPanel extends javax.swing.JPanel
} else {
logger.debug("trees have not been changed");
}
-
+
} else {
logger.debug("no trees selected");
}
@@ -1379,15 +1406,15 @@ public class MainPanel extends javax.swing.JPanel
*
* @param aList Vector<jDefaultTemplate> all default template names.
*/
- private boolean createDefaultTemplateDialog(jOTDBtree aTree,ArrayList<jDefaultTemplate> aList) {
+ private boolean createDefaultTemplateDialog(jOTDBtree aTree, ArrayList<jDefaultTemplate> aList) {
logger.debug("createDefaultTemplateDialog started");
if (itsMainFrame.getSharedVars().getTreeID() > 0) {
- // show multiEdit dialog
- if (defaultTemplateDialog == null ) {
- defaultTemplateDialog = new CreateDefaultTemplateDialog(true,aList,aTree,itsMainFrame);
+ // show defaultTemplate dialog
+ if (defaultTemplateDialog == null) {
+ defaultTemplateDialog = new CreateDefaultTemplateDialog(true, aList, aTree, itsMainFrame);
} else {
- defaultTemplateDialog.setNew(aList,aTree);
+ defaultTemplateDialog.setNew(aList, aTree);
}
defaultTemplateDialog.setLocationRelativeTo(this);
defaultTemplateDialog.setVisible(true);
@@ -1405,25 +1432,24 @@ public class MainPanel extends javax.swing.JPanel
return defaultTemplateDialog.isOk();
}
-
/** Launch LoadFileDialog to get a file to work with.
*
* @param aType PIC-tree or VIC-component
*
*/
private boolean getFile(String aType) {
- File aNewFile=null;
- String aFileStatus="";
- String aFileDescription="";
-
+ File aNewFile = null;
+ String aFileStatus = "";
+ String aFileDescription = "";
+
// Reset the File info fields
itsNewFile = null;
- itsFileDescription="";
- itsFileStatus="";
-
+ itsFileDescription = "";
+ itsFileStatus = "";
+
// show login dialog
- if (loadFileDialog == null ) {
- loadFileDialog = new LoadFileDialog(itsMainFrame,true,aType);
+ if (loadFileDialog == null) {
+ loadFileDialog = new LoadFileDialog(itsMainFrame, true, aType);
} else {
loadFileDialog.setType(aType);
}
@@ -1432,10 +1458,10 @@ public class MainPanel extends javax.swing.JPanel
loadFileDialog.setStatusVisible(false);
}
loadFileDialog.setVisible(true);
- if(loadFileDialog.isOk()) {
+ if (loadFileDialog.isOk()) {
aFileDescription = loadFileDialog.getDescription();
aFileStatus = loadFileDialog.getStatus();
- aNewFile = loadFileDialog.getFile();
+ aNewFile = loadFileDialog.getFile();
} else {
logger.info("No File chosen");
return false;
@@ -1443,7 +1469,7 @@ public class MainPanel extends javax.swing.JPanel
if (aNewFile != null && aNewFile.exists()) {
logger.trace("File to load: " + aNewFile.getName());
logger.debug("Status: " + aFileStatus);
- logger.debug("Description: "+ aFileDescription);
+ logger.debug("Description: " + aFileDescription);
itsNewFile = aNewFile;
if (aType.equals("VIC-component")) {
itsFileStatus = "";
@@ -1455,227 +1481,227 @@ public class MainPanel extends javax.swing.JPanel
}
return false;
}
-
+
private void validateButtons() {
// depending on the tabfocus and the info the selected row contains
// certain buttons are valid and others need to be grey out
- jOTDBtree aTree=null;
- String aTreeState="";
- String aClassif="";
-
- int treeID=getSelectedTreeID();
- int componentID=itsMainFrame.getSharedVars().getComponentID();
- logger.debug("Selected Tree: "+treeID);
+ jOTDBtree aTree = null;
+ String aTreeState = "";
+ String aClassif = "";
+
+ int treeID = getSelectedTreeID();
+ int componentID = itsMainFrame.getSharedVars().getComponentID();
+ logger.debug("Selected Tree: " + treeID);
if (treeID > 0) {
try {
- aTree = OtdbRmi.getRemoteOTDB().getTreeInfo(treeID,false);
+ aTree = OtdbRmi.getRemoteOTDB().getTreeInfo(treeID, false);
aTreeState = OtdbRmi.getRemoteTypes().getTreeState(aTree.state);
- aClassif = OtdbRmi.getRemoteTypes().getClassif(aTree.classification);
+ aClassif = OtdbRmi.getRemoteTypes().getClassif(aTree.classification);
} catch (RemoteException ex) {
- String aS="Couldn't get Tree "+ treeID;
+ String aS = "Couldn't get Tree " + treeID;
logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
return;
}
}
switch (itsTabFocus) {
case "PIC":
- if (treeID>0) {
+ if (treeID > 0) {
if (aTreeState.equals("active")) {
- buttonPanel1.setButtonEnabled("Delete",false);
+ buttonPanel1.setButtonEnabled("Delete", false);
} else {
- buttonPanel1.setButtonEnabled("Delete",true);
+ buttonPanel1.setButtonEnabled("Delete", true);
}
- buttonPanel1.setButtonEnabled("View",true);
- buttonPanel1.setButtonEnabled("Info",true);
- buttonPanel1.setButtonEnabled("State History",true);
+ buttonPanel1.setButtonEnabled("View", true);
+ buttonPanel1.setButtonEnabled("Info", true);
+ buttonPanel1.setButtonEnabled("State History", true);
} else {
- buttonPanel1.setButtonEnabled("State History",false);
- buttonPanel1.setButtonEnabled("Delete",false);
- buttonPanel1.setButtonEnabled("View",false);
- buttonPanel1.setButtonEnabled("Info",false);
+ buttonPanel1.setButtonEnabled("State History", false);
+ buttonPanel1.setButtonEnabled("Delete", false);
+ buttonPanel1.setButtonEnabled("View", false);
+ buttonPanel1.setButtonEnabled("Info", false);
}
break;
case "VIC":
if (VICPanel.getSelectedRowCount() > 1) {
- multipleSelection=true;
+ multipleSelection = true;
} else {
- multipleSelection=false;
+ multipleSelection = false;
}
- if (treeID>0) {
+ if (treeID > 0) {
// !!!!!!!!!!!!!!
// Need to see if buttons need to be invalidated under certain states....
//
if (!multipleSelection) {
- buttonPanel1.setButtonEnabled("State History",true);
- buttonPanel1.setButtonEnabled("View",true);
- buttonPanel1.setButtonEnabled("Query Panel",true);
- buttonPanel1.setButtonEnabled("Refresh",true);
+ buttonPanel1.setButtonEnabled("State History", true);
+ buttonPanel1.setButtonEnabled("View", true);
+ buttonPanel1.setButtonEnabled("Query Panel", true);
+ buttonPanel1.setButtonEnabled("Refresh", true);
} else {
- buttonPanel1.setButtonEnabled("Query Panel",false);
- buttonPanel1.setButtonEnabled("Refresh",false);
- buttonPanel1.setButtonEnabled("State History",false);
- buttonPanel1.setButtonEnabled("View",false);
+ buttonPanel1.setButtonEnabled("Query Panel", false);
+ buttonPanel1.setButtonEnabled("Refresh", false);
+ buttonPanel1.setButtonEnabled("State History", false);
+ buttonPanel1.setButtonEnabled("View", false);
}
- buttonPanel1.setButtonEnabled("Delete",true);
- buttonPanel1.setButtonEnabled("Schedule",true);
+ buttonPanel1.setButtonEnabled("Delete", true);
+ buttonPanel1.setButtonEnabled("Schedule", true);
} else {
- buttonPanel1.setButtonEnabled("Delete",false);
- buttonPanel1.setButtonEnabled("View",false);
- buttonPanel1.setButtonEnabled("State History",false);
- buttonPanel1.setButtonEnabled("Schedule",false);
+ buttonPanel1.setButtonEnabled("Delete", false);
+ buttonPanel1.setButtonEnabled("View", false);
+ buttonPanel1.setButtonEnabled("State History", false);
+ buttonPanel1.setButtonEnabled("Schedule", false);
}
break;
case "Templates":
if (TemplatesPanel.getSelectedRowCount() > 1) {
- multipleSelection=true;
+ multipleSelection = true;
} else {
- multipleSelection=false;
+ multipleSelection = false;
}
if (treeID > 0) {
- if ((aTreeState.equals("idle") ||
- aTreeState.equals("described") ||
- aTreeState.equals("prepared") ||
- aTreeState.equals("approved")) && !multipleSelection) {
- buttonPanel1.setButtonEnabled("Duplicate",true);
- buttonPanel1.setButtonEnabled("Modify",true);
- buttonPanel1.setButtonEnabled("Set to Default",true);
- buttonPanel1.setButtonEnabled("Query Panel",true);
+ if ((aTreeState.equals("idle")
+ || aTreeState.equals("described")
+ || aTreeState.equals("prepared")
+ || aTreeState.equals("approved")) && !multipleSelection) {
+ buttonPanel1.setButtonEnabled("Duplicate", true);
+ buttonPanel1.setButtonEnabled("Modify", true);
+ buttonPanel1.setButtonEnabled("Set to Default", true);
+ buttonPanel1.setButtonEnabled("Query Panel", true);
if (aTreeState.equals("approved") || aTreeState.equals("on_hold") || aTreeState.equals("prescheduled")) {
- buttonPanel1.setButtonEnabled("Build VIC tree",true);
+ buttonPanel1.setButtonEnabled("Build VIC tree", true);
} else {
- buttonPanel1.setButtonEnabled("Build VIC tree",false);
+ buttonPanel1.setButtonEnabled("Build VIC tree", false);
}
} else {
- buttonPanel1.setButtonEnabled("Duplicate",false);
- buttonPanel1.setButtonEnabled("Modify",false);
- buttonPanel1.setButtonEnabled("Set to Default",false);
+ buttonPanel1.setButtonEnabled("Duplicate", false);
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("Set to Default", false);
}
if (multipleSelection) {
- buttonPanel1.setButtonEnabled("State History",false);
- buttonPanel1.setButtonEnabled("Duplicate",false);
- buttonPanel1.setButtonEnabled("Modify",false);
- buttonPanel1.setButtonEnabled("MultiEdit",true);
- buttonPanel1.setButtonEnabled("Query Panel",false);
- buttonPanel1.setButtonEnabled("Refresh",false);
+ buttonPanel1.setButtonEnabled("State History", false);
+ buttonPanel1.setButtonEnabled("Duplicate", false);
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("MultiEdit", true);
+ buttonPanel1.setButtonEnabled("Query Panel", false);
+ buttonPanel1.setButtonEnabled("Refresh", false);
} else {
- buttonPanel1.setButtonEnabled("State History",true);
- buttonPanel1.setButtonEnabled("Duplicate",true);
- buttonPanel1.setButtonEnabled("Modify",true);
- buttonPanel1.setButtonEnabled("MultiEdit",false);
- buttonPanel1.setButtonEnabled("Query Panel",true);
- buttonPanel1.setButtonEnabled("Refresh",true);
+ buttonPanel1.setButtonEnabled("State History", true);
+ buttonPanel1.setButtonEnabled("Duplicate", true);
+ buttonPanel1.setButtonEnabled("Modify", true);
+ buttonPanel1.setButtonEnabled("MultiEdit", false);
+ buttonPanel1.setButtonEnabled("Query Panel", true);
+ buttonPanel1.setButtonEnabled("Refresh", true);
}
- buttonPanel1.setButtonEnabled("Delete",true);
- buttonPanel1.setButtonEnabled("Change Status",true);
+ buttonPanel1.setButtonEnabled("Delete", true);
+ buttonPanel1.setButtonEnabled("Change Status", true);
} else {
- buttonPanel1.setButtonEnabled("Duplicate",false);
- buttonPanel1.setButtonEnabled("State History",false);
- buttonPanel1.setButtonEnabled("Modify",false);
- buttonPanel1.setButtonEnabled("Delete",false);
- buttonPanel1.setButtonEnabled("Change Status",false);
- buttonPanel1.setButtonEnabled("Build VIC tree",false);
- buttonPanel1.setButtonEnabled("Set to Default",false);
+ buttonPanel1.setButtonEnabled("Duplicate", false);
+ buttonPanel1.setButtonEnabled("State History", false);
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("Delete", false);
+ buttonPanel1.setButtonEnabled("Change Status", false);
+ buttonPanel1.setButtonEnabled("Build VIC tree", false);
+ buttonPanel1.setButtonEnabled("Set to Default", false);
}
break;
case "Default Templates":
if (DefaultTemplatesPanel.getSelectedRowCount() > 1) {
- multipleSelection=true;
+ multipleSelection = true;
} else {
- multipleSelection=false;
+ multipleSelection = false;
}
if (treeID > 0) {
- if ((aTreeState.equals("idle") ||
- aTreeState.equals("described") ||
- aTreeState.equals("prepared") ||
- aTreeState.equals("approved")) && !multipleSelection) {
- buttonPanel1.setButtonEnabled("Duplicate",true);
- buttonPanel1.setButtonEnabled("Modify",true);
+ if ((aTreeState.equals("idle")
+ || aTreeState.equals("described")
+ || aTreeState.equals("prepared")
+ || aTreeState.equals("approved")) && !multipleSelection) {
+ buttonPanel1.setButtonEnabled("Duplicate", true);
+ buttonPanel1.setButtonEnabled("Modify", true);
} else {
- buttonPanel1.setButtonEnabled("Duplicate",false);
- buttonPanel1.setButtonEnabled("Modify",false);
+ buttonPanel1.setButtonEnabled("Duplicate", false);
+ buttonPanel1.setButtonEnabled("Modify", false);
}
if (multipleSelection) {
- buttonPanel1.setButtonEnabled("State History",false);
- buttonPanel1.setButtonEnabled("Duplicate",false);
- buttonPanel1.setButtonEnabled("Modify",false);
+ buttonPanel1.setButtonEnabled("State History", false);
+ buttonPanel1.setButtonEnabled("Duplicate", false);
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("Change Status", false);
} else {
- buttonPanel1.setButtonEnabled("State History",true);
- buttonPanel1.setButtonEnabled("Duplicate",true);
- buttonPanel1.setButtonEnabled("Modify",true);
+ buttonPanel1.setButtonEnabled("State History", true);
+ buttonPanel1.setButtonEnabled("Duplicate", true);
+ buttonPanel1.setButtonEnabled("Modify", true);
+ buttonPanel1.setButtonEnabled("Change Status", true);
}
- buttonPanel1.setButtonEnabled("Change Status",true);
+ buttonPanel1.setButtonEnabled("Remove from Default", true);
} else {
- buttonPanel1.setButtonEnabled("Duplicate",false);
- buttonPanel1.setButtonEnabled("Modify",false);
- buttonPanel1.setButtonEnabled("State History",false);
- buttonPanel1.setButtonEnabled("Change Status",false);
- }break;
+ buttonPanel1.setButtonEnabled("Duplicate", false);
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("State History", false);
+ buttonPanel1.setButtonEnabled("Change Status", false);
+ buttonPanel1.setButtonEnabled("Remove from Default", false);
+ }
+ break;
case "Components":
if (ComponentsPanel.getSelectedRowCount() > 1) {
- multipleSelection=true;
+ multipleSelection = true;
} else {
- multipleSelection=false;
+ multipleSelection = false;
}
- if (componentID > 0 ) {
+ if (componentID > 0) {
if (multipleSelection) {
- buttonPanel1.setButtonEnabled("Modify",false);
- buttonPanel1.setButtonEnabled("Query Panel",false);
- buttonPanel1.setButtonEnabled("New",false);
- buttonPanel1.setButtonEnabled("Refresh",false);
- buttonPanel1.setButtonEnabled("Build TemplateTree",false);
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("Query Panel", false);
+ buttonPanel1.setButtonEnabled("New", false);
+ buttonPanel1.setButtonEnabled("Refresh", false);
+ buttonPanel1.setButtonEnabled("Build TemplateTree", false);
} else {
- buttonPanel1.setButtonEnabled("Modify",true);
- buttonPanel1.setButtonEnabled("Query Panel",true);
- buttonPanel1.setButtonEnabled("New",true);
- buttonPanel1.setButtonEnabled("Refresh",true);
- buttonPanel1.setButtonEnabled("Build TemplateTree",true);
+ buttonPanel1.setButtonEnabled("Modify", true);
+ buttonPanel1.setButtonEnabled("Query Panel", true);
+ buttonPanel1.setButtonEnabled("New", true);
+ buttonPanel1.setButtonEnabled("Refresh", true);
+ buttonPanel1.setButtonEnabled("Build TemplateTree", true);
try {
if (OtdbRmi.getRemoteMaintenance().isTopComponent(componentID)) {
- buttonPanel1.setButtonEnabled("Build TemplateTree",true);
+ buttonPanel1.setButtonEnabled("Build TemplateTree", true);
} else {
- buttonPanel1.setButtonEnabled("Build TemplateTree",false);
+ buttonPanel1.setButtonEnabled("Build TemplateTree", false);
}
} catch (RemoteException ex) {
- String aS="Error checking isTopComponent";
+ String aS = "Error checking isTopComponent";
logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
}
- buttonPanel1.setButtonEnabled("Delete",true);
+ buttonPanel1.setButtonEnabled("Delete", true);
} else {
- buttonPanel1.setButtonEnabled("Delete",false);
- buttonPanel1.setButtonEnabled("Modify",false);
- buttonPanel1.setButtonEnabled("Query Panel",false);
- buttonPanel1.setButtonEnabled("New",false);
- buttonPanel1.setButtonEnabled("Refresh",false);
- buttonPanel1.setButtonEnabled("Build TemplateTree",false);
+ buttonPanel1.setButtonEnabled("Delete", false);
+ buttonPanel1.setButtonEnabled("Modify", false);
+ buttonPanel1.setButtonEnabled("Query Panel", false);
+ buttonPanel1.setButtonEnabled("New", false);
+ buttonPanel1.setButtonEnabled("Refresh", false);
+ buttonPanel1.setButtonEnabled("Build TemplateTree", false);
}
break;
case "Query Results":
break;
}
}
-
- private MainFrame itsMainFrame = null;
- private String itsTabFocus="PIC";
- private boolean buttonsInitialized=false;
- private LoadFileDialog loadFileDialog = null;
- private TreeInfoDialog treeInfoDialog = null;
- private MultiEditDialog multiEditDialog = null;
+ private MainFrame itsMainFrame = null;
+ private String itsTabFocus = "PIC";
+ private boolean buttonsInitialized = false;
+ private LoadFileDialog loadFileDialog = null;
+ private TreeInfoDialog treeInfoDialog = null;
+ private MultiEditDialog multiEditDialog = null;
private CreateDefaultTemplateDialog defaultTemplateDialog = null;
- private TableDialog stateChangeHistoryDialog = null;
+ private TableDialog stateChangeHistoryDialog = null;
private StateChangeHistoryTableModel itsStateChangeModel = null;
- private boolean changed=false;
- private boolean multipleSelection=false;
-
+ private boolean changed = false;
+ private boolean multipleSelection = false;
// File to be loaded info
- File itsNewFile=null;
- String itsFileDescription="";
+ File itsNewFile = null;
+ String itsFileDescription = "";
String itsFileStatus = "";
-
-
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel AdminPanel;
private nl.astron.lofar.sas.otbcomponents.TablePanel ComponentsPanel;
@@ -1687,5 +1713,4 @@ public class MainPanel extends javax.swing.JPanel
private nl.astron.lofar.sas.otbcomponents.ButtonPanel buttonPanel1;
private javax.swing.JTabbedPane jTabbedPane1;
// End of variables declaration//GEN-END:variables
-
}
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 e2f9b7b94ca2a9177897774515df81f55b42597f..637c406b936468e7cd8e559624f782582bf263e7 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
@@ -61,7 +61,6 @@ public class BeamConfigurationTableModel extends javax.swing.table.DefaultTableM
this.addColumn("coordtype");
this.addColumn("#TAB");
this.addColumn("subbands");
- this.addColumn("beamlets");
}
/** fills the table with the initial settings
@@ -138,8 +137,7 @@ public class BeamConfigurationTableModel extends javax.swing.table.DefaultTableM
aBeam.getAngle2(),
aBeam.getCoordType(),
aBeam.getNrTiedArrayBeams(),
- aBeam.getSubbandList(),
- aBeam.getBeamletList() };
+ aBeam.getSubbandList() };
this.addRow(newRow);
itsBeams.trimToSize();
@@ -171,7 +169,6 @@ public class BeamConfigurationTableModel extends javax.swing.table.DefaultTableM
this.setValueAt(newBeam.getCoordType(),row,3);
this.setValueAt(newBeam.getNrTiedArrayBeams(),row,5);
this.setValueAt(newBeam.getSubbandList(),row,6);
- this.setValueAt(newBeam.getBeamletList(),row,7);
isChanged=true;
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.form
index a1ff016b431d68b4b3b6028720b44e4b5e4a18cd..b41add2590a183726a1835d99d29c28ed980ac93 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.form
@@ -107,25 +107,14 @@
<EmptySpace max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <Component id="labelSubbandList" pref="87" max="32767" attributes="1"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <Component id="labelBeamletList" min="-2" max="-2" attributes="1"/>
- <EmptySpace min="-2" pref="45" max="-2" attributes="0"/>
- </Group>
- </Group>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="inputBeamletList" max="32767" attributes="1"/>
- <Component id="inputSubbandList" alignment="0" pref="1077" max="32767" attributes="1"/>
- </Group>
+ <Component id="labelSubbandList" pref="102" max="32767" attributes="1"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="inputSubbandList" min="-2" pref="1077" max="-2" attributes="1"/>
<EmptySpace min="-2" pref="665" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jPanel3" min="-2" pref="1201" max="-2" attributes="1"/>
- <EmptySpace pref="646" max="32767" attributes="0"/>
+ <EmptySpace pref="661" max="32767" attributes="0"/>
</Group>
</Group>
</Group>
@@ -173,12 +162,7 @@
<Component id="labelSubbandList" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="inputSubbandList" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="labelBeamletList" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="inputBeamletList" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace type="separate" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="49" max="-2" attributes="0"/>
<Component id="jPanel3" min="-2" pref="267" max="-2" attributes="1"/>
<EmptySpace min="-2" pref="94" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
@@ -224,13 +208,6 @@
</Component>
<Component class="javax.swing.JTextField" name="inputSubbandList">
</Component>
- <Component class="javax.swing.JLabel" name="labelBeamletList">
- <Properties>
- <Property name="text" type="java.lang.String" value="Beamlets :"/>
- </Properties>
- </Component>
- <Component class="javax.swing.JTextField" name="inputBeamletList">
- </Component>
<Component class="javax.swing.JButton" name="cancelButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
@@ -311,7 +288,7 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
- <Component id="TABConfigurationPanel" pref="201" max="32767" attributes="0"/>
+ <Component id="TABConfigurationPanel" pref="202" max="32767" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="addTiedArrayBeamButton" alignment="3" min="-2" max="-2" attributes="0"/>
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 2d4b0ba1a1e028838706b296c69f7a33138ac002..60c7b3ddd62ff1f43306b89adc25768e985a5dba 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
@@ -21,7 +21,6 @@
package nl.astron.lofar.sas.otbcomponents;
import java.util.ArrayList;
-import java.util.BitSet;
import javax.swing.JOptionPane;
import javax.swing.ListSelectionModel;
import javax.swing.border.TitledBorder;
@@ -49,20 +48,17 @@ public class BeamDialog extends javax.swing.JDialog {
*
* @param parent Frame where this dialog belongs
* @param modal Should the Dialog be modal or not
- * @param usedBeamlets Bitset of all used beamlets(in case edit, the old ones have been xorred allready)
* @param selection Vector of all Beam parameters
* @param directionTypeChoices String with all possible choices + default for combobox
* @param edit indicates edit or add mode
* @param show indicates show only mode
*/
- public BeamDialog(java.awt.Frame parent, String treeType, boolean modal,BitSet usedBeamlets, Beam aBeam, boolean edit, boolean show ) {
+ public BeamDialog(java.awt.Frame parent, String treeType, boolean modal,Beam aBeam, boolean edit, boolean show ) {
super(parent, modal);
initComponents();
LofarUtils.setPopupComboChoices(inputDirectionTypes,aBeam.getDirectionTypeChoices());
itsBeam = aBeam;
- itsSavedBeamlets=(BitSet)usedBeamlets.clone();
- itsUsedBeamlets=(BitSet)usedBeamlets.clone();
editting=edit;
showing=show;
itsTreeType = treeType;
@@ -99,29 +95,6 @@ public class BeamDialog extends javax.swing.JDialog {
return true;
}
- // check if Beamlets are spelled correctly and if Beamlets are not used by other Beams'
- private boolean checkBeamlets(){
- if (inputBeamletList.getText().length() <=2) {
- return true;
- }
-
- BitSet aBitSet = LofarUtils.beamletToBitSet(LofarUtils.expandedArrayString(inputBeamletList.getText()));
- if(itsUsedBeamlets.intersects(aBitSet)) {
- return false;
- } else {
- itsUsedBeamlets.or(aBitSet);
- }
- return true;
- }
-
- // check if nr of beamlets used and nr of subbands used are equal
- private boolean checkNrOfBeamletsAndSubbands() {
- if (LofarUtils.nrArrayStringElements(inputBeamletList.getText())!= LofarUtils.nrArrayStringElements(inputSubbandList.getText()) ) {
- return false;
- }
-
- return true;
- }
private void initialize() {
@@ -144,7 +117,6 @@ public class BeamDialog extends javax.swing.JDialog {
inputAngle2.setText(itsBeam.getAngle2());
coordTypeChange.setSelectedItem(itsBeam.getCoordType());
inputSubbandList.setText(itsBeam.getSubbandList());
- inputBeamletList.setText(itsBeam.getBeamletList());
inputDuration.setText(itsBeam.getDuration());
inputTarget.setText(itsBeam.getTarget());
inputStartTime.setText(itsBeam.getStartTime());
@@ -171,7 +143,6 @@ public class BeamDialog extends javax.swing.JDialog {
inputAngle2.setEnabled(flag);
coordTypeChange.setEnabled(flag);
inputSubbandList.setEnabled(flag);
- inputBeamletList.setEnabled(flag);
inputDuration.setEnabled(flag);
inputTarget.setEnabled(flag);
inputStartTime.setEnabled(flag);
@@ -183,10 +154,6 @@ public class BeamDialog extends javax.swing.JDialog {
return isChanged;
}
- public BitSet getBeamletList() {
- return itsUsedBeamlets;
- }
-
public void setBorderTitle(String text) {
TitledBorder aBorder=(TitledBorder)jPanel1.getBorder();
aBorder.setTitle(text);
@@ -212,8 +179,6 @@ public class BeamDialog extends javax.swing.JDialog {
inputAngle2 = new javax.swing.JTextField();
labelSubbandList = new javax.swing.JLabel();
inputSubbandList = new javax.swing.JTextField();
- labelBeamletList = new javax.swing.JLabel();
- inputBeamletList = new javax.swing.JTextField();
cancelButton = new javax.swing.JButton();
saveButton = new javax.swing.JButton();
labelDirectionTypes = new javax.swing.JLabel();
@@ -255,8 +220,6 @@ public class BeamDialog extends javax.swing.JDialog {
labelSubbandList.setText("Subbands :");
- labelBeamletList.setText("Beamlets :");
-
cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_cancel.png"))); // NOI18N
cancelButton.setText("Cancel");
cancelButton.addActionListener(new java.awt.event.ActionListener() {
@@ -338,7 +301,7 @@ public class BeamDialog extends javax.swing.JDialog {
jPanel3Layout.setVerticalGroup(
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel3Layout.createSequentialGroup()
- .add(TABConfigurationPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 201, Short.MAX_VALUE)
+ .add(TABConfigurationPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 202, Short.MAX_VALUE)
.add(18, 18, 18)
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(addTiedArrayBeamButton)
@@ -398,20 +361,13 @@ public class BeamDialog extends javax.swing.JDialog {
.add(org.jdesktop.layout.GroupLayout.LEADING, labelNrTabRings, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addContainerGap())
.add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel1Layout.createSequentialGroup()
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel1Layout.createSequentialGroup()
- .add(labelSubbandList, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 87, Short.MAX_VALUE)
- .add(18, 18, 18))
- .add(jPanel1Layout.createSequentialGroup()
- .add(labelBeamletList)
- .add(45, 45, 45)))
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(inputBeamletList)
- .add(inputSubbandList, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1077, Short.MAX_VALUE))
+ .add(labelSubbandList, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 102, Short.MAX_VALUE)
+ .add(18, 18, 18)
+ .add(inputSubbandList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1077, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(665, 665, 665))
.add(jPanel1Layout.createSequentialGroup()
.add(jPanel3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1201, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(646, Short.MAX_VALUE))))
+ .addContainerGap(661, Short.MAX_VALUE))))
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -448,11 +404,7 @@ public class BeamDialog extends javax.swing.JDialog {
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(labelSubbandList)
.add(inputSubbandList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelBeamletList)
- .add(inputBeamletList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(18, 18, 18)
+ .add(49, 49, 49)
.add(jPanel3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 267, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(94, 94, 94)
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
@@ -482,33 +434,12 @@ public class BeamDialog extends javax.swing.JDialog {
private void saveButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveButtonActionPerformed
//check if input is correct
checkChanged();
- if (hasChanged() && !checkBeamlets()) {
- if (JOptionPane.showConfirmDialog(this,"There is an error in the beamletList, some of them are allready in use by other Beams. continueing discards all changes. Continue?","Beamlet Error",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
- itsUsedBeamlets=(BitSet)itsSavedBeamlets.clone();
- isChanged=false;
- setVisible(false);
- dispose();
- } else {
- itsUsedBeamlets=(BitSet)itsSavedBeamlets.clone();
- return;
- }
- } else if (hasChanged() && !checkSubbands()) {
- if (JOptionPane.showConfirmDialog(this,"There is an error in the SubbandsList , Only subbands 1-511 can be used. continueing discards all changes. Continue?","Beamlet Error",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
- itsUsedBeamlets=(BitSet)itsSavedBeamlets.clone();
+ if (hasChanged() && !checkSubbands()) {
+ if (JOptionPane.showConfirmDialog(this,"There is an error in the SubbandsList , Only subbands 1-511 can be used. continueing discards all changes. Continue?","SubbandNr Error",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
isChanged=false;
setVisible(false);
dispose();
} else {
- itsUsedBeamlets=(BitSet)itsSavedBeamlets.clone();
- return;
- }
-
- } else if (hasChanged() && !checkNrOfBeamletsAndSubbands() ) {
- if (JOptionPane.showConfirmDialog(this,"The number of beamlets and subbands differ.","Beamlet-subband amount differ Error",JOptionPane.OK_CANCEL_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION ) {
- setVisible(false);
- dispose();
- } else {
- itsUsedBeamlets=(BitSet)itsSavedBeamlets.clone();
return;
}
@@ -523,7 +454,6 @@ public class BeamDialog extends javax.swing.JDialog {
private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed
isChanged=false;
- itsUsedBeamlets=(BitSet)itsSavedBeamlets.clone();
setVisible(false);
TABConfigurationPanel=null;
itsTABConfigurationTableModel = null;
@@ -626,10 +556,6 @@ public class BeamDialog extends javax.swing.JDialog {
isChanged=true;
return;
}
- if (!itsBeam.getBeamletList().equals(inputBeamletList.getText())) {
- isChanged=true;
- return;
- }
if (!itsBeam.getDuration().equals(inputDuration.getText())) {
isChanged=true;
return;
@@ -669,7 +595,6 @@ public class BeamDialog extends javax.swing.JDialog {
itsBeam.setDuration(inputDuration.getText());
itsBeam.setStartTime(inputStartTime.getText());
itsBeam.setSubbandList(LofarUtils.compactedArrayString(inputSubbandList.getText()));
- itsBeam.setBeamletList(LofarUtils.compactedArrayString(inputBeamletList.getText()));
itsBeam.setNrTabRings(inputNrTabRings.getText());
itsBeam.setTabRingSize(inputTabRingSize.getText());
itsBeam.setNrTiedArrayBeams(Integer.toString(itsTiedArrayBeams.size()-offset));
@@ -680,7 +605,6 @@ public class BeamDialog extends javax.swing.JDialog {
private void deleteTiedArrayBeam() {
itsSelectedRow = TABConfigurationPanel.getSelectedRow();
if (JOptionPane.showConfirmDialog(this,"Are you sure you want to delete this TAB ?","Delete TAB",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
- // if removed then the old Beamlets's should be removed form the checklist also
if (itsSelectedRow > -1) {
itsTABConfigurationTableModel.removeRow(itsSelectedRow);
// No selection anymore after delete, so buttons disabled again
@@ -737,8 +661,6 @@ public class BeamDialog extends javax.swing.JDialog {
private boolean editTiedArrayBeam = false;
private boolean editting = false;
private boolean showing = false;
- private BitSet itsUsedBeamlets = null;
- private BitSet itsSavedBeamlets = null;
private String itsTreeType = null;
private TiedArrayBeamConfigurationTableModel itsTABConfigurationTableModel = null;
@@ -753,7 +675,6 @@ public class BeamDialog extends javax.swing.JDialog {
private javax.swing.JButton editTiedArrayBeamButton;
private javax.swing.JTextField inputAngle1;
private javax.swing.JTextField inputAngle2;
- private javax.swing.JTextField inputBeamletList;
private javax.swing.JComboBox inputDirectionTypes;
private javax.swing.JTextField inputDuration;
private javax.swing.JTextField inputNrTabRings;
@@ -766,7 +687,6 @@ public class BeamDialog extends javax.swing.JDialog {
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JLabel labelAngle1;
private javax.swing.JLabel labelAngle2;
- private javax.swing.JLabel labelBeamletList;
private javax.swing.JLabel labelDirectionTypes;
private javax.swing.JLabel labelDuration;
private javax.swing.JLabel labelNrTabRings;
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.form
index 85269c318866506307d3ce92ab90a6ce9061750a..290ea233931b17d8da87eea60f54a0a5ca4730fe 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.form
@@ -75,7 +75,7 @@
<Component class="javax.swing.JTextField" name="nameInput">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="170" y="200" width="300" height="-1"/>
+ <AbsoluteConstraints x="220" y="200" width="300" height="-1"/>
</Constraint>
</Constraints>
</Component>
@@ -92,7 +92,7 @@
<Component class="javax.swing.JTextField" name="processTypeInput">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="170" y="230" width="300" height="-1"/>
+ <AbsoluteConstraints x="220" y="230" width="300" height="-1"/>
</Constraint>
</Constraints>
</Component>
@@ -109,7 +109,7 @@
<Component class="javax.swing.JTextField" name="processSubtypeInput">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="170" y="260" width="300" height="-1"/>
+ <AbsoluteConstraints x="220" y="260" width="300" height="-1"/>
</Constraint>
</Constraints>
</Component>
@@ -126,7 +126,7 @@
<Component class="javax.swing.JTextField" name="strategyInput">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="170" y="290" width="300" height="-1"/>
+ <AbsoluteConstraints x="220" y="290" width="300" height="-1"/>
</Constraint>
</Constraints>
</Component>
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 d94e66c2b686c0fc0cfcedba5bc6f0da7356f251..c19b6155fffdb1bf1b2d0d701ac587d0f06c88a0 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
@@ -116,21 +116,21 @@ public class CreateDefaultTemplateDialog extends javax.swing.JDialog {
}
});
getContentPane().add(jButtonOK, new org.netbeans.lib.awtextra.AbsoluteConstraints(110, 350, -1, -1));
- getContentPane().add(nameInput, new org.netbeans.lib.awtextra.AbsoluteConstraints(170, 200, 300, -1));
+ getContentPane().add(nameInput, new org.netbeans.lib.awtextra.AbsoluteConstraints(220, 200, 300, -1));
jLabel2.setText("ProcessType:");
getContentPane().add(jLabel2, new org.netbeans.lib.awtextra.AbsoluteConstraints(30, 230, -1, -1));
- getContentPane().add(processTypeInput, new org.netbeans.lib.awtextra.AbsoluteConstraints(170, 230, 300, -1));
+ getContentPane().add(processTypeInput, new org.netbeans.lib.awtextra.AbsoluteConstraints(220, 230, 300, -1));
jLabel3.setText("ProcessSubtype:");
getContentPane().add(jLabel3, new org.netbeans.lib.awtextra.AbsoluteConstraints(30, 260, -1, -1));
- getContentPane().add(processSubtypeInput, new org.netbeans.lib.awtextra.AbsoluteConstraints(170, 260, 300, -1));
+ getContentPane().add(processSubtypeInput, new org.netbeans.lib.awtextra.AbsoluteConstraints(220, 260, 300, -1));
jLabel4.setText("Strategy:");
getContentPane().add(jLabel4, new org.netbeans.lib.awtextra.AbsoluteConstraints(30, 290, -1, -1));
- getContentPane().add(strategyInput, new org.netbeans.lib.awtextra.AbsoluteConstraints(170, 290, 300, -1));
+ getContentPane().add(strategyInput, new org.netbeans.lib.awtextra.AbsoluteConstraints(220, 290, 300, -1));
- jLabel5.setFont(new java.awt.Font("Tahoma", 1, 14)); // NOI18N
+ jLabel5.setFont(new java.awt.Font("Tahoma", 1, 14));
jLabel5.setText("Create new Default Template");
getContentPane().add(jLabel5, new org.netbeans.lib.awtextra.AbsoluteConstraints(140, 10, 220, -1));
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 d6236d16c01480b65211c71d1e85a2f1a4a75992..b338925e885d1babf8551c3f2ad5c9e09e8b0735 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
@@ -1,4 +1,4 @@
-/* BeamDialog.java
+/* ParamExtensionDialog.java
*
* Copyright (C) 2002-2007
* ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -40,10 +40,7 @@ public class ParamExtensionDialog extends javax.swing.JDialog {
*
* @param parent Frame where this dialog belongs
* @param modal Should the Dialog be modal or not
- * @param usedBeamlets Bitset of all used beamlets(in case edit, the old ones have been xorred allready)
* @param selection Vector of all Beam parameters
- * @param directionTypeChoices String with all possible choices + default for combobox
- * @param edit indicates edit or add mode
*/
public ParamExtensionDialog(java.awt.Frame parent, boolean modal, String[] selection) {
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 f9a0411a9e6d4c47e92492143fa82480d1e0d0e0..0266542a67dea7a472673e9d0d3f0d0a2c49f208 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
@@ -32,7 +32,6 @@ import java.io.IOException;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.BitSet;
import java.util.Collection;
import javax.swing.DefaultListModel;
import javax.swing.JFileChooser;
@@ -487,12 +486,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
} else {
itsActiveBeam.setStartTime(aNode.limits);
}break;
- case "beamletList":
- if (isRef && aParam != null) {
- itsActiveBeam.setBeamletList(aNode.limits + " : " + aParam.limits);
- } else {
- itsActiveBeam.setBeamletList(aNode.limits);
- }break;
case "subbandList":
if (isRef && aParam != null) {
itsActiveBeam.setSubbandList(aNode.limits + " : " + aParam.limits);
@@ -721,13 +714,8 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
inputDescription.setText("");
inputTreeDescription.setText(itsOldTreeDescription);
- if (!itsTreeType.equals("VHtree")) {
- // Observation Beam parameters
- // create original Beamlet Bitset
- fillBeamletBitset();
- }
- // set tables back to initial values
- boolean fillTable = itsBeamConfigurationTableModel.fillTable(itsTreeType,itsBeamList,false);
+ // set tables back to initial values
+ boolean fillTable = itsBeamConfigurationTableModel.fillTable(itsTreeType,itsBeamList,false);
itsAnaBeamConfigurationTableModel.fillTable(itsTreeType,itsAnaBeamList,false);
itsBeamformerConfigurationTableModel.fillTable(itsTreeType, itsStations);
@@ -762,27 +750,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
// also restore antennaConfigPanel
antennaConfigPanel.restore();
}
-
-
- /** fill the Beamlet bitset to see what Beamlets have been set. To be able to determine later if a given Beamlet is indeed free.
- */
- private void fillBeamletBitset() {
- itsUsedBeamlets.clear();
- for (Beam b : itsBeamList) {
- BitSet aNewBitSet=b.getBeamletBitSet();
- // check if no duplication between the two bitsets
- if (itsUsedBeamlets.intersects(aNewBitSet)) {
- String errorMsg = "ERROR: This BeamletList has beamlets defined that are allready used in a prior BeamConfiguration!!!!! Beam: "+b;
- JOptionPane.showMessageDialog(this,errorMsg,"BeamletError",JOptionPane.ERROR_MESSAGE);
- logger.debug(errorMsg );
- return;
- }
-
- // No intersection, both bitsets can be or
- itsUsedBeamlets.or(aNewBitSet);
- }
- }
-
+
private void initialize() {
buttonPanel1.addButton("Restore");
@@ -803,7 +771,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
beamConfigurationPanel.setColumnSize("coordtype",24);
beamConfigurationPanel.setColumnSize("#TAB",24);
beamConfigurationPanel.setColumnSize("subbands",65);
- beamConfigurationPanel.setColumnSize("beamlets",65);
beamConfigurationPanel.repaint();
itsAnaBeamConfigurationTableModel = new AnaBeamConfigurationTableModel();
@@ -862,7 +829,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
}
// set defaults
- // create initial beamletBitset
// create initial table
restore();
@@ -1126,9 +1092,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
case "subbandList" :
n.limits=b.getSubbandList();
break;
- case "beamletList" :
- n.limits=b.getBeamletList();
- break;
case "momID" :
n.limits=b.getMomID();
break;
@@ -1477,11 +1440,8 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
private void deleteBeam() {
int row = beamConfigurationPanel.getSelectedRow();
if (JOptionPane.showConfirmDialog(this,"Are you sure you want to delete this Beam ?","Delete Beam",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
- // if removed then the old Beamlets's should be removed form the checklist also
- BitSet beamletSet = itsBeamConfigurationTableModel.getSelection(row).getBeamletBitSet();
if (row > -1) {
itsBeamConfigurationTableModel.removeRow(row);
- itsUsedBeamlets.xor(beamletSet);
// No selection anymore after delete, so buttons disabled again
this.editBeamButton.setEnabled(false);
this.deleteBeamButton.setEnabled(false);
@@ -1522,7 +1482,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
private void addBeam() {
- BitSet aBS=itsUsedBeamlets;
itsSelectedRow=-1;
itsSelectedRow = beamConfigurationPanel.getSelectedRow();
// set selection to defaults.
@@ -1530,10 +1489,8 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
if (editBeam) {
selection = itsBeamConfigurationTableModel.getSelection(itsSelectedRow);
- BitSet oldBeamlets = selection.getBeamletBitSet();
- aBS.xor(oldBeamlets);
}
- beamDialog = new BeamDialog(itsMainFrame,itsTreeType,true,aBS,selection.clone(),editBeam,showBeam);
+ beamDialog = new BeamDialog(itsMainFrame,itsTreeType,true,selection.clone(),editBeam,showBeam);
beamDialog.setLocationRelativeTo(this);
if (editBeam) {
@@ -1550,7 +1507,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
// check if something has changed
if (beamDialog.hasChanged()) {
Beam newBeam = beamDialog.getBeam();
- itsUsedBeamlets=beamDialog.getBeamletList();
// check if we are editting an entry or adding a new entry
if (editBeam) {
itsBeamConfigurationTableModel.updateRow(newBeam,itsSelectedRow);
@@ -1648,7 +1604,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
// beam0.directionType=AZEL
// beam0.duration=300
// beam0.subbandList=[1,2,3,4,5]
- // beam0.beamletList[1,2,3,4,5]
// beam0.tiedarraybeam0.angle1 = 1
// #
// beam1.target=test2
@@ -1658,7 +1613,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
// beam1.directionType=LMN
// beam1.duration=360
// beam1.subbandList=[6..10]
- // beam1.beamletList[6..10]
//
if (choice.equals("AnaBeams") || choice.equals("Beams")) {
File aNewFile=null;
@@ -1913,17 +1867,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
break;
}
break;
- case "beamletlist" :
- switch (check) {
- case "beam" :
- readBeams.get(idx+1).setBeamletList(keyVal[1]);
- break;
- case "anabeam" :
- break;
- case "tiedarraybeam" :
- break;
- }
- break;
case "nrtiedarraybeams" :
switch (check) {
case "beam" :
@@ -2761,8 +2704,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
// keeps lists of available (unused) and all used stations for Beamformer creation
private ArrayList<String> itsAvailableBeamformStations = new ArrayList<>();
private ArrayList<String> itsUsedBeamformStations = new ArrayList<>();
- // each beamlet has its bit in the bitset
- private BitSet itsUsedBeamlets = new BitSet(216);
private boolean editBeam = false;
private boolean editAnaBeam = false;
private boolean showBeam = false;
diff --git a/SAS/OTDB/bin/database.py b/SAS/OTDB/bin/database.py
index bab0435633ce8344100da5093e7a618c2df6df2f..900f9c8a1292fa4953083fcd1876e3e3c6af7be9 100644
--- a/SAS/OTDB/bin/database.py
+++ b/SAS/OTDB/bin/database.py
@@ -2,8 +2,8 @@
#coding: iso-8859-15
## database info
-dbName="BBSbwcomp"
-dbHost="rs005"
+dbName="LOFAR_4"
+dbHost="sas001"
def getDBname():
return(dbName)