scf_eda.proto

diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c
index 8689756b8f8235dc0d47e184cd18a5352101f046..84e07a49b19d2b9daf4f65ea9ca4593632bc2dcc 100644 (file)
--- a/scf_eda.pb-c.c
+++ b/scf_eda.pb-c.c
@@ -385,7 +385,7 @@ const ProtobufCMessageDescriptor scf_line__descriptor =
   (ProtobufCMessageInit) scf_line__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
+static const ProtobufCFieldDescriptor scf_epin__field_descriptors[30] =
 {
   {
     "id",
@@ -640,9 +640,21 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "x",
+    "path",
     22,
     PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_UINT64,
+    0,   /* quantifier_offset */
+    offsetof(ScfEpin, path),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "x",
+    23,
+    PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
     offsetof(ScfEpin, x),
@@ -653,7 +665,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
   },
   {
     "y",
-    23,
+    24,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -665,7 +677,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
   },
   {
     "n_diodes",
-    24,
+    25,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -677,7 +689,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
   },
   {
     "l_pos",
-    25,
+    26,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -689,7 +701,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
   },
   {
     "vflag",
-    26,
+    27,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -701,7 +713,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
   },
   {
     "pflag",
-    27,
+    28,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -713,7 +725,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
   },
   {
     "vconst",
-    28,
+    29,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -725,7 +737,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
   },
   {
     "aconst",
-    29,
+    30,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -738,7 +750,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[29] =
 };
 static const unsigned scf_epin__field_indices_by_name[] = {
   8,   /* field[8] = a */
-  28,   /* field[28] = aconst */
+  29,   /* field[29] = aconst */
   5,   /* field[5] = c_lid */
   1,   /* field[1] = cid */
   15,   /* field[15] = dr */
@@ -751,10 +763,11 @@ static const unsigned scf_epin__field_indices_by_name[] = {
   11,   /* field[11] = jr */
   18,   /* field[18] = jsr */
   7,   /* field[7] = jv */
-  24,   /* field[24] = l_pos */
+  25,   /* field[25] = l_pos */
   2,   /* field[2] = lid */
-  23,   /* field[23] = n_diodes */
-  26,   /* field[26] = pflag */
+  24,   /* field[24] = n_diodes */
+  21,   /* field[21] = path */
+  27,   /* field[27] = pflag */
   19,   /* field[19] = pr */
   10,   /* field[10] = r */
   17,   /* field[17] = sr */
@@ -762,15 +775,15 @@ static const unsigned scf_epin__field_indices_by_name[] = {
   12,   /* field[12] = uF */
   13,   /* field[13] = uH */
   6,   /* field[6] = v */
-  27,   /* field[27] = vconst */
-  25,   /* field[25] = vflag */
-  21,   /* field[21] = x */
-  22,   /* field[22] = y */
+  28,   /* field[28] = vconst */
+  26,   /* field[26] = vflag */
+  22,   /* field[22] = x */
+  23,   /* field[23] = y */
 };
 static const ProtobufCIntRange scf_epin__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 29 }
+  { 0, 30 }
 };
 const ProtobufCMessageDescriptor scf_epin__descriptor =
 {
@@ -780,7 +793,7 @@ const ProtobufCMessageDescriptor scf_epin__descriptor =
   "ScfEpin",
   "",
   sizeof(ScfEpin),
-  29,
+  30,
   scf_epin__field_descriptors,
   scf_epin__field_indices_by_name,
   1,  scf_epin__number_ranges,

diff --git a/scf_eda.pb-c.h b/scf_eda.pb-c.h
index c8234f3b7153d9889882acab39ab5757f607f192..4243879224ab5685d14ebeeca7a157fdca901e1b 100644 (file)
--- a/scf_eda.pb-c.h
+++ b/scf_eda.pb-c.h
@@ -67,6 +67,7 @@ struct  _ScfEpin
   double jsr;
   double pr;
   double jpr;
+  uint64_t path;
   int32_t x;
   int32_t y;
   int32_t n_diodes;
@@ -78,7 +79,7 @@ struct  _ScfEpin
 };
 #define SCF_EPIN__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&scf_epin__descriptor) \
-    , 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+    , 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 struct  _ScfEconn

diff --git a/scf_eda.proto b/scf_eda.proto
index f793189b89978ef21131cd0d8400156943aba0b1..b0820f13b844d7096cb0efce32b2503d69a062ce 100644 (file)
--- a/scf_eda.proto
+++ b/scf_eda.proto
@@ -37,17 +37,19 @@ message scf_epin
        required double    pr    = 20;
        required double    jpr   = 21;
 
-       required int32     x     = 22;
-       required int32     y     = 23;
+       required uint64    path  = 22;
 
-       required int32     n_diodes = 24;
-       required int32     l_pos = 25;
+       required int32     x     = 23;
+       required int32     y     = 24;
 
-       required bool      vflag = 26;
-       required bool      pflag = 27;
+       required int32     n_diodes = 25;
+       required int32     l_pos = 26;
 
-       required bool      vconst = 28;
-       required bool      aconst = 29;
+       required bool      vflag = 27;
+       required bool      pflag = 28;
+
+       required bool      vconst = 29;
+       required bool      aconst = 30;
 }
 
 message scf_econn

diff --git a/scf_eda_pb.h b/scf_eda_pb.h
index 379270b3f6374ba2fc1c972a63d13cc88488355d..951d1a798b9d3df6f719831c95584cd4570d9b61 100644 (file)
--- a/scf_eda_pb.h
+++ b/scf_eda_pb.h
@@ -29,7 +29,7 @@ enum {
 #define SCF_EDA_V_MIN    -10000000.0
 #define SCF_EDA_V_MAX     10000000.0
 
-#define SCF_EDA_V_Diode_ON  0.69
+#define SCF_EDA_V_Diode_ON  0.68
 #define SCF_EDA_V_Diode_OFF 0.70
 
 #define SCF_EDA_V_NPN_ON    SCF_EDA_V_Diode_OFF

diff --git a/ses_core.h b/ses_core.h
index aa357f025450dd22ac85b63480a8cd09ba81b211..7737b0972974e35f4127d552f111cfd3f55ceee5 100644 (file)
--- a/ses_core.h
+++ b/ses_core.h
@@ -77,6 +77,7 @@ struct ses_path_s
        int            index;
 
        int            n_diodes;
+       int            n_layers;
 };
 
 struct ses_ctx_s