Skip to content

Commit a0ac808

Browse files
author
Alvaro Arroyo Parejo
committed
changes to consider 2 decimal digits in mag for ephemerides
1 parent a2ea15e commit a0ac808

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎ESANEOCC/tabs.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,11 +1909,11 @@ def _ephem_parser(self, name, observatory, start, stop, step, step_unit):
19091909
# Since ephemerides col space is fixed, it is defined in order
19101910
# to set the length (number of spaces) for each field
19111911
col_space = [(1,12), (13,19), (20,32) ,(34,37), (38,40),
1912-
(41,47), (49,52), (53,55), (56, 61), (62,67),
1913-
(68,73), (74,82), (83, 94), (95,101), (102, 108),
1914-
(109,115), (116,121), (122,127), (128,135),
1915-
(136,143), (145,153), (155,163), (165,173),
1916-
(174,179), (181,188), (191,198), (200,205)]
1912+
(41,47), (49,52), (53,55), (56, 61), (62,68),
1913+
(69,74), (75,83), (84, 95), (96,102), (103, 109),
1914+
(110,116), (117,122), (123,128), (129,136),
1915+
(137,144), (146,154), (156,164), (166,174),
1916+
(175,180), (182,189), (192,199), (201,206)]
19171917
# Read pandas as txt
19181918
ephem = pd.read_fwf(ephems_d, header=None, skiprows=9,
19191919
engine='python', colspecs=col_space)

‎test/data/516976%202012HM1.eph

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ Initial Date: 2020/09/01 00:00 UTC
44
Final Date: 2020/09/02 00:00 UTC
55
Time step: 5 hours
66
Equatorial coordinates App. motion Sky plane error
7-
Date Hour MJD RA DEC Mag Alt Airmass Sun elev. SolEl LunEl Phase Glat Glon R Delta RA*cosDE DEC Vel PA Err1 Err2 AngAx
8-
(UTC) (UTC) (h m s) (d ' ") (deg) (deg) (deg) (deg) (deg) (deg) (deg) (au) (au) ("/min) ("/min) ("/min) (deg) (deg)
9-
=========== ====== ============ ============= ============ ===== ===== ======== =========== ====== ====== ====== ===== ===== ======= ======= ======== ======== ======== ===== ======== ======== ======
10-
1 Sep 2020 0.000 59093.000000 9 42 59.688 + 8 9 39.70 26.6 -42.6 INF -43.8 14.5 169.8 5.6 41.6 226.9 2.603 3.568 0.9632 -0.3270 1.0172 108.7 0.014" 0.008" 113.3
11-
1 Sep 2020 5.000 59093.208333 9 43 19.087 + 8 8 1.71 26.6 2.7 15.337 -8.5 14.6 -170.0 5.6 41.7 227.0 2.602 3.566 0.9555 -0.3265 1.0098 108.9 0.014" 0.008" 113.3
12-
1 Sep 2020 10.000 59093.416666 9 43 38.293 + 8 6 23.59 26.6 56.0 1.205 48.1 14.7 -169.2 5.6 41.7 227.1 2.601 3.565 0.9472 -0.3278 1.0023 109.1 0.014" 0.008" 113.3
13-
1 Sep 2020 15.000 59093.625000 9 43 57.442 + 8 4 44.95 26.6 30.4 1.969 41.4 14.8 -167.2 5.7 41.8 227.2 2.601 3.563 0.9509 -0.3297 1.0064 109.1 0.014" 0.008" 113.3
14-
1 Sep 2020 20.000 59093.833333 9 44 16.758 + 8 3 5.95 26.6 -26.3 INF -16.0 14.9 -165.4 5.7 41.9 227.3 2.600 3.562 0.9614 -0.3300 1.0164 108.9 0.014" 0.008" 113.4
7+
Date Hour MJD RA DEC Mag Alt Airmass Sun elev. SolEl LunEl Phase Glat Glon R Delta RA*cosDE DEC Vel PA Err1 Err2 AngAx
8+
(UTC) (UTC) (h m s) (d ' ") (deg) (deg) (deg) (deg) (deg) (deg) (deg) (au) (au) ("/min) ("/min) ("/min) (deg) (deg)
9+
=========== ====== ============ ============= ============ ====== ===== ======== =========== ====== ====== ====== ===== ===== ======= ======= ======== ======== ======== ===== ======== ======== ======
10+
1 Sep 2020 0.000 59093.000000 9 42 59.688 + 8 9 39.70 26.64 -42.6 INF -43.8 14.5 169.8 5.6 41.6 226.9 2.603 3.568 0.9632 -0.3270 1.0172 108.7 0.014" 0.008" 113.3
11+
1 Sep 2020 5.000 59093.208333 9 43 19.087 + 8 8 1.71 26.65 2.7 15.337 -8.5 14.6 -170.0 5.6 41.7 227.0 2.602 3.566 0.9555 -0.3265 1.0098 108.9 0.014" 0.008" 113.3
12+
1 Sep 2020 10.000 59093.416666 9 43 38.293 + 8 6 23.59 26.65 56.0 1.205 48.1 14.7 -169.2 5.6 41.7 227.1 2.601 3.565 0.9472 -0.3278 1.0023 109.1 0.014" 0.008" 113.3
13+
1 Sep 2020 15.000 59093.625000 9 43 57.442 + 8 4 44.95 26.65 30.4 1.969 41.4 14.8 -167.2 5.7 41.8 227.2 2.601 3.563 0.9509 -0.3297 1.0064 109.1 0.014" 0.008" 113.3
14+
1 Sep 2020 20.000 59093.833333 9 44 16.758 + 8 3 5.95 26.65 -26.3 INF -16.0 14.9 -165.4 5.7 41.9 227.3 2.600 3.562 0.9614 -0.3300 1.0164 108.9 0.014" 0.008" 113.4
1515

‎test/data/99942.eph

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ Initial Date: 2019/05/08 01:30 UTC
44
Final Date: 2019/05/23 00:00 UTC
55
Time step: 1 days
66
Equatorial coordinates App. motion Sky plane error
7-
Date Hour MJD RA DEC Mag Alt Airmass Sun elev. SolEl LunEl Phase Glat Glon R Delta RA*cosDE DEC Vel PA Err1 Err2 AngAx
8-
(UTC) (UTC) (h m s) (d ' ") (deg) (deg) (deg) (deg) (deg) (deg) (deg) (au) (au) ("/min) ("/min) ("/min) (deg) (deg)
9-
=========== ====== ============ ============= ============ ===== ===== ======== =========== ====== ====== ====== ===== ===== ======= ======= ======== ======== ======== ===== ======== ======== ======
10-
8 May 2019 1.500 58611.062500 6 43 40.509 +20 47 1.20 21.6 0.0 INF 0.0 -53.3 -14.8 47.4 7.7 193.5 1.098 1.346 2.1406 -0.0992 2.1429 92.7 0.001" 0.000" 115.9
11-
9 May 2019 1.500 58612.062500 6 47 20.055 +20 44 29.55 21.6 0.0 INF 0.0 -53.2 -2.4 47.3 8.4 193.9 1.098 1.349 2.1359 -0.1114 2.1389 93.0 0.001" 0.000" 117.5
12-
10 May 2019 1.500 58613.062500 6 50 59.059 +20 41 40.35 21.6 0.0 INF 0.0 -53.1 11.3 47.3 9.2 194.3 1.099 1.352 2.1313 -0.1235 2.1349 93.3 0.001" 0.000" 119.1
13-
11 May 2019 1.500 58614.062500 6 54 37.517 +20 38 33.74 21.6 0.0 INF 0.0 -53.0 24.4 47.2 9.9 194.7 1.099 1.355 2.1267 -0.1356 2.1310 93.6 0.001" 0.000" 120.9
14-
12 May 2019 1.500 58615.062500 6 58 15.428 +20 35 9.86 21.6 0.0 INF 0.0 -52.9 37.6 47.1 10.7 195.1 1.099 1.358 2.1221 -0.1475 2.1273 94.0 0.001" 0.000" 122.9
15-
13 May 2019 1.500 58616.062500 7 1 52.788 +20 31 28.87 21.6 0.0 INF 0.0 -52.7 51.0 47.0 11.4 195.6 1.099 1.361 2.1176 -0.1594 2.1236 94.3 0.001" 0.000" 125.2
16-
14 May 2019 1.500 58617.062500 7 5 29.596 +20 27 30.91 21.6 0.0 INF 0.0 -52.6 64.4 46.9 12.2 196.0 1.099 1.363 2.1131 -0.1711 2.1201 94.6 0.001" 0.000" 127.6
17-
15 May 2019 1.500 58618.062500 7 9 5.851 +20 23 16.13 21.6 0.0 INF 0.0 -52.5 77.8 46.9 12.9 196.4 1.098 1.366 2.1087 -0.1827 2.1166 95.0 0.001" 0.000" 130.4
18-
16 May 2019 1.500 58619.062500 7 12 41.554 +20 18 44.67 21.6 0.0 INF 0.0 -52.4 91.1 46.8 13.6 196.8 1.098 1.369 2.1044 -0.1942 2.1133 95.3 0.001" 0.000" 133.4
19-
17 May 2019 1.500 58620.062500 7 16 16.707 +20 13 56.69 21.6 0.0 INF 0.0 -52.3 104.4 46.7 14.4 197.3 1.098 1.372 2.1001 -0.2057 2.1101 95.6 0.001" 0.000" 136.7
20-
18 May 2019 1.500 58621.062500 7 19 51.312 +20 8 52.34 21.6 0.0 INF 0.0 -52.1 117.5 46.6 15.1 197.7 1.098 1.374 2.0959 -0.2170 2.1071 95.9 0.001" 0.000" 140.2
21-
19 May 2019 1.500 58622.062500 7 23 25.375 +20 3 31.76 21.6 0.0 INF 0.0 -52.0 130.3 46.6 15.8 198.1 1.098 1.377 2.0918 -0.2282 2.1042 96.2 0.001" 0.000" 143.9
22-
20 May 2019 1.500 58623.062500 7 26 58.899 +19 57 55.11 21.6 0.0 INF 0.0 -51.9 142.9 46.5 16.6 198.6 1.097 1.379 2.0878 -0.2393 2.1015 96.5 0.001" 0.000" 147.7
23-
21 May 2019 1.500 58624.062500 7 30 31.891 +19 52 2.53 21.6 0.0 INF 0.0 -51.8 155.1 46.4 17.3 199.0 1.097 1.382 2.0839 -0.2503 2.0989 96.8 0.001" 0.000" 151.5
24-
22 May 2019 1.500 58625.062500 7 34 4.356 +19 45 54.16 21.6 0.0 INF 0.0 -51.7 166.9 46.4 18.0 199.5 1.096 1.384 2.0801 -0.2612 2.0965 97.2 0.001" 0.001" 155.2
7+
Date Hour MJD RA DEC Mag Alt Airmass Sun elev. SolEl LunEl Phase Glat Glon R Delta RA*cosDE DEC Vel PA Err1 Err2 AngAx
8+
(UTC) (UTC) (h m s) (d ' ") (deg) (deg) (deg) (deg) (deg) (deg) (deg) (au) (au) ("/min) ("/min) ("/min) (deg) (deg)
9+
=========== ====== ============ ============= ============ ====== ===== ======== =========== ====== ====== ====== ===== ===== ======= ======= ======== ======== ======== ===== ======== ======== ======
10+
8 May 2019 1.500 58611.062500 6 43 40.509 +20 47 1.20 21.58 0.0 INF 0.0 -53.3 -14.8 47.4 7.7 193.5 1.098 1.346 2.1406 -0.0992 2.1429 92.7 0.001" 0.000" 115.9
11+
9 May 2019 1.500 58612.062500 6 47 20.055 +20 44 29.55 21.58 0.0 INF 0.0 -53.2 -2.4 47.3 8.4 193.9 1.098 1.349 2.1359 -0.1114 2.1389 93.0 0.001" 0.000" 117.5
12+
10 May 2019 1.500 58613.062500 6 50 59.059 +20 41 40.35 21.58 0.0 INF 0.0 -53.1 11.3 47.3 9.2 194.3 1.099 1.352 2.1313 -0.1235 2.1349 93.3 0.001" 0.000" 119.1
13+
11 May 2019 1.500 58614.062500 6 54 37.517 +20 38 33.74 21.58 0.0 INF 0.0 -53.0 24.4 47.2 9.9 194.7 1.099 1.355 2.1267 -0.1356 2.1310 93.6 0.001" 0.000" 120.9
14+
12 May 2019 1.500 58615.062500 6 58 15.428 +20 35 9.86 21.59 0.0 INF 0.0 -52.9 37.6 47.1 10.7 195.1 1.099 1.358 2.1221 -0.1475 2.1273 94.0 0.001" 0.000" 122.9
15+
13 May 2019 1.500 58616.062500 7 1 52.788 +20 31 28.87 21.59 0.0 INF 0.0 -52.7 51.0 47.0 11.4 195.6 1.099 1.361 2.1176 -0.1594 2.1236 94.3 0.001" 0.000" 125.2
16+
14 May 2019 1.500 58617.062500 7 5 29.596 +20 27 30.91 21.59 0.0 INF 0.0 -52.6 64.4 46.9 12.2 196.0 1.099 1.363 2.1131 -0.1711 2.1201 94.6 0.001" 0.000" 127.6
17+
15 May 2019 1.500 58618.062500 7 9 5.851 +20 23 16.13 21.59 0.0 INF 0.0 -52.5 77.8 46.9 12.9 196.4 1.098 1.366 2.1087 -0.1827 2.1166 95.0 0.001" 0.000" 130.4
18+
16 May 2019 1.500 58619.062500 7 12 41.554 +20 18 44.67 21.60 0.0 INF 0.0 -52.4 91.1 46.8 13.6 196.8 1.098 1.369 2.1044 -0.1942 2.1133 95.3 0.001" 0.000" 133.4
19+
17 May 2019 1.500 58620.062500 7 16 16.707 +20 13 56.69 21.60 0.0 INF 0.0 -52.3 104.4 46.7 14.4 197.3 1.098 1.372 2.1001 -0.2057 2.1101 95.6 0.001" 0.000" 136.7
20+
18 May 2019 1.500 58621.062500 7 19 51.312 +20 8 52.34 21.60 0.0 INF 0.0 -52.1 117.5 46.6 15.1 197.7 1.098 1.374 2.0959 -0.2170 2.1071 95.9 0.001" 0.000" 140.2
21+
19 May 2019 1.500 58622.062500 7 23 25.375 +20 3 31.76 21.60 0.0 INF 0.0 -52.0 130.3 46.6 15.8 198.1 1.098 1.377 2.0918 -0.2282 2.1042 96.2 0.001" 0.000" 143.9
22+
20 May 2019 1.500 58623.062500 7 26 58.899 +19 57 55.11 21.60 0.0 INF 0.0 -51.9 142.9 46.5 16.6 198.6 1.097 1.379 2.0878 -0.2393 2.1015 96.5 0.001" 0.000" 147.7
23+
21 May 2019 1.500 58624.062500 7 30 31.891 +19 52 2.53 21.60 0.0 INF 0.0 -51.8 155.1 46.4 17.3 199.0 1.097 1.382 2.0839 -0.2503 2.0989 96.8 0.001" 0.000" 151.5
24+
22 May 2019 1.500 58625.062500 7 34 4.356 +19 45 54.16 21.60 0.0 INF 0.0 -51.7 166.9 46.4 18.0 199.5 1.096 1.384 2.0801 -0.2612 2.0965 97.2 0.001" 0.001" 155.2
2525

‎test/test_NEOCC.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,7 +1396,7 @@ def test_tabs_ephemerides(patch_get):
13961396
'MJD in UTC' : 59093.833333,
13971397
'RA h' : 9, 'RA m' : 44, 'RA s' : 16.758,
13981398
'DEC d' : 8, 'DEC \'' : 3, 'DEC "' : 5.95,
1399-
'Mag' : 26.6, 'Alt (deg)' : -26.3,
1399+
'Mag' : 26.65, 'Alt (deg)' : -26.3,
14001400
'Airmass' : float('INF'),
14011401
'Sun elev. (deg)' : -16.0, 'SolEl (deg)' : 14.9,
14021402
'LunEl (deg)' : -165.4, 'Phase (deg)' : 5.7,
@@ -1421,7 +1421,7 @@ def test_tabs_ephemerides(patch_get):
14211421
'MJD in UTC' : 58615.0625,
14221422
'RA h' : 6, 'RA m' : 58, 'RA s' : 15.428,
14231423
'DEC d' : 20, 'DEC \'' : 35, 'DEC "' : 9.86,
1424-
'Mag' : 21.6, 'Alt (deg)' : 0.0,
1424+
'Mag' : 21.59, 'Alt (deg)' : 0.0,
14251425
'Airmass' : float('INF'),
14261426
'Sun elev. (deg)' : 0.0, 'SolEl (deg)' : -52.9,
14271427
'LunEl (deg)' : 37.6, 'Phase (deg)' : 47.1,

0 commit comments

Comments
 (0)