Changeset b9a5f0e in sasview for src/sas/simulation/analmodelpy

Timestamp:

Feb 13, 2015 4:52:52 AM (10 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/analmodelpy

Files:

• analmodelpymodule/Make.mm (modified) (1 diff)
• libanalmodelpy/Make.mm (modified) (1 diff)
• libanalmodelpy/analytical_model.h (modified) (1 diff)
• libanalmodelpy/sans_model.h (deleted)
• libanalmodelpy/sas_model.h (added)
• tests/Make.mm (modified) (1 diff)
• tests/testanal_model.py (modified) (1 diff)

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

@@ -12 +12 @@
 #
 
-PROJECT = SANSsimulation
+PROJECT = SASsimulation
 PACKAGE = analmodelpymodule
 MODULE = analmodelpy

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

@@ -55 +55 @@
 EXPORT_HEADERS = \
     analytical_model.h  \
-    sans_model.h
+    sas_model.h
 
 EXPORT_LIBS = $(PROJ_SAR)

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

@@ -1 @@
-/** \file analytical_model.h class AnalyticalModel:SANSModel */
+/** \file analytical_model.h class AnalyticalModel:SASModel */
 
 #ifndef ANALYTICALMODEL_H
 #define ANALYTICALMODEL_H
 
-#include "sans_model.h"
+#include "sas_model.h"
 #include "geo_shape.h"
 #include "iq.h"
 
-class AnalyticalModel : public SANSModel{
+class AnalyticalModel : public SASModel{
 
  public:

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

@@ -16 +16 @@
                      ../../geoshapespy/libgeoshapespy
 
-PROJECT = SANSsimulation
+PROJECT = SASsimulation
 PACKAGE = tests
 

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

@@ -14 +14 @@
 if __name__ == "__main__":
 
-    from SANSsimulation import analmodelpy as analmodelpymodule
-    from SANSsimulation import iqPy
-    from SANSsimulation import geoshapespy
+    from SASsimulation import analmodelpy as analmodelpymodule
+    from SASsimulation import iqPy
+    from SASsimulation import geoshapespy
 
     print "copyright information:"