From 1ddafe327675667bfc30a2244a89c23915bbc089 Mon Sep 17 00:00:00 2001
From: stefan schippers <stefan.schippers@gmail.com>
Date: Fri, 20 Dec 2024 11:56:53 +0100
Subject: [PATCH] updated autozero_comp.sch to show saout histogram; xschem raw
 switch: do not call update_op() if not switching into a 1-point OP or DC sim

---
 src/scheduler.c                          |  12 +-
 xschem_library/ngspice/autozero_comp.sch | 165 ++++++++++++++++-------
 2 files changed, 126 insertions(+), 51 deletions(-)

diff --git a/src/scheduler.c b/src/scheduler.c
index e2d286c8..36d80965 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -3931,7 +3931,11 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
         } else {
           ret = extra_rawfile(2, NULL, NULL, -1.0, -1.0);
         }
-        update_op();
+        /* only update_op() if switching into a 1-point OP or DC */
+        if(ret && raw && raw->rawfile && raw->allpoints == 1 &&
+           (!strcmp(xctx->raw->sim_type, "op") || !strcmp(xctx->raw->sim_type, "dc"))) {
+          update_op();
+        }
         Tcl_SetResult(interp, my_itoa(ret), TCL_VOLATILE);
       } else if(argc ==9 && !strcmp(argv[2], "new")) {
         ret = new_rawfile(argv[3], argv[4], argv[5], atof(argv[6]), atof(argv[7]),atof(argv[8]));
@@ -3940,7 +3944,11 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
         ret = extra_rawfile(4, NULL, NULL, -1.0, -1.0);
       } else if(argc > 2 && !strcmp(argv[2], "switch_back")) {
         ret = extra_rawfile(5, NULL, NULL, -1.0, -1.0);
-        update_op();
+        /* only update_op() if switching into a 1-point OP or DC */
+        if(ret && raw && raw->rawfile && raw->allpoints == 1 &&
+           (!strcmp(xctx->raw->sim_type, "op") || !strcmp(xctx->raw->sim_type, "dc"))) {
+          update_op();
+        }
         Tcl_SetResult(interp, my_itoa(ret), TCL_VOLATILE);
       } else if(argc > 3 && !strcmp(argv[2], "del")) {
         ret = raw_deletevar(argv[3]);
diff --git a/xschem_library/ngspice/autozero_comp.sch b/xschem_library/ngspice/autozero_comp.sch
index b48ec269..5b0861ee 100644
--- a/xschem_library/ngspice/autozero_comp.sch
+++ b/xschem_library/ngspice/autozero_comp.sch
@@ -38,30 +38,31 @@ L 4 410 -150 570 -150 {}
 L 4 570 -170 570 -150 {}
 L 4 570 -170 690 -170 {}
 L 7 1090 -260 2520 -260 {}
-B 2 350 -1020 810 -860 {flags=graph
+B 2 270 -1020 680 -860 {flags=graph,unlocked
 y1 = 0
 y2 = 0.93
 divy = 5
-x1=1.0574372e-07
-x2=4.3554617e-07
+x1=1.1411925e-07
+x2=4.2357466e-07
 divx=5
 subdivx=4
 unitx=n
 node="cal%0
-saout
-saout%70
-saout%3"
-color="8 19 7 12"
+saout"
+color="8 6"
 
 linewidth_mult=1.0
 hilight_wave=-1
-dataset=-1}
-B 2 350 -1160 810 -1030 {flags=graph
+dataset=-1
+rawfile=$netlist_dir/autozero_comp.raw
+sim_type=tran
+rainbow=0}
+B 2 270 -1160 680 -1030 {flags=graph,unlocked
 y1 = 0.647319
 y2 = 0.652563
 
-x1=1.0574372e-07
-x2=4.3554617e-07
+x1=1.1411925e-07
+x2=4.2357466e-07
 unitx=n
 divx=5
 subdivx=2
@@ -71,48 +72,68 @@ color="4 5"
 dataset=-1
 linewidth_mult=1.0
 divy=3
-subdivy=1}
-B 2 350 -1320 810 -1160 {flags=graph
+subdivy=1
+rawfile=$netlist_dir/autozero_comp.raw
+sim_type=tran}
+B 2 270 -1320 680 -1160 {flags=graph,unlocked
+y1 = 0.647319
+y2 = 0.652563
+
+x1=1.1411925e-07
+x2=4.2357466e-07
+unitx=n
+divx=5
+subdivx=2
+node="plus%0
+minus%0"
+color="4 5"
+dataset=-1
+linewidth_mult=1.0
+divy=3
+subdivy=1
+rawfile=$netlist_dir/autozero_comp.raw
+sim_type=tran}
+B 2 270 -1450 680 -1330 {flags=graph,unlocked
+y1 = 0.647319
+y2 = 0.652563
+
+x1=1.1411925e-07
+x2=4.2357466e-07
+unitx=n
+divx=5
+subdivx=2
+node="plus%0
+minus%0"
+color="4 5"
+dataset=-1
+linewidth_mult=1.0
+divy=3
+subdivy=1
+rawfile=$netlist_dir/autozero_comp.raw
+sim_type=tran}
+B 2 690 -1020 870 -860 {flags=graph,unlocked
 y1 = 0
 y2 = 0.9
 divy = 5
-x1=1.0574372e-07
-x2=4.3554617e-07
-unitx=n
+x1=0
+x2=58
 divx=5
 subdivx=4
-node="en%0
-cal%0
-SAOUT#3; vss,saout%3
---slow--
-SAOUT#15; vss,saout%15
---failure--
-SAOUT#70; vss,saout%70"
-color="4 4 4 8 8 7 7"
-dataset=-1
-digital=1
-ypos1=0.0825406
-ypos2=0.767045
-ylabmag=1.2
-linewidth_mult=1.0
-subdivy=0}
-B 2 350 -1450 810 -1330 {flags=graph
-y1 = -8.54414e-05
-y2 = 2.7198e-05
-divy = 5
-x1=1.0574372e-07
-x2=4.3554617e-07
-divx=5
-subdivx=4
-unitx=n
+unitx=1
 
 
+
+linewidth_mult=2
+hilight_wave=-1
 dataset=-1
+rawfile=distrib
+sim_type=distrib
 color="4 7"
-node="power dset 97 ; i(vvcc) vcc * % 23
-power dset 70 ; i(vvcc) vcc * % 70"
-subdivy=4
-linewidth_mult=1.0}
+node="saout
+ 0.45"
+sweep=freq
+mode=HistoH
+xlabmag=2.3}
 T {CAL} 140 -180 0 1 0.4 0.4 {}
 T {EN} 140 -130 0 1 0.4 0.4 {}
 T {CALIBRATION
@@ -306,7 +327,7 @@ C {ipin.sym} 110 -810 0 0 { name=p97 lab=VCC }
 C {vsource_arith.sym} 120 -420 0 0 {name=E5 VOL=temper MAX=200 MIN=-200}
 C {lab_pin.sym} 120 -470 0 1 {name=p113 lab=TEMPERAT}
 C {lab_pin.sym} 120 -390 0 0 {name=p114 lab=VSS}
-C {opin.sym} 230 -900 0 0 { name=p116 lab=SAOUT }
+C {opin.sym} 180 -880 0 0 { name=p116 lab=SAOUT }
 C {lab_pin.sym} 200 -570 0 1 {name=p126 lab=CALB}
 C {lab_pin.sym} 120 -570 0 0 {name=l50 lab=CAL}
 C {code.sym} 840 -190 0 0 {name=STIMULI 
@@ -478,12 +499,58 @@ tclcommand="xschem netlist; xschem simulate"}
 C {parax_cap.sym} 1060 -1150 0 0 {name=c4  value=5f}
 C {parax_cap.sym} 1550 -1150 0 0 {name=c6  value=5f}
 C {parax_cap.sym} 2040 -1150 0 0 {name=c7  value=5f}
-C {launcher.sym} 65 -1075 0 0 {name=h1 
-descr="Select arrow and 
-Ctrl-Left-Click to
-load/unload waveforms" 
+C {launcher.sym} 75 -1075 0 0 {name=h1 
+descr="Reload
+Waves" 
 tclcommand="
 xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw
+
+proc get_histo \{varname varlist mean min max step\} \{
+  xschem raw switch 0
+  proc xround \{a size\} \{ return [expr \{round($a/$size) * $size\}]\}
+  #### get rounded data
+  catch \{unset freq\}
+  foreach v1 $varlist \{
+    set v1 [xround [expr \{$v1 - $mean\}] $step]
+    if \{![info exists freq($v1)]\} \{ set freq($v1) 1\} else \{incr freq($v1)\}
+  \}
+  #### create histogram raw data in memory
+  xschem raw new distrib distrib $varname $min $max $step
+  xschem raw add freq
+  set j 0
+  for \{set i $min\} \{$i <= $max\} \{set i [expr \{$i + $step\}] \} \{
+    set ii  [xround $i $step]
+    set v1 0
+    if \{[info exists freq($ii)]\} \{ set v1 $freq($ii) \}
+    xschem raw set freq $j $v1
+    incr j
+  \}
+\}
+
+proc get_values \{\} \{
+  set l \{\}
+  set dset [xschem raw datasets]
+  set p [xschem raw pos_at time 259n]
+  for \{set i 0\} \{ $i < $dset\} \{ incr i\} \{
+     set v [xschem raw value saout $p $i]
+     lappend l $v
+  \}
+
+  set p [xschem raw pos_at time 339n]
+  for \{set i 0\} \{ $i < $dset\} \{ incr i\} \{
+     set v [xschem raw value saout $p $i]
+     lappend l $v
+  \}
+  get_histo saout $l 0 0 0.9 0.01
+  xschem raw switch 0
+
+\}
+
+
+get_values
+xschem redraw
+
+
 "
 }
 C {ammeter.sym} 660 -710 0 0 {name=vdiffp}