X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Faptx%2Faptx_configuration_files%2F_aptx_configuration_file;h=acf39bb6f4b52bc2df29599f3e8490a7d0a456b9;hb=b645b534c071c9c9e882d550eb38169190d32d30;hp=645d6714c82ead8b851c903a518e66cc1b7b62f7;hpb=f47c40112b8f637cf6559f84bdb5222b289c8355;p=jalview.git

diff --git a/forester/aptx/aptx_configuration_files/_aptx_configuration_file b/forester/aptx/aptx_configuration_files/_aptx_configuration_file
index 645d671..acf39bb 100644
--- a/forester/aptx/aptx_configuration_files/_aptx_configuration_file
+++ b/forester/aptx/aptx_configuration_files/_aptx_configuration_file
@@ -80,6 +80,7 @@ native_ui: ?
 #                      sequence_symbol
 #                      taxonomy_scientific_name
 #                      taxonomy_code
+#                      taxonomy_common_name
 #                      user_selected
 #
 #  To determine where to return data selected by user clicking on "Return ...": 'ext_descendents_data_to_return_on'
@@ -107,9 +108,13 @@ native_ui: ?
 #  To replace underscores with spaces during NH/NHX/Nexus file parsing:
 #     'replace_underscores_in_nh_parsing', possible values are 'yes', 'no'
 #
-#  To extract UniProt taxonomy codes (e.g. CAEEL) from node names during NH/NHX/Nexus file parsing:
-#     'taxonomy_extraction_in_nh_parsing',
-#     possible values are 'yes' (for e.g. BCL2_MOUSE), 'pfam' (for e.g. BCL2_MOUSE/23-453), 'no'
+#  To extract UniProt taxonomy codes (e.g. CAEEL) or UniProt identifiers (or scientific names)
+#  from node names during NH/NHX/Nexus file parsing: 'taxonomy_extraction_in_nh_parsing'
+#     possible values are:
+#     'no'
+#     'pfam_strict'  (for e.g. MOUSE from BCL2_MOUSE/23-453, or [uniprot] 10090 from BCL2_10090/23-453)
+#     'pfam_relaxed' (for e.g. MOUSE from bax_MOUSE, or [uniprot] 10090 from bax_10090)
+#     'aggressive'   (for e.g. MOUSE from MOUSE, or [uniprot] 10090 from 10090, or Nematostella vectensis from xyz_Nematostella_vectensis)
 #
 #  Internal node labels are confidence values during NH/NHX/Nexus file parsing:
 #     'internal_labels_are_confidence_values', possible values are 'yes', 'no'
@@ -162,12 +167,12 @@ confidence_value_digits:                   3
 background_gradient:                       no
 allow_editing:                             yes
 ext_descendents_data_to_return_on:         window
-ext_descendents_data_to_return:            sequence_mol_seq_fasta
+ext_descendents_data_to_return:            user_selected
 #label_for_get_ext_descendents_data:        Get_Node_Data         
 #  NH/NHX/Nexus file parsing:
 internal_labels_are_confidence_values:     no
 replace_underscores_in_nh_parsing:         no
-taxonomy_extraction_in_nh_parsing:         yes
+taxonomy_extraction_in_nh_parsing:         no
 
 
 #  Checkbox Display Selection