Skip to content

Commit 113101b

Browse files
committed
fix s21 calculation
1 parent 210c990 commit 113101b

1 file changed

Lines changed: 14 additions & 12 deletions

File tree

smith_chart/js/smith_tool.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ function update_smith_chart() {
12811281
type: "scatter",
12821282
};
12831283
var traceS21 = { ...traceS11 };
1284-
var traceS21Ph = { ...traceS11Ph };
1284+
// var traceS21Ph = { ...traceS11Ph };
12851285

12861286
var sParamLayout = {
12871287
yaxis: {
@@ -1338,27 +1338,27 @@ function update_smith_chart() {
13381338
traceS11.x = [];
13391339
traceS11Ph.x = [];
13401340
traceS21.x = [];
1341-
traceS21Ph.x = [];
1341+
// traceS21Ph.x = [];
13421342
traceS11.y = [];
13431343
traceS11Ph.y = [];
13441344
traceS21.y = [];
1345-
traceS21Ph.y = [];
1345+
// traceS21Ph.y = [];
13461346
if (span_freq == 0) {
13471347
var newSpanFreq = 1;
13481348
traceS11.x = [scaledFreq];
13491349
traceS11Ph.x = [scaledFreq];
13501350
traceS21.x = [scaledFreq];
1351-
traceS21Ph.x = [scaledFreq];
1351+
// traceS21Ph.x = [scaledFreq];
13521352
if (reflection_mag == 0) {
13531353
traceS11.y.push(0);
13541354
traceS11Ph.y.push(0);
13551355
traceS21.y.push(1);
1356-
traceS21Ph.y.push(0);
1356+
// traceS21Ph.y.push(0);
13571357
} else {
13581358
traceS11.y.push(20 * Math.log10(reflection_mag));
13591359
traceS11Ph.y.push(reflection_phase);
13601360
traceS21.y.push(20 * Math.log10(1 - reflection_mag));
1361-
traceS21Ph.y.push(-reflection_phase);
1361+
// traceS21Ph.y.push(-reflection_phase);
13621362
}
13631363
// traceS22.x = [scaledFreq];
13641364
// traceS22.y = [0.5];
@@ -1376,29 +1376,31 @@ function update_smith_chart() {
13761376
traceS11.y.push(0);
13771377
traceS11Ph.y.push(0);
13781378
traceS21.y.push(0);
1379-
traceS21Ph.y.push(0);
1379+
// traceS21Ph.y.push(0);
13801380
} else {
13811381
traceS11.y.push(20 * Math.log10(reflection_mag));
13821382
traceS11Ph.y.push(reflection_phase);
1383-
traceS21.y.push(20 * Math.log10(1 - reflection_mag));
1384-
traceS21Ph.y.push(-reflection_phase);
1383+
traceS21.y.push(20 * Math.log10(1 - Math.sqrt(reflection_mag)));
1384+
// traceS21Ph.y.push(-reflection_phase);
13851385
}
13861386
traceS11.x.push((freq + (span_freq * (i - span_res)) / span_res) / schematic[0].freq_unit.multiplier);
13871387
traceS11Ph.x.push((freq + (span_freq * (i - span_res)) / span_res) / schematic[0].freq_unit.multiplier);
13881388
traceS21.x.push((freq + (span_freq * (i - span_res)) / span_res) / schematic[0].freq_unit.multiplier);
1389-
traceS21Ph.x.push((freq + (span_freq * (i - span_res)) / span_res) / schematic[0].freq_unit.multiplier);
1389+
// traceS21Ph.x.push((freq + (span_freq * (i - span_res)) / span_res) / schematic[0].freq_unit.multiplier);
13901390
}
13911391
newSpanFreq = span_freq / schematic[0].freq_unit.multiplier;
13921392
}
13931393

13941394
sParamLayout.xaxis.range = [scaledFreq - newSpanFreq, scaledFreq + newSpanFreq];
1395+
sParamLayout2 = JSON.parse(JSON.stringify(sParamLayout));
1396+
sParamLayout2.yaxis.title="S21 (dB)"
13951397

13961398
// var data = [traceS11, traceS22];
13971399
var data = [traceS11, traceS11Ph];
1398-
var data21 = [traceS21, traceS21Ph];
1400+
var data21 = [traceS21];
13991401

14001402
Plotly.react("SParamPlot", data, sParamLayout, config);
1401-
Plotly.react("SParamPlot_s21", data21, sParamLayout, config);
1403+
Plotly.react("SParamPlot_s21", data21, sParamLayout2, config);
14021404

14031405
//update the HTML tables
14041406
drawMakerTable();

0 commit comments

Comments
 (0)