Index: mttroot/mtt/bin/trans/abg2lbl_fig2txt
==================================================================
--- mttroot/mtt/bin/trans/abg2lbl_fig2txt
+++ mttroot/mtt/bin/trans/abg2lbl_fig2txt
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!/bin/sh
 
      ###################################### 
      ##### Model Transformation Tools #####
      ######################################
 
@@ -11,10 +11,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.20  2001/07/04 05:19:57  gawthrop
+## Added RT & CT to list
+##
 ## Revision 1.19  2001/07/03 23:51:10  gawthrop
 ## Now puts outline #Summary and #Description lines at top of lbl file
 ##
 ## Revision 1.18  2001/06/13 18:24:10  gawthrop
 ## Made "lin" default in place of "none"
@@ -88,21 +91,27 @@
 infofile='mtt_info.txt'
 typefile="$1_type.sh"
 sensitivity=$2;
 system=$1
 outfile=$1_lbl.txt
+
+if [ -n "$sensitivity" ]; then
+    sys="-s ${system}"
+else
+    sys=${system}
+fi
 
 # Remove the old log file
 rm -f abg2lbl_fig2txt.log
 rm -f $1_cbg.m
 rm -f $typefile
 rm -f $infofile
 rm -f mtt_junk*
 
 ## Create lbl files beneath this one
-mtt -q -u -l 1 $1 sub sh # Create the list
-sh $1_sub.sh "abg2lbl_fig2txt "
+mtt -q -u -l 1 ${sys} sub sh # Create the list
+sh $1_sub.sh "abg2lbl_fig2txt " " $sensitivity"
 
 if [ -f "$1_lbl.txt" ]; then
   ##echo "$1_lbl.txt exists in `pwd` - no action taken"
   exit
 ##else 
@@ -151,10 +160,11 @@
 awk '/:/ {print $NF}' $1_abg.fig | \
 sed 's/\\001//' | \
 sort | \
 tee $1_raw_list | \
 sort -u> $1_unique_raw_list
+
 
 #Write out non-unique names
 #echo 'Non-unique names (if any):'
 #diff $1_unique_raw_list  $1_raw_list | grep '>' | sed 's/>/	/'
 
@@ -285,12 +295,12 @@
 write_header            > ${outfile}
 cat mtt_junk_alias.txt >> ${outfile}
 create_args mtt_junk   >> ${outfile}
 write_blurb            >> ${outfile}
 cat mtt_junk_lbl.txt   >> ${outfile}
+## Put a blank line at end
+cat >> ${outfile} <<EOF
 
+EOF
 ## Clean up
 rm -f mtt_junk*
-
-
-
 

Index: mttroot/mtt/bin/trans/ese2rdae_r
==================================================================
--- mttroot/mtt/bin/trans/ese2rdae_r
+++ mttroot/mtt/bin/trans/ese2rdae_r
@@ -12,10 +12,14 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.10  2000/11/30 15:23:16  peterg
+## Taken out all subsystem stuff - now done in mtt using
+## mtt_make_subsystems
+##
 ## Revision 1.9  2000/09/07 12:18:31  peterg
 ## Prettified layout of this file
 ##
 ## Revision 1.8  2000/09/07 12:07:26  peterg
 ## *** empty log message ***
@@ -85,10 +89,14 @@
 
 while [ -n "`echo $1 | grep '^-'`" ]; do
   case $1 in
 	-I )
                 info=info;;
+	-cr )
+                load_cr=yes;
+                blurb2=' using cr first';
+                ;;
 	-partition )
                 partition=yes;
                 blurb='with partitioning';
 		;;
 	*)
@@ -113,19 +121,26 @@
 crname=$topname"_cr.r"
 paramname=$topname"_params.r"
 daename=$sysname"_rdae.r"
 esename=$sysname"_ese.r"
 logname=ese2rdae.log
+
+if [ -n "${load_cr}" ]; then
+    load_cr_comm="in \"${crname}\";"
+fi
 
 # Inform user
-echo Creating $daename $blurb
+echo Creating $daename $blurb $blurb2
 
 # Remove the old log file
 rm -f $logname
 
 # Use symbolic algebra to accomplish the transformation
 $SYMBOLIC >$logname  << EOF
+
+%Read in the the cr is -cr set
+$load_cr_comm
 
 %Read the formatting function
 in "$MTTPATH/trans/reduce_matrix.r";
 
 % Definitions