Changeset b699768 in sasview for src


Ignore:
Timestamp:
Feb 19, 2016 8:07:22 AM (8 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
d7bb526
Parents:
792e6be
Message:

Initial commit of the refactored SasCalc? module.

Location:
src
Files:
6 added
48 edited
58 moved

Legend:

Unmodified
Added
Removed
  • src/examples/test_panel2D.py

    r3a39c2e rb699768  
    200200            path = dlg.GetPath() 
    201201            mypath = os.path.basename(path) 
    202             from sas.dataloader.loader import  Loader 
     202            from sas.sascalc.dataloader.loader import  Loader 
    203203            
    204204            #Instantiate a loader  
  • src/sas/guiframe/CategoryInstaller.py

    rfd5ac0d rb699768  
    3333        returns the dir where installed_models.txt should be 
    3434        """ 
    35         import sas.dataloader.readers 
    36         return sas.dataloader.readers.get_data_path() 
     35        import sas.sascalc.dataloader.readers 
     36        return sas.sascalc.dataloader.readers.get_data_path() 
    3737 
    3838    @staticmethod 
  • src/sas/guiframe/dataFitting.py

    r79492222 rb699768  
    55import numpy 
    66import math 
    7 from sas.data_util.uncertainty import Uncertainty 
     7from sas.sascalc.data_util.uncertainty import Uncertainty 
    88from sas.plottools.plottables import Data1D as PlotData1D 
    99from sas.plottools.plottables import Data2D as PlotData2D 
    1010from sas.plottools.plottables import Theory1D as PlotTheory1D 
    1111 
    12 from sas.dataloader.data_info import Data1D as LoadData1D 
    13 from sas.dataloader.data_info import Data2D as LoadData2D 
     12from sas.sascalc.dataloader.data_info import Data1D as LoadData1D 
     13from sas.sascalc.dataloader.data_info import Data2D as LoadData2D 
    1414 
    1515 
  • src/sas/guiframe/data_manager.py

    r79492222 rb699768  
    2121from sas.guiframe.data_state import DataState 
    2222from sas.guiframe.utils import parse_name 
    23 import sas.dataloader.data_info as DataInfo 
     23import sas.sascalc.dataloader.data_info as DataInfo 
    2424from sas.guiframe.dataFitting import Data1D 
    2525from sas.guiframe.dataFitting import Data2D 
  • src/sas/guiframe/data_panel.py

    r3a5f7c8 rb699768  
    3434from sas.guiframe.gui_style import GUIFRAME 
    3535from sas.guiframe.events import NewBatchEvent 
    36 from sas.dataloader.loader import Loader 
     36from sas.sascalc.dataloader.loader import Loader 
    3737#from sas.guiframe.local_perspectives.plotting.masking \ 
    3838#    import FloatPanel as QucikPlotDialog 
  • src/sas/guiframe/gui_manager.py

    r225aca8 rb699768  
    4545from sas.guiframe.events import EVT_NEW_BATCH 
    4646from sas.guiframe.CategoryManager import CategoryManager 
    47 from sas.dataloader.loader import Loader 
     47from sas.sascalc.dataloader.loader import Loader 
    4848from sas.guiframe.proxy import Connection 
    4949from matplotlib import _pylab_helpers 
  • src/sas/guiframe/local_perspectives/data_loader/data_loader.py

    rf21d496 rb699768  
    88import logging 
    99 
    10 from sas.dataloader.loader import Loader 
     10from sas.sascalc.dataloader.loader import Loader 
    1111from sas.guiframe.plugin_base import PluginBase 
    1212from sas.guiframe.events import StatusEvent 
  • src/sas/guiframe/local_perspectives/data_loader/load_thread.py

    rb9dbd6b rb699768  
    66import os 
    77 
    8 from sas.data_util.calcthread import CalcThread 
     8from sas.sascalc.data_util.calcthread import CalcThread 
    99 
    1010 
  • src/sas/guiframe/local_perspectives/plotting/AnnulusSlicer.py

    r824e488 rb699768  
    125125            return 
    126126 
    127         from sas.dataloader.manipulations import Ring 
     127        from sas.sascalc.dataloader.manipulations import Ring 
    128128        rmin = min(math.fabs(self.inner_circle.get_radius()), 
    129129                   math.fabs(self.outer_circle.get_radius())) 
     
    524524            return 
    525525        mask = data.mask 
    526         from sas.dataloader.manipulations import Ringcut 
     526        from sas.sascalc.dataloader.manipulations import Ringcut 
    527527 
    528528        rmin = 0 
  • src/sas/guiframe/local_perspectives/plotting/AzimutSlicer.py

    r824e488 rb699768  
    150150        # print "phimin, phimax, rmin ,rmax",math.degrees(phimin), 
    151151        # math.degrees(phimax), rmin ,rmax 
    152         # from sas.dataloader.manipulations import SectorQ 
     152        # from sas.sascalc.dataloader.manipulations import SectorQ 
    153153 
    154154        sect = new_sector(r_min=rmin, r_max=rmax, 
     
    261261        """ 
    262262        """ 
    263         from sas.dataloader.manipulations import SectorQ 
     263        from sas.sascalc.dataloader.manipulations import SectorQ 
    264264        self.post_data(SectorQ) 
    265265 
     
    278278        """ 
    279279        """ 
    280         from sas.dataloader.manipulations import SectorPhi 
     280        from sas.sascalc.dataloader.manipulations import SectorPhi 
    281281        self.post_data(SectorPhi) 
    282282 
  • src/sas/guiframe/local_perspectives/plotting/Plotter2D.py

    r6f16e25 rb699768  
    571571        npt = math.sqrt(len(self.data2D.data[numpy.isfinite(self.data2D.data)])) 
    572572        npt = math.floor(npt) 
    573         from sas.dataloader.manipulations import CircularAverage 
     573        from sas.sascalc.dataloader.manipulations import CircularAverage 
    574574        ## compute the maximum radius of data2D 
    575575        self.qmax = max(math.fabs(self.data2D.xmax), 
  • src/sas/guiframe/local_perspectives/plotting/SectorSlicer.py

    rb40ad40 rb699768  
    147147            return 
    148148        ## Averaging 
    149         from sas.dataloader.manipulations import SectorQ 
     149        from sas.sascalc.dataloader.manipulations import SectorQ 
    150150        radius = self.qmax 
    151151        phimin = -self.left_line.phi + self.main_line.theta 
  • src/sas/guiframe/local_perspectives/plotting/boxMask.py

    rb5de88e rb699768  
    142142        contained in that region and the error on that sum 
    143143        """ 
    144         from sas.dataloader.manipulations import Boxcut 
     144        from sas.sascalc.dataloader.manipulations import Boxcut 
    145145        # # Data 2D for which the pixel will be summed 
    146146        data = self.base.data 
  • src/sas/guiframe/local_perspectives/plotting/boxSlicer.py

    rb5de88e rb699768  
    519519        Post data creating by averaging in Qx direction 
    520520        """ 
    521         from sas.dataloader.manipulations import SlabX 
     521        from sas.sascalc.dataloader.manipulations import SlabX 
    522522        self.post_data(SlabX, direction="X") 
    523523 
     
    536536        Post data creating by averaging in Qy direction 
    537537        """ 
    538         from sas.dataloader.manipulations import SlabY 
     538        from sas.sascalc.dataloader.manipulations import SlabY 
    539539        self.post_data(SlabY, direction="Y") 
    540540 
  • src/sas/guiframe/local_perspectives/plotting/boxSum.py

    rb5de88e rb699768  
    180180        y_max = self.vertical_lines.y1 
    181181        # #computation of the sum and its error 
    182         from sas.dataloader.manipulations import Boxavg 
     182        from sas.sascalc.dataloader.manipulations import Boxavg 
    183183        box = Boxavg(x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max) 
    184184        self.count, self.error = box(self.base.data2D) 
    185185        # Dig out number of points summed, SMK & PDB, 04/03/2013 
    186         from sas.dataloader.manipulations import Boxsum 
     186        from sas.sascalc.dataloader.manipulations import Boxsum 
    187187        boxtotal = Boxsum(x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max) 
    188188        self.total, self.totalerror, self.points = boxtotal(self.base.data2D) 
  • src/sas/guiframe/local_perspectives/plotting/masking.py

    rc039589 rb699768  
    5252    FONT_VARIANT = 1 
    5353 
    54 from sas.data_util.calcthread import CalcThread 
     54from sas.sascalc.data_util.calcthread import CalcThread 
    5555 
    5656class CalcPlot(CalcThread): 
  • src/sas/guiframe/local_perspectives/plotting/sector_mask.py

    rc039589 rb699768  
    120120            return 
    121121        ## Averaging 
    122         from sas.dataloader.manipulations import Sectorcut 
     122        from sas.sascalc.dataloader.manipulations import Sectorcut 
    123123        phimin = -self.left_line.phi + self.main_line.theta 
    124124        phimax = self.left_line.phi + self.main_line.theta 
  • src/sas/models/smearing_2d.py

    rfd5ac0d rb699768  
    240240    dz = numpy.sqrt(z) 
    241241     
    242     from sas.dataloader import Data2D 
     242    from sas.sascalc.dataloader import Data2D 
    243243    #for i in range(10): print i, 0.001 + i*0.008/9.0  
    244244    #for i in range(100): print i, int(math.floor( (i/ (100/9.0)) ))  
  • src/sas/perspectives/calculator/collimation_editor.py

    r49ab5d7 rb699768  
    44import sys 
    55from copy import deepcopy 
    6 from sas.dataloader.loader import Loader 
    7 from sas.dataloader.data_info import Aperture, Collimation 
     6from sas.sascalc.dataloader.loader import Loader 
     7from sas.sascalc.dataloader.data_info import Aperture, Collimation 
    88from aperture_editor import ApertureDialog 
    99 
  • src/sas/perspectives/calculator/console.py

    r49ab5d7 rb699768  
    44import wx 
    55import sys 
    6 from sas.dataloader.loader import Loader 
     6from sas.sascalc.dataloader.loader import Loader 
    77 
    88_BOX_WIDTH = 60 
  • src/sas/perspectives/calculator/data_editor.py

    rac7be54 rb699768  
    55from copy import deepcopy 
    66 
    7 from sas.dataloader.loader import Loader 
    8 from sas.dataloader.data_info import Data2D 
     7from sas.sascalc.dataloader.loader import Loader 
     8from sas.sascalc.dataloader.data_info import Data2D 
    99from detector_editor import DetectorDialog 
    1010from collimation_editor import CollimationDialog 
  • src/sas/perspectives/calculator/data_operator.py

    r3db44fb rb699768  
    66import time 
    77import numpy 
    8 from sas.dataloader.data_info import Data1D 
     8from sas.sascalc.dataloader.data_info import Data1D 
    99from sas.plottools.PlotPanel import PlotPanel 
    1010from sas.plottools.plottables import Graph 
  • src/sas/perspectives/calculator/detector_editor.py

    r49ab5d7 rb699768  
    33import sys 
    44from copy import deepcopy 
    5 from sas.dataloader.data_info import Detector 
     5from sas.sascalc.dataloader.data_info import Detector 
    66from sas.guiframe.utils import check_float 
    77 
  • src/sas/perspectives/calculator/gen_scatter_panel.py

    r3db44fb rb699768  
    2020 
    2121#from sas.guiframe.gui_manager import MDIFrame 
    22 from sas.data_util.calcthread import CalcThread 
     22from sas.sascalc.data_util.calcthread import CalcThread 
    2323from sas.guiframe.local_perspectives.plotting.SimplePlot import PlotFrame 
    2424from sas.guiframe.dataFitting import Data2D 
    2525from sas.guiframe.dataFitting import Data1D 
    26 from sas.dataloader.data_info import Detector 
    27 from sas.dataloader.data_info import Source 
     26from sas.sascalc.dataloader.data_info import Detector 
     27from sas.sascalc.dataloader.data_info import Source 
    2828from sas.guiframe.panel_base import PanelBase 
    2929from sas.guiframe.utils import format_number 
    3030from sas.guiframe.events import StatusEvent 
    31 from sas.calculator import sas_gen 
     31from sas.sascalc.calculator import sas_gen 
    3232from sas.perspectives.calculator.calculator_widgets import OutputTextCtrl 
    3333from sas.perspectives.calculator.calculator_widgets import InputTextCtrl 
  • src/sas/perspectives/calculator/image_viewer.py

    r3db44fb rb699768  
    1313from sas.guiframe.events import StatusEvent 
    1414from sas.perspectives.calculator.calculator_widgets import InputTextCtrl 
    15 from sas.dataloader.data_info import Data2D 
    16 from sas.dataloader.data_info import Detector 
    17 from sas.dataloader.manipulations import reader2D_converter 
     15from sas.sascalc.dataloader.data_info import Data2D 
     16from sas.sascalc.dataloader.data_info import Detector 
     17from sas.sascalc.dataloader.manipulations import reader2D_converter 
    1818from sas.guiframe.documentation_window import DocumentationWindow 
    1919 
  • src/sas/perspectives/calculator/kiessig_calculator_panel.py

    r3db44fb rb699768  
    1313 
    1414from sas.guiframe.panel_base import PanelBase 
    15 from sas.calculator.kiessig_calculator import KiessigThicknessCalculator 
     15from sas.sascalc.calculator.kiessig_calculator import KiessigThicknessCalculator 
    1616from calculator_widgets import OutputTextCtrl 
    1717from calculator_widgets import InputTextCtrl 
  • src/sas/perspectives/calculator/load_thread.py

    r49ab5d7 rb699768  
    33""" 
    44import time 
    5 from sas.data_util.calcthread import CalcThread 
    6 from sas.dataloader.loader import Loader 
     5from sas.sascalc.data_util.calcthread import CalcThread 
     6from sas.sascalc.dataloader.loader import Loader 
    77 
    88class DataReader(CalcThread): 
  • src/sas/perspectives/calculator/resolcal_thread.py

    r49ab5d7 rb699768  
    33""" 
    44import time 
    5 from sas.data_util.calcthread import CalcThread 
     5from sas.sascalc.data_util.calcthread import CalcThread 
    66 
    77class CalcRes(CalcThread): 
  • src/sas/perspectives/calculator/resolution_calculator_panel.py

    r3db44fb rb699768  
    2626 
    2727#from sas.guicomm.events import StatusEvent 
    28 from sas.calculator.resolution_calculator import ResolutionCalculator 
     28from sas.sascalc.calculator.resolution_calculator import ResolutionCalculator 
    2929from sas.guiframe.events import StatusEvent 
    3030from sas.perspectives.calculator.calculator_widgets import OutputTextCtrl 
  • src/sas/perspectives/calculator/sample_editor.py

    r49ab5d7 rb699768  
    546546if __name__ == "__main__": 
    547547    app = wx.App() 
    548     from sas.dataloader.data_info import Sample 
     548    from sas.sascalc.dataloader.data_info import Sample 
    549549    sample = Sample() 
    550550    dlg = SampleDialog(sample=sample) 
  • src/sas/perspectives/calculator/slit_length_calculator_panel.py

    r3db44fb rb699768  
    1616 
    1717from sas.guiframe.events import StatusEvent 
    18 from sas.calculator.slit_length_calculator import SlitlengthCalculator 
     18from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator 
    1919from calculator_widgets import OutputTextCtrl 
    2020from calculator_widgets import InterActiveOutputTextCtrl 
  • src/sas/perspectives/calculator/source_editor.py

    r49ab5d7 rb699768  
    534534if __name__ == "__main__": 
    535535    app = wx.App() 
    536     from sas.dataloader.data_info import Source 
     536    from sas.sascalc.dataloader.data_info import Source 
    537537    source = Source() 
    538538    dlg = SourceDialog(source=source) 
  • src/sas/perspectives/fitting/basepage.py

    r1c2bf90 rb699768  
    2323from sas.guiframe.dataFitting import check_data_validity 
    2424from sas.guiframe.gui_style import GUIFRAME_ID 
    25 from sas.dataloader.data_info import Detector 
    26 from sas.dataloader.data_info import Source 
     25from sas.sascalc.dataloader.data_info import Detector 
     26from sas.sascalc.dataloader.data_info import Source 
    2727from sas.perspectives.fitting.pagestate import PageState 
    2828from sas.guiframe.CategoryInstaller import CategoryInstaller 
  • src/sas/perspectives/fitting/console.py

    r2f4b430 rb699768  
    55import time 
    66import wx 
    7 from sas.fit import FitHandler 
     7from sas.sascalc.fit import FitHandler 
    88 
    99class ConsoleUpdate(FitHandler): 
  • src/sas/perspectives/fitting/fit_thread.py

    r2f4b430 rb699768  
    22import sys 
    33import time 
    4 from sas.data_util.calcthread import CalcThread 
     4from sas.sascalc.data_util.calcthread import CalcThread 
    55 
    66def map_getattr(classInstance, classFunc, *args): 
  • src/sas/perspectives/fitting/fitting.py

    r6f16e25 rb699768  
    2121import models 
    2222 
    23 from sas.dataloader.loader import Loader 
     23from sas.sascalc.dataloader.loader import Loader 
    2424from sas.guiframe.dataFitting import Data2D 
    2525from sas.guiframe.dataFitting import Data1D 
     
    3232from sas.guiframe.plugin_base import PluginBase 
    3333from sas.guiframe.data_processor import BatchCell 
    34 from sas.fit.BumpsFitting import BumpsFit as Fit 
     34from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit 
    3535from sas.perspectives.fitting.console import ConsoleUpdate 
    3636from sas.perspectives.fitting.fitproblem import FitProblemDictionary 
  • src/sas/perspectives/fitting/model_thread.py

    ra3f125f0 rb699768  
    66import numpy 
    77import math 
    8 from sas.data_util.calcthread import CalcThread 
     8from sas.sascalc.data_util.calcthread import CalcThread 
    99 
    1010class Calc2D(CalcThread): 
  • src/sas/perspectives/fitting/pagestate.py

    rabcbe09 rb699768  
    2525from lxml import etree 
    2626 
    27 import sas.dataloader 
    28 from sas.dataloader.readers.cansas_reader import Reader as CansasReader 
    29 from sas.dataloader.readers.cansas_reader import get_content, write_node 
    30 from sas.dataloader.data_info import Data2D 
    31 from sas.dataloader.data_info import Collimation 
    32 from sas.dataloader.data_info import Detector 
    33 from sas.dataloader.data_info import Process 
    34 from sas.dataloader.data_info import Aperture 
     27import sas.sascalc.dataloader 
     28from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader 
     29from sas.sascalc.dataloader.readers.cansas_reader import get_content, write_node 
     30from sas.sascalc.dataloader.data_info import Data2D 
     31from sas.sascalc.dataloader.data_info import Collimation 
     32from sas.sascalc.dataloader.data_info import Detector 
     33from sas.sascalc.dataloader.data_info import Process 
     34from sas.sascalc.dataloader.data_info import Aperture 
    3535#Information to read/write state as xml 
    3636FITTING_NODE_NAME = 'fitting_plug_in' 
  • src/sas/perspectives/invariant/__init__.py

    r79492222 rb699768  
    11PLUGIN_ID = "Invariant plug-in 1.0" 
    22import os 
     3 
     4from distutils.filelist import findall 
    35from invariant import * 
    4 from distutils.filelist import findall 
     6 
    57def get_data_path(media): 
    68    """ 
  • src/sas/perspectives/invariant/invariant.py

    rf21d496 rb699768  
    2323from sas.guiframe.gui_style import GUIFRAME_ID 
    2424from sas.perspectives.invariant.invariant_state import Reader as reader 
    25 from sas.dataloader.loader import Loader 
     25from sas.sascalc.dataloader.loader import Loader 
    2626from sas.perspectives.invariant.invariant_panel import InvariantPanel 
    2727from sas.guiframe.plugin_base import PluginBase 
  • src/sas/perspectives/invariant/invariant_panel.py

    r0e33a8d rb699768  
    99import wx 
    1010import logging 
     11 
    1112from wx.lib.scrolledpanel import ScrolledPanel 
    12 from sas.invariant import invariant 
     13from sas.sascalc.invariant import invariant 
     14 
    1315from sas.guiframe.utils import format_number 
    1416from sas.guiframe.utils import check_float 
     
    19221924        wx.Frame.__init__(self, parent, id, title, size=(PANEL_WIDTH + 100, 
    19231925                                                         PANEL_HEIGHT + 100)) 
    1924         from sas.dataloader.loader import  Loader 
     1926        from sas.sascalc.dataloader.loader import  Loader 
    19251927        self.loader = Loader() 
    19261928        path = "C:/ECLPS/workspace/trunk/sasdataloader/test/ascii_test_3.txt" 
  • src/sas/perspectives/invariant/invariant_state.py

    r78a205a rb699768  
    88import logging 
    99import copy 
    10 import sas.dataloader 
     10import sas.sascalc.dataloader 
    1111# from xml.dom.minidom import parse 
    1212from lxml import etree 
    13 from sas.dataloader.readers.cansas_reader import Reader as CansasReader 
    14 from sas.dataloader.readers.cansas_reader import get_content 
     13from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader 
     14from sas.sascalc.dataloader.readers.cansas_reader import get_content 
    1515from sas.guiframe.utils import format_number 
    1616from sas.guiframe.gui_style import GUIFRAME_ID 
  • src/sas/perspectives/pr/explore_dialog.py

    r3d250da3 rb699768  
    150150        Initialization. The parameters added to Dialog are: 
    151151 
    152         :param pr_state: sas.pr.invertor.Invertor object 
     152        :param pr_state: sas.sascalc.pr.invertor.Invertor object 
    153153        :param nfunc: Number of terms in the expansion 
    154154 
  • src/sas/perspectives/pr/inversion_panel.py

    rf21d496 rb699768  
    966966    """ 
    967967    def __init__(self, parent, id): 
    968         from sas.pr.invertor import help 
     968        from sas.sascalc.pr.invertor import help 
    969969        wx.Dialog.__init__(self, parent, id, size=(250, 120)) 
    970970        self.SetTitle("P(r) distribution") 
  • src/sas/perspectives/pr/inversion_state.py

    r8b21fa7 rb699768  
    1919from lxml import etree 
    2020from sas.guiframe.dataFitting import Data1D 
    21 from sas.dataloader.readers.cansas_reader import Reader as CansasReader 
    22 from sas.dataloader.readers.cansas_reader import get_content 
     21from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader 
     22from sas.sascalc.dataloader.readers.cansas_reader import get_content 
    2323 
    2424PRNODE_NAME = 'pr_inversion' 
  • src/sas/perspectives/pr/pr.py

    rf21d496 rb699768  
    2828from sas.guiframe.events import StatusEvent 
    2929from sas.guiframe.gui_style import GUIFRAME_ID 
    30 from sas.pr.invertor import Invertor 
    31 from sas.dataloader.loader import Loader 
    32 import sas.dataloader 
     30from sas.sascalc.pr.invertor import Invertor 
     31from sas.sascalc.dataloader.loader import Loader 
     32import sas.sascalc.dataloader 
    3333 
    3434from pr_widgets import load_error 
  • src/sas/perspectives/pr/pr_thread.py

    r8b21fa7 rb699768  
    1212import sys 
    1313import time 
    14 from sas.data_util.calcthread import CalcThread 
     14from sas.sascalc.data_util.calcthread import CalcThread 
    1515 
    1616class CalcPr(CalcThread): 
  • src/sas/perspectives/simulation/simulation.py

    r79492222 rb699768  
    2222import sas.realspace.VolumeCanvas as VolumeCanvas 
    2323 
    24 from sas.data_util.calcthread import CalcThread 
     24from sas.sascalc.data_util.calcthread import CalcThread 
    2525from sas.guicomm.events import NewPlotEvent, StatusEvent     
    2626 
  • src/sas/sascalc/calculator/resolution_calculator.py

    rb6627d9 rb699768  
    10861086        # try to set it as a Data2D otherwise pass (not required for now) 
    10871087        try: 
    1088             from sas.dataloader.data_info import Data2D 
     1088            from sas.sascalc.dataloader.data_info import Data2D 
    10891089            output = Data2D() 
    10901090            inten = numpy.zeros_like(qx_value) 
  • src/sas/sascalc/dataloader/data_info.py

    r3a5f7c8 rb699768  
    2222 
    2323#from sas.guitools.plottables import Data1D as plottable_1D 
    24 from sas.data_util.uncertainty import Uncertainty 
     24from sas.sascalc.data_util.uncertainty import Uncertainty 
    2525import numpy 
    2626import math 
  • src/sas/sascalc/dataloader/loader.py

    rf06d7fc rb699768  
    2626import time 
    2727from zipfile import ZipFile 
    28 from sas.data_util.registry import ExtensionRegistry 
     28from sas.sascalc.data_util.registry import ExtensionRegistry 
    2929# Default readers are defined in the readers sub-module 
    3030import readers 
  • src/sas/sascalc/dataloader/manipulations.py

    r3c3a440 rb699768  
    9797 
    9898    #TODO: make sense of the following two lines... 
    99     #from sas.dataloader.data_info import Data2D 
     99    #from sas.sascalc.dataloader.data_info import Data2D 
    100100    #output = Data2D() 
    101101    output = data2d 
  • src/sas/sascalc/dataloader/readers/IgorReader.py

    r79492222 rb699768  
    1616import math 
    1717#import logging 
    18 from sas.dataloader.data_info import Data2D 
    19 from sas.dataloader.data_info import Detector 
    20 from sas.dataloader.manipulations import reader2D_converter 
     18from sas.sascalc.dataloader.data_info import Data2D 
     19from sas.sascalc.dataloader.data_info import Detector 
     20from sas.sascalc.dataloader.manipulations import reader2D_converter 
    2121 
    2222# Look for unit converter 
    2323has_converter = True 
    2424try: 
    25     from sas.data_util.nxsunit import Converter 
     25    from sas.sascalc.data_util.nxsunit import Converter 
    2626except: 
    2727    has_converter = False 
  • src/sas/sascalc/dataloader/readers/abs_reader.py

    r79492222 rb699768  
    1111import numpy 
    1212import os 
    13 from sas.dataloader.data_info import Data1D 
    14 from sas.dataloader.data_info import Detector 
     13from sas.sascalc.dataloader.data_info import Data1D 
     14from sas.sascalc.dataloader.data_info import Detector 
    1515 
    1616has_converter = True 
    1717try: 
    18     from sas.data_util.nxsunit import Converter 
     18    from sas.sascalc.data_util.nxsunit import Converter 
    1919except: 
    2020    has_converter = False 
  • src/sas/sascalc/dataloader/readers/ascii_reader.py

    ref3445e2 rb699768  
    1616import numpy 
    1717import os 
    18 from sas.dataloader.data_info import Data1D 
     18from sas.sascalc.dataloader.data_info import Data1D 
    1919 
    2020# Check whether we have a converter available 
    2121has_converter = True 
    2222try: 
    23     from sas.data_util.nxsunit import Converter 
     23    from sas.sascalc.data_util.nxsunit import Converter 
    2424except: 
    2525    has_converter = False 
  • src/sas/sascalc/dataloader/readers/cansas_reader.py

    r5ce7f17 rb699768  
    2020import inspect 
    2121# For saving individual sections of data 
    22 from sas.dataloader.data_info import Data1D 
    23 from sas.dataloader.data_info import Collimation 
    24 from sas.dataloader.data_info import TransmissionSpectrum 
    25 from sas.dataloader.data_info import Detector 
    26 from sas.dataloader.data_info import Process 
    27 from sas.dataloader.data_info import Aperture 
    28 import sas.dataloader.readers.xml_reader as xml_reader 
    29 from sas.dataloader.readers.xml_reader import XMLreader 
    30 from sas.dataloader.readers.cansas_constants import CansasConstants 
     22from sas.sascalc.dataloader.data_info import Data1D 
     23from sas.sascalc.dataloader.data_info import Collimation 
     24from sas.sascalc.dataloader.data_info import TransmissionSpectrum 
     25from sas.sascalc.dataloader.data_info import Detector 
     26from sas.sascalc.dataloader.data_info import Process 
     27from sas.sascalc.dataloader.data_info import Aperture 
     28import sas.sascalc.dataloader.readers.xml_reader as xml_reader 
     29from sas.sascalc.dataloader.readers.xml_reader import XMLreader 
     30from sas.sascalc.dataloader.readers.cansas_constants import CansasConstants 
    3131 
    3232# The following 2 imports *ARE* used. Do not remove either. 
     
    4040HAS_CONVERTER = True 
    4141try: 
    42     from sas.data_util.nxsunit import Converter 
     42    from sas.sascalc.data_util.nxsunit import Converter 
    4343except ImportError: 
    4444    HAS_CONVERTER = False 
  • src/sas/sascalc/dataloader/readers/danse_reader.py

    rfd5ac0d rb699768  
    1717import numpy 
    1818import logging 
    19 from sas.dataloader.data_info import Data2D, Detector 
    20 from sas.dataloader.manipulations import reader2D_converter 
     19from sas.sascalc.dataloader.data_info import Data2D, Detector 
     20from sas.sascalc.dataloader.manipulations import reader2D_converter 
    2121 
    2222# Look for unit converter 
    2323has_converter = True 
    2424try: 
    25     from sas.data_util.nxsunit import Converter 
     25    from sas.sascalc.data_util.nxsunit import Converter 
    2626except: 
    2727    has_converter = False 
  • src/sas/sascalc/dataloader/readers/hfir1d_reader.py

    r79492222 rb699768  
    1111import numpy 
    1212import os 
    13 from sas.dataloader.data_info import Data1D 
     13from sas.sascalc.dataloader.data_info import Data1D 
    1414 
    1515# Check whether we have a converter available 
    1616has_converter = True 
    1717try: 
    18     from sas.data_util.nxsunit import Converter 
     18    from sas.sascalc.data_util.nxsunit import Converter 
    1919except: 
    2020    has_converter = False 
  • src/sas/sascalc/dataloader/readers/nexus_reader.py

    r79492222 rb699768  
    1010""" 
    1111import os 
    12 from sas.dataloader.data_info import Data2D 
     12from sas.sascalc.dataloader.data_info import Data2D 
    1313 
    1414 
  • src/sas/sascalc/dataloader/readers/red2d_reader.py

    r79492222 rb699768  
    1212import numpy 
    1313import math 
    14 from sas.dataloader.data_info import Data2D, Detector 
     14from sas.sascalc.dataloader.data_info import Data2D, Detector 
    1515 
    1616# Look for unit converter 
    1717has_converter = True 
    1818try: 
    19     from sas.data_util.nxsunit import Converter 
     19    from sas.sascalc.data_util.nxsunit import Converter 
    2020except: 
    2121    has_converter = False 
  • src/sas/sascalc/dataloader/readers/sesans_reader.py

    redfc8ac rb699768  
    88import numpy 
    99import os 
    10 from sas.dataloader.data_info import SESANSData1D 
     10from sas.sascalc.dataloader.data_info import SESANSData1D 
    1111 
    1212# Check whether we have a converter available 
    1313has_converter = True 
    1414try: 
    15     from sas.data_util.nxsunit import Converter 
     15    from sas.sascalc.data_util.nxsunit import Converter 
    1616except: 
    1717    has_converter = False 
  • src/sas/sascalc/dataloader/readers/tiff_reader.py

    r79492222 rb699768  
    1414import os 
    1515import numpy 
    16 from sas.dataloader.data_info import Data2D 
    17 from sas.dataloader.manipulations import reader2D_converter 
     16from sas.sascalc.dataloader.data_info import Data2D 
     17from sas.sascalc.dataloader.manipulations import reader2D_converter 
    1818     
    1919class Reader: 
  • src/sas/sascalc/fit/AbstractFitEngine.py

    r9f7fbd9 rb699768  
    66import numpy 
    77 
    8 from sas.dataloader.data_info import Data1D 
    9 from sas.dataloader.data_info import Data2D 
     8from sas.sascalc.dataloader.data_info import Data1D 
     9from sas.sascalc.dataloader.data_info import Data2D 
    1010_SMALLVALUE = 1.0e-10 
    1111 
  • src/sas/sascalc/fit/BumpsFitting.py

    r7945367 rb699768  
    2828 
    2929 
    30 from sas.fit.AbstractFitEngine import FitEngine 
    31 from sas.fit.AbstractFitEngine import FResult 
    32 from sas.fit.expression import compile_constraints 
     30from sas.sascalc.fit.AbstractFitEngine import FitEngine 
     31from sas.sascalc.fit.AbstractFitEngine import FResult 
     32from sas.sascalc.fit.expression import compile_constraints 
    3333 
    3434class Progress(object): 
  • src/sas/sascalc/invariant/invariant.py

    rc76bdc3 rb699768  
    1919import numpy 
    2020 
    21 from sas.dataloader.data_info import Data1D as LoaderData1D 
     21from sas.sascalc.dataloader.data_info import Data1D as LoaderData1D 
    2222 
    2323# The minimum q-value to be used when extrapolating 
  • src/sas/sascalc/pr/__init__.py

    rb9a5f0e rb699768  
    5353# To create an inversion object: 
    5454# \verbatim 
    55 #from sas.pr.invertor import Invertor 
     55#from sas.sascalc.pr.invertor import Invertor 
    5656#    invertor = Invertor() 
    5757# \endverbatim 
  • src/sas/sascalc/pr/c_extensions/Cinvertor.c

    rb9a5f0e rb699768  
    11141114 
    11151115    d = PyModule_GetDict(module); 
    1116     CinvertorError = PyErr_NewException("sas.pr.invertor.Cinvertor.InvertorError", PyExc_RuntimeError, NULL); 
     1116    CinvertorError = PyErr_NewException("sas.sascalc.pr.invertor.Cinvertor.InvertorError", PyExc_RuntimeError, NULL); 
    11171117    PyDict_SetItemString(d, "CinvertorError", CinvertorError); 
    11181118} 
  • src/sas/sascalc/pr/distance_explorer.py

    r038c00cf rb699768  
    5151        Initialization. 
    5252 
    53         :param pr_state: sas.pr.invertor.Invertor object 
     53        :param pr_state: sas.sascalc.pr.invertor.Invertor object 
    5454 
    5555        """ 
  • src/sas/sascalc/pr/invertor.py

    r3d250da3 rb699768  
    1717from numpy.linalg import lstsq 
    1818from scipy import optimize 
    19 from sas.pr.core.pr_inversion import Cinvertor 
     19from sas.sascalc.pr.core.pr_inversion import Cinvertor 
    2020 
    2121def help(): 
  • src/sas/sascalc/pr/num_term.py

    rc1bffa5 rb699768  
    44import sys 
    55import logging 
    6 from sas.pr.invertor import Invertor 
     6from sas.sascalc.pr.invertor import Invertor 
    77 
    88class NTermEstimator(object): 
Note: See TracChangeset for help on using the changeset viewer.