From 6087eb828e9a59f63688f892639e7cf20c890a63 Mon Sep 17 00:00:00 2001
From: eduardo-rodrigues <eduardo.rodrigues@cern.ch>
Date: Wed, 27 Mar 2019 14:23:50 +0100
Subject: [PATCH] Update of a couple of CommonParticles tests
---
.../tests/options/CommonParticles/DVTestStandardIntermediate.py | 2 +-
.../options/CommonParticles/TestStandardIntermediateCuts.py | 2 +-
.../test_standardintermediate_reco14_init.qmt | 2 +-
.../test_standardintermediate_reco14_run.qmt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
index 6e02a5a10..9e1562e86 100644
--- a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
+++ b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
@@ -42,7 +42,7 @@ DaVinci().HistogramFile = "DVStandardIntermediate.root"
##############################################################################
DaVinci().UserAlgorithms = [ CP ] # count them all
DaVinci().EvtMax = 500
-DaVinci().DataType = "2012"
+DaVinci().DataType = "2015"
DaVinci().Simulation = False
DaVinci().InputType = "DST"
diff --git a/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py b/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
index fc374b9a4..3e5a05024 100644
--- a/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
+++ b/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
@@ -30,7 +30,7 @@ for a,b in StandardIntermediate.locations.iteritems():
DaVinci( UserAlgorithms = List,
EvtMax = 1,
- DataType = "2010",
+ DataType = "2015",
Simulation = False,
InputType = "DST" )
diff --git a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt
index 7ca3bd366..cb8c4ccb6 100755
--- a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt
+++ b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt
@@ -15,7 +15,7 @@
<argument name="timeout"><integer>6400</integer></argument>
<argument name="args"><set>
<text>../options/CommonParticles/TestStandardIntermediateCuts.py</text>
- <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-FULLDST.py</text>
+ <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision15EM-6.5TeV-Reco15EM-FULLDST.py</text>
</set></argument>
<argument name="validator"><text>
findReferenceBlock("""
diff --git a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
index 34568b84b..64e471007 100755
--- a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
+++ b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
@@ -15,7 +15,7 @@
<argument name="timeout"><integer>6400</integer></argument>
<argument name="args"><set>
<text>../options/CommonParticles/DVTestStandardIntermediate.py</text>
- <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-FULLDST.py</text>
+ <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision15EM-6.5TeV-Reco15EM-FULLDST.py</text>
</set></argument>
<argument name="prerequisites"><set>
<tuple><text>commonparticles.test_standardbasic_reco14_init</text><enumeral>PASS</enumeral></tuple>
--
GitLab