Index: mttroot/mtt/bin/trans/dm2fr_m
==================================================================
--- mttroot/mtt/bin/trans/dm2fr_m
+++ mttroot/mtt/bin/trans/dm2fr_m
@@ -13,10 +13,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.5  1996/08/15 16:23:02  peter
+## Now uses W in place of w for consistancy with time responses.
+##
 ## Revision 1.4  1996/08/15 11:52:42  peter
 ## Now creats a number of versions:
 ## fr 	complex frequency response
 ## lmfr 	log  magnitude of fr
 ## lpfr  	phase of fr
@@ -40,11 +43,11 @@
 echo Creating $1_nyfr.m
 echo Creating $1_nifr.m
 
 if [ "$2" = "" ]; 
 then
-  PARAMS='W=logspace(-1,2,100); u0=ones(nu,1);'
+  PARAMS='W=logspace(-1,2,100); u0=zeros(nu,1); u0(1)=1;'
   echo Using default parameter $PARAMS
 else
   PARAMS=$2;
 fi
 
@@ -53,24 +56,25 @@
   [nx,ny,nu,nz,nyz] = $1_def;
   $PARAMS
 
   %Defaults
   if exist('W')==0
-    W = logspace(-1,2,100);
+    W = logspace(-1,2,100)';
   end;
 
   if exist('u0')==0
-    u0 = ones(nu,1);
+    u0 = zeros(nu,1);
+    u0(1) = 1;
   end;
 
   [n,m]=size(W);
   if m>n
     W=W';
   end;
 
-  [A,B,C,D,E] = $1_dm($1_numpar);
-  fr = dm2fr(A,B,C,D,E,W,u0);
+  [A,B,C,D,E] = $1_dm($1_numpar)
+  fr = dm2fr(A,B,C,D,E,W,u0)
   lw = log10(W);
   lmfr = log10(abs(fr));
   pfr = angle(fr)*180/pi;
 
 % Complex frequency response
@@ -90,15 +94,15 @@
     nyq = [nyq re(:,i) im(:,i)]
   end;
   write_matrix(nyq, '$1_nyfr');
 
 % Nichols style
-  re = lw;
+  re = lmfr;
   im = pfr;
   nic = [im(:,1) re(:,1)];
   for i = 2:ny
     nic = [nic im(:,i) re(:,i)]
   end;
   write_matrix(nic, '$1_nifr');
 
 EOF