Skip to content

Commit

Permalink
fix: make imports work without optional pip dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
kmnhan committed Apr 3, 2024
1 parent 08a27f3 commit b8ac11d
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 50 deletions.
14 changes: 10 additions & 4 deletions src/erlab/analysis/fit/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,26 @@
]


import importlib

import lmfit
import numba
import numpy as np
import numpy.typing as npt
import scipy.ndimage
import xarray as xr
from arpes.fits import XModelMixin

if importlib.util.find_spec("arpes"):
from arpes.fits import XModelMixin
else:
from lmfit.models import Model as XModelMixin

from erlab.analysis.fit.functions import (
FermiEdge2dFunc,
MultiPeakFunction,
PolyFunc,
fermi_dirac_linbkg_broad,
step_linbkg_broad,
PolyFunc,
MultiPeakFunction,
FermiEdge2dFunc,
)


Expand Down
6 changes: 4 additions & 2 deletions src/erlab/analysis/gold.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
"resolution_roi",
]

import importlib
from collections.abc import Sequence

import arpes
import arpes.fits
import lmfit.model
import matplotlib
import matplotlib.figure
Expand All @@ -32,6 +31,9 @@
from erlab.analysis.utilities import correct_with_edge
from erlab.plotting.general import autoscale_to, figwh

if importlib.util.find_spec("arpes"):
import arpes.fits


def edge(
gold: xr.DataArray | xr.Dataset,
Expand Down
6 changes: 5 additions & 1 deletion src/erlab/interactive/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@

__all__ = ["goldtool", "itool", "ktool", "dtool"]

import importlib

from erlab.interactive.fermiedge import goldtool
from erlab.interactive.imagetool import itool
from erlab.interactive.kspace import ktool
from erlab.interactive.derivative import dtool

if importlib.util.find_spec("arpes"):
from erlab.interactive.derivative import dtool
43 changes: 0 additions & 43 deletions src/erlab/io/igor.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,46 +238,3 @@ def get_dim_name(index):

load_pxp = load_experiment
load_ibw = load_wave

# from arpes import load_pxt
# import igor.igorpy


# def load_pxp_old(filename, recursive=False, silent=False, **kwargs):
# expt = load_pxt.read_experiment(filename, **kwargs)
# waves = {}

# def process_wave(arr):
# arr = arr.where(arr != 0)
# for d in arr.dims:
# arr = arr.sortby(d)
# return arr

# def unpack_folders(expt):
# for e in expt:
# try:
# arr = process_wave(load_pxt.wave_to_xarray(e))
# waves[arr.name] = arr
# if not silent:
# print(arr.name)
# except AttributeError:
# pass
# if recursive and isinstance(e, igor.igorpy.Folder):
# unpack_folders(e)

# unpack_folders(expt)
# return waves


# def load_ibw_old(filename, data_dir: str | os.PathLike | None = None):
# try:
# filename = find_first_file(filename, data_dir=data_dir)
# except (ValueError, TypeError):
# if data_dir is not None:
# filename = os.path.join(data_dir, filename)

# class ibwfile_wave(object):
# def __init__(self, fname):
# self.wave = load_pxt.read_single_ibw(fname)

# return load_pxt.wave_to_xarray(igor.igorpy.Wave(ibwfile_wave(filename)))

0 comments on commit b8ac11d

Please sign in to comment.