Changeset 2740 for trunk/src/STBaselineTable.cpp
- Timestamp:
- 01/18/13 20:42:21 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/STBaselineTable.cpp
r2738 r2740 52 52 { 53 53 table_.addColumn(ScalarColumnDesc<uInt>("NCHAN")); 54 table_.addColumn(ScalarColumnDesc<uInt>("FUNCTION")); 55 table_.addColumn(ScalarColumnDesc<uInt>("ORDER")); 54 table_.addColumn(ScalarColumnDesc<uInt>("FUNC_TYPE")); 55 table_.addColumn(ArrayColumnDesc<uInt>("FUNC_PARAM")); 56 table_.addColumn(ArrayColumnDesc<Float>("FUNC_FPARAM")); 56 57 table_.addColumn(ScalarColumnDesc<uInt>("CLIP_ITERATION")); 57 58 table_.addColumn(ScalarColumnDesc<Float>("CLIP_THRESHOLD")); 58 table_.addColumn(ArrayColumnDesc<Float>("SECTION")); 59 table_.addColumn(ArrayColumnDesc<Float>("PARAMETER")); 60 table_.addColumn(ArrayColumnDesc<Float>("MASKLIST")); 59 table_.addColumn(ArrayColumnDesc<uInt>("MASKLIST")); 60 table_.addColumn(ArrayColumnDesc<Float>("RESULT")); 61 61 table_.addColumn(ScalarColumnDesc<Float>("RMS")); 62 62 … … 69 69 { 70 70 nchanCol_.attach(table_, "NCHAN"); 71 funcCol_.attach(table_, "FUNCTION"); 72 orderCol_.attach(table_, "ORDER"); 73 clipiterCol_.attach(table_, "CLIP_ITERATION"); 74 clipthresCol_.attach(table_, "CLIP_THRESHOLD"); 75 sectCol_.attach(table_, "SECTION"); 76 paramCol_.attach(table_, "PARAMETER"); 71 ftypeCol_.attach(table_, "FUNC_TYPE"); 72 fparCol_.attach(table_, "FUNC_PARAM"); 73 ffparCol_.attach(table_, "FUNC_FPARAM"); 74 citerCol_.attach(table_, "CLIP_ITERATION"); 75 cthresCol_.attach(table_, "CLIP_THRESHOLD"); 77 76 maskCol_.attach(table_, "MASKLIST"); 77 resCol_.attach(table_, "RESULT"); 78 78 rmsCol_.attach(table_, "RMS"); 79 79 } … … 88 88 89 89 void STBaselineTable::setdata(uInt irow, uInt scanno, uInt cycleno, 90 uInt beamno, uInt ifno, uInt polno, uInt freqid, 91 Double time, uInt nchan, STBaselineFunc::FuncName func, uInt order, 92 uInt clipiter, Float clipthres, 93 Vector<Float> sect, Vector<Float> param, 94 Vector<Float> mask, Float rms) 90 uInt beamno, uInt ifno, uInt polno, 91 uInt freqid, Double time, 92 uInt nchan, 93 STBaselineFunc::FuncName ftype, 94 Vector<uInt> fpar, 95 Vector<Float> ffpar, 96 uInt citer, 97 Float cthres, 98 Vector<uInt> mask, 99 Vector<Float> res, 100 Float rms) 95 101 { 96 102 if (irow >= (uInt)nrow()) { … … 105 111 setbasedata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time); 106 112 nchanCol_.put(irow, nchan); 107 funcCol_.put(irow, uInt(func)); 108 orderCol_.put(irow, order); 109 clipiterCol_.put(irow, clipiter); 110 clipthresCol_.put(irow, clipthres); 111 sectCol_.put(irow, sect); 112 paramCol_.put(irow, param); 113 ftypeCol_.put(irow, uInt(ftype)); 114 fparCol_.put(irow, fpar); 115 ffparCol_.put(irow, ffpar); 116 citerCol_.put(irow, citer); 117 cthresCol_.put(irow, cthres); 113 118 maskCol_.put(irow, mask); 119 resCol_.put(irow, res); 114 120 rmsCol_.put(irow, rms); 115 121 } 116 122 117 123 void STBaselineTable::appenddata(uInt scanno, uInt cycleno, 118 uInt beamno, uInt ifno, uInt polno, uInt freqid, 119 Double time, uInt nchan, STBaselineFunc::FuncName func, uInt order, 120 uInt clipiter, Float clipthres, 121 Vector<Float> sect, Vector<Float> param, 122 Vector<Float> mask, Float rms) 124 uInt beamno, uInt ifno, uInt polno, 125 uInt freqid, Double time, 126 uInt nchan, 127 STBaselineFunc::FuncName ftype, 128 Vector<uInt> fpar, 129 Vector<Float> ffpar, 130 uInt citer, 131 Float cthres, 132 Vector<uInt> mask, 133 Vector<Float> res, 134 Float rms) 123 135 { 124 136 uInt irow = nrow(); 125 137 table_.addRow(1, True); 126 138 setdata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time, 127 nchan, f unc, order, clipiter, clipthres, sect, param, mask, rms);139 nchan, ftype, fpar, ffpar, citer, cthres, mask, res, rms); 128 140 } 129 141 130 142 Vector<STBaselineFunc::FuncName> STBaselineTable::getFunctionAsString() 131 143 { 132 Vector<uInt> rawBlfuncColumn = f uncCol_.getColumn();144 Vector<uInt> rawBlfuncColumn = ftypeCol_.getColumn(); 133 145 uInt n = rawBlfuncColumn.nelements(); 134 146 Vector<STBaselineFunc::FuncName> blfuncColumn(n);
Note: See TracChangeset
for help on using the changeset viewer.