Skip to content
Snippets Groups Projects
Commit bc3e91f0 authored by Eduardo Rodrigues's avatar Eduardo Rodrigues
Browse files

Merge branch 'erodrigu-tests-cleanup-take5' into 'master' 

Bring DaVinciTests/tests/qmtest/commonparticles.qms tests in sync

See merge request lhcb/DaVinci!319
parents 63e5a68c 3b23ccbf
No related branches found
No related tags found
2 merge requests!1103Draft: Add AnalysisHelpers to DaVinci Stack,!319Bring DaVinciTests/tests/qmtest/commonparticles.qms tests in sync
Pipeline #816053 passed
Stage: test
    Hide whitespace changes
    Inline Side-by-side
    DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
    + 1
    − 1
    View file @ bc3e91f0
    ......@@ -30,7 +30,7 @@ for a,b in StandardIntermediate.locations.iteritems():
    DaVinci( UserAlgorithms = List,
    EvtMax = 1,
    DataType = "2015",
    DataType = "2010",
    Simulation = False,
    InputType = "DST" )
    ......
    DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt
    + 1
    − 1
    View file @ bc3e91f0
    ......@@ -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/Collision15EM-6.5TeV-Reco15EM-FULLDST.py</text>
    <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-FULLDST.py</text>
    </set></argument>
    <argument name="validator"><text>
    findReferenceBlock("""
    ......
    DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
    + 10
    − 10
    View file @ bc3e91f0
    ......@@ -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/Collision15EM-6.5TeV-Reco15EM-FULLDST.py</text>
    <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-FULLDST.py</text>
    </set></argument>
    <argument name="prerequisites"><set>
    <tuple><text>commonparticles.test_standardbasic_reco14_init</text><enumeral>PASS</enumeral></tuple>
    ......@@ -25,7 +25,7 @@
    findReferenceBlock("""
    DaVinciInitAlg SUCCESS 500 events processed
    DaVinciInitAlg SUCCESS ==================================================================
    CountParticles SUCCESS Number of counters : 96
    CountParticles SUCCESS Number of counters : 97
    | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
    | "# Phys/StdAllLooseMuPion" | 500 | 11668 | 23.336 | 51.196 | 0.0000 | 541.00 |
    | "# Phys/StdDiElectronFromTracks" | 500 | 11976 | 23.952 | 41.569 | 0.0000 | 378.00 |
    ......@@ -43,9 +43,10 @@ CountParticles SUCCESS Number of co
    | "# Phys/StdLooseD02PiPi" | 500 | 1134 | 2.2680 | 6.0147 | 0.0000 | 78.000 |
    | "# Phys/StdLooseDalitzPi0" | 500 | 117 | 0.23400 | 0.88501 | 0.0000 | 10.000 |
    | "# Phys/StdLooseDetachedDiElectron" | 500 | 593 | 1.1860 | 2.3982 | 0.0000 | 19.000 |
    | "# Phys/StdLooseDetachedDiElectronLU" | 500 | 810 | 1.6200 | 8.5800 | 0.0000 | 186.00 |
    | "# Phys/StdLooseDetachedDipion" | 500 | 3193 | 6.3860 | 7.4614 | 0.0000 | 59.000 |
    | "# Phys/StdLooseDetachedKpi" | 500 | 27494 | 54.988 | 116.83 | 0.0000 | 1231.0 |
    | "# Phys/StdLooseDetachedKst2Kpi" | 500 | 10258 | 20.516 | 41.457 | 0.0000 | 437.00 |
    | "# Phys/StdLooseDetachedKst2Kpi" | 500 | 10255 | 20.510 | 41.454 | 0.0000 | 437.00 |
    | "# Phys/StdLooseDetachedPhi2KK" | 500 | 914 | 1.8280 | 4.7932 | 0.0000 | 48.000 |
    | "# Phys/StdLooseDetachedTau3pi" | 500 | 1337 | 2.6740 | 7.3506 | 0.0000 | 108.00 |
    | "# Phys/StdLooseDetachedTau3piNonPhys" | 500 | 343 | 0.68600 | 1.9109 | 0.0000 | 21.000 |
    ......@@ -66,14 +67,13 @@ CountParticles SUCCESS Number of co
    | "# Phys/StdLooseDstarWithD02PiPi" | 500 | 115 | 0.23000 | 0.87926 | 0.0000 | 9.0000 |
    | "# Phys/StdLooseJpsi2MuMu" | 500 | 30 | 0.060000 | 0.24576 | 0.0000 | 2.0000 |
    | "# Phys/StdLooseJpsi2ee" | 500 | 184 | 0.36800 | 1.0975 | 0.0000 | 9.0000 |
    | "# Phys/StdLooseKsDD" | 500 | 2472 | 4.9440 | 6.9709 | 0.0000 | 50.000 |
    | "# Phys/StdLooseKsLD" | 500 | 4571 | 9.1420 | 12.977 | 0.0000 | 105.00 |
    | "# Phys/StdLooseKsLD_NegLong" | 500 | 2384 | 4.7680 | 7.7608 | 0.0000 | 64.000 |
    | "# Phys/StdLooseKsLD_PosLong" | 500 | 2187 | 4.3740 | 6.3493 | 0.0000 | 54.000 |
    | "# Phys/StdLooseKsDD" | 500 | 2435 | 4.8700 | 6.8528 | 0.0000 | 49.000 |
    | "# Phys/StdLooseKsLD" | 500 | 4512 | 9.0240 | 12.914 | 0.0000 | 104.00 |
    | "# Phys/StdLooseKsLD_NegLong" | 500 | 2363 | 4.7260 | 7.8248 | 0.0000 | 67.000 |
    | "# Phys/StdLooseKsLD_PosLong" | 500 | 2149 | 4.2980 | 6.1392 | 0.0000 | 51.000 |
    | "# Phys/StdLooseKsLL" | 500 | 421 | 0.84200 | 1.6640 | 0.0000 | 17.000 |
    | "# Phys/StdLooseKstar2Kpi" | 500 | 103693 | 207.39 | 262.62 | 0.0000 | 2113.0 |
    | "# Phys/StdLooseLambdaDD" | 500 | 2012 | 4.0240 | 5.4567 | 0.0000 | 36.000 |
    | "# Phys/StdLooseLambdaLD" | 500 | 2150 | 4.3000 | 8.9734 | 0.0000 | 89.000 |
    | "# Phys/StdLooseKstar2Kpi" | 500 | 103638 | 207.28 | 262.54 | 0.0000 | 2112.0 |
    | "# Phys/StdLooseLambdaDD" | 500 | 1994 | 3.9880 | 5.4395 | 0.0000 | 37.000 |
    """, stdout, result, causes,
    signature_offset = 0, id='Particles')
    countErrorLines({"FATAL":0})
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment