Skip to content

Commit

Permalink
🔧 Fix both connectivity examples
Browse files Browse the repository at this point in the history
  • Loading branch information
@daquintero
daquintero committed Jul 29, 2024
1 parent 03f3fc3 commit 791a45e
Show file tree
Hide file tree
Showing 20 changed files with 2,103 additions and 25 deletions.
10 changes: 4 additions & 6 deletions docs/examples/08a_pcb_interposer_characterisation/08a_pcb_interposer_characterisation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,13 @@ def create_vna_measurements(

# Let's assume that we want to measure an open return loss between SIG14 and RES1
experiment_connections.extend(
piel.models.create_all_connections(
piel.create_all_connections(
[vna.ports[0], rf_calibration_pcb.ports[0]],
)
)

experiment_connections.extend(
piel.models.create_all_connections(
[vna.ports[1], rf_calibration_pcb.ports[1]]
)
piel.create_all_connections([vna.ports[1], rf_calibration_pcb.ports[1]])
)

# Define experiment with connections
Expand Down Expand Up @@ -178,7 +176,7 @@ def calibration_propagation_delay_experiment_instance(
splitter = pe.models.create_power_splitter_1to2()

# List of connections
experiment_connections = piel.models.create_connection_list_from_ports_lists(
experiment_connections = piel.create_connection_list_from_ports_lists(
[
[splitter.ports[1], oscilloscope.ports[0]],
[splitter.ports[2], oscilloscope.ports[1]],
Expand Down Expand Up @@ -209,7 +207,7 @@ def pcb_propagation_delay_experiment_instance(
splitter = pe.models.create_power_splitter_1to2()

# List of connections
experiment_connections = piel.models.create_connection_list_from_ports_lists(
experiment_connections = piel.create_connection_list_from_ports_lists(
[
[splitter.ports[1], oscilloscope.ports[0]],
[splitter.ports[2], oscilloscope.ports[1]],
Expand Down
163 changes: 162 additions & 1 deletion docs/examples/08a_pcb_interposer_characterisation/data/basic_vna_test/experiment.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,162 @@
"{\"name\":\"basic_vna_test\",\"goal\":null,\"experiment_instances\":[{\"name\":null,\"components\":[{\"name\":\"rf_calibration_pcb\",\"ports\":[{\"name\":\"SIG14\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"RES1\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"SIG1\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"SIG2\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"RES2\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"SIG3\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"OPEN\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"SHORT\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"SIG5\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"RES3\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"SIG6\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"SIG7\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"RES4\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"SIG8\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null},{\"name\":\"L50\",\"domain\":\"RF\",\"connector\":\"smp_plug\",\"manifold\":null}],\"connections\":[],\"components\":[],\"environment\":{\"temperature_K\":273.0,\"region\":null}},{\"name\":\"DPO73304\",\"ports\":[{\"name\":\"PORT1\",\"domain\":\"RF\",\"connector\":null,\"manifold\":null},{\"name\":\"PORT2\",\"domain\":\"RF\",\"connector\":null,\"manifold\":null}],\"connections\":null,\"components\":[],\"environment\":{\"temperature_K\":273.0,\"region\":null},\"configuration\":null}],\"connections\":[{\"name\":null,\"ports\":[{\"name\":\"PORT1\"},{\"name\":\"SIG14\"}]},{\"name\":null,\"ports\":[{\"name\":\"PORT2\"},{\"name\":\"RES1\"}]}],\"goal\":null,\"index\":0,\"date_configured\":\"2024-07-29T11:15:57.223001\",\"date_measured\":null}]}"
{
"name": "basic_vna_test",
"goal": null,
"experiment_instances": [
{
"name": null,
"components": [
{
"name": "rf_calibration_pcb",
"ports": [
{
"name": "SIG14",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "RES1",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "SIG1",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "SIG2",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "RES2",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "SIG3",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "OPEN",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "SHORT",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "SIG5",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "RES3",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "SIG6",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "SIG7",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "RES4",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "SIG8",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
},
{
"name": "L50",
"domain": "RF",
"connector": "smp_plug",
"manifold": null
}
],
"connections": [],
"components": [],
"environment": {
"temperature_K": 273.0,
"region": null
},
"manufacturer": null
},
{
"name": "DPO73304",
"ports": [
{
"name": "PORT1",
"domain": "RF",
"connector": null,
"manifold": null
},
{
"name": "PORT2",
"domain": "RF",
"connector": null,
"manifold": null
}
],
"connections": null,
"components": [],
"environment": {
"temperature_K": 273.0,
"region": null
},
"manufacturer": null,
"configuration": null
}
],
"connections": [
{
"name": null,
"ports": [
{
"name": "PORT1"
},
{
"name": "SIG14"
}
]
},
{
"name": null,
"ports": [
{
"name": "PORT2"
},
{
"name": "RES1"
}
]
}
],
"goal": null,
"index": 0,
"date_configured":
49 changes: 48 additions & 1 deletion ...aracterisation/data/multi_frequency_through_propagation_measurement/0/README.md
View file
Original file line number Diff line number Diff line change
@@ -1 +1,48 @@
TODO
- **name**: pcb_1000000000.0_Hz
- **components**:
-
- **name**: two_port_oscilloscope
- **ports**:
-
- **name**: CH1
-
- **name**: CH2
- **connections**: None
- **components**:
-
- **name**: two_port_oscilloscope
- **ports**:
-
- **name**: CH1
- **connections**: None
- **components**:
-
- **name**: power_splitter_1to2
- **ports**:
-
- **name**: IN
-
- **name**: OUT1
-
- **name**: OUT2
- **connections**: None
- **components**:
- **connections**:
-
- **name**: None
- **ports**:
-
- **name**: OUT1
-
- **name**: CH1
-
- **name**: None
- **ports**:
-
- **name**: OUT2
-
- **name**: CH2
- **goal**: None
- **index**: None
- **date_configured**: None
- **date_measured**: None
73 changes: 72 additions & 1 deletion ...ser_characterisation/data/multi_frequency_through_propagation_measurement/0/instance.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,72 @@
"{\"name\":\"pcb_1000000000.0_Hz\",\"components\":[{\"name\":\"two_port_oscilloscope\",\"ports\":[{\"name\":\"CH1\"},{\"name\":\"CH2\"}],\"connections\":null,\"components\":[]},{\"name\":\"two_port_oscilloscope\",\"ports\":[{\"name\":\"CH1\"}],\"connections\":null,\"components\":[]},{\"name\":\"power_splitter_1to2\",\"ports\":[{\"name\":\"IN\"},{\"name\":\"OUT1\"},{\"name\":\"OUT2\"}],\"connections\":null,\"components\":[]}],\"connections\":[{\"name\":null,\"ports\":[{\"name\":\"OUT1\"},{\"name\":\"CH1\"}]},{\"name\":null,\"ports\":[{\"name\":\"OUT2\"},{\"name\":\"CH2\"}]}],\"goal\":null,\"index\":null,\"date_configured\":null,\"date_measured\":null}"
{
"name": "pcb_1000000000.0_Hz",
"components": [
{
"name": "two_port_oscilloscope",
"ports": [
{
"name": "CH1"
},
{
"name": "CH2"
}
],
"connections": null,
"components": []
},
{
"name": "two_port_oscilloscope",
"ports": [
{
"name": "CH1"
}
],
"connections": null,
"components": []
},
{
"name": "power_splitter_1to2",
"ports": [
{
"name": "IN"
},
{
"name": "OUT1"
},
{
"name": "OUT2"
}
],
"connections": null,
"components": []
}
],
"connections": [
{
"name": null,
"ports": [
{
"name": "OUT1"
},
{
"name": "CH1"
}
]
},
{
"name": null,
"ports": [
{
"name": "OUT2"
},
{
"name": "CH2"
}
]
}
],
"goal": null,
"index": null,
"date_configured": null,
"date_measured": null
}
49 changes: 48 additions & 1 deletion ...aracterisation/data/multi_frequency_through_propagation_measurement/1/README.md
View file
Original file line number Diff line number Diff line change
@@ -1 +1,48 @@
TODO
- **name**: calibration_1000000000.0_Hz
- **components**:
-
- **name**: two_port_oscilloscope
- **ports**:
-
- **name**: CH1
-
- **name**: CH2
- **connections**: None
- **components**:
-
- **name**: two_port_oscilloscope
- **ports**:
-
- **name**: CH1
- **connections**: None
- **components**:
-
- **name**: power_splitter_1to2
- **ports**:
-
- **name**: IN
-
- **name**: OUT1
-
- **name**: OUT2
- **connections**: None
- **components**:
- **connections**:
-
- **name**: None
- **ports**:
-
- **name**: OUT1
-
- **name**: CH1
-
- **name**: None
- **ports**:
-
- **name**: OUT2
-
- **name**: CH2
- **goal**: None
- **index**: None
- **date_configured**: None
- **date_measured**: None
Loading

0 comments on commit 791a45e

Please sign in to comment.