Changeset db7a82e in sasview


Ignore:
Timestamp:
Aug 11, 2011 1:15:30 PM (13 years ago)
Author:
Jae Cho <jhjcho@…>
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:
fe857e2
Parents:
9e2e7e9
Message:

updated dataloader calls

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/AnnulusSlicer.py

    r8c347a6 rdb7a82e  
    125125            return 
    126126         
    127         from DataLoader.manipulations import Ring 
     127        from sans.dataloader.manipulations import Ring 
    128128        rmin = min(math.fabs(self.inner_circle.get_radius()), 
    129129                  math.fabs(self.outer_circle.get_radius())) 
    … …  
    535535            return 
    536536        mask = data.mask   
    537         from DataLoader.manipulations import Ringcut 
     537        from sans.dataloader.manipulations import Ringcut 
    538538     
    539539        rmin = 0 

  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/AzimutSlicer.py

    r8c347a6 rdb7a82e  
    173173        #print "phimin, phimax, rmin ,rmax",math.degrees(phimin), 
    174174        # math.degrees(phimax), rmin ,rmax 
    175         #from DataLoader.manipulations import SectorQ 
     175        #from sans.dataloader.manipulations import SectorQ 
    176176         
    177177        sect = new_sector(r_min=rmin, r_max=rmax, 
    … …  
    290290        """ 
    291291        """ 
    292         from DataLoader.manipulations import SectorQ 
     292        from sans.dataloader.manipulations import SectorQ 
    293293        self.post_data(SectorQ)    
    294294         
    … …  
    307307        """ 
    308308        """ 
    309         from DataLoader.manipulations import SectorPhi 
     309        from sans.dataloader.manipulations import SectorPhi 
    310310        self.post_data(SectorPhi )    
    311311         

  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/SectorSlicer.py

    r8c347a6 rdb7a82e  
    146146            return 
    147147        ## Averaging 
    148         from DataLoader.manipulations import SectorQ 
     148        from sans.dataloader.manipulations import SectorQ 
    149149        radius = self.qmax  
    150150        phimin =  -self.left_line.phi + self.main_line.theta 

  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/boxMask.py

    r8c347a6 rdb7a82e  
    148148        contained in that region and the error on that sum 
    149149        """ 
    150         from DataLoader.manipulations import Boxcut 
     150        from sans.dataloader.manipulations import Boxcut 
    151151        ## Data 2D for which the pixel will be summed 
    152152        data = self.base.data 

  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/boxSlicer.py

    r8c347a6 rdb7a82e  
    538538        Post data creating by averaging in Qx direction 
    539539        """ 
    540         from DataLoader.manipulations import SlabX 
     540        from sans.dataloader.manipulations import SlabX 
    541541        self.post_data(SlabX, direction="X")    
    542542         
    … …  
    555555        Post data creating by averaging in Qy direction 
    556556        """ 
    557         from DataLoader.manipulations import SlabY 
     557        from sans.dataloader.manipulations import SlabY 
    558558        self.post_data(SlabY, direction="Y")    
    559559         

  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/boxSum.py

    r8c347a6 rdb7a82e  
    179179        y_max = self.vertical_lines.y1 
    180180        ##computation of the sum and its error 
    181         from DataLoader.manipulations import Boxavg 
     181        from sans.dataloader.manipulations import Boxavg 
    182182        box =  Boxavg(x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max) 
    183183        self.count, self.error = box(self.base.data2D) 

  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/sectorMask.py

    r8c347a6 rdb7a82e  
    121121        mask = data.mask 
    122122        ## Averaging 
    123         from DataLoader.manipulations import Sectorcut 
     123        from sans.dataloader.manipulations import Sectorcut 
    124124        radius = self.qmax  
    125125        phimin =  -self.left_line.phi + self.main_line.theta 

  • sansguiframe/src/sans/guiframe/state_reader.py

    r8c347a6 rdb7a82e  
    3333from sans.guiframe.dataFitting import Data1D 
    3434from sans.guiframe.dataFitting import Data2D 
    35 from DataLoader.data_info import Collimation 
    36 from DataLoader.data_info import Detector 
    37 from DataLoader.data_info import Process 
    38 from DataLoader.data_info import Aperture 
     35from sans.dataloader.data_info import Collimation 
     36from sans.dataloader.data_info import Detector 
     37from sans.dataloader.data_info import Process 
     38from sans.dataloader.data_info import Aperture 
    3939from lxml import etree 
    4040import xml.dom.minidom 

  • sansview/scripts/installer_generator.py

    rff00215 rdb7a82e  
    4141        list = [] 
    4242        #(ext, type, name, flags) 
    43         from DataLoader.loader import Loader 
     43        from sans.dataloader.loader import Loader 
    4444        wild_cards = Loader().get_wildcards() 
    4545        for item in wild_cards: 

  • sansview/scripts/sansview.py

    rc9a7ce9 rdb7a82e  
    6262            self.gui.add_perspective(pr_plug) 
    6363        except: 
     64            raise 
    6465            logging.error("SansView: could not find P(r) plug-in module")  
    6566            logging.error(sys.exc_value)   
    … …  
    7172            self.gui.add_perspective(invariant_plug) 
    7273        except: 
     74            raise 
    7375            logging.error("SansView: could not find Invariant plug-in module")  
    7476            logging.error(sys.exc_value)   

  • sansview/scripts/setup_exe.py

    rff00215 rdb7a82e  
    9898    data_files.append((os.path.split(dirname)[0], [f])) 
    9999 
    100 # Copy the settings file for the DataLoader file extension associations 
    101 import DataLoader.readers 
    102 f = os.path.join(DataLoader.readers.get_data_path(),'defaults.xml') 
     100# Copy the settings file for the sans.dataloader file extension associations 
     101import sans.dataloader.readers 
     102f = os.path.join(sans.dataloader.readers.get_data_path(),'defaults.xml') 
    103103if os.path.isfile(f): 
    104104    data_files.append(('.', [f])) 

  • sansview/scripts/setup_mac.py

    rff00215 rdb7a82e  
    77from setuptools import setup 
    88import periodictable.xsf 
    9 import DataLoader.readers  
     9import sans.dataloader.readers  
    1010from distutils.sysconfig import get_python_lib 
    1111import os 
    … …  
    3131 
    3232#CANSAxml reader data files 
    33 RESOURCES_FILES.append(os.path.join(DataLoader.readers.get_data_path(),'defaults.xml')) 
     33RESOURCES_FILES.append(os.path.join(sans.dataloader.readers.get_data_path(),'defaults.xml')) 
    3434 
    3535# Locate libxml2 library 
    … …  
    5353        list = [] 
    5454        EXCEPTION_LIST = ['*', '.', ''] 
    55         from DataLoader.loader import Loader 
     55        from sans.dataloader.loader import Loader 
    5656        wild_cards = Loader().get_wildcards() 
    5757        for item in wild_cards: 
Note: See TracChangeset for help on using the changeset viewer.