Commits

Pam Ford authored a50ba5e52d4 Merge
Merge branch 'master' into CAS-11501

code/air_casawvr/casawvr/msutils.cpp

Modified
124 124
125 125 std::set<size_t> skyStateIDs(const casacore::MeasurementSet &ms)
126 126 {
127 127 std::set<size_t> res;
128 128 StateIntentMap mi;
129 129 scanIntents(ms, mi);
130 130 for(StateIntentMap::const_iterator i=mi.begin();
131 131 i!=mi.end();
132 132 ++i)
133 133 {
134 - if(i->second.find("ON_SOURCE") != i->second.npos &&
135 - i->second.find("CALIBRATE_ATMOSPHERE") == i->second.npos)
136 - res.insert(i->first);
134 + if((i->second.find("ON_SOURCE") != i->second.npos
135 + || i->second.find("REFERENCE") != i->second.npos
136 + || i->second.find("SIGNAL") != i->second.npos)
137 + && (i->second.find("CALIBRATE_ATMOSPHERE") == i->second.npos))
138 + {
139 + res.insert(i->first);
140 + }
137 141 }
138 142 return res;
139 143 }
140 144
141 145 field_t getFieldNames(const casacore::MeasurementSet &ms)
142 146 {
143 147 field_t res;
144 148 const casacore::MSField & fieldT(ms.field());
145 149 const size_t nfields=fieldT.nrow();
146 150

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

Add shortcut