Commits

Bob Garwood authored e03804d7d80
fixed incorrect type of new SDM_CORR_BIT column

casa5/code/mstransform/MSTransform/MSTransformDataHandler.cc

Modified
2228 2228 outSwfCol.put(outSPWId, inSwfCol(spw_p[k]));
2229 2229 }
2230 2230 if (haveSpwSNB)
2231 2231 {
2232 2232 ScalarColumn<Int> inSnbCol(mssel_p.spectralWindow(), "SDM_NUM_BIN");
2233 2233 ScalarColumn<Int> outSnbCol(msOut_p.spectralWindow(), "SDM_NUM_BIN");
2234 2234 outSnbCol.put(outSPWId, inSnbCol(spw_p[k]));
2235 2235 }
2236 2236 if (haveSpwCorrBit)
2237 2237 {
2238 - ScalarColumn<Int> inCorrBitCol(mssel_p.spectralWindow(), "SDM_CORR_BIT");
2239 - ScalarColumn<Int> outCorrBitCol(msOut_p.spectralWindow(), "SDM_CORR_BIT");
2238 + ScalarColumn<String> inCorrBitCol(mssel_p.spectralWindow(), "SDM_CORR_BIT");
2239 + ScalarColumn<String> outCorrBitCol(msOut_p.spectralWindow(), "SDM_CORR_BIT");
2240 2240 outCorrBitCol.put(outSPWId, inCorrBitCol(spw_p[k]));
2241 2241 }
2242 2242
2243 2243 if (haveSpwASI)
2244 2244 {
2245 2245 if (reindex_p)
2246 2246 {
2247 2247 // Get list of SPWs associated to his one
2248 2248 std::vector<Int> selectedSPWs = spw_p.tovector();
2249 2249
3349 3349 if (spwTable_i.tableDesc().isColumn("SDM_NUM_BIN") &&
3350 3350 spwTable_i.tableDesc().columnDescSet().isDefined("SDM_NUM_BIN"))
3351 3351 {
3352 3352 ScalarColumn<Int> snbCol_i(spwTable_i, "SDM_NUM_BIN");
3353 3353 ScalarColumn<Int> snbCol_0(spwTable_0, "SDM_NUM_BIN");
3354 3354 snbCol_0.put(rowIndex, snbCol_i(subms_row_index));
3355 3355 }
3356 3356 if (spwTable_i.tableDesc().isColumn("SDM_CORR_BIT") &&
3357 3357 spwTable_i.tableDesc().columnDescSet().isDefined("SDM_CORR_BIT"))
3358 3358 {
3359 - ScalarColumn<Int> corrBitCol_i(spwTable_i, "SDM_CORR_BIT");
3360 - ScalarColumn<Int> corrBitCol_0(spwTable_0, "SDM_CORR_BIT");
3359 + ScalarColumn<String> corrBitCol_i(spwTable_i, "SDM_CORR_BIT");
3360 + ScalarColumn<String> corrBitCol_0(spwTable_0, "SDM_CORR_BIT");
3361 3361 corrBitCol_0.put(rowIndex, corrBitCol_i(subms_row_index));
3362 3362 }
3363 3363
3364 3364 rowIndex += 1;
3365 3365 }
3366 3366 }
3367 3367 }
3368 3368
3369 3369 // Merge the other sub-tables using SPW map generated here
3370 3370 mergeDDISubTables(filenames);

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

Add shortcut