Commits

David Mehringer authored f32fff35700 Merge
Merge branch 'master' into CAS-12358

code/air_casawvr/casawvr/msantdata.cpp

Modified
17 17
18 18 namespace LibAIR2 {
19 19
20 20 void getAntPos(const casacore::MeasurementSet &ms,
21 21 antpos_t &res)
22 22 {
23 23 const casacore::MSAntenna & antTable(ms.antenna());
24 24 const size_t nant=antTable.nrow();
25 25 res.resize(nant, 3);
26 26 casacore::ROMSAntennaColumns acols(antTable);
27 - const casacore::ROArrayColumn<casacore::Double> &pos (acols.position());
27 + const casacore::ArrayColumn<casacore::Double> &pos (acols.position());
28 28 for(size_t i=0; i<nant; ++i)
29 29 {
30 30 casacore::Array<casacore::Double> a;
31 31 pos.get(i, a,
32 32 casacore::True);
33 33 for(size_t j=0; j<3; ++j)
34 34 res(i,j)=a(casacore::IPosition(1,j));
35 35 }
36 36 }
37 37
38 38 aname_t getAName(const casacore::MeasurementSet &ms)
39 39 {
40 40 aname_t res;
41 41 const casacore::MSAntenna & antTable(ms.antenna());
42 42 const size_t nant=antTable.nrow();
43 43
44 44 casacore::ROMSAntennaColumns acols(antTable);
45 - const casacore::ROScalarColumn<casacore::String> &names (acols.name());
45 + const casacore::ScalarColumn<casacore::String> &names (acols.name());
46 46 for(size_t i=0; i<nant; ++i)
47 47 {
48 48 res.insert(aname_t::value_type(i, std::string(names(i))));
49 49 }
50 50 return res;
51 51 }
52 52
53 53 }
54 54
55 55

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

Add shortcut