diff --git a/scripts/hivnetworkannotate b/scripts/hivnetworkannotate index d26592d..34ef0f9 100755 --- a/scripts/hivnetworkannotate +++ b/scripts/hivnetworkannotate @@ -71,6 +71,8 @@ import_settings = arguments.parse_args() results_json = json.load (import_settings.network) +root_trace_results = False + if('trace_results' in results_json.keys()): root_trace_results = True @@ -197,7 +199,7 @@ if inject_missing_value: if import_settings.inplace and import_settings.network is not sys.stdin: import_settings.output = open (import_settings.network.name, "w") -if 'Settings' in network_json and 'compact_json' in network_json['Settings']: +if 'Settings' in network_json and 'compact_json' in network_json['Settings'] and network_json['Settings']['compact_json']: ht_compress_network_json (network_json) # Return with trace_results key diff --git a/scripts/hivnetworkcsv b/scripts/hivnetworkcsv index 15823fa..1ab0b6e 100755 --- a/scripts/hivnetworkcsv +++ b/scripts/hivnetworkcsv @@ -101,7 +101,8 @@ def make_hiv_network(): cluster_summary_info = None - + prior_network_subclusters = None + if settings().prior is not None: try: existing_nodes = {} # node ID -> cluster ID