Finish blocks, add fields

macro-consortium · Jan 24, 2025 · 46d8713 · 46d8713
1 parent 0fda4e4
commit 46d8713
Show file tree

Hide file tree

Showing 11 changed files with 317 additions and 1,028 deletions.
diff --git a/pyscope/scheduling/__init__.py b/pyscope/scheduling/__init__.py
@@ -16,9 +16,9 @@
 from ._block import _Block
 from .flat_field import FlatField
 from .dark_field import DarkField
+from .repositioning_field import RepositioningField
 from .autofocus_field import AutofocusField
-from .light_field import LightField
-from ._field import _Field
+from .field import Field
 from .status import Status
 from .snr_condition import SNRCondition
 from .time_condition import TimeCondition
@@ -50,8 +50,8 @@
     "TimeCondition",
     "SNRCondition",
     "Target",
-    "_Field",
-    "LightField",
+    "Field",
+    "RepositioningField",
     "AutofocusField",
     "DarkField",
     "FlatField",

diff --git a/pyscope/scheduling/_block.py b/pyscope/scheduling/_block.py
@@ -77,12 +77,12 @@ class is a base class that should not be instantiated directly. Instead,
         `~pyscope.telrun.InstrumentConfiguration` will be
         used to set the telescope's `~pyscope.telrun.InstrumentConfiguration`
         at the start of the `~pyscope.scheduling._Block` and will act as the
-        default for all `~pyscope.scheduling._Field` objects in the
+        default for all `~pyscope.scheduling.Field` objects in the
         `~pyscope.scheduling._Block` if one has not been provided. If a
-        `~pyscope.scheduling._Field` has a different
+        `~pyscope.scheduling.Field` has a different
         `~pyscope.telrun.InstrumentConfiguration`, it will override the block
         `~pyscope.telrun.InstrumentConfiguration` for the duration of the
-        `~pyscope.scheduling._Field`.
+        `~pyscope.scheduling.Field`.
 
     schedule : `~pyscope.scheduling.Schedule`, default : `None`
         The `~pyscope.scheduling.Schedule` that the
@@ -96,14 +96,14 @@ class is a base class that should not be instantiated directly. Instead,
     --------
     pyscope.scheduling.ScheduleBlock : A subclass of
         `~pyscope.scheduling._Block` that is used to schedule
-        `~pyscope.scheduling._Field` objects in a
+        `~pyscope.scheduling.Field` objects in a
         `~pyscope.scheduling.Schedule`.
     pyscope.scheduling.UnallocableBlock : A subclass of
         `~pyscope.scheduling._Block` that is used to represent unallocated
         time in a `~pyscope.scheduling.Schedule`.
     pyscope.telrun.InstrumentConfiguration : A class that represents the
         configuration of the telescope.
-    pyscope.scheduling._Field : A class that represents a field to observe.
+    pyscope.scheduling.Field : A class that represents a field to observe.
     """
 
     __tablename__ = "block"