Corrected the Magic device generator to paint nwell under pFETs
when the guard ring is not selected (previously it was drawn with
the guard ring so went missing when the guard ring was unselected).
Corrected MiM cap DRC rules (to match the Calibre decks rather than
the documentation, which has different layers for MiM cap).  Note
that Magic was modified to correct a wrong reported distance on
CIF-DRC rules such as the one used for one of the MiM cap rules.
diff --git a/sky130/magic/sky130.tcl b/sky130/magic/sky130.tcl
index a64099f..88f9f23 100644
--- a/sky130/magic/sky130.tcl
+++ b/sky130/magic/sky130.tcl
@@ -4943,6 +4943,7 @@
 	    poly_type		poly \
 	    poly_contact_type	pc \
 	    sub_type		nwell \
+	    dev_sub_type	nwell \
 	    gate_to_polycont	0.32 \
 	    min_effl		0.185 \
 	    min_allc		0.26 \
@@ -4961,6 +4962,7 @@
 	    poly_type		poly \
 	    poly_contact_type	pc \
 	    sub_type		nwell \
+	    dev_sub_type	nwell \
 	    gate_to_polycont	0.32 \
 	    min_effl		0.185 \
 	    min_allc		0.26 \
@@ -4979,6 +4981,7 @@
 	    poly_type		poly \
 	    poly_contact_type	pc \
 	    sub_type		nwell \
+	    dev_sub_type	nwell \
 	    gate_to_polycont	0.32 \
 	    min_effl		0.185 \
 	    min_allc		0.26 \
@@ -5001,6 +5004,7 @@
 	    poly_type		poly \
 	    poly_contact_type	pc \
 	    sub_type		nwell \
+	    dev_sub_type	nwell \
 	    guard_sub_surround	0.33 \
 	    gate_to_polycont	0.32 \
 	    diff_spacing	0.31 \