diff --git a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py index 6e02a5a105768533a7b0feb237fb07afe2d27a67..9e1562e86ddb87360b7ec6069d8c3e33b8be703f 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 fc374b9a4905b95a3c15c09f99b55e558061ba7d..3e5a0502442198fd99f4423a1852f07c7b5259c7 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 7ca3bd366c53a466abd3266f7e79ad5ca8409c13..cb8c4ccb6e29e866b46450628f2275a14afaaa44 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 34568b84b63c556c511424de401b943faa8ae346..64e4710071e3dc438cd294f9a709f0304fbcb5c6 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>