chore: fix some code parts from previous refator

ComPWA · Mar 11, 2021 · 059bda4 · 059bda4
1 parent 6b8a559
commit 059bda4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/docs/usage.ipynb b/docs/usage.ipynb
@@ -64,6 +64,7 @@
     "    create_relativistic_breit_wigner_with_ff,\n",
     ")\n",
     "from tensorwaves.data.generate import generate_data, generate_phsp\n",
+    "from tensorwaves.data.helicity import HelicityKinematicsConverter\n",
     "from tensorwaves.estimator import SympyUnbinnedNLL\n",
     "from tensorwaves.optimizer.callbacks import CSVSummary\n",
     "from tensorwaves.optimizer.minuit import Minuit2\n",
@@ -150,8 +151,9 @@
    },
    "outputs": [],
    "source": [
-    "phsp_sample = generate_phsp(300_000, model.adapter)\n",
-    "data_sample = generate_data(30_000, model.adapter, intensity)"
+    "data_converter = HelicityKinematicsConverter(model.adapter)\n",
+    "phsp_sample = generate_phsp(300_000, model.adapter.reaction_info)\n",
+    "data_sample = generate_data(30_000, model.adapter.reaction_info, data_converter, intensity)"
    ]
   },
   {

diff --git a/src/tensorwaves/interfaces.py b/src/tensorwaves/interfaces.py
@@ -161,7 +161,7 @@ class PhaseSpaceGenerator(ABC):
     def setup(self, reaction_info: ReactionInfo) -> None:
         """Hook for initialization of the PhaseSpaceGenerator.
 
-        Called before and generate calls.
+        Called before any generate calls.
         """
 
     @abstractmethod

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -4,7 +4,7 @@
 
 import expertsystem as es
 import pytest
-from expertsystem.amplitude.data import DataSet, EventCollection
+from expertsystem.amplitude.data import EventCollection
 from expertsystem.amplitude.dynamics.builder import (
     create_relativistic_breit_wigner_with_ff,
 )
@@ -16,7 +16,7 @@
 from tensorwaves.data.helicity import HelicityKinematicsConverter
 from tensorwaves.data.tf_phasespace import TFUniformRealNumberGenerator
 from tensorwaves.estimator import SympyUnbinnedNLL
-from tensorwaves.interfaces import DataConverter
+from tensorwaves.interfaces import DataConverter, DataSample
 from tensorwaves.optimizer.callbacks import (
     CallbackList,
     CSVSummary,
@@ -80,7 +80,7 @@ def phsp_sample(reaction_info: ReactionInfo) -> EventCollection:
 @pytest.fixture(scope="session")
 def phsp_set(
     kinematics: DataConverter, phsp_sample: EventCollection
-) -> DataSet:
+) -> DataSample:
     return kinematics.convert(phsp_sample)
 
 
@@ -106,13 +106,13 @@ def data_sample(
 def data_set(
     kinematics: DataConverter,
     data_sample: EventCollection,
-) -> DataSet:
+) -> DataSample:
     return kinematics.convert(data_sample)
 
 
 @pytest.fixture(scope="session")
 def estimator(
-    helicity_model: SympyModel, data_set: DataSet, phsp_set: DataSet
+    helicity_model: SympyModel, data_set: DataSample, phsp_set: DataSample
 ) -> SympyUnbinnedNLL:
     return SympyUnbinnedNLL(
         helicity_model,