Index: raw2proc/trunk/raw2proc/b2_config_20111005.py =================================================================== --- raw2proc/trunk/raw2proc/b2_config_20111005.py (revision 490) +++ raw2proc/trunk/raw2proc/b2_config_20111005.py (revision 491) @@ -71,5 +71,5 @@ 'raw_file_glob' : '*.dat', 'proc_dir' : '/seacoos/data/nccoos/level1/b2/ctd1/', - 'process_module' : 'proc_cr1000_ctd', + 'process_module' : 'proc_cr1000_ctd_v1', 'utc_offset' : 0, # hours offset to utc of sampling time 'nominal_depth' : -2.0, # meters @@ -86,5 +86,5 @@ 'raw_file_glob' : '*.dat', 'proc_dir' : '/seacoos/data/nccoos/level1/b2/ctd2/', - 'process_module' : 'proc_cr1000_ctd', + 'process_module' : 'proc_cr1000_ctd_v1', 'utc_offset' : 0, # hours offset to utc of sampling time 'nominal_depth' : -15.0, # meters Index: raw2proc/trunk/raw2proc/b2_config_20111112.py =================================================================== --- raw2proc/trunk/raw2proc/b2_config_20111112.py (revision 490) +++ raw2proc/trunk/raw2proc/b2_config_20111112.py (revision 491) @@ -83,5 +83,5 @@ 'ctd2' : { 'id' : 'ctd2', 'description' : 'Mid-level CTD Data each sample period', - 'raw_dir' : '/seacoos/data/nccoos/level0/b2/ctd2/sotre/2011_11', + 'raw_dir' : '/seacoos/data/nccoos/level0/b2/ctd2/store/2011_11', 'raw_file_glob' : '*', 'proc_dir' : '/seacoos/data/nccoos/level1/b2/ctd2/', Index: raw2proc/trunk/raw2proc/proc_cr1000_ctd_v1.py =================================================================== --- raw2proc/trunk/raw2proc/proc_cr1000_ctd_v1.py (revision 490) +++ raw2proc/trunk/raw2proc/proc_cr1000_ctd_v1.py (revision 491) @@ -1,4 +1,4 @@ #!/usr/bin/env python -# Last modified: Time-stamp: <2012-04-23 14:12:55 haines> +# Last modified: Time-stamp: <2012-05-01 16:12:51 haines> """ how to parse data, and assert what data and info goes into @@ -41,10 +41,11 @@ "TS","RN","","","","","","","" "","","Smp","Smp","Smp","Smp","Smp","Smp","Smp" - "2011-12-01 00:02:09",4449,3585,16.1596,4.15704,3.413," 30 Nov 2011"," 23:58:44"," 4406 " - "2011-12-01 00:08:09",4450,3585,16.1783,4.15878,3.745," 01 Dec 2011"," 00:04:44"," 4407 " - "2011-12-01 00:14:09",4451,3585,16.1638,4.15794,3.545," 01 Dec 2011"," 00:10:44"," 4408 " - "2011-12-01 00:20:09",4452,3585,16.1632,4.15769,3.254," 01 Dec 2011"," 00:16:44"," 4409 " - "2011-12-01 00:26:09",4453,3585,16.1524,4.15665,3.649," 01 Dec 2011"," 00:22:44"," 4410 " - "2011-12-01 00:32:09",4454,3585,16.1661,4.1582,3.277," 01 Dec 2011"," 00:28:44"," 4411 " + "2011-10-05 21:08:06",43,4085,24.5027,5.18209,3.347 + "2011-10-05 21:14:06",44,4085,24.5078,5.18305,3.454 + "2011-10-05 21:56:07",45,4085,24.5247,5.19257,3.423 + "2011-10-05 22:02:06",46,4085,24.5105,5.18714,3.526 + "2011-10-05 22:08:07",47,4085,24.519,5.19096,3.547 + "2011-10-05 22:14:06",48,4085,24.5207,5.19172,3.508 + """ @@ -95,23 +96,16 @@ csi.append(float(m.groups()[0])) - if len(sw)>=9: - dstr = re.sub('"', '', sw[6]+' '+sw[7]) + if len(sw)>=6: + dstr = re.sub('"', '', sw[0]) # print dstr - m = re.search('\s*(\d{2})\s*(\w{2,3})\s*(\d{4})\s*(\d{2}):(\d{2}):(\d{2})', dstr) else: print ' ... skipping line %d -- %s ' % (i,line) continue - if m: - dstr = '%s %s %s %s:%s:%s' % m.groups() - else: - print ' ... skipping line %d -- %s ' % (i,line) - continue - if sensor_info['utc_offset']: - sample_dt = scanf_datetime(dstr, fmt='%d %b %Y %H:%M:%S') + \ + sample_dt = scanf_datetime(dstr, fmt='%Y-%m-%d %H:%M:%S') + \ timedelta(hours=sensor_info['utc_offset']) else: - sample_dt = scanf_datetime(dstr, fmt='%d %b %Y %H:%M:%S') + sample_dt = scanf_datetime(dstr, fmt='%Y-%m-%d %H:%M:%S') # ***** TO DO: need to adjust any drift of offset in CTD sample time to CR1000 clock Index: raw2proc/trunk/raw2proc/raw2proc.py =================================================================== --- raw2proc/trunk/raw2proc/raw2proc.py (revision 490) +++ raw2proc/trunk/raw2proc/raw2proc.py (revision 491) @@ -1,4 +1,4 @@ #!/usr/bin/env python -# Last modified: Time-stamp: <2012-05-01 11:58:23 haines> +# Last modified: Time-stamp: <2012-05-01 16:40:55 haines> """Process raw data to monthly netCDF data files @@ -291,4 +291,5 @@ else: platforms = [plats] # make one platform iterable + else: platforms = plats print ' Expanded lists for creating spin_list:' @@ -305,4 +306,5 @@ else: packages = [packs] # make one package iterable + else: packages = packs print ' ... ... packages : %s' % packages @@ -603,9 +605,9 @@ ofn = os.path.join(si['proc_dir'], si['proc_filename']) (raw_files, raw_dts) = find_raw(si, yyyy_mm) - print raw_files - print raw_dts + # print raw_files + # print raw_dts raw_files = which_raw(pi, raw_files, raw_dts) - print raw_files - print raw_dts + # print raw_files + # print raw_dts # remove any previous netcdf file (platform_package_yyyy_mm.nc) if index==0 and os.path.exists(ofn): Index: raw2proc/trunk/raw2proc/spin/spin_billymitchell_sfas.py =================================================================== --- raw2proc/trunk/raw2proc/spin/spin_billymitchell_sfas.py (revision 465) +++ raw2proc/trunk/raw2proc/spin/spin_billymitchell_sfas.py (revision 491) @@ -4,23 +4,27 @@ from raw2proc import * -raw2proc('manual', 'billymitchell', 'sfas', '2009_06') -raw2proc('manual', 'billymitchell', 'sfas', '2009_07') -raw2proc('manual', 'billymitchell', 'sfas', '2009_08') -raw2proc('manual', 'billymitchell', 'sfas', '2009_09') -raw2proc('manual', 'billymitchell', 'sfas', '2009_10') -raw2proc('manual', 'billymitchell', 'sfas', '2009_11') -raw2proc('manual', 'billymitchell', 'sfas', '2009_12') -raw2proc('manual', 'billymitchell', 'sfas', '2010_01') -raw2proc('manual', 'billymitchell', 'sfas', '2010_02') -raw2proc('manual', 'billymitchell', 'sfas', '2010_03') -raw2proc('manual', 'billymitchell', 'sfas', '2010_04') -raw2proc('manual', 'billymitchell', 'sfas', '2010_05') -raw2proc('manual', 'billymitchell', 'sfas', '2010_06') -raw2proc('manual', 'billymitchell', 'sfas', '2010_07') -raw2proc('manual', 'billymitchell', 'sfas', '2010_08') -raw2proc('manual', 'billymitchell', 'sfas', '2010_09') -raw2proc('manual', 'billymitchell', 'sfas', '2011_06') -raw2proc('manual', 'billymitchell', 'sfas', '2011_07') -raw2proc('manual', 'billymitchell', 'sfas', '2011_08') -raw2proc('manual', 'billymitchell', 'sfas', '2011_09') -raw2proc('manual', 'billymitchell', 'sfas', '2011_10') +# raw2proc('manual', 'billymitchell', 'sfas', '2009_06') +# raw2proc('manual', 'billymitchell', 'sfas', '2009_07') +# raw2proc('manual', 'billymitchell', 'sfas', '2009_08') +# raw2proc('manual', 'billymitchell', 'sfas', '2009_09') +# raw2proc('manual', 'billymitchell', 'sfas', '2009_10') +# raw2proc('manual', 'billymitchell', 'sfas', '2009_11') +# raw2proc('manual', 'billymitchell', 'sfas', '2009_12') +# raw2proc('manual', 'billymitchell', 'sfas', '2010_01') +# raw2proc('manual', 'billymitchell', 'sfas', '2010_02') +# raw2proc('manual', 'billymitchell', 'sfas', '2010_03') +# raw2proc('manual', 'billymitchell', 'sfas', '2010_04') +# raw2proc('manual', 'billymitchell', 'sfas', '2010_05') +# raw2proc('manual', 'billymitchell', 'sfas', '2010_06') +# raw2proc('manual', 'billymitchell', 'sfas', '2010_07') +# raw2proc('manual', 'billymitchell', 'sfas', '2010_08') +# raw2proc('manual', 'billymitchell', 'sfas', '2010_09') +# raw2proc('manual', 'billymitchell', 'sfas', '2011_06') +# raw2proc('manual', 'billymitchell', 'sfas', '2011_07') +# raw2proc('manual', 'billymitchell', 'sfas', '2011_08') +# raw2proc('manual', 'billymitchell', 'sfas', '2011_09') +# raw2proc('manual', 'billymitchell', 'sfas', '2011_10') +# raw2proc('manual', 'billymitchell', 'sfas', '2011_11') +raw2proc('manual', 'billymitchell', 'sfas', '2011_12') +raw2proc('manual', 'billymitchell', 'sfas', '2012_01') +raw2proc('manual', 'billymitchell', 'sfas', '2012_02')