Commit 2a356273f5cbf9ad9b5f61cf1a1604488e0338f4
Exists in
master
Merge branch 'master' of https://gitlab.irap.omp.eu/guitastrolib/guitastro
# Conflicts: # src/guitastro/rrlyromc.py
Showing
1 changed file
with
12 additions
and
0 deletions
Show diff stats
src/guitastro/rrlyromc.py
| ... | ... | @@ -3792,9 +3792,21 @@ if __name__ == "__main__": |
| 3792 | 3792 | Download (o-c) data of selected stars in the GEOS database |
| 3793 | 3793 | """ |
| 3794 | 3794 | star = RrlyrOmC() |
| 3795 | +<<<<<<< HEAD | |
| 3795 | 3796 | res = star.download_geos_database(starnames=["RR Lyr"], force=True) |
| 3796 | 3797 | res = star.download_geos_database(starnames=["V1109 Cas", "KQ UMa"]) |
| 3797 | 3798 | res = star.download_geos_database(starnames=["BH Peg", "SS CVn", "ST Boo", "SZ Hya", "TT Cnc", "AV Dra", "BD Her", "HP Her", "V759 Cyg", "KV Cnc", "RU Cet", "RZ Lyr", "WZ Hya"]) |
| 3799 | +======= | |
| 3800 | +<<<<<<< HEAD | |
| 3801 | + res = star.download_geos_database(starnames=["RR Lyr"], force=True) | |
| 3802 | + res = star.download_geos_database(starnames=["V1109 Cas", "KQ UMa"]) | |
| 3803 | + res = star.download_geos_database(starnames=["BH Peg", "SS CVn", "ST Boo", "SZ Hya", "TT Cnc", "AV Dra", "BD Her", "HP Her", "V759 Cyg", "KV Cnc", "RU Cet", "RZ Lyr", "WZ Hya"]) | |
| 3804 | +======= | |
| 3805 | + res = star.download_geos_database(starnames=["RR Lyr"]) | |
| 3806 | + #res = star.download_geos_database(starnames=["V1109 Cas", "KQ UMa"]) | |
| 3807 | + #res = star.download_geos_database(starnames=["BH Peg", "SS CVn", "ST Boo", "SZ Hya", "TT Cnc", "AV Dra", "BD Her", "HP Her", "V759 Cyg", "KV Cnc", "RU Cet", "RZ Lyr", "WZ Hya"]) | |
| 3808 | +>>>>>>> df3c588c20f68f12b29f9b375984754a697b95fc | |
| 3809 | +>>>>>>> c7738e4a85021f0edad4b5a562fa34fe5a9ca0e1 | |
| 3798 | 3810 | |
| 3799 | 3811 | if example == 2: |
| 3800 | 3812 | """ | ... | ... |