Changeset b9a5f0e in sasview for src/sas/simulation


Ignore:
Timestamp:
Feb 13, 2015 4:52:52 AM (9 years ago)
Author:
krzywon
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:
fd5ac0d
Parents:
35ec279
Message:

90% complete with the conversion.

Location:
src/sas/simulation
Files:
1 added
1 deleted
19 edited

Legend:

Unmodified
Added
Removed

  • src/sas/simulation/analmodelpy/analmodelpymodule/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = analmodelpymodule 
    1616MODULE = analmodelpy 

  • src/sas/simulation/analmodelpy/libanalmodelpy/Make.mm

    r79492222 rb9a5f0e  
    5555EXPORT_HEADERS = \ 
    5656    analytical_model.h  \ 
    57     sans_model.h 
     57    sas_model.h 
    5858 
    5959EXPORT_LIBS = $(PROJ_SAR) 

  • src/sas/simulation/analmodelpy/libanalmodelpy/analytical_model.h

    r79492222 rb9a5f0e  
    1 /** \file analytical_model.h class AnalyticalModel:SANSModel */ 
     1/** \file analytical_model.h class AnalyticalModel:SASModel */ 
    22 
    33#ifndef ANALYTICALMODEL_H 
    44#define ANALYTICALMODEL_H 
    55 
    6 #include "sans_model.h" 
     6#include "sas_model.h" 
    77#include "geo_shape.h" 
    88#include "iq.h" 
    99 
    10 class AnalyticalModel : public SANSModel{ 
     10class AnalyticalModel : public SASModel{ 
    1111 
    1212 public: 

  • src/sas/simulation/analmodelpy/tests/Make.mm

    r79492222 rb9a5f0e  
    1616                     ../../geoshapespy/libgeoshapespy 
    1717 
    18 PROJECT = SANSsimulation 
     18PROJECT = SASsimulation 
    1919PACKAGE = tests 
    2020 

  • src/sas/simulation/analmodelpy/tests/testanal_model.py

    r79492222 rb9a5f0e  
    1414if __name__ == "__main__": 
    1515 
    16     from SANSsimulation import analmodelpy as analmodelpymodule 
    17     from SANSsimulation import iqPy 
    18     from SANSsimulation import geoshapespy 
     16    from SASsimulation import analmodelpy as analmodelpymodule 
     17    from SASsimulation import iqPy 
     18    from SASsimulation import geoshapespy 
    1919 
    2020    print "copyright information:" 

  • src/sas/simulation/geoshapespy/geoshapespymodule/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = geoshapespymodule 
    1616MODULE = geoshapespy 

  • src/sas/simulation/geoshapespy/tests/testshapes.py

    r79492222 rb9a5f0e  
    1414if __name__ == "__main__": 
    1515 
    16     from SANSsimulation import geoshapespy 
     16    from SASsimulation import geoshapespy 
    1717 
    1818    print 

  • src/sas/simulation/iqPy/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515 
    1616# directory structure 

  • src/sas/simulation/iqPy/examples/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = examples 
    1616 

  • src/sas/simulation/iqPy/iqPy/Make.mm

    r79492222 rb9a5f0e  
    1111# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    1212 
    13 PROJECT = SANSsimulation 
     13PROJECT = SASsimulation 
    1414PACKAGE = iqPy 
    1515 

  • src/sas/simulation/iqPy/iqPymodule/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = iqPymodule 
    1616MODULE = iqPy 

  • src/sas/simulation/iqPy/tests/testiq.py

    r79492222 rb9a5f0e  
    1414if __name__ == "__main__": 
    1515 
    16         from SANSsimulation import iqPy 
     16        from SASsimulation import iqPy 
    1717        iqPy.new_iq(10,0.01,0.4) 
    1818 

  • src/sas/simulation/pointsmodelpy/libpointsmodelpy/points_model.h

    r79492222 rb9a5f0e  
    1 /** \file points_model.h child class of SANSmodel*/ 
     1/** \file points_model.h child class of SASmodel*/ 
    22 
    33#ifndef POINTSMODEL_H 
    … …  
    99#include "Point3D.h" 
    1010#include "iq.h" 
    11 #include "sans_model.h" 
     11#include "sas_model.h" 
    1212 
    1313using namespace std; 
    1414 
    15 class PointsModel : public SANSModel{ 
     15class PointsModel : public SASModel{ 
    1616 public: 
    1717  PointsModel(); 

  • src/sas/simulation/pointsmodelpy/pointsmodelpymodule/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = pointsmodelpymodule 
    1616MODULE = pointsmodelpy 

  • src/sas/simulation/pointsmodelpy/tests/testcomplexmodel.py

    r79492222 rb9a5f0e  
    1 from sansModeling.pointsmodelpy import pointsmodelpy 
    2 from sansModeling.iqPy import iqPy 
    3 from sansModeling.geoshapespy import geoshapespy 
     1from sasModeling.pointsmodelpy import pointsmodelpy 
     2from sasModeling.iqPy import iqPy 
     3from sasModeling.geoshapespy import geoshapespy 
    44 
    55#First testing: a normal case, a lores model holds a sphere 

  • src/sas/simulation/pointsmodelpy/tests/testlores.py

    r79492222 rb9a5f0e  
    11if __name__ == "__main__": 
    22 
    3     from sansModeling.iqPy import iqPy 
    4     #from sansModeling.analmodelpy import analmodelpy as analmodelpymodule 
    5     from sansModeling.geoshapespy import geoshapespy 
    6     from sansModeling.pointsmodelpy import pointsmodelpy 
     3    from sasModeling.iqPy import iqPy 
     4    #from sasModeling.analmodelpy import analmodelpy as analmodelpymodule 
     5    from sasModeling.geoshapespy import geoshapespy 
     6    from sasModeling.pointsmodelpy import pointsmodelpy 
    77 
    88#    print "copyright information:" 

  • src/sas/simulation/pointsmodelpy/tests/testlores2d.py

    r79492222 rb9a5f0e  
    11def test_lores2d(phi): 
    2   from sansModeling.pointsmodelpy import pointsmodelpy  
    3   from sansModeling.iqPy import iqPy 
    4   from sansModeling.geoshapespy import geoshapespy 
     2  from sasModeling.pointsmodelpy import pointsmodelpy  
     3  from sasModeling.iqPy import iqPy 
     4  from sasModeling.geoshapespy import geoshapespy 
    55 
    66  #lores model is to hold several geometric objects 
    … …  
    1515  pointsmodelpy.lores_add(lm,c,3.0) 
    1616 
    17   #retrieve the points from lores model for sans calculation 
     17  #retrieve the points from lores model for sas calculation 
    1818  vp = pointsmodelpy.new_point3dvec() 
    1919  pointsmodelpy.get_lorespoints(lm,vp) 
    … …  
    3030  from Numeric import arange,zeros 
    3131  from enthought.util.numerix import Float,zeros 
    32   from sansModeling.file2array import readfile2array 
    33   from sansModeling.pointsmodelpy import pointsmodelpy 
    34   from sansModeling.geoshapespy import geoshapespy 
     32  from sasModeling.file2array import readfile2array 
     33  from sasModeling.pointsmodelpy import pointsmodelpy 
     34  from sasModeling.geoshapespy import geoshapespy 
    3535 
    3636  lm = pointsmodelpy.new_loresmodel(0.1) 
    … …  
    7070  from Numeric import arange,zeros 
    7171  from enthought.util.numerix import Float,zeros 
    72   from sansModeling.file2array import readfile2array 
    73   from sansModeling.pointsmodelpy import pointsmodelpy 
    74   from sansModeling.geoshapespy import geoshapespy 
     72  from sasModeling.file2array import readfile2array 
     73  from sasModeling.pointsmodelpy import pointsmodelpy 
     74  from sasModeling.geoshapespy import geoshapespy 
    7575 
    7676  lm = pointsmodelpy.new_loresmodel(0.1) 

  • src/sas/simulation/pointsmodelpy/tests/testnegativepr.py

    r79492222 rb9a5f0e  
    11if __name__ == "__main__": 
    2   from sansModeling.pointsmodelpy import pointsmodelpy 
    3   from sansModeling.iqPy import iqPy 
    4   from sansModeling.geoshapespy import geoshapespy 
     2  from sasModeling.pointsmodelpy import pointsmodelpy 
     3  from sasModeling.iqPy import iqPy 
     4  from sasModeling.geoshapespy import geoshapespy 
    55 
    66  a = geoshapespy.new_sphere(10) 

  • src/sas/simulation/setup.py

    r79492222 rb9a5f0e  
    11""" 
    2  Installation script for SANS models 
     2 Installation script for SAS models 
    33 
    44  - To compile and install: 
    … …  
    2727 
    2828# Top package name 
    29 #pck_top = "sansModeling" 
     29#pck_top = "sasModeling" 
    3030pck_top = "sas.simulation" 
    3131pck_dir = os.path.join("src","sas", "simulation") 
    … …  
    9898 
    9999setup( 
    100     name="sansrealspace_modeling", 
     100    name="sasrealspace_modeling", 
    101101    version = "0.2", 
    102     description = "Python module for SANS simulation", 
     102    description = "Python module for SAS simulation", 
    103103    author = "University of Tennessee", 
    104104    url = "http://danse.us/trac/sas", 
Note: See TracChangeset for help on using the changeset viewer.