Merge branch 'ubsan.TrigInDetEventTPCnv-20170616' into 'master'

TrigInDetEventTPCnv: Avoid undefined behavior warning.

See merge request !2751
Former-commit-id: 72fed680

Trigger/TrigEvent/TrigInDetEventTPCnv/TrigInDetEventTPCnv/TrigVertex_p1.h

@@ -32,8 +32,13 @@ class TrigVertex_p1
   
   TrigVertex_p1() {}
   virtual ~TrigVertex_p1(){}
-  
-  enum AlgoId_p1{NULLID=0, SITRACKID=1, IDSCANID=2, HISTOPRMVTXID=3, VKALSECVTXID=4, BPHYSSECID=5};
+
+  enum AlgoId_p1{NULLID=0, SITRACKID=1, IDSCANID=2, HISTOPRMVTXSITRACKID=3, VKALSECVTXID=4, BPHYSSECID=5,
+                 BSFULLSITRACKID=6, BSFULLIDSCANID=7, BSSPLITSITRACKID=8, BSSPLITIDSCANID=9, HISTOPRMVTXIDSCANID=10,
+                 HISTOPRMVTXEFID=11, HISTOPRMVTXSITRACKIDTAU=12, HISTOPRMVTXEFIDTAU=13, BJETSECVTXID=14, 
+                 BSFULL_STRATEGY_B_ID=15, BSFULL_STRATEGY_A_ID=16, BSSPLIT_STRATEGY_B_ID=17, BSSPLIT_STRATEGY_A_ID=18,
+                 HISTOPRMVTXFTKID=19, HISTOPRMVTXFTKIDTAU=20, BSFULL_STRATEGY_F_ID=21, BSSPLIT_STRATEGY_F_ID = 22,
+                 HISTOPRMVTXFTKID_REFIT = 23};
 
  private: