more components

piel/experimental/__init__.py

@@ -1,5 +1,6 @@
 import piel.experimental.types as types
 import piel.experimental.visual as visual
+import piel.experimental.models as models
 
 from . import DPO73304
 
@@ -8,13 +9,4 @@
     construct_experiment_structure,
 )
 
-from .models.cables import rg164
-from .models.oscilloscope import create_two_port_oscilloscope
-from .models.waveform_generator import create_one_port_square_wave_waveform_generator
-from .models.rf_passives import create_power_splitter_1to2
-from .models.rf_calibration import (
-    open_82052D,
-    short_82052D,
-    load_85052D,
-    through_85052D,
-)
+

piel/experimental/file_system.py

@@ -71,13 +71,14 @@ def construct_experiment_directories(
     parent_directory = return_path(parent_directory)
     # Create the experiment directory
     experiment_directory = parent_directory / experiment.name
-    directory_exists = create_new_directory(experiment_directory)
 
-    if directory_exists:
+    if experiment_directory.exists():
         input(
             "The directory already exists. Press enter to continue and overwrite all the json and configuration "
             "files."
         )
+    else:
+        create_new_directory(experiment_directory)
 
     # Create the experiment.json file
     experiment_json_path = experiment_directory / "experiment.json"

piel/experimental/models/__init__.py

@@ -1 +1,12 @@
 # use experimental/__init__.py to import all the necessary modules and functions.
+from .cables import rg164
+from .oscilloscope import create_two_port_oscilloscope, DPO73304
+from .waveform_generator import create_one_port_square_wave_waveform_generator, AWG70001A
+from .rf_passives import create_power_splitter_1to2
+from .rf_calibration import (
+    open_82052D,
+    short_82052D,
+    load_85052D,
+    through_85052D,
+)
+from .vna import E8364A

piel/experimental/models/oscilloscope.py

@@ -22,5 +22,5 @@ def create_two_port_oscilloscope() -> Oscilloscope:
     )
 
 
-def create_DPO73304():
+def DPO73304():
     pass

piel/experimental/models/vna.py

@@ -1,5 +1,5 @@
 import piel.experimental as pe
 
 
-def create_E8364A() -> pe.types.VNA:
+def E8364A() -> pe.types.VNA:
     pass

piel/experimental/models/waveform_generator.py

@@ -41,5 +41,5 @@ def create_one_port_square_wave_waveform_generator(
     )
 
 
-def create_AWG70001A() -> WaveformGenerator:
+def AWG70001A() -> WaveformGenerator:
     pass

piel/types/electrical/rf_calibration.py

@@ -2,19 +2,19 @@
 
 
 class Short(PhysicalComponent):
-    ports = [PhysicalPort(name="SHORT", connector="SMA_3.5mm", manifold="82052D")]
+    ports: list[PhysicalPort] = [PhysicalPort(name="SHORT", connector="SMA_3.5mm", manifold="82052D")]
 
 
 class Open(PhysicalComponent):
-    ports = [PhysicalPort(name="OPEN", connector="SMA_3.5mm", manifold="82052D")]
+    ports: list[PhysicalPort] = [PhysicalPort(name="OPEN", connector="SMA_3.5mm", manifold="82052D")]
 
 
 class Load(PhysicalComponent):
-    ports = [PhysicalPort(name="LOAD", connector="SMA_3.5mm", manifold="82052D")]
+    ports: list[PhysicalPort] = [PhysicalPort(name="LOAD", connector="SMA_3.5mm", manifold="82052D")]
 
 
 class Through(PhysicalComponent):
-    ports = [
+    ports: list[PhysicalPort] = [
         PhysicalPort(name="IN", connector="SMA_3.5mm", manifold="82052D"),
         PhysicalPort(name="OUT", connector="SMA_3.5mm", manifold="82052D"),
     ]