Commit 37973e8b authored by Marco Clemencic's avatar Marco Clemencic
Browse files

v36r6

parent e92becb0
......@@ -6,13 +6,14 @@ find_package(GaudiProject)
#---------------------------------------------------------------
# Declare project name and version
gaudi_project(DaVinci v36r5
USE Analysis v13r4
Stripping v9r5
Lbcom v16r4
gaudi_project(DaVinci v36r6
USE Analysis v13r5
Stripping v9r6
Lbcom v16r5
DATA AppConfig VERSION v3r*
FieldMap VERSION v5r*
ParamFiles VERSION v8r*
QMTestFiles VERSION v1r*
PRConfig VERSION v1r*
PRConfig VERSION v1r*
TurboStreamProd VERSION v*
TCK/HltTCK)
################################################################################
# Package: DaVinciSys
################################################################################
gaudi_subdir(DaVinciSys v36r5)
gaudi_subdir(DaVinciSys v36r6)
gaudi_depends_on_subdirs(DaVinciTests
Phys/DaVinci
......
package DaVinciSys
version v36r5
version v36r6
branches doc cmt
# Packages
use DaVinci v36r5 Phys # DaVinci coordinator
use DaVinciTests v2r30
use DaVinci v36r6 Phys # DaVinci coordinator
use DaVinciTests v2r31
use KaliCalo v4r17 Phys # Olivier Deschamps
use Tesla v1r3 Phys # Sean Benson
# Extra package just for this release,
# to deal with seg faults seen when reading Strip21 MC
use EventPacker v5r0 Event
use Tesla v1r4 Phys # Sean Benson
# Declare this as a container package
apply_pattern container_package
......
......@@ -3,6 +3,40 @@ Package : DaVinciSys
Package Coordinator : DaVinci coordinator
Purpose : LHCb physics analysis application
 
</PRE><H1><A NAME=v36r6>2015-04-30 DaVinci v36r6</A></H1><PRE>
Development release for 2015 data taking, based on Gaudi v26r1,
LHCb v38r6, Lbcom v16r5, Rec v17r6, Phys v19r6, Analysis v13r5
and Stripping v9r6 . Uses LCG_74root6 with ROOT 6.02.05.
- Refer to the release notes of Phys, Analysis and Stripping for details
on updates to these dependency projects.
- Packages updated :
DaVinciTests v2r31, Phys/DaVinci v36r6, Phys/Tesla v1r4.
- In DaVinciTests v2r31 :
. Updated option files tests/options/DVTestWriteDst.py and
tests/options/DVReadKs.py since necessary DST files have been copied over
from CASTOR (a private user area deleted by CERN!) to
/eos/lhcb/grid/prod/lhcb/swtest/lhcb/swtest/.
. Test commonparticles.qms/test_standardintermediate_reco14_run.qmt updated.
. Updated tagging reference file to account for new BDT taggers.
. Updated references for stripping tests.
- In Phys/DaVinci v36r6 :
. New stack release.
- In Phys/Tesla v1r4 :
. Support refitted PV persistence.
. Remove deprecated "PreSplit" and "ReportVersion" options.
. Test fixes.
. Fixed CMake for DDDB tags.
. Added previously private lumi tests.
. Added relations table generation for XDSTs and LDSTs.
. Added packed relations table location.
. Added dependency on TurboStreamProd.
</PRE><H1><A NAME=v36r5>2015-03-16 DaVinci v36r5</A></H1><PRE>
 
Development release for 2015 data taking, based on Gaudi v26r1,
......
This diff is collapsed.
################################################################################
# Package: DaVinciTests
################################################################################
gaudi_subdir(DaVinciTests v2r30)
gaudi_subdir(DaVinciTests v2r31)
gaudi_depends_on_subdirs(GaudiConf)
......
package DaVinciTests
version v2r30
version v2r31
branches doc cmt tests python
......
......@@ -4,6 +4,27 @@
! Purpose : QMTests for DaVinci
!-----------------------------------------------------------------------------
!======================= DaVinciTests v2r31 2015-04-30 =======================
! 2015-04-29 - Andrea Contu
- Updated references for stripping tests
! 2015-04-22 - Stefania Vecchi
- Updated tagging reference file to account for new BDT taggers
! 2015-03-25 - Eduardo Rodrigues
- Test commonparticles.qms/test_standardintermediate_reco14_run.qmt updated.
! 2015-03-20 - Eduardo Rodrigues
- Test commonparticles.qms/test_standardintermediate_reco14_run.qmt updated.
! 2015-03-19 - Eduardo Rodrigues
- Updated option files tests/options/DVTestWriteDst.py and
tests/options/DVReadKs.py since necessary DST files have been copied over
from CASTOR (a private user area deleted by CERN!) to
/eos/lhcb/grid/prod/lhcb/swtest/lhcb/swtest/.
- Test commonparticles.qms/test_standardintermediate_reco14_run.qmt updated.
!======================= DaVinciTests v2r30 2015-03-16 =======================
! 2015-03-11 - Eduardo Rodrigues
......
......@@ -42,6 +42,6 @@ DaVinci().PrintFreq = 100
# Real Data
#
EventSelector().Input = [
"DATAFILE='root://castorlhcb.cern.ch//castor/cern.ch/user/r/rlambert/testfiles/2009_00005803_00000001_1.V0.dst' TYP='POOL_ROOTTREE' OPT='READ'" ]
"DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/swtest/2009_00005803_00000001_1.V0.dst' TYP='POOL_ROOTTREE' OPT='READ'" ]
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
......@@ -87,4 +87,4 @@ MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
from Gaudi.Configuration import *
EventSelector().Input = [
"DATAFILE='root://castorlhcb.cern.ch//castor/cern.ch/user/r/rlambert/testfiles/MC2010_BsJPsiPhi_00008405_00000506_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
"DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/swtest/MC2010_BsJPsiPhi_00008405_00000506_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
......@@ -17,8 +17,8 @@ DaVinciInitAlg SUCCESS 500 events p
DaVinciInitAlg SUCCESS ==================================================================
CountParticles SUCCESS Number of counters : 78
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "# Phys/StdDiElectronFromTracks" | 500 | 11964 | 23.928 | 41.502 | 0.0000 | 375.00 |
| "# Phys/StdDiElectronGamma" | 500 | 11985 | 23.970 | 41.543 | 0.0000 | 375.00 |
| "# Phys/StdDiElectronFromTracks" | 500 | 11976 | 23.952 | 41.569 | 0.0000 | 378.00 |
| "# Phys/StdDiElectronGamma" | 500 | 11988 | 23.976 | 41.603 | 0.0000 | 378.00 |
| "# Phys/StdKs2PiPiDD" | 500 | 177 | 0.35400 | 0.66984 | 0.0000 | 4.0000 |
| "# Phys/StdKs2PiPiLL" | 500 | 319 | 0.63800 | 0.99144 | 0.0000 | 8.0000 |
| "# Phys/StdLTUnbiasedJpsi2MuMu" | 500 | 13 | 0.026000 | 0.15914 | 0.0000 | 1.0000 |
......@@ -29,7 +29,7 @@ CountParticles SUCCESS Number of co
| "# Phys/StdLooseD02KPiDCS" | 500 | 1131 | 2.2620 | 6.5294 | 0.0000 | 74.000 |
| "# Phys/StdLooseD02KsKK" | 500 | 56 | 0.11200 | 1.1115 | 0.0000 | 22.000 |
| "# Phys/StdLooseD02PiPi" | 500 | 1128 | 2.2560 | 5.9651 | 0.0000 | 76.000 |
| "# Phys/StdLooseDalitzPi0" | 500 | 116 | 0.23200 | 0.87760 | 0.0000 | 10.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/StdLooseDetachedDipion" | 500 | 3197 | 6.3940 | 7.4455 | 0.0000 | 55.000 |
| "# Phys/StdLooseDetachedKpi" | 500 | 26068 | 52.136 | 108.25 | 0.0000 | 1108.0 |
......@@ -42,20 +42,20 @@ CountParticles SUCCESS Number of co
| "# Phys/StdLooseDplus2hhh" | 500 | 14381 | 28.762 | 108.26 | 0.0000 | 1447.0 |
| "# Phys/StdLooseDstarWithD02KK" | 500 | 72 | 0.14400 | 0.79452 | 0.0000 | 10.000 |
| "# Phys/StdLooseDstarWithD02KPi" | 500 | 88 | 0.17600 | 0.72734 | 0.0000 | 8.0000 |
| "# Phys/StdLooseDstarWithD02KPiDCS" | 500 | 98 | 0.19600 | 0.91082 | 0.0000 | 13.000 |
| "# Phys/StdLooseDstarWithD02KPiDCS" | 500 | 99 | 0.19800 | 0.92022 | 0.0000 | 13.000 |
| "# Phys/StdLooseDstarWithD02PiPi" | 500 | 106 | 0.21200 | 0.82647 | 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 | 2108 | 4.2160 | 5.7725 | 0.0000 | 40.000 |
| "# Phys/StdLooseKsLD" | 500 | 3772 | 7.5440 | 10.337 | 0.0000 | 88.000 |
| "# Phys/StdLooseKsLD_NegLong" | 500 | 2009 | 4.0180 | 6.3879 | 0.0000 | 51.000 |
| "# Phys/StdLooseKsLD_PosLong" | 500 | 1763 | 3.5260 | 4.9704 | 0.0000 | 42.000 |
| "# Phys/StdLooseKsDD" | 500 | 2108 | 4.2160 | 5.7652 | 0.0000 | 40.000 |
| "# Phys/StdLooseKsLD" | 500 | 3780 | 7.5600 | 10.330 | 0.0000 | 88.000 |
| "# Phys/StdLooseKsLD_NegLong" | 500 | 2013 | 4.0260 | 6.3757 | 0.0000 | 51.000 |
| "# Phys/StdLooseKsLD_PosLong" | 500 | 1767 | 3.5340 | 4.9712 | 0.0000 | 42.000 |
| "# Phys/StdLooseKsLL" | 500 | 381 | 0.76200 | 1.4823 | 0.0000 | 15.000 |
| "# Phys/StdLooseKstar2Kpi" | 500 | 100978 | 201.96 | 250.87 | 0.0000 | 1949.0 |
| "# Phys/StdLooseLambdaDD" | 500 | 1687 | 3.3740 | 4.3056 | 0.0000 | 31.000 |
| "# Phys/StdLooseLambdaLD" | 500 | 1732 | 3.4640 | 6.8653 | 0.0000 | 74.000 |
| "# Phys/StdLooseLambdaDD" | 500 | 1705 | 3.4100 | 4.3518 | 0.0000 | 31.000 |
| "# Phys/StdLooseLambdaLD" | 500 | 1749 | 3.4980 | 6.8957 | 0.0000 | 75.000 |
| "# Phys/StdLooseLambdaLDpDown" | 500 | 93 | 0.18600 | 0.51323 | 0.0000 | 4.0000 |
| "# Phys/StdLooseLambdaLDpLong" | 500 | 1639 | 3.2780 | 6.6676 | 0.0000 | 71.000 |
| "# Phys/StdLooseLambdaLDpLong" | 500 | 1656 | 3.3120 | 6.6989 | 0.0000 | 72.000 |
| "# Phys/StdLooseLambdaLL" | 500 | 209 | 0.41800 | 1.4280 | 0.0000 | 17.000 |
| "# Phys/StdLooseLambdac2PKPi" | 500 | 725 | 1.4500 | 9.1564 | 0.0000 | 175.00 |
| "# Phys/StdLoosePhi2KK" | 500 | 14789 | 29.578 | 38.317 | 0.0000 | 361.00 |
......@@ -64,37 +64,6 @@ CountParticles SUCCESS Number of co
| "# Phys/StdMassConstrainedJpsi2MuMu" | 500 | 18 | 0.036000 | 0.18629 | 0.0000 | 1.0000 |
| "# Phys/StdTightDetachedTau3pi" | 500 | 49 | 0.098000 | 0.45650 | 0.0000 | 4.0000 |
| "# Phys/StdTightDplus2PiPiPi" | 500 | 175 | 0.35000 | 1.3489 | 0.0000 | 16.000 |
| "# Phys/StdTightPhi2KK" | 500 | 285 | 0.57000 | 1.5878 | 0.0000 | 18.000 |
| "# Phys/StdVeryLooseDetachedKst2Kpi" | 500 | 10246 | 20.492 | 38.796 | 0.0000 | 372.00 |
| "# Phys/StdVeryLooseDiMuon" | 500 | 4251 | 8.5020 | 25.497 | 0.0000 | 235.00 |
| "# Phys/StdVeryLooseJpsi2MuMu" | 500 | 10 | 0.020000 | 0.15362 | 0.0000 | 2.0000 |
| "# Phys/StdVeryLooseLambdaLL" | 500 | 1152 | 2.3040 | 4.5960 | 0.0000 | 44.000 |
| "# input particles" | 500 | 257217 | 514.43 | 776.34 | 0.0000 | 7444.0 |
|*"#accept" | 500 | 493 |( 98.6000 +- 0.525433 )%| ------- | ------- |
| "D*(2010)+" | 207 | 207 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "D*(2010)-" | 157 | 157 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "D+" | 6939 | 6939 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "D-" | 7617 | 7617 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "D0" | 2190 | 2190 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "D~0" | 2190 | 2190 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "J/psi(1S)" | 12879 | 12879 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "K*(892)0" | 72935 | 72935 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "K*(892)~0" | 73843 | 73843 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "KS0" | 10529 | 10529 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda0" | 3117 | 3117 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda_c+" | 389 | 389 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda_c~-" | 336 | 336 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda~0" | 3592 | 3592 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "e+" | 7983 | 7983 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "e-" | 7983 | 7983 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "gamma" | 3995 | 3995 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "phi(1020)" | 15871 | 15871 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "pi0" | 116 | 116 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "rho(770)+" | 10100 | 10100 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "rho(770)-" | 10523 | 10523 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "rho(770)0" | 2357 | 2357 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "tau+" | 702 | 702 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "tau-" | 667 | 667 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
""", stdout, result, causes,
signature_offset = 0, id='Particles')
countErrorLines({"FATAL":0})
......
......@@ -13,26 +13,27 @@ findReferenceBlock("""
BTaggingChecker INFO =======================================================
BTaggingChecker INFO Summary: EXCLUSIVE TAGGING PERFORMANCE
BTaggingChecker INFO Category EFF. Etag Wrong TF r w
BTaggingChecker INFO 1 Category 1.2+-1.2 29+-2.4 40+-4.9 59 39
BTaggingChecker INFO 2 Category 0.77+-0.92 11+-1.7 37+-7.8 24 14
BTaggingChecker INFO 3 Category 1.8+-1.2 3.8+-1 15+-10 11 2
BTaggingChecker INFO 4 Category 1.3+-1 3.2+-0.95 18+-12 9 2
BTaggingChecker INFO 1 Category 0.77+-0.94 32+-2.5 42+-4.7 63 46
BTaggingChecker INFO 2 Category 0.95+-1 11+-1.7 35+-7.8 24 13
BTaggingChecker INFO 3 Category 0.95+-0.96 4.4+-1.1 27+-11 11 4
BTaggingChecker INFO 4 Category 1.9+-1.1 2.9+-0.91 10+-9.5 9 1
BTaggingChecker INFO 5 Category 1.7+-0.71 1.7+-0.71 0+-0 6 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.3+-1.5 13+-1.8 29+-6.8 32 13
BTaggingChecker INFO ** SS kaon 0.44+-0.7 7+-1.4 62+-9.9 9 15
BTaggingChecker INFO ** SS kaon 0.29+-0.57 7.3+-1.4 60+-9.8 10 15
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.7+-1.9 27+-2.4 32+-4.8 63 29
BTaggingChecker INFO ** SS nnetkaon 0.87+-0.99 28+-2.4 59+-5 40 57
BTaggingChecker INFO ** OS nnetkaon 3.3+-1.9 28+-2.4 33+-4.8 65 32
BTaggingChecker INFO ** SS nnetkaon 0.73+-0.91 30+-2.5 58+-4.9 43 59
BTaggingChecker INFO ** OS Charm 0.81+-0.85 2.6+-0.86 22+-14 7 2
BTaggingChecker INFO ** SS Proton 0.18+-0.46 23+-2.3 46+-5.6 43 36
BTaggingChecker INFO ** SS Proton 0.2+-0.48 27+-2.4 46+-5.1 51 43
BTaggingChecker INFO ** SS pionBDT 0.045+-0.23 30+-2.5 52+-4.9 50 54
BTaggingChecker INFO ---------------------------------------------------------
BTaggingChecker INFO Tagging efficiency = 48 +/- 2.7 %
BTaggingChecker INFO Wrong Tag fraction = 31 +/- 3.7 %
BTaggingChecker INFO EFFECTIVE COMB. TE = 6.8 +/- 2.3 % (Total events= 343)
BTaggingChecker INFO Tagging efficiency = 52 +/- 2.7 %
BTaggingChecker INFO Wrong Tag fraction = 33 +/- 3.6 %
BTaggingChecker INFO EFFECTIVE COMB. TE = 6.3 +/- 2.1 % (Total events= 343)
BTaggingChecker SUCCESS =========================================================
""", stdout, result, causes, signature_offset = 1)
countErrorLines({"FATAL":0})
......
Supports Markdown
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