changes setting up on cruise dy113, associated with change from 1hz to 24hz as...

changes setting up on cruise dy113, associated with change from 1hz to 24hz as source for 2db averages

 Committer: PStar User Account <pstar@192.168.122.1>

 On branch dy113
 Changes to be committed:

	modified:   source/mtechsas/mtnames.m
	modified:   source/unfinished/mcalc.m
	modified:   source/unfinished/mplotxy.m

source/mtechsas/mtnames.m

@@ -146,7 +146,7 @@ switch MEXEC_G.Mship
         'surflight'     'surfmet'  'Light-SURFMET.SURFMETv2'
         'surflight'     'surfmet'  'Light-DY-SM_DY1.SURFMETv3'
 %        'surflight' ' '  'Light-SURFMET.SURFMETv2'
-        'surfmet' ' ' 'MET-SURFMET.SURFMETv2'
+%        'surfmet' ' ' 'MET-SURFMET.SURFMETv2'
         'surfmet' ' ' 'MET-DY-SM_DY1.SURFMETv3'
 %        'surfmet'       'surfmet'  'MET-SURFMET.SURFMETv2'
         'surfmet'     ' '   'SURFMET-Surfmet.met'
@@ -154,10 +154,10 @@ switch MEXEC_G.Mship
          'tsg'                   'tsg'                          'SBE45-SBE45_DY1.TSG'
 %        'surftsg' ' '   'Surf-SURFMET.SURFMETv2'
  'met_tsg'      'surfmet'             'Surf-DY-SM_DY1.SURFMETv3'
-         'winch'           'winch'  'DWINCH-CLAM.DWINCH'
+%         'winch'           'winch'  'DWINCH-CLAM.DWINCH'
 %        'winch'       ' '   'DWINCH-CLAM.DWINCH'
-        'winch' ' '   'CLAM-CLAM.CLAM'
-        'winch' ' '   'CLAM-CLAM_DY1.CLAM'
+%        'winch' ' '   'CLAM-CLAM.CLAM'
+        'winch' 'winch'   'CLAM-CLAM_DY1.CLAM'
         'usbl'        ' '   'USBL-USBL01.usbl'
         'usbl'        ' '   'position-usbl_DY1.gps'
 %        'wamos' ' ' 'wamos-WaMoS.nc'

source/unfinished/mcalc.m

@@ -195,7 +195,7 @@ while endflag == 0
             hot = m_read_header(ncfile_ot);
             kmat = strmatch(newname,hot.fldnam,'exact');
             while ~isempty(kmat)
-                m1 = 'That name is already taken in the output file; try again';
+                m1 = ['That name (' newname ') is already taken in the output file; try again'];
                 fprintf(MEXEC_A.Mfider,'%s\n',m1)
                 newname = input('new variable name','s');
                 kmat = strmatch(newname,hot.fldnam,'exact');

source/unfinished/mplotxy.m

@@ -131,5 +131,8 @@ m_proghd
 % m_getinput. If we don't remove varargin here it will 'accumulate'
 MEXEC_A.MARGS_IN_LOCAL(1:length(varargin)) = [];
 MEXEC_A.MARGS_IN = MEXEC_A.MARGS_IN_LOCAL;
+try
 pdfot = m_edplot(varargin{:});
+catch
+end