From e239af3ac76f4011b9f0719fc802235b85ac82ef Mon Sep 17 00:00:00 2001
From: Kevin Heinicke <kevin@kehei.de>
Date: Fri, 4 May 2018 12:54:56 +0200
Subject: [PATCH] Update reference file and use TestTuning
---
.../DVTestTagging-Summer2017Opt-Run1.py | 14 +++++---
.../qmtest/tagging.qms/test_tag_mc12.qmt | 32 ++++++++-----------
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py
index ce60e09bb..bdcd299f8 100644
--- a/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py
+++ b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py
@@ -13,6 +13,13 @@ from Configurables import GaudiSequencer
from Configurables import CheatedSelection, BDecayTool, MCDecayFinder
+from GaudiKernel import ROOT6WorkAroundEnabled
+if ROOT6WorkAroundEnabled('ROOT-7492'):
+ # trigger autoloading of LHCbKernel dictionary
+ GaudiPython.gbl.LHCb.LHCbID
+ # trigger autoloading of DigiEvent dictionary
+ GaudiPython.gbl.LHCb.CaloDigit
+
myDecay = '[B+ -> (J/psi(1S) => mu+ mu- ) K+]cc'
cheatsel = CheatedSelection("CheatedSelection")
@@ -29,8 +36,7 @@ cheatsel.BDecayTool.MCDecayFinder.Decay = myDecay
location = "Phys/CheatedSelection"
-from Configurables import (BTagging, BTaggingTool, BTaggingChecker,
- BDecayTool, MCDecayFinder)
+from Configurables import BTagging, BTaggingTool, BTaggingChecker
from FlavourTagging.Tunings import applyTuning
tag = BTagging("BTagging")
@@ -40,14 +46,14 @@ tag.addTool( BDecayTool )
tag.BDecayTool.addTool( MCDecayFinder )
tag.BDecayTool.MCDecayFinder.Decay = myDecay
tag.addTool( BTaggingTool )
-applyTuning(tag.BTaggingTool, 'Run1')
+applyTuning(tag.BTaggingTool, 'TestTuning')
tag.BTaggingTool.AssocPVCriterion = 'PVbyIP' # needed by CheatedSelection
# Flavour tagging Checker
tagcheck = BTaggingChecker("BTaggingChecker")
tagcheck.Inputs = [ location ]
tagcheck.TagsLocation = location+"/FlavourTags"
-#tagcheck.OutputLevel = 1
+# tagcheck.OutputLevel = DEBUG
tagcheck.addTool( BDecayTool )
tagcheck.BDecayTool.addTool( MCDecayFinder )
tagcheck.BDecayTool.MCDecayFinder.Decay = myDecay
diff --git a/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt b/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt
index ec7b4441a..bfe986f95 100644
--- a/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt
+++ b/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt
@@ -10,28 +10,24 @@
findReferenceBlock("""
BTagging SUCCESS #ERRORS = 1 Message = 'Tagging Tool returned error.'
BTaggingChecker INFO =======================================================
+BTaggingChecker INFO WARNING: The following numbers do not represent the correct tagging powers.
BTaggingChecker INFO Summary: EXCLUSIVE TAGGING PERFORMANCE
BTaggingChecker INFO Category EFF. Etag Wrong TF r w
-BTaggingChecker INFO 1 Category 2.4+-1.6 14+-1.9 29+-6.6 34 14
-BTaggingChecker INFO 2 Category 0.77+-0.92 11+-1.7 37+-7.8 24 14
-BTaggingChecker INFO 3 Category 2.1+-1.2 4.1+-1.1 14+-9.4 12 2
-BTaggingChecker INFO 4 Category 1.6+-1 2.6+-0.86 11+-10 8 1
-BTaggingChecker INFO 5 Category 1.5+-0.65 1.5+-0.65 0+-0 5 0
BTaggingChecker INFO ---------------------------------------------------------
-BTaggingChecker INFO ** OS muon 0.87+-0.91 3.5+-0.99 25+-12 9 3
-BTaggingChecker INFO ** OS elec 1.3+-0.94 2.3+-0.81 12+-12 7 1
-BTaggingChecker INFO ** OS kaon 2.4+-1.6 13+-1.8 28+-6.8 31 12
-BTaggingChecker INFO ** SS kaon 0.15+-0.4 2.3+-0.81 62+-17 3 5
-BTaggingChecker INFO ** SS pion 1.4+-1.2 7.3+-1.4 28+-9 18 7
-BTaggingChecker INFO ** VertexCh 3.9+-1.9 17+-2 26+-5.7 43 15
-BTaggingChecker INFO ** OS nnetkaon 3.2+-1.8 21+-2.2 31+-5.4 50 22
-BTaggingChecker INFO ** SS nnetkaon 1.2+-1.2 15+-2 64+-6.6 19 34
-BTaggingChecker INFO ** OS Charm 1.2+-0.58 1.2+-0.58 0+-0 4 0
+BTaggingChecker INFO ** OS muon 0.874636+-0.909124 3.49854+-0.992118 25+-12.5 9 3
+BTaggingChecker INFO ** OS elec 1.31195+-0.937816 2.33236+-0.814941 12.5+-11.6927 7 1
+BTaggingChecker INFO ** OS kaon 2.33884+-1.53195 13.1195+-1.82294 28.8889+-6.7566 32 13
+BTaggingChecker INFO ** SS kaon 0.374844+-0.649362 8.16327+-1.4784 60.7143+-9.22962 11 17
+BTaggingChecker INFO ** SS pion 1.41108+-1.18357 7.28863+-1.4036 28+-8.97998 18 7
+BTaggingChecker INFO ** VertexCh 3.4842+-1.85224 17.7843+-2.06466 27.8689+-5.74058 44 17
+BTaggingChecker INFO ** OS nnetkaon 2.1026+-1.53339 44.0233+-2.68039 39.0728+-3.97059 92 59
+BTaggingChecker INFO ** SS nnetkaon 0.419301+-0.696782 51.895+-2.69781 54.4944+-3.73249 81 97
+BTaggingChecker INFO ** OS Charm 0.874636+-0.909124 3.49854+-0.992118 25+-12.5 9 3
BTaggingChecker INFO ---------------------------------------------------------
-BTaggingChecker INFO Tagging efficiency = 33 +/- 2.5 %
-BTaggingChecker INFO Wrong Tag fraction = 25 +/- 4.2 %
-BTaggingChecker INFO EFFECTIVE COMB. TE = 8.3 +/- 2.5 % (Total events= 343)
-BTaggingChecker SUCCESS =========================================================
+BTaggingChecker INFO Tagging efficiency = 0 +/- 0 %
+BTaggingChecker INFO Wrong Tag fraction = -nan +/- -nan %
+BTaggingChecker INFO EFFECTIVE COMB. TE = 0 +/- 0 % (Total events= 343)
+BTaggingChecker DEBUG =========================================================
""", stdout, result, causes, signature_offset = 1)
countErrorLines({"FATAL":0})
</text></argument>
--
GitLab