Skip to content
Snippets Groups Projects

Clean up & add unit tests

Merged Davide Fazzini requested to merge dfazzini_unit_tests_configuration into master
3 files
+ 17
32
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -13,7 +13,6 @@ import os, sys, importlib
from GaudiKernel.ProcessJobOptions import importOptions
from PyConf.Algorithms import (LoKi__HDRFilter as HDRFilter, LoKi__VoidFilter
as VoidFilter)
from DaVinci.configOptions import get_option_value
from DaVinci.optionChecker import DVImportError, log_click
@@ -28,7 +27,7 @@ def setup_algorithms(options):
- Dict of the algorithm instances to be run in the job.
- List of public tool instances to configure.
"""
opts = get_option_value(options, "main_options")
opts = options.main_options
publicTools = []
dvAlgs = {}
@@ -39,7 +38,7 @@ def setup_algorithms(options):
"INFO",
"No MainOptions specified. DaVinci will import no options file!")
userAlgName = get_option_value(options, 'user_algorithms')
userAlgName = options.user_algorithms
if not userAlgName:
log_click(
"WARNING",
@@ -156,7 +155,7 @@ def define_fsr_writer(options):
mergeGenfsr = GenFSRMerge(name="GenFSRMerge")
algs.append(mergeGenfsr)
outputLevel = get_option_value(options, "output_level")
outputLevel = options.output_level
if outputLevel == '':
outputLevel = INFO
@@ -252,8 +251,8 @@ def unpack_locations(options, unpack_only_mc):
"""
from GaudiConf import reading
process = get_option_value(options, "process")
stream = get_option_value(options, "stream")
process = options.process
stream = options.stream
unpack_raw_event = reading.unpack_rawevent(
bank_types=['ODIN', 'DstData', 'HltDecReports'],
@@ -296,8 +295,8 @@ def get_hlt_reports(options, source=''):
"""
from GaudiConf import reading
process = get_option_value(options, "process")
stream = get_option_value(options, "stream")
process = options.process
stream = options.stream
if source == 'Hlt2':
dec_reports = reading.hlt2_decisions(
Loading