diff --git a/RTCP/Cobalt/CoInterface/src/Parset.cc b/RTCP/Cobalt/CoInterface/src/Parset.cc index 212cd942ace21c42e9df6a1bab1a9078c5aae903..280f411945aa3544a2b0a9d36fab0c267473b5fc 100644 --- a/RTCP/Cobalt/CoInterface/src/Parset.cc +++ b/RTCP/Cobalt/CoInterface/src/Parset.cc @@ -709,7 +709,7 @@ namespace LOFAR size_t nrTABs = getUint32(str(format("Observation.Beam[%u].nrTiedArrayBeams") % i), 0); size_t nrTABSParset = nrTABs; size_t nrRings = getUint32(str(format("Observation.Beam[%u].nrTabRings") % i), 0); - double ringWidth = getDouble(str(format("Observation.Beam[%u].ringWidth") % i), 0.0); + double ringWidth = getDouble(str(format("Observation.Beam[%u].tabRingSize") % i), 0.0); // Create a ptr to RingCoordinates object // If there are tab rings the object will be actuall constructed @@ -797,7 +797,7 @@ namespace LOFAR // but not used anyway. Unclear if setting to 0.0 is better/worse. const string prefix = str(format("Cobalt.Observation.Beam[%u]") % i); tab.dispersionMeasure = getDouble(prefix + ".tabRingDispersionMeasure", 0.0); - tab.coherent = getBool(prefix + ".tabRingCoherent", true); // in practice, always coherent + tab.coherent = true; // rings cannot be incoherent, since we use non-(0,0) pointings } } diff --git a/RTCP/Cobalt/CoInterface/test/tParset.cc b/RTCP/Cobalt/CoInterface/test/tParset.cc index cabd12fc29399afc88de30033f2127a86ed6ce40..42e7b80d4f06d9c235d1f9a08290307b6cbefd96 100644 --- a/RTCP/Cobalt/CoInterface/test/tParset.cc +++ b/RTCP/Cobalt/CoInterface/test/tParset.cc @@ -1077,7 +1077,7 @@ TEST(testRing) { ps.replace(key, value); // ringwidth == 1 - key = prefix + ".ringWidth"; + key = prefix + ".tabRingSize"; value = "2"; ps.replace(key, value); diff --git a/SubSystems/Online_Cobalt/test/default.parset b/SubSystems/Online_Cobalt/test/default.parset index 04a4ff29ff03493f85b6521dfb3476089d851dc3..652fc9ac1454fbde96c58e9bf926feff6ac3f4ed 100644 --- a/SubSystems/Online_Cobalt/test/default.parset +++ b/SubSystems/Online_Cobalt/test/default.parset @@ -165,7 +165,7 @@ Observation.Beam[0].nrTiedArrayBeams=1 # Number of rings to create Observation.Beam[0].nrTabRings=0 # Distance between rings -Observation.Beam[0].ringWidth=0 +Observation.Beam[0].tabRingSize=0 # TAB pointing (absolute). The relative pointings still end up in the metadata, # so the directionType must therefor match the directionType of the SAP.