Skip to content
Snippets Groups Projects
Commit 74b4727e authored by Marco Clemencic's avatar Marco Clemencic
Browse files

v33r2

parent e8111ae9
No related branches found
Tags v33r2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 176 additions and 40 deletions
CMakeLists.txt
+ 4
− 4
View file @ 74b4727e
......@@ -6,10 +6,10 @@ find_package(GaudiProject)
#---------------------------------------------------------------
# Declare project name and version
gaudi_project(DaVinci v33r1
USE Analysis v10r3
Stripping v6r3
Lbcom v13r3
gaudi_project(DaVinci v33r2
USE Analysis v10r4
Stripping v6r4
Lbcom v13r4
DATA AppConfig VERSION v3r*
FieldMap VERSION v5r*
ParamFiles VERSION v8r*
......
DaVinciSys/CMakeLists.txt
+ 1
− 1
View file @ 74b4727e
################################################################################
# Package: DaVinciSys
################################################################################
gaudi_subdir(DaVinciSys v33r1p1)
gaudi_subdir(DaVinciSys v33r2)
gaudi_depends_on_subdirs(DaVinciTests
Phys/DaVinci
......
DaVinciSys/cmt/requirements
+ 3
− 6
View file @ 74b4727e
package DaVinciSys
version v33r1p1
version v33r2
branches doc cmt
use DaVinci v33r1p1 Phys
use DaVinciTests v2r15
# Temporary packages
use SimComponents v2r24 Sim
use DaVinci v33r2 Phys
use DaVinciTests v2r16
# Declare this as a container package
apply_pattern container_package
......
DaVinciSys/cmt/version.cmt
+ 1
− 1
View file @ 74b4727e
v33r1p1
v33r2
DaVinciSys/doc/release.notes
+ 29
− 0
View file @ 74b4727e
......@@ -3,6 +3,35 @@ Package : DaVinciSys
Package Coordinator : Chris Jones
Purpose : LHCb physics analysis application
</PRE><H1><A NAME=v33r2>2013-02-21 DaVinci v33r2</A></H1><PRE>
New development release based on the LHCb v35r4 stack.
Executive Summary :-
- Changes to supported platforms
. Add support for x86_64-slc6-gcc46 (I/O via Castor client not yet supported)
. Remove support for i686-slc5-gcc43
- Core changes
. Fix a bug where IgnoreP2PVFromInputLocations in DVCommonBase was not
respected. Fixes https://savannah.cern.ch/bugs/?99656
. Disable the preloading of P2PV relations, as this is no longer needed with
the new logic that loads on demand the relations based on the Particle
location in the TES.
- DecayTreeTuple
. New tools : TupleToolVeloTrackClusterInfo, TupleToolDEDX and
TupleToolVeloClusters.
- Jets
. Various improvements to the Jet finding and tagging.
See package release notes in Analysis.
- Flavour Tagging
. New NN OS kaon tagger added
. Complete rewrite of the clone definition in the flavour tagging
</PRE><H1><A NAME=v33r1p1>2013-01-20 DaVinci v33r1p1</A></H1><PRE>
Patch release on top of DaVinci v33r1 to fix dependency on DecFiles.
......
DaVinciTests/CMakeLists.txt
+ 1
− 1
View file @ 74b4727e
################################################################################
# Package: DaVinciTests
################################################################################
gaudi_subdir(DaVinciTests v2r15)
gaudi_subdir(DaVinciTests v2r16)
gaudi_depends_on_subdirs(GaudiConf)
......
DaVinciTests/cmt/requirements
+ 1
− 1
View file @ 74b4727e
package DaVinciTests
version v2r15
version v2r16
branches doc cmt tests
use GaudiConf v* -no_auto_imports
......
DaVinciTests/cmt/version.cmt
+ 1
− 1
View file @ 74b4727e
v2r15
v2r16
DaVinciTests/doc/release.notes
+ 24
− 0
View file @ 74b4727e
......@@ -4,6 +4,30 @@
! Purpose : QMTests for DaVinci
!-----------------------------------------------------------------------------
!========================= DaVinciTests v2r16 2013-02-21 =========================
! 2013-02-19 - Stefania Vecchi
- Update tests references for tagging
! 2013-02-07 - Chris Jones
- Add an unpacking test.
! 2013-01-08 - Anton Poluektov
- Fix fsrs tests, change stripping version to Stripping20r1
! 2012-12-07 - Chris Jones
- Update io.qms/test_decaytreetuple references again.
! 2012-12-04 - Chris Jones
- Update commonparticles/standardintermediate_run reference again for Taus
! 2012-12-04 - Chris Jones
- Update the reference blocks for io.qms/test_decaytreetuple after
VertexFitter fixes
! 2012-12-03 - Anton Poluektov
- Update commonparticles/standardintermediate_run reference
!========================= DaVinciTests v2r15 2012-12-03 =========================
! 2012-12-03 - Chris Jones
......
DaVinciTests/tests/options/DVTestDecayTreeTuple.py
+ 4
− 2
View file @ 74b4727e
......@@ -9,7 +9,7 @@
from Gaudi.Configuration import *
from GaudiKernel.SystemOfUnits import *
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
#######################################################################
#
# Selection
......@@ -100,7 +100,9 @@ DaVinci().DDDBtag="head-20100624"
from Gaudi.Configuration import *
EventSelector().Input = [
" DATAFILE='castor:/castor/cern.ch/user/r/rlambert/testfiles/MC2010_BdJPsiKs_00008414_00000106_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
"DATAFILE='castor:/castor/cern.ch/user/r/rlambert/testfiles/MC2010_BdJPsiKs_00008414_00000106_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"
#"DATAFILE='PFN:/usera/jonesc/NFS/data/MC/test/MC2010_BdJPsiKs_00008414_00000106_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"
]
#FileCatalog().Catalogs = [ 'xmlcatalog_file:Sim2010_Bd2JpsiKs.xml' ]
DaVinciTests/tests/options/DaVinci-Packing-Test.py 0 → 100755
+ 59
− 0
View file @ 74b4727e
########################################################################
from Gaudi.Configuration import *
from Configurables import GaudiSequencer
from Configurables import DaVinci, PhysConf
########################################################################
DaVinci().EvtMax = 100 # Number of events
DaVinci().PrintFreq = 10 # Events to skip
DaVinci().DataType = "2012" # Must be given
DaVinci().Simulation = False
########################################################################
from Configurables import DataObjectVersionFilter
DaVinci().UserAlgorithms += [
DataObjectVersionFilter( "CheckTracks",
DataObjectLocation = "/Event/Bhadron/Rec/Track/Best",
MaxVersion = 999 ),
DataObjectVersionFilter( "CheckDecReports",
DataObjectLocation = "/Event/Strip/Phys/DecReports",
MaxVersion = 999,
OutputLevel = 3 ),
DataObjectVersionFilter( "CheckVeloClusters",
DataObjectLocation = "/Event/Bhadron/Raw/Velo/Clusters",
MaxVersion = 999,
OutputLevel = 3 ),
DataObjectVersionFilter( "CheckCaloElectrons",
DataObjectLocation = "/Event/Bhadron/Rec/Calo/Electrons",
MaxVersion = 999,
OutputLevel = 3 ),
DataObjectVersionFilter( "CheckCaloPhotons",
DataObjectLocation = "/Event/Bhadron/Rec/Calo/Photons",
MaxVersion = 999,
OutputLevel = 3 ),
DataObjectVersionFilter( "CheckLiteTTClusters",
DataObjectLocation = "/Event/Bhadron/Raw/TT/LiteClusters",
MaxVersion = 999,
OutputLevel = 3 ),
DataObjectVersionFilter( "CheckLiteITClusters",
DataObjectLocation = "/Event/Bhadron/Raw/IT/LiteClusters",
MaxVersion = 999,
OutputLevel = 3 ),
DataObjectVersionFilter( "CheckLiteVeloClusters",
DataObjectLocation = "/Event/Bhadron/Raw/Velo/LiteClusters",
MaxVersion = 999,
OutputLevel = 3 ),
DataObjectVersionFilter( "CheckBhadronKaons",
DataObjectLocation = "/Event/Bhadron/Phys/StdAllNoPIDsKaons/Particles",
MaxVersion = 999,
OutputLevel = 3 ),
DataObjectVersionFilter( "CheckPVs",
DataObjectLocation = "/Event/Bhadron/Rec/Vertex/Primary",
MaxVersion = 999,
OutputLevel = 3 )
]
from GaudiConf import IOHelper
IOHelper().inputFiles(['PFN:root://eoslhcb.cern.ch//eos/lhcb/LHCb/Collision12/BHADRON.MDST/00021211/0000/00021211_00001955_1.bhadron.mdst'])
DaVinciTests/tests/options/Stripping/test_sdst_appconfig.py
+ 1
− 1
View file @ 74b4727e
......@@ -10,7 +10,7 @@ MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
from StrippingConf.Configuration import StrippingConf, StrippingStream
from StrippingArchive.Utils import buildStreams, cloneLinesFromStream, cloneStream
streams = buildStreams('Stripping17')
streams = buildStreams('Stripping20r1')
#
# Now do some cloning to deal with the charm full/microDST streams
......
DaVinciTests/tests/options/Stripping/test_stripping_allstreams_sim2010_bs2jpsiphi.py
+ 1
− 1
View file @ 74b4727e
......@@ -17,7 +17,7 @@ MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
from StrippingConf.Configuration import StrippingConf
from StrippingArchive.Utils import buildStreams
allStreams = buildStreams('Stripping17')
allStreams = buildStreams('Stripping20r1')
sc = StrippingConf( Streams = allStreams)
......
DaVinciTests/tests/options/TestSDSTCatalog.xml
+ 14
− 0
View file @ 74b4727e
......@@ -117,4 +117,18 @@
<logical/>
</File>
<File ID="AA819693-DF59-E211-BBE2-643150385937">
<physical>
<pfn filetype="ROOT" name="000000.CharmToBeSwum.dst"/>
</physical>
<logical/>
</File>
<File ID="FE12DC95-DF59-E211-BBE2-643150385937">
<physical>
<pfn filetype="ROOT" name="000000.BhadronCompleteEvent.dst"/>
</physical>
<logical/>
</File>
</POOLFILECATALOG>
DaVinciTests/tests/options/fsrs/DVStripping-RealData-MagDown.py
+ 1
− 1
View file @ 74b4727e
......@@ -7,7 +7,7 @@ from Configurables import DaVinci
from StrippingConf.Configuration import StrippingConf
from StrippingArchive.Utils import buildStreams
allStreams = buildStreams('Stripping17')
allStreams = buildStreams('Stripping20r1')
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
......
DaVinciTests/tests/options/fsrs/DVStripping-RealData-MagUp.py
+ 1
− 1
View file @ 74b4727e
......@@ -7,7 +7,7 @@ from Configurables import DaVinci
from StrippingConf.Configuration import StrippingConf
from StrippingArchive.Utils import buildStreams
allStreams = buildStreams('Stripping17')
allStreams = buildStreams('Stripping20r1')
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
......
DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_run.qmt
+ 5
− 6
View file @ 74b4727e
......@@ -14,8 +14,7 @@
<argument name="validator"><text>
findReferenceBlock("""
DaVinciInitAlg SUCCESS 500 events processed
""", stdout, result, causes, signature_offset = 0, id='Events')
findReferenceBlock("""
DaVinciInitAlg SUCCESS ==================================================================
CountParticles SUCCESS Number of counters : 67
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "# Phys/StdDiElectronFromTracks" | 362 | 9555 | 26.395 | 28.151 | 3.0000 | 168.00 |
......@@ -34,7 +33,7 @@ CountParticles SUCCESS Number of co
| "# Phys/StdLooseDetachedKpi" | 463 | 12187 | 26.322 | 28.069 | 1.0000 | 213.00 |
| "# Phys/StdLooseDetachedKst2Kpi" | 429 | 4830 | 11.259 | 11.919 | 1.0000 | 83.000 |
| "# Phys/StdLooseDetachedPhi2KK" | 187 | 357 | 1.9091 | 1.4320 | 1.0000 | 10.000 |
| "# Phys/StdLooseDetachedTau3pi" | 124 | 582 | 4.6935 | 6.4235 | 1.0000 | 47.000 |
| "# Phys/StdLooseDetachedTau3pi" | 170 | 540 | 3.1765 | 4.1050 | 1.0000 | 37.000 |
| "# Phys/StdLooseDiMuon" | 455 | 1495 | 3.2857 | 4.0172 | 1.0000 | 38.000 |
| "# Phys/StdLooseDiMuonSameSign" | 321 | 1371 | 4.2710 | 6.7882 | 1.0000 | 83.000 |
| "# Phys/StdLooseDplus2hhh" | 374 | 5690 | 15.214 | 22.382 | 1.0000 | 201.00 |
......@@ -61,7 +60,7 @@ CountParticles SUCCESS Number of co
| "# Phys/StdVeryLooseDiMuon" | 465 | 2751 | 5.9161 | 8.2694 | 1.0000 | 69.000 |
| "# Phys/StdVeryLooseJpsi2MuMu" | 26 | 27 | 1.0385 | 0.19231 | 1.0000 | 2.0000 |
| "# Phys/StdVeryLooseLambdaLL" | 227 | 483 | 2.1278 | 1.8361 | 1.0000 | 22.000 |
| "# input particles" | 500 | 141190 | 282.38 | 242.05 | 5.0000 | 2045.0 |
| "# input particles" | 500 | 141148 | 282.30 | 242.15 | 5.0000 | 2045.0 |
|*"#accept" | 500 | 500 |( 100.000 +- 0.200000 )%| ------- | ------- |
| "D*(2010)+" | 34 | 34 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "D*(2010)-" | 44 | 44 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
......@@ -83,8 +82,8 @@ CountParticles SUCCESS Number of co
| "rho(770)+" | 392 | 392 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "rho(770)-" | 374 | 374 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "rho(770)0" | 1498 | 1498 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "tau+" | 265 | 265 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "tau-" | 317 | 317 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "tau+" | 264 | 264 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "tau-" | 276 | 276 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
""", stdout, result, causes,
signature_offset = 0, id='Particles')
countErrorLines({"FATAL":0})
......
DaVinciTests/tests/qmtest/io.qms/test_decaytreetuple.qmt
+ 6
− 6
View file @ 74b4727e
......@@ -7,21 +7,21 @@
</set></argument>
<argument name="validator"><text>
findReferenceBlock("""
Tuple SUCCESS Number of counters : 4
Tuple SUCCESS Number of counters : 4
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "# Phys/BetaSBd2JpsiKsDetachedLine" | 9 | 9 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "# input particles" | 100 | 9 | 0.090000 | 0.28618 | 0.0000 | 1.0000 |
|*"#accept" | 100 | 9 |( 9.00000 +- 2.86182 )%| ------- | ------- |
| "# Phys/BetaSBd2JpsiKsDetachedLine" | 11 | 11 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "# input particles" | 100 | 11 | 0.11000 | 0.31289 | 0.0000 | 1.0000 |
|*"#accept" | 100 | 11 |( 11.0000 +- 3.12890 )%| ------- | ------- |
| "Event" | 100 | 100 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
""", stdout, result, causes,
signature_offset = 0, id="Tuple")
findReferenceBlock("""
EventTuple SUCCESS Number of counters : 1
EventTuple SUCCESS Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "Event" | 100 | 100 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
""", stdout, result, causes, signature_offset = 0, id="EventTuple")
findReferenceBlock("""
MCTuple SUCCESS Number of counters : 2
MCTuple SUCCESS Number of counters : 2
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
|*"#accept" | 100 | 99 |( 99.0000 +- 0.994987 )%| ------- | ------- |
| "Event" | 100 | 100 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
......
DaVinciTests/tests/qmtest/packing.qms/test_particleunpacking_stripping20.qmt 0 → 100755
+ 12
− 0
View file @ 74b4727e
<?xml version="1.0" ?>
<!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
<extension class="GaudiTest.GaudiExeTest" kind="test">
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set>
<text>../options/DaVinci-Packing-Test.py</text>
</set></argument>
<argument name="reference"><text>../refs/test_particleunpacking_stripping20.ref</text></argument>
<argument name="validator"><text>
countErrorLines({"FATAL":0, "WARNING":0, "ERROR":0})
</text></argument>
</extension>
DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc10.qmt
+ 7
− 7
View file @ 74b4727e
......@@ -11,21 +11,21 @@ findReferenceBlock("""
BTaggingChecker INFO =======================================================
BTaggingChecker INFO Summary: EXCLUSIVE TAGGING PERFORMANCE
BTaggingChecker INFO Category EFF. Etag Wrong TF r w
BTaggingChecker INFO 1 NNet 0.12+-0.49 20+-2.9 46+-8 21 18
BTaggingChecker INFO 2 NNet 2.1+-1.9 12+-2.3 29+-9.3 17 7
BTaggingChecker INFO 1 NNet 0.2+-0.64 20+-2.9 45+-7.9 22 18
BTaggingChecker INFO 2 NNet 2.3+-2 11+-2.3 27+-9.5 16 6
BTaggingChecker INFO 3 NNet 4.1+-2.2 7.7+-1.9 13+-8.8 13 2
BTaggingChecker INFO 4 NNet 0.92+-1.2 2.6+-1.1 20+-18 4 1
BTaggingChecker INFO ---------------------------------------------------------
BTaggingChecker INFO ** OS muons -0.2+-0.64 5.1+-1.6 60+-15 4 6
BTaggingChecker INFO ** OS elect 2.3+-1.6 4.1+-1.4 12+-12 7 1
BTaggingChecker INFO ** OS elect 1.4+-1.5 4.6+-1.5 22+-14 7 2
BTaggingChecker INFO ** OS kaons 0.39+-0.88 17+-2.7 42+-8.6 19 14
BTaggingChecker INFO ** SS kaon 2.9+-2.2 11+-2.2 24+-9.3 16 5
BTaggingChecker INFO ** SS pion -0.51+-0.98 4.6+-1.5 67+-16 3 6
BTaggingChecker INFO ** VertexCh 6.4+-3 16+-2.6 19+-6.9 26 6
BTaggingChecker INFO ** SS kaon 3.2+-2.2 9.7+-2.1 21+-9.4 15 4
BTaggingChecker INFO ** SS pion -0.66+-1.1 3.6+-1.3 71+-17 2 5
BTaggingChecker INFO ** VertexCh 7.3+-3.1 16+-2.6 16+-6.6 26 5
BTaggingChecker INFO ---------------------------------------------------------
BTaggingChecker INFO Tagging efficiency = 42 +/- 3.5 %
BTaggingChecker INFO Wrong Tag fraction = 29 +/- 5.2 %
BTaggingChecker INFO EFFECTIVE COMB. TE = 7.3 +/- 3.2 % (Total events= 196)
BTaggingChecker INFO EFFECTIVE COMB. TE = 7.6 +/- 3.3 % (Total events= 196)
BTaggingChecker SUCCESS =========================================================
""", stdout, result, causes, signature_offset = 1)
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