Merge branch 'removeUpgrade-2016' into '2016-patches'

Complete the removal of upgrade detectors

See merge request !674

(cherry picked from commit 34d92fe1)

f0151608 Complete the removal of upgrade detectors

Phys/FlavourTagging/src/TaggingHelpers.cpp

@@ -116,17 +116,17 @@ namespace TaggingHelpers
           //        stations for the upgrade clone detection?
           while (h1.end() != it && h2.end() != jt) {
             if (*it < *jt) {
-              if (it->isVelo() || it->isVP()) ++nVelo1;
+              if (it->isVelo()) ++nVelo1;
               else if (it->isIT() || it->isOT()) ++nT1;
               ++it;
             } else if (*jt < *it) {
-              if (jt->isVelo() || jt->isVP()) ++nVelo2;
+              if (jt->isVelo()) ++nVelo2;
               else if (jt->isIT() || jt->isOT()) ++nT2;
               ++jt;
             } else {
               ++nCommon;
               // common LHCb ID
-              if (it->isVelo() || it->isVP()) {
+              if (it->isVelo()) {
                 ++nVelo1;
                 ++nVelo2;
                 ++nVeloCommon;
@@ -141,13 +141,13 @@ namespace TaggingHelpers
           }
           // consume any hits potentially remaining in track 1
           while (h1.end() != it) {
-            if (it->isVelo() || it->isVP()) ++nVelo1;
+            if (it->isVelo()) ++nVelo1;
             else if (it->isIT() || it->isOT()) ++nT1;
             ++it;
           }
           // consume any hits potentially remaining in track 2
           while (h2.end() != jt) {
-            if (jt->isVelo() || jt->isVP()) ++nVelo2;
+            if (jt->isVelo()) ++nVelo2;
             else if (jt->isIT() || jt->isOT()) ++nT2;
             ++jt;
           }