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

Merge branch 'sponce_newmonitoring' into 'master' 

Adapted to new Gaudi monitoring

See merge request !433
parents 46338663 572a9760
No related branches found
No related tags found
2 merge requests!1103Draft: Add AnalysisHelpers to DaVinci Stack,!433Adapted to new Gaudi monitoring
Pipeline #2008454 passed
Stage: test
    Hide whitespace changes
    Inline Side-by-side
    .gitignore
    + 18
    − 19
    View file @ fdf98cd6
    ......@@ -5,10 +5,15 @@
    # build products
    InstallArea/
    # Centrally managed files and helpers
    .clang-format
    toolchain.cmake
    Makefile
    cache_preload.cmake
    # CMake temporary files
    build.*/
    build*/
    .build/
    build-dir/
    CMakeFiles/
    CTestTestfile.cmake
    CPackSourceConfig.cmake
    ......@@ -25,25 +30,19 @@ DoxyWarnings.log
    *.launch.py
    *.launch.opts
    # Eclipse data
    # QMTest byproducts
    **/tests/qmtest/*
    !**/tests/qmtest/*.qms
    !**/tests/qmtest/*.qmt
    # Metadata used by IDEs
    # - Eclipse
    .project
    .cproject
    .settings
    .pydevproject
    .eclipse/
    # CMT tempoary files
    build.*.log
    Makefile
    NMake
    install.*.history
    setup.*
    cleanup.*
    version.cmt
    genConf/
    QMTest/
    test_results/
    *-slc[56]-*/
    i686-winxp-vc9-dbg/
    .*-slc[56]-*.d/
    .i686-winxp-vc9-dbg.d/
    # - QtCreator
    CMakeLists.txt.user
    # - VSCode
    .vscode/
    DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
    + 65
    − 17
    View file @ fdf98cd6
    ......@@ -22,23 +22,21 @@
    </set></argument>
    <argument name="validator"><text>
    findReferenceBlock("""
    DaVinciInitAlg SUCCESS 500 events processed
    DaVinciInitAlg SUCCESS ==================================================================
    CountParticles SUCCESS Number of counters : 97
    CountParticles INFO Number of counters : 97
    | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
    | "# Phys/StdAllLooseMuPion" | 500 | 20624 | 41.248 | 56.654 | 0.0000 | 583.00 |
    | "# Phys/StdDiElectronFromTracks" | 500 | 686583 | 1373.2 | 1503.7 | 0.0000 | 11649. |
    | "# Phys/StdDiElectronGamma" | 500 | 686790 | 1373.6 | 1504.0 | 0.0000 | 11649. |
    | "# Phys/StdDiElectronFromTracks" | 500 | 686583 | 1373.2 | 1503.7 | 0.0000 | 11649.0 |
    | "# Phys/StdDiElectronGamma" | 500 | 686790 | 1373.6 | 1504.0 | 0.0000 | 11649.0 |
    | "# Phys/StdKs2PiPiDD" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
    | "# Phys/StdKs2PiPiLL" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
    | "# Phys/StdLTUnbiasedJpsi2MuMu" | 500 | 4 | 0.0080000 | 0.089084 | 0.0000 | 1.0000 |
    | "# Phys/StdLTUnbiasedJpsi2MuMu" | 500 | 4 | 0.008 | 0.089084 | 0.0000 | 1.0000 |
    | "# Phys/StdLambda2PPiDD" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
    | "# Phys/StdLambda2PPiLL" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
    | "# Phys/StdLooseD02KK" | 500 | 410 | 0.82000 | 1.6515 | 0.0000 | 14.000 |
    | "# Phys/StdLooseD02KK" | 500 | 410 | 0.82 | 1.6515 | 0.0000 | 14.000 |
    | "# Phys/StdLooseD02KPi" | 500 | 571 | 1.1420 | 1.8894 | 0.0000 | 22.000 |
    | "# Phys/StdLooseD02KPiDCS" | 500 | 571 | 1.1420 | 1.8894 | 0.0000 | 22.000 |
    | "# Phys/StdLooseD02KsKK" | 500 | 14 | 0.028000 | 0.32127 | 0.0000 | 6.0000 |
    | "# Phys/StdLooseD02KsPiPi" | 500 | 16 | 0.032000 | 0.30818 | 0.0000 | 4.0000 |
    | "# Phys/StdLooseD02KsKK" | 500 | 14 | 0.028 | 0.32127 | 0.0000 | 6.0000 |
    | "# Phys/StdLooseD02KsPiPi" | 500 | 16 | 0.032 | 0.30818 | 0.0000 | 4.0000 |
    | "# Phys/StdLooseD02PiPi" | 500 | 592 | 1.1840 | 2.0333 | 0.0000 | 20.000 |
    | "# Phys/StdLooseDalitzPi0" | 500 | 8461 | 16.922 | 23.647 | 0.0000 | 188.00 |
    | "# Phys/StdLooseDetachedDiElectron" | 500 | 21431 | 42.862 | 46.608 | 0.0000 | 480.00 |
    ......@@ -59,21 +57,71 @@ CountParticles SUCCESS Number of co
    | "# Phys/StdLooseDplus2PiPiPi" | 500 | 730 | 1.4600 | 3.3759 | 0.0000 | 41.000 |
    | "# Phys/StdLooseDplus2hhh" | 500 | 6038 | 12.076 | 38.120 | 0.0000 | 760.00 |
    | "# Phys/StdLooseDsplus2KKPi" | 500 | 910 | 1.8200 | 5.1548 | 0.0000 | 70.000 |
    | "# Phys/StdLooseDsplus2KKPiOppSign" | 500 | 1 | 0.0020000 | 0.044677 | 0.0000 | 1.0000 |
    | "# Phys/StdLooseDstarWithD02KK" | 500 | 25 | 0.050000 | 0.32787 | 0.0000 | 4.0000 |
    | "# Phys/StdLooseDstarWithD02KPi" | 500 | 76 | 0.15200 | 1.0977 | 0.0000 | 21.000 |
    | "# Phys/StdLooseDstarWithD02KPiDCS" | 500 | 80 | 0.16000 | 0.80895 | 0.0000 | 13.000 |
    | "# Phys/StdLooseDstarWithD02PiPi" | 500 | 74 | 0.14800 | 0.71140 | 0.0000 | 8.0000 |
    | "# Phys/StdLooseJpsi2MuMu" | 500 | 22 | 0.044000 | 0.21463 | 0.0000 | 2.0000 |
    | "# Phys/StdLooseDsplus2KKPiOppSign" | 500 | 1 | 0.002 | 0.044677 | 0.0000 | 1.0000 |
    | "# Phys/StdLooseDstarWithD02KK" | 500 | 25 | 0.05 | 0.32787 | 0.0000 | 4.0000 |
    | "# Phys/StdLooseDstarWithD02KPi" | 500 | 76 | 0.152 | 1.0977 | 0.0000 | 21.000 |
    | "# Phys/StdLooseDstarWithD02KPiDCS" | 500 | 80 | 0.16 | 0.80895 | 0.0000 | 13.000 |
    | "# Phys/StdLooseDstarWithD02PiPi" | 500 | 74 | 0.148 | 0.7114 | 0.0000 | 8.0000 |
    | "# Phys/StdLooseJpsi2MuMu" | 500 | 22 | 0.044 | 0.21463 | 0.0000 | 2.0000 |
    | "# Phys/StdLooseJpsi2ee" | 500 | 4737 | 9.4740 | 11.935 | 0.0000 | 121.00 |
    | "# Phys/StdLooseKsDD" | 500 | 2877 | 5.7540 | 8.4258 | 0.0000 | 117.00 |
    | "# Phys/StdLooseKsLD" | 500 | 6218 | 12.436 | 15.331 | 0.0000 | 209.00 |
    | "# Phys/StdLooseKsLD_NegLong" | 500 | 3185 | 6.3700 | 8.8772 | 0.0000 | 112.00 |
    | "# Phys/StdLooseKsLD_PosLong" | 500 | 3033 | 6.0660 | 7.9936 | 0.0000 | 97.000 |
    | "# Phys/StdLooseKsLL" | 500 | 282 | 0.56400 | 0.89325 | 0.0000 | 6.0000 |
    | "# Phys/StdLooseKsLL" | 500 | 282 | 0.564 | 0.89325 | 0.0000 | 6.0000 |
    | "# Phys/StdLooseKstar2Kpi" | 500 | 275144 | 550.29 | 542.31 | 1.0000 | 3762.0 |
    | "# Phys/StdLooseLambdaDD" | 500 | 2941 | 5.8820 | 8.2435 | 0.0000 | 99.000 |
    """, stdout, result, causes,
    | "# Phys/StdLooseLambdaLD" | 500 | 1934 | 3.8680 | 4.8755 | 0.0000 | 59.000 |
    | "# Phys/StdLooseLambdaLDpDown" | 500 | 135 | 0.27 | 0.63961 | 0.0000 | 7.0000 |
    | "# Phys/StdLooseLambdaLDpLong" | 500 | 1799 | 3.5980 | 4.5361 | 0.0000 | 52.000 |
    | "# Phys/StdLooseLambdaLL" | 500 | 94 | 0.188 | 0.49463 | 0.0000 | 3.0000 |
    | "# Phys/StdLooseLambdac2PKPi" | 500 | 291 | 0.582 | 2.1669 | 0.0000 | 38.000 |
    | "# Phys/StdLooseLambdastar2pK" | 500 | 648874 | 1297.7 | 1285.1 | 0.0000 | 8764.0 |
    | "# Phys/StdLoosePhi2KK" | 500 | 67279 | 134.56 | 132.58 | 0.0000 | 863.00 |
    | "# Phys/StdLooseRho0" | 500 | 776 | 1.5520 | 1.9858 | 0.0000 | 16.000 |
    | "# Phys/StdLooseRhoPlus" | 500 | 80225 | 160.45 | 191.40 | 0.0000 | 1139.0 |
    | "# Phys/StdMassConstrainedJpsi2MuMu" | 500 | 22 | 0.044 | 0.21463 | 0.0000 | 2.0000 |
    | "# Phys/StdTightDetachedTau3pi" | 500 | 113 | 0.226 | 2.0868 | 0.0000 | 39.000 |
    | "# Phys/StdTightDplus2KPiPiOppSignPi" | 500 | 147 | 0.294 | 0.9228 | 0.0000 | 9.0000 |
    | "# Phys/StdTightDplus2PiPiPi" | 500 | 82 | 0.164 | 0.66716 | 0.0000 | 10.000 |
    | "# Phys/StdTightPhi2KK" | 500 | 531 | 1.0620 | 1.8073 | 0.0000 | 14.000 |
    | "# Phys/StdVeryLooseDetachedKst2Kpi" | 500 | 10707 | 21.414 | 25.532 | 0.0000 | 207.00 |
    | "# Phys/StdVeryLooseDiMuon" | 500 | 16010 | 32.020 | 68.780 | 0.0000 | 985.00 |
    | "# Phys/StdVeryLooseJpsi2MuMu" | 500 | 19 | 0.038 | 0.1912 | 0.0000 | 1.0000 |
    | "# Phys/StdVeryLooseKsLL" | 500 | 1154 | 2.3080 | 2.6331 | 0.0000 | 21.000 |
    | "# Phys/StdVeryLooseLambdaLL" | 500 | 993 | 1.9860 | 2.6149 | 0.0000 | 18.000 |
    | "# Phys/StdVeryTightDsplus2KKPi" | 500 | 34 | 0.068 | 0.35125 | 0.0000 | 3.0000 |
    | "# input particles" | 500 | 2630760 | 5261.5 | 5417.2 | 9.0000 | 37866.0 |
    |*"#accept" | 500 | 500 |( 100.0000 +- 0.000000)% |
    | "D*(2010)+" | 135 | 135 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "D*(2010)-" | 120 | 120 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "D+" | 5083 | 5083 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "D-" | 4625 | 4625 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "D0" | 1087 | 1087 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "D_s+" | 488 | 488 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "D_s-" | 457 | 457 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "D~0" | 1087 | 1087 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "J/psi(1S)" | 297334 | 297334 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "K*(892)0" | 158225 | 158225 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "K*(892)~0" | 158859 | 158859 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "KS0" | 16749 | 16749 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "Lambda(1520)0" | 323601 | 323601 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "Lambda(1520)~0" | 325273 | 325273 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "Lambda0" | 3984 | 3984 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "Lambda_c+" | 139 | 139 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "Lambda_c~-" | 152 | 152 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "Lambda~0" | 3912 | 3912 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "e+" | 457791 | 457791 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "e-" | 457791 | 457791 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "gamma" | 228930 | 228930 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "phi(1020)" | 68876 | 68876 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "pi0" | 8461 | 8461 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "rho(770)+" | 40593 | 40593 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "rho(770)-" | 41431 | 41431 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "rho(770)0" | 23307 | 23307 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "tau+" | 1128 | 1128 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "tau-" | 1142 | 1142 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    """, stdout, result, causes,
    signature_offset = 0, id='Particles')
    countErrorLines({"FATAL":0})
    </text></argument>
    ......
    DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
    + 3
    − 3
    View file @ fdf98cd6
    ......@@ -18,21 +18,21 @@
    </set></argument>
    <argument name="validator"><text>
    findReferenceBlock("""
    Print_3000_3087 SUCCESS Number of counters : 3
    Print_3000_3087 INFO Number of counters : 3
    | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
    | "# Phys/SelJpsi_3000_3087" | 28 | 30 | 1.0714 | 0.25754 | 1.0000 | 2.0000 |
    | "# input particles" | 28 | 30 | 1.0714 | 0.25754 | 1.0000 | 2.0000 |
    |*"#accept" | 28 | 28 |( 100.0000 +- 0.000000)% |
    """, stdout, result, causes, signature_offset = 0, id = "Stream1")
    findReferenceBlock("""
    Print_3088_3100 SUCCESS Number of counters : 3
    Print_3088_3100 INFO Number of counters : 3
    | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
    | "# Phys/SelJpsi_3088_3100" | 4 | 4 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "# input particles" | 4 | 4 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    |*"#accept" | 4 | 4 |( 100.0000 +- 0.000000)% |
    """, stdout, result, causes, signature_offset = 0, id = "Stream2")
    findReferenceBlock("""
    Print_3100_4000 SUCCESS Number of counters : 3
    Print_3100_4000 INFO Number of counters : 3
    | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
    | "# Phys/SelJpsi_3100_4000" | 6 | 6 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    | "# input particles" | 6 | 6 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
    ......
    Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_success.qmt
    + 3
    − 6
    View file @ fdf98cd6
    ......@@ -15,7 +15,7 @@
    # ...................
    # Author: sstahl
    # Purpose: Test fucntionality of TeslaLineChecker
    # Common failure modes, severities and cures:
    # Common failure modes, severities and cures:
    # . SEVERE: Segfault or raised exception, stderr, nonzero return code
    # . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
    # . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
    ......@@ -31,13 +31,10 @@
    </set></argument>
    <argument name="validator"><text>
    block="""
    DaVinciInitAlg SUCCESS ==================================================================
    DaVinciInitAlg SUCCESS 50 events processed
    DaVinciInitAlg SUCCESS ==================================================================
    TeslaLineChecker SUCCESS Number of counters : 1
    TeslaLineChecker INFO Number of counters : 1
    | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
    |*"#accept" | 50 | 50 |( 100.0000 +- 0.000000)% |
    """
    findReferenceBlock(block,signature_offset = 1)
    findReferenceBlock(block)
    </text></argument>
    </extension>
    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