From ed6a867866ed70a351ee260a9936b44321d65925 Mon Sep 17 00:00:00 2001 From: Sean Dobbs Date: Thu, 4 Jan 2018 13:34:07 -0500 Subject: [PATCH 1/2] Modify beam energy calculation --- python/update_epics.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/update_epics.py b/python/update_epics.py index 2ebb319..71b9496 100644 --- a/python/update_epics.py +++ b/python/update_epics.py @@ -135,7 +135,7 @@ def update_beam_conditions(run, log): continue key = tokens[0] value = tokens[2] # average value - if key == "HALLD:pX": + if key == "HALLD:p": conditions["beam_energy"] = float(value) except Exception as e: @@ -150,7 +150,7 @@ def setup_run_conds(run): # Build mapping of conditions to add to the RCDB, key is name of condition conditions = {} - # Beam energy - HALLD:pX gives the corrected measured beam energy + # Beam energy - HALLD:p gives the measured beam energy # - MMSHLDE gives beam energy from model try: conditions["beam_energy"] = float(caget("HALLD:p")) From 435a39548f455971d97d27cbf0287af06be95674 Mon Sep 17 00:00:00 2001 From: Sean Dobbs Date: Fri, 9 Aug 2019 12:32:56 -0400 Subject: [PATCH 2/2] Update DIRC run searches --- python/rcdb/alias.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python/rcdb/alias.py b/python/rcdb/alias.py index f5ed3d0..3a438c1 100644 --- a/python/rcdb/alias.py +++ b/python/rcdb/alias.py @@ -25,7 +25,12 @@ def __init__(self, name, expression, comment): collimator_diameter != 'Blocking'""", "Is PrimEx production run"), - ConditionSearchAlias('is_dirc_production', "daq_config in ['FCAL_BCAL_PS_DIRC_m9.conf', 'FCAL_BCAL_PS_DIRC_m10.conf'] ", "Is DIRC production run"), + ConditionSearchAlias('is_dirc_production', """daq_run == 'PHYSICS_DIRC' and + beam_current > 2 and + event_count > 5000000 and + solenoid_current > 100 and + collimator_diameter != 'Blocking'""", + "Is DIRC production run"), ConditionSearchAlias('is_production_long', """daq_run == 'PHYSICS_raw' beam_current > 2 and