Skip to content

Commit ea895c4

Browse files
authored
Correct aperture configuration (#34)
1 parent 7868dbe commit ea895c4

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

script-gen-manager/src/script_component/sweep.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,9 +620,11 @@ impl SweepModel {
620620
.value,
621621
),
622622
);
623+
self.val_replacement_map
624+
.insert(String::from("APERTURE"), "nil".to_owned());
623625
} else {
624626
self.val_replacement_map.insert(
625-
String::from("Aperture"),
627+
String::from("APERTURE"),
626628
self.format(
627629
sweep_config
628630
.global_parameters
@@ -632,6 +634,8 @@ impl SweepModel {
632634
.value,
633635
),
634636
);
637+
self.val_replacement_map
638+
.insert(String::from("NPLC"), "nil".to_owned());
635639
}
636640

637641
self.val_replacement_map.insert(

xml-handler/src/resources/sweep/MP5000Sweep.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<substitute name="BIAS-NODES">%BIAS-NODES%</substitute>
3030
<substitute name="BIAS-SMUS">%BIAS-SMUS%</substitute>
3131
<substitute name="NPLC">%NPLC%</substitute>
32+
<substitute name="APERTURE">%APERTURE%</substitute>
3233
<substitute name="SOURCE-DELAY">%SOURCE-DELAY%</substitute>
3334
<substitute name="MEASURE-DELAY">%MEASURE-DELAY%</substitute>
3435
<substitute name="EFFECTIVE-FILTER-COUNT">%EFFECTIVE-FILTER-COUNT%</substitute>
@@ -1281,6 +1282,8 @@
12811282

12821283
local nplc = %NPLC%
12831284

1285+
local aperture = %APERTURE%
1286+
12841287
local source_delay = %SOURCE-DELAY%
12851288
local measure_delay = %MEASURE-DELAY%
12861289
local measure_count = %MEASURE-COUNT%
@@ -1326,6 +1329,7 @@
13261329
},
13271330
measure = {
13281331
nplc = nplc,
1332+
aperture = aperture,
13291333
count = measure_count,
13301334
delay = measure_delay,
13311335
func = CONSTANTS.%MFUNCTION%, -- must be FUNC_DC_CURRENT, FUNC_DC_VOLTAGE, or FUNC_DC_IV_COMBINED
@@ -1431,6 +1435,7 @@
14311435
},
14321436
measure = {
14331437
nplc = nplc,
1438+
aperture = aperture,
14341439
count = measure_count,
14351440
delay = measure_delay,
14361441
func = CONSTANTS.%MFUNCTION%, -- must be FUNC_DC_VOLTAGE, FUNC_DC_CURRENT, or FUNC_DC_IV_COMBINED
@@ -1536,6 +1541,7 @@
15361541
},
15371542
measure = {
15381543
nplc = nplc,
1544+
aperture = aperture,
15391545
count = measure_count,
15401546
delay = measure_delay,
15411547
func = CONSTANTS.%MFUNCTION%, -- must be FUNC_DC_VOLTAGE, FUNC_DC_CURRENT, or FUNC_DC_IV_COMBINED

0 commit comments

Comments
 (0)