RAS data file updates for N1 chiplet

Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
Change-Id: Ie0c8199370951a3c302b6bbf2312be24e2af3251
diff --git a/analyzer/ras-data/data/ras-data-p10-10.json b/analyzer/ras-data/data/ras-data-p10-10.json
index 100f9f2..c70ec79 100644
--- a/analyzer/ras-data/data/ras-data-p10-10.json
+++ b/analyzer/ras-data/data/ras-data-p10-10.json
@@ -970,21 +970,21 @@
    },
    "signatures" : {
       "06b6" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -994,21 +994,21 @@
          "15" : { "00" : "masked" }
       },
       "06b7" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1018,21 +1018,21 @@
          "15" : { "00" : "masked" }
       },
       "06b8" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1042,21 +1042,21 @@
          "15" : { "00" : "masked" }
       },
       "06b9" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1098,34 +1098,34 @@
       },
       "0985" : {
          "00" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "01" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "02" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "03" : {
             "00" : "masked",
@@ -1138,14 +1138,14 @@
             "07" : "masked"
          },
          "04" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "05" : {
             "00" : "masked",
@@ -1158,14 +1158,14 @@
             "07" : "masked"
          },
          "06" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "07" : {
             "00" : "masked",
@@ -1188,64 +1188,64 @@
             "07" : "masked"
          },
          "09" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "self",
+            "01" : "self",
+            "02" : "self",
+            "03" : "self",
+            "04" : "self",
+            "05" : "self",
+            "06" : "self",
+            "07" : "self"
          },
          "0a" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2",
+            "01" : "level2",
+            "02" : "level2",
+            "03" : "level2",
+            "04" : "level2",
+            "05" : "level2",
+            "06" : "level2",
+            "07" : "level2"
          },
          "0b" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "0c" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "0d" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "0e" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "0f" : {
             "00" : "masked",
@@ -1350,21 +1350,21 @@
          "27" : { "00" : "global" }
       },
       "0bb6" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1374,21 +1374,21 @@
          "15" : { "00" : "masked" }
       },
       "0bb7" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1398,21 +1398,21 @@
          "15" : { "00" : "masked" }
       },
       "0bb8" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1422,21 +1422,21 @@
          "15" : { "00" : "masked" }
       },
       "0bb9" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1446,18 +1446,18 @@
          "15" : { "00" : "masked" }
       },
       "0cb8" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
          "02" : { "00" : "masked" },
-         "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
+         "03" : { "00" : "self" },
+         "04" : { "00" : "self" },
+         "05" : { "00" : "self" },
+         "06" : { "00" : "self" },
+         "07" : { "00" : "self" },
+         "08" : { "00" : "self" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "self" },
+         "0b" : { "00" : "self" },
          "0c" : { "00" : "masked" },
          "0d" : { "00" : "masked" },
          "0e" : { "00" : "masked" },
@@ -1465,24 +1465,24 @@
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
          "12" : { "00" : "masked" },
-         "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
+         "13" : { "00" : "self" },
+         "14" : { "00" : "self" },
+         "15" : { "00" : "self" },
          "16" : { "00" : "masked" },
          "17" : { "00" : "masked" },
          "18" : { "00" : "masked" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
          "1b" : { "00" : "masked" },
-         "1c" : { "00" : "masked" },
-         "1d" : { "00" : "masked" },
-         "1e" : { "00" : "masked" },
-         "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
-         "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
+         "1c" : { "00" : "self" },
+         "1d" : { "00" : "self" },
+         "1e" : { "00" : "self" },
+         "1f" : { "00" : "self" },
+         "20" : { "00" : "self" },
+         "21" : { "00" : "self" },
+         "22" : { "00" : "self" },
+         "23" : { "00" : "self" },
+         "24" : { "00" : "self" },
          "25" : { "00" : "masked" },
          "26" : { "00" : "masked" },
          "27" : { "00" : "masked" }
@@ -10171,30 +10171,30 @@
          }
       },
       "5c6e" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
          "02" : { "00" : "masked" },
          "03" : { "00" : "masked" },
          "04" : { "00" : "masked" },
          "05" : { "00" : "masked" },
          "06" : { "00" : "masked" },
          "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
+         "08" : { "00" : "level2_M_self_L" },
+         "09" : { "00" : "level2_M_self_L" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2" },
+         "0d" : { "00" : "level2_M_self_L" },
          "0e" : { "00" : "masked" },
-         "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
-         "12" : { "00" : "masked" },
-         "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
+         "0f" : { "00" : "self_M_level2_L" },
+         "10" : { "00" : "self_M_level2_L" },
+         "11" : { "00" : "self_M_level2_L" },
+         "12" : { "00" : "self_M_level2_L" },
+         "13" : { "00" : "self_M_level2_L" },
+         "14" : { "00" : "self_M_level2_L" },
          "15" : { "00" : "masked" },
          "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
+         "17" : { "00" : "level2_M_self_L" },
          "18" : { "00" : "masked" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
@@ -21158,14 +21158,14 @@
          "29" : { "00" : "nx0" }
       },
       "d9ef" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
+         "02" : { "00" : "self" },
          "03" : { "00" : "masked" },
          "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
+         "05" : { "00" : "self" },
+         "06" : { "00" : "self" },
+         "07" : { "00" : "self" },
          "08" : { "00" : "masked" },
          "09" : { "00" : "masked" }
       },
@@ -21236,15 +21236,15 @@
          "3f" : { "00" : "masked" }
       },
       "e0bb" : {
-         "00" : { "00" : "masked" },
+         "00" : { "00" : "self" },
          "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
-         "03" : { "00" : "masked" },
+         "02" : { "00" : "self" },
+         "03" : { "00" : "self" },
          "04" : { "00" : "masked" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
+         "06" : { "00" : "self" },
+         "07" : { "00" : "self" },
+         "08" : { "00" : "self" },
          "09" : { "00" : "masked" },
          "0a" : { "00" : "masked" }
       },
diff --git a/analyzer/ras-data/data/ras-data-p10-20.json b/analyzer/ras-data/data/ras-data-p10-20.json
index 4102494..f7b63f8 100644
--- a/analyzer/ras-data/data/ras-data-p10-20.json
+++ b/analyzer/ras-data/data/ras-data-p10-20.json
@@ -970,21 +970,21 @@
    },
    "signatures" : {
       "06b6" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -994,21 +994,21 @@
          "15" : { "00" : "masked" }
       },
       "06b7" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1018,21 +1018,21 @@
          "15" : { "00" : "masked" }
       },
       "06b8" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1042,21 +1042,21 @@
          "15" : { "00" : "masked" }
       },
       "06b9" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1098,34 +1098,34 @@
       },
       "0985" : {
          "00" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "01" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "02" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "03" : {
             "00" : "masked",
@@ -1138,14 +1138,14 @@
             "07" : "masked"
          },
          "04" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "05" : {
             "00" : "masked",
@@ -1158,14 +1158,14 @@
             "07" : "masked"
          },
          "06" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "07" : {
             "00" : "masked",
@@ -1188,64 +1188,64 @@
             "07" : "masked"
          },
          "09" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "self",
+            "01" : "self",
+            "02" : "self",
+            "03" : "self",
+            "04" : "self",
+            "05" : "self",
+            "06" : "self",
+            "07" : "self"
          },
          "0a" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2",
+            "01" : "level2",
+            "02" : "level2",
+            "03" : "level2",
+            "04" : "level2",
+            "05" : "level2",
+            "06" : "level2",
+            "07" : "level2"
          },
          "0b" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "0c" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "0d" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "0e" : {
-            "00" : "masked",
-            "01" : "masked",
-            "02" : "masked",
-            "03" : "masked",
-            "04" : "masked",
-            "05" : "masked",
-            "06" : "masked",
-            "07" : "masked"
+            "00" : "level2_M_self_L",
+            "01" : "level2_M_self_L",
+            "02" : "level2_M_self_L",
+            "03" : "level2_M_self_L",
+            "04" : "level2_M_self_L",
+            "05" : "level2_M_self_L",
+            "06" : "level2_M_self_L",
+            "07" : "level2_M_self_L"
          },
          "0f" : {
             "00" : "masked",
@@ -1350,21 +1350,21 @@
          "27" : { "00" : "global" }
       },
       "0bb6" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1374,21 +1374,21 @@
          "15" : { "00" : "masked" }
       },
       "0bb7" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1398,21 +1398,21 @@
          "15" : { "00" : "masked" }
       },
       "0bb8" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
-         "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
+         "03" : { "00" : "self" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "08" : { "00" : "self" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1422,21 +1422,21 @@
          "15" : { "00" : "masked" }
       },
       "0bb9" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "level2_M_self_L" },
+         "01" : { "00" : "level2_M_self_L" },
+         "02" : { "00" : "level2_M_self_L" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
+         "04" : { "00" : "level2_M_self_L" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
+         "06" : { "00" : "level2_M_self_L" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2_M_self_L" },
+         "0d" : { "00" : "level2_M_self_L" },
+         "0e" : { "00" : "level2_M_self_L" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
@@ -1446,18 +1446,18 @@
          "15" : { "00" : "masked" }
       },
       "0cb8" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
          "02" : { "00" : "masked" },
-         "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
+         "03" : { "00" : "self" },
+         "04" : { "00" : "self" },
+         "05" : { "00" : "self" },
+         "06" : { "00" : "self" },
+         "07" : { "00" : "self" },
+         "08" : { "00" : "self" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "self" },
+         "0b" : { "00" : "self" },
          "0c" : { "00" : "masked" },
          "0d" : { "00" : "masked" },
          "0e" : { "00" : "masked" },
@@ -1465,24 +1465,24 @@
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
          "12" : { "00" : "masked" },
-         "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
+         "13" : { "00" : "self" },
+         "14" : { "00" : "self" },
+         "15" : { "00" : "self" },
          "16" : { "00" : "masked" },
          "17" : { "00" : "masked" },
          "18" : { "00" : "masked" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
          "1b" : { "00" : "masked" },
-         "1c" : { "00" : "masked" },
-         "1d" : { "00" : "masked" },
-         "1e" : { "00" : "masked" },
-         "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
-         "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
+         "1c" : { "00" : "self" },
+         "1d" : { "00" : "self" },
+         "1e" : { "00" : "self" },
+         "1f" : { "00" : "self" },
+         "20" : { "00" : "self" },
+         "21" : { "00" : "self" },
+         "22" : { "00" : "self" },
+         "23" : { "00" : "self" },
+         "24" : { "00" : "self" },
          "25" : { "00" : "masked" },
          "26" : { "00" : "masked" },
          "27" : { "00" : "masked" }
@@ -10147,20 +10147,20 @@
          }
       },
       "5c6e" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
          "02" : { "00" : "masked" },
          "03" : { "00" : "masked" },
          "04" : { "00" : "masked" },
          "05" : { "00" : "masked" },
          "06" : { "00" : "masked" },
          "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
+         "08" : { "00" : "level2_M_self_L" },
+         "09" : { "00" : "level2_M_self_L" },
+         "0a" : { "00" : "level2" },
+         "0b" : { "00" : "level2_M_self_L" },
+         "0c" : { "00" : "level2" },
+         "0d" : { "00" : "level2_M_self_L" },
          "0e" : { "00" : "masked" },
          "0f" : { "00" : "masked" },
          "10" : { "00" : "masked" },
@@ -10170,7 +10170,7 @@
          "14" : { "00" : "masked" },
          "15" : { "00" : "masked" },
          "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
+         "17" : { "00" : "level2_M_self_L" },
          "18" : { "00" : "masked" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
@@ -20994,14 +20994,14 @@
          "29" : { "00" : "nx0" }
       },
       "d9ef" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
+         "02" : { "00" : "self" },
          "03" : { "00" : "masked" },
          "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
+         "05" : { "00" : "self" },
+         "06" : { "00" : "self" },
+         "07" : { "00" : "self" },
          "08" : { "00" : "masked" },
          "09" : { "00" : "masked" }
       },
@@ -21072,17 +21072,17 @@
          "3f" : { "00" : "masked" }
       },
       "e0bb" : {
-         "00" : { "00" : "masked" },
+         "00" : { "00" : "self" },
          "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
-         "03" : { "00" : "masked" },
+         "02" : { "00" : "self" },
+         "03" : { "00" : "self" },
          "04" : { "00" : "masked" },
          "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
+         "06" : { "00" : "self" },
+         "07" : { "00" : "self" },
+         "08" : { "00" : "self" },
          "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" }
+         "0a" : { "00" : "self" }
       },
       "e5bb" : {
          "00" : { "00" : "masked" },