Atomic measurement

docs/explanation/atomic_interface.md

@@ -212,6 +212,25 @@ microwave_pulse = Pulse(
 
 ///
 
+#### Measurement
+
+To perform a measurement, we not only have to turn on an optical channel, we also have to turn on a detector, this is handled by the [`MeasurePulse`][oqd_core.interface.atomic.protocol.MeasurePulse].
+
+<!-- prettier-ignore -->
+/// admonition | Example
+    type: example
+
+Pulse that drives a fluorescent transition and turns on the detector for a duration $T$:
+
+```python
+detection_pulse = MeasurePulse(
+    beam=detection_beam,
+    duration=T,
+)
+```
+
+///
+
 ### Composition of Protocols
 
 The pulse program for a quantum experiment is usually more complex than a pulse of a single beam. This is handled with [`SequentialProtocol`][oqd_core.interface.atomic.protocol.SequentialProtocol] and [`ParallelProtocol`][oqd_core.interface.atomic.protocol.ParallelProtocol].

docs/explanation/math_interface.md

@@ -101,9 +101,13 @@ The compatible operators for the math interface consist of:
 The compatible named functions include:
 
 - trigonometric (`sin`, `cos`, `tan`)
+- inverse trigonometric functions (`asin`, `acos`, `atan`, `atan2`)
 - hyperbolic trigonometric (`sinh`, `cosh`, `tanh`)
+- inverse hyperbolic trigonometric functions (`asinh`, `acosh`, `atanh`)
 - exponential (`exp`)
 - logarithm (`log`)
+- complex number functions (`real`, `imag`, `conj`, `abs`)
+- step function (`heaviside`)
 
 ///
 

pyproject.toml

@@ -36,7 +36,7 @@ classifiers = [
 
 dependencies = [
   "pydantic>=2.10.6",
-  "oqd-compiler-infrastructure@git+https://github.com/openquantumdesign/oqd-compiler-infrastructure",
+  "oqd-compiler-infrastructure",
   "numpy",
   "scipy",
 ]
@@ -60,8 +60,14 @@ include = ["oqd_core*"]
 select = ["E4", "E7", "E9", "F", "I"]
 fixable = ["ALL"]
 
+[tool.uv.sources]
+oqd-compiler-infrastructure = { git = "https://github.com/openquantumdesign/oqd-compiler-infrastructure" }
+
 [dependency-groups]
-dev = ["pre-commit>=4.1.0"]
+dev = [
+    "jupyter>=1.1.1",
+    "pre-commit>=4.1.0",
+]
 
 
 [project.urls]

src/oqd_core/compiler/atomic/canonicalize.py

@@ -270,6 +270,9 @@ def _get_duration(cls, model):
                 [cls._get_duration(p) for p in model.sequence],
             )
         if isinstance(model, ParallelProtocol):
+            if len(model.sequence) == 1:
+                return cls._get_duration(model.sequence[0])
+
             return max(
                 *[cls._get_duration(p) for p in model.sequence],
             )

src/oqd_core/interface/atomic/__init__.py

@@ -13,7 +13,14 @@
 # limitations under the License.
 
 from .circuit import AtomicCircuit
-from .protocol import Beam, ParallelProtocol, Protocol, Pulse, SequentialProtocol
+from .protocol import (
+    Beam,
+    MeasurePulse,
+    ParallelProtocol,
+    Protocol,
+    Pulse,
+    SequentialProtocol,
+)
 from .species import Ba133IIBuilder, IonBuilder, Yb171IIBuilder
 from .system import Ion, Level, Phonon, System, Transition
 
@@ -32,4 +39,5 @@
     "IonBuilder",
     "Yb171IIBuilder",
     "Ba133IIBuilder",
+    "MeasurePulse",
 ]

src/oqd_core/interface/atomic/protocol.py

@@ -30,6 +30,7 @@
     "Protocol",
     "ParallelProtocol",
     "SequentialProtocol",
+    "MeasurePulse",
 ]
 
 ########################################################################################
@@ -76,6 +77,16 @@ class Pulse(TypeReflectBaseModel):
     duration: float
 
 
+class MeasurePulse(Pulse):
+    """
+    Class representing a fluorescent measurement for some duration.
+
+    Attributes:
+        duration: Period of time to turn the measurement on for.
+
+    """
+
+
 class Protocol(TypeReflectBaseModel):
     """
     Class representing a light-matter interaction protocol/pulse program for the optical channels/beams.
@@ -92,7 +103,7 @@ class ParallelProtocol(Protocol):
         sequence: List of pulses or subprotocols to compose together in a parallel fashion.
     """
 
-    sequence: List[Union[Pulse, ProtocolSubTypes]]
+    sequence: List[Union[PulseSubTypes, ProtocolSubTypes]]
 
 
 class SequentialProtocol(Protocol):
@@ -103,7 +114,8 @@ class SequentialProtocol(Protocol):
         sequence: List of pulses or subprotocols to compose together in a sequntial fashion.
     """
 
-    sequence: List[Union[Pulse, ProtocolSubTypes]]
+    sequence: List[Union[PulseSubTypes, ProtocolSubTypes]]
 
 
 ProtocolSubTypes = Union[SequentialProtocol, ParallelProtocol]
+PulseSubTypes = Union[Pulse, MeasurePulse]

src/oqd_core/interface/atomic/system.py

@@ -162,6 +162,23 @@ class Ion(TypeReflectBaseModel):
     transitions: List[Transition]
     position: List[float]
 
+    @property
+    def _level_dict(self):
+        return {level.label: level for level in self.levels}
+
+    @property
+    def _transition_dict(self):
+        return {transition.label: transition for transition in self.transitions}
+
+    def __getitem__(self, label):
+        if label in self._level_dict.keys():
+            return self._level_dict[label]
+
+        if label in self._transition_dict.keys():
+            return self._transition_dict[label]
+
+        raise KeyError("Invalid key, label not in levels or transitions.")
+
 
 ########################################################################################