WIP: working through installing xy data

xraypy · Jul 2, 2024 · 1d41956 · 1d41956
1 parent 01c0544
commit 1d41956
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/larch/wxlib/columnframe.py b/larch/wxlib/columnframe.py
@@ -40,7 +40,7 @@
 YERR_OPS = ('Constant', 'Sqrt(Y)', 'Array')
 CONV_OPS  = ('Lorenztian', 'Gaussian')
 
-DATATYPES = ('raw', 'xas')
+DATATYPES = ('xydata', 'xas')
 ENUNITS_TYPES = ('eV', 'keV', 'degrees', 'not energy')
 
 
@@ -601,7 +601,7 @@ def __init__(self, parent, filename=None, groupname=None, config=None,
         self.array_labels = [l.lower() for l in group.array_labels]
 
         if self.workgroup.datatype is None:
-            self.workgroup.datatype = 'raw'
+            self.workgroup.datatype = 'xydata'
             en_units = 'not energy'
             for arrlab in self.array_labels[:3]:
                 arrlab  = arrlab.lower()
@@ -619,7 +619,7 @@ def __init__(self, parent, filename=None, groupname=None, config=None,
         if config is not None:
             self.config.update(config)
             dtype = config.get('datatype', None)
-            if dtype in ('xas', 'raw'):
+            if dtype in ('xas', 'xydata'):
                 self.workgroup.datatype = dtype
 
         if self.config['yarr2'] is None and 'i0' in self.array_labels:
@@ -1119,7 +1119,7 @@ def onOK(self, event=None):
             expr = self.expressions[aname]
             buff.append(f"{{group}}.{aname} = {expr}")
 
-        if getattr(self.workgroup, 'datatype', 'raw') == 'xas':
+        if getattr(self.workgroup, 'datatype', 'xytype') == 'xas':
             if self.reader == 'read_gsescan':
                 buff.append("{group}.xdat = {group}.x")
             buff.append("{group}.energy = {group}.xdat")
@@ -1214,7 +1214,7 @@ def onXSelect(self, evt=None):
         self.onUpdate()
 
         self.monod_val.Disable()
-        if self.datatype.GetStringSelection().strip().lower() == 'raw':
+        if self.datatype.GetStringSelection().strip().lower() == 'xydata':
             self.en_units.SetSelection(4)
         else:
             eguess = guess_energy_units(workgroup.xdat)
@@ -1240,7 +1240,7 @@ def set_energy_units(self):
             workgroup.xdat = 1.0*np.arange(npts)
         else:
             workgroup.xdat = 1.0*self.workgroup.data[ix, :]
-        if self.datatype.GetStringSelection().strip().lower() != 'raw':
+        if self.datatype.GetStringSelection().strip().lower() != 'xydata':
             eguess =  guess_energy_units(workgroup.xdat)
             if eguess.startswith('eV'):
                 self.en_units.SetStringSelection('eV')
@@ -1250,7 +1250,7 @@ def set_energy_units(self):
     def read_form(self, **kws):
         """return form configuration"""
         datatype = self.datatype.GetStringSelection().strip().lower()
-        if self.workgroup.datatype == 'raw' and datatype == 'xas':
+        if self.workgroup.datatype == 'xydata' and datatype == 'xas':
             self.workgroup.datatype = 'xas'
             eguess = guess_energy_units(self.workgroup.xdat)
             if eguess.startswith('keV'):
@@ -1260,7 +1260,7 @@ def read_form(self, **kws):
                 self.monod_val.Enable()
             else:
                 self.en_units.SetSelection(0)
-        if datatype == 'raw':
+        if datatype == 'xydata':
             self.en_units.SetStringSelection('not energy')
 
         ypop = self.ypop.GetStringSelection().strip()

diff --git a/larch/wxxas/xasgui.py b/larch/wxxas/xasgui.py
@@ -546,15 +546,20 @@ def get_nbpage(self, name):
         "get nb page by name"
         name = name.lower()
         out = 0
-        tabname = PANELS_MAP.get(name, None)
-        atab = LARIX_PANELS.get(tabname, None)
+        print("GET NB PAGE ", name, LARIX_PANELS.get(name, 'gg'))
+        if name not in LARIX_PANELS:
+            print("unknown panel : ", name)
+            return 0, self.nb.GetPage(0)
+
+        atab = LARIX_PANELS[name]
+        title = atab.title
         current_panels = self.get_panels()
-        if tabname not in current_panels:
-            self.add_analysis_panel(tabname)
-        print("GET NB PAGE A: ", name, current_panels)
-        i = current_panels.get(tabname, 0)
+        if title not in current_panels:
+            self.add_analysis_panel(name)
+        # print("GET NB PAGE A: ", name, current_panels)
+        i = current_panels.get(title, 0)
         page = self.nb.GetPage(i)
-        print('GET NB PAGE ', name, tabname, i, page)
+        # print('GET NB PAGE ', name,  title, i, page)
         return i, page
 
     def onNBChanged(self, event=None):
@@ -603,7 +608,7 @@ def ShowFile(self, evt=None, groupname=None, process=True,
         if dgroup is None:
             return
 
-        if (getattr(dgroup, 'datatype', 'raw').startswith('xa') and not
+        if (getattr(dgroup, 'datatype', 'xyda').startswith('xa') and not
             (hasattr(dgroup, 'norm') and hasattr(dgroup, 'e0'))):
             self.process_normalization(dgroup, force=True, use_form=False)
         if filename is None:
@@ -624,6 +629,7 @@ def ShowFile(self, evt=None, groupname=None, process=True,
         self.controller.group = dgroup
         self.controller.groupname = groupname
         cur_panel = self.nb.GetCurrentPage()
+        print("Got CUR PANEL  ", cur_panel)
         if process:
             cur_panel.fill_form(dgroup)
             cur_panel.skip_process = False
@@ -1790,8 +1796,8 @@ def install_group(self, groupname, filename=None, source=None, journal=None,
 
         self.controller.install_group(groupname, filename,
                                       source=source, journal=journal)
-        dtype = getattr(dgroup, 'datatype', 'raw')
-        startpage = 'xasnorm' if dtype == 'xas' else 'rawdata'
+        dtype = getattr(dgroup, 'datatype', 'xydata')
+        startpage = 'xasnorm' if dtype == 'xas' else 'xydata'
         ipage, pagepanel = self.get_nbpage(startpage)
         print("START PAGE ", dgroup, dtype, ipage, startpage, pagepanel)
         self.nb.SetSelection(ipage)