zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse data factory impl and printer formats vars

Browse Source
This commit is contained in:
usov_i 2020-08-31 18:12:17 +02:00
parent c011bfedbd
commit 3e256b1707
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pyzebra/anatric.py
View File

@ -3,12 +3,12 @@ import xml.etree.ElementTree as ET
ANATRIC_PATH = "/afs/psi.ch/project/sinq/rhel7/bin/anatric" ANATRIC_PATH = "/afs/psi.ch/project/sinq/rhel7/bin/anatric"
DATA_FACTORY_IMPLEMENTATION = ( DATA_FACTORY_IMPLEMENTATION = [
"trics", "trics",
"morph", "morph",
"d10", "d10",
) ]
REFLECTION_PRINTER_FORMATS = ( REFLECTION_PRINTER_FORMATS = [
"rafin", "rafin",
"rafinf", "rafinf",
"rafin2d", "rafin2d",
@ -19,9 +19,9 @@ REFLECTION_PRINTER_FORMATS = (
"jana2kf", "jana2kf",
"raw", "raw",
"oksana", "oksana",
) ]
ALGORITHMS = ("adaptivemaxcog", "adaptivedynamic") ALGORITHMS = ["adaptivemaxcog", "adaptivedynamic"]
def anatric(config_file): def anatric(config_file):

18
pyzebra/app/panel_anatric.py
View File

@ -17,6 +17,7 @@ from bokeh.models import (
) )
import pyzebra import pyzebra
from pyzebra.anatric import DATA_FACTORY_IMPLEMENTATION, REFLECTION_PRINTER_FORMATS
def create(): def create():
@ -191,7 +192,7 @@ def create():
config.dataFactory_implementation = new config.dataFactory_implementation = new
dataFactory_implementation_select = Select( dataFactory_implementation_select = Select(
title="DataFactory implementation:", options=["trics", "morph", "d10",], width=300, title="DataFactory implementation:", options=DATA_FACTORY_IMPLEMENTATION, width=300,
) )
dataFactory_implementation_select.on_change("value", dataFactory_implementation_select_callback) dataFactory_implementation_select.on_change("value", dataFactory_implementation_select_callback)
@ -210,20 +211,7 @@ def create():
config.reflectionPrinter_format = new config.reflectionPrinter_format = new
reflectionPrinter_format_select = Select( reflectionPrinter_format_select = Select(
title="ReflectionPrinter format:", title="ReflectionPrinter format:", options=REFLECTION_PRINTER_FORMATS, width=300,
options=[
"rafin",
"rafinf",
"rafin2d",
"rafin2di",
"orient",
"shelx",
"jana2k",
"jana2kf",
"raw",
"oksana",
],
width=300,
) )
reflectionPrinter_format_select.on_change("value", reflectionPrinter_format_select_callback) reflectionPrinter_format_select.on_change("value", reflectionPrinter_format_select_callback)