diff --git a/MAPS/SHMS/DETEC/phodo.map b/MAPS/SHMS/DETEC/phodo.map
index ed12927530f0aacbc042c51f7a9774dfd8e8ec91..a2ae7957511e0f1b0e5c33a5e5a7c5bdf0c0ec4b 100644
--- a/MAPS/SHMS/DETEC/phodo.map
+++ b/MAPS/SHMS/DETEC/phodo.map
@@ -6,269 +6,269 @@ DETECTOR=23
 ROC=2
 
 SLOT=3
-   0,   1,   1,   0  ! S1X001L
-   1,   1,   2,   0  ! S1X002L
-   2,   1,   3,   0  ! S1X003L
-   3,   1,   4,   0  ! S1X004L
-   4,   1,   5,   0  ! S1X005L
-   5,   1,   6,   0  ! S1X006L
-   6,   1,   7,   0  ! S1X007L
-   7,   1,   8,   0  ! S1X008L
-   8,   1,   9,   0  ! S1X009L
-   9,   1,  10,   0  ! S1X010L
-  10,   1,  11,   0  ! S1X011L
-  11,   1,  12,   0  ! S1X012L
-  12,   1,  13,   0  ! S1X013L
-  13,   1,   1,   1  ! S1X001R
-  14,   1,   2,   1  ! S1X002R
-  15,   1,   3,   1  ! S1X003R
+   0,   1,   1,   0  ! p1x01A+
+   1,   1,   2,   0  ! p1x02A+
+   2,   1,   3,   0  ! p1x03A+
+   3,   1,   4,   0  ! p1x04A+
+   4,   1,   5,   0  ! p1x05A+
+   5,   1,   6,   0  ! p1x06A+
+   6,   1,   7,   0  ! p1x07A+
+   7,   1,   8,   0  ! p1x08A+
+   8,   1,   9,   0  ! p1x09A+
+   9,   1,  10,   0  ! p1x10A+
+  10,   1,  11,   0  ! p1x11A+
+  11,   1,  12,   0  ! p1x12A+
+  12,   1,  13,   0  ! p1x13A+
+  13,   1,   1,   1  ! p1x01A-
+  14,   1,   2,   1  ! p1x02A-
+  15,   1,   3,   1  ! p1x03A-
 
 SLOT=4
-   0,   1,   4,   1  ! S1X004R
-   1,   1,   5,   1  ! S1X005R
-   2,   1,   6,   1  ! S1X006R
-   3,   1,   7,   1  ! S1X007R
-   4,   1,   8,   1  ! S1X008R
-   5,   1,   9,   1  ! S1X009R
-   6,   1,  10,   1  ! S1X010R
-   7,   1,  11,   1  ! S1X011R
-   8,   1,  12,   1  ! S1X012R
-   9,   1,  13,   1  ! S1X013R
-  10,   2,   1,   1  ! S1Y001T
-  11,   2,   2,   1  ! S1Y002T
-  12,   2,   3,   1  ! S1Y003T
-  13,   2,   4,   1  ! S1Y004T
-  14,   2,   5,   1  ! S1Y005T
-  15,   2,   6,   1  ! S1Y006T
+   0,   1,   4,   1  ! p1x04A-
+   1,   1,   5,   1  ! p1x05A-
+   2,   1,   6,   1  ! p1x06A-
+   3,   1,   7,   1  ! p1x07A-
+   4,   1,   8,   1  ! p1x08A-
+   5,   1,   9,   1  ! p1x09A-
+   6,   1,  10,   1  ! p1x10A-
+   7,   1,  11,   1  ! p1x11A-
+   8,   1,  12,   1  ! p1x12A-
+   9,   1,  13,   1  ! p1x13A-
+  10,   2,   1,   1  ! p1y01A-
+  11,   2,   2,   1  ! p1y02A-
+  12,   2,   3,   1  ! p1y03A-
+  13,   2,   4,   1  ! p1y04A-
+  14,   2,   5,   1  ! p1y05A-
+  15,   2,   6,   1  ! p1y06A-
 
 SLOT=5
-   0,   2,   7,   1  ! S1Y007T
-   1,   2,   8,   1  ! S1Y008T
-   2,   2,   9,   1  ! S1Y009T
-   3,   2,  10,   1  ! S1Y010T
-   4,   2,  11,   1  ! S1Y011T
-   5,   2,  12,   1  ! S1Y012T
-   6,   2,  13,   1  ! S1Y013T
-   7,   2,   1,   0  ! S1Y001B
-   8,   2,   2,   0  ! S1Y002B
-   9,   2,   3,   0  ! S1Y003B
-  10,   2,   4,   0  ! S1Y004B
-  11,   2,   5,   0  ! S1Y005B
-  12,   2,   6,   0  ! S1Y006B
-  13,   2,   7,   0  ! S1Y007B
-  14,   2,   8,   0  ! S1Y008B
-  15,   2,   9,   0  ! S1Y009B
+   0,   2,   7,   1  ! p1y07A-
+   1,   2,   8,   1  ! p1y08A-
+   2,   2,   9,   1  ! p1y09A-
+   3,   2,  10,   1  ! p1y10A-
+   4,   2,  11,   1  ! p1y11A-
+   5,   2,  12,   1  ! p1y12A-
+   6,   2,  13,   1  ! p1y13A-
+   7,   2,   1,   0  ! p1y01+
+   8,   2,   2,   0  ! p1y02+
+   9,   2,   3,   0  ! p1y03+
+  10,   2,   4,   0  ! p1y04+
+  11,   2,   5,   0  ! p1y05+
+  12,   2,   6,   0  ! p1y06+
+  13,   2,   7,   0  ! p1y07+
+  14,   2,   8,   0  ! p1y08+
+  15,   2,   9,   0  ! p1y09+
 
 SLOT=6
-   0,   2,  10,   0  ! S1Y010B
-   1,   2,  11,   0  ! S1Y011B
-   2,   2,  12,   0  ! S1Y012B
-   3,   2,  13,   0  ! S1Y013B
-   4,   3,   1,   0  ! S2X001L
-   5,   3,   2,   0  ! S2X002L
-   6,   3,   3,   0  ! S2X003L
-   7,   3,   4,   0  ! S2X004L
-   8,   3,   5,   0  ! S2X005L
-   9,   3,   6,   0  ! S2X006L
-  10,   3,   7,   0  ! S2X007L
-  11,   3,   8,   0  ! S2X008L
-  12,   3,   9,   0  ! S2X009L
-  13,   3,  10,   0  ! S2X010L
-  14,   3,  11,   0  ! S2X011L
-  15,   3,  12,   0  ! S2X012L
+   0,   2,  10,   0  ! p1y10+
+   1,   2,  11,   0  ! p1y11+
+   2,   2,  12,   0  ! p1y12+
+   3,   2,  13,   0  ! p1y13+
+   4,   3,   1,   0  ! p2x01+
+   5,   3,   2,   0  ! p2x02+
+   6,   3,   3,   0  ! p2x03+
+   7,   3,   4,   0  ! p2x04+
+   8,   3,   5,   0  ! p2x05+
+   9,   3,   6,   0  ! p2x06+
+  10,   3,   7,   0  ! p2x07+
+  11,   3,   8,   0  ! p2x08+
+  12,   3,   9,   0  ! p2x09+
+  13,   3,  10,   0  ! p2x10+
+  14,   3,  11,   0  ! p2x11+
+  15,   3,  12,   0  ! p2x12+
 
 SLOT=7
-   0,   3,  13,   0  ! S2X013L
-   1,   3,  14,   0  ! S2X014L
-   2,   3,   1,   1  ! S2X001R
-   3,   3,   2,   1  ! S2X002R
-   4,   3,   3,   1  ! S2X003R
-   5,   3,   4,   1  ! S2X004R
-   6,   3,   5,   1  ! S2X005R
-   7,   3,   6,   1  ! S2X006R
-   8,   3,   7,   1  ! S2X007R
-   9,   3,   8,   1  ! S2X008R
-  10,   3,   9,   1  ! S2X009R
-  11,   3,  10,   1  ! S2X010R
-  12,   3,  11,   1  ! S2X011R
-  13,   3,  12,   1  ! S2X012R
-  14,   3,  13,   1  ! S2X013R
-  15,   3,  14,   1  ! S2X014R
+   0,   3,  13,   0  ! p2x13+
+   1,   3,  14,   0  ! p2x14+
+   2,   3,   1,   1  ! p2x01A-
+   3,   3,   2,   1  ! p2x02A-
+   4,   3,   3,   1  ! p2x03A-
+   5,   3,   4,   1  ! p2x04A-
+   6,   3,   5,   1  ! p2x05A-
+   7,   3,   6,   1  ! p2x06A-
+   8,   3,   7,   1  ! p2x07A-
+   9,   3,   8,   1  ! p2x08A-
+  10,   3,   9,   1  ! p2x09A-
+  11,   3,  10,   1  ! p2x10A-
+  12,   3,  11,   1  ! p2x11A-
+  13,   3,  12,   1  ! p2x12A-
+  14,   3,  13,   1  ! p2x13A-
+  15,   3,  14,   1  ! p2x14A-
 
 SLOT=8
-   0,   4,   1,   1  ! S2Y001T
-   1,   4,   2,   1  ! S2Y002T
-   2,   4,   3,   1  ! S2Y003T
-   3,   4,   4,   1  ! S2Y004T
-   4,   4,   5,   1  ! S2Y005T
-   5,   4,   6,   1  ! S2Y006T
-   6,   4,   7,   1  ! S2Y007T
-   7,   4,   8,   1  ! S2Y008T
-   8,   4,   9,   1  ! S2Y009T
-   9,   4,  10,   1  ! S2Y010T
-  10,   4,  11,   1  ! S2Y011T
-  11,   4,  12,   1  ! S2Y012T
-  12,   4,  13,   1  ! S2Y013T
-  13,   4,  14,   1  ! S2Y014T
-  14,   4,  15,   1  ! S2Y015T
-  15,   4,  16,   1  ! S2Y016T
+   0,   4,   1,   1  ! p2y01A-
+   1,   4,   2,   1  ! p2y02A-
+   2,   4,   3,   1  ! p2y03A-
+   3,   4,   4,   1  ! p2y04A-
+   4,   4,   5,   1  ! p2y05A-
+   5,   4,   6,   1  ! p2y06A-
+   6,   4,   7,   1  ! p2y07A-
+   7,   4,   8,   1  ! p2y08A-
+   8,   4,   9,   1  ! p2y09A-
+   9,   4,  10,   1  ! p2y10A-
+  10,   4,  11,   1  ! p2y11A-
+  11,   4,  12,   1  ! p2y12A-
+  12,   4,  13,   1  ! p2y13A-
+  13,   4,  14,   1  ! p2y14A-
+  14,   4,  15,   1  ! p2y15A-
+  15,   4,  16,   1  ! p2y16A-
 
 SLOT=9
-   0,   4,  17,   1  ! S2Y017T
-   1,   4,  18,   1  ! S2Y018T
-   2,   4,  19,   1  ! S2Y019T
-   3,   4,  20,   1  ! S2Y020T
-   4,   4,  21,   1  ! S2Y021T
-   5,   4,   1,   0  ! S2Y001B
-   6,   4,   2,   0  ! S2Y002B
-   7,   4,   3,   0  ! S2Y003B
-   8,   4,   4,   0  ! S2Y004B
-   9,   4,   5,   0  ! S2Y005B
-  10,   4,   6,   0  ! S2Y006B
-  11,   4,   7,   0  ! S2Y007B
-  12,   4,   8,   0  ! S2Y008B
-  13,   4,   9,   0  ! S2Y009B
-  14,   4,  10,   0  ! S2Y010B
-  15,   4,  11,   0  ! S2Y011B
+   0,   4,  17,   1  ! p2y17A-
+   1,   4,  18,   1  ! p2y18A-
+   2,   4,  19,   1  ! p2y19A-
+   3,   4,  20,   1  ! p2y20A-
+   4,   4,  21,   1  ! p2y21A-
+   5,   4,   1,   0  ! p2y01A+
+   6,   4,   2,   0  ! p2y02A+
+   7,   4,   3,   0  ! p2y03A+
+   8,   4,   4,   0  ! p2y04A+
+   9,   4,   5,   0  ! p2y05A+
+  10,   4,   6,   0  ! p2y06A+
+  11,   4,   7,   0  ! p2y07A+
+  12,   4,   8,   0  ! p2y08A+
+  13,   4,   9,   0  ! p2y09A+
+  14,   4,  10,   0  ! p2y10A+
+  15,   4,  11,   0  ! p2y11A+
 
 SLOT=10
-   0,   4,  12,   0  ! S2Y012B
-   1,   4,  13,   0  ! S2Y013B
-   2,   4,  14,   0  ! S2Y014B
-   3,   4,  15,   0  ! S2Y015B
-   4,   4,  16,   0  ! S2Y016B
-   5,   4,  17,   0  ! S2Y017B
-   6,   4,  18,   0  ! S2Y018B
-   7,   4,  19,   0  ! S2Y019B
-   8,   4,  20,   0  ! S2Y020B
-   9,   4,  21,   0  ! S2Y021B
+   0,   4,  12,   0  ! p2y12A+
+   1,   4,  13,   0  ! p2y13A+
+   2,   4,  14,   0  ! p2y14A+
+   3,   4,  15,   0  ! p2y15A+
+   4,   4,  16,   0  ! p2y16A+
+   5,   4,  17,   0  ! p2y17A+
+   6,   4,  18,   0  ! p2y18A+
+   7,   4,  19,   0  ! p2y19A+
+   8,   4,  20,   0  ! p2y20A+
+   9,   4,  21,   0  ! p2y21A+
 
 SLOT=20
 REFINDEX=0
   15,1000,   0,   0
-   0,   1,   1,   2  ! S1X001L
-   1,   1,   3,   2  ! S1X003L
-   2,   1,   5,   2  ! S1X005L
-   3,   1,   7,   2  ! S1X007L
-   4,   1,   2,   2  ! S1X002L
-   5,   1,   4,   2  ! S1X004L
-   6,   1,   6,   2  ! S1X006L
-   7,   1,   8,   2  ! S1X008L
-   8,   1,   9,   2  ! S1X009L
-   9,   1,  11,   2  ! S1X011L
-  10,   1,  13,   2  ! S1X013L
-  12,   1,  10,   2  ! S1X010L
-  13,   1,  12,   2  ! S1X012L
-  16,   1,   1,   3  ! S1X001R
-  17,   1,   3,   3  ! S1X003R
-  18,   1,   5,   3  ! S1X005R
-  19,   1,   7,   3  ! S1X007R
-  20,   1,   2,   3  ! S1X002R
-  21,   1,   4,   3  ! S1X004R
-  22,   1,   6,   3  ! S1X006R
-  23,   1,   8,   3  ! S1X008R
-  24,   1,   9,   3  ! S1X009R
-  25,   1,  11,   3  ! S1X011R
-  26,   1,  13,   3  ! S1X013R
-  28,   1,  10,   3  ! S1X010R
-  30,   1,  12,   3  ! S1X012R
-  32,   2,   1,   3  ! S1Y001T
-  33,   2,   3,   3  ! S1Y003T
-  34,   2,   5,   3  ! S1Y005T
-  35,   2,   7,   3  ! S1Y007T
-  36,   2,   2,   3  ! S1Y002T
-  37,   2,   4,   3  ! S1Y004T
-  38,   2,   6,   3  ! S1Y006T
-  39,   2,   8,   3  ! S1Y008T
-  40,   2,   9,   3  ! S1Y009T
-  41,   2,  11,   3  ! S1Y011T
-  42,   2,  13,   3  ! S1Y013T
-  44,   2,  10,   3  ! S1Y010T
-  45,   2,  12,   3  ! S1Y012T
-  48,   2,   1,   2  ! S1Y001B
-  49,   2,   3,   2  ! S1Y003B
-  50,   2,   5,   2  ! S1Y005B
-  51,   2,   7,   2  ! S1Y007B
-  52,   2,   2,   2  ! S1Y002B
-  53,   2,   4,   2  ! S1Y004B
-  54,   2,   6,   2  ! S1Y006B
-  55,   2,   8,   2  ! S1Y008B
-  56,   2,   9,   2  ! S1Y009B
-  57,   2,  11,   2  ! S1Y011B
-  58,   2,  13,   2  ! S1Y013B
-  60,   2,  10,   2  ! S1Y010B
-  61,   2,  12,   2  ! S1Y012B
-  64,   3,   1,   2  ! S2X001L
-  65,   3,   3,   2  ! S2X003L
-  66,   3,   5,   2  ! S2X005L
-  67,   3,   7,   2  ! S2X007L
-  68,   3,   2,   2  ! S2X002L
-  69,   3,   4,   2  ! S2X004L
-  70,   3,   6,   2  ! S2X006L
-  71,   3,   8,   2  ! S2X008L
-  72,   3,   9,   2  ! S2X009L
-  73,   3,  11,   2  ! S2X011L
-  74,   3,  13,   2  ! S2X013L
-  76,   3,  10,   2  ! S2X010L
-  77,   3,  12,   2  ! S2X012L
-  78,   3,  14,   2  ! S2X014L
-  80,   3,   1,   3  ! S2X001R
-  81,   3,   3,   3  ! S2X003R
-  82,   3,   5,   3  ! S2X005R
-  83,   3,   7,   3  ! S2X007R
-  84,   3,   2,   3  ! S2X002R
-  85,   3,   4,   3  ! S2X004R
-  86,   3,   6,   3  ! S2X006R
-  87,   3,   8,   3  ! S2X008R
-  88,   3,   9,   3  ! S2X009R
-  89,   3,  11,   3  ! S2X011R
-  90,   3,  13,   3  ! S2X013R
-  92,   3,  10,   3  ! S2X010R
-  93,   3,  12,   3  ! S2X012R
-  94,   3,  14,   3  ! S2X014R
-  96,   4,   1,   3  ! S2Y001T
-  97,   4,   3,   3  ! S2Y003T
-  98,   4,   5,   3  ! S2Y005T
-  99,   4,   7,   3  ! S2Y007T
- 100,   4,   2,   3  ! S2Y002T
- 101,   4,   4,   3  ! S2Y004T
- 102,   4,   6,   3  ! S2Y006T
- 103,   4,   8,   3  ! S2Y008T
- 104,   4,   9,   3  ! S2Y009T
- 105,   4,  11,   3  ! S2Y011T
- 106,   4,  13,   3  ! S2Y013T
- 107,   4,  15,   3  ! S2Y015T
- 108,   4,  10,   3  ! S2Y010T
- 109,   4,  12,   3  ! S2Y012T
- 110,   4,  14,   3  ! S2Y014T
- 111,   4,  16,   3  ! S2Y016T
- 112,   4,  17,   3  ! S2Y017T
- 113,   4,  19,   3  ! S2Y019T
- 114,   4,  21,   3  ! S2Y021T
- 116,   4,  18,   3  ! S2Y018T
- 117,   4,  20,   3  ! S2Y020T
+   0,   1,   1,   2  ! p1x01T+
+   1,   1,   3,   2  ! p1x03T+
+   2,   1,   5,   2  ! p1x05T+
+   3,   1,   7,   2  ! p1x07T+
+   4,   1,   2,   2  ! p1x02T+
+   5,   1,   4,   2  ! p1x04T+
+   6,   1,   6,   2  ! p1x06T+
+   7,   1,   8,   2  ! p1x08T+
+   8,   1,   9,   2  ! p1x09T+
+   9,   1,  11,   2  ! p1x11T+
+  10,   1,  13,   2  ! p1x13T+
+  12,   1,  10,   2  ! p1x10T+
+  13,   1,  12,   2  ! p1x12T+
+  16,   1,   1,   3  ! p1x01T-
+  17,   1,   3,   3  ! p1x03T-
+  18,   1,   5,   3  ! p1x05T-
+  19,   1,   7,   3  ! p1x07T-
+  20,   1,   2,   3  ! p1x02T-
+  21,   1,   4,   3  ! p1x04T-
+  22,   1,   6,   3  ! p1x06T-
+  23,   1,   8,   3  ! p1x08T-
+  24,   1,   9,   3  ! p1x09T-
+  25,   1,  11,   3  ! p1x11T-
+  26,   1,  13,   3  ! p1x13T-
+  28,   1,  10,   3  ! p1x10T-
+  30,   1,  12,   3  ! p1x12T-
+  32,   2,   1,   3  ! p1y01T-
+  33,   2,   3,   3  ! p1y03T-
+  34,   2,   5,   3  ! p1y05T-
+  35,   2,   7,   3  ! p1y07T-
+  36,   2,   2,   3  ! p1y02T-
+  37,   2,   4,   3  ! p1y04T-
+  38,   2,   6,   3  ! p1y06T-
+  39,   2,   8,   3  ! p1y08T-
+  40,   2,   9,   3  ! p1y09T-
+  41,   2,  11,   3  ! p1y11T-
+  42,   2,  13,   3  ! p1y13T-
+  44,   2,  10,   3  ! p1y10T-
+  45,   2,  12,   3  ! p1y12T-
+  48,   2,   1,   2  ! p1y01T+
+  49,   2,   3,   2  ! p1y03T+
+  50,   2,   5,   2  ! p1y05T+
+  51,   2,   7,   2  ! p1y07T+
+  52,   2,   2,   2  ! p1y02T+
+  53,   2,   4,   2  ! p1y04T+
+  54,   2,   6,   2  ! p1y06T+
+  55,   2,   8,   2  ! p1y08T+
+  56,   2,   9,   2  ! p1y09T+
+  57,   2,  11,   2  ! p1y11T+
+  58,   2,  13,   2  ! p1y13T+
+  60,   2,  10,   2  ! p1y10T+
+  61,   2,  12,   2  ! p1y12T+
+  64,   3,   1,   2  ! p2x01T+
+  65,   3,   3,   2  ! p2x03T+
+  66,   3,   5,   2  ! p2x05T+
+  67,   3,   7,   2  ! p2x07T+
+  68,   3,   2,   2  ! p2x02T+
+  69,   3,   4,   2  ! p2x04T+
+  70,   3,   6,   2  ! p2x06T+
+  71,   3,   8,   2  ! p2x08T+
+  72,   3,   9,   2  ! p2x09T+
+  73,   3,  11,   2  ! p2x11T+
+  74,   3,  13,   2  ! p2x13T+
+  76,   3,  10,   2  ! p2x10T+
+  77,   3,  12,   2  ! p2x12T+
+  78,   3,  14,   2  ! p2x14T+
+  80,   3,   1,   3  ! p2x01T-
+  81,   3,   3,   3  ! p2x03T-
+  82,   3,   5,   3  ! p2x05T-
+  83,   3,   7,   3  ! p2x07T-
+  84,   3,   2,   3  ! p2x02T-
+  85,   3,   4,   3  ! p2x04T-
+  86,   3,   6,   3  ! p2x06T-
+  87,   3,   8,   3  ! p2x08T-
+  88,   3,   9,   3  ! p2x09T-
+  89,   3,  11,   3  ! p2x11T-
+  90,   3,  13,   3  ! p2x13T-
+  92,   3,  10,   3  ! p2x10T-
+  93,   3,  12,   3  ! p2x12T-
+  94,   3,  14,   3  ! p2x14T-
+  96,   4,   1,   3  ! p2y01T-
+  97,   4,   3,   3  ! p2y03T-
+  98,   4,   5,   3  ! p2y05T-
+  99,   4,   7,   3  ! p2y07T-
+ 100,   4,   2,   3  ! p2y02T-
+ 101,   4,   4,   3  ! p2y04T-
+ 102,   4,   6,   3  ! p2y06T-
+ 103,   4,   8,   3  ! p2y08T-
+ 104,   4,   9,   3  ! p2y09T-
+ 105,   4,  11,   3  ! p2y11T-
+ 106,   4,  13,   3  ! p2y13T-
+ 107,   4,  15,   3  ! p2y15T-
+ 108,   4,  10,   3  ! p2y10T-
+ 109,   4,  12,   3  ! p2y12T-
+ 110,   4,  14,   3  ! p2y14T-
+ 111,   4,  16,   3  ! p2y16T-
+ 112,   4,  17,   3  ! p2y17T-
+ 113,   4,  19,   3  ! p2y19T-
+ 114,   4,  21,   3  ! p2y21T-
+ 116,   4,  18,   3  ! p2y18T-
+ 117,   4,  20,   3  ! p2y20T-
 
 SLOT=19
 REFINDEX=0
   31,1000,   0,   1
-   0,   4,   1,   2  ! S2Y001B
-   1,   4,   3,   2  ! S2Y003B
-   2,   4,   5,   2  ! S2Y005B
-   3,   4,   7,   2  ! S2Y007B
-   4,   4,   2,   2  ! S2Y002B
-   5,   4,   4,   2  ! S2Y004B
-   6,   4,   6,   2  ! S2Y006B
-   7,   4,   8,   2  ! S2Y008B
-   8,   4,   9,   2  ! S2Y009B
-   9,   4,  11,   2  ! S2Y011B
-  10,   4,  13,   2  ! S2Y013B
-  11,   4,  15,   2  ! S2Y015B
-  12,   4,  10,   2  ! S2Y010B
-  13,   4,  12,   2  ! S2Y012B
-  14,   4,  14,   2  ! S2Y014B
-  15,   4,  16,   2  ! S2Y016B
-  16,   4,  17,   2  ! S2Y017B
-  17,   4,  19,   2  ! S2Y019B
-  18,   4,  21,   2  ! S2Y021B
-  20,   4,  18,   2  ! S2Y018B
-  21,   4,  20,   2  ! S2Y020B
+   0,   4,   1,   2  ! p2y01T+
+   1,   4,   3,   2  ! p2y03T+
+   2,   4,   5,   2  ! p2y05T+
+   3,   4,   7,   2  ! p2y07T+
+   4,   4,   2,   2  ! p2y02T+
+   5,   4,   4,   2  ! p2y04T+
+   6,   4,   6,   2  ! p2y06T+
+   7,   4,   8,   2  ! p2y08T+
+   8,   4,   9,   2  ! p2y09T+
+   9,   4,  11,   2  ! p2y11T+
+  10,   4,  13,   2  ! p2y13T+
+  11,   4,  15,   2  ! p2y15T+
+  12,   4,  10,   2  ! p2y10T+
+  13,   4,  12,   2  ! p2y12T+
+  14,   4,  14,   2  ! p2y14T+
+  15,   4,  16,   2  ! p2y16T+
+  16,   4,  17,   2  ! p2y17T+
+  17,   4,  19,   2  ! p2y19T+
+  18,   4,  21,   2  ! p2y21T+
+  20,   4,  18,   2  ! p2y18T+
+  21,   4,  20,   2  ! p2y20T+
diff --git a/MAPS/SHMS/DETEC/phodo_ptrig.map b/MAPS/SHMS/DETEC/phodo_ptrig.map
index 60ca4788f652529f23a8e76536f6845521e05a58..541af4393ba39b1a89038ea557e40b3ddbcb6a9d 100644
--- a/MAPS/SHMS/DETEC/phodo_ptrig.map
+++ b/MAPS/SHMS/DETEC/phodo_ptrig.map
@@ -1,5 +1,5 @@
-! TSHMS_ID=20      ::  ::,::,ADC+,ADC-,TDC+,TDC-
-! PSCIN_ID=23      ::  ::,::,ADC+,ADC-,TDC+,TDC-
+! TSHMS_ID=20      ::  ADC,TDC
+! PSCIN_ID=23      ::  ,ADC+,ADC-,TDC+,TDC-
 
 
 DETECTOR=20
@@ -8,8 +8,8 @@ ROC=2
 
 SLOT=14
    0,   1,   1,   0  ! pAERSUM
-   1,   1,   2,   0  ! pHGCSUM
-   2,   1,   3,   0  ! pNGCSUM
+   1,   1,   2,   0  ! pHGCERSUM
+   2,   1,   3,   0  ! pNGCERSUM
 
 SLOT=20
   15,   2,   1,   1  ! pT1
@@ -24,8 +24,8 @@ SLOT=19
   37,   2,   8,   1  ! p2T
   38,   2,   9,   1  ! pT3
   39,   2,  10,   1  ! pAERSUM
-  40,   2,  11,   1  ! pHGCSUM
-  41,   2,  12,   1  ! pNGCSUM
+  40,   2,  11,   1  ! pHGCERSUM
+  41,   2,  12,   1  ! pNGCERSUM
 
 ROC=6
 
@@ -65,269 +65,269 @@ DETECTOR=23
 ROC=2
 
 SLOT=3
-   0,   1,   1,   0  ! S1X001L
-   1,   1,   2,   0  ! S1X002L
-   2,   1,   3,   0  ! S1X003L
-   3,   1,   4,   0  ! S1X004L
-   4,   1,   5,   0  ! S1X005L
-   5,   1,   6,   0  ! S1X006L
-   6,   1,   7,   0  ! S1X007L
-   7,   1,   8,   0  ! S1X008L
-   8,   1,   9,   0  ! S1X009L
-   9,   1,  10,   0  ! S1X010L
-  10,   1,  11,   0  ! S1X011L
-  11,   1,  12,   0  ! S1X012L
-  12,   1,  13,   0  ! S1X013L
-  13,   1,   1,   1  ! S1X001R
-  14,   1,   2,   1  ! S1X002R
-  15,   1,   3,   1  ! S1X003R
+   0,   1,   1,   0  ! p1x01A+
+   1,   1,   2,   0  ! p1x02A+
+   2,   1,   3,   0  ! p1x03A+
+   3,   1,   4,   0  ! p1x04A+
+   4,   1,   5,   0  ! p1x05A+
+   5,   1,   6,   0  ! p1x06A+
+   6,   1,   7,   0  ! p1x07A+
+   7,   1,   8,   0  ! p1x08A+
+   8,   1,   9,   0  ! p1x09A+
+   9,   1,  10,   0  ! p1x10A+
+  10,   1,  11,   0  ! p1x11A+
+  11,   1,  12,   0  ! p1x12A+
+  12,   1,  13,   0  ! p1x13A+
+  13,   1,   1,   1  ! p1x01A-
+  14,   1,   2,   1  ! p1x02A-
+  15,   1,   3,   1  ! p1x03A-
 
 SLOT=4
-   0,   1,   4,   1  ! S1X004R
-   1,   1,   5,   1  ! S1X005R
-   2,   1,   6,   1  ! S1X006R
-   3,   1,   7,   1  ! S1X007R
-   4,   1,   8,   1  ! S1X008R
-   5,   1,   9,   1  ! S1X009R
-   6,   1,  10,   1  ! S1X010R
-   7,   1,  11,   1  ! S1X011R
-   8,   1,  12,   1  ! S1X012R
-   9,   1,  13,   1  ! S1X013R
-  10,   2,   1,   1  ! S1Y001T
-  11,   2,   2,   1  ! S1Y002T
-  12,   2,   3,   1  ! S1Y003T
-  13,   2,   4,   1  ! S1Y004T
-  14,   2,   5,   1  ! S1Y005T
-  15,   2,   6,   1  ! S1Y006T
+   0,   1,   4,   1  ! p1x04A-
+   1,   1,   5,   1  ! p1x05A-
+   2,   1,   6,   1  ! p1x06A-
+   3,   1,   7,   1  ! p1x07A-
+   4,   1,   8,   1  ! p1x08A-
+   5,   1,   9,   1  ! p1x09A-
+   6,   1,  10,   1  ! p1x10A-
+   7,   1,  11,   1  ! p1x11A-
+   8,   1,  12,   1  ! p1x12A-
+   9,   1,  13,   1  ! p1x13A-
+  10,   2,   1,   1  ! p1y01A-
+  11,   2,   2,   1  ! p1y02A-
+  12,   2,   3,   1  ! p1y03A-
+  13,   2,   4,   1  ! p1y04A-
+  14,   2,   5,   1  ! p1y05A-
+  15,   2,   6,   1  ! p1y06A-
 
 SLOT=5
-   0,   2,   7,   1  ! S1Y007T
-   1,   2,   8,   1  ! S1Y008T
-   2,   2,   9,   1  ! S1Y009T
-   3,   2,  10,   1  ! S1Y010T
-   4,   2,  11,   1  ! S1Y011T
-   5,   2,  12,   1  ! S1Y012T
-   6,   2,  13,   1  ! S1Y013T
-   7,   2,   1,   0  ! S1Y001B
-   8,   2,   2,   0  ! S1Y002B
-   9,   2,   3,   0  ! S1Y003B
-  10,   2,   4,   0  ! S1Y004B
-  11,   2,   5,   0  ! S1Y005B
-  12,   2,   6,   0  ! S1Y006B
-  13,   2,   7,   0  ! S1Y007B
-  14,   2,   8,   0  ! S1Y008B
-  15,   2,   9,   0  ! S1Y009B
+   0,   2,   7,   1  ! p1y07A-
+   1,   2,   8,   1  ! p1y08A-
+   2,   2,   9,   1  ! p1y09A-
+   3,   2,  10,   1  ! p1y10A-
+   4,   2,  11,   1  ! p1y11A-
+   5,   2,  12,   1  ! p1y12A-
+   6,   2,  13,   1  ! p1y13A-
+   7,   2,   1,   0  ! p1y01+
+   8,   2,   2,   0  ! p1y02+
+   9,   2,   3,   0  ! p1y03+
+  10,   2,   4,   0  ! p1y04+
+  11,   2,   5,   0  ! p1y05+
+  12,   2,   6,   0  ! p1y06+
+  13,   2,   7,   0  ! p1y07+
+  14,   2,   8,   0  ! p1y08+
+  15,   2,   9,   0  ! p1y09+
 
 SLOT=6
-   0,   2,  10,   0  ! S1Y010B
-   1,   2,  11,   0  ! S1Y011B
-   2,   2,  12,   0  ! S1Y012B
-   3,   2,  13,   0  ! S1Y013B
-   4,   3,   1,   0  ! S2X001L
-   5,   3,   2,   0  ! S2X002L
-   6,   3,   3,   0  ! S2X003L
-   7,   3,   4,   0  ! S2X004L
-   8,   3,   5,   0  ! S2X005L
-   9,   3,   6,   0  ! S2X006L
-  10,   3,   7,   0  ! S2X007L
-  11,   3,   8,   0  ! S2X008L
-  12,   3,   9,   0  ! S2X009L
-  13,   3,  10,   0  ! S2X010L
-  14,   3,  11,   0  ! S2X011L
-  15,   3,  12,   0  ! S2X012L
+   0,   2,  10,   0  ! p1y10+
+   1,   2,  11,   0  ! p1y11+
+   2,   2,  12,   0  ! p1y12+
+   3,   2,  13,   0  ! p1y13+
+   4,   3,   1,   0  ! p2x01+
+   5,   3,   2,   0  ! p2x02+
+   6,   3,   3,   0  ! p2x03+
+   7,   3,   4,   0  ! p2x04+
+   8,   3,   5,   0  ! p2x05+
+   9,   3,   6,   0  ! p2x06+
+  10,   3,   7,   0  ! p2x07+
+  11,   3,   8,   0  ! p2x08+
+  12,   3,   9,   0  ! p2x09+
+  13,   3,  10,   0  ! p2x10+
+  14,   3,  11,   0  ! p2x11+
+  15,   3,  12,   0  ! p2x12+
 
 SLOT=7
-   0,   3,  13,   0  ! S2X013L
-   1,   3,  14,   0  ! S2X014L
-   2,   3,   1,   1  ! S2X001R
-   3,   3,   2,   1  ! S2X002R
-   4,   3,   3,   1  ! S2X003R
-   5,   3,   4,   1  ! S2X004R
-   6,   3,   5,   1  ! S2X005R
-   7,   3,   6,   1  ! S2X006R
-   8,   3,   7,   1  ! S2X007R
-   9,   3,   8,   1  ! S2X008R
-  10,   3,   9,   1  ! S2X009R
-  11,   3,  10,   1  ! S2X010R
-  12,   3,  11,   1  ! S2X011R
-  13,   3,  12,   1  ! S2X012R
-  14,   3,  13,   1  ! S2X013R
-  15,   3,  14,   1  ! S2X014R
+   0,   3,  13,   0  ! p2x13+
+   1,   3,  14,   0  ! p2x14+
+   2,   3,   1,   1  ! p2x01A-
+   3,   3,   2,   1  ! p2x02A-
+   4,   3,   3,   1  ! p2x03A-
+   5,   3,   4,   1  ! p2x04A-
+   6,   3,   5,   1  ! p2x05A-
+   7,   3,   6,   1  ! p2x06A-
+   8,   3,   7,   1  ! p2x07A-
+   9,   3,   8,   1  ! p2x08A-
+  10,   3,   9,   1  ! p2x09A-
+  11,   3,  10,   1  ! p2x10A-
+  12,   3,  11,   1  ! p2x11A-
+  13,   3,  12,   1  ! p2x12A-
+  14,   3,  13,   1  ! p2x13A-
+  15,   3,  14,   1  ! p2x14A-
 
 SLOT=8
-   0,   4,   1,   1  ! S2Y001T
-   1,   4,   2,   1  ! S2Y002T
-   2,   4,   3,   1  ! S2Y003T
-   3,   4,   4,   1  ! S2Y004T
-   4,   4,   5,   1  ! S2Y005T
-   5,   4,   6,   1  ! S2Y006T
-   6,   4,   7,   1  ! S2Y007T
-   7,   4,   8,   1  ! S2Y008T
-   8,   4,   9,   1  ! S2Y009T
-   9,   4,  10,   1  ! S2Y010T
-  10,   4,  11,   1  ! S2Y011T
-  11,   4,  12,   1  ! S2Y012T
-  12,   4,  13,   1  ! S2Y013T
-  13,   4,  14,   1  ! S2Y014T
-  14,   4,  15,   1  ! S2Y015T
-  15,   4,  16,   1  ! S2Y016T
+   0,   4,   1,   1  ! p2y01A-
+   1,   4,   2,   1  ! p2y02A-
+   2,   4,   3,   1  ! p2y03A-
+   3,   4,   4,   1  ! p2y04A-
+   4,   4,   5,   1  ! p2y05A-
+   5,   4,   6,   1  ! p2y06A-
+   6,   4,   7,   1  ! p2y07A-
+   7,   4,   8,   1  ! p2y08A-
+   8,   4,   9,   1  ! p2y09A-
+   9,   4,  10,   1  ! p2y10A-
+  10,   4,  11,   1  ! p2y11A-
+  11,   4,  12,   1  ! p2y12A-
+  12,   4,  13,   1  ! p2y13A-
+  13,   4,  14,   1  ! p2y14A-
+  14,   4,  15,   1  ! p2y15A-
+  15,   4,  16,   1  ! p2y16A-
 
 SLOT=9
-   0,   4,  17,   1  ! S2Y017T
-   1,   4,  18,   1  ! S2Y018T
-   2,   4,  19,   1  ! S2Y019T
-   3,   4,  20,   1  ! S2Y020T
-   4,   4,  21,   1  ! S2Y021T
-   5,   4,   1,   0  ! S2Y001B
-   6,   4,   2,   0  ! S2Y002B
-   7,   4,   3,   0  ! S2Y003B
-   8,   4,   4,   0  ! S2Y004B
-   9,   4,   5,   0  ! S2Y005B
-  10,   4,   6,   0  ! S2Y006B
-  11,   4,   7,   0  ! S2Y007B
-  12,   4,   8,   0  ! S2Y008B
-  13,   4,   9,   0  ! S2Y009B
-  14,   4,  10,   0  ! S2Y010B
-  15,   4,  11,   0  ! S2Y011B
+   0,   4,  17,   1  ! p2y17A-
+   1,   4,  18,   1  ! p2y18A-
+   2,   4,  19,   1  ! p2y19A-
+   3,   4,  20,   1  ! p2y20A-
+   4,   4,  21,   1  ! p2y21A-
+   5,   4,   1,   0  ! p2y01A+
+   6,   4,   2,   0  ! p2y02A+
+   7,   4,   3,   0  ! p2y03A+
+   8,   4,   4,   0  ! p2y04A+
+   9,   4,   5,   0  ! p2y05A+
+  10,   4,   6,   0  ! p2y06A+
+  11,   4,   7,   0  ! p2y07A+
+  12,   4,   8,   0  ! p2y08A+
+  13,   4,   9,   0  ! p2y09A+
+  14,   4,  10,   0  ! p2y10A+
+  15,   4,  11,   0  ! p2y11A+
 
 SLOT=10
-   0,   4,  12,   0  ! S2Y012B
-   1,   4,  13,   0  ! S2Y013B
-   2,   4,  14,   0  ! S2Y014B
-   3,   4,  15,   0  ! S2Y015B
-   4,   4,  16,   0  ! S2Y016B
-   5,   4,  17,   0  ! S2Y017B
-   6,   4,  18,   0  ! S2Y018B
-   7,   4,  19,   0  ! S2Y019B
-   8,   4,  20,   0  ! S2Y020B
-   9,   4,  21,   0  ! S2Y021B
+   0,   4,  12,   0  ! p2y12A+
+   1,   4,  13,   0  ! p2y13A+
+   2,   4,  14,   0  ! p2y14A+
+   3,   4,  15,   0  ! p2y15A+
+   4,   4,  16,   0  ! p2y16A+
+   5,   4,  17,   0  ! p2y17A+
+   6,   4,  18,   0  ! p2y18A+
+   7,   4,  19,   0  ! p2y19A+
+   8,   4,  20,   0  ! p2y20A+
+   9,   4,  21,   0  ! p2y21A+
 
 SLOT=20
 REFINDEX=0
   15,1000,   0,   0
-   0,   1,   1,   2  ! S1X001L
-   1,   1,   3,   2  ! S1X003L
-   2,   1,   5,   2  ! S1X005L
-   3,   1,   7,   2  ! S1X007L
-   4,   1,   2,   2  ! S1X002L
-   5,   1,   4,   2  ! S1X004L
-   6,   1,   6,   2  ! S1X006L
-   7,   1,   8,   2  ! S1X008L
-   8,   1,   9,   2  ! S1X009L
-   9,   1,  11,   2  ! S1X011L
-  10,   1,  13,   2  ! S1X013L
-  12,   1,  10,   2  ! S1X010L
-  13,   1,  12,   2  ! S1X012L
-  16,   1,   1,   3  ! S1X001R
-  17,   1,   3,   3  ! S1X003R
-  18,   1,   5,   3  ! S1X005R
-  19,   1,   7,   3  ! S1X007R
-  20,   1,   2,   3  ! S1X002R
-  21,   1,   4,   3  ! S1X004R
-  22,   1,   6,   3  ! S1X006R
-  23,   1,   8,   3  ! S1X008R
-  24,   1,   9,   3  ! S1X009R
-  25,   1,  11,   3  ! S1X011R
-  26,   1,  13,   3  ! S1X013R
-  28,   1,  10,   3  ! S1X010R
-  30,   1,  12,   3  ! S1X012R
-  32,   2,   1,   3  ! S1Y001T
-  33,   2,   3,   3  ! S1Y003T
-  34,   2,   5,   3  ! S1Y005T
-  35,   2,   7,   3  ! S1Y007T
-  36,   2,   2,   3  ! S1Y002T
-  37,   2,   4,   3  ! S1Y004T
-  38,   2,   6,   3  ! S1Y006T
-  39,   2,   8,   3  ! S1Y008T
-  40,   2,   9,   3  ! S1Y009T
-  41,   2,  11,   3  ! S1Y011T
-  42,   2,  13,   3  ! S1Y013T
-  44,   2,  10,   3  ! S1Y010T
-  45,   2,  12,   3  ! S1Y012T
-  48,   2,   1,   2  ! S1Y001B
-  49,   2,   3,   2  ! S1Y003B
-  50,   2,   5,   2  ! S1Y005B
-  51,   2,   7,   2  ! S1Y007B
-  52,   2,   2,   2  ! S1Y002B
-  53,   2,   4,   2  ! S1Y004B
-  54,   2,   6,   2  ! S1Y006B
-  55,   2,   8,   2  ! S1Y008B
-  56,   2,   9,   2  ! S1Y009B
-  57,   2,  11,   2  ! S1Y011B
-  58,   2,  13,   2  ! S1Y013B
-  60,   2,  10,   2  ! S1Y010B
-  61,   2,  12,   2  ! S1Y012B
-  64,   3,   1,   2  ! S2X001L
-  65,   3,   3,   2  ! S2X003L
-  66,   3,   5,   2  ! S2X005L
-  67,   3,   7,   2  ! S2X007L
-  68,   3,   2,   2  ! S2X002L
-  69,   3,   4,   2  ! S2X004L
-  70,   3,   6,   2  ! S2X006L
-  71,   3,   8,   2  ! S2X008L
-  72,   3,   9,   2  ! S2X009L
-  73,   3,  11,   2  ! S2X011L
-  74,   3,  13,   2  ! S2X013L
-  76,   3,  10,   2  ! S2X010L
-  77,   3,  12,   2  ! S2X012L
-  78,   3,  14,   2  ! S2X014L
-  80,   3,   1,   3  ! S2X001R
-  81,   3,   3,   3  ! S2X003R
-  82,   3,   5,   3  ! S2X005R
-  83,   3,   7,   3  ! S2X007R
-  84,   3,   2,   3  ! S2X002R
-  85,   3,   4,   3  ! S2X004R
-  86,   3,   6,   3  ! S2X006R
-  87,   3,   8,   3  ! S2X008R
-  88,   3,   9,   3  ! S2X009R
-  89,   3,  11,   3  ! S2X011R
-  90,   3,  13,   3  ! S2X013R
-  92,   3,  10,   3  ! S2X010R
-  93,   3,  12,   3  ! S2X012R
-  94,   3,  14,   3  ! S2X014R
-  96,   4,   1,   3  ! S2Y001T
-  97,   4,   3,   3  ! S2Y003T
-  98,   4,   5,   3  ! S2Y005T
-  99,   4,   7,   3  ! S2Y007T
- 100,   4,   2,   3  ! S2Y002T
- 101,   4,   4,   3  ! S2Y004T
- 102,   4,   6,   3  ! S2Y006T
- 103,   4,   8,   3  ! S2Y008T
- 104,   4,   9,   3  ! S2Y009T
- 105,   4,  11,   3  ! S2Y011T
- 106,   4,  13,   3  ! S2Y013T
- 107,   4,  15,   3  ! S2Y015T
- 108,   4,  10,   3  ! S2Y010T
- 109,   4,  12,   3  ! S2Y012T
- 110,   4,  14,   3  ! S2Y014T
- 111,   4,  16,   3  ! S2Y016T
- 112,   4,  17,   3  ! S2Y017T
- 113,   4,  19,   3  ! S2Y019T
- 114,   4,  21,   3  ! S2Y021T
- 116,   4,  18,   3  ! S2Y018T
- 117,   4,  20,   3  ! S2Y020T
+   0,   1,   1,   2  ! p1x01T+
+   1,   1,   3,   2  ! p1x03T+
+   2,   1,   5,   2  ! p1x05T+
+   3,   1,   7,   2  ! p1x07T+
+   4,   1,   2,   2  ! p1x02T+
+   5,   1,   4,   2  ! p1x04T+
+   6,   1,   6,   2  ! p1x06T+
+   7,   1,   8,   2  ! p1x08T+
+   8,   1,   9,   2  ! p1x09T+
+   9,   1,  11,   2  ! p1x11T+
+  10,   1,  13,   2  ! p1x13T+
+  12,   1,  10,   2  ! p1x10T+
+  13,   1,  12,   2  ! p1x12T+
+  16,   1,   1,   3  ! p1x01T-
+  17,   1,   3,   3  ! p1x03T-
+  18,   1,   5,   3  ! p1x05T-
+  19,   1,   7,   3  ! p1x07T-
+  20,   1,   2,   3  ! p1x02T-
+  21,   1,   4,   3  ! p1x04T-
+  22,   1,   6,   3  ! p1x06T-
+  23,   1,   8,   3  ! p1x08T-
+  24,   1,   9,   3  ! p1x09T-
+  25,   1,  11,   3  ! p1x11T-
+  26,   1,  13,   3  ! p1x13T-
+  28,   1,  10,   3  ! p1x10T-
+  30,   1,  12,   3  ! p1x12T-
+  32,   2,   1,   3  ! p1y01T-
+  33,   2,   3,   3  ! p1y03T-
+  34,   2,   5,   3  ! p1y05T-
+  35,   2,   7,   3  ! p1y07T-
+  36,   2,   2,   3  ! p1y02T-
+  37,   2,   4,   3  ! p1y04T-
+  38,   2,   6,   3  ! p1y06T-
+  39,   2,   8,   3  ! p1y08T-
+  40,   2,   9,   3  ! p1y09T-
+  41,   2,  11,   3  ! p1y11T-
+  42,   2,  13,   3  ! p1y13T-
+  44,   2,  10,   3  ! p1y10T-
+  45,   2,  12,   3  ! p1y12T-
+  48,   2,   1,   2  ! p1y01T+
+  49,   2,   3,   2  ! p1y03T+
+  50,   2,   5,   2  ! p1y05T+
+  51,   2,   7,   2  ! p1y07T+
+  52,   2,   2,   2  ! p1y02T+
+  53,   2,   4,   2  ! p1y04T+
+  54,   2,   6,   2  ! p1y06T+
+  55,   2,   8,   2  ! p1y08T+
+  56,   2,   9,   2  ! p1y09T+
+  57,   2,  11,   2  ! p1y11T+
+  58,   2,  13,   2  ! p1y13T+
+  60,   2,  10,   2  ! p1y10T+
+  61,   2,  12,   2  ! p1y12T+
+  64,   3,   1,   2  ! p2x01T+
+  65,   3,   3,   2  ! p2x03T+
+  66,   3,   5,   2  ! p2x05T+
+  67,   3,   7,   2  ! p2x07T+
+  68,   3,   2,   2  ! p2x02T+
+  69,   3,   4,   2  ! p2x04T+
+  70,   3,   6,   2  ! p2x06T+
+  71,   3,   8,   2  ! p2x08T+
+  72,   3,   9,   2  ! p2x09T+
+  73,   3,  11,   2  ! p2x11T+
+  74,   3,  13,   2  ! p2x13T+
+  76,   3,  10,   2  ! p2x10T+
+  77,   3,  12,   2  ! p2x12T+
+  78,   3,  14,   2  ! p2x14T+
+  80,   3,   1,   3  ! p2x01T-
+  81,   3,   3,   3  ! p2x03T-
+  82,   3,   5,   3  ! p2x05T-
+  83,   3,   7,   3  ! p2x07T-
+  84,   3,   2,   3  ! p2x02T-
+  85,   3,   4,   3  ! p2x04T-
+  86,   3,   6,   3  ! p2x06T-
+  87,   3,   8,   3  ! p2x08T-
+  88,   3,   9,   3  ! p2x09T-
+  89,   3,  11,   3  ! p2x11T-
+  90,   3,  13,   3  ! p2x13T-
+  92,   3,  10,   3  ! p2x10T-
+  93,   3,  12,   3  ! p2x12T-
+  94,   3,  14,   3  ! p2x14T-
+  96,   4,   1,   3  ! p2y01T-
+  97,   4,   3,   3  ! p2y03T-
+  98,   4,   5,   3  ! p2y05T-
+  99,   4,   7,   3  ! p2y07T-
+ 100,   4,   2,   3  ! p2y02T-
+ 101,   4,   4,   3  ! p2y04T-
+ 102,   4,   6,   3  ! p2y06T-
+ 103,   4,   8,   3  ! p2y08T-
+ 104,   4,   9,   3  ! p2y09T-
+ 105,   4,  11,   3  ! p2y11T-
+ 106,   4,  13,   3  ! p2y13T-
+ 107,   4,  15,   3  ! p2y15T-
+ 108,   4,  10,   3  ! p2y10T-
+ 109,   4,  12,   3  ! p2y12T-
+ 110,   4,  14,   3  ! p2y14T-
+ 111,   4,  16,   3  ! p2y16T-
+ 112,   4,  17,   3  ! p2y17T-
+ 113,   4,  19,   3  ! p2y19T-
+ 114,   4,  21,   3  ! p2y21T-
+ 116,   4,  18,   3  ! p2y18T-
+ 117,   4,  20,   3  ! p2y20T-
 
 SLOT=19
 REFINDEX=0
   31,1000,   0,   1
-   0,   4,   1,   2  ! S2Y001B
-   1,   4,   3,   2  ! S2Y003B
-   2,   4,   5,   2  ! S2Y005B
-   3,   4,   7,   2  ! S2Y007B
-   4,   4,   2,   2  ! S2Y002B
-   5,   4,   4,   2  ! S2Y004B
-   6,   4,   6,   2  ! S2Y006B
-   7,   4,   8,   2  ! S2Y008B
-   8,   4,   9,   2  ! S2Y009B
-   9,   4,  11,   2  ! S2Y011B
-  10,   4,  13,   2  ! S2Y013B
-  11,   4,  15,   2  ! S2Y015B
-  12,   4,  10,   2  ! S2Y010B
-  13,   4,  12,   2  ! S2Y012B
-  14,   4,  14,   2  ! S2Y014B
-  15,   4,  16,   2  ! S2Y016B
-  16,   4,  17,   2  ! S2Y017B
-  17,   4,  19,   2  ! S2Y019B
-  18,   4,  21,   2  ! S2Y021B
-  20,   4,  18,   2  ! S2Y018B
-  21,   4,  20,   2  ! S2Y020B
+   0,   4,   1,   2  ! p2y01T+
+   1,   4,   3,   2  ! p2y03T+
+   2,   4,   5,   2  ! p2y05T+
+   3,   4,   7,   2  ! p2y07T+
+   4,   4,   2,   2  ! p2y02T+
+   5,   4,   4,   2  ! p2y04T+
+   6,   4,   6,   2  ! p2y06T+
+   7,   4,   8,   2  ! p2y08T+
+   8,   4,   9,   2  ! p2y09T+
+   9,   4,  11,   2  ! p2y11T+
+  10,   4,  13,   2  ! p2y13T+
+  11,   4,  15,   2  ! p2y15T+
+  12,   4,  10,   2  ! p2y10T+
+  13,   4,  12,   2  ! p2y12T+
+  14,   4,  14,   2  ! p2y14T+
+  15,   4,  16,   2  ! p2y16T+
+  16,   4,  17,   2  ! p2y17T+
+  17,   4,  19,   2  ! p2y19T+
+  18,   4,  21,   2  ! p2y21T+
+  20,   4,  18,   2  ! p2y18T+
+  21,   4,  20,   2  ! p2y20T+