Changeset b699768 in sasview for src/sas/sascalc


Ignore:
Timestamp:
Feb 19, 2016 10:07:22 AM (9 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/sas/sascalc
Files:
6 added
58 moved

Legend:

Unmodified
Added
Removed

  • 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.