Skip to content
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

Jump to bottom

DEV: Changed skxray imports to correct (new) locations after re-org #67

Merged
merged 4 commits into from
Jul 22, 2015
Merged

DEV: Changed skxray imports to correct (new) locations after re-org #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb599c5
DEV: Changed skxray imports to correct (new) locations after re-org
giltis Jul 22, 2015
6560a0c
IMPORT MOD: Updated import statements for fitting models
giltis Jul 22, 2015
f2d17ea
IMPORT-MOD: Corrected Lorentzian2Model import to load from skxray not…
giltis Jul 22, 2015
79e0600
BUG: Corrected import statement for Lorentzian2Model..again
giltis Jul 22, 2015
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
13 changes: 7 additions & 6 deletions vt_config/NSLS-II/init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,16 @@ def get_modules():
'scipy.spatial',
'scipy.special',
'scipy.stats',
'skxray.calibration',
'skxray.correlation',
'skxray.core',
'skxray.recip',
'skxray.roi',
'skxray.core.arithmetic',
'skxray.core.calibration',
'skxray.core.correlation',
'skxray.core.utils',
'skxray.core.recip',
'skxray.core.roi',
'skxray.io.binary',
'skxray.io.save_powder_output',
'skxray.io.gsas_file_reader',
'skxray.api.diffraction',
'skxray.diffraction',
'vttools.to_wrap.fitting',
]

Expand Down
2 changes: 1 addition & 1 deletion vttools/scrape.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
from numpydoc.docscrape import FunctionDoc, ClassDoc
import numpy

from skxray.core import verbosedict
from skxray.core.utils import verbosedict
import abc

logger = logging.getLogger(__name__)
Expand Down
7 changes: 3 additions & 4 deletions vttools/to_wrap/fitting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@
# POSSIBILITY OF SUCH DAMAGE. #
########################################################################
import sys
from skxray.fitting.api import (QuadraticModel, GaussianModel,
LorentzianModel, Lorentzian2Model,
ExpressionModel)

from lmfit.models import (QuadraticModel, GaussianModel, LorentzianModel,
ExpressionModel)
from skxray.core.fitting.models import Lorentzian2Model
import logging
logger = logging.getLogger(__name__)

Expand Down