Merge commit '4039b54f44d6c3f6632c53a0b8a9e049ec669e2e' into feat/mea…

…sure-channels

CHANGELOG.md

@@ -7,14 +7,16 @@
 ### Changed
 - Pulses with `pulse.axis_angle = None` are now compatible with an `IQChannel` as all signal on the I port.
 
+### Fixed
+- Switched channel `RF_inputs` and `RF_outputs` for Octave
+
 ## [0.3.0]
 ### Added
 - Added InOutSingleChannel
 - Added optional `config_settings` property to quam components indicating that they should be called before/after other components when generating QUA configuration
 - Added support for the new Octave API.
 - Added support for `Literal` types in QuAM
 
-
 ### Changed
 - Changed `InOutIQChannel.input_offset_I/Q` to `InOutIQChannel.opx_input_offset_I/Q`
 - Renamed `SingleChannel.output_offset` -> `SingleChannel.opx_output_offset`

quam/components/channels.py

@@ -812,7 +812,7 @@ def apply_to_config(self, config: dict):
                     f"OctaveUpConverter (id={self.frequency_converter_up.id}) without "
                     "an attached Octave"
                 )
-            element_cfg["RF_outputs"] = {
+            element_cfg["RF_inputs"] = {
                 "port": (octave.name, self.frequency_converter_up.id)
             }
         elif str_ref.is_reference(self.frequency_converter_up):
@@ -919,7 +919,7 @@ def apply_to_config(self, config: dict):
                     f"OctaveDownConverter (id={self.frequency_converter_down.id}) "
                     "without an attached Octave"
                 )
-            element_cfg["RF_inputs"] = {
+            element_cfg["RF_outputs"] = {
                 "port": (octave.name, self.frequency_converter_down.id)
             }
         elif str_ref.is_reference(self.frequency_converter_down):

quam/components/octave.py

@@ -262,7 +262,7 @@ def apply_to_config(self, config: Dict) -> None:
         if self.id in config["octaves"][self.octave.name]["RF_outputs"]:
             raise KeyError(
                 f"Error generating config: "
-                f'config["octaves"]["{self.octave.name}"]["RF_inputs"] '
+                f'config["octaves"]["{self.octave.name}"]["RF_outputs"] '
                 f'already has an entry for OctaveDownConverter with id "{self.id}"'
             )