Browse Source

Bugs fixed and Ant.pos updated

pull/1/head
Benito Marcote 2 years ago
parent
commit
ac1ded6da1
  1. 6
      app.py
  2. 9
      assets/style.css
  3. 15
      data/station_location.txt
  4. BIN
      src/__pycache__/observation.cpython-37.pyc
  5. 14
      src/observation.py

6
app.py

@ -176,7 +176,7 @@ app.layout = html.Div([
html.Div(className='form-group', children=[
html.Label('Target Source Coordinates'),
# dcc.Input(id='source', value='hh:mm:ss dd:mm:ss', type='text',
dcc.Input(id='source', value='01:20:00 +50:40:30', type='text',
dcc.Input(id='source', value='12:29:06.7 +02:03:08.6', type='text',
className='form-control', placeholder="hh:mm:ss dd:mm:ss",
persistence=True),
html.Small(id='error_source', style={'color': 'red'},
@ -255,7 +255,9 @@ app.layout = html.Div([
# dcc.Markdown(id='sensitivity-output',
# children="Set the observation first.")
html.Div(className='col-12', id='sensitivity-output',
children=[html.Br(), html.P("Set the observation first.")])
children=[html.Div(className='col-6 justify-content-center', children=[html.Br(),
html.P("You need to set the observation and click in the 'Compute Observation' buttom first (go to the previous tab).")])
])
])
]),
dcc.Tab(label='Elevations', className='custom-tab',

9
assets/style.css

@ -3338,6 +3338,15 @@ input[type=checkbox]:disabled:after {
/* justify-content: center; */
}
.custom-tabs-container {
border-top: 0px solid #F0959B;
}
.custom-tabs {
border-top: 0px solid #F0959B !important;
}
.custom-tabs-container .tab--selected {
background-color: #F0959B;
color: #a01d26;

15
data/station_location.txt

@ -1,13 +1,13 @@
station code network x y z SEFD-92 SEFD-49 SEFD-30 SEFD-21 SEFD-18 SEFD-13 SEFD-6 SEFD-5 SEFD-3.6 SEFD-1.3 SEFD-0.7 SEFD-0.3 SEFD-0.1
Badary Bd EVN -838201.0685 3865751.5652 4987670.8885 -1 -1 -1 330 330 330 200 -1 200 710 -1 -1 -1
Effelsberg Ef EVN 4033947.2616 486990.7866 4900430.9915 600 600 65 20 19 300 20 25 20 70 200 -1 -1
Effelsberg Ef EVN 4033947.2616 486990.7943 4900431.0017 600 600 65 20 19 300 20 25 20 70 200 -1 -1
Brewster Br VLBA -2112065.2062 -3705356.5048 4726813.6759 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Fort_Davis Fd VLBA -1324009.3266 -5332181.9547 3231962.3949 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Green_Bank Gb VLBA 882589.4102 -4924872.3416 3943729.4062 35 24 13 10 10 12 13 13 15 20 30 -1 -1
Hartebeesthoek Hh EVN 5085442.7637 2668263.7913 -2768696.7523 -1 -1 -1 -1 430 410 650 700 630 1800 -1 -1 -1
Hancock Hn VLBA 1446374.8658 -4447939.6774 4322306.1838 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Hobart Ho LBA -3950237.3590 2522347.6804 -4311561.8790 -1 -1 -1 470 470 650 640 640 560 1200 1800 -1 -1
Kitt_Peak Kp VLBA -1995678.8402 -5037317.6968 3357328.0251 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Kitt_Peak Kp VLBA -1995678.8571 -5037317.7049 3357328.0174 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Kunming Km EVN -1281152.8362 5640864.3586 2682653.4434 -1 -1 -1 -1 -1 350 17 17 480 -1 -1 -1 -1
Los_Alamos La VLBA -1449752.5839 -4975298.5757 3709123.8459 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Medicina Mc EVN 4461369.6954 919597.1240 4449559.3812 -1 -1 -1 490 700 400 170 840 320 700 -1 -1 -1
@ -15,23 +15,23 @@ Metsahovi Mh EVN 2892584.8489 1311715.5980 5512640.1545 -1
Mauna_Kea Mk VLBA -5464075.1874 -2495248.1168 2148297.3643 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
North_Liberty Nl VLBA -130872.4987 -4762317.0925 4226851.0014 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Noto Nt EVN 4934562.8407 1321201.5428 3806484.7336 -1 -1 -1 820 784 770 260 1100 770 800 900 -1 -1
Onsala On EVN 3370605.8010 711917.7196 5349830.9004 -1 -1 900 350 350 1110 480 850 785 1200 1310 -1 -1
Onsala On EVN 3370965.8787 711466.1978 5349664.2006 -1 -1 900 350 350 1110 480 850 785 1200 1310 -1 -1
OVRO Ov VLBA -2409150.4018 -4478573.1180 3838617.3385 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Parkes Pa LBA -4554232.4864 2816758.8662 -3454035.0137 -1 -1 -1 40 40 30 110 110 43 370 810 -1 -1
Pie_Town Pt VLBA -1640953.9383 -5014816.0237 3575411.7916 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Sardinia Sr EVN 4865182.7660 791922.6890 4035137.1740 -1 -1 -1 67 67 -1 -1 50 -1 138 -1 -1 -1
Sardinia Sr EVN 4865183.5420 791922.2550 4035136.0240 -1 -1 -1 67 67 -1 -1 50 -1 138 -1 -1 -1
St._Croix Sc VLBA 2607848.6379 -5488069.5358 1932739.7326 2742 2744 -1 289 314 347 210 278 327 543 640 -1 -1
Tianma T6 EVN -2826708.6030 4679237.0770 3274667.5510 -1 -1 -1 39000 39000 46 26 26 48 70 120 -1 -1
Shanghai Sh EVN -2826708.6030 4679237.0770 3274667.5510 -1 -1 -1 -1 670 800 720 1500 800 -1 -1 -1 -1
Shanghai Sh EVN -2831687.4273 4675733.4681 3275327.4971 -1 -1 -1 -1 670 800 720 1500 800 -1 -1 -1 -1
Urumqi Ur EVN 228310.2129 4631922.7656 4367064.0638 -1 -1 -1 300 300 560 250 -1 350 850 -1 -1 -1
Yebes Ys EVN 4848780.1314 -261701.7668 4123035.9350 -1 -1 -1 -1 -1 1400 160 160 200 200 480 -1 -1
Yebes Ys EVN 4848761.8027 -261484.1746 4123085.0529 -1 -1 -1 -1 -1 1400 160 160 200 200 480 -1 -1
Zelenchukskaya Zc EVN 3451207.5353 3060375.4139 4391915.0384 -1 -1 -1 300 300 330 400 -1 200 710 -1 -1 -1
JVLA_1 VLA VLBA -1601185.4286 -5041977.1754 3554875.6231 3900 -1 -1 420 420 370 310 310 250 350 560 -1 -1
JVLA_27 Y27 VLBA -1601185.4286 -5041977.1754 3554875.6231 167 -1 -1 17.9 17.9 15.8 13.2 13.2 10.7 15 23.9 -1 -1
Robledo_70 Ro7 EVN 4849336.6927 -360488.7857 4114748.8272 -1 -1 -1 -1 35 20 -1 -1 18 83 -1 -1 -1
Robledo_34 Ro3 EVN 4849336.6927 -360488.7857 4114748.8272 -1 -1 -1 -1 -1 150 -1 -1 106 -1 -1 -1 -1
Arecibo Ar Other 2390486.9000 -5564731.4400 1994720.4500 12 -1 3 3.5 3 3 5 5 6 -1 -1 -1 -1
Irbene Ir EVN 3183649.615 1276902.735 5359264.576 -1 -1 -1 -1 3600 -1 430 480 1300 -1 -1 -1 -1
Irbene Ir EVN 3183649.314 1276902.989 5359264.710 -1 -1 -1 -1 3600 -1 430 480 1300 -1 -1 -1 -1
Jodrell_Bank Jb2 EVN 3822846.7600 -153802.2800 5086285.9000 -1 -1 -1 350 320 -1 320 300 -1 910 -1 -1 -1
Lovell Jb1 EVN 3822626.0400 -154105.6500 5086486.0400 132 83 -1 36 65 -1 80 -1 -1 -1 -1 -1 -1
Torun Tr EVN 3638558.5100 1221969.7200 5077036.7600 -1 -1 2000 250 300 -1 220 650 -1 500 -1 -1 -1
@ -56,6 +56,7 @@ ASKAP ASKAP Other -2556743.707 5097440.315 -2847749.657 -1
Wettzell Wz EVN 4075627.6441 931774.2773 4801552.3784 -1 -1 -1 -1 -1 1250 -1 -1 750 -1 -1 -1 -1
SKA1_MID SKA Other -2556743.707 5097440.315 -2847749.657 -1 -1 -1 3 3 -1 -1 -1 -1 -1 -1 -1 -1
Kuntunse Nk Other 6346273.5210 -33779.7127 634844.9454 -1 -1 -1 -1 -1 -1 1200 -1 -1 -1 -1 -1 -1
Dwingeloo Dw Other 3839348.9730 430403.5100 5057990.0990 -1 -1 -1 6000 6000 -1 -1 -1 -1 -1 -1 -1 -1
FAST Fa Other -1668526.98 5506738.85 2744897.69 8 -1 2 1.95 1.95 -1 -1 -1 -1 -1 -1 -1 -1
Matera Ma Other 4641938.4489 1393003.3339 4133325.7916 -1 -1 -1 -1 -1 1000 -1 -1 1000 -1 -1 -1 -1
Alesund Ny Other 1202462.5055 252734.5174 6237766.2210 -1 -1 -1 -1 -1 850 -1 -1 1255 -1 -1 -1 -1

BIN
src/__pycache__/observation.cpython-37.pyc

Binary file not shown.

14
src/observation.py

@ -406,11 +406,21 @@ class Observation(object):
bl_bmaj = np.max(uvvis_polar[:,0])
bl_bmaj_theta = uvvis_polar[:,1][np.where(uvvis_polar[:,0] == bl_bmaj)][0]
# Estimates the BMIN
cond = np.where((uvvis_polar[:,1] > (bl_bmaj_theta+np.pi/3) % (2*np.pi)) & (uvvis_polar[:,1] < (bl_bmaj_theta+2*np.pi/3) % (2*np.pi) ))
cond = [[]]
if len(cond[0]) == 0:
cond = np.where((uvvis_polar[:,1] > (bl_bmaj_theta+4*np.pi/3) % (2*np.pi)) & (uvvis_polar[:,1] < (bl_bmaj_theta+5*np.pi/3) % (2*np.pi) ))
bl_bmin = np.max( uvvis_polar[:,0][cond] )
check_intervals = [(np.pi/3, 2*np.pi/3), (4*np.pi/3, 5*np.pi/3), (np.pi/4, 3*np.pi/4),
(5*np.pi/4, 7*np.pi/4)]
try:
while len(cond[0]) == 0:
ci = check_intervals.pop()
cond = np.where((uvvis_polar[:,1] > (bl_bmaj_theta+ci[0]) % (2*np.pi)) & \
(uvvis_polar[:,1] < (bl_bmaj_theta+ci[1]) % (2*np.pi) ))
bl_bmin = np.max( uvvis_polar[:,0][cond] )
except IndexError:
bl_bmin = bl_bmaj/10
return {'bmaj': resolution(bl_bmin), 'bmin': resolution(bl_bmaj), 'pa': (bl_bmaj_theta*u.rad).to(u.deg)}

Loading…
Cancel
Save