Commits

Revert "Merge remote-tracking branch 'origin/master' into CAS-13464"

This reverts commit 67b43fbdf58b6f323bd8b8fd91d48981f1376341, reversing changes made to 0ea4799c125dd2edc71066228296d84db85a947a.
No tags

casa5/code/alma/apps/asdm2MS/asdm2MS.cc

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

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut