Fix prefilter not correctly masking extended dbtype for comparision

soedinglab · Sep 21, 2021 · be11943 · be11943
1 parent e3ce460
commit be11943
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/commons/Parameters.h b/src/commons/Parameters.h
@@ -1118,12 +1118,14 @@ class Parameters {
     static std::vector<std::string> findMissingTaxDbFiles(const std::string &filename);
     static void printTaxDbError(const std::string &filename, const std::vector<std::string>& missingFiles);
 
+    static const uint32_t DBTYPE_MASK = 0x0000FFFF;
+
     static bool isEqualDbtype(const int type1, const int type2) {
-        return ((type1 & 0x0000FFFF) == (type2 & 0x0000FFFF));
+        return ((type1 & DBTYPE_MASK) == (type2 & DBTYPE_MASK));
     }
 
     static const char* getDbTypeName(int dbtype) {
-        switch (dbtype & 0x0000FFFF) {
+        switch (dbtype & DBTYPE_MASK) {
             case DBTYPE_AMINO_ACIDS: return "Aminoacid";
             case DBTYPE_NUCLEOTIDES: return "Nucleotide";
             case DBTYPE_HMM_PROFILE: return "Profile";

diff --git a/src/prefiltering/Prefiltering.cpp b/src/prefiltering/Prefiltering.cpp
@@ -54,7 +54,7 @@ Prefiltering::Prefiltering(const std::string &queryDB,
     sameQTDB = isSameQTDB();
 
     // init the substitution matrices
-    switch (querySeqType & 0x7FFFFFFF) {
+    switch (querySeqType & Parameters::DBTYPE_MASK) {
         case Parameters::DBTYPE_NUCLEOTIDES:
             kmerSubMat = getSubstitutionMatrix(scoringMatrixFile, par.alphabetSize, 1.0, false, true);
             ungappedSubMat = kmerSubMat;