From 546ef79db8a692be6a44eeef7cf3646052ea80d4 Mon Sep 17 00:00:00 2001
From: Adam Megacz <adam.megacz@sun.com>
Date: Thu, 28 May 2009 02:44:00 +0000
Subject: [PATCH] new marina.xml

---
 testCode/marina.xml |   70 +++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/testCode/marina.xml b/testCode/marina.xml
index 7789e17..a884caf 100644
--- a/testCode/marina.xml
+++ b/testCode/marina.xml
@@ -63,10 +63,9 @@
   <datanet name="southFif@1.tapPropS@1.properSt@1.fillStag@1.data1in6@1.la[16].scanCell@3" net="xsouthFif@1.xtapPropS@1.xproperSt@1.net@65[2](R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.xdata1in6@1.xla[16].xscanCell@3.xlatch2in@0.dataBar(WI)" />
   <datanet name="southFif@1.tapPropS@1.properSt@1.fillStag@1.data1in6@1.la[17].scanCell@3" net="xsouthFif@1.xtapPropS@1.xproperSt@1.net@65[1](R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.xdata1in6@1.xla[17].xscanCell@3.xlatch2in@0.dataBar(WI)" />
   <datanet name="southFif@1.tapPropS@1.properSt@1.fillStag@1.data1in6@1.la[18].scanCell@3" net="xsouthFif@1.xtapPropS@1.xproperSt@1.net@65[0](R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.xdata1in6@1.xla[18].xscanCell@3.xlatch2in@0.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnFo@1.cntScnOn@1" net="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnFo@1.net@43(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnFo@1.xcntScnOn@1.xlatch2in@0.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnFo@1.cntScnOn@2" net="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnFo@1.net@46(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnFo@1.xcntScnOn@2.xlatch2in@0.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnFo@1.cntScnOn@0" net="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnFo@1.net@40(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnFo@1.xcntScnOn@0.xlatch2in@0.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnFo@1.cntScnOn@3" net="xsouthFif@1.xtapPropS@1.xinstruct@0.net@1(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnFo@1.xcntScnOn@3.xlatch2in@0.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnTh@1.cntScnOn@1" net="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTh@1.net@43(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTh@1.xcntScnOn@1.xlatch2in@0.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnTh@1.cntScnOn@2" net="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTh@1.net@46(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTh@1.xcntScnOn@2.xlatch2in@0.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnTh@1.cntScnOn@0" net="xsouthFif@1.xtapPropS@1.xinstruct@0.net@1(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTh@1.xcntScnOn@0.xlatch2in@0.dataBar(WI)" />
   <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnTw@3.cntScnFo@1.cntScnOn@1" net="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.net@43(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.xcntScnOn@1.xlatch2in@0.dataBar(WI)" />
   <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnTw@3.cntScnFo@1.cntScnOn@2" net="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.net@46(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.xcntScnOn@2.xlatch2in@0.dataBar(WI)" />
   <datanet name="southFif@1.tapPropS@1.instruct@0.cntScnTw@3.cntScnFo@1.cntScnOn@0" net="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.net@40(R)" net2="xsouthFif@1.xtapPropS@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.xcntScnOn@0.xlatch2in@0.dataBar(WI)" />
@@ -148,10 +147,9 @@
   <datanet name="northFif@1.fillDrai@1.properSt@1.fillStag@1.data1in6@1.la[16].scanCell@3" net="xnorthFif@1.xfillDrai@1.xproperSt@1.net@65[2](R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.xdata1in6@1.xla[16].xscanCell@3.xlatch2in@0.dataBar(WI)" />
   <datanet name="northFif@1.fillDrai@1.properSt@1.fillStag@1.data1in6@1.la[17].scanCell@3" net="xnorthFif@1.xfillDrai@1.xproperSt@1.net@65[1](R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.xdata1in6@1.xla[17].xscanCell@3.xlatch2in@0.dataBar(WI)" />
   <datanet name="northFif@1.fillDrai@1.properSt@1.fillStag@1.data1in6@1.la[18].scanCell@3" net="xnorthFif@1.xfillDrai@1.xproperSt@1.net@65[0](R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.xdata1in6@1.xla[18].xscanCell@3.xlatch2in@0.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnFo@1.cntScnOn@1" net="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnFo@1.net@43(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnFo@1.xcntScnOn@1.xlatch2in@0.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnFo@1.cntScnOn@2" net="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnFo@1.net@46(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnFo@1.xcntScnOn@2.xlatch2in@0.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnFo@1.cntScnOn@0" net="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnFo@1.net@40(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnFo@1.xcntScnOn@0.xlatch2in@0.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnFo@1.cntScnOn@3" net="xnorthFif@1.xfillDrai@1.xinstruct@0.net@1(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnFo@1.xcntScnOn@3.xlatch2in@0.dataBar(WI)" />
+  <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnTh@1.cntScnOn@1" net="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTh@1.net@43(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTh@1.xcntScnOn@1.xlatch2in@0.dataBar(WI)" />
+  <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnTh@1.cntScnOn@2" net="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTh@1.net@46(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTh@1.xcntScnOn@2.xlatch2in@0.dataBar(WI)" />
+  <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnTh@1.cntScnOn@0" net="xnorthFif@1.xfillDrai@1.xinstruct@0.net@1(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTh@1.xcntScnOn@0.xlatch2in@0.dataBar(WI)" />
   <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnTw@3.cntScnFo@1.cntScnOn@1" net="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.net@43(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.xcntScnOn@1.xlatch2in@0.dataBar(WI)" />
   <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnTw@3.cntScnFo@1.cntScnOn@2" net="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.net@46(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.xcntScnOn@2.xlatch2in@0.dataBar(WI)" />
   <datanet name="northFif@1.fillDrai@1.instruct@0.cntScnTw@3.cntScnFo@1.cntScnOn@0" net="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.net@40(R)" net2="xnorthFif@1.xfillDrai@1.xinstruct@0.xcntScnTw@3.xcntScnFo@1.xcntScnOn@0.xlatch2in@0.dataBar(WI)" />
@@ -255,20 +253,20 @@
   <datanet name="northFif@1.fillDrai@1.properSt@1.drainSta@1.scanEx2v@1.scanCell@4" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.net@17[0](R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.xscanEx2v@1.xscanCell@4.xlatch2in@0.dataBar(WI)" />
 '>
 <!ENTITY marina_marina_control_dataNets '
-  <datanet name="southFif@1.tapPropS@1.properSt@1.fillStag@1.scanFx3@0.scanCell@4" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.block(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.xscanFx3@0.xscanCell@4.xlatch2in@1.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.properSt@1.fillStag@1.scanFx3@0.scanCell@5" net="xsouthFif@1.xtapPropS@1.net@91(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.xscanFx3@0.xscanCell@5.xlatch2in@1.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.properSt@1.fillStag@1.scanFx3@0.scanCell@6" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.fill(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.xscanFx3@0.xscanCell@6.xlatch2in@1.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.properSt@1.drainSta@1.scanFx3t@1.scanCell@7" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.go(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.xscanFx3t@1.xscanCell@7.xlatch2in@1.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.properSt@1.drainSta@1.scanFx3t@1.scanCell@5" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.clear(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.xscanFx3t@1.xscanCell@5.xlatch2in@1.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.properSt@1.drainSta@1.scanFx3t@1.scanCell@6" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.silent(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.xscanFx3t@1.xscanCell@6.xlatch2in@1.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.tapStage@2.scanFx2@0.scanCell@3" net="xsouthFif@1.xtapPropS@1.xtapStage@2.to[A](R)" net2="xsouthFif@1.xtapPropS@1.xtapStage@2.xscanFx2@0.xscanCell@3.xlatch2in@1.dataBar(WI)" />
-  <datanet name="southFif@1.tapPropS@1.tapStage@2.scanFx2@0.scanCell@4" net="xsouthFif@1.xtapPropS@1.xtapStage@2.to[B](R)" net2="xsouthFif@1.xtapPropS@1.xtapStage@2.xscanFx2@0.xscanCell@4.xlatch2in@1.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.properSt@1.fillStag@1.scanFx3@0.scanCell@4" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.block(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.xscanFx3@0.xscanCell@4.xlatch2in@1.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.properSt@1.fillStag@1.scanFx3@0.scanCell@5" net="xnorthFif@1.xfillDrai@1.net@48(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.xscanFx3@0.xscanCell@5.xlatch2in@1.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.properSt@1.fillStag@1.scanFx3@0.scanCell@6" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.fill(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.xscanFx3@0.xscanCell@6.xlatch2in@1.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.properSt@1.drainSta@1.scanFx3t@1.scanCell@7" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.go(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.xscanFx3t@1.xscanCell@7.xlatch2in@1.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.properSt@1.drainSta@1.scanFx3t@1.scanCell@5" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.clear(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.xscanFx3t@1.xscanCell@5.xlatch2in@1.dataBar(WI)" />
-  <datanet name="northFif@1.fillDrai@1.properSt@1.drainSta@1.scanFx3t@1.scanCell@6" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.silent(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.xscanFx3t@1.xscanCell@6.xlatch2in@1.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.properSt@1.fillStag@1.scanFx3L@0.scanCell@8" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.block(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.xscanFx3L@0.xscanCell@8.xlatch2in@1.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.properSt@1.fillStag@1.scanFx3L@0.scanCell@5" net="xsouthFif@1.xtapPropS@1.net@91(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.xscanFx3L@0.xscanCell@5.xlatch2in@1.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.properSt@1.fillStag@1.scanFx3L@0.scanCell@6" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.fill(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xfillStag@1.xscanFx3L@0.xscanCell@6.xlatch2in@1.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.properSt@1.drainSta@1.scanFx3@0.scanCell@7" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.go(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.xscanFx3@0.xscanCell@7.xlatch2in@1.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.properSt@1.drainSta@1.scanFx3@0.scanCell@5" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.clear(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.xscanFx3@0.xscanCell@5.xlatch2in@1.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.properSt@1.drainSta@1.scanFx3@0.scanCell@6" net="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.silent(R)" net2="xsouthFif@1.xtapPropS@1.xproperSt@1.xdrainSta@1.xscanFx3@0.xscanCell@6.xlatch2in@1.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.tapStage@2.scanFx2v@0.scanCell@5" net="xsouthFif@1.xtapPropS@1.xtapStage@2.to[A](R)" net2="xsouthFif@1.xtapPropS@1.xtapStage@2.xscanFx2v@0.xscanCell@5.xlatch2in@1.dataBar(WI)" />
+  <datanet name="southFif@1.tapPropS@1.tapStage@2.scanFx2v@0.scanCell@4" net="xsouthFif@1.xtapPropS@1.xtapStage@2.to[B](R)" net2="xsouthFif@1.xtapPropS@1.xtapStage@2.xscanFx2v@0.xscanCell@4.xlatch2in@1.dataBar(WI)" />
+  <datanet name="northFif@1.fillDrai@1.properSt@1.fillStag@1.scanFx3L@0.scanCell@8" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.block(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.xscanFx3L@0.xscanCell@8.xlatch2in@1.dataBar(WI)" />
+  <datanet name="northFif@1.fillDrai@1.properSt@1.fillStag@1.scanFx3L@0.scanCell@5" net="xnorthFif@1.xfillDrai@1.net@48(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.xscanFx3L@0.xscanCell@5.xlatch2in@1.dataBar(WI)" />
+  <datanet name="northFif@1.fillDrai@1.properSt@1.fillStag@1.scanFx3L@0.scanCell@6" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.fill(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xfillStag@1.xscanFx3L@0.xscanCell@6.xlatch2in@1.dataBar(WI)" />
+  <datanet name="northFif@1.fillDrai@1.properSt@1.drainSta@1.scanFx3@0.scanCell@7" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.go(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.xscanFx3@0.xscanCell@7.xlatch2in@1.dataBar(WI)" />
+  <datanet name="northFif@1.fillDrai@1.properSt@1.drainSta@1.scanFx3@0.scanCell@5" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.clear(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.xscanFx3@0.xscanCell@5.xlatch2in@1.dataBar(WI)" />
+  <datanet name="northFif@1.fillDrai@1.properSt@1.drainSta@1.scanFx3@0.scanCell@6" net="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.silent(R)" net2="xnorthFif@1.xfillDrai@1.xproperSt@1.xdrainSta@1.xscanFx3@0.xscanCell@6.xlatch2in@1.dataBar(WI)" />
 '>
 <!ENTITY countersL_cntScnFour_sin '
 	<subchain name="cntScnOn@1" length="1" access="RW" clears="-" />
@@ -287,7 +285,7 @@
 	<subchain name="cntScnFo@0"> &countersL_cntScnFour_sin; </subchain>
 '>
 <!ENTITY countersL_instructionCount_sid_1_ '
-	<subchain name="cntScnFo@1"> &countersL_cntScnFour_sin; </subchain>
+	<subchain name="cntScnTh@1"> &countersL_cntScnThree_sin; </subchain>
 	<subchain name="cntScnTw@3"> &countersL_cntScnTwelve_sin; </subchain>
 	<subchain name="cntScnTh@0"> &countersL_cntScnThree_sin; </subchain>
 	<subchain name="cntScnTw@5"> &countersL_cntScnTwelve_sin; </subchain>
@@ -388,12 +386,12 @@
 	<subchain name="scanCell@12" length="1" access="RW" clears="-" />
 	<subchain name="scanCell@13" length="1" access="RW" clears="-" />
 '>
-<!ENTITY scanM_scanFx2_sic_1_ '
-	<subchain name="scanCell@3" length="1" access="RW" clears="L" />
+<!ENTITY scanM_scanFx2vert_sic_1_ '
+	<subchain name="scanCell@5" length="1" access="RW" clears="L" />
 	<subchain name="scanCell@4" length="1" access="RW" clears="L" />
 '>
-<!ENTITY scanM_scanFx3_sic_1_ '
-	<subchain name="scanCell@4" length="1" access="RW" clears="L" />
+<!ENTITY scanM_scanFx3Lshape_sic_1_ '
+	<subchain name="scanCell@8" length="1" access="RW" clears="L" />
 	<subchain name="scanCell@5" length="1" access="RW" clears="L" />
 	<subchain name="scanCell@6" length="1" access="RW" clears="L" />
 '>
@@ -453,24 +451,24 @@
 	<subchain name="drainSta@1"> &stagesM_drainStage_sir_1_; </subchain>
 '>
 <!ENTITY stageGroupsM_southFifo_sic_1_ '
-	<subchain name="tapPropS@1"> &stageGroupsM_tapPropStop_sic_1_; </subchain>
+	<subchain name="tapPropS@1"> &stageGroupsM_tapPropStopUp_sic_1_; </subchain>
 '>
 <!ENTITY stageGroupsM_southFifo_sid_1_ '
-	<subchain name="tapPropS@1"> &stageGroupsM_tapPropStop_sid_1_; </subchain>
+	<subchain name="tapPropS@1"> &stageGroupsM_tapPropStopUp_sid_1_; </subchain>
 '>
 <!ENTITY stageGroupsM_southFifo_sir_1_ '
 	<subchain name="upDown8w@1"> &stageGroupsM_upDown8weak_sir_1_; </subchain>
-	<subchain name="tapPropS@1"> &stageGroupsM_tapPropStop_sir_1_; </subchain>
+	<subchain name="tapPropS@1"> &stageGroupsM_tapPropStopUp_sir_1_; </subchain>
 '>
-<!ENTITY stageGroupsM_tapPropStop_sic_1_ '
+<!ENTITY stageGroupsM_tapPropStopUp_sic_1_ '
 	<subchain name="properSt@1"> &stageGroupsM_properStopper_sic_1_; </subchain>
 	<subchain name="tapStage@2"> &stagesM_tapStage_sic_1_; </subchain>
 '>
-<!ENTITY stageGroupsM_tapPropStop_sid_1_ '
+<!ENTITY stageGroupsM_tapPropStopUp_sid_1_ '
 	<subchain name="properSt@1"> &stageGroupsM_properStopper_sid_1_; </subchain>
 	<subchain name="instruct@0"> &countersL_instructionCount_sid_1_; </subchain>
 '>
-<!ENTITY stageGroupsM_tapPropStop_sir_1_ '
+<!ENTITY stageGroupsM_tapPropStopUp_sir_1_ '
 	<subchain name="properSt@1"> &stageGroupsM_properStopper_sir_1_; </subchain>
 	<subchain name="tapStage@2"> &stagesM_tapStage_sir_1_; </subchain>
 '>
@@ -494,7 +492,7 @@
 	<subchain name="scanEx2v@1"> &scanM_scanEx2_sir_1_; </subchain>
 '>
 <!ENTITY stagesM_drainStage_sic_1_ '
-	<subchain name="scanFx3t@1"> &scanM_scanFx3tallL_sic_1_; </subchain>
+	<subchain name="scanFx3@0"> &scanM_scanFx3tallL_sic_1_; </subchain>
 '>
 <!ENTITY stagesM_drainStage_sir_1_ '
 	<subchain name="scanEx2v@1"> &scanM_scanEx2_sir_1_; </subchain>
@@ -503,7 +501,7 @@
 	<subchain name="scanEx1@0"> &scanM_scanEx1_sir_1_; </subchain>
 '>
 <!ENTITY stagesM_fillStage_sic_1_ '
-	<subchain name="scanFx3@0"> &scanM_scanFx3_sic_1_; </subchain>
+	<subchain name="scanFx3L@0"> &scanM_scanFx3Lshape_sic_1_; </subchain>
 '>
 <!ENTITY stagesM_fillStage_sid_1_ '
 	<subchain name="gaspFill@0"> &gaspM_gaspFill_si_1_; </subchain>
@@ -540,7 +538,7 @@
 	<subchain name="scanEx3p@1"> &scanM_scanEx3plain_sin; </subchain>
 '>
 <!ENTITY stagesM_tapStage_sic_1_ '
-	<subchain name="scanFx2@0"> &scanM_scanFx2_sic_1_; </subchain>
+	<subchain name="scanFx2v@0"> &scanM_scanFx2vert_sic_1_; </subchain>
 '>
 <!ENTITY stagesM_tapStage_sir_1_ '
 	<subchain name="scanEx1@0"> &scanM_scanEx1_sir_1_; </subchain>
-- 
1.7.10.4