From c011bfedbd447f9b3742f0eb8a81c5213c6660b4 Mon Sep 17 00:00:00 2001
From: Ivan Usov <ivan.usov@psi.ch>
Date: Mon, 31 Aug 2020 17:52:53 +0200
Subject: [PATCH] Add DataFactory implementation

---
 pyzebra/anatric.py           | 22 +++++++++++++++++++---
 pyzebra/app/panel_anatric.py | 22 ++++++++++++++++------
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/pyzebra/anatric.py b/pyzebra/anatric.py
index 5685f85..fde5ef0 100644
--- a/pyzebra/anatric.py
+++ b/pyzebra/anatric.py
@@ -3,6 +3,11 @@ import xml.etree.ElementTree as ET
 
 
 ANATRIC_PATH = "/afs/psi.ch/project/sinq/rhel7/bin/anatric"
+DATA_FACTORY_IMPLEMENTATION = (
+    "trics",
+    "morph",
+    "d10",
+)
 REFLECTION_PRINTER_FORMATS = (
     "rafin",
     "rafinf",
@@ -220,11 +225,22 @@ class AnatricConfig:
         self._tree.find("crystal").find("UB").text = value
 
     @property
-    def dist1(self):
+    def dataFactory_implementation(self):
+        return self._tree.find("DataFactory").attrib["implementation"]
+
+    @dataFactory_implementation.setter
+    def dataFactory_implementation(self, value):
+        if value not in DATA_FACTORY_IMPLEMENTATION:
+            raise ValueError("Unknown DataFactory implementation.")
+
+        self._tree.find("DataFactory").attrib["implementation"] = value
+
+    @property
+    def dataFactory_dist1(self):
         return self._tree.find("DataFactory").find("dist1").attrib["value"]
 
-    @dist1.setter
-    def dist1(self, value):
+    @dataFactory_dist1.setter
+    def dataFactory_dist1(self, value):
         self._tree.find("DataFactory").find("dist1").attrib["value"] = value
 
     @property
diff --git a/pyzebra/app/panel_anatric.py b/pyzebra/app/panel_anatric.py
index b4e1cb7..14d4f60 100644
--- a/pyzebra/app/panel_anatric.py
+++ b/pyzebra/app/panel_anatric.py
@@ -40,7 +40,8 @@ def create():
         zeroCHI_textinput.value = config.crystal_zeroCHI
         ub_textareainput.value = config.crystal_UB
 
-        dist1_textinput.value = config.dist1
+        dataFactory_implementation_select.value = config.dataFactory_implementation
+        dataFactory_dist1_textinput.value = config.dataFactory_dist1
         reflectionPrinter_format_select.value = config.reflectionPrinter_format
 
         set_active_widgets(config.algorithm)
@@ -186,11 +187,19 @@ def create():
     zeroCHI_textinput.on_change("value", zeroCHI_textinput_callback)
 
     # ---- DataFactory
-    def dist1_textinput_callback(_attr, _old, new):
-        config.dist1 = new
+    def dataFactory_implementation_select_callback(_attr, _old, new):
+        config.dataFactory_implementation = new
 
-    dist1_textinput = TextInput(title="Dist1:", width=290)
-    dist1_textinput.on_change("value", dist1_textinput_callback)
+    dataFactory_implementation_select = Select(
+        title="DataFactory implementation:", options=["trics", "morph", "d10",], width=300,
+    )
+    dataFactory_implementation_select.on_change("value", dataFactory_implementation_select_callback)
+
+    def dataFactory_dist1_textinput_callback(_attr, _old, new):
+        config.dataFactory_dist1 = new
+
+    dataFactory_dist1_textinput = TextInput(title="dist1:", width=290)
+    dataFactory_dist1_textinput.on_change("value", dataFactory_dist1_textinput_callback)
 
     # ---- BackgroundProcessor
 
@@ -370,7 +379,8 @@ def create():
             crystal_sample_textinput,
             row(lambda_textinput, zeroOM_textinput, zeroSTT_textinput, zeroCHI_textinput),
             ub_textareainput,
-            row(dist1_textinput, reflectionPrinter_format_select),
+            row(dataFactory_implementation_select, dataFactory_dist1_textinput),
+            reflectionPrinter_format_select,
             process_button,
         ),
         column(