Index: raw2proc/trunk/raw2proc/bogue_config_20060918.py =================================================================== --- raw2proc/trunk/raw2proc/bogue_config_20060918.py (revision 116) +++ raw2proc/trunk/raw2proc/bogue_config_20060918.py (revision 124) @@ -19,4 +19,5 @@ 'proc_dir' : '/home/haines/data/nccoos/level1/bogue/adcp', 'process_module' : 'proc_rdi_logdata_adcp', + 'utc_offset' : 4, # hours offset to utc 'nbins' : 50, 'bin_size' : 0.5, # meters @@ -30,4 +31,5 @@ 'proc_dir' : '/home/haines/data/nccoos/level1/bogue/adcpwaves', 'process_module' : 'proc_rdi_logdata_dw', + 'utc_offset' : 4, # hours offset to utc }, } Index: raw2proc/trunk/raw2proc/bogue_config_20070224.py =================================================================== --- raw2proc/trunk/raw2proc/bogue_config_20070224.py (revision 115) +++ raw2proc/trunk/raw2proc/bogue_config_20070224.py (revision 124) @@ -19,4 +19,5 @@ 'proc_dir' : '/home/haines/data/nccoos/level1/bogue/adcp', 'process_module' : 'proc_rdi_logdata_adcp', + 'utc_offset' : 4, # hours offset to utc 'nbins' : 50, 'bin_size' : 0.5, # meters @@ -30,4 +31,5 @@ 'proc_dir' : '/home/haines/data/nccoos/level1/bogue/adcpwaves', 'process_module' : 'proc_rdi_logdata_dw', + 'utc_offset' : 4, # hours offset to utc }, } Index: raw2proc/trunk/raw2proc/proc_rdi_logdata_adcp.py =================================================================== --- raw2proc/trunk/raw2proc/proc_rdi_logdata_adcp.py (revision 101) +++ raw2proc/trunk/raw2proc/proc_rdi_logdata_adcp.py (revision 124) @@ -1,4 +1,4 @@ #!/usr/bin/env python -# Last modified: Time-stamp: <2008-01-14 12:20:17 haines> +# Last modified: Time-stamp: <2008-03-20 09:40:53 haines> """ how to parse data, and assert what data and info goes into @@ -59,6 +59,10 @@ # get sample datetime from data sample_str = '%02d-%02d-%02d %02d:%02d:%02d' % tuple(rdi[1:7]) - sample_dt = scanf_datetime(sample_str, fmt='%y-%m-%d %H:%M:%S') - # datetime(*strptime(sample_str, "%y-%m-%d %H:%M:%S")[0:6]) + if sensor_info['utc_offset']: + sample_dt = scanf_datetime(sample_str, fmt='%y-%m-%d %H:%M:%S') + \ + timedelta(hours=sensor_info['utc_offset']) + else: + sample_dt = scanf_datetime(sample_str, fmt='%y-%m-%d %H:%M:%S') + # datetime(*strptime(sample_str, "%y-%m-%d %H:%M:%S")[0:6]) # get sample datetime from filename Index: raw2proc/trunk/raw2proc/proc_rdi_logdata_dw.py =================================================================== --- raw2proc/trunk/raw2proc/proc_rdi_logdata_dw.py (revision 101) +++ raw2proc/trunk/raw2proc/proc_rdi_logdata_dw.py (revision 124) @@ -1,4 +1,4 @@ #!/usr/bin/env python -# Last modified: Time-stamp: <2008-01-14 12:14:32 haines> +# Last modified: Time-stamp: <2008-03-20 09:41:11 haines> """ how to parse data, and assert what data and info goes into @@ -58,6 +58,10 @@ # get sample datetime from data sample_str = '%02d-%02d-%02d %02d:%02d:%02d' % tuple(rdi[1:7]) - sample_dt = scanf_datetime(sample_str, fmt='%y-%m-%d %H:%M:%S') - # datetime(*strptime(sample_str, "%y-%m-%d %H:%M:%S")[0:6]) + if sensor_info['utc_offset']: + sample_dt = scanf_datetime(sample_str, fmt='%y-%m-%d %H:%M:%S') + \ + timedelta(hours=sensor_info['utc_offset']) + else: + sample_dt = scanf_datetime(sample_str, fmt='%y-%m-%d %H:%M:%S') + # datetime(*strptime(sample_str, "%y-%m-%d %H:%M:%S")[0:6]) # get sample datetime from filename Index: raw2proc/trunk/raw2proc/raw2proc.py =================================================================== --- raw2proc/trunk/raw2proc/raw2proc.py (revision 118) +++ raw2proc/trunk/raw2proc/raw2proc.py (revision 124) @@ -1,4 +1,4 @@ #!/usr/bin/env python -# Last modified: Time-stamp: <2008-02-19 15:04:00 jcleary> +# Last modified: Time-stamp: <2008-03-20 09:49:13 haines> """Process raw data to monthly netCDF data files @@ -333,4 +333,6 @@ if package in pi['packages']: si = asi[package] + if si['utc_offset']: + print ' ... ... utc_offset : %g (hours)' % si['utc_offset'] si['proc_start_dt'] = month_start_dt si['proc_end_dt'] = month_end_dt