Commit c3b2940f authored by Martin Schorb's avatar Martin Schorb
Browse files

change deployment dir and finalize call

parent ea67f634
Pipeline #22543 failed with stage
in 23 seconds
......@@ -3,7 +3,7 @@
eval "$(/g/emcf/software/python/miniconda/bin/conda shell.bash hook)"
conda activate dash
dashpath=/g/emcf/schorb/code/volumealign/dash
dashpath=./dash
cd $dashpath
......
......@@ -110,7 +110,7 @@ def n5export_execute_gobutton(click,jsonfile):
out['logfile'] = ''
mkxml_p = launch_jobs.run(target='standalone',pyscript='filetypes/make_xml.py',
run_args=n5file+' '+str(res),target_args='')
run_args=n5file+' '+str(res))
params.processes[parent].extend(mkxml_p)
......
......@@ -8,7 +8,7 @@ def make_render_xml(path, scale_factors = 3 * [[2, 2, 2]], resolution = [0.05, 0
attrs = {'channel': {'id': None}}
attrs = validate_attributes(xml_path, attrs, setup_id=0,
enforce_consistency=False)
write_xml_metadata(xml_path, path, unit, resolution,
is_h5=False,
setup_id=0, timepoint=0,
......
......@@ -5,9 +5,10 @@ Created on Tue Nov 3 13:30:16 2020
@author: schorb
"""
import dash
import dash_core_components as dcc
import dash_html_components as html
from dash.exceptions import PreventUpdate
from dash.dependencies import Input,Output,State
......@@ -79,13 +80,16 @@ page.append(page3)
@app.callback([Output(module+'_input_dd', 'options'),
Output(module+'_input_dd', 'value')],
[Input(module+'_format_dd', 'value'),
Input({'component': 'store_r_launch', 'module': previous},'modified_timestamp')
Input({'component': 'store_r_launch', 'module': previous},'modified_timestamp'),
Input('url', 'pathname')
])
def finalize_volume_dd(dd_in,prev_in):
def finalize_volume_dd(dd_in,prev_in,url):
if not dash.callback_context.triggered:
raise PreventUpdate
expjson_list = glob.glob(os.path.join(params.json_run_dir,'*export_'+params.user+'*'))
print(os.path.join(params.json_run_dir,'*export_'+params.user+'*'))
dts = []
......
......@@ -13,18 +13,18 @@ import socket
#=============================================================
## Directory presets
json_template_dir = '/g/emcf/schorb/code/volumealign/JSON_parameters/templates'
json_template_dir = '/g/emcf/software/volumealign/JSON_parameters/templates'
json_run_dir = '/g/emcf/schorb/code/volumealign/JSON_parameters/runs'
json_run_dir = '/g/emcf/software/volumealign/JSON_parameters/runs'
json_match_dir = '/g/emcf/schorb/code/volumealign/JSON_parameters/MatchTrials'
json_match_dir = '/g/emcf/software/volumealign/JSON_parameters/MatchTrials'
render_log_dir = '/g/emcf/software/render-logs'
hotknife_dir = "/g/emcf/schorb/code/hot-knife"
# base directory for launchers etc...
workdir = '/g/emcf/schorb/code/volumealign/dash'
workdir = '/g/emcf/software/volumealign/dash'
# emails
......
......@@ -319,6 +319,7 @@ def run(target='standalone',pyscript='thispyscript',json='',run_args=None,target
if target=='standalone':
command += pyscript
command += ' '+json
command += run_args
print(command)
......
Markdown is supported
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