From dedaaddc71072ac15d45882d019ca6f9890266d7 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 16 Jun 2017 10:30:12 +0200
Subject: [PATCH] TrigInDetEventTPCnv: Avoid undefined behavior warning.
Update TrigVertex_p1::AlgoId_p1 enum to match transient version.
Was seeing ubsan warnings coming from cases where an ID was used that wasn't
listed in the persistent enum.
---
.../TrigInDetEventTPCnv/TrigVertex_p1.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigEvent/TrigInDetEventTPCnv/TrigInDetEventTPCnv/TrigVertex_p1.h b/Trigger/TrigEvent/TrigInDetEventTPCnv/TrigInDetEventTPCnv/TrigVertex_p1.h
index 083e042a1f8..16e7890a454 100644
--- a/Trigger/TrigEvent/TrigInDetEventTPCnv/TrigInDetEventTPCnv/TrigVertex_p1.h
+++ b/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:
--
GitLab