Changeset 7c8d3093 in sasview for fittingview/src/sans/perspectives/fitting/plugin_models

Timestamp:

Dec 20, 2011 5:25:39 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:

b025572

Parents:

1352c78

Message:

more completion of custom model edit

Location:

fittingview/src/sans/perspectives/fitting/plugin_models

Files:

• polynominal5.py (added)
• sph_bessel_jn.py (added)
• sum_Ap1_1_Ap2.py (added)
• sum_p1_p2.py (modified) (5 diffs)
• testmodel.py (modified) (2 diffs)
• testmodel_2.py (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/plugin_models/sum_p1_p2.py

@@ -2 +2 @@
 import copy
 from sans.models.pluginmodel import Model1DPlugin
-# User can change the name of the model (only with single functional model)
-from sans.models.CylinderModel import CylinderModel as P1
-from sans.models.PolymerExclVolume import PolymerExclVolume as P2
-
-
+# Possible model names
+"""
+BCCrystalModel, BEPolyelectrolyte, BarBellModel, BinaryHSModel, BroadPeakModel,
+CSParallelepipedModel, CappedCylinderModel, CoreShellCylinderModel,
+CoreShellEllipsoidModel, CoreShellModel, CorrLengthModel, CylinderModel, 
+DABModel, DebyeModel, EllipsoidModel, EllipticalCylinderModel, FCCrystalModel,
+FlexCylEllipXModel, FlexibleCylinderModel, FractalCoreShellModel, FractalModel,
+FuzzySphereModel, GaussLorentzGelModel, GuinierModel, GuinierPorodModel,
+HardsphereStructure, HayterMSAStructure, HollowCylinderModel, LamellarFFHGModel,
+LamellarModel, LamellarPCrystalModel, LamellarPSHGModel, LamellarPSModel,
+LineModel, LorentzModel, MultiShellModel, ParallelepipedModel, PeakGaussModel,
+PeakLorentzModel, PearlNecklaceModel, Poly_GaussCoil, PolymerExclVolume,
+PorodModel, PowerLawAbsModel, SCCrystalModel, SphereModel, SquareWellStructure,
+StackedDisksModel, StickyHSStructure, TeubnerStreyModel, TriaxialEllipsoidModel,
+TwoLorentzianModel, TwoPowerLawModel, VesicleModel
+"""
+## This is same as the Easy Custom Sum(p1 + p2) 
+#
+#     Custom model = scale_factor * (P1 + P2)
+#
+## User can REPLACE model names below two arrowed lines (two names per line)
+from sans.models.CylinderModel import CylinderModel as P1          #<========
+from sans.models.PolymerExclVolume import PolymerExclVolume as P2  #<========
+
+#####DO NOT CHANGE ANYTHING BELOW THIS LINE 
+#####------------------------------------------------------------------------
 class Model(Model1DPlugin):
     """
@@ -23 +44 @@
         ## Setting  model name model description
         self.description=""
-        self.name = "Sum[" + "P1(Cyl)"  +", "+ "P2(PEV)" + "]"
+        self.name = self._get_name(p_model1.name, p_model2.name)
         self.description = p_model1.name+"\n"
         self.description += p_model2.name+"\n"
@@ -52 +73 @@
         ## Parameter details [units, min, max]
         self._set_details()
-        self.details['scale_factor'] = ['',     None, None]
+        self.details['scale_factor'] = ['',  None, None]
 
         
@@ -96 +117 @@
         return obj
     
-    
+    def _get_name(self, name1, name2):
+        """
+        Get combined name from two model names
+        """
+        name = self._get_upper_name(name1)
+        name += "+"
+        name += self._get_upper_name(name2)
+        return name
+    
+    def _get_upper_name(self, name=None):
+        """
+        Get uppercase string from model name
+        """
+        if name == None:
+            return ""
+        upper_name = ""
+        str_name = str(name)
+        for index in range(len(str_name)):
+            if str_name[index].isupper():
+                upper_name += str_name[index]
+        return upper_name
+        
     def _set_dispersion(self):
         """
@@ -339 +381 @@
 if __name__ == "__main__": 
     m1= Model() 
-    m1.setParam("p1_scale", 25)  
-    m1.setParam("p1_length", 1000)
-    m1.setParam("p2_scale", 100) 
-    m1.setParam("p2_rg", 100) 
+    #m1.setParam("p1_scale", 25)  
+    #m1.setParam("p1_length", 1000)
+    #m1.setParam("p2_scale", 100) 
+    #m1.setParam("p2_rg", 100) 
     out1 = m1.runXY(0.01)
 
     m2= Model()
-    m2.p_model1.setParam("scale", 25) 
-    m2.p_model1.setParam("length", 1000) 
-    m2.p_model2.setParam("scale", 100)
-    m2.p_model2.setParam("rg", 100)
+    #m2.p_model1.setParam("scale", 25) 
+    #m2.p_model1.setParam("length", 1000) 
+    #m2.p_model2.setParam("scale", 100)
+    #m2.p_model2.setParam("rg", 100)
     out2 = m2.p_model1.runXY(0.01) + m2.p_model2.runXY(0.01)
+    print "Testing at Q = 0.01:"
     print out1, " = ", out2
-
-   
+    if out1 == out2:
+        print "===> Simple Test: Passed!"
+    else:
+        print "===> Simple Test: Failed!"

fittingview/src/sans/perspectives/fitting/plugin_models/testmodel.py

@@ -7 +7 @@
 """
 from sans.models.pluginmodel import Model1DPlugin  ##DO NOT CHANGE THIS LINE!!!
-from math import *                    ##DO NOT CHANGE THIS LINE!!!
-from numpy import *                ##DO NOT CHANGE THIS LINE!!!
+import math                  ##DO NOT CHANGE THIS LINE!!!
+import numpy               ##DO NOT CHANGE THIS LINE!!!
 
 ##PLEASE READ COMMENTS CAREFULLY !!! COMMENT ARE IN CAPITAL LETTERS AND AFTER ##
@@ -83 +83 @@
         ## numpy FUNCTIONS ARE FOR EXPERT USER
         
-        return self.params['A']+self.params['B']*cos(2.0*x)+self.params['C']*math.sin(2.0*x)
-   
+        return self.params['A']+self.params['B']*math.cos(2.0*x)+self.params['C']*math.sin(2.0*x)
+    
+## DO NOT MODIFY THE FOLLOWING LINES!!!!!!!!!!!!!!!!       
+if __name__ == "__main__": 
+    m= Model() 
+    out1 = m.runXY(0.0)
+    out2 = m.runXY(0.01)
+    isfine1 = numpy.isfinite(out1)
+    isfine2 = numpy.isfinite(out2)
+    print "Testing the value at Q = 0.0:"
+    print out1, " : finite? ", isfine1
+    print "Testing the value at Q = 0.01:"
+    print out2, " : finite? ", isfine2
+    if isfine1 and isfine2:
+        print "===> Simple Test: Passed!"
+    else:
+        print "===> Simple Test: Failed!"

fittingview/src/sans/perspectives/fitting/plugin_models/testmodel_2.py

@@ -133 +133 @@
             result = 1                      ## <-----   
         else:                               ## <-----   
-            result = sin(poly)/poly    ## <-----   
+            result = math.sin(poly)/poly    ## <-----   
             
         #Re-scale                          ## <-----   
@@ -139 +139 @@
 
         return result ## MODIFY ONLY RESULT. DON'T DELETE RETURN!!!!
-   
+    
+## DO NOT MODIFY THE FOLLOWING LINES!!!!!!!!!!!!!!!!       
+if __name__ == "__main__": 
+    m= Model() 
+    out1 = m.runXY(0.0)
+    out2 = m.runXY(0.01)
+    isfine1 = numpy.isfinite(out1)
+    isfine2 = numpy.isfinite(out2)
+    print "Testing the value at Q = 0.0:"
+    print out1, " : finite? ", isfine1
+    print "Testing the value at Q = 0.01:"
+    print out2, " : finite? ", isfine2
+    if isfine1 and isfine2:
+        print "===> Simple Test: Passed!"
+    else:
+        print "===> Simple Test: Failed!"