chore: remove comments and use public function to load models

Author: zmx27

news/fix-sasmodels.rst

@@ -4,7 +4,7 @@
 
 **Changed:**
 
-* Refactored code utilizing sasmodels to use the new sasview api.
+* <news item>
 
 **Deprecated:**
 
@@ -16,7 +16,7 @@
 
 **Fixed:**
 
-* <news item>
+* Refactored code utilizing sasmodels to use the new sasview api.
 
 **Security:**
 

src/diffpy/srfit/sas/sasparser.py

@@ -101,17 +101,13 @@ def parseFile(self, filename):
         Raises IOError if the file cannot be read
         Raises ParseError if the file cannot be parsed
         """
-        import sasdata.dataloader.loader as ld
+        import sasdata.dataloader.loader as sas_dataloader
 
-        Loader = ld.Loader
+        Loader = sas_dataloader.Loader
         loader = Loader()
 
-        # Convert Path object to string if needed
-        if not isinstance(filename, str):
-            filename = str(filename)
-
         try:
-            data = loader.load(filename)
+            data = loader.load(str(filename))
         except RuntimeError as e:
             raise ParseError(e)
         except ValueError as e:
@@ -122,16 +118,10 @@ def parseFile(self, filename):
         self._meta["filename"] = filename
         self._meta["datainfo"] = data
 
-        # Handle case where loader returns a list of data objects
-        if isinstance(data, list):
-            # If it's a list, iterate through each data object
-            for data_obj in data:
-                self._banks.append(
-                    [data_obj.x, data_obj.y, data_obj.dx, data_obj.dy]
-                )
-        else:
-            # If it's a single data object, use it directly
-            self._banks.append([data.x, data.y, data.dx, data.dy])
+        for data_obj in data:
+            self._banks.append(
+                [data_obj.x, data_obj.y, data_obj.dx, data_obj.dy]
+            )
         self.selectBank(0)
         return
 

src/diffpy/srfit/sas/sasprofile.py

@@ -82,15 +82,7 @@ def __init__(self, datainfo):
         datainfo
             The DataInfo object this wraps.
         """
-        # Handle case where datainfo is a list (new sasdata behavior)
-        if isinstance(datainfo, list):
-            if len(datainfo) == 0:
-                raise ValueError("Empty datainfo list provided")
-            # Use the first data object if it's a list
-            self._datainfo = datainfo[0]
-        else:
-            # Single datainfo object (legacy behavior)
-            self._datainfo = datainfo
+        self._datainfo = datainfo[0]
         Profile.__init__(self)
 
         self._xobs = self._datainfo.x

tests/test_characteristicfunctions.py

@@ -18,12 +18,12 @@
 
 import numpy
 import pytest
-
-# Use the updated SasView model API to load models
-from sasmodels.sasview_model import _make_standard_model
+from sasmodels.sasview_model import find_model, load_standard_models
 
 import diffpy.srfit.pdf.characteristicfunctions as cf
 
+load_standard_models()
+
 # # Global variables to be assigned in setUp
 # cf = None
 # Fixme: remove this code if imports don't break on testing
@@ -36,7 +36,7 @@ def testSphere(sas_available):
         pytest.skip("sas package not available")
     radius = 25
     # Calculate sphere cf from SphereModel
-    SphereModel = _make_standard_model("sphere")
+    SphereModel = find_model("sphere")
     model = SphereModel()
     model.setParam("radius", radius)
     ff = cf.SASCF("sphere", model)
@@ -58,7 +58,7 @@ def testSpheroid(sas_available):
     prad = 20.9
     erad = 33.114
     # Calculate cf from EllipsoidModel
-    EllipsoidModel = _make_standard_model("ellipsoid")
+    EllipsoidModel = find_model("ellipsoid")
     model = EllipsoidModel()
     model.setParam("radius_polar", prad)
     model.setParam("radius_equatorial", erad)
@@ -81,7 +81,7 @@ def testShell(sas_available):
     radius = 19.2
     thickness = 7.8
     # Calculate cf from VesicleModel
-    VesicleModel = _make_standard_model("vesicle")
+    VesicleModel = find_model("vesicle")
     model = VesicleModel()
     model.setParam("radius", radius)
     model.setParam("thickness", thickness)
@@ -105,7 +105,7 @@ def testCylinder(sas_available):
     radius = 100
     length = 30
 
-    CylinderModel = _make_standard_model("cylinder")
+    CylinderModel = find_model("cylinder")
     model = CylinderModel()
     model.setParam("radius", radius)
     model.setParam("length", length)

tests/test_sas.py

@@ -18,10 +18,12 @@
 import pytest
 
 # Use the updated SasView model API to load models
-from sasmodels.sasview_model import _make_standard_model
+from sasmodels.sasview_model import find_model, load_standard_models
 
 from diffpy.srfit.sas import SASGenerator, SASParser, SASProfile
 
+load_standard_models()
+
 # ----------------------------------------------------------------------------
 # FIXME: adjust sensitivity of the pytest.approx statements when ready to test
 # with sasview installed.
@@ -115,7 +117,7 @@ def testParser(sas_available, datafile):
 def test_generator(sas_available):
     if not sas_available:
         pytest.skip("sas package not available")
-    SphereModel = _make_standard_model("sphere")
+    SphereModel = find_model("sphere")
     model = SphereModel()
     gen = SASGenerator("sphere", model)
     for pname in model.params:
@@ -142,14 +144,14 @@ def test_generator(sas_available):
 def testGenerator2(sas_available, datafile):
     if not sas_available:
         pytest.skip("sas package not available")
-    EllipsoidModel = _make_standard_model("ellipsoid")
+    EllipsoidModel = find_model("ellipsoid")
     model = EllipsoidModel()
     gen = SASGenerator("ellipsoid", model)
 
     # Load the data using SAS tools
-    import sasdata.dataloader.loader as ld
+    import sasdata.dataloader.loader as sas_dataloader
 
-    Loader = ld.Loader
+    Loader = sas_dataloader.Loader
     loader = Loader()
     data = datafile("sas_ellipsoid_testdata.txt")
     datainfo = loader.load(str(data))