Commits

Mark Wieringa authored 4e8c9460d09
CAS-12665 Fix NUM_POLY entries for FIELD table to avoid concat issues

code/atnf/atca/ATCAFiller.cc

Modified
1614 1614 fieldId_p=nField_p++;
1615 1615 atms_p.field().addRow();
1616 1616 Int nf=atms_p.field().nrow()-1;
1617 1617 // for now we have 1 field/source
1618 1618 msc_p->field().sourceId().put(nf,fieldId_p);
1619 1619 msc_p->field().name().put(nf,src.before(trailing));
1620 1620
1621 1621 msc_p->field().phaseDir().put(nf,dir);
1622 1622 msc_p->field().delayDir().put(nf,dir);
1623 1623 msc_p->field().referenceDir().put(nf, dir);
1624 - msc_p->field().numPoly().put(nf, 1);
1624 + msc_p->field().numPoly().put(nf, 0);
1625 1625 msc_p->field().time().put(nf,epoch);
1626 1626 msc_p->field().code().put(nf,String(&names_.su_cal[sourceno*16],
1627 1627 16).before(trailing));
1628 1628 }
1629 1629 dir(0, 0)=doubles_.su_pra[sourceno];
1630 1630 dir(1, 0)=doubles_.su_pdec[sourceno];
1631 1631 Vector<Double> srcdir(2);
1632 1632 srcdir(0)=doubles_.su_ra[sourceno];
1633 1633 srcdir(1)=doubles_.su_dec[sourceno];
1634 1634 atms_p.source().addRow();
1690 1690 for (Int i=0; i<nAnt_p; i++) {
1691 1691 atms_p.pointing().addRow();
1692 1692 msc_p->pointing().antennaId().put(np+i, i+1);
1693 1693 if (newPointingCorr_p) {
1694 1694 pointingOffset(0, 0)=pointingCorr_p(0,i)*C::arcsec;
1695 1695 pointingOffset(1, 0)=pointingCorr_p(0,i)*C::arcsec;
1696 1696 }
1697 1697 if (i==0) { // ISM storage
1698 1698 msc_p->pointing().time().put(np,epoch);
1699 1699 msc_p->pointing().interval().put(np,DBL_MAX);
1700 - msc_p->pointing().numPoly().put(np, 1);
1700 + msc_p->pointing().numPoly().put(np, 0);
1701 1701 msc_p->pointing().direction().put(np,pointingDir);
1702 1702 msc_p->pointing().pointingOffset().put(np,pointingOffset);
1703 1703 msc_p->pointing().tracking().put(np,True);
1704 1704 } else {
1705 1705 if (newPointingCorr_p) {
1706 1706 msc_p->pointing().pointingOffset().put(np,pointingOffset);
1707 1707 }
1708 1708 }
1709 1709 }
1710 1710 }

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

Add shortcut