🚧 Add more types

piel/experimental/models/cables.py

@@ -16,7 +16,7 @@ def generic_banana(
             name="OUT",
             domain="DC",
             connector="Male",
-        )
+        ),
     ]
 
     return DCCable(
@@ -26,9 +26,9 @@ def generic_banana(
     )
 
 
-
 def rg164(
     length_m: float,
+    name: str = "RG164",
     **kwargs,
 ) -> CoaxialCable:
     geometry = CoaxialCableGeometryType(
@@ -45,13 +45,14 @@ def rg164(
             name="OUT",
             domain="RF",
             connector="SMA",
-        )
+        ),
     ]
 
     return CoaxialCable(
-        name="RG164",
+        name=name,
         geometry=geometry,
         ports=ports,
+        model="RG164",
         **kwargs,
     )
 
@@ -75,7 +76,7 @@ def generic_sma(
             name="OUT",
             domain="RF",
             connector="SMA",
-        )
+        ),
     ]
 
     return CoaxialCable(

piel/experimental/models/multimeter.py

@@ -31,4 +31,6 @@ def DMM6500(**kwargs) -> Multimeter:
         ),
     ]
 
-    return Multimeter(name="DMM6500", ports=ports, manufacturer="Keithley", **kwargs)
+    return Multimeter(
+        name="DMM6500", ports=ports, manufacturer="Keithley", model="DMM6500", **kwargs
+    )

piel/experimental/models/oscilloscope.py

@@ -2,7 +2,9 @@
 from ..types import Oscilloscope
 
 
-def create_two_port_oscilloscope() -> Oscilloscope:
+def create_two_port_oscilloscope(
+    name: str = "two_port_oscilloscope", **kwargs
+) -> Oscilloscope:
     ports = [
         PhysicalPort(
             name="CH1",
@@ -17,12 +19,12 @@ def create_two_port_oscilloscope() -> Oscilloscope:
     ]
 
     return Oscilloscope(
-        name="two_port_oscilloscope",
+        name=name,
         ports=ports,
     )
 
 
-def DPO73304(**kwargs) -> Oscilloscope:
+def DPO73304(name: str = "DPO73304", **kwargs) -> Oscilloscope:
     ports = [
         PhysicalPort(
             name="CH1",
@@ -37,5 +39,5 @@ def DPO73304(**kwargs) -> Oscilloscope:
     ]
 
     return Oscilloscope(
-        name="DPO73304", ports=ports, manufacturer="Tektronix", **kwargs
+        name=name, ports=ports, manufacturer="Tektronix", model="DPO73304", **kwargs
     )

piel/experimental/models/rf_calibration.py

@@ -2,16 +2,16 @@
 
 
 def short_85052D():
-    return Short(name="short_85052D", manufacturer="Agilent")
+    return Short(name="short_85052D", model="85052D", manufacturer="Agilent")
 
 
 def open_85052D():
-    return Open(name="open_85052D", manufacturer="Agilent")
+    return Open(name="open_85052D", model="85052D", manufacturer="Agilent")
 
 
 def load_85052D():
-    return Load(name="load_82052D", manufacturer="Agilent")
+    return Load(name="load_82052D", model="85052D", manufacturer="Agilent")
 
 
 def through_85052D():
-    return Through(name="through_82052D", manufacturer="Agilent")
+    return Through(name="through_82052D", model="85052D", manufacturer="Agilent")

piel/experimental/models/rf_passives.py

@@ -1,7 +1,12 @@
-from ...types import PhysicalPort, PowerSplitter
+from typing import Optional
+from functools import partial
+from ...types import PhysicalPort, PowerSplitter, BiasTee
 
 
-def create_power_splitter_1to2():
+def create_power_splitter_1to2(name: Optional[str] = None):
+    if name is None:
+        name = "power_splitter_1to2"
+
     ports = [
         PhysicalPort(
             name="IN",
@@ -21,6 +26,62 @@ def create_power_splitter_1to2():
     ]
 
     return PowerSplitter(
-        name="power_splitter_1to2",
+        name=name,
         ports=ports,
     )
+
+
+def create_bias_tee(name: Optional[str] = None):
+    if name is None:
+        name = "bias_tee"
+
+    ports = [
+        PhysicalPort(
+            name="IN_RF",
+            domain="RF",
+            connector="SMA",
+        ),
+        PhysicalPort(
+            name="IN_DC",
+            domain="RF",
+            connector="SMA",
+        ),
+        PhysicalPort(
+            name="OUT",
+            domain="RF",
+            connector="SMA",
+        ),
+    ]
+
+    return BiasTee(
+        name=name,
+        ports=ports,
+    )
+
+
+def create_attenuator(name: Optional[str] = None):
+    if name is None:
+        name = "attenuator"
+
+    ports = [
+        PhysicalPort(
+            name="RF",
+            domain="RF",
+            connector="SMA",
+        ),
+        PhysicalPort(
+            name="OUT",
+            domain="RF",
+            connector="SMA",
+        ),
+    ]
+
+    return BiasTee(
+        name=name,
+        ports=ports,
+    )
+
+
+Picosecond5575A104 = partial(
+    create_bias_tee, manufacturer="Picosecond Pulse Labs", model="5575A104"
+)

piel/experimental/models/sourcemeter.py

@@ -1,11 +1,21 @@
 from typing import Optional
 from ...types import PhysicalPort
-from ..types import Sourcemeter
+from ..types import Sourcemeter, SourcemeterConfiguration
 
 
-def SMU2450(name: Optional[str] = None,
-            **kwargs) -> Sourcemeter:
-
+def create_dc_operating_point_configuration(
+    voltage_V: float,
+) -> SourcemeterConfiguration:
+    return SourcemeterConfiguration(voltage_set_V=voltage_V)
+
+
+def create_dc_sweep_configuration(
+    voltage_range_V: tuple[float, float],
+) -> SourcemeterConfiguration:
+    return SourcemeterConfiguration(voltage_range_V=voltage_range_V)
+
+
+def SMU2450(name: Optional[str] = None, **kwargs) -> Sourcemeter:
     if name is None:
         name = "SMU2450"
 
@@ -37,4 +47,6 @@ def SMU2450(name: Optional[str] = None,
         ),
     ]
 
-    return Sourcemeter(name=name, manufacturer="Keithley", ports=ports, **kwargs)
+    return Sourcemeter(
+        name=name, manufacturer="Keithley", model="", ports=ports, **kwargs
+    )

piel/experimental/models/vna.py

@@ -2,4 +2,4 @@
 
 
 def E8364A(**kwargs) -> pe.types.VNA:
-    return pe.types.VNA(name="E8364A", manufacturer="Agilent", **kwargs)
+    return pe.types.VNA(name="E8364A", manufacturer="Agilent", model="E8364A", **kwargs)

piel/experimental/models/waveform_generator.py

@@ -1,4 +1,4 @@
-from ...types import PhysicalPort, PulseSource
+from ...types import PhysicalPort, PulseSource, SignalTimeSources
 from ..types import WaveformGenerator, WaveformGeneratorConfiguration
 
 
@@ -38,9 +38,26 @@ def create_one_port_square_wave_waveform_generator(
         name="two_port_oscilloscope",
         ports=ports,
         configuration=configuration,
-        manufacturer="Tektronix",
     )
 
 
-def AWG70001A(**kwargs) -> WaveformGenerator:
-    pass
+def AWG70001A(signal: SignalTimeSources, **kwargs) -> WaveformGenerator:
+    # Configure the waveform generator
+    configuration = WaveformGeneratorConfiguration(signal=signal)
+
+    # Configure the ports
+    ports = [
+        PhysicalPort(
+            name="CH1",
+            domain="RF",
+            connector="SMA",
+        ),
+    ]
+
+    return WaveformGenerator(
+        name="AWG70001A",
+        ports=ports,
+        configuration=configuration,
+        manufacturer="Tektronix",
+        **kwargs
+    )

piel/experimental/types/cryostat.py

@@ -1,3 +1,4 @@
+from typing import Optional
 from ...types import Environment, Component
 
 
@@ -6,7 +7,7 @@ class TemperatureStage(Environment, Component):
     Standard definition for a generic temperature stage.
     """
 
-    surface_area_m2: float  # TODO move to a geometry type.
+    surface_area_m2: Optional[float] = None  # TODO move to a geometry type.
 
 
 class Cryostat(Component):

piel/experimental/types/dc.py

@@ -8,8 +8,10 @@ class SourcemeterConfiguration(DeviceConfiguration):
     not the experimental setup connectivity.
     """
 
-    current_limit_A: float
-    voltage_limit_V: float
+    voltage_set_V: Optional[float] = None
+    voltage_range_V: Optional[tuple] = None
+    current_limit_A: Optional[float] = None
+    voltage_limit_V: Optional[float] = None
 
 
 class Sourcemeter(Device):

piel/types/__init__.py

@@ -50,6 +50,7 @@
 
 from .electrical.rf_passives import (
     PowerSplitter,
+    BiasTee,
 )
 
 from .electro_optic import (
@@ -60,7 +61,18 @@
     SwitchFunctionParameter,
     SParameterCollection,
 )
-from .electronic import HVAMetricsType, LNAMetricsType, ElectronicCircuitComponent
+
+from .electronic.core import (
+    ElectronicCircuit,
+    ElectronicChip,
+    ElectronicCircuitComponent,
+)
+from .electronic.amplifier import RFTwoPortAmplifier
+from .electronic.hva import HVAMetricsType, HighVoltageTwoPortAmplifier
+from .electronic.lna import LNAMetricsType, LowNoiseTwoPortAmplifier
+
+from .frequency import FrequencyNetworkModel
+
 from .file_system import ProjectType
 from .integration import CircuitComponent
 from .materials import (
@@ -81,7 +93,6 @@
 from .signal.dc_data import SignalDC, DCSweepData
 
 from .signal.frequency import (
-    SParameterNetwork,
     TwoPortCalibrationNetworkCollection,
 )
 

piel/types/connectivity/physical.py

@@ -39,3 +39,8 @@ class PhysicalComponent(Component):
     """
     The manufacturer of the device.
     """
+
+    model: Optional[str] = None
+    """
+    The model of the device.
+    """

piel/types/electrical/rf_passives.py

@@ -1,5 +1,18 @@
-from ...types import PhysicalComponent
+from ...types import PhysicalComponent, MinimumMaximumType
 
 
-class PowerSplitter(PhysicalComponent):
+class RFComponent(PhysicalComponent):
+    bandwidth: MinimumMaximumType = None
+
+
+class PowerSplitter(RFComponent):
+    pass
+
+
+class BiasTee(RFComponent):
+    pass
+
+
+class Attenuator(RFComponent):
+    nominal_attenuation_dB: float = None
     pass