diff --git a/Appl/CEP/CS1/CS1_Storage/test/AH_TestStorage.cc b/Appl/CEP/CS1/CS1_Storage/test/AH_TestStorage.cc
index 33f3b4c7e8b80399b4496fc2848d37966971d3d7..b6f4c71b3a8194d41da83bca572279c6da324cad 100644
--- a/Appl/CEP/CS1/CS1_Storage/test/AH_TestStorage.cc
+++ b/Appl/CEP/CS1/CS1_Storage/test/AH_TestStorage.cc
@@ -51,18 +51,35 @@ namespace LOFAR
Composite comp(0, 0, "topComposite");
setComposite(comp); // tell the ApplicationHolder this is the top-level composite
- int nrSubbands = itsParamSet.getInt32("Observation.NSubbands");
-
- for (int subb=0; subb< nrSubbands; subb++)
+ itsCS1PS = new CS1_Parset(&itsParamSet);
+
+
+ int nrSubbands = itsCS1PS->nrSubbands();
+
+
+ uint nrSubbandsPerPset = itsCS1PS->nrSubbandsPerPset();
+ uint nrPsetsPerStorage = itsParamSet.getUint32("OLAP.psetsPerStorage");
+ uint nrWriters = nrSubbands / nrSubbandsPerPset / nrPsetsPerStorage;
+ ASSERT(nrSubbands % nrSubbandsPerPset == 0);
+ ASSERT(nrSubbands / nrSubbandsPerPset % nrPsetsPerStorage == 0);
+ LOG_TRACE_VAR_STR("Creating " << nrWriters << " subband writers ...");
+
+ for (unsigned nw = 0; nw < nrWriters; ++nw)
{
- vector<uint> subbands; subbands.push_back(subb);
- WH_SubbandWriter wh("storage1", subbands, itsParamSet);
+ vector<uint> sbIDs(nrSubbandsPerPset * nrPsetsPerStorage);
+ for (uint i = 0; i < nrSubbandsPerPset * nrPsetsPerStorage; ++i) {
+ sbIDs[i] = nrSubbandsPerPset * nrPsetsPerStorage * nw + i;
+ LOG_TRACE_LOOP_STR("Writer " << nw << ": sbIDs[" << i << "] = "
+ << sbIDs[i]);
+ }
+
+ WH_SubbandWriter wh("storage1", sbIDs, itsCS1PS);
Step step(wh);
comp.addBlock(step);
for (int nr=0; nr < step.getNrInputs(); nr++)
{
- DH_Visibilities* inDH = new DH_Visibilities("in_"+nr, itsParamSet);
+ DH_Visibilities* inDH = new DH_Visibilities("in_"+nr, itsCS1PS);
itsInDHs.push_back(inDH);
Connection* inConn = new Connection("in_"+nr,
@@ -81,9 +98,9 @@ namespace LOFAR
}
void AH_TestStorage::setTestPattern(DH_Visibilities &dh, int factor) {
- unsigned nrPolarizations = itsParamSet.getUint32("Observation.NPolarisations");
- unsigned nrChannels = itsParamSet.getUint32("Observation.NChannels");
- unsigned nrStations = itsParamSet.getUint32("Observation.NStations");
+ unsigned nrPolarizations = itsCS1PS->getUint32("Observation.nrPolarisations");
+ unsigned nrChannels = itsCS1PS->nrChannelsPerSubband();
+ unsigned nrStations = itsCS1PS->nrStations();
unsigned nrBaselines = (nrStations + 1) * nrStations / 2;
for (unsigned bl = 0; bl < nrBaselines; bl++) {
@@ -141,6 +158,7 @@ namespace LOFAR
}
itsInDHs.clear();
itsInConns.clear();
+ delete itsCS1PS; itsCS1PS = 0;
}
void AH_TestStorage::quit() {
diff --git a/Appl/CEP/CS1/CS1_Storage/test/AH_TestStorage.h b/Appl/CEP/CS1/CS1_Storage/test/AH_TestStorage.h
index 0f3bc3471df46de031a10684a94bedf46714a990..0177eb30425e10146bf21b476a74a0ae42d948ab 100644
--- a/Appl/CEP/CS1/CS1_Storage/test/AH_TestStorage.h
+++ b/Appl/CEP/CS1/CS1_Storage/test/AH_TestStorage.h
@@ -24,6 +24,7 @@
#define LOFAR_CS1_AH_TESTSTORAGE_H
#include <CEPFrame/ApplicationHolder.h>
+#include <CS1_Interface/CS1_Parset.h>
namespace LOFAR
{
@@ -53,6 +54,7 @@ namespace LOFAR
vector<DH_Visibilities*> itsInDHs;
vector<Connection*> itsInConns;
+ CS1_Parset *itsCS1PS;
};
} // namespace CS1
diff --git a/Appl/CEP/CS1/CS1_Storage/test/CS1.parset b/Appl/CEP/CS1/CS1_Storage/test/CS1.parset
new file mode 100644
index 0000000000000000000000000000000000000000..ead45ee5979af79d8857c8c57a628477d7492387
--- /dev/null
+++ b/Appl/CEP/CS1/CS1_Storage/test/CS1.parset
@@ -0,0 +1,335 @@
+OLAP.BGLProc.coresPerPset = 16
+OLAP.BGLProc.inputPsets = [8]
+OLAP.BGLProc.integrationSteps = 768
+OLAP.BGLProc.maxConcurrentComm = 1
+OLAP.BGLProc.nrPPFTaps = 16
+OLAP.BGLProc.outputPsets = [0, 1]
+OLAP.DelayComp.converterType = IMPL
+OLAP.DelayComp.hostname = 10.181.0.1
+OLAP.DelayComp.ports = [7200..7263]
+OLAP.DelayComp.positionType = ITRF
+OLAP.EPAHeaderSize = 16
+OLAP.IONProc.integrationSteps = 10
+OLAP.IONProc.useGather = T
+OLAP.IPHeaderSize = 32
+OLAP.OLAP_Conn.AMCServerHost = localhost
+OLAP.OLAP_Conn.AMCServerPort = 31337
+OLAP.OLAP_Conn.BGLProc_Storage_Ports = [8300..8363]
+OLAP.OLAP_Conn.BGLProc_Storage_ServerHosts = [10.181.0.1,10.181.0.2]
+OLAP.OLAP_Conn.BGLProc_Storage_Transport = TCP
+OLAP.OLAP_Conn.input_BGLProc_Ports = [8100..8163]
+OLAP.OLAP_Conn.input_DelayComp_Transport = TCP
+OLAP.OLAP_Conn.station_Input_Transport = UDP
+OLAP.StorageProc.integrationSteps = 1
+OLAP.StorageProc.subbandsPerMS = 1
+OLAP.delayCompensation = T
+OLAP.nrBitsPerSample = 16
+OLAP.nrRSPboards = 1
+OLAP.nrSecondsOfBuffer = 6
+OLAP.nrSubbandsPerFrame = 36
+OLAP.nrTimesInFrame = 16
+OLAP.psetsPerStorage = 1
+OLAP.storageStationNames = ['CS008_dipole0']
+OLAP.subbandsPerPset = 2
+Observation.Beam.angle1 = [0]
+Observation.Beam.angle2 = [1.570796327]
+Observation.Beam.directionTypes = J2000
+Observation.MSNameMask = SB${SUBBAND}.MS
+Observation.NSubbands = 2
+Observation.ObsID = 4980
+Observation.RefFreqs = [0.0, 195312.5]
+Observation.VirtualInstrument.stationList = ['CS010', 'CS008', 'CS001', 'CS016']
+Observation.channelsPerSubband = 256
+Observation.nrBeams = 1
+Observation.nrPolarisations = 2
+Observation.nyquistZone = 1
+Observation.sampleClock = 200
+Observation.startTime = 2007-12-19 12:58:19
+Observation.stopTime = 2007-12-19 13:03:19
+Observation.subbandList = [0, 1]
+Observation.treeID = 00001
+Observation.year = 2007
+PIC.Core.B06.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.B06_0.port = 10.170.0.50:4346
+PIC.Core.B06_0.position = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS001.phaseCenter = [0.119858559246, 0.920235787778, 6364622.29921]
+PIC.Core.CS001T.phaseCenter = [0.111617470856, 0.918506058083, 6364659.82025]
+PIC.Core.CS001T_dipole0.port = 10.170.0.121:4346
+PIC.Core.CS001T_dipole0.position = [0.111617470856, 0.918506058083, 6364659.82025]
+PIC.Core.CS001T_dipole12.port = 10.170.0.115:4349
+PIC.Core.CS001T_dipole12.position = [0.111619739784, 0.918506058083, 6364659.82025]
+PIC.Core.CS001T_dipole4.port = 10.170.0.123:4347
+PIC.Core.CS001T_dipole4.position = [0.111618168988, 0.918506058083, 6364659.82025]
+PIC.Core.CS001T_dipole8.port = 10.170.0.113:4348
+PIC.Core.CS001T_dipole8.position = [0.111618867120, 0.918506058083, 6364659.82025]
+PIC.Core.CS001_HBA0.port = 10.170.0.2:4346
+PIC.Core.CS001_HBA0.position = [0.119852973708, 0.920234762967, 6364622.31931]
+PIC.Core.CS001_HBA1.port = 10.170.0.4:4347
+PIC.Core.CS001_HBA1.position = [0.119856867247, 0.920239170623, 6364622.22858]
+PIC.Core.CS001_HBA2.port = 10.170.0.1:4348
+PIC.Core.CS001_HBA2.position = [0.119864144785, 0.920236812588, 6364622.27712]
+PIC.Core.CS001_HBA3.port = 10.170.0.3:4349
+PIC.Core.CS001_HBA3.position = [0.119860251246, 0.920232404931, 6364622.36784]
+PIC.Core.CS001_dipole0.port = 10.170.0.2:4346
+PIC.Core.CS001_dipole0.position = [0.119851061603, 0.920235296278, 6364622.34933]
+PIC.Core.CS001_dipole1.position = [0.119851934267, 0.920237044779, 6364622.33234]
+PIC.Core.CS001_dipole10.port = 10.170.0.1:4348
+PIC.Core.CS001_dipole10.position = [0.119865896901, 0.920235296272, 6364622.33833]
+PIC.Core.CS001_dipole11.position = [0.119864849704, 0.920235296275, 6364622.34433]
+PIC.Core.CS001_dipole12.port = 10.170.0.3:4349
+PIC.Core.CS001_dipole12.position = [0.119857344788, 0.920231799293, 6364622.41931]
+PIC.Core.CS001_dipole13.position = [0.119858391986, 0.920231799297, 6364622.42731]
+PIC.Core.CS001_dipole14.port = 10.170.0.3:4349
+PIC.Core.CS001_dipole14.position = [0.11985926465, 0.920231799295, 6364622.42431]
+PIC.Core.CS001_dipole15.position = [0.119858391986, 0.920231799293, 6364622.41931]
+PIC.Core.CS001_dipole2.port = 10.170.0.2:4346
+PIC.Core.CS001_dipole2.position = [0.119852981465, 0.92023529628, 6364622.35333]
+PIC.Core.CS001_dipole3.position = [0.119851934267, 0.920235296279, 6364622.35233]
+PIC.Core.CS001_dipole4.port = 10.170.0.4:4347
+PIC.Core.CS001_dipole4.position = [0.119857693854, 0.92024054175, 6364622.23536]
+PIC.Core.CS001_dipole5.position = [0.119858566519, 0.920240541747, 6364622.22836]
+PIC.Core.CS001_dipole6.port = 10.170.0.4:4347
+PIC.Core.CS001_dipole6.position = [0.119859439183, 0.920240541755, 6364622.24536]
+PIC.Core.CS001_dipole7.position = [0.119858566519, 0.920238793259, 6364622.27335]
+PIC.Core.CS001_dipole8.port = 10.170.0.1:4348
+PIC.Core.CS001_dipole8.position = [0.119863977039, 0.920235296262, 6364622.31833]
+PIC.Core.CS001_dipole9.position = [0.119865024237, 0.92023704477, 6364622.31334]
+PIC.Core.CS001_us0.port = 10.170.0.2:4346
+PIC.Core.CS001_us0.position = [0.119852074863, 0.920235868407, 6364622.30655]
+PIC.Core.CS001_us1.port = 10.170.0.4:4347
+PIC.Core.CS001_us1.position = [0.119858692085, 0.920239715084, 6364622.21637]
+PIC.Core.CS001_us2.port = 10.170.0.1:4348
+PIC.Core.CS001_us2.position = [0.119865043629, 0.920235707148, 6364622.29187]
+PIC.Core.CS001_us3.port = 10.170.0.3:4349
+PIC.Core.CS001_us3.position = [0.119858426407, 0.920231860473, 6364622.38405]
+PIC.Core.CS008.phaseCenter = [0.119875714863, 0.920290262694, 6364620.51091]
+PIC.Core.CS008_HBA0.port = 10.170.0.10:4346
+PIC.Core.CS008_HBA0.position = [0.11987012884 , 0.920289237881, 6364620.52801]
+PIC.Core.CS008_HBA1.port = 10.170.0.9:4347
+PIC.Core.CS008_HBA1.position = [0.119874022864, 0.920293645541, 6364620.43728]
+PIC.Core.CS008_HBA2.port = 10.170.0.12:4348
+PIC.Core.CS008_HBA2.position = [0.119898033261, 0.920287307739, 6364620.56774]
+PIC.Core.CS008_HBA3.port = 10.170.0.11:4349
+PIC.Core.CS008_HBA3.position = [0.119894139238, 0.92028290008 , 6364620.65846]
+PIC.Core.CS008_dipole0.port = 10.170.0.10:4346
+PIC.Core.CS008_dipole0.position = [0.119868340362, 0.920291247693, 6364620.51764]
+PIC.Core.CS008_dipole1.position = [0.119869213027, 0.920291247697, 6364620.52664]
+PIC.Core.CS008_dipole10.port = 10.170.0.12:4348
+PIC.Core.CS008_dipole10.position = [0.119899930822, 0.920286002248, 6364620.69461]
+PIC.Core.CS008_dipole11.position = [0.119898883624, 0.920286002256, 6364620.71061]
+PIC.Core.CS008_dipole12.port = 10.170.0.11:4349
+PIC.Core.CS008_dipole12.position = [0.119891378708, 0.920282505287, 6364620.81559]
+PIC.Core.CS008_dipole13.position = [0.119892425906, 0.920282505285, 6364620.81059]
+PIC.Core.CS008_dipole14.port = 10.170.0.11:4349
+PIC.Core.CS008_dipole14.position = [0.119893298571, 0.920282505263, 6364620.76859]
+PIC.Core.CS008_dipole15.position = [0.119892251373, 0.920282505277, 6364620.79559]
+PIC.Core.CS008_dipole2.port = 10.170.0.10:4346
+PIC.Core.CS008_dipole2.position = [0.119870085692, 0.920289499199, 6364620.55363]
+PIC.Core.CS008_dipole3.position = [0.119869213027, 0.920289499202, 6364620.55863]
+PIC.Core.CS008_dipole4.port = 10.170.0.9:4347
+PIC.Core.CS008_dipole4.position = [0.119874972614, 0.920294744687, 6364620.46066]
+PIC.Core.CS008_dipole5.position = [0.119875845278, 0.920294744689, 6364620.46466]
+PIC.Core.CS008_dipole6.port = 10.170.0.9:4347
+PIC.Core.CS008_dipole6.position = [0.119876717943, 0.920294744688, 6364620.46366]
+PIC.Core.CS008_dipole7.position = [0.119875845278, 0.920292996194, 6364620.49765]
+PIC.Core.CS008_dipole8.port = 10.170.0.12:4348
+PIC.Core.CS008_dipole8.position = [0.11989801096, 0.920286002266, 6364620.72861]
+PIC.Core.CS008_dipole9.position = [0.119899058157, 0.920286002257, 6364620.71161]
+PIC.Core.CS008_us0.port = 10.170.0.10:4346
+PIC.Core.CS008_us0.position = [0.119869229995, 0.920290343316, 6364620.50225]
+PIC.Core.CS008_us1.port = 10.170.0.9:4347
+PIC.Core.CS008_us1.position = [0.119875847702, 0.920294190008, 6364620.43708]
+PIC.Core.CS008_us2.port = 10.170.0.12:4348
+PIC.Core.CS008_us2.position = [0.119898932106, 0.920286202343, 6364620.66949]
+PIC.Core.CS008_us3.port = 10.170.0.11:4349
+PIC.Core.CS008_us3.position = [0.119892314399, 0.920282356152, 6364620.76366]
+PIC.Core.CS010.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS010T.phaseCenter = [0.111620612449, 0.918506058083, 6364659.82025]
+PIC.Core.CS010T_dipole0.port = 10.170.0.122:4346
+PIC.Core.CS010T_dipole0.position = [0.111620612449, 0.918506058083, 6364659.82025]
+PIC.Core.CS010T_dipole12.port = 10.170.0.116:4349
+PIC.Core.CS010T_dipole12.position = [0.111622881377, 0.918506058083, 6364659.82025]
+PIC.Core.CS010T_dipole4.port = 10.170.0.124:4347
+PIC.Core.CS010T_dipole4.position = [0.111621310581, 0.918506058083, 6364659.82025]
+PIC.Core.CS010T_dipole8.port = 10.170.0.114:4348
+PIC.Core.CS010T_dipole8.position = [0.111622008713, 0.918506058083, 6364659.82025]
+PIC.Core.CS010_HBA0.port = 10.170.0.18:4346
+PIC.Core.CS010_HBA0.position = [0.119881248042, 0.920262545738, 6364621.18843]
+PIC.Core.CS010_HBA1.port = 10.170.0.17:4347
+PIC.Core.CS010_HBA1.position = [0.119888779622, 0.920265564336, 6364621.16629]
+PIC.Core.CS010_HBA2.port = 10.170.0.20:4348
+PIC.Core.CS010_HBA2.position = [0.119879764027, 0.920262155263, 6364621.23847]
+PIC.Core.CS010_HBA3.port = 10.170.0.19:4349
+PIC.Core.CS010_HBA3.position = [0.119885557551, 0.920264027099, 6364621.15694]
+PIC.Core.CS010_S30.port = 10.170.0.18:4346
+PIC.Core.CS010_S30.position = [0.119892920416, 0.92026905084 , 6364619.58352]
+PIC.Core.CS010_S31.port = 10.170.0.17:4347
+PIC.Core.CS010_S31.position = [0.119895877779, 0.920274150605, 6364619.46855]
+PIC.Core.CS010_S32.port = 10.170.0.20:4348
+PIC.Core.CS010_S32.position = [0.119904798351, 0.920274053467, 6364619.47055]
+PIC.Core.CS010_S33.port = 10.170.0.19:4349
+PIC.Core.CS010_S33.position = [0.119907416345, 0.920268856583, 6364619.62752]
+PIC.Core.CS010_dipole0.port = 10.170.0.18:4346
+PIC.Core.CS010_dipole0.position = [0.119881255799, 0.920263271867, 6364621.21048]
+PIC.Core.CS010_dipole1.position = [0.119881081266, 0.920263271878, 6364621.23348]
+PIC.Core.CS010_dipole10.position = [0.119878637805, 0.9202597749, 6364621.31846]
+PIC.Core.CS010_dipole11.position = [0.11987776514, 0.920261523398, 6364621.29247]
+PIC.Core.CS010_dipole12.port = 10.170.0.19:4349
+PIC.Core.CS010_dipole12.position = [0.119885619122, 0.920263271866, 6364621.20948]
+PIC.Core.CS010_dipole13.position = [0.119884048326, 0.920265020376, 6364621.20649]
+PIC.Core.CS010_dipole14.position = [0.119884048326, 0.920265020367, 6364621.19049]
+PIC.Core.CS010_dipole15.position = [0.119885270056, 0.920265020366, 6364621.18849]
+PIC.Core.CS010_dipole16.position = [0.119883350194, 0.920265020364, 6364621.18349]
+PIC.Core.CS010_dipole17.position = [0.119882128463, 0.920265020366, 6364621.18849]
+PIC.Core.CS010_dipole18.position = [0.119882652062, 0.920266768862, 6364621.1595]
+PIC.Core.CS010_dipole19.position = [0.119881430332, 0.920266768849, 6364621.1335]
+PIC.Core.CS010_dipole2.position = [0.119880383134, 0.920263271876, 6364621.22848]
+PIC.Core.CS010_dipole20.position = [0.119887538984, 0.920261523377, 6364621.25247]
+PIC.Core.CS010_dipole21.position = [0.119885793655, 0.920259774903, 6364621.32446]
+PIC.Core.CS010_dipole22.position = [0.119888760715, 0.920259774902, 6364621.32246]
+PIC.Core.CS010_dipole23.position = [0.119885793655, 0.920259774902, 6364621.32246]
+PIC.Core.CS010_dipole24.position = [0.119882826595, 0.92026152338, 6364621.25847]
+PIC.Core.CS010_dipole25.position = [0.119881779398, 0.920261523389, 6364621.27647]
+PIC.Core.CS010_dipole26.position = [0.119883175661, 0.920261523383, 6364621.26347]
+PIC.Core.CS010_dipole27.position = [0.119882826595, 0.920259774877, 6364621.27346]
+PIC.Core.CS010_dipole28.position = [0.119889807912, 0.920263271881, 6364621.23848]
+PIC.Core.CS010_dipole29.position = [0.119890680577, 0.920263271888, 6364621.25248]
+PIC.Core.CS010_dipole3.position = [0.119880208601, 0.920263271874, 6364621.22548]
+PIC.Core.CS010_dipole30.position = [0.119890156978, 0.920261523386, 6364621.26947]
+PIC.Core.CS010_dipole31.position = [0.119891727774, 0.920261523378, 6364621.25447]
+PIC.Core.CS010_dipole32.position = [0.119883001128, 0.920266768856, 6364621.1465]
+PIC.Core.CS010_dipole33.position = [0.119884571924, 0.920266768859, 6364621.1535]
+PIC.Core.CS010_dipole34.position = [0.119884222859, 0.920268517355, 6364621.12251]
+PIC.Core.CS010_dipole35.position = [0.119882652062, 0.920268517355, 6364621.12251]
+PIC.Core.CS010_dipole36.position = [0.119886491787, 0.92026327188, 6364621.23748]
+PIC.Core.CS010_dipole37.position = [0.119886840852, 0.920265020355, 6364621.16549]
+PIC.Core.CS010_dipole38.position = [0.119887364451, 0.920263271882, 6364621.24148]
+PIC.Core.CS010_dipole39.position = [0.11988788805, 0.920263271883, 6364621.24248]
+PIC.Core.CS010_dipole4.port = 10.170.0.17:4347
+PIC.Core.CS010_dipole4.position = [0.119888760715, 0.92026502038, 6364621.21449]
+PIC.Core.CS010_dipole40.position = [0.119877939673, 0.920263271878, 6364621.23348]
+PIC.Core.CS010_dipole41.position = [0.119878986871, 0.920265020372, 6364621.20049]
+PIC.Core.CS010_dipole42.position = [0.119876717943, 0.920265020377, 6364621.20849]
+PIC.Core.CS010_dipole43.position = [0.119877939673, 0.920266768867, 6364621.1685]
+PIC.Core.CS010_dipole44.position = [0.119885619122, 0.920263271884, 6364621.24448]
+PIC.Core.CS010_dipole45.position = [0.119886666319, 0.92026152339, 6364621.27747]
+PIC.Core.CS010_dipole46.position = [0.11988492099, 0.920261523389, 6364621.27547]
+PIC.Core.CS010_dipole47.position = [0.119886317254, 0.920261523385, 6364621.26847]
+PIC.Core.CS010_dipole5.position = [0.119888411649, 0.920266768872, 6364621.1785]
+PIC.Core.CS010_dipole6.position = [0.11989085511, 0.920265020383, 6364621.22149]
+PIC.Core.CS010_dipole7.position = [0.11989085511, 0.920266768869, 6364621.1715]
+PIC.Core.CS010_dipole8.port = 10.170.0.20:4348
+PIC.Core.CS010_dipole8.position = [0.119879859535, 0.920261523396, 6364621.28847]
+PIC.Core.CS010_dipole9.position = [0.119879335937, 0.920261523393, 6364621.28347]
+PIC.Core.CS010_us0.port = 10.170.0.18:4346
+PIC.Core.CS010_us0.position = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS010_us1.port = 10.170.0.17:4347
+PIC.Core.CS010_us1.position = [0.11988976137 , 0.920265828067, 6364621.16087]
+PIC.Core.CS010_us2.port = 10.170.0.20:4348
+PIC.Core.CS010_us2.position = [0.119878900574, 0.920261296557, 6364621.25414]
+PIC.Core.CS010_us3.port = 10.170.0.19:4349
+PIC.Core.CS010_us3.position = [0.119884742094, 0.920264493858, 6364621.16333]
+PIC.Core.CS016.phaseCenter = [0.119965884875, 0.920263367124, 6364621.33052]
+PIC.Core.CS016_HBA0.port = 10.170.0.42:4346
+PIC.Core.CS016_HBA0.position = [0.119960298852, 0.920262342708, 6364621.17161]
+PIC.Core.CS016_HBA1.port = 10.170.0.41:4347
+PIC.Core.CS016_HBA1.position = [0.11996419336 , 0.92026674988 , 6364621.08089]
+PIC.Core.CS016_HBA2.port = 10.170.0.44:4348
+PIC.Core.CS016_HBA2.position = [0.119971470898, 0.920264391844, 6364621.12943]
+PIC.Core.CS016_HBA3.port = 10.170.0.43:4349
+PIC.Core.CS016_HBA3.position = [0.11996757639 , 0.920259984186, 6364621.22015]
+PIC.Core.CS016_dipole0.port = 10.170.0.42:4346
+PIC.Core.CS016_dipole0.position = [0.119958573885, 0.920263271944, 6364621.36248]
+PIC.Core.CS016_dipole1.position = [0.119959446549, 0.920263271944, 6364621.36248]
+PIC.Core.CS016_dipole10.port = 10.170.0.44:4348
+PIC.Core.CS016_dipole10.position = [0.119973409183, 0.920263271948, 6364621.37048]
+PIC.Core.CS016_dipole11.position = [0.119972361986, 0.920263271948, 6364621.37048]
+PIC.Core.CS016_dipole12.port = 10.170.0.43:4349
+PIC.Core.CS016_dipole12.position = [0.11996485707, 0.920259774969, 6364621.45346]
+PIC.Core.CS016_dipole13.position = [0.119965904268, 0.920259774969, 6364621.45346]
+PIC.Core.CS016_dipole14.port = 10.170.0.43:4349
+PIC.Core.CS016_dipole14.position = [0.119966776932, 0.920259774969, 6364621.45346]
+PIC.Core.CS016_dipole15.position = [0.119965729735, 0.920258026476, 6364621.48945]
+PIC.Core.CS016_dipole2.port = 10.170.0.42:4346
+PIC.Core.CS016_dipole2.position = [0.119960319214, 0.920263271944, 6364621.36248]
+PIC.Core.CS016_dipole3.position = [0.119959446549, 0.920263271944, 6364621.36248]
+PIC.Core.CS016_dipole4.port = 10.170.0.41:4347
+PIC.Core.CS016_dipole4.position = [0.119965206136, 0.92026676893, 6364621.2925]
+PIC.Core.CS016_dipole5.position = [0.1199660788, 0.920268517423, 6364621.25651]
+PIC.Core.CS016_dipole6.port = 10.170.0.41:4347
+PIC.Core.CS016_dipole6.position = [0.119966951465, 0.92026676893, 6364621.2925]
+PIC.Core.CS016_dipole7.position = [0.1199660788, 0.92026676893, 6364621.2925]
+PIC.Core.CS016_dipole8.port = 10.170.0.44:4348
+PIC.Core.CS016_dipole8.position = [0.119971489321, 0.920263271948, 6364621.37048]
+PIC.Core.CS016_dipole9.position = [0.119972536519, 0.920263271948, 6364621.37048]
+PIC.Core.CS016_us0.port = 10.170.0.42:4346
+PIC.Core.CS016_us0.position = [0.119959400492, 0.920263448231, 6364621.32185]
+PIC.Core.CS016_us1.port = 10.170.0.41:4347
+PIC.Core.CS016_us1.position = [0.119966018199, 0.92026729443 , 6364621.24368]
+PIC.Core.CS016_us2.port = 10.170.0.44:4348
+PIC.Core.CS016_us2.position = [0.119972369258, 0.9202632865 , 6364621.33318]
+PIC.Core.CS016_us3.port = 10.170.0.43:4349
+PIC.Core.CS016_us3.position = [0.119965751066, 0.920259440307, 6364621.42235]
+PIC.Core.CS030.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS030_dipole0.port = 10.170.0.18:4346
+PIC.Core.CS030_dipole0.position = [0.119881255799, 0.920263271867, 6364621.21048]
+PIC.Core.CS030_dipole1.position = [0.119881081266, 0.920263271878, 6364621.23348]
+PIC.Core.CS030_dipole10.port = 10.170.0.20:4348
+PIC.Core.CS030_dipole10.position = [0.119878637805, 0.9202597749, 6364621.31846]
+PIC.Core.CS030_dipole11.position = [0.11987776514, 0.920261523398, 6364621.29247]
+PIC.Core.CS030_dipole12.position = [0.119885619122, 0.920263271866, 6364621.20948]
+PIC.Core.CS030_dipole13.position = [0.119884048326, 0.920265020376, 6364621.20649]
+PIC.Core.CS030_dipole14.port = 10.170.0.19:4349
+PIC.Core.CS030_dipole14.position = [0.119884048326, 0.920265020367, 6364621.19049]
+PIC.Core.CS030_dipole15.position = [0.119885270056, 0.920265020366, 6364621.18849]
+PIC.Core.CS030_dipole2.position = [0.119880383134, 0.920263271876, 6364621.22848]
+PIC.Core.CS030_dipole3.position = [0.119880208601, 0.920263271874, 6364621.22548]
+PIC.Core.CS030_dipole4.position = [0.119888760715, 0.92026502038, 6364621.21449]
+PIC.Core.CS030_dipole5.position = [0.119888411649, 0.920266768872, 6364621.1785]
+PIC.Core.CS030_dipole6.position = [0.11989085511, 0.920265020383, 6364621.22149]
+PIC.Core.CS030_dipole7.port = 10.170.0.17:4347
+PIC.Core.CS030_dipole7.position = [0.11989085511, 0.920266768869, 6364621.1715]
+PIC.Core.CS030_dipole8.position = [0.119879859535, 0.920261523396, 6364621.28847]
+PIC.Core.CS030_dipole9.position = [0.119879335937, 0.920261523393, 6364621.28347]
+PIC.Core.CS031.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS031_dipole16.port = 10.170.0.26:4346
+PIC.Core.CS031_dipole16.position = [0.119883350194, 0.920265020364, 6364621.18349]
+PIC.Core.CS031_dipole17.position = [0.119882128463, 0.920265020366, 6364621.18849]
+PIC.Core.CS031_dipole18.position = [0.119882652062, 0.920266768862, 6364621.1595]
+PIC.Core.CS031_dipole19.position = [0.119881430332, 0.920266768849, 6364621.1335]
+PIC.Core.CS031_dipole20.position = [0.119887538984, 0.920261523377, 6364621.25247]
+PIC.Core.CS031_dipole21.position = [0.119885793655, 0.920259774903, 6364621.32446]
+PIC.Core.CS031_dipole22.port = 10.170.0.25:4347
+PIC.Core.CS031_dipole22.position = [0.119888760715, 0.920259774902, 6364621.32246]
+PIC.Core.CS031_dipole23.position = [0.119885793655, 0.920259774902, 6364621.32246]
+PIC.Core.CS031_dipole24.port = 10.170.0.28:4348
+PIC.Core.CS031_dipole24.position = [0.119882826595, 0.92026152338, 6364621.25847]
+PIC.Core.CS031_dipole25.position = [0.119881779398, 0.920261523389, 6364621.27647]
+PIC.Core.CS031_dipole26.position = [0.119883175661, 0.920261523383, 6364621.26347]
+PIC.Core.CS031_dipole27.position = [0.119882826595, 0.920259774877, 6364621.27346]
+PIC.Core.CS031_dipole28.position = [0.119889807912, 0.920263271881, 6364621.23848]
+PIC.Core.CS031_dipole29.position = [0.119890680577, 0.920263271888, 6364621.25248]
+PIC.Core.CS031_dipole30.position = [0.119890156978, 0.920261523386, 6364621.26947]
+PIC.Core.CS031_dipole31.port = 10.170.0.27:4349
+PIC.Core.CS031_dipole31.position = [0.119891727774, 0.920261523378, 6364621.25447]
+PIC.Core.CS032.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS032_dipole32.position = [0.119883001128, 0.920266768856, 6364621.1465]
+PIC.Core.CS032_dipole33.position = [0.119884571924, 0.920266768859, 6364621.1535]
+PIC.Core.CS032_dipole34.port = 10.170.0.34:4346
+PIC.Core.CS032_dipole34.position = [0.119884222859, 0.920268517355, 6364621.12251]
+PIC.Core.CS032_dipole35.position = [0.119882652062, 0.920268517355, 6364621.12251]
+PIC.Core.CS032_dipole36.position = [0.119886491787, 0.92026327188, 6364621.23748]
+PIC.Core.CS032_dipole37.port = 10.170.0.33:4347
+PIC.Core.CS032_dipole37.position = [0.119886840852, 0.920265020355, 6364621.16549]
+PIC.Core.CS032_dipole38.position = [0.119887364451, 0.920263271882, 6364621.24148]
+PIC.Core.CS032_dipole39.position = [0.11988788805, 0.920263271883, 6364621.24248]
+PIC.Core.CS032_dipole40.position = [0.119877939673, 0.920263271878, 6364621.23348]
+PIC.Core.CS032_dipole41.position = [0.119878986871, 0.920265020372, 6364621.20049]
+PIC.Core.CS032_dipole42.port = 10.170.0.36:4348
+PIC.Core.CS032_dipole42.position = [0.119876717943, 0.920265020377, 6364621.20849]
+PIC.Core.CS032_dipole43.position = [0.119877939673, 0.920266768867, 6364621.1685]
+PIC.Core.CS032_dipole44.position = [0.119885619122, 0.920263271884, 6364621.24448]
+PIC.Core.CS032_dipole45.position = [0.119886666319, 0.92026152339, 6364621.27747]
+PIC.Core.CS032_dipole46.port = 10.170.0.35:4349
+PIC.Core.CS032_dipole46.position = [0.11988492099, 0.920261523389, 6364621.27547]
+PIC.Core.CS032_dipole47.position = [0.119886317254, 0.920261523385, 6364621.26847]
diff --git a/Appl/CEP/CS1/CS1_Storage/test/tAH_TestStorage.cc b/Appl/CEP/CS1/CS1_Storage/test/tAH_TestStorage.cc
index 7d74ab5c4b62abf1845b48bd68c46635fa20e01e..2cc651fd7fb841c3145c34c8aac3e8361db26f7f 100644
--- a/Appl/CEP/CS1/CS1_Storage/test/tAH_TestStorage.cc
+++ b/Appl/CEP/CS1/CS1_Storage/test/tAH_TestStorage.cc
@@ -43,7 +43,7 @@ int main (int argc, const char** argv){
test.setarg(argc,argv);
test.baseDefine();
test.basePrerun();
- int nrRuns = ps.getInt32("General.NRuns");
+ int nrRuns = atoi(argv[argc - 1]);
cout << "run " << nrRuns << " times" << endl;
test.baseRun(nrRuns);
test.basePostrun();