Merge pull request #390 from ZLLentz/enh_xpp_calc_ns

ENH: XPP calc namespace hotfix

conda-recipe/meta.yaml

@@ -32,7 +32,7 @@ requirements:
   - lightpath >=1.0.1
   - matplotlib-base >=3.4.0
   - nabs >=1.5.0
-  - pcdscalc >=0.3.0
+  - pcdscalc >=0.6.0
   - pcdsdaq >=2.3.0
   - pcdsdevices >=7.0.0
   - pcdsutils >=0.6.0

docs/source/upcoming_release_notes/390-enh_xpp_calc_ns.rst

@@ -0,0 +1,29 @@
+390 enh_xpp_calc_ns
+###################
+
+API Changes
+-----------
+- N/A
+
+Features
+--------
+- Add ``pcdscalc.xray`` to the calc namespace.
+- Add top-level shortcuts to some of the most used calcs,
+  ``E2lam``, ``lam2E``, ``bragg_angle``, ``darwin_width``,
+  and ``transmission``.
+  ``E2lam`` is an alias for ``energy_to_wavelength`` and
+  ``lam2E`` is an alias for ``wavelength_to_energy``
+  to match scientist expectations.
+
+Bugfixes
+--------
+- N/A
+
+Maintenance
+-----------
+- N/A
+
+Contributors
+------------
+- vespos
+- zllentz

hutch_python/calc_defaults.py

@@ -1,5 +1,9 @@
 from importlib import import_module
 
+from pcdscalc.common import energy_to_wavelength, wavelength_to_energy
+from pcdscalc.diffraction import bragg_angle, darwin_width
+from pcdscalc.xray import transmission
+
 from .utils import HelpfulNamespace
 
 
@@ -33,7 +37,13 @@ def collect_functions(modules):
 
 
 calc_namespace = HelpfulNamespace(
+    E2lam=energy_to_wavelength,
+    lam2E=wavelength_to_energy,
+    bragg_angle=bragg_angle,
+    darwin_width=darwin_width,
+    transmission=transmission,
     be_lens=collect_functions(['pcdscalc.be_lens_calcs']),
     common=collect_functions(['pcdscalc.common']),
     diffraction=collect_functions(['pcdscalc.diffraction']),
+    xray=collect_functions(['pcdscalc.xray']),
 )

requirements.txt

@@ -8,7 +8,7 @@ jinja2>=2.11.0
 lightpath>=1.0.1
 matplotlib>=3.4.0
 nabs>=1.5.0
-pcdscalc>=0.3.0
+pcdscalc>=0.6.0
 pcdsdaq>=2.3.0
 pcdsdevices>=7.0.0
 pcdsutils>=0.5.0