From 2595cfc0cb693d628332d40867829bf3f56705d6 Mon Sep 17 00:00:00 2001 From: Hugot FX Date: Wed, 23 Jan 2019 06:13:55 +0100 Subject: [PATCH] reading sat priorities and favorite transmitters as external csv file --- schedule_single_station.py | 43 +++++++------------------------------- utils.py | 16 ++++++++++++++ 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/schedule_single_station.py b/schedule_single_station.py index dbea3ab..2f771f0 100755 --- a/schedule_single_station.py +++ b/schedule_single_station.py @@ -10,7 +10,7 @@ import argparse import logging from utils import get_active_transmitter_info, get_transmitter_stats, \ get_groundstation_info, get_last_update, get_scheduled_passes_from_network, ordered_scheduler, \ - efficiency, find_passes, schedule_observation + efficiency, find_passes, schedule_observation, read_priorities_transmitters import settings from tqdm import tqdm import sys @@ -225,40 +225,13 @@ if __name__ == "__main__": # Find passes passes = find_passes(satellites, observer, tmin, tmax, minimum_altitude) - # Priorities - priorities = { - '25544' : .8, #"ISS"; - '43017' : 1.0, #"FOX-1B"; - '43770' : 1.0, #"FOX-1C"; - '43137' : 1.0, #"FOX-1D"; - '40967' : .3, #"FOX-1A"; - '25338' : .8, #"NOAA-15"; - '28654' : .8, #"NOAA-18"; - '33591' : .8, #"NOAA-19"; - '40654' : .4, #"NO-84"; - '40903' : .4, #"XW-2A"; - '40907' : .4, #"XW-2D"; - '40909' : .4, #"XW-2E"; - '40910' : .4, #"XW-2F"; - '42761' : .4, #"CAS-4A"; - '42759' : .4, #"CAS-4B"; - '40069' : .3, #"METEOR-M2"; - '43792' : .8, #"FUNCUBE-4"; - '39444' : .3, #"FUNCUBE-1"; - '42017' : .3, #"NAYIF-1"; - '42778' : .3, #"MAXVALIER"; - } - - favorite_transmitters = { - '43017' : 'KgazZMKEa74VnquqXLwAvD', #"FOX-1B"; - '43137' : '3rLGJWqj3XZ6Z8vADCRwiW', #"FOX-1D"; - '43770' : 'bxfwWfvm9UaXRvVfyhcjt6', #"FOX-1C"; - '40967' : 'ZyjKNJ9KqnTHBCUzAPN5G5', #"FOX-1A"; - '25338' : 'mjsHcYajEgbiS9cbKfecGo', #"NOAA-15"; - '28654' : 'u2h8AaSR7ZJPreFgVDtcfP', #"NOAA-18"; - '33591' : 'kE4VaYKpnFmzEquEjKKi8D', #"NOAA-19"; - '43792' : 'cmw2kqKrADT2JYGhwSfui3', #"FUNCUBE-4"; - } + # Priorities and favorite transmitters + # read the following format + # 43017 1. KgazZMKEa74VnquqXLwAvD + if os.path.exists('satpriorities.csv'): + priorities, favorite_transmitters = read_priorities_transmitters('satpriorities.csv') + else: + priorities, favorite_transmitters = {}, {} # List of scheduled passes scheduledpasses = get_scheduled_passes_from_network(ground_station_id, tmin, tmax) diff --git a/utils.py b/utils.py index 4e2bd56..3a976cb 100644 --- a/utils.py +++ b/utils.py @@ -7,6 +7,7 @@ import ephem import lxml import settings from tqdm import tqdm +import csv def get_paginated_endpoint(url, max_entries=None): @@ -26,6 +27,21 @@ def get_paginated_endpoint(url, max_entries=None): return data +def read_priorities_transmitters(filename): + with open(filename, 'rb') as csvfile: + satprio = {} + sattrans = {} + csvreader = csv.reader(csvfile, delimiter=' ', quotechar='|') + for row in csvreader: + sat = row[0] + prio = row[1] + transmitter = row[2] + satprio[sat] = float(prio) + sattrans[sat] = transmitter + return (satprio, sattrans) + + + def get_active_transmitter_info(fmin, fmax): # Open session logging.info("Fetching transmitter information from DB.")