From 004ec717e267931c848068d979730f533d0cacac Mon Sep 17 00:00:00 2001
From: govin08 <govindah08@gmail.com>
Date: Fri, 12 Apr 2024 10:34:35 +0900
Subject: [PATCH] altered the location of the definition of 'ch2pa', 'dires'
 while 'dires' is to be deprecated

---
 Results/sn_1704418200.add.xml | 900 +++++++++-------------------------
 Scripts/preprocess_daily.py   |  15 +-
 2 files changed, 231 insertions(+), 684 deletions(-)

diff --git a/Results/sn_1704418200.add.xml b/Results/sn_1704418200.add.xml
index 000582e14..970ccdb5b 100644
--- a/Results/sn_1704418200.add.xml
+++ b/Results/sn_1704418200.add.xml
@@ -1,173 +1,188 @@
 <additional>
-<<<<<<< HEAD
-    <tlLogic id="c30" type="static" programID="c30_prog" offset="-80">
-=======
     <tlLogic id="c30" type="static" programID="c30_prog" offset="-10">
->>>>>>> 0f30f57d1293c3d55a053df9dbca957e8d465618
       <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="38" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="17" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
+      <phase duration="34" state="GGGGGG"/>
+      <phase duration="4" state="GGGGGG"/>
+      <phase duration="1" state="GGGGGG"/>
+      <phase duration="38" state="GGGGGG"/>
+      <phase duration="4" state="GGGGGG"/>
+      <phase duration="1" state="GGGGGG"/>
+      <phase duration="17" state="GGGGGG"/>
+      <phase duration="4" state="yyyyyy"/>
       <phase duration="1" state="rrrrrr"/>
       <phase duration="33" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="38" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="17" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
+      <phase duration="34" state="GGGGGG"/>
+      <phase duration="4" state="GGGGGG"/>
+      <phase duration="1" state="GGGGGG"/>
+      <phase duration="38" state="GGGGGG"/>
+      <phase duration="4" state="GGGGGG"/>
+      <phase duration="1" state="GGGGGG"/>
+      <phase duration="17" state="GGGGGG"/>
+      <phase duration="4" state="yyyyyy"/>
       <phase duration="1" state="rrrrrr"/>
       <phase duration="33" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="38" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="17" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
+      <phase duration="34" state="GGGGGG"/>
+      <phase duration="4" state="GGGGGG"/>
+      <phase duration="1" state="GGGGGG"/>
+      <phase duration="38" state="GGGGGG"/>
+      <phase duration="4" state="GGGGGG"/>
+      <phase duration="1" state="GGGGGG"/>
+      <phase duration="17" state="GGGGGG"/>
+      <phase duration="4" state="yyyyyy"/>
       <phase duration="1" state="rrrrrr"/>
       <phase duration="33" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="38" state="rrrrrr"/>
+      <phase duration="34" state="GGGGGG"/>
+      <phase duration="4" state="GGGGGG"/>
+      <phase duration="1" state="GGGGGG"/>
+      <phase duration="38" state="GGGGGG"/>
     </tlLogic>
-<<<<<<< HEAD
-    <tlLogic id="i0" type="static" programID="i0_prog" offset="-161">
-      <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
+    <tlLogic id="i0" type="static" programID="i0_prog" offset="-40">
+      <phase duration="39" state="gGGrgrrrgGGGGrgrr"/>
+      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="39" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="5" state="grrygrrrgrrrrygrr"/>
+      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="4" state="grrygrrrgrrrrygrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="27" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="5" state="grrrgGGygrrrrrgrr"/>
+      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="4" state="grrrgGGygrrrrrgrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="16" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="5" state="grrrgyyrgrrrrrgGr"/>
+      <phase duration="17" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="4" state="grrrgyyrgrrrrrgGr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
-      <phase duration="31" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="5" state="grrrgrrrgrrrrrgyy"/>
+      <phase duration="32" state="grrrgrrrgrrrrrgGG"/>
+      <phase duration="4" state="grrrgrrrgrrrrrgyy"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="37" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
+      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="39" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="5" state="grrygrrrgrrrrygrr"/>
+      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="4" state="grrygrrrgrrrrygrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="27" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="5" state="grrrgGGygrrrrrgrr"/>
+      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="4" state="grrrgGGygrrrrrgrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="16" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="5" state="grrrgyyrgrrrrrgGr"/>
+      <phase duration="17" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="4" state="grrrgyyrgrrrrrgGr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
-      <phase duration="31" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="5" state="grrrgrrrgrrrrrgyy"/>
+      <phase duration="32" state="grrrgrrrgrrrrrgGG"/>
+      <phase duration="4" state="grrrgrrrgrrrrrgyy"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="37" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
+      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="39" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="5" state="grrygrrrgrrrrygrr"/>
+      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="4" state="grrygrrrgrrrrygrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="27" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
       <phase duration="22" state="grrrgGGygrrrrrgrr"/>
     </tlLogic>
-    <tlLogic id="i1" type="static" programID="i1_prog" offset="-126">
+    <tlLogic id="i1" type="static" programID="i1_prog" offset="-150">
       <phase duration="33" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="0" state="grrGGGGgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="99" state="grrGGGGgrr"/>
       <phase duration="4" state="grryyyygrr"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="35" state="grrrrrrgGG"/>
+      <phase duration="0" state="grrrrrrgrr"/>
+      <phase duration="0" state="grrrrrrgrr"/>
+      <phase duration="0" state="grrrrrrgGG"/>
+      <phase duration="36" state="grrrrrrgGG"/>
       <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="31" state="gGGGGGrgrr"/>
+      <phase duration="0" state="grrrrrrgrr"/>
+      <phase duration="0" state="gGGrrrrgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="33" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="96" state="grrGGGGgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="0" state="grrGGGGgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="99" state="grrGGGGgrr"/>
       <phase duration="4" state="grryyyygrr"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="34" state="grrrrrrgGG"/>
+      <phase duration="0" state="grrrrrrgGG"/>
+      <phase duration="0" state="grrrrrrgGG"/>
+      <phase duration="0" state="grrrrrrgrr"/>
+      <phase duration="36" state="grrrrrrgrr"/>
       <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="32" state="gGGGGGrgrr"/>
+      <phase duration="0" state="grrrrrrgrr"/>
+      <phase duration="0" state="gGGrrrrgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="33" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="0" state="grrGGGGgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="99" state="grrGGGGgrr"/>
       <phase duration="4" state="grryyyygrr"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="35" state="grrrrrrgGG"/>
+      <phase duration="0" state="grrrrrrgGG"/>
+      <phase duration="0" state="grrrrrrgGG"/>
+      <phase duration="0" state="grrrrrrgrr"/>
+      <phase duration="36" state="grrrrrrgrr"/>
       <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="32" state="gGGGGGrgrr"/>
+      <phase duration="0" state="grrrrrrgrr"/>
+      <phase duration="0" state="gGGrrrrgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="33" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
+      <phase duration="0" state="grrGGGGgrr"/>
+      <phase duration="0" state="grrGGGrgrr"/>
+      <phase duration="0" state="grrGGGGgrr"/>
+      <phase duration="99" state="grrGGGrgrr"/>
     </tlLogic>
-    <tlLogic id="i2" type="static" programID="i2_prog" offset="-169">
-      <phase duration="39" state="GGgrGGG"/>
-      <phase duration="4" state="yygryyy"/>
+    <tlLogic id="i2" type="static" programID="i2_prog" offset="-60">
+      <phase duration="38" state="GGgrGGG"/>
+      <phase duration="5" state="yygryyy"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="22" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="21" state="rrgrrrr"/>
+      <phase duration="5" state="rrgrrrr"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="65" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="64" state="rrgrrrr"/>
+      <phase duration="5" state="rrgrrrr"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="35" state="rrgrGGG"/>
-      <phase duration="4" state="rrgrGGG"/>
+      <phase duration="34" state="rrgrGGG"/>
+      <phase duration="5" state="rrgrGGG"/>
       <phase duration="1" state="rrgrGGG"/>
-      <phase duration="38" state="GGgrGGG"/>
-      <phase duration="4" state="yygryyy"/>
+      <phase duration="37" state="GGgrGGG"/>
+      <phase duration="5" state="yygryyy"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="22" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="21" state="rrgrrrr"/>
+      <phase duration="5" state="rrgrrrr"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="65" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="64" state="rrgrrrr"/>
+      <phase duration="5" state="rrgrrrr"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="35" state="rrgrGGG"/>
-      <phase duration="4" state="rrgrGGG"/>
+      <phase duration="34" state="rrgrGGG"/>
+      <phase duration="5" state="rrgrGGG"/>
       <phase duration="1" state="rrgrGGG"/>
-      <phase duration="38" state="GGgrGGG"/>
-      <phase duration="4" state="yygryyy"/>
+      <phase duration="37" state="GGgrGGG"/>
+      <phase duration="5" state="yygryyy"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="22" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="21" state="rrgrrrr"/>
+      <phase duration="5" state="rrgrrrr"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="65" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="64" state="rrgrrrr"/>
+      <phase duration="5" state="rrgrrrr"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="35" state="rrgrGGG"/>
-      <phase duration="4" state="rrgrGGG"/>
+      <phase duration="34" state="rrgrGGG"/>
+      <phase duration="5" state="rrgrGGG"/>
       <phase duration="1" state="rrgrGGG"/>
-      <phase duration="38" state="GGgrGGG"/>
-      <phase duration="4" state="yygryyy"/>
+      <phase duration="37" state="GGgrGGG"/>
+      <phase duration="5" state="yygryyy"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="22" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="21" state="rrgrrrr"/>
+      <phase duration="5" state="rrgrrrr"/>
       <phase duration="1" state="rrgrrrr"/>
-      <phase duration="65" state="rrgrrrr"/>
+      <phase duration="64" state="rrgrrrr"/>
     </tlLogic>
-    <tlLogic id="i3" type="static" programID="i3_prog" offset="-80">
+    <tlLogic id="i3" type="static" programID="i3_prog" offset="-10">
       <phase duration="34" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
@@ -212,110 +227,110 @@
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
       <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
     </tlLogic>
-    <tlLogic id="i6" type="static" programID="i6_prog" offset="-140">
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
+    <tlLogic id="i6" type="static" programID="i6_prog" offset="-10">
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
       <phase duration="23" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="3" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="4" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
       <phase duration="10" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="3" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="4" state="grrrgyyyrgrrgGGr"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
       <phase duration="38" state="grrrgrrrrgrrgGGG"/>
-      <phase duration="3" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="4" state="grrrgrrrrgrrgyyy"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
       <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
-      <phase duration="3" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="4" state="gyyygrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
       <phase duration="19" state="grrrgrrrrgGGgrrr"/>
-      <phase duration="3" state="grrrgrrrrgyygrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="4" state="grrrgrrrrgyygrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
       <phase duration="23" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="3" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="4" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
       <phase duration="10" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="3" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="4" state="grrrgyyyrgrrgGGr"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
       <phase duration="38" state="grrrgrrrrgrrgGGG"/>
-      <phase duration="3" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="4" state="grrrgrrrrgrrgyyy"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
       <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
-      <phase duration="3" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="4" state="gyyygrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
       <phase duration="19" state="grrrgrrrrgGGgrrr"/>
-      <phase duration="3" state="grrrgrrrrgyygrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="4" state="grrrgrrrrgyygrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
       <phase duration="23" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="3" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="4" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
       <phase duration="10" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="3" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="4" state="grrrgyyyrgrrgGGr"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
       <phase duration="38" state="grrrgrrrrgrrgGGG"/>
-      <phase duration="3" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="4" state="grrrgrrrrgrrgyyy"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
       <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
-      <phase duration="3" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="4" state="gyyygrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
       <phase duration="19" state="grrrgrrrrgGGgrrr"/>
-      <phase duration="3" state="grrrgrrrrgyygrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="4" state="grrrgrrrrgyygrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
       <phase duration="23" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="3" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="4" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
       <phase duration="10" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="3" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="4" state="grrrgyyyrgrrgGGr"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
       <phase duration="38" state="grrrgrrrrgrrgGGG"/>
-      <phase duration="3" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="4" state="grrrgrrrrgrrgyyy"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
       <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i7" type="static" programID="i7_prog" offset="-119">
-      <phase duration="41" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+    <tlLogic id="i7" type="static" programID="i7_prog" offset="-60">
+      <phase duration="40" state="GGrggGG"/>
+      <phase duration="5" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="47" state="rrrggrr"/>
+      <phase duration="5" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="20" state="GGrggGG"/>
+      <phase duration="5" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="20" state="rrrggrr"/>
+      <phase duration="5" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="39" state="GGrggGG"/>
+      <phase duration="5" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="47" state="rrrggrr"/>
+      <phase duration="5" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="20" state="GGrggGG"/>
+      <phase duration="5" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="20" state="rrrggrr"/>
+      <phase duration="5" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="39" state="GGrggGG"/>
+      <phase duration="5" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="47" state="rrrggrr"/>
+      <phase duration="5" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="20" state="GGrggGG"/>
+      <phase duration="5" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="20" state="rrrggrr"/>
+      <phase duration="5" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="39" state="GGrggGG"/>
+      <phase duration="5" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="47" state="rrrggrr"/>
+      <phase duration="5" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
+      <phase duration="20" state="GGrggGG"/>
     </tlLogic>
-    <tlLogic id="i8" type="static" programID="i8_prog" offset="-31">
+    <tlLogic id="i8" type="static" programID="i8_prog" offset="-20">
       <phase duration="29" state="grrrrrrrgGGGgrrr"/>
       <phase duration="4" state="grrrrrrrgyyygrrr"/>
       <phase duration="2" state="grrrrrrrgrrrgrrr"/>
@@ -372,392 +387,26 @@
       <phase duration="2" state="grrrGGGrgrrrgrrr"/>
       <phase duration="52" state="grrrGGGGgrrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i9" type="static" programID="i9_prog" offset="-119">
-      <phase duration="43" state="GGGG"/>
-      <phase duration="3" state="yyyy"/>
+    <tlLogic id="i9" type="static" programID="i9_prog" offset="-130">
+      <phase duration="42" state="GGGG"/>
+      <phase duration="4" state="yyyy"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="110" state="rrrr"/>
-      <phase duration="3" state="rrrr"/>
+      <phase duration="109" state="rrrr"/>
+      <phase duration="4" state="rrrr"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="42" state="GGGG"/>
-      <phase duration="3" state="yyyy"/>
+      <phase duration="41" state="GGGG"/>
+      <phase duration="4" state="yyyy"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="110" state="rrrr"/>
-      <phase duration="3" state="rrrr"/>
+      <phase duration="109" state="rrrr"/>
+      <phase duration="4" state="rrrr"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="42" state="GGGG"/>
-      <phase duration="3" state="yyyy"/>
+      <phase duration="41" state="GGGG"/>
+      <phase duration="4" state="yyyy"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="110" state="rrrr"/>
-      <phase duration="3" state="rrrr"/>
+      <phase duration="109" state="rrrr"/>
+      <phase duration="4" state="rrrr"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="42" state="GGGG"/>
-    </tlLogic>
-    <tlLogic id="u00" type="static" programID="u00_prog" offset="-161">
-=======
-    <tlLogic id="i0" type="static" programID="i0_prog" offset="-40">
-      <phase duration="39" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="40" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrGgrrrrrrrr"/>
-      <phase duration="28" state="grrrGrrGgrrrrrrrr"/>
-      <phase duration="4" state="grrryrrGgrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrGgrrrrrrrG"/>
-      <phase duration="17" state="grrrrrrGgrrrrrrrG"/>
-      <phase duration="4" state="grrrrrrygrrrrrrrG"/>
-      <phase duration="1" state="grrrrrrrgrrrrrrrG"/>
-      <phase duration="32" state="grrrrrrrgrrrrrGrG"/>
-      <phase duration="4" state="grrrrrrrgrrrrryry"/>
-      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="38" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="40" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrGgrrrrrrrr"/>
-      <phase duration="28" state="grrrGrrGgrrrrrrrr"/>
-      <phase duration="4" state="grrryrrGgrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrGgrrrrrrrG"/>
-      <phase duration="17" state="grrrrrrGgrrrrrrrG"/>
-      <phase duration="4" state="grrrrrrygrrrrrrrG"/>
-      <phase duration="1" state="grrrrrrrgrrrrrrrG"/>
-      <phase duration="32" state="grrrrrrrgrrrrrGrG"/>
-      <phase duration="4" state="grrrrrrrgrrrrryry"/>
-      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="38" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="40" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrGgrrrrrrrr"/>
-      <phase duration="28" state="grrrGrrGgrrrrrrrr"/>
-      <phase duration="22" state="grrryrrGgrrrrrrrr"/>
-    </tlLogic>
-    <tlLogic id="i1" type="static" programID="i1_prog" offset="-150">
-      <phase duration="33" state="grrgggrrrr"/>
-      <phase duration="4" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="99" state="grrgggrrrr"/>
-      <phase duration="4" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrGrr"/>
-      <phase duration="36" state="grrgggrGrr"/>
-      <phase duration="4" state="grrgggryrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="33" state="grrgggrrrr"/>
-      <phase duration="4" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="99" state="grrgggrrrr"/>
-      <phase duration="4" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrGrr"/>
-      <phase duration="0" state="grrgggrGrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="36" state="grrgggrrrr"/>
-      <phase duration="4" state="grrgggryrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="33" state="grrgggrrrr"/>
-      <phase duration="4" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="99" state="grrgggrrrr"/>
-      <phase duration="4" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrGrr"/>
-      <phase duration="0" state="grrgggrGrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="36" state="grrgggrrrr"/>
-      <phase duration="4" state="grrgggryrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="33" state="grrgggrrrr"/>
-      <phase duration="4" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="0" state="grrgggrrrr"/>
-      <phase duration="99" state="grrgggrrrr"/>
-    </tlLogic>
-    <tlLogic id="i2" type="static" programID="i2_prog" offset="-60">
-      <phase duration="38" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="21" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="64" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="34" state="ggGgrrr"/>
-      <phase duration="5" state="ggygrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="37" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="21" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="64" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="34" state="ggGgrrr"/>
-      <phase duration="5" state="ggygrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="37" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="21" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="64" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="34" state="ggGgrrr"/>
-      <phase duration="5" state="ggygrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="37" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="21" state="ggrgrrr"/>
-      <phase duration="5" state="ggrgrrr"/>
-      <phase duration="1" state="ggrgrrr"/>
-      <phase duration="64" state="ggrgrrr"/>
-    </tlLogic>
-    <tlLogic id="i3" type="static" programID="i3_prog" offset="-10">
-      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
-      <phase duration="4" state="grrrrrrrrrgrrrryrrry"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="17" state="grrrrGrrrGgrrrrrrrrr"/>
-      <phase duration="4" state="grrrryrrrygrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="33" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
-      <phase duration="4" state="grrrrrrrrrgrrrryrrry"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="17" state="grrrrGrrrGgrrrrrrrrr"/>
-      <phase duration="4" state="grrrryrrrygrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="33" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
-      <phase duration="4" state="grrrrrrrrrgrrrryrrry"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="17" state="grrrrGrrrGgrrrrrrrrr"/>
-      <phase duration="4" state="grrrryrrrygrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="33" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
-      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
-    </tlLogic>
-    <tlLogic id="i6" type="static" programID="i6_prog" offset="-10">
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="yrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="19" state="rrrrrrrrrGrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrryrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="yrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="19" state="rrrrrrrrrGrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrryrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="yrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="19" state="rrrrrrrrrGrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrryrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
-      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
-    </tlLogic>
-    <tlLogic id="i7" type="static" programID="i7_prog" offset="-60">
-      <phase duration="40" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="47" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="20" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="20" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="39" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="47" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="20" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="20" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="39" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="47" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="20" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="20" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="39" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="47" state="ggrggrr"/>
-      <phase duration="5" state="ggrggrr"/>
-      <phase duration="1" state="ggrggrr"/>
-      <phase duration="20" state="ggrggrr"/>
-    </tlLogic>
-    <tlLogic id="i8" type="static" programID="i8_prog" offset="-20">
-      <phase duration="29" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
-      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrygrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="12" state="GrrGrrrrgrrrrrrr"/>
-      <phase duration="4" state="yrryrrrrgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
-      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrygrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="12" state="GrrGrrrrgrrrrrrr"/>
-      <phase duration="4" state="yrryrrrrgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
-      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrygrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="12" state="GrrGrrrrgrrrrrrr"/>
-      <phase duration="4" state="yrryrrrrgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
-      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
-      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
-      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
-      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
-    </tlLogic>
-    <tlLogic id="i9" type="static" programID="i9_prog" offset="-130">
-      <phase duration="42" state="gggg"/>
-      <phase duration="4" state="gggg"/>
-      <phase duration="1" state="gggg"/>
-      <phase duration="109" state="gggg"/>
-      <phase duration="4" state="gggg"/>
-      <phase duration="1" state="gggg"/>
-      <phase duration="41" state="gggg"/>
-      <phase duration="4" state="gggg"/>
-      <phase duration="1" state="gggg"/>
-      <phase duration="109" state="gggg"/>
-      <phase duration="4" state="gggg"/>
-      <phase duration="1" state="gggg"/>
-      <phase duration="41" state="gggg"/>
-      <phase duration="4" state="gggg"/>
-      <phase duration="1" state="gggg"/>
-      <phase duration="109" state="gggg"/>
-      <phase duration="4" state="gggg"/>
-      <phase duration="1" state="gggg"/>
-      <phase duration="41" state="gggg"/>
+      <phase duration="41" state="GGGG"/>
     </tlLogic>
     <tlLogic id="u00" type="static" programID="u00_prog" offset="-40">
       <phase duration="39" state="ggggrgggg"/>
@@ -775,63 +424,31 @@
       <phase duration="32" state="ggggrgggg"/>
       <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
->>>>>>> 0f30f57d1293c3d55a053df9dbca957e8d465618
       <phase duration="38" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="39" state="ggggGgggg"/>
-      <phase duration="5" state="ggggygggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="27" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="16" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="31" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="37" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="39" state="ggggGgggg"/>
-      <phase duration="5" state="ggggygggg"/>
+      <phase duration="40" state="ggggGgggg"/>
+      <phase duration="4" state="ggggygggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="27" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="28" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="16" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="17" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="31" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="32" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="37" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="38" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="39" state="ggggGgggg"/>
-      <phase duration="5" state="ggggygggg"/>
+      <phase duration="40" state="ggggGgggg"/>
+      <phase duration="4" state="ggggygggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="27" state="ggggrgggg"/>
+      <phase duration="28" state="ggggrgggg"/>
       <phase duration="22" state="ggggrgggg"/>
     </tlLogic>
-<<<<<<< HEAD
-    <tlLogic id="u20" type="static" programID="u20_prog" offset="-169">
-      <phase duration="39" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
-=======
     <tlLogic id="u20" type="static" programID="u20_prog" offset="-60">
->>>>>>> 0f30f57d1293c3d55a053df9dbca957e8d465618
       <phase duration="38" state="ggrggg"/>
       <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
@@ -876,11 +493,7 @@
       <phase duration="1" state="ggrggg"/>
       <phase duration="64" state="ggrggg"/>
     </tlLogic>
-<<<<<<< HEAD
-    <tlLogic id="u30" type="static" programID="u30_prog" offset="-80">
-=======
     <tlLogic id="u30" type="static" programID="u30_prog" offset="-10">
->>>>>>> 0f30f57d1293c3d55a053df9dbca957e8d465618
       <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
@@ -925,11 +538,7 @@
       <phase duration="1" state="ggggrggg"/>
       <phase duration="38" state="ggggrggg"/>
     </tlLogic>
-<<<<<<< HEAD
-    <tlLogic id="u31" type="static" programID="u31_prog" offset="-80">
-=======
     <tlLogic id="u31" type="static" programID="u31_prog" offset="-10">
->>>>>>> 0f30f57d1293c3d55a053df9dbca957e8d465618
       <phase duration="34" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
@@ -974,11 +583,7 @@
       <phase duration="1" state="ggggrggg"/>
       <phase duration="38" state="ggggrggg"/>
     </tlLogic>
-<<<<<<< HEAD
-    <tlLogic id="u32" type="static" programID="u32_prog" offset="-80">
-=======
     <tlLogic id="u32" type="static" programID="u32_prog" offset="-10">
->>>>>>> 0f30f57d1293c3d55a053df9dbca957e8d465618
       <phase duration="34" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
       <phase duration="1" state="gggggggr"/>
@@ -1023,64 +628,6 @@
       <phase duration="1" state="gggggggr"/>
       <phase duration="38" state="gggggggr"/>
     </tlLogic>
-<<<<<<< HEAD
-    <tlLogic id="u60" type="static" programID="u60_prog" offset="-140">
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="23" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="10" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="38" state="ggggggggG"/>
-      <phase duration="3" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="65" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="19" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="23" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="10" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="38" state="ggggggggG"/>
-      <phase duration="3" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="65" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="19" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="23" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="10" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="38" state="ggggggggG"/>
-      <phase duration="3" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="65" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="19" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="23" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="10" state="ggggggggr"/>
-      <phase duration="3" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="38" state="ggggggggG"/>
-      <phase duration="3" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-=======
     <tlLogic id="u60" type="static" programID="u60_prog" offset="-10">
       <phase duration="1" state="ggggggggr"/>
       <phase duration="23" state="ggggggggr"/>
@@ -1137,7 +684,6 @@
       <phase duration="38" state="ggggggggG"/>
       <phase duration="4" state="ggggggggy"/>
       <phase duration="1" state="ggggggggr"/>
->>>>>>> 0f30f57d1293c3d55a053df9dbca957e8d465618
       <phase duration="65" state="ggggggggr"/>
     </tlLogic>
 </additional>
\ No newline at end of file
diff --git a/Scripts/preprocess_daily.py b/Scripts/preprocess_daily.py
index 120af3f62..aea0a228d 100644
--- a/Scripts/preprocess_daily.py
+++ b/Scripts/preprocess_daily.py
@@ -202,6 +202,14 @@ class DailyPreprocessor():
 
         self.inter2node = dict(zip(inter['inter_no'], inter['node_id']))
 
+        # ch2pa : child to parent
+        self.ch2pa = {}
+        for child_id in self.child_ids:
+            parent_no = self.inter_node[self.inter_node.node_id==child_id].inter_no.iloc[0]
+            sub_inter_node = self.inter_node[self.inter_node.inter_no==parent_no]
+            self.ch2pa[child_id] = sub_inter_node[sub_inter_node.inter_type=='parent'].iloc[0].node_id
+        self.dires = ['북', '북동', '동', '남동', '남', '남서', '서', '북서'] # 정북기준 시계방향으로 8방향
+
         # ids
         ids = {'node_ids'  : self.node_ids,
                'parent_ids': self.parent_ids,
@@ -400,13 +408,6 @@ class DailyPreprocessor():
         컬럼명 : inter_no, phase_no, ring_type, move_no, inc_dire, out_dire, inc_angle, out_angle, inc_edge_id, out_edge_id, node_id
         '''
 
-        ch2pa = {} # child to parent
-        for child_id in self.child_ids:
-            parent_no = self.inter_node[self.inter_node.node_id==child_id].inter_no.iloc[0]
-            sub_inter_node = self.inter_node[self.inter_node.inter_no==parent_no]
-            ch2pa[child_id] = sub_inter_node[sub_inter_node.inter_type=='parent'].iloc[0].node_id
-        self.dires = ['북', '북동', '동', '남동', '남', '남서', '서', '북서'] # 정북기준 시계방향으로 8방향
-
         # 각 uturn node에 대하여 (inc_edge_id, out_edge_id) 부여
         cmatches = []
         for _, row in self.uturn.iterrows():