From 4b7f06327e3b12827ccd515ff47e94055b39443a Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Mon, 7 Apr 2025 13:14:05 +0200 Subject: [PATCH] Fix #63, updated SRT KM configuration --- basie/radiotelescopes.py | 28 +++++++++++------------ basie/user_templates/configuration.txt | 21 ++++++++++++++--- basie/user_templates/configuration_SR.txt | 14 ++++++++---- basie/user_templates/targets.txt | 10 ++++---- 4 files changed, 46 insertions(+), 27 deletions(-) diff --git a/basie/radiotelescopes.py b/basie/radiotelescopes.py index fbcbad6..76cdf6b 100644 --- a/basie/radiotelescopes.py +++ b/basie/radiotelescopes.py @@ -106,18 +106,18 @@ def __init__(self, name=""): """ SRT.receivers["KM"].set_feed_offsets(0, (VAngle(0, u.rad), VAngle(0, u.rad))) -SRT.receivers["KM"].set_feed_offsets(1, (VAngle(0.00033355202, u.rad), - VAngle(-0.00057772859, u.rad))) +SRT.receivers["KM"].set_feed_offsets(1, (VAngle(-0.00066710365, u.rad), + VAngle(0.0, u.rad))) SRT.receivers["KM"].set_feed_offsets(2, (VAngle(-0.00033355205, u.rad), - VAngle(-0.00057772859, u.rad))) -SRT.receivers["KM"].set_feed_offsets(3, (VAngle(-0.00066710365, u.rad), - VAngle(0, u.rad))) -SRT.receivers["KM"].set_feed_offsets(4, (VAngle(-0.00033355205, u.rad), VAngle(0.00057772859, u.rad))) -SRT.receivers["KM"].set_feed_offsets(5, (VAngle(0.00033355205, u.rad), +SRT.receivers["KM"].set_feed_offsets(3, (VAngle(0.00033355205, u.rad), VAngle(0.00057772859, u.rad))) -SRT.receivers["KM"].set_feed_offsets(6, (VAngle(0.00066710365, u.rad), +SRT.receivers["KM"].set_feed_offsets(4, (VAngle(0.00066710365, u.rad), VAngle(0.0, u.rad))) +SRT.receivers["KM"].set_feed_offsets(5, (VAngle(0.00033355205, u.rad), + VAngle(-0.00057772859, u.rad))) +SRT.receivers["KM"].set_feed_offsets(6, (VAngle(-0.00033355205, u.rad), + VAngle(-0.00057772859, u.rad))) """ MLA: Adding data for supporting multi-feed nodding mode. @@ -125,12 +125,12 @@ def __init__(self, name=""): SRT.receivers["KM"].set_valid_pairs( { - '0': [(0,3),(0,6),(1,2),(3,6),(4,5)], - '30':[(3,5), (2,6)], - '60':[(0,2),(0,5),(1,6),(2,5),(3,4)], - '90':[(1,5),(2,4)], - '-30':[(1,3),(4,6)], - '-60':[(0,1),(0,4),(1,4),(2,3),(5,6)] + '0': [(0,1),(0,4),(1,4),(2,3),(5,6)], + '30':[(1,3), (4,6)], + '60':[(0,3),(0,6),(1,2),(3,6),(4,5)], + '90':[(2,6),(3,5)], + '-30':[(1,5),(2,4)], + '-60':[(0,2),(0,5),(1,6),(2,5),(3,4)] } ) diff --git a/basie/user_templates/configuration.txt b/basie/user_templates/configuration.txt index cca8bbf..b26847e 100644 --- a/basie/user_templates/configuration.txt +++ b/basie/user_templates/configuration.txt @@ -4,7 +4,7 @@ scheduleLabel = TestSched # SRT, MED or NOTO radiotelescope = SRT # for Medicina receivers can be: -# C, CL, X, K, KM +# CL, C, X, K, KM # for SRT receivers can be: # P, L, CL, C, K, KM # for NOTO receivers can be: @@ -24,7 +24,7 @@ tsys = 0 #maxElevation = 87 # File name of the target specs in this same directory -targetsFile = targets.txt +targetsFile = targets.txt [backends] # Here we configure which backend we are using in this schedule. @@ -48,12 +48,24 @@ targetsFile = targets.txt # 300, 730, 1250, 2000 bandwidth = 730 +[[TP40_1250]] + type = TOTALPOWER + # integration period in ms + integration = 40 + # sampling interval in ms + samplingInterval = 40.0 + # bandwidth in MHz, possible values are: + # 300, 730, 1250, 2000 + bandwidth = 1250 + feeds = 3;6 + [[XK77]] type = XARCOS # one of XK77 XK03 XK06 XK00 XC00 # if configuration = skip, the backend is not configured and the initialize must be done from operatorInput # configuration = XK77 + feeds = 0;7 [[XC00]] type=XARCOS @@ -62,6 +74,7 @@ targetsFile = targets.txt [[SARDARA]] type = Sardara # configuration must be done from operatorInput before starting the schedule + feeds = 0;7 [scantypes] @@ -101,5 +114,7 @@ targetsFile = targets.txt AlwaysOn = ONOFF 10.0 EQ 0.0d 0.0d [4on,4on_cal] #NODDINGNAME = NODDING FEED_A FEED_B DURATION [a,b,a_cal,b_cal] - Nodding06 = NODDING 2 5 10.0 [2a,2a_cal,2b,2b_cal] + Nodding01 = NODDING 0 1 10.0 [2a,2a_cal,2b,2b_cal] + Nodding04 = NODDING 0 4 10.0 [2a,2a_cal,2b,2b_cal] + Nodding14 = NODDING 1 4 10.0 [2a,2a_cal,2b,2b_cal] diff --git a/basie/user_templates/configuration_SR.txt b/basie/user_templates/configuration_SR.txt index 17d493e..6f57258 100644 --- a/basie/user_templates/configuration_SR.txt +++ b/basie/user_templates/configuration_SR.txt @@ -4,9 +4,9 @@ scheduleLabel = TestSched # SRT, MED or NOTO radiotelescope = SRT # for Medicina receivers can be: -# C, CL, X, K, KM +# CL, C, X, K, KM # for SRT receivers can be: -# P, L, C, K, KM +# P, L, CL, C, K, KM # for NOTO receivers can be: # C, M, K, Q receiver = KM @@ -18,6 +18,10 @@ tsys = 0 #restFrequency = 22345.18,22410.10 #restFrequency = 22000 #ftrack = True +#optional minElevation in degrees +#minElevation = 6 +#optional maxElevation in degrees +#maxElevation = 87 # File name of the target specs in this same directory targetsFile = targets.txt @@ -110,7 +114,7 @@ targetsFile = targets.txt AlwaysOn = ONOFF 10.0 EQ 0.0d 0.0d [4on,4on_cal] #NODDINGNAME = NODDING FEED_A FEED_B DURATION [a,b,a_cal,b_cal] - Nodding13 = NODDING 1 3 10.0 [2a,2a_cal,2b,2b_cal] - Nodding25 = NODDING 2 5 10.0 [2a,2a_cal,2b,2b_cal] - Nodding36 = NODDING 3 6 10.0 [2a,2a_cal,2b,2b_cal] + Nodding01 = NODDING 0 1 10.0 [2a,2a_cal,2b,2b_cal] + Nodding04 = NODDING 0 4 10.0 [2a,2a_cal,2b,2b_cal] + Nodding14 = NODDING 1 4 10.0 [2a,2a_cal,2b,2b_cal] diff --git a/basie/user_templates/targets.txt b/basie/user_templates/targets.txt index 249e13f..af808f7 100644 --- a/basie/user_templates/targets.txt +++ b/basie/user_templates/targets.txt @@ -1,5 +1,5 @@ -#Alpha Nodding13 XK77 EQ 12:00:00h +45:00:00 rvel=2.5 vref=GALCEN vdef=Z -#Beta Nodding25 XK77 EQ 13:00:00h +65:00:00 rvel=3.5 vref=GALCEN vdef=Z -#Gamma Nodding13 XK77 EQ 120.0d 50.0d rvel=4.5 vref=GALCEN vdef=Z -#Delta Nodding36 TP40_1250 EQ 150.0d 30.0d repetitions=2 -Gamma Nodding36 SARDARA EQ 0.0d 75.0d rvel=4.5 vref=GALCEN vdef=Z +#Alpha Nodding01 XK77 EQ 12:00:00h +45:00:00 rvel=2.5 vref=GALCEN vdef=Z +#Beta Nodding04 XK77 EQ 13:00:00h +65:00:00 rvel=3.5 vref=GALCEN vdef=Z +#Gamma Nodding01 XK77 EQ 120.0d 50.0d rvel=4.5 vref=GALCEN vdef=Z +#Delta Nodding14 TP40_1250 EQ 150.0d 30.0d repetitions=2 +Gamma Nodding14 SARDARA EQ 0.0d 75.0d rvel=4.5 vref=GALCEN vdef=Z