fixes #432

BCDA-APS · Sep 28, 2020 · 73a83ff · 73a83ff
1 parent 1711dca
commit 73a83ff
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 11 deletions.
diff --git a/apstools/diffractometer.py b/apstools/diffractometer.py
@@ -153,7 +153,34 @@ def wh(self, printing=True):
         """
         report the diffractometer settings
 
-        SPEC compatibility::
+        EXAMPLE::
+
+            In [1]: from apstools import diffractometer as APS_diffractometer
+
+            In [2]: sim4c = APS_diffractometer.SoftE4CV('', name='sim4c')
+
+            In [3]: sim4c.wh()
+            ===================== =========
+            term                  value
+            ===================== =========
+            diffractometer        sim4c
+            sample name           main
+            energy (keV)          0.80509
+            wavelength (angstrom) 1.54000
+            calc engine           hkl
+            mode                  bissector
+            h                     0.0
+            k                     0.0
+            l                     0.0
+            omega                 0
+            chi                   0
+            phi                   0
+            tth                   0
+            ===================== =========
+
+            Out[3]: <pyRestTable.rest_table.Table at 0x7f55c4775cd0>
+
+        compare with similar function in SPEC::
 
             1117.KAPPA> wh
             H K L =  0  0  1.7345
@@ -166,9 +193,11 @@ def wh(self, printing=True):
         table = pyRestTable.Table()
         table.labels = "term value".split()
         table.addRow(("diffractometer", self.name))
-        table.addRow(("mode", self.calc.engine.mode))
         table.addRow(("sample name", self.calc.sample.name))
-        table.addRow(("wavelength (angstrom)", self.calc.wavelength))
+        table.addRow(("energy (keV)", f"{self.calc.energy:.5f}"))
+        table.addRow(("wavelength (angstrom)", f"{self.calc.wavelength:.5f}"))
+        table.addRow(("calc engine", self.calc.engine.name))
+        table.addRow(("mode", self.calc.engine.mode))
 
         for k, v in self.calc.pseudo_axes.items():
             table.addRow((k, v))

diff --git a/tests/test_diffractometer.py b/tests/test_diffractometer.py
@@ -49,9 +49,11 @@ def test_sim4c_wh(self):
             "term                  value    ",
             "===================== =========",
             "diffractometer        sim4c    ",
-            "mode                  bissector",
             "sample name           main     ",
-            "wavelength (angstrom) 1.54     ",
+            "energy (keV)          0.80509  ",
+            "wavelength (angstrom) 1.54000  ",
+            "calc engine           hkl      ",
+            "mode                  bissector",
             "h                     0.0      ",
             "k                     0.0      ",
             "l                     0.0      ",
@@ -144,9 +146,11 @@ def test_sim6c_wh(self):
             "term                  value             ",
             "===================== ==================",
             "diffractometer        sim6c             ",
-            "mode                  bissector_vertical",
             "sample name           main              ",
-            "wavelength (angstrom) 1.54              ",
+            "energy (keV)          0.80509           ",
+            "wavelength (angstrom) 1.54000           ",
+            "calc engine           hkl               ",
+            "mode                  bissector_vertical",
             "h                     0.0               ",
             "k                     0.0               ",
             "l                     0.0               ",
@@ -191,9 +195,11 @@ def test_simk4c_wh(self):
             "term                  value    ",
             "===================== =========",
             "diffractometer        simk4c   ",
-            "mode                  bissector",
             "sample name           main     ",
-            "wavelength (angstrom) 1.54     ",
+            "energy (keV)          0.80509  ",
+            "wavelength (angstrom) 1.54000  ",
+            "calc engine           hkl      ",
+            "mode                  bissector",
             "h                     0.0      ",
             "k                     0.0      ",
             "l                     0.0      ",
@@ -234,9 +240,11 @@ def test_simk6c_wh(self):
             "term                  value             ",
             "===================== ==================",
             "diffractometer        simk6c            ",
-            "mode                  bissector_vertical",
             "sample name           main              ",
-            "wavelength (angstrom) 1.54              ",
+            "energy (keV)          0.80509           ",
+            "wavelength (angstrom) 1.54000           ",
+            "calc engine           hkl               ",
+            "mode                  bissector_vertical",
             "h                     0.0               ",
             "k                     0.0               ",
             "l                     0.0               ",