diff --git a/MooreOnlineConf/options/alignFT_input.py b/MooreOnlineConf/options/alignFT_input.py index 9e2ad0ad4e62003dc5d9afeac09e146070604050..5b492c243e0f0c808312a3ffeb6bd2c27e6be618 100644 --- a/MooreOnlineConf/options/alignFT_input.py +++ b/MooreOnlineConf/options/alignFT_input.py @@ -59,7 +59,6 @@ application.app.TopAlg.insert(0, application.updateAndReset) application.app.EvtSel = 'NONE' application.app.EvtMax = -1 application.app.StopOnSignal = False # = default -application.app.StalledEventMonitoring = False # = default EventLoopMgr().Warnings = False print('Setup complete....') diff --git a/MooreOnlineConf/options/align_analyzer.py b/MooreOnlineConf/options/align_analyzer.py index c1337445b848c8beaee25f5848ad3f116052e3de..0bff16064b55de065f492e976d8844f4a809004d 100644 --- a/MooreOnlineConf/options/align_analyzer.py +++ b/MooreOnlineConf/options/align_analyzer.py @@ -102,7 +102,6 @@ application.app.TopAlg.insert(0, application.updateAndReset) application.app.EvtSel = 'NONE' application.app.EvtMax = 1000 application.app.StopOnSignal = False # = default -application.app.StalledEventMonitoring = False # = default # TODO: add back once ResettingSink is merged # from Configurables import LHCb__Alignment__ResettingSink as ResettingSink # resettingSink = ResettingSink() diff --git a/MooreOnlineConf/options/align_analyzer_Tracker.py b/MooreOnlineConf/options/align_analyzer_Tracker.py index 27991d91ca51ef3b17a2e7576274f6346992c10f..6ef3668f3812ff5d2342f8bec6c356524a726169 100644 --- a/MooreOnlineConf/options/align_analyzer_Tracker.py +++ b/MooreOnlineConf/options/align_analyzer_Tracker.py @@ -96,7 +96,6 @@ application.app.TopAlg.insert(0, application.updateAndReset) application.app.EvtSel = 'NONE' application.app.EvtMax = 1000 application.app.StopOnSignal = False # = default -application.app.StalledEventMonitoring = False # = default # TODO: add back once ResettingSink is merged # from Configurables import LHCb__Alignment__ResettingSink as ResettingSink # resettingSink = ResettingSink() diff --git a/MooreOnlineConf/options/align_iterator.py b/MooreOnlineConf/options/align_iterator.py index 4de80e4ffa609e8f4143dc756fb98b48e7d24835..7c4832048487337741bed1c2d8a0e6dd3dc812bd 100644 --- a/MooreOnlineConf/options/align_iterator.py +++ b/MooreOnlineConf/options/align_iterator.py @@ -30,7 +30,6 @@ application.config.enableContinue = True application.app.EvtSel = 'NONE' application.app.EvtMax = -1 application.app.StopOnSignal = False # = default -application.app.StalledEventMonitoring = False # = default online_options = alignment_options(OnlineEnv) diff --git a/MooreOnlineConf/options/calo.py b/MooreOnlineConf/options/calo.py index 5bae7224ff7d04eff99faa74872013773beb2b4d..c559864ec68f83b461cf3f2590fb06fe851a0f49 100644 --- a/MooreOnlineConf/options/calo.py +++ b/MooreOnlineConf/options/calo.py @@ -45,9 +45,8 @@ def calo_moni(): adcFilterEcal=-100, adcFilterHcal=-100, HistoMultiplicityMaxEcal=6000, - HistoMultiplicityMaxHCal=4000, - spectrum=False) - data += monitor_calo_clusters(calo, split_clusters=False) + HistoMultiplicityMaxHcal=4000) + data += monitor_calo_clusters(ecalClusters, split_clusters=None) data += monitor_calo_time_alignment( calo, adcFilterEcal=-100, adcFilterHcal=-100) data += monitor_calo_pedestal(calo, adcFilterEcal=-100, adcFilterHcal=-100) diff --git a/MooreOnlineConf/options/velo.py b/MooreOnlineConf/options/velo.py index 6b920824249b46c16f8afcb6c5867921b186c5b0..c0298f155a1997241d95187744436bc0d6dc4de7 100644 --- a/MooreOnlineConf/options/velo.py +++ b/MooreOnlineConf/options/velo.py @@ -19,7 +19,7 @@ from PyConf.Algorithms import VoidFilter, HltDecReportsDecoder from PyConf.control_flow import CompositeNode, NodeLogic from PyConf.utilities import DISABLE_TOOL from Moore import options -from Recoconf.config import Reconstruction, run_reconstruction +from RecoConf.config import Reconstruction, run_reconstruction from RecoConf.standalone import reco_prefilters from RecoConf.legacy_rec_hlt1_tracking import make_RetinaClusters, make_PatPV3DFuture_pvs, make_velo_full_clusters, get_default_ut_clusters from RecoConf.legacy_rec_hlt1_tracking import get_global_clusters_on_track_tool_only_velo @@ -48,7 +48,7 @@ def get_my_track_master_fitter(): def myDefRawEvent(banks): - return default_raw_event(["VPRetinaCluster"]) + return default_raw_event("VPRetinaCluster") velo_clusters_algorithm_light = make_RetinaClusters @@ -209,7 +209,7 @@ def VPDQTrackNode(eventFilter="BeamCrossing"): name="VPDQMonitors{0}".format(eventFilter), allow_duplicate_instances_with_distinct_names=True, ClusterLocation=velo_clusters_full, - RawEventLocation=default_raw_event(["VPRetinaCluster"])) + RawEventLocation=default_raw_event("VPRetinaCluster")) data += [DQ_monitor] if eventFilter == "NoBeam":