Commits
Benjamin Bean authored 6904c31885e Merge
62 62 | using namespace CalibrationDeviceMod; |
63 63 | |
64 64 | |
65 65 | |
66 66 | |
67 67 | |
68 68 | |
69 69 | using namespace SubscanIntentMod; |
70 70 | |
71 71 | |
72 + | |
72 73 | |
73 74 | |
74 75 | |
75 76 | |
76 77 | using namespace asdmbinaries; |
77 78 | |
78 79 | |
79 80 | |
80 81 | |
81 82 | |
2177 2178 | int ifConvChain = 0; |
2178 2179 | int freqGroup = r->isFreqGroupExists()?r->getFreqGroup():0; |
2179 2180 | string freqGroupName = r->isFreqGroupNameExists()?r->getFreqGroupName().c_str():""; |
2180 2181 | // windowFunction is a required field |
2181 2182 | std::string windowFunction = CWindowFunction::name(r->getWindowFunction()); |
2182 2183 | int numBin = getNumBin(r, telescopeName); |
2183 2184 | if (telescopeName == "EVLA" && (numBin>1) && (!r->isNumBinExists())) { |
2184 2185 | // numBin has been inferred for EVLA data, adjust resolution |
2185 2186 | resolution1D = chanWidth1D; |
2186 2187 | } |
2188 + | std::string corrBit = "UNKNOWN"; |
2189 + | if (r->isCorrelationBitExists()) { |
2190 + | corrBit = CCorrelationBit::name(r->getCorrelationBit()); |
2191 + | } |
2187 2192 | |
2188 2193 | for (map<AtmPhaseCorrectionMod::AtmPhaseCorrection, ASDM2MSFiller*>::iterator iter = msFillers.begin(); |
2189 2194 | iter != msFillers.end(); ++iter) { |
2190 2195 | iter->second->addSpectralWindow(numChan, |
2191 2196 | name, |
2192 2197 | refFreq, |
2193 2198 | chanFreq1D, |
2194 2199 | chanWidth1D, |
2195 2200 | measFreqRef, |
2196 2201 | effectiveBw1D, |
2197 2202 | resolution1D, |
2198 2203 | totalBandwidth, |
2199 2204 | netSideband, |
2200 2205 | bbcNo, |
2201 2206 | ifConvChain, |
2202 2207 | freqGroup, |
2203 2208 | freqGroupName, |
2204 2209 | numAssocValues, |
2205 2210 | assocSpectralWindowId_, |
2206 2211 | assocNature_, |
2207 2212 | windowFunction, |
2208 - | numBin); |
2213 + | numBin, |
2214 + | corrBit ); |
2209 2215 | } |
2210 2216 | } |
2211 2217 | if (nSpectralWindow) { |
2212 2218 | infostream.str(""); |
2213 2219 | infostream << "converted in " << msFillers.begin()->second->ms()->spectralWindow().nrow() << " spectral window(s) in the measurement set(s)."; |
2214 2220 | info(infostream.str()); |
2215 2221 | } |
2216 2222 | } catch (IllegalAccessException& e) { |
2217 2223 | errstream.str(""); |
2218 2224 | errstream << e.getMessage(); |