From: Jim Procter <jprocter@dundee.ac.uk>
Date: Tue, 3 Sep 2024 14:11:30 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-4366_foldseek_3di_viewing
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5c6602fc2bedea0744f617499174f65185e3f291;p=jalview.git

Merge branch 'develop' into features/JAL-4366_foldseek_3di_viewing
---

5c6602fc2bedea0744f617499174f65185e3f291
diff --cc src/jalview/analysis/scoremodels/ScoreModels.java
index bdadacf,84db2e3..d93e65e
--- a/src/jalview/analysis/scoremodels/ScoreModels.java
+++ b/src/jalview/analysis/scoremodels/ScoreModels.java
@@@ -83,10 -80,9 +83,10 @@@ public class ScoreModel
       * using LinkedHashMap keeps models ordered as added
       */
      models = new LinkedHashMap<>();
-     BLOSUM62 = loadScoreMatrix("scoreModel/blosum62.scm");
-     PAM250 = loadScoreMatrix("scoreModel/pam250.scm");
-     DNA = loadScoreMatrix("scoreModel/dna.scm");
-     FOLDSEEK3DI = loadScoreMatrix("scoreModel/foldseek_mat3di.scm");
+     BLOSUM62 = loadScoreMatrix("scoreModel/blosum62.scm",true);
+     PAM250 = loadScoreMatrix("scoreModel/pam250.scm",true);
+     DNA = loadScoreMatrix("scoreModel/dna.scm",true);
++    FOLDSEEK3DI = loadScoreMatrix("scoreModel/foldseek_mat3di.scm",true);
      registerScoreModel(new PIDModel());
      registerScoreModel(new FeatureDistanceModel());
      SECONDARYSTRUCTURE = loadScoreMatrix(