Changeset 491

Timestamp:

05/01/12 16:47:44

Author:

haines

Message:

--

Files:

• raw2proc/trunk/raw2proc/b2_config_20111005.py (modified) (2 diffs)
• raw2proc/trunk/raw2proc/b2_config_20111112.py (modified) (1 diff)
• raw2proc/trunk/raw2proc/proc_cr1000_ctd_v1.py (modified) (3 diffs)
• raw2proc/trunk/raw2proc/raw2proc.py (modified) (4 diffs)
• raw2proc/trunk/raw2proc/spin/spin_billymitchell_sfas.py (modified) (1 diff)

raw2proc/trunk/raw2proc/b2_config_20111005.py

@@ -71 +71 @@
-              'raw_file_glob' : '*.dat',
-              'proc_dir' : '/seacoos/data/nccoos/level1/b2/ctd1/',
-
+_v1
-              'utc_offset' : 0,  # hours offset to utc of sampling time
-              'nominal_depth' : -2.0,  # meters 
@@ -86 +86 @@
-              'raw_file_glob' : '*.dat',
-              'proc_dir' : '/seacoos/data/nccoos/level1/b2/ctd2/',
-
+_v1
-              'utc_offset' : 0,  # hours offset to utc of sampling time
-              'nominal_depth' : -15.0,  # meters 

raw2proc/trunk/raw2proc/b2_config_20111112.py

@@ -83 +83 @@
-    'ctd2' : { 'id' : 'ctd2',
-               'description' : 'Mid-level CTD Data each sample period',
-ot
+to
-              'raw_file_glob' : '*',
-              'proc_dir' : '/seacoos/data/nccoos/level1/b2/ctd2/',

raw2proc/trunk/raw2proc/proc_cr1000_ctd_v1.py

@@ -1 +1 @@
-#!/usr/bin/env python
-4-23 14:12:55
+5-01 16:12:51
-"""
-how to parse data, and assert what data and info goes into
@@ -41 +41 @@
-    "TS","RN","","","","","","",""
-    "","","Smp","Smp","Smp","Smp","Smp","Smp","Smp"
-
-
-
-
-
-
+
+
+
+
+
+
+
-    """
-
@@ -95 +96 @@
-                csi.append(float(m.groups()[0]))
-
-9
-6]+' '+sw[7
+6
+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']:
-d %b %Y
+Y-%m-%d
-                        timedelta(hours=sensor_info['utc_offset'])
-        else:
-d %b %Y
+Y-%m-%d
-
-        # ***** TO DO: need to adjust any drift of offset in CTD sample time to CR1000 clock

raw2proc/trunk/raw2proc/raw2proc.py

@@ -1 +1 @@
-#!/usr/bin/env python
-1:58:23
+6:40:55
-"""Process raw data to monthly netCDF data files
-
@@ -291 +291 @@
-        else:
-            platforms = [plats] # make one platform iterable
+    else: platforms = plats
-        
-    print ' Expanded lists for creating spin_list:'
@@ -305 +306 @@
-            else:
-                packages = [packs] # make one package iterable
+        else: packages = packs
-
-        print ' ... ... packages : %s' % packages
@@ -603 +605 @@
-                ofn = os.path.join(si['proc_dir'], si['proc_filename'])
-                (raw_files, raw_dts) = find_raw(si, yyyy_mm)
-
-
+# 
+# 
-                raw_files = which_raw(pi, raw_files, raw_dts)
-
-
+# 
+# 
-                # remove any previous netcdf file (platform_package_yyyy_mm.nc)
-                if index==0  and os.path.exists(ofn):

raw2proc/trunk/raw2proc/spin/spin_billymitchell_sfas.py

@@ -4 +4 @@
-from raw2proc import *
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+