Skip to content
Snippets Groups Projects
Commit 7842b27c authored by Rosen Matev's avatar Rosen Matev :sunny:
Browse files

Prevent race conditions in calo resolution tests

parent ab7f53bf
No related branches found
No related tags found
1 merge request!1807Update refs for LHCb!3226 and test cleanup
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 9 deletions
Hlt/Moore/tests/options/dst_input_and_conds_calo_res_pi0.py
+ 3
− 2
View file @ 7842b27c
......@@ -8,6 +8,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
import os
from Moore import options
options.evt_max = 100
......@@ -18,5 +19,5 @@ options.set_input_and_conds_from_testfiledb('Upgrade_Bd_pi+pi-pi0_LDST')
options.input_type = 'ROOT'
options.input_raw_format = 4.3
options.histo_file = 'histofile_calo_res_pi0.root'
options.ntuple_file = 'outputfile_calo_res_pi0.root'
options.histo_file = os.path.expandvars('histos_${QMTTEST_NAME}.root')
options.ntuple_file = os.path.expandvars('ntuple_${QMTTEST_NAME}.root')
Hlt/Moore/tests/options/xdigi_input_and_conds_calo_res_gamma.py
+ 3
− 2
View file @ 7842b27c
......@@ -8,6 +8,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
import os
from Moore import options
options.evt_max = 100
......@@ -19,5 +20,5 @@ options.input_type = 'ROOT'
from RecoConf.decoders import default_ft_decoding_version
default_ft_decoding_version.global_bind(value=6)
options.histo_file = 'histofile_calo_res_gamma.root'
options.ntuple_file = 'outputfile_calo_res_gamma.root'
options.histo_file = os.path.expandvars('histos_${QMTTEST_NAME}.root')
options.ntuple_file = os.path.expandvars('ntuple_${QMTTEST_NAME}.root')
Hlt/RecoConf/scripts/plot_CaloClusterResolution.py
+ 1
− 1
View file @ 7842b27c
......@@ -407,7 +407,7 @@ if __name__ == '__main__':
sys.exit(1)
# input ROOT tuple (optional, default is from the reco test which creates it)
nameFileIn = 'outputfile_calo_res_' + particle + '.root'
nameFileIn = 'ntuple_hlt2_reco_calo_resolution_' + particle + '.root'
if len(sys.argv) == 3:
nameFileIn = sys.argv[2]
......
Hlt/RecoConf/tests/refs/hlt2_reco_calo_resolution_gamma.ref
+ 1
− 1
View file @ 7842b27c
......@@ -18,7 +18,7 @@ TransportSvc SUCCESS GEOMETRY ERRORS: 'Codes' map has
TransportSvc INFO Reset the static pointer to DetDesc::IGeometyrErrorSvc
ToolSvc INFO Removing all tools created by ToolSvc
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=outputfile_calo_res_gamma.root, title=Gaudi Trees, option=CREATE
TFile: name=ntuple_hlt2_reco_calo_resolution_gamma.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
......
Hlt/RecoConf/tests/refs/hlt2_reco_calo_resolution_gamma.ref.x86_64_v3-opt
+ 1
− 1
View file @ 7842b27c
......@@ -20,7 +20,7 @@ ToolSvc INFO Removing all tools created by ToolSv
TrackBestTrackCreator.TrackMaste... SUCCESS #WARNINGS = 1 Message = 'Error in smooth function: non positive diagonal element in coveriance matrix'
TrackBestTrackCreator.TrackMaste... SUCCESS Exceptions/Errors/Warnings/Infos Statistics : 0/0/1/0
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=outputfile_calo_res_gamma.root, title=Gaudi Trees, option=CREATE
TFile: name=ntuple_hlt2_reco_calo_resolution_gamma.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
......
Hlt/RecoConf/tests/refs/hlt2_reco_calo_resolution_pi0.ref
+ 1
− 1
View file @ 7842b27c
......@@ -8,7 +8,7 @@ CaloHypoResolution-clusDef-pi0Def SUCCESS List of booked N-Tuples in directory
CaloHypoResolution-clusDef-pi0Def SUCCESS ID=pi0-clusDef-pi0DefTitle="pi0-clusDef-pi0Def" #items=25 {maxMatchFraction,energy,energyCluster,xCluster,yCluster,zCluster,energyClusterUnc}
ToolSvc INFO Removing all tools created by ToolSvc
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=outputfile_calo_res_pi0.root, title=Gaudi Trees, option=CREATE
TFile: name=ntuple_hlt2_reco_calo_resolution_pi0.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
......
Hlt/RecoConf/tests/refs/hlt2_reco_calo_resolution_pi0.ref.x86_64_v3-opt
+ 1
− 1
View file @ 7842b27c
......@@ -8,7 +8,7 @@ CaloHypoResolution-clusDef-pi0Def SUCCESS List of booked N-Tuples in directory
CaloHypoResolution-clusDef-pi0Def SUCCESS ID=pi0-clusDef-pi0DefTitle="pi0-clusDef-pi0Def" #items=25 {maxMatchFraction,energy,energyCluster,xCluster,yCluster,zCluster,energyClusterUnc}
ToolSvc INFO Removing all tools created by ToolSvc
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=outputfile_calo_res_pi0.root, title=Gaudi Trees, option=CREATE
TFile: name=ntuple_hlt2_reco_calo_resolution_pi0.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
......
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