diff --git a/Hlt/RecoConf/python/RecoConf/rich_data_monitoring.py b/Hlt/RecoConf/python/RecoConf/rich_data_monitoring.py index 355654a9acfd2692764bbb3210553c391b44c66e..b528691c99399486a1fee4e3dd243cfeba24a20c 100644 --- a/Hlt/RecoConf/python/RecoConf/rich_data_monitoring.py +++ b/Hlt/RecoConf/python/RecoConf/rich_data_monitoring.py @@ -11,6 +11,7 @@ from Configurables import NTupleSvc from GaudiKernel.SystemOfUnits import GeV +from Moore import options from PyConf import configurable from PyConf.Algorithms import ( Rich__Future__MC__DummyTrackToMCParticleRelations as DummyTkToMCPRels, @@ -638,9 +639,15 @@ def make_rich_track_monitors( key = "PIDTuple" if key in monitors and moni_opts["EnablePIDTuple"]: # NTupleSvc - lun = "RICHPIDTUPLEDATA" + track_name.upper() - ntuple = track_name + ".Data-PIDTuple.root" - NTupleSvc().Output += [lun + " DATAFILE='" + ntuple + "' TYP='ROOT' OPT='NEW'"] + if len(options.ntuple_file) > 0: + # Use the centrally defined ntuple output file + lun = options.ntuple_lun + else: + lun = "RICHPIDTUPLEDATA" + track_name.upper() + ntuple = track_name + ".Data-PIDTuple.root" + NTupleSvc().Output += [ + lun + " DATAFILE='" + ntuple + "' TYP='ROOT' OPT='NEW'" + ] # Momentum cuts (min,max) pCutsPID = moni_opts["MomCutsForTuple"] # Make a PID monitor for this selection diff --git a/Hlt/RecoConf/python/RecoConf/rich_mc_checking.py b/Hlt/RecoConf/python/RecoConf/rich_mc_checking.py index 63682e8819794e32dbd2de5300c10dd9f09a1718..9fb2ab2994ddfe5bcacd1b9997cee48d7b20a3a3 100644 --- a/Hlt/RecoConf/python/RecoConf/rich_mc_checking.py +++ b/Hlt/RecoConf/python/RecoConf/rich_mc_checking.py @@ -11,6 +11,7 @@ from Configurables import NTupleSvc from GaudiKernel.SystemOfUnits import GeV +from Moore import options from PyConf import configurable from PyConf.Algorithms import ( Rich__Future__MC__TrackToMCParticleRelations as TkToMCPRels, @@ -355,9 +356,15 @@ def make_rich_checkers(conf, reco_opts, check_opts, moni_set="Standard"): key = "PIDTuple" if key in checkers and check_opts["EnablePIDTuple"]: # NTupleSvc - lun = "RICHPIDTUPLEMC" + track_name.upper() - ntuple = track_name + ".MC-PIDTuple.root" - NTupleSvc().Output += [lun + " DATAFILE='" + ntuple + "' TYP='ROOT' OPT='NEW'"] + if len(options.ntuple_file) > 0: + # Use the centrally defined ntuple output file + lun = options.ntuple_lun + else: + lun = "RICHPIDTUPLEMC" + track_name.upper() + ntuple = track_name + ".MC-PIDTuple.root" + NTupleSvc().Output += [ + lun + " DATAFILE='" + ntuple + "' TYP='ROOT' OPT='NEW'" + ] # Momentum cuts (min,max) pCutsPID = check_opts["MomCutsForTuple"] # Make a PID monitor for this selection