From 532316a9ecd49a258855a9f74be07d19cccbf8a7 Mon Sep 17 00:00:00 2001 From: cgbsat Date: Sun, 14 Jul 2019 11:58:04 +0000 Subject: [PATCH] Change description of -f option --- schedule_single_station.py | 12 ++++++------ utils.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/schedule_single_station.py b/schedule_single_station.py index 3556fa2..36f1375 100755 --- a/schedule_single_station.py +++ b/schedule_single_station.py @@ -97,11 +97,11 @@ def main(): help="Don't respect station horizon (schedule 0 to 0 elevation)", action="store_true") parser.add_argument("-f", - "--no-search-transmitters", - help="Do not search good transmitters [default searching]", - dest='search_transmitters', + "--only-priority", + help="Schedule only priority satellites (from -P file)", + dest='only_priority', action='store_false') - parser.set_defaults(search_transmitters=True) + parser.set_defaults(only_priority=True) parser.add_argument("-w", "--wait", help="Wait time between consecutive observations (for setup and slewing)" + @@ -172,7 +172,7 @@ def main(): min_horizon_arg = args.min_horizon cache_dir = "/tmp/cache" schedule = not args.dryrun - search_transmitters = args.search_transmitters + only_priority = args.only_priority priority_filename = args.priorities # Set time range @@ -288,7 +288,7 @@ def main(): # Get passes of priority objects prioritypasses, normalpasses = get_priority_passes(passes, priorities, favorite_transmitters, - search_transmitters, min_priority) + only_priority, min_priority) # Priority scheduler prioritypasses = sorted(prioritypasses, key=lambda satpass: -satpass['priority']) diff --git a/utils.py b/utils.py index be96849..bae5694 100644 --- a/utils.py +++ b/utils.py @@ -305,7 +305,7 @@ def find_passes(satellites, observer, tmin, tmax, minimum_altitude, min_pass_dur return passes -def get_priority_passes(passes, priorities, favorite_transmitters, search, min_priority): +def get_priority_passes(passes, priorities, favorite_transmitters, only_priority, min_priority): priority = [] normal = [] for satpass in passes: @@ -317,7 +317,7 @@ def get_priority_passes(passes, priorities, favorite_transmitters, search, min_p # Add if priority is high enough if satpass['priority'] >= min_priority: priority.append(satpass) - elif search: + elif only_priority: # Find satellite transmitter with highest number of good observations max_good_count = max([s['good_count'] for s in passes if s["id"] == satpass["id"]]) if max_good_count > 0: