Index: raw2proc/trunk/raw2proc/hampton_config_20050812.py =================================================================== --- raw2proc/trunk/raw2proc/hampton_config_20050812.py (revision 219) +++ raw2proc/trunk/raw2proc/hampton_config_20050812.py (revision 221) @@ -16,5 +16,5 @@ 'description' : 'Automated profiler data ctd and water quality', 'raw_dir' : '/seacoos/data/nccoos/level0/hampton/avp/', - 'raw_file_glob' : '*.dat', + 'raw_file_glob' : '*.[Dd][Aa][Tt]', 'proc_dir' : '/seacoos/data/nccoos/level1/hampton/avp/', 'process_module' : 'proc_avp_ysi_6600_v1_CDL2', @@ -22,17 +22,13 @@ 'bin_size' : 0.1, # meters 'nbins' : 150, # max number of samples in profile - # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', - # 'latest_vars' : ('time','lat','lon','z','wtemp','salin'), }, 'met' : { 'id' : 'met', 'description' : 'Wind Data at Automated Vertical Profiler Station', 'raw_dir' : '/seacoos/data/nccoos/level0/hampton/met/', - 'raw_file_glob' : '*.wnd', + 'raw_file_glob' : '*.[Ww][Nn][Dd]', 'proc_dir' : '/seacoos/data/nccoos/level1/hampton/met/', 'process_module' : 'proc_avp_ascii_met', 'utc_offset' : 5., # hours offset to Eastern Standard 'anemometer_height' : 2., # meters - 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', - 'latest_vars' : ('time','lat','lon','z','u','v','wspd', 'wdir'), }, } Index: raw2proc/trunk/raw2proc/hampton_config_20080930.py =================================================================== --- raw2proc/trunk/raw2proc/hampton_config_20080930.py (revision 219) +++ raw2proc/trunk/raw2proc/hampton_config_20080930.py (revision 221) @@ -16,5 +16,5 @@ 'description' : 'Automated profiler data ctd and water quality', 'raw_dir' : '/seacoos/data/nccoos/level0/hampton/avp/', - 'raw_file_glob' : '*.dat', + 'raw_file_glob' : '*.[Dd][Aa][Tt]', 'proc_dir' : '/seacoos/data/nccoos/level1/hampton/avp/', 'process_module' : 'proc_avp_ysi_6600_v1_CDL2', @@ -28,11 +28,11 @@ 'description' : 'Wind Data at Automated Vertical Profiler Station', 'raw_dir' : '/seacoos/data/nccoos/level0/hampton/met/', - 'raw_file_glob' : '*.wnd', + 'raw_file_glob' : '*.[Ww][Nn][Dd]', 'proc_dir' : '/seacoos/data/nccoos/level1/hampton/met/', 'process_module' : 'proc_avp_ascii_met', 'utc_offset' : 5., # hours offset to Eastern Standard 'anemometer_height' : 2., # meters - 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', - 'latest_vars' : ('time','lat','lon','z','u','v','wspd', 'wdir'), + # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', + # 'latest_vars' : ('time','lat','lon','z','u','v','wspd', 'wdir'), }, } Index: raw2proc/trunk/raw2proc/morgan_config_20080701.py =================================================================== --- raw2proc/trunk/raw2proc/morgan_config_20080701.py (revision 218) +++ raw2proc/trunk/raw2proc/morgan_config_20080701.py (revision 221) @@ -18,5 +18,5 @@ 'description' : 'Automated profiler data ctd and water quality', 'raw_dir' : '/seacoos/data/nccoos/level0/morgan/avp/', - 'raw_file_glob' : '*.dat', + 'raw_file_glob' : '*.[Dd][Aa][Tt]', 'proc_dir' : '/seacoos/data/nccoos/level1/morgan/avp/', 'process_module' : 'proc_avp_ysi_6600_v2_CDL2', @@ -30,11 +30,11 @@ 'description' : 'Wind Data at Automated Vertical Profiler Station', 'raw_dir' : '/seacoos/data/nccoos/level0/morgan/met/', - 'raw_file_glob' : '*.wnd', + 'raw_file_glob' : '*.[Ww][Nn][Dd]', 'proc_dir' : '/seacoos/data/nccoos/level1/morgan/met/', 'process_module' : 'proc_avp_ascii_met', 'utc_offset' : 5., # hours offset to Eastern Standard 'anemometer_height' : 2., # meters - 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', - 'latest_vars' : ('time','lat','lon','z','u','v','wspd', 'wdir'), + # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', + # 'latest_vars' : ('time','lat','lon','z','u','v','wspd', 'wdir'), }, } Index: raw2proc/trunk/raw2proc/proc_avp_ysi_6600_v2_CDL2.py =================================================================== --- raw2proc/trunk/raw2proc/proc_avp_ysi_6600_v2_CDL2.py (revision 219) +++ raw2proc/trunk/raw2proc/proc_avp_ysi_6600_v2_CDL2.py (revision 221) @@ -1,4 +1,4 @@ #!/usr/bin/env python -# Last modified: Time-stamp: <2009-01-08 11:50:47 haines> +# Last modified: Time-stamp: <2009-01-09 12:07:49 haines> """ how to parse data, and assert what data and info goes into @@ -226,5 +226,5 @@ j = j+1 - elif (len(ysi)==0 and have_head): # each profile separated by empty line + elif (len(ysi)==0 and have_head and i +# Last modified: Time-stamp: <2009-01-09 15:04:17 haines> """Utilities to help data processing @@ -378,5 +378,5 @@ ofn = os.path.join(si['latest_dir'], si['latest_filename']) if os.path.exists(ifn): - print ' ... ... latest : %s ' % (ifn,) + print ' ... ... latest : %s ' % (ofn,) # get dt from current month file (es, units) = nc_get_time(ifn) Index: raw2proc/trunk/raw2proc/stones_config_20080701.py =================================================================== --- raw2proc/trunk/raw2proc/stones_config_20080701.py (revision 218) +++ raw2proc/trunk/raw2proc/stones_config_20080701.py (revision 221) @@ -18,5 +18,5 @@ 'description' : 'Automated profiler data ctd and water quality', 'raw_dir' : '/seacoos/data/nccoos/level0/stones/avp', - 'raw_file_glob' : '*.dat', + 'raw_file_glob' : '*.[Dd][Aa][Tt]', 'proc_dir' : '/seacoos/data/nccoos/level1/stones/avp', 'process_module' : 'proc_avp_ysi_6600_v2_CDL2', @@ -30,11 +30,11 @@ 'description' : 'Wind Data at Automated Vertical Profiler Station', 'raw_dir' : '/seacoos/data/nccoos/level0/stones/met/', - 'raw_file_glob' : '*.wnd', + 'raw_file_glob' : '*.[Ww][Nn][Dd]', 'proc_dir' : '/seacoos/data/nccoos/level1/stones/met/', 'process_module' : 'proc_avp_ascii_met', 'utc_offset' : 5., # hours offset to Eastern Standard 'anemometer_height' : 2., # meters - 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', - 'latest_vars' : ('time','lat','lon','z','u', 'v', 'wspd', 'wdir'), + # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', + # 'latest_vars' : ('time','lat','lon','z','u', 'v', 'wspd', 'wdir'), }, }