From 7ccd9140a1ee45f5910fccd97631bff546121f9f Mon Sep 17 00:00:00 2001 From: Paul Kienzle Date: Fri, 8 May 2026 19:27:03 -0400 Subject: [PATCH] bumps 1.1 reorganized the source tree --- molgroups/refl1d_interface/functionalprofile.py | 8 ++++++-- molgroups/refl1d_interface/plots.py | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/molgroups/refl1d_interface/functionalprofile.py b/molgroups/refl1d_interface/functionalprofile.py index de6009a..b920398 100644 --- a/molgroups/refl1d_interface/functionalprofile.py +++ b/molgroups/refl1d_interface/functionalprofile.py @@ -18,8 +18,12 @@ from ..mol import nSLDObj from bumps.dream.state import MCMCDraw -from bumps.webview.server.custom_plot import CustomWebviewPlot -from refl1d.webview.server.colors import COLORS +try: + from bumps.plots.custom_plot import CustomWebviewPlot + from bumps.plots.colors import COLORS +except ImportError: # CRUFT: bumps pre-1.1 + from bumps.webview.server.custom_plot import CustomWebviewPlot + from bumps.webview.server.colors import COLORS from refl1d.names import Slab, Stack, SLD, Experiment, FitProblem from refl1d.sample.flayer import FunctionalProfile diff --git a/molgroups/refl1d_interface/plots.py b/molgroups/refl1d_interface/plots.py index 1991574..a6d42b7 100644 --- a/molgroups/refl1d_interface/plots.py +++ b/molgroups/refl1d_interface/plots.py @@ -13,10 +13,15 @@ from bumps.dream.state import MCMCDraw from bumps.dream.stats import credible_interval -from bumps.webview.server.custom_plot import CustomWebviewPlot from bumps.plotutil import form_quantiles +try: + from bumps.plots.custom_plot import CustomWebviewPlot + from bumps.plots.colors import COLORS +except ImportError: # CRUFT: bumps pre-1.1 + from bumps.webview.server.custom_plot import CustomWebviewPlot + from bumps.webview.server.colors import COLORS + from refl1d.names import FitProblem, Experiment -from refl1d.webview.server.colors import COLORS from .layers import MolgroupsLayer