Fixup merge conflicts

Author: olivhoenen

docs/Makefile

@@ -31,7 +31,7 @@ clean: Makefile
 # Seems to overwrite autosummary documentation though! So not using this rn
 MODULE_EXCLUDE="../imas/examples/**" "../imas/**"
 apidocs: Makefile
-	sphinx-apidoc --implicit-namespaces -o "$(GENERATEDDIR)" "$(PROJECT_ROOT)/imaspy/" $(MODULE_EXCLUDE)
+	sphinx-apidoc --implicit-namespaces -o "$(GENERATEDDIR)" "$(PROJECT_ROOT)/imas/" $(MODULE_EXCLUDE)
 
 # Sphinx will run this automatically
 autogen: Makefile

imas/backends/db_entry_impl.py

@@ -36,30 +36,6 @@ class GetSampleParameters:
     """See :param:`imas.db_entry.DBEntry.get_sample.interpolation_method`."""
 
 
-@dataclass
-class GetSliceParameters:
-    """Helper class to store parameters to get_slice."""
-
-    time_requested: float
-    """See :param:`imaspy.db_entry.DBEntry.get_slice.time_requested`."""
-    interpolation_method: int
-    """See :param:`imaspy.db_entry.DBEntry.get_slice.interpolation_method`."""
-
-
-@dataclass
-class GetSampleParameters:
-    """Helper class to store parameters to get_sample."""
-
-    tmin: float
-    """See :param:`imaspy.db_entry.DBEntry.get_sample.tmin`."""
-    tmax: float
-    """See :param:`imaspy.db_entry.DBEntry.get_sample.tmax`."""
-    dtime: Optional[numpy.ndarray]
-    """See :param:`imaspy.db_entry.DBEntry.get_sample.dtime`."""
-    interpolation_method: Optional[int]
-    """See :param:`imaspy.db_entry.DBEntry.get_sample.interpolation_method`."""
-
-
 class DBEntryImpl(ABC):
     """Interface for DBEntry implementations."""