Changeset 713cc1c in sasview


Ignore:
Timestamp:
Aug 11, 2016 8:16:28 AM (8 years ago)
Author:
wojciech
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:
b61bd57, 66f21cd
Parents:
e5c09cf (diff), 801a296 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Added two readers to registry function, so mac build doesn't fail on them

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • sasview/__init__.py

    r8ca1ba1 r801a296  
    33try: 
    44    import subprocess 
    5     git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD']) 
     5    import os 
     6    FNULL = open(os.devnull, 'w') 
     7    git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'], 
     8                    stderr=FNULL, 
     9                    shell=True) 
    610    __build__ = str(git_revision).strip() 
    711except: 
  • sasview/setup_exe.py

    r5552396 rc3e4e213  
    242242if os.path.isfile(f): 
    243243    data_files.append(('.', [f])) 
     244 
     245# atlas DLL required by matplotlib 11.1 
     246# ** REVISIT WHEN MOVING TO ANACONDA ** 
     247f = "c:\\python27\\lib\\site-packages\\numpy\\core\\numpy-atlas.dll" 
     248if os.path.isfile(f): 
     249    data_files.append(('.', [f])) 
    244250     
    245251if os.path.isfile("BUILD_NUMBER"): 
     
    332338    # numpy 1.8 openmp bindings (still seems to use all the cores without them) 
    333339    #'libiomp5md.dll', 'libifcoremd.dll', 'libmmd.dll', 'svml_dispmd.dll','libifportMD.dll', 
     340    'numpy-atlas.dll', 
    334341    # microsoft C runtime (not allowed to ship with the app; need to ship vcredist 
    335342    'msvcp90.dll', 
  • src/sas/sascalc/calculator/BaseComponent.py

    rcb4ef58 rdeddda1  
    77# imports 
    88import copy 
     9from collections import OrderedDict 
     10 
    911import numpy 
    1012#TO DO: that about a way to make the parameter 
     
    254256        Return a list of all available parameters for the model 
    255257        """ 
    256         list = self.params.keys() 
     258        list = _ordered_keys(self.params) 
    257259        # WARNING: Extending the list with the dispersion parameters 
    258260        list.extend(self.getDispParamList()) 
     
    264266        """ 
    265267        list = [] 
    266  
    267         for item in self.dispersion.keys(): 
    268             for p in self.dispersion[item].keys(): 
     268        for item in _ordered_keys(self.dispersion): 
     269            for p in _ordered_keys(self.dispersion[item]): 
    269270                if p not in ['type']: 
    270271                    list.append('%s.%s' % (item.lower(), p.lower())) 
     
    309310        """ 
    310311        raise ValueError, "Model operation are no longer supported" 
     312 
     313 
     314def _ordered_keys(d): 
     315    keys = list(d.keys()) 
     316    if not isinstance(d, OrderedDict): 
     317        keys.sort() 
     318    return keys 
  • src/sas/sascalc/calculator/sas_gen.py

    rcb4ef58 rd2fd8fc  
    33SAS generic computation and sld file readers 
    44""" 
     5import sas.sascalc.calculator.core.sld2i as mod 
    56from sas.sascalc.calculator.BaseComponent import BaseComponent 
    6 import sas.sascalc.calculator.core.sld2i as mod 
    77from periodictable import formula 
    88from periodictable import nsf 
  • src/sas/sascalc/dataloader/readers/associations.py

    rb699768 re5c09cf  
    9292    import nexus_reader 
    9393    import sesans_reader 
     94    import cansas_reader_HDF5 
     95    import anton_paar_saxs_reader 
    9496    registry_function(sesans_reader) 
    9597    registry_function(abs_reader) 
     
    102104    #registry_function(tiff_reader) 
    103105    registry_function(nexus_reader) 
    104      
     106    registry_function(cansas_reader_HDF5) 
     107    registry_function(anton_paar_saxs_reader) 
    105108    return True 
Note: See TracChangeset for help on using the changeset viewer.