diff --git a/aria/conbox/converter.py b/aria/conbox/converter.py index c9f4df930cd7a616c4a54581db936dadcbf1d2e9..9f1be034372b9eccebb748a2c5cf1c85bded1298 100644 --- a/aria/conbox/converter.py +++ b/aria/conbox/converter.py @@ -1263,11 +1263,11 @@ class AriaEcXMLConverter(AriaXMLConverter): Returns ------- - """ if scoremap is not None: # TODO: implement viterbiscore as scoremap for bbcontacts ? + LOG.info("Using contact scores as selection criteria") contacts = scoremap.sortedset()[:nb_c] else: # TODO: Probleme selection des contacts utilises en l'absence de @@ -1280,13 +1280,13 @@ class AriaEcXMLConverter(AriaXMLConverter): # contacts) => utiliser tout les contact de ce set ou def des # poids pour selectionner l * f contacts de ce set if nb_c < len(contactmap.contactset()): - LOG.info( + LOG.warning( "Initialize sampling for contact selection with seed %s", self.settings.setup.config['seed']) random.seed(self.settings.setup.config['seed']) contacts = random.sample(contactmap.contactset(), nb_c) else: - LOG.info("Using all contacts") + LOG.warning("Using all contacts") contacts = contactmap.contactset()[:] hum_list = [(con1 + 1, con2 + 1) for con1, con2 in contacts] diff --git a/aria/conbox/reader.py b/aria/conbox/reader.py index 0ae91fa44595b3dd826c8142a37ad07e21d8521f..bd6e8ef791baf03041bbe22111f526f35006d790 100644 --- a/aria/conbox/reader.py +++ b/aria/conbox/reader.py @@ -935,7 +935,8 @@ class MapFileListReader(object): elif maptypes[i].lower() in conio.CONTACT_FILE_PARSERS: self.maps.append(ContactMapFile(filepath, maptypes[i], - conkit_reader=True)) + conkit_reader=True, + sort="raw_score")) else: self.maps.append(ContactMapFile(filepath, maptypes[i],