Changeset 201af9f in sasview for src/sans/perspectives

Timestamp:

Apr 5, 2014 6:29:18 AM (11 years ago)

Author:

Miguel Gonzalez <onzalezm@…>

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:

beda555

Parents:

f44b076

Message:

Added the three models for hollow and massive rectangular parallelepipeds as defined in Z. Phys. Chem. 226 (2012) 837-854.
To do: Create model documentation.

File:

• src/sans/perspectives/fitting/models.py (modified) (1 diff)

src/sans/perspectives/fitting/models.py

@@ -677 +677 @@
         self.model_name_list.append(PringlesModel.__name__)
 
+        from sans.models.RectangularPrismModel import RectangularPrismModel
+        self.model_dictionary[RectangularPrismModel.__name__] = RectangularPrismModel
+        self.shape_list.append(RectangularPrismModel)
+        self.multiplication_factor.append(RectangularPrismModel)
+        self.model_name_list.append(RectangularPrismModel.__name__)
+
+        from sans.models.RectangularHollowPrismInfThinWallsModel import RectangularHollowPrismInfThinWallsModel
+        self.model_dictionary[RectangularHollowPrismInfThinWallsModel.__name__] = RectangularHollowPrismInfThinWallsModel
+        self.shape_list.append(RectangularHollowPrismInfThinWallsModel)
+        self.multiplication_factor.append(RectangularHollowPrismInfThinWallsModel)
+        self.model_name_list.append(RectangularHollowPrismInfThinWallsModel.__name__)
+
+        from sans.models.RectangularHollowPrismModel import RectangularHollowPrismModel
+        self.model_dictionary[RectangularHollowPrismModel.__name__] = RectangularHollowPrismModel
+        self.shape_list.append(RectangularHollowPrismModel)
+        self.multiplication_factor.append(RectangularHollowPrismModel)
+        self.model_name_list.append(RectangularHollowPrismModel.__name__)
+
         #from sans.models.FractalO_Z import FractalO_Z
         #self.model_dictionary[FractalO_Z.__name__] = FractalO_Z