Skip to content

bumps 1.1 reorganized the source tree #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pkienzle wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bumps 1.1 reorganized the source tree #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions molgroups/refl1d_interface/functionalprofile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 7 additions & 2 deletions molgroups/refl1d_interface/plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down