easyreflectometry 1.3.3__tar.gz → 1.4.0__tar.gz

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easyreflectometry
-Version: 1.3.3
+Version: 1.4.0
 Summary: A reflectometry python package built on the EasyScience framework.
 Project-URL: homepage, https://docs.easyreflectometry.org
 Project-URL: documentation, https://docs.easyreflectometry.org
@@ -41,34 +41,33 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: <3.13,>=3.10
-Requires-Dist: bumps==1.0.0b7
-Requires-Dist: easyscience==1.3.0
-Requires-Dist: orsopy==1.2.1
-Requires-Dist: refl1d[webview]==1.0.0a12
-Requires-Dist: refnx==0.1.52
-Requires-Dist: scipp==25.2.0
-Requires-Dist: xhtml2pdf==0.2.17
+Requires-Python: <3.13,>=3.11
+Requires-Dist: bumps
+Requires-Dist: easyscience
+Requires-Dist: orsopy
+Requires-Dist: refl1d>=1.0.0rc0
+Requires-Dist: refnx
+Requires-Dist: scipp
+Requires-Dist: xhtml2pdf
 Provides-Extra: dev
-Requires-Dist: build==1.2.2.post1; extra == 'dev'
-Requires-Dist: codecov==2.1.13; extra == 'dev'
-Requires-Dist: coverage==7.7.0; extra == 'dev'
-Requires-Dist: coveralls==4.0.1; extra == 'dev'
-Requires-Dist: flake8==7.1.2; extra == 'dev'
-Requires-Dist: ipykernel==6.29.5; extra == 'dev'
-Requires-Dist: jupyter==1.1.1; extra == 'dev'
-Requires-Dist: jupyterlab==4.3.6; extra == 'dev'
-Requires-Dist: plopp==25.3.0; extra == 'dev'
-Requires-Dist: pooch==1.8.2; extra == 'dev'
-Requires-Dist: pytest-cov==6.0.0; extra == 'dev'
-Requires-Dist: pytest==8.3.5; extra == 'dev'
-Requires-Dist: ruff==0.11.0; extra == 'dev'
-Requires-Dist: toml==0.10.2; extra == 'dev'
-Requires-Dist: yapf==0.43.0; extra == 'dev'
+Requires-Dist: build; extra == 'dev'
+Requires-Dist: codecov; extra == 'dev'
+Requires-Dist: coverage; extra == 'dev'
+Requires-Dist: coveralls; extra == 'dev'
+Requires-Dist: flake8; extra == 'dev'
+Requires-Dist: ipykernel; extra == 'dev'
+Requires-Dist: jupyter; extra == 'dev'
+Requires-Dist: jupyterlab; extra == 'dev'
+Requires-Dist: plopp; extra == 'dev'
+Requires-Dist: pooch; extra == 'dev'
+Requires-Dist: pytest; extra == 'dev'
+Requires-Dist: pytest-cov; extra == 'dev'
+Requires-Dist: ruff; extra == 'dev'
+Requires-Dist: toml; extra == 'dev'
+Requires-Dist: yapf; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: myst-parser; extra == 'docs'
 Requires-Dist: nbsphinx; extra == 'docs'

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/pyproject.toml

@@ -21,41 +21,40 @@ classifiers = [
     "Topic :: Scientific/Engineering",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Development Status :: 3 - Alpha"
 ]
 
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.11,<3.13"
 
 dependencies = [
-    "easyscience==1.3.0",
-    "scipp==25.2.0",
-    "refnx==0.1.52",
-    "refl1d[webview]==1.0.0a12",
-    "orsopy==1.2.1",
-    "xhtml2pdf==0.2.17",
-    "bumps==1.0.0b7",
+    "easyscience",
+    "scipp",
+    "refnx",
+    "refl1d>=1.0.0rc0",
+    "orsopy",
+    "xhtml2pdf",
+    "bumps",
 ]
 
 [project.optional-dependencies]
 dev = [
-    "build==1.2.2.post1",
-    "codecov==2.1.13",
-    "coverage==7.7.0",
-    "coveralls==4.0.1",
-    "flake8==7.1.2",
-    "ipykernel==6.29.5",
-    "jupyter==1.1.1",
-    "jupyterlab==4.3.6",
-    "plopp==25.3.0",
-    "pooch==1.8.2",
-    "pytest==8.3.5",
-    "pytest-cov==6.0.0",
-    "ruff==0.11.0",
-    "toml==0.10.2",
-    "yapf==0.43.0",
+    "build",
+    "codecov",
+    "coverage",
+    "coveralls",
+    "flake8",
+    "ipykernel",
+    "jupyter",
+    "jupyterlab",
+    "plopp",
+    "pooch",
+    "pytest",
+    "pytest-cov",
+    "ruff",
+    "toml",
+    "yapf",
 ]
 
 docs = [
@@ -134,10 +133,9 @@ force-single-line = true
 legacy_tox_ini = """
 [tox]
 isolated_build = True
-envlist = py{3.10,3.11,3.12}
+envlist = py{3.11,3.12}
 [gh-actions]
 python =
-        3.10: py310
         3.11: py311
         3.12: py312
 [gh-actions:env]

easyreflectometry-1.4.0/src/easyreflectometry/__version__.py

@@ -0,0 +1 @@
+__version__ = '1.4.0'

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/calculators/bornagain/calculator.py

@@ -1,6 +1,6 @@
 __author__ = 'github.com/arm61'
 
-from easyscience.Objects.Inferface import ItemContainer
+from easyscience.fitting.calculators.interface_factory import ItemContainer
 
 from easyreflectometry.model import Model
 from easyreflectometry.sample import Layer

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/calculators/calculator_base.py

@@ -4,8 +4,8 @@ from abc import ABCMeta
 from typing import Callable
 
 import numpy as np
-from easyscience.Objects.core import ComponentSerializer
-from easyscience.Objects.Inferface import ItemContainer
+from easyscience.fitting.calculators.interface_factory import ItemContainer
+from easyscience.io import SerializerComponent
 
 from easyreflectometry.model import Model
 from easyreflectometry.sample import BaseAssembly
@@ -17,7 +17,7 @@ from easyreflectometry.sample import Multilayer
 from .wrapper_base import WrapperBase
 
 
-class CalculatorBase(ComponentSerializer, metaclass=ABCMeta):
+class CalculatorBase(SerializerComponent, metaclass=ABCMeta):
     """
     This class is a template and defines all properties that a calculator should have.
     """

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/calculators/factory.py

@@ -1,7 +1,7 @@
 __author__ = 'github.com/wardsimon'
 from typing import Callable
 
-from easyscience.Objects.Inferface import InterfaceFactoryTemplate
+from easyscience.fitting.calculators.interface_factory import InterfaceFactoryTemplate
 
 from easyreflectometry.calculators import CalculatorBase
 

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/calculators/refl1d/wrapper.py

@@ -42,9 +42,7 @@ class Refl1dWrapper(WrapperBase):
 
         :param name: The name of the item
         """
-        self.storage['item'][name] = Repeat(
-            names.Stack(names.Slab(names.SLD(), thickness=0, interface=0)), name=str(name)
-        )
+        self.storage['item'][name] = Repeat(names.Stack(names.Slab(names.SLD(), thickness=0, interface=0)), name=str(name))
         del self.storage['item'][name].stack[0]
 
     def update_layer(self, name: str, **kwargs):
@@ -66,7 +64,9 @@ class Refl1dWrapper(WrapperBase):
         :param key: The given value keys
         """
         if key in ['magnetism_rhoM', 'magnetism_thetaM']:
-            return getattr(self.storage['layer'][name].magnetism, key.split('_')[-1]).value #TODO: check if we want to return the raw value or the full Parameter  # noqa: E501
+            return getattr(
+                self.storage['layer'][name].magnetism, key.split('_')[-1]
+            ).value  # TODO: check if we want to return the raw value or the full Parameter  # noqa: E501
         return super().get_layer_value(name, key)
 
     def create_model(self, name: str):
@@ -231,6 +231,7 @@ def _get_probe(
     model_name: str,
     storage: dict,
     oversampling_factor: int = 1,
+    magnetism: bool = False,
 ) -> names.QProbe:
     probe = names.QProbe(
         Q=q_array,
@@ -238,6 +239,12 @@ def _get_probe(
         intensity=storage['model'][model_name]['scale'],
         background=storage['model'][model_name]['bkg'],
     )
+
+    # Add theta_offset attribute if magnetism is enabled
+    # This is required for PolarizedQProbe to work correctly
+    if magnetism:
+        probe.theta_offset = names.Parameter.default(0, name='theta_offset')
+
     if oversampling_factor > 1:
         probe.calc_Qo = _get_oversampling_q(q_array, dq_array, oversampling_factor)
     return probe
@@ -250,7 +257,7 @@ def _get_polarized_probe(
     storage: dict,
     oversampling_factor: int = 1,
     all_polarizations: bool = False,
-) -> names.PolarizedQProbe:
+) -> names.PolarizedNeutronQProbe:
     four_probes = []
     for i in range(4):
         if i == 0 or all_polarizations:
@@ -260,11 +267,17 @@ def _get_polarized_probe(
                 model_name=model_name,
                 storage=storage,
                 oversampling_factor=oversampling_factor,
+                magnetism=True,  # Enable magnetism for polarized probes
             )
         else:
             probe = None
         four_probes.append(probe)
-    return names.PolarizedQProbe(xs=four_probes, name='polarized')
+
+    # Create polarized probe and work around initialization bug
+    polarized_probe = names.PolarizedNeutronQProbe.__new__(names.PolarizedNeutronQProbe)
+    polarized_probe._union_cache_key = None  # Initialize missing attribute
+    polarized_probe.__init__(xs=four_probes, name='polarized')
+    return polarized_probe
 
 
 def _build_sample(storage: dict, model_name: str) -> names.Stack:

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/data/__init__.py

@@ -2,10 +2,12 @@ from .data_store import DataSet1D
 from .data_store import ProjectData
 from .measurement import load
 from .measurement import load_as_dataset
+from .measurement import merge_datagroups
 
 __all__ = [
-    "load",
-    "load_as_dataset",
-    "ProjectData",
-    "DataSet1D",
+    'load',
+    'load_as_dataset',
+    'merge_datagroups',
+    'ProjectData',
+    'DataSet1D',
 ]

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/data/data_store.py

@@ -6,15 +6,16 @@ from typing import TypeVar
 from typing import Union
 
 import numpy as np
-from easyscience.Objects.core import ComponentSerializer
-from easyscience.Utils.io.dict import DictSerializer
+from easyscience.io import SerializerComponent
+from easyscience.io import SerializerDict
 
+# from easyscience.utils.io.dict import DictSerializer
 from easyreflectometry.model import Model
 
 T = TypeVar('T')
 
 
-class ProjectData(ComponentSerializer):
+class ProjectData(SerializerComponent):
     def __init__(self, name='DataStore', exp_data=None, sim_data=None):
         self.name = name
         if exp_data is None:
@@ -25,7 +26,7 @@ class ProjectData(ComponentSerializer):
         self.sim_data = sim_data
 
 
-class DataStore(Sequence, ComponentSerializer):
+class DataStore(Sequence, SerializerComponent):
     def __init__(self, *args, name='DataStore'):
         self.name = name
         self.items = list(args)
@@ -55,7 +56,7 @@ class DataStore(Sequence, ComponentSerializer):
         items = d['items']
         del d['items']
         obj = cls.from_dict(d)
-        decoder = DictSerializer()
+        decoder = SerializerDict()
         obj.items = [decoder.decode(item) for item in items]
         return obj
 
@@ -68,7 +69,7 @@ class DataStore(Sequence, ComponentSerializer):
         return [self[idx] for idx in range(len(self)) if self[idx].is_simulation]
 
 
-class DataSet1D(ComponentSerializer):
+class DataSet1D(SerializerComponent):
     def __init__(
         self,
         name: str = 'Series',

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/data/measurement.py

@@ -1,5 +1,6 @@
 __author__ = 'github.com/arm61'
 
+import os
 from typing import TextIO
 from typing import Union
 
@@ -25,11 +26,16 @@ def load(fname: Union[TextIO, str]) -> sc.DataGroup:
 def load_as_dataset(fname: Union[TextIO, str]) -> DataSet1D:
     """Load data from an ORSO .ort file as a DataSet1D."""
     data_group = load(fname)
+    basename = os.path.splitext(os.path.basename(fname))[0]
+    data_name = 'R_' + basename
+    coords_name = 'Qz_' + basename
+    coords_name = list(data_group['coords'].keys())[0] if coords_name not in data_group['coords'] else coords_name
+    data_name = list(data_group['data'].keys())[0] if data_name not in data_group['data'] else data_name
     return DataSet1D(
-        x=data_group['coords']['Qz_0'].values,
-        y=data_group['data']['R_0'].values,
-        ye=data_group['data']['R_0'].variances,
-        xe=data_group['coords']['Qz_0'].variances,
+        x=data_group['coords'][coords_name].values,
+        y=data_group['data'][data_name].values,
+        ye=data_group['data'][data_name].variances,
+        xe=data_group['coords'][coords_name].variances,
     )
 
 
@@ -86,6 +92,8 @@ def _load_txt(fname: Union[TextIO, str]) -> sc.DataGroup:
     if ',' in first_line:
         delimiter = ','
 
+    basename = os.path.splitext(os.path.basename(fname))[0]
+
     try:
         # First load only the data to check column count
         data = np.loadtxt(fname, delimiter=delimiter, comments='#')
@@ -97,7 +105,7 @@ def _load_txt(fname: Union[TextIO, str]) -> sc.DataGroup:
 
         # Verify minimum column requirement
         if num_columns < 3:
-            raise ValueError(f"File must contain at least 3 columns (found {num_columns})")
+            raise ValueError(f'File must contain at least 3 columns (found {num_columns})')
 
         # Now unpack the data based on column count
         if num_columns >= 4:
@@ -108,15 +116,47 @@ def _load_txt(fname: Union[TextIO, str]) -> sc.DataGroup:
 
     except (ValueError, IOError) as error:
         # Re-raise with more descriptive message
-        raise ValueError(f"Failed to load data from {fname}: {str(error)}") from error
+        raise ValueError(f'Failed to load data from {fname}: {str(error)}') from error
 
-    data = {'R_0': sc.array(dims=['Qz_0'], values=y, variances=np.square(e))}
+    data_name = 'R_' + basename
+    coords_name = 'Qz_' + basename
+    data = {data_name: sc.array(dims=[coords_name], values=y, variances=np.square(e))}
     coords = {
-        data['R_0'].dims[0]: sc.array(
-            dims=['Qz_0'],
+        data[data_name].dims[0]: sc.array(
+            dims=[coords_name],
             values=x,
             variances=np.square(xe),
             unit=sc.Unit('1/angstrom'),
         )
     }
     return sc.DataGroup(data=data, coords=coords)
+
+
+def merge_datagroups(*data_groups: sc.DataGroup) -> sc.DataGroup:
+    """Merge multiple DataGroups into a single DataGroup."""
+    merged_data = {}
+    merged_coords = {}
+    merged_attrs = {}
+
+    for group in data_groups:
+        for key, value in group['data'].items():
+            if key not in merged_data:
+                merged_data[key] = value
+            else:
+                merged_data[key] = sc.concatenate([merged_data[key], value])
+
+        for key, value in group['coords'].items():
+            if key not in merged_coords:
+                merged_coords[key] = value
+            else:
+                merged_coords[key] = sc.concatenate([merged_coords[key], value])
+
+        if 'attrs' not in group:
+            continue
+        for key, value in group['attrs'].items():
+            if key not in merged_attrs:
+                merged_attrs[key] = value
+            else:
+                merged_attrs[key] = {**merged_attrs[key], **value}
+
+    return sc.DataGroup(data=merged_data, coords=merged_coords, attrs=merged_attrs)

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/fitting.py

@@ -50,7 +50,8 @@ class MultiFitter:
             )
             sld_profile = self.easy_science_multi_fitter._fit_objects[i].interface.sld_profile(self._models[i].unique_name)
             new_data[f'SLD_{id}'] = sc.array(dims=[f'z_{id}'], values=sld_profile[1] * 1e-6, unit=sc.Unit('1/angstrom') ** 2)
-            new_data['attrs'][f'R_{id}_model'] = {'model': sc.scalar(self._models[i].as_dict())}
+            if 'attrs' in new_data:
+                new_data['attrs'][f'R_{id}_model'] = {'model': sc.scalar(self._models[i].as_dict())}
             new_data['coords'][f'z_{id}'] = sc.array(
                 dims=[f'z_{id}'], values=sld_profile[0], unit=(1 / new_data['coords'][f'Qz_{id}'].unit).unit
             )

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/model/__init__.py

@@ -2,12 +2,14 @@ from .model import Model
 from .model_collection import ModelCollection
 from .resolution_functions import LinearSpline
 from .resolution_functions import PercentageFwhm
+from .resolution_functions import Pointwise
 from .resolution_functions import ResolutionFunction
 
 __all__ = (
-    "LinearSpline",
-    "PercentageFwhm",
-    "ResolutionFunction",
-    "Model",
-    "ModelCollection",
+    'LinearSpline',
+    'PercentageFwhm',
+    'Pointwise',
+    'ResolutionFunction',
+    'Model',
+    'ModelCollection',
 )

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/model/model.py

@@ -8,9 +8,9 @@ from typing import Optional
 from typing import Union
 
 import numpy as np
+from easyscience import ObjBase as BaseObj
 from easyscience import global_object
-from easyscience.Objects.ObjectClasses import BaseObj
-from easyscience.Objects.variable import Parameter
+from easyscience.variable import Parameter
 
 from easyreflectometry.sample import BaseAssembly
 from easyreflectometry.sample import Sample
@@ -42,6 +42,8 @@ DEFAULTS = {
     },
 }
 
+COLORS = ['#0173B2', '#DE8F05', '#029E73', '#D55E00', '#CC78BC', '#CA9161', '#FBAFE4', '#949494', '#ECE133', '#56B4E9']
+
 
 class Model(BaseObj):
     """Model is the class that represents the experiment.
@@ -60,8 +62,8 @@ class Model(BaseObj):
         scale: Union[Parameter, Number, None] = None,
         background: Union[Parameter, Number, None] = None,
         resolution_function: Union[ResolutionFunction, None] = None,
-        name: str = 'EasyModel',
-        color: str = 'black',
+        name: str = 'Model',
+        color: str = COLORS[0],
         unique_name: Optional[str] = None,
         interface=None,
     ):
@@ -70,7 +72,7 @@ class Model(BaseObj):
         :param sample: The sample being modelled.
         :param scale: Scaling factor of profile.
         :param background: Linear background magnitude.
-        :param name: Name of the model, defaults to 'EasyModel'.
+        :param name: Name of the model, defaults to 'Model'.
         :param resolution_function: Resolution function, defaults to PercentageFwhm.
         :param interface: Calculator interface, defaults to `None`.
 

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/model/model_collection.py

@@ -4,6 +4,7 @@ from typing import List
 from typing import Optional
 from typing import Tuple
 
+from easyreflectometry.model.model import COLORS
 from easyreflectometry.sample.collections.base_collection import BaseCollection
 
 from .model import Model
@@ -18,7 +19,7 @@ class ModelCollection(BaseCollection):
     def __init__(
         self,
         *models: Tuple[Model],
-        name: str = 'EasyModels',
+        name: str = 'Models',
         interface=None,
         unique_name: Optional[str] = None,
         populate_if_none: bool = True,
@@ -41,7 +42,8 @@ class ModelCollection(BaseCollection):
         :param model: Model to add.
         """
         if model is None:
-            model = Model(name='EasyModel added', interface=self.interface)
+            color = COLORS[len(self) % len(COLORS)]
+            model = Model(name='Model', interface=self.interface, color=color)
         self.append(model)
 
     def duplicate_model(self, index: int):
@@ -77,6 +79,6 @@ class ModelCollection(BaseCollection):
             collection.add_model(Model.from_dict(model_data))
 
         if len(collection) != len(this_dict['data']):
-            raise ValueError(f"Expected {len(collection)} models, got {len(this_dict['data'])}")
+            raise ValueError(f'Expected {len(collection)} models, got {len(this_dict["data"])}')
 
         return collection

{easyreflectometry-1.3.3 → easyreflectometry-1.4.0}/src/easyreflectometry/model/resolution_functions.py

@@ -30,6 +30,8 @@ class ResolutionFunction:
             return PercentageFwhm(data['constant'])
         if data['smearing'] == 'LinearSpline':
             return LinearSpline(data['q_data_points'], data['fwhm_values'])
+        if data['smearing'] == 'Pointwise':
+            return Pointwise([data['q_data_points'], data['R_data_points'], data['sQz_data_points']])
         raise ValueError('Unknown resolution function type')
 
 
@@ -60,3 +62,61 @@ class LinearSpline(ResolutionFunction):
         self, skip: Optional[List[str]] = None
     ) -> dict[str, str]:  # skip is kept for consistency of the as_dict signature
         return {'smearing': 'LinearSpline', 'q_data_points': list(self.q_data_points), 'fwhm_values': list(self.fwhm_values)}
+
+
+# add pointwise smearing funtion
+class Pointwise(ResolutionFunction):
+    def __init__(self, q_data_points: list[np.ndarray]):
+        self.q_data_points = q_data_points
+        self.q = None
+
+    def smearing(self, q: Union[np.ndarray, float] = None) -> np.ndarray:
+        Qz = self.q_data_points[0]
+        R = self.q_data_points[1]
+        sQz = self.q_data_points[2]
+        if q is None:
+            q = self.q_data_points[0]
+        self.q = q
+        sQzs = np.sqrt(sQz)
+        if isinstance(Qz, float):
+            Qz = np.array(Qz)
+
+        smeared = self.apply_smooth_smearing(Qz, R, sQzs)
+        return smeared
+
+    def as_dict(
+        self, skip: Optional[List[str]] = None
+    ) -> dict[str, str]:  # skip is kept for consistency of the as_dict signature
+        return {
+            'smearing': 'Pointwise',
+            'q_data_points': list(self.q_data_points[0]),
+            'R_data_points': list(self.q_data_points[1]),
+            'sQz_data_points': list(self.q_data_points[2]),
+        }
+
+    def gaussian_smearing(self, qt, Qz, R, sQz):
+        weights = np.exp(-0.5 * ((qt - Qz) / sQz) ** 2)
+        if np.sum(weights) == 0 or not np.isfinite(np.sum(weights)):
+            return np.sum(R)
+        weights /= sQz * np.sqrt(2 * np.pi)
+        return np.sum(R * weights) / np.sum(weights)
+
+    def apply_smooth_smearing(self, Qz, R, sQzs):
+        """
+        Apply smooth resolution smearing using convolution with Gaussian kernel.
+        """
+        if self.q is None:
+            R_smeared = np.zeros_like(Qz)
+        else:
+            R_smeared = np.zeros_like(self.q)
+
+        if not isinstance(Qz, np.ndarray):
+            Qz = np.array(Qz)
+        if not isinstance(R, np.ndarray):
+            R = np.array(R)
+        R_smeared = np.zeros_like(self.q)
+
+        for i, qt in enumerate(self.q):
+            R_smeared[i] = self.gaussian_smearing(qt, Qz, R, sQzs)
+
+        return R_smeared