Commit 7286b611 authored by doetschj's avatar doetschj
Browse files

bug fixes

parent ae0f8d7b
......@@ -77,14 +77,14 @@ Trigger:
# threshold : 100.0 # in miliVolt
classification:
spread_int : 1e-4
noise_vis : 'True'
noise_vis : True
noise_vis_interval : 60 # in seconds
Hr : 13 #hour from which to start processing
Min : 49 #min from which to start processing
Processing:
parallel_processing: 'True'
parallel_processing: True
number_workers : 5
vp : 2600.0 # velocity in m/s
vs : 2000.0 # velocity in m/s
......
......@@ -20,6 +20,7 @@ import pandas as pd
import matplotlib
matplotlib.use("Agg")
from matplotlib import pyplot as plt
import logging
# necesary for picker
import sys
......@@ -53,8 +54,6 @@ class Event(ObsPyEvent):
self.logger.info('Noise Visualisation at ' + str(t_start_plot)[11:-1] + ', processing started.')
def bandpass(self):
# bandpass filter using same parameters as for triggering
self.wf_stream.filter("bandpass", freqmin=self.prparam['bandpass_f_min'], freqmax=self.prparam['bandpass_f_max'])
......
......@@ -26,7 +26,7 @@ def processing(param):
logger = logging.getLogger('dug-seis')
logger.info('Starting trigger module')
tparam = param['Trigger']
if param['Processing']['parallel_processing'] == 'True':
if param['Processing']['parallel_processing']:
from dug_seis.processing.celery_tasks import event_processing_celery
os.system('redis-server > redis.log &')
os.system('celery -A dug_seis worker --loglevel=debug --concurrency=%i &> celery.log &' %param['Processing']['number_workers'])
......@@ -120,7 +120,7 @@ def processing(param):
event_processing(param, load_file, trig_time[l], event_id[l], classification[l], logger) # run processing for each event
# noise visualization
if tparam['noise_vis']=='True':
if tparam['noise_vis']:
if next_noise_vis == 0:
next_noise_vis = sta_copy.traces[0].stats["starttime"]+param['Trigger']['starttime']#start time of current file+starttime
while next_noise_vis < sta_copy.traces[0].stats["endtime"]:#end of current file:
......
......@@ -61,7 +61,7 @@ def call_event_table():
if os.path.isfile('events.csv'):
df = pd.read_csv('events.csv', header=None,
names=['Id', 'Date & Time', 'x', 'y', 'z', 'Mag', 'loc_rms', 'npicks'])
df['Date & Time'] = pd.to_datetime(df['Date & Time'])
#df['Date & Time'] = pd.to_datetime(df['Date & Time'])
#df.round(pd.Series([1, 0, 2], index=['Mag', 'y', 'z']))
return html.Div(children=event_table(df), id='table-container')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment