Commit 44c5725a authored by Marco Clemencic's avatar Marco Clemencic
Browse files

v33r1

parent f3f04233
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
#---------------------------------------------------------------
# Load macros and functions for Gaudi-based projects
find_package(GaudiProject)
#---------------------------------------------------------------
# Declare project name and version
gaudi_project(DaVinci v33r1
USE Analysis v10r3
Stripping v6r3
Lbcom v13r3
DATA AppConfig VERSION v3r*
FieldMap VERSION v5r*
ParamFiles VERSION v8r*
TCK/HltTCK)
################################################################################
# Package: DaVinciSys
################################################################################
gaudi_subdir(DaVinciSys v33r1)
gaudi_depends_on_subdirs(DaVinciTests
Phys/DaVinci)
gaudi_add_test(QMTest QMTEST)
package DaVinciSys
version v33r0p1
version v33r1
branches doc cmt
use DaVinci v33r0p1 Phys
use DaVinciTests v2r14
use DaVinci v33r1 Phys
use DaVinciTests v2r15
# Declare this as a container package
apply_pattern container_package
......
......@@ -3,6 +3,40 @@ Package : DaVinciSys
Package Coordinator : Chris Jones
Purpose : LHCb physics analysis application
</PRE><H1><A NAME=v33r1>2012-11-30 DaVinci v33r1</A></H1><PRE>
New development release based on the LHCb v35r3 stack.
Uses new Gaudi v23r5 release, that uses ROOT v5.34.03
Executive Summary :-
- (Developmetal) Support added for CMake.
- Core changes :-
. Extend the related PV finding logic in DVCommonBase to try and predict
the relations table location from the Particle container TES location.
Also, attempt to load with and without respecting the RootInTES setting.
. Add a compiler warning when the depreciated DVAlgorithm.h head is included.
Make the runtime warning message more noticeable...
- Micro DST Improvements :-
. Better support for creating and reading MC uDSTs
- DecayTreeTuple :-
. Move the base classes and core components to a new package called
Phys/DecayTreeTupleBase.
+ Move some components to various seperate new packages
DecayTreeTupleDalitz - 'Dalitz' tools
DecayTreeTupleJets - Jet tools
DecayTreeTupleMC - MC tools
DecayTreeTupleMuonCalib - Muon PID calibration
DecayTreeTupleReco - Reconstruction information tools
DecayTreeTupleTrigger - Trigger and stripping tools
. Various improvements and bug fixes to the tools.
- FlavourTagging :-
. Various new tunings.
</PRE><H1><A NAME=v33r0p1>2012-10-23 DaVinci v33r0p1</A></H1><PRE>
Trivial patch release, with updated example options for October 2012 Analysis
......
################################################################################
# Package: DaVinciTests
################################################################################
gaudi_subdir(DaVinciTests v2r15)
gaudi_depends_on_subdirs(GaudiConf)
gaudi_add_test(QMTest QMTEST)
package DaVinciTests
version v2r14
version v2r15
branches doc cmt tests
use GaudiConf v* -no_auto_imports
......
......@@ -4,6 +4,27 @@
! Purpose : QMTests for DaVinci
!-----------------------------------------------------------------------------
!========================= DaVinciTests v2r15 2012-12-03 =========================
! 2012-12-03 - Chris Jones
- Adapt DVTestWriteDst.py to DSTWriter changes
! 2012-11-29 - Marco Clemencic
- Added CMake configuration file.
! 2012-11-27 - Rob Lambert
- Updated FSR test references to reflect new files
! 2012-11-15 - Stefania Vecchi
- Update tests references for tagging
! 2012-10-09 - Anton Poluektov
- Update tests references
! 2012-08-09 - Rob Lambert
- clone merger test from Rec/LumiAlgs, and add a check using CheckFSRs from AppConfig
- davinci-merge-small-files.qmt
!========================= DaVinciTests v2r14 2012-07-09 =========================
! 2012-05-04 - Chris Jones
......
......@@ -47,8 +47,8 @@ MessageSvc().Format = "% F%40W%S%7W%R%T %0W%M"
# Standard configuration
#
from Configurables import DaVinci
DaVinci().EvtMax = 500 # Number of events
DaVinci().SkipEvents = 0 # Events to skip
DaVinci().EvtMax = 500 # Number of events
DaVinci().SkipEvents = 0 # Events to skip
DaVinci().PrintFreq = 1
DaVinci().DataType = "2010"
DaVinci().CondDBtag = 'sim-20101210-vc-md100'
......@@ -67,7 +67,7 @@ DaVinci().MoniSequence = [ #PrintDecayTree()
#
# example data file
# bsjpsiphi
#DaVinci().Input = [ "DATAFILE='PFN:/usera/jonesc/NFS/data/MC/MC10/TaggingTest/00008922_00000001_1.allstreams.dst' TYP='POOL_ROOTTREE' OPT='READ'" ]
#DaVinci().Input = [ "DATAFILE='PFN:/usera/jonesc/NFS/data/MC/MC10/DST/BtaggingTest/00008922_00000001_1.allstreams.dst' TYP='POOL_ROOTTREE' OPT='READ'" ]
DaVinci().Input = [ "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/freezer/lhcb/MC/MC10/ALLSTREAMS.DST/00008922/0000/00008922_00000001_1.allstreams.dst?svcClass=lhcbdisk' TYP='POOL_ROOTTREE' OPT='READ'" ]
#from Configurables import CondDB
#CondDB().LocalTags['SIMCOND'] = ['sim-20100429-vc-md100']
......@@ -22,7 +22,7 @@ from Configurables import GaudiSequencer, FilterDesktop, DeterministicPrescaler,
from PhysSelPython.Wrappers import Selection, DataOnDemand, SelectionSequence
#from Configurables import SelDSTWriter
from DSTWriters.Configuration import SelDSTWriter
from DSTWriters.microdstelements import CloneMCInfo
from DSTWriters.microdstelements import CloneParticleMCInfo
MyLooseJpsi = DataOnDemand(Location = 'Phys/StdLooseJpsi2MuMu/Particles')
......@@ -63,7 +63,7 @@ for i in MassRanges :
dstWriter = SelDSTWriter("JpsiDSTWriter_"+name,
SelectionSequences = selections)
dstWriter.MicroDSTElements['default'] += [CloneMCInfo()]
dstWriter.MicroDSTElements['default'] += [CloneParticleMCInfo()]
seq = dstWriter.sequence()
......
......@@ -103,4 +103,18 @@
<logical/>
</File>
<File ID="EEA8805A-7511-E211-8B27-00242179EFBA">
<physical>
<pfn filetype="ROOT" name="000000.Leptonic.mdst"/>
</physical>
<logical/>
</File>
<File ID="928EC45A-7511-E211-8B27-00242179EFBA">
<physical>
<pfn filetype="ROOT" name="000000.PID.dst"/>
</physical>
<logical/>
</File>
</POOLFILECATALOG>
###################
# Define InputData
###################
InputData=[]
for i in range(94):
InputData.append("castor:/castor/cern.ch/user/r/rlambert/smallfiles/R08S14EW/R08S14EW_small_1_#.dst".replace("#",str(i+1)))
RecoDict= {"Reco" : "R08S14EW"}
from Gaudi.Configuration import *
from GaudiConf import IOHelper
id=InputData
######################
#choose number of files
######################
IOHelper().inputFiles(id[:5])
IOHelper().outStream("merged.dst","InputCopyStream")
IOHelper().setupServices()
##############################
#fill summary every event
##############################
from Configurables import ( XMLSummary )
XMLSummary().XMLSummary="summary.xml"
from Configurables import XMLSummarySvc
XMLSummarySvc("CounterSummarySvc").UpdateFreq=1
##############################
#Run the merger
##############################
from Configurables import GaudiSequencer
from Configurables import LumiAlgsConf
LumiSeq=GaudiSequencer("LumiSeq")
LumiAlgsConf().LumiSequencer=LumiSeq
LumiAlgsConf().MergeFSR=True
LumiAlgsConf().InputType="MDST"
ApplicationMgr().TopAlg+=[LumiSeq]
##############################################
#Debug printout, lists all cleaned directories
##############################################
from Configurables import FSRCleaner
FSRCleaner().OutputLevel=DEBUG
#FSRCleaner().Enable=False
......@@ -16,49 +16,52 @@ findReferenceBlock("""
DaVinciInitAlg SUCCESS 500 events processed
""", stdout, result, causes, signature_offset = 0, id='Events')
findReferenceBlock("""
CountParticles SUCCESS Number of counters : 58
CountParticles SUCCESS Number of counters : 67
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "# Phys/StdLTUnbiasedJpsi2MuMu" | 500 | 44 | 0.088000 | 0.29027 | 0.0000 | 2.0000 |
| "# Phys/StdLooseD02KK" | 500 | 232 | 0.46400 | 1.3118 | 0.0000 | 12.000 |
| "# Phys/StdLooseD02KPi" | 500 | 272 | 0.54400 | 1.0863 | 0.0000 | 9.0000 |
| "# Phys/StdLooseD02KPiDCS" | 500 | 272 | 0.54400 | 1.0863 | 0.0000 | 9.0000 |
| "# Phys/StdLooseD02KsKK" | 500 | 18 | 0.036000 | 0.40829 | 0.0000 | 8.0000 |
| "# Phys/StdLooseD02PiPi" | 500 | 366 | 0.73200 | 1.5950 | 0.0000 | 10.000 |
| "# Phys/StdLooseDetachedDiElectron" | 500 | 492 | 0.98400 | 2.0039 | 0.0000 | 18.000 |
| "# Phys/StdLooseDetachedKpi" | 500 | 12187 | 24.374 | 27.876 | 0.0000 | 213.00 |
| "# Phys/StdLooseDetachedKst2Kpi" | 500 | 4830 | 9.6600 | 11.719 | 0.0000 | 83.000 |
| "# Phys/StdLooseDetachedPhi2KK" | 500 | 357 | 0.71400 | 1.2729 | 0.0000 | 10.000 |
| "# Phys/StdLooseDiElectron" | 500 | 226 | 0.45200 | 1.0676 | 0.0000 | 8.0000 |
| "# Phys/StdLooseDiMuon" | 500 | 1495 | 2.9900 | 3.9459 | 0.0000 | 38.000 |
| "# Phys/StdLooseDiMuonSameSign" | 500 | 1371 | 2.7420 | 5.8117 | 0.0000 | 83.000 |
| "# Phys/StdLooseDplus2hhh" | 500 | 5690 | 11.380 | 20.453 | 0.0000 | 201.00 |
| "# Phys/StdLooseDstarWithD02KK" | 500 | 12 | 0.024000 | 0.20838 | 0.0000 | 3.0000 |
| "# Phys/StdLooseDstarWithD02KPi" | 500 | 23 | 0.046000 | 0.26055 | 0.0000 | 3.0000 |
| "# Phys/StdLooseDstarWithD02KPiDCS" | 500 | 20 | 0.040000 | 0.23324 | 0.0000 | 2.0000 |
| "# Phys/StdLooseDstarWithD02PiPi" | 500 | 23 | 0.046000 | 0.30312 | 0.0000 | 3.0000 |
| "# Phys/StdLooseJpsi2MuMu" | 500 | 145 | 0.29000 | 0.46680 | 0.0000 | 2.0000 |
| "# Phys/StdLooseJpsi2ee" | 500 | 121 | 0.24200 | 0.70671 | 0.0000 | 6.0000 |
| "# Phys/StdLooseKsDD" | 500 | 3214 | 6.4280 | 7.6867 | 0.0000 | 53.000 |
| "# Phys/StdLooseKsLD" | 500 | 3185 | 6.3700 | 6.6493 | 0.0000 | 39.000 |
| "# Phys/StdLooseKsLD_NegLong" | 500 | 1618 | 3.2360 | 4.1227 | 0.0000 | 25.000 |
| "# Phys/StdLooseKsLD_PosLong" | 500 | 1567 | 3.1340 | 3.8408 | 0.0000 | 23.000 |
| "# Phys/StdLooseKsLL" | 500 | 149 | 0.29800 | 0.59766 | 0.0000 | 3.0000 |
| "# Phys/StdLooseKstar2Kpi" | 500 | 67936 | 135.87 | 111.54 | 0.0000 | 907.00 |
| "# Phys/StdLooseLambdaDD" | 500 | 2039 | 4.0780 | 4.7489 | 0.0000 | 36.000 |
| "# Phys/StdLooseLambdac2PKPi" | 500 | 156 | 0.31200 | 1.2612 | 0.0000 | 15.000 |
| "# Phys/StdLoosePhi2KK" | 500 | 11961 | 23.922 | 24.037 | 0.0000 | 179.00 |
| "# Phys/StdLooseRho0" | 500 | 664 | 1.3280 | 2.2690 | 0.0000 | 18.000 |
| "# Phys/StdLooseRhoPlus" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
| "# Phys/StdMassConstrainedJpsi2MuMu" | 500 | 72 | 0.14400 | 0.36230 | 0.0000 | 2.0000 |
| "# Phys/StdTightDplus2PiPiPi" | 500 | 76 | 0.15200 | 0.65490 | 0.0000 | 9.0000 |
| "# Phys/StdTightPhi2KK" | 500 | 159 | 0.31800 | 0.67593 | 0.0000 | 4.0000 |
| "# Phys/StdVeryLooseDetachedKst2Kpi" | 500 | 5334 | 10.668 | 12.940 | 0.0000 | 92.000 |
| "# Phys/StdVeryLooseDiMuon" | 500 | 2751 | 5.5020 | 8.1163 | 0.0000 | 69.000 |
| "# Phys/StdVeryLooseJpsi2MuMu" | 500 | 27 | 0.054000 | 0.23470 | 0.0000 | 2.0000 |
| "# Phys/StdVeryLooseKsDD" | 500 | 93 | 0.18600 | 0.46412 | 0.0000 | 3.0000 |
| "# Phys/StdVeryLooseKsLL" | 500 | 390 | 0.78000 | 1.2015 | 0.0000 | 8.0000 |
| "# Phys/StdVeryLooseLambdaLL" | 500 | 483 | 0.96600 | 1.6288 | 0.0000 | 22.000 |
| "# input particles" | 500 | 130070 | 260.14 | 223.19 | 5.0000 | 1958.0 |
| "# Phys/StdDiElectronFromTracks" | 362 | 9555 | 26.395 | 28.151 | 3.0000 | 168.00 |
| "# Phys/StdKs2PiPiDD" | 58 | 66 | 1.1379 | 0.39165 | 1.0000 | 3.0000 |
| "# Phys/StdKs2PiPiLL" | 70 | 75 | 1.0714 | 0.25754 | 1.0000 | 2.0000 |
| "# Phys/StdLTUnbiasedJpsi2MuMu" | 43 | 44 | 1.0233 | 0.15071 | 1.0000 | 2.0000 |
| "# Phys/StdLambda2PPiDD" | 28 | 30 | 1.0714 | 0.25754 | 1.0000 | 2.0000 |
| "# Phys/StdLambda2PPiLL" | 20 | 22 | 1.1000 | 0.30000 | 1.0000 | 2.0000 |
| "# Phys/StdLooseD02KK" | 78 | 232 | 2.9744 | 1.8877 | 2.0000 | 12.000 |
| "# Phys/StdLooseD02KPi" | 157 | 272 | 1.7325 | 1.3035 | 1.0000 | 9.0000 |
| "# Phys/StdLooseD02KPiDCS" | 157 | 272 | 1.7325 | 1.3035 | 1.0000 | 9.0000 |
| "# Phys/StdLooseD02KsKK" | 6 | 18 | 3.0000 | 2.2361 | 2.0000 | 8.0000 |
| "# Phys/StdLooseD02PiPi" | 114 | 366 | 3.2105 | 1.7892 | 2.0000 | 10.000 |
| "# Phys/StdLooseDetachedDiElectron" | 160 | 415 | 2.5938 | 2.4528 | 1.0000 | 16.000 |
| "# Phys/StdLooseDetachedDipion" | 383 | 1600 | 4.1775 | 3.7241 | 1.0000 | 22.000 |
| "# 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/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 |
| "# Phys/StdLooseDstarWithD02KK" | 8 | 12 | 1.5000 | 0.70711 | 1.0000 | 3.0000 |
| "# Phys/StdLooseDstarWithD02KPi" | 18 | 23 | 1.2778 | 0.55833 | 1.0000 | 3.0000 |
| "# Phys/StdLooseDstarWithD02KPiDCS" | 16 | 20 | 1.2500 | 0.43301 | 1.0000 | 2.0000 |
| "# Phys/StdLooseDstarWithD02PiPi" | 13 | 23 | 1.7692 | 0.69657 | 1.0000 | 3.0000 |
| "# Phys/StdLooseJpsi2MuMu" | 142 | 145 | 1.0211 | 0.14381 | 1.0000 | 2.0000 |
| "# Phys/StdLooseJpsi2ee" | 62 | 97 | 1.5645 | 0.97750 | 1.0000 | 6.0000 |
| "# Phys/StdLooseKsDD" | 419 | 3214 | 7.6706 | 7.8087 | 1.0000 | 53.000 |
| "# Phys/StdLooseKsLD" | 430 | 3185 | 7.4070 | 6.6128 | 1.0000 | 39.000 |
| "# Phys/StdLooseKsLD_NegLong" | 348 | 1618 | 4.6494 | 4.2247 | 1.0000 | 25.000 |
| "# Phys/StdLooseKsLD_PosLong" | 365 | 1567 | 4.2932 | 3.9028 | 1.0000 | 23.000 |
| "# Phys/StdLooseKsLL" | 118 | 149 | 1.2627 | 0.54350 | 1.0000 | 3.0000 |
| "# Phys/StdLooseKstar2Kpi" | 497 | 67936 | 136.69 | 111.37 | 1.0000 | 907.00 |
| "# Phys/StdLooseLambdaDD" | 390 | 2039 | 5.2282 | 4.7853 | 1.0000 | 36.000 |
| "# Phys/StdLooseLambdac2PKPi" | 63 | 156 | 2.4762 | 2.6954 | 1.0000 | 15.000 |
| "# Phys/StdLoosePhi2KK" | 487 | 11961 | 24.561 | 24.031 | 1.0000 | 179.00 |
| "# Phys/StdLooseRho0" | 190 | 664 | 3.4947 | 2.4446 | 2.0000 | 18.000 |
| "# Phys/StdMassConstrainedJpsi2MuMu" | 70 | 72 | 1.0286 | 0.16660 | 1.0000 | 2.0000 |
| "# Phys/StdTightDplus2PiPiPi" | 43 | 76 | 1.7674 | 1.4601 | 1.0000 | 9.0000 |
| "# Phys/StdTightPhi2KK" | 115 | 159 | 1.3826 | 0.71727 | 1.0000 | 4.0000 |
| "# Phys/StdVeryLooseDetachedKst2Kpi" | 431 | 5334 | 12.376 | 13.157 | 1.0000 | 92.000 |
| "# 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 |
|*"#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 |
......@@ -66,17 +69,24 @@ CountParticles SUCCESS Number of co
| "D-" | 2841 | 2841 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "D0" | 580 | 580 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "D~0" | 580 | 580 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "J/psi(1S)" | 6744 | 6744 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "J/psi(1S)" | 9602 | 9602 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "K*(892)0" | 45340 | 45340 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "K*(892)~0" | 44947 | 44947 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "KS0" | 10216 | 10216 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda0" | 1318 | 1318 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "KS0" | 9874 | 9874 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda0" | 1339 | 1339 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda_c+" | 67 | 67 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda_c~-" | 89 | 89 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda~0" | 1204 | 1204 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda~0" | 1235 | 1235 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "e+" | 3185 | 3185 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "e-" | 3185 | 3185 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "phi(1020)" | 12477 | 12477 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "rho(770)0" | 664 | 664 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
""", stdout, result, causes, signature_offset = 0, id='Particles')
| "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 |
""", stdout, result, causes,
signature_offset = 0, id='Particles')
countErrorLines({"FATAL":0})
</text></argument>
</extension>
<?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-merge-small-files.py</text></set></argument>
<arguement name="timeout"><integer>3600</integer></arguement>
<argument name="validator"><text>
myname="fsrs.davinci-merge-small-files"
import re
retstr=""
########################################
#check the produced file, and the stdout
########################################
f=open('../refs/merge-small-files.ref')
refblock=f.read().strip().split('\n')
f.close()
result_lines=[line for line in stdout.strip().split('\n') if (("FSRCleaner" in line or "MergeFSR" in line) and "ToolSvc." not in line)]
missing_lines=[line for line in refblock if line not in result_lines]
extra_lines=[line for line in result_lines if line not in refblock]
#################################################################
#Check that the merger lines are the same in reference and result
#################################################################
if (len(missing_lines)+ len(extra_lines))!=0:
causes.append('Stdout modifications (check reference files) ')
retstr=retstr+"\nStdout modifications:"
for line in missing_lines:
retstr=retstr+"\n\t - "+line
for line in extra_lines:
retstr=retstr+"\n\t + "+line
try:
f2=open('../refs/merge-small-files.ref.new',"w")
except IOError:
causes.append('could not open reference file')
if f2 is not None:
f2.write('\n'.join(result_lines))
f2.close()
#################################################################
#Check that the file size is as I expect
#################################################################
import os
size=-1
try:
size=os.path.getsize("merged.dst")
except OSError:
causes.append('Could not locate merged DST')
retstr=retstr+'\n'+'Could not locate merged DST'
if (size/1024/1024)>3.0:
causes.append('Merged DST size too large')
retstr=retstr+'\n\n'+'Merged DST size too large '+str(size/1024/1024) + " MB. Note that anything over 3.0 MB represents a serious problem. Don't just ignore it!"
#################################################################
#Check that the VMEM usage is as I expect
#################################################################
memory=-1
sum=None
try:
from XMLSummaryBase import summary
sum=summary.Summary()
sum.parse("summary.xml")
for child in sum.children("usage")[0].children():
if child.attrib()["useOf"]=="MemoryMaximum":
memory=child.value()
except ImportError:
causes.append('XMLsummary python error')
retstr=retstr+'\n'+"XMLSummary Summary class could not be imported"
except IOError:
causes.append('XMLsummary missing')
retstr=retstr+'\n'+"XMLSummary missing"
except IndexError:
causes.append('XMLsummary Memory Maximum missing')
retstr=retstr+'\n'+"XMLsummary Memory Maximum missing\n"+sum.xml()
if memory==-1:
causes.append('XMLsummary Memory Maximum missing')
retstr=retstr+'\n'+"XMLsummary Memory Maximum missing\n"+sum.xml()
if (memory/1024/1024)>1.2:
causes.append('VMem usage too high')
retstr=retstr+'\n\n'+'VMem usage too high, '+str(memory/1024/1024)+" GB. Note that anything over 1.2 GB represents a serious problem. Don't just ignore it!"
############################################
#Check file structure with CheckFSRs test
############################################
import commands
newresult=commands.getoutput("$APPCONFIGROOT/scripts/CheckFSRs.py merged.dst")
if "error" in newresult.lower() or "warning" in newresult.lower() or "merged and cleaned up correctly" not in newresult:
causes.append('CheckFSRs failure on merged file')
retstr=retstr+'\n\n'+'CheckFSRs failure on merged file \n'+newresult.replace('\n','\t\n')
if len(retstr):
result[myname]=result.Quote(retstr)
</text></argument>
</extension>
......@@ -9,11 +9,12 @@
findReferenceBlock("""
Tuple SUCCESS Number of counters : 4
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "# Phys/BetaSBd2JpsiKsDetachedLine" | 12 | 11 | 0.91667 | 0.27639 | 0.0000 | 1.0000 |
| "# input particles" | 100 | 11 | 0.11000 | 0.31289 | 0.0000 | 1.0000 |
|*"#accept" | 100 | 11 |( 11.0000 +- 3.12890 )%| ------- | ------- |
| "# 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 )%| ------- | ------- |
| "Event" | 100 | 100 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
""", stdout, result, causes, signature_offset = 0, id="Tuple")
""", stdout, result, causes,
signature_offset = 0, id="Tuple")
findReferenceBlock("""
EventTuple SUCCESS Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
......
......@@ -11,7 +11,7 @@ findReferenceBlock("""
StdLooseDiMuon SUCCESS Number of counters : 7
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "# J/psi(1S) -> mu+ mu- " | 200 | 397 | 1.9850 | 2.8609 | 0.0000 | 21.000 |
| "# Phys/StdAllLooseMuons" | 200 | 652 | 3.2600 | 2.3585 | 0.0000 | 13.000 |
| "# Phys/StdAllLooseMuons" | 188 | 652 | 3.4681 | 2.2794 | 1.0000 | 13.000 |
| "# input particles" | 200 | 652 | 3.2600 | 2.3585 | 0.0000 | 13.000 |
| "# mu+" | 200 | 314 | 1.5700 | 1.3766 | 0.0000 | 10.000 |
| "# mu-" | 200 | 338 | 1.6900 | 1.6655 | 0.0000 | 11.000 |
......
......@@ -10,21 +10,22 @@
findReferenceBlock("""
CountParticles SUCCESS Number of counters : 15
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "# /Event/Strip/Phys/StrippingK0S" | 7612 | 1499 | 0.19693 | 0.50455 | 0.0000 | 5.0000 |
| "# /Event/Strip/Phys/StrippingK0S_noPV" | 2388 | 3067 | 1.2843 | 1.8188 | 0.0000 | 18.000 |
| "# /Event/Strip/Phys/StrippingK0S_noPV_ws" | 2388 | 2681 | 1.1227 | 1.8293 | 0.0000 | 29.000 |
| "# /Event/Strip/Phys/StrippingK0S_ws" | 7612 | 1105 | 0.14517 | 0.44900 | 0.0000 | 5.0000 |
| "# /Event/Strip/Phys/StrippingKSAllGeoLineCombin| 7612 | 18648 | 2.4498 | 2.6708 | 0.0000 | 34.000 |
| "# /Event/Strip/Phys/StrippingLambda0" | 7612 | 3237 | 0.42525 | 0.79181 | 0.0000 | 9.0000 |
| "# /Event/Strip/Phys/StrippingLambda0_noPV" | 2388 | 2584 | 1.0821 | 1.6988 | 0.0000 | 17.000 |
| "# /Event/Strip/Phys/StrippingLambda0_noPV_ws" | 2388 | 2361 | 0.98869 | 1.7578 | 0.0000 | 31.000 |
| "# /Event/Strip/Phys/StrippingLambda0_ws" | 7612 | 2679 | 0.35194 | 0.71598 | 0.0000 | 8.0000 |
| "# /Event/Strip/Phys/StrippingLambdaAllGeoLineCo| 7612 | 13672 | 1.7961 | 2.1879 | 0.0000 | 21.000 |
| "# /Event/Strip/Phys/StrippingK0S" | 1216 | 1499 | 1.2327 | 0.56278 | 1.0000 | 5.0000 |
| "# /Event/Strip/Phys/StrippingK0S_noPV" | 1485 | 3067 | 2.0653 | 1.9253 | 1.0000 | 18.000 |
| "# /Event/Strip/Phys/StrippingK0S_noPV_ws" | 1315 | 2681 | 2.0388 | 2.0516 | 1.0000 | 29.000 |
| "# /Event/Strip/Phys/StrippingK0S_ws" | 883 | 1105 | 1.2514 | 0.59460 | 1.0000 | 5.0000 |
| "# /Event/Strip/Phys/StrippingKSAllGeoLineCombin| 6489 | 18648 | 2.8738 | 2.6738 | 1.0000 | 34.000 |
| "# /Event/Strip/Phys/StrippingLambda0" | 2281 | 3237 | 1.4191 | 0.82575 | 1.0000 | 9.0000 |
| "# /Event/Strip/Phys/StrippingLambda0_noPV" | 1262 | 2584 | 2.0475 | 1.8666 | 1.0000 | 17.000 |
| "# /Event/Strip/Phys/StrippingLambda0_noPV_ws" | 1179 | 2361 | 2.0025 | 2.0562 | 1.0000 | 31.000 |
| "# /Event/Strip/Phys/StrippingLambda0_ws" | 1952 | 2679 | 1.3724 | 0.77362 | 1.0000 | 8.0000 |
| "# /Event/Strip/Phys/StrippingLambdaAllGeoLineCo| 5459 | 13672 | 2.5045 | 2.2138 | 1.0000 | 21.000 |
| "# input particles" | 10000 | 51533 | 5.1533 | 5.7808 | 1.0000 | 82.000 |
|*"#accept" | 10000 | 10000 |( 100.000 +- 0.0100000)%| ------- | ------- |
| "KS0" | 27000 | 27000 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda0" | 12751 | 12751 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
| "Lambda~0" | 11782 | 11782 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
""", stdout, result, causes, signature_offset = 0, id = "Ks")
""", stdout, result, causes,
signature_offset = 0, id = "Ks")
</text></argument>
</extension>
......@@ -9,23 +9,23 @@
<argument name="validator"><text>
findReferenceBlock("""
BTaggingChecker INFO =======================================================
BTaggingChecker INFO Summary: EXCLUSIVE TAGGING PERFORMANCE
BTaggingChecker INFO Category EFF. Etag Wrong TF r w
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 1.6+-1.7 10+-2.2 30+-10 14 6
BTaggingChecker INFO 3 NNet 3.2+-2 6.6+-1.8 15+-10 11 2
BTaggingChecker INFO 4 NNet 2.3+-1.6 4.1+-1.4 12+-12 7 1
BTaggingChecker INFO 5 NNet 0.17+-0.56 1.5+-0.88 33+-27 2 1
BTaggingChecker INFO 2 NNet 2.1+-1.9 12+-2.3 29+-9.3 17 7
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 kaons 0.39+-0.88 17+-2.7 42+-8.6 19 14
BTaggingChecker INFO ** SS k/pi 2.9+-2.2 11+-2.2 24+-9.3 16 5
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 ---------------------------------------------------------
BTaggingChecker INFO Tagging efficiency = 42 +/- 3.5 %
BTaggingChecker INFO Wrong Tag fraction = 29 +/- 5.2 %
BTaggingChecker INFO EFFECTIVE COMB. TE = 7.4 +/- 3.2 % (Total events= 196)
BTaggingChecker INFO EFFECTIVE COMB. TE = 7.3 +/- 3.2 % (Total events= 196)
BTaggingChecker SUCCESS =========================================================
""", stdout, result, causes, signature_offset = 1)
countErrorLines({"FATAL":0})
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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