FreeCalypso > hg > fc-rfcal-tools
changeset 114:ae8da516681c
fc-rfcal-txband: data struct preparation for channel calibration
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Tue, 13 Feb 2018 05:06:28 +0000 |
| parents | 01bae2629ffd |
| children | 1e49bb52b07e |
| files | autocal/txband.h autocal/txbandmain.c |
| diffstat | 2 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/autocal/txband.h Tue Feb 13 04:39:33 2018 +0000 +++ b/autocal/txband.h Tue Feb 13 05:06:28 2018 +0000 @@ -14,6 +14,8 @@ unsigned end_plnum; struct tx_calchan_range *calchan_ranges; unsigned ref_subband; + unsigned *calchan_selections; + unsigned *calchan_plnum; }; #define MAX_BASIS_POINTS 15
--- a/autocal/txbandmain.c Tue Feb 13 04:39:33 2018 +0000 +++ b/autocal/txbandmain.c Tue Feb 13 05:06:28 2018 +0000 @@ -56,12 +56,24 @@ {783, 810, 796} }; +unsigned tx_calchan_low_selections[] = {0,0,0, 1,1,1,1, 2,2,2,2, 3,3,3,3}; + +unsigned tx_calchan_low_plnum[] = {5, 8, 12, 16}; + +unsigned tx_calchan_high_selections[] = {0,0,0,0, 1,1,1,1, 2,2,2,2, 3,3,3,3}; + +unsigned tx_calchan_high_plnum[] = {0, 4, 8, 12}; + struct txcal_band txcal_band_list[] = { - {"850", RFPW_STD_BAND_850, 190, 5, 19, tx_calchan_850, 4}, - {"900", RFPW_STD_BAND_900, 40, 5, 19, tx_calchan_900, 1}, - {"1800", RFPW_STD_BAND_1800, 700, 0, 15, tx_calchan_1800, 4}, - {"1900", RFPW_STD_BAND_1900, 660, 0, 15, tx_calchan_1900, 3}, - {0, 0, 0, 0, 0, 0, 0} + {"850", RFPW_STD_BAND_850, 190, 5, 19, tx_calchan_850, 4, + tx_calchan_low_selections, tx_calchan_low_plnum}, + {"900", RFPW_STD_BAND_900, 40, 5, 19, tx_calchan_900, 1, + tx_calchan_low_selections, tx_calchan_low_plnum}, + {"1800", RFPW_STD_BAND_1800, 700, 0, 15, tx_calchan_1800, 4, + tx_calchan_high_selections, tx_calchan_high_plnum}, + {"1900", RFPW_STD_BAND_1900, 660, 0, 15, tx_calchan_1900, 3, + tx_calchan_high_selections, tx_calchan_high_plnum}, + {0, 0, 0, 0, 0, 0, 0, 0, 0} }; struct txcal_band *txcal_band;