From f52a95695f61bbb24399ed3290e834097d6dae30 Mon Sep 17 00:00:00 2001 From: Felipe Machado Date: Tue, 29 Jan 2019 12:08:22 -0200 Subject: [PATCH] QL update (#308) * ql update * poining to master commit * Changes in 'FIBER_MAGS' plots * fixing checkarc checkflat and xwsigma * change axis orientation * fixing global fiber offset * QL update * desispec update 0.27.1 --- backend/desispec | 2 +- backend/framework/qlf/ui_channel/qlf_state.py | 8 ++++++-- backend/framework/qlf/ui_channel/upstream.py | 14 +++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/backend/desispec b/backend/desispec index 5cd44528..10d1c39a 160000 --- a/backend/desispec +++ b/backend/desispec @@ -1 +1 @@ -Subproject commit 5cd445286dcc64316648de23404c562c02f21336 +Subproject commit 10d1c39ad4d8c479db8f3310aba83d41f9bb6b19 diff --git a/backend/framework/qlf/ui_channel/qlf_state.py b/backend/framework/qlf/ui_channel/qlf_state.py index 8367459e..95b7a5f6 100644 --- a/backend/framework/qlf/ui_channel/qlf_state.py +++ b/backend/framework/qlf/ui_channel/qlf_state.py @@ -8,6 +8,7 @@ import logging from log import get_logger import datetime +import time desi_spectro_redux = os.environ.get('DESI_SPECTRO_REDUX') qlf_root = os.environ.get('QLF_ROOT') @@ -33,7 +34,8 @@ def load_flavors(self): flavors = ['science', 'arc', 'flat'] self.flavor_stages = dict() for flavor in flavors: - flavor_path = os.path.join(qlf_root, "framework", "ql_mapping", "{}.json".format(flavor)) + flavor_path = os.path.join( + qlf_root, "framework", "ql_mapping", "{}.json".format(flavor)) try: stages_json = open(flavor_path).read() self.flavor_stages[flavor] = json.loads(stages_json) @@ -96,6 +98,7 @@ def update_pipeline_status(self): if self.pipeline_running is 1 and qlf.is_running(): self.camera_logs = dict() + time.sleep(0.5) self.camera_status_generator.reset_camera_status() self.pipeline_running = 0 if not qlf.get_status() else 2 @@ -236,4 +239,5 @@ def update_camera_logs(self): desi_spectro_redux, job.logname ) - self.camera_logs[camera.camera] = self.get_camera_log(camera_log_path) + self.camera_logs[camera.camera] = self.get_camera_log( + camera_log_path) diff --git a/backend/framework/qlf/ui_channel/upstream.py b/backend/framework/qlf/ui_channel/upstream.py index 7360bde6..3e9bdc72 100644 --- a/backend/framework/qlf/ui_channel/upstream.py +++ b/backend/framework/qlf/ui_channel/upstream.py @@ -35,6 +35,7 @@ class Upstream: def __init__(self, qlf_state): self.startedUpStreamJob = False self.qlf_state = qlf_state + self.updating = False def start_daemon(self): qlf.start() @@ -51,12 +52,15 @@ def pipeline_message(self, message): logger_pipeline.info(message) def monitor_job(self): - state = self.qlf_state.get_monitor_state() + if not self.updating: + self.updating = True + state = self.qlf_state.get_monitor_state() - if state is not None: - Group("monitor").send({ - "text": state - }) + if state is not None: + Group("monitor").send({ + "text": state + }) + self.updating = False def disk_space_job(self): Group("monitor").send({