diff --git a/RTCP/Cobalt/CoInterface/src/Parset.cc b/RTCP/Cobalt/CoInterface/src/Parset.cc index 611b9f56d95c5dceb8657993a94ced9aa176cb46..02bce31dd61861109fc91a19922466e714cb26b5 100644 --- a/RTCP/Cobalt/CoInterface/src/Parset.cc +++ b/RTCP/Cobalt/CoInterface/src/Parset.cc @@ -870,6 +870,7 @@ namespace LOFAR const struct ObservationSettings& settings) const { ObservationSettings::BeamFormer::StokesSettings stSettings; + stSettings.coherent = coherent; std::string prefix = bfPrefix + (coherent ? ".CoherentStokes" : ".IncoherentStokes"); @@ -939,7 +940,7 @@ namespace LOFAR { auto stokesDefaultSettings = defaultStokesSettings(); stokesDefaultSettings.coherent = false; - beamFormer.incoherentSettings = readStokesSettings("Cobalt.BeamFormer", false, stokesDefaultSettings, settings); + beamFormer.incoherentSettings = readStokesSettings("Cobalt.BeamFormer", false, stokesDefaultSettings, settings); } beamFormer.dedispersionFFTsize = getUint32("Cobalt.BeamFormer.dedispersionFFTsize", settings.blockSize); @@ -979,12 +980,12 @@ namespace LOFAR // Read stokes settings, use default settings when a key is not specified if (doCoherentStokes) { - beamFormer.coherentSettings = readStokesSettings(prefix, true, pipeline.coherentSettings, settings); + pipeline.coherentSettings = readStokesSettings(prefix, true, beamFormer.coherentSettings, settings); } if (doIncoherentStokes) { - beamFormer.incoherentSettings = readStokesSettings(prefix, false, pipeline.incoherentSettings, settings); + pipeline.incoherentSettings = readStokesSettings(prefix, false, beamFormer.incoherentSettings, settings); } // Derive antennaFields to use for beam forming diff --git a/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers.run b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers.run index 254676e64aa4f97164640e684c413442738b245a..7e25c8bf6044e1e9cacbb67406dba145d90ba468 100755 --- a/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers.run +++ b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers.run @@ -74,27 +74,37 @@ fi "[12*localhost:${OUTDIR_REF_BF4}]" >> ${PARSET_BF4} # Setup parset for LMM beamFormer - BFLMM="${TESTNAME}_combined.parset" - cat ${srcdir}/${PARSET_BFCOMMON} >> ${BFLMM} - cat ${srcdir}/${BFLMM} >> ${BFLMM} + PARSET_BFLMM="${TESTNAME}_combined.parset" + cat ${srcdir}/${PARSET_BFCOMMON} >> ${PARSET_BFLMM} + cat ${srcdir}/${PARSET_BFLMM} >> ${PARSET_BFLMM} echo "Observation.DataProducts.Output_Correlated.locations="\ - "[10*localhost:${OUTDIR_LMM_IM1}]" >> ${BFLMM} + "[10*localhost:${OUTDIR_LMM_IM1}]" >> ${PARSET_BFLMM} echo "Observation.DataProducts.Output_CoherentStokes.locations="\ "[7*localhost:${OUTDIR_LMM_BF1},"\ "19*localhost:${OUTDIR_LMM_BF2},"\ "32*localhost:${OUTDIR_LMM_BF3},"\ - "12*localhost:${OUTDIR_LMM_BF4}]" >> ${BFLMM} + "12*localhost:${OUTDIR_LMM_BF4}]" >> ${PARSET_BFLMM} echo "Observation.DataProducts.Output_IncoherentStokes.locations="\ - "[1*localhost:${OUTDIR_LMM_BF1}]" >> ${BFLMM} + "[1*localhost:${OUTDIR_LMM_BF1}]" >> ${PARSET_BFLMM} # Run reference: individual beamFormers - runObservation.sh -A -F -l 1 ${PARSET_BF1} - runObservation.sh -A -F -l 1 ${PARSET_BF2} - runObservation.sh -A -F -l 1 ${PARSET_BF3} - runObservation.sh -A -F -l 1 ${PARSET_BF4} + LOG_REF_BF1=${TESTNAME}_ref_bf1.log + LOG_REF_BF2=${TESTNAME}_ref_bf2.log + LOG_REF_BF3=${TESTNAME}_ref_bf3.log + LOG_REF_BF4=${TESTNAME}_ref_bf4.log + LOG_LMM=${TESTNAME}_lmm.log + echo "Run ${PARSET_BF1}" + runObservation.sh -A -F -l 1 ${PARSET_BF1} > ${LOG_REF_BF1} 2>&1 + echo "Run ${PARSET_BF2}" + runObservation.sh -A -F -l 1 ${PARSET_BF2} > ${LOG_REF_BF2} 2>&1 + echo "Run ${PARSET_BF3}" + runObservation.sh -A -F -l 1 ${PARSET_BF3} > ${LOG_REF_BF3} 2>&1 + echo "Run ${PARSET_BF4}" + runObservation.sh -A -F -l 1 ${PARSET_BF4} > ${LOG_REF_BF4} 2>&1 # Run LMM beamFormer - runObservation.sh -A -F -l 1 ${BFLMM} + echo "Run ${PARSET_BFLMM}" + runObservation.sh -A -F -l 1 ${PARSET_BFLMM} > ${LOG_LMM} 2>&1 # Examine the output EXAMINE="${srcdir}/${TESTNAME}_examine.py"