Commits
4893 4893 | } |
4894 4894 | |
4895 4895 | // Loop over field id. and spectral window id. |
4896 4896 | //Vector<Double> fluxUsed(4); |
4897 4897 | String fluxScaleName("user-specified"); |
4898 4898 | FluxStandard::FluxScale fluxScaleEnum; |
4899 4899 | if(!FluxStandard::matchStandard(standard, fluxScaleEnum, fluxScaleName)) |
4900 4900 | throw(AipsError(standard + " is not a recognized flux density scale")); |
4901 4901 | |
4902 4902 | FluxStandard fluxStd(fluxScaleEnum); |
4903 - | if (fluxScaleEnum==FluxStandard::PERLEY_BUTLER_2013) { |
4903 + | if (fluxScaleEnum==FluxStandard::PERLEY_BUTLER_2013 || |
4904 + | fluxScaleEnum==FluxStandard::PERLEY_BUTLER_2017 ) { |
4904 4905 | fluxStd.setInterpMethod(interpolation); |
4905 4906 | } |
4906 4907 | |
4907 4908 | // Setup the frequency, Flux, and ComponentList arrays. |
4908 4909 | uInt nspws = selToRawSpwIds.nelements(); |
4909 4910 | Vector<Vector<Flux<Double> > > returnFluxes(nspws), returnFluxErrs(nspws); |
4910 4911 | Vector<Vector<MFrequency> > mfreqs(nspws); |
4911 4912 | Vector<Vector<Double> > fluxUsed(nspws); // fluxesUsed(nspws,4) |
4912 4913 | ROMSColumns msc(*ms_p); |
4913 4914 | MEpoch aveEpoch=MEpoch(msc.timeMeas()(0)); |