Index: raw2proc/trunk/raw2proc/b1_config_20111112.py
===================================================================
--- raw2proc/trunk/raw2proc/b1_config_20111112.py (revision 510)
+++ raw2proc/trunk/raw2proc/b1_config_20111112.py (revision 511)
@@ -36,4 +36,12 @@
             'ndbc_dir' : '/seacoos/data/nccoos/latest_ndbc',
             'ndbc_missing' : -9999.0,
+            # report data to NDBC closest to top of each hour +/- 6 min
+            'ndbc_sample_interval':(1,'hour'),
+            'ndbc_sample_offset':(0,'minute'),
+            'ndbc_time_tolerance':(6,'minute'),
+            # report data closest to 0:10 and 0:40 each hour +/- 3 min
+            # 'ndbc_sample_interval':(30,'minute'), # every 30 min
+            # 'ndbc_sample_offset':(10,'minute'), # offset by +10 min
+            # 'ndbc_time_tolerance':(3,'minute'),
  	    }
 
Index: raw2proc/trunk/raw2proc/b2_config_20111112.py
===================================================================
--- raw2proc/trunk/raw2proc/b2_config_20111112.py (revision 510)
+++ raw2proc/trunk/raw2proc/b2_config_20111112.py (revision 511)
@@ -36,4 +36,12 @@
             'ndbc_dir' : '/seacoos/data/nccoos/latest_ndbc',
             'ndbc_missing' : -9999.0,
+            # report data to NDBC closest to top of each hour +/- 6 min
+            'ndbc_sample_interval':(1,'hour'),
+            'ndbc_sample_offset':(0,'minute'),
+            'ndbc_time_tolerance':(6,'minute'),
+            # report data closest to 0:10 and 0:40 each hour +/- 3 min
+            # 'ndbc_sample_interval':(30,'minute'), # every 30 min
+            # 'ndbc_sample_offset':(10,'minute'), # offset by +10 min
+            # 'ndbc_time_tolerance':(3,'minute'),
  	    }
 
Index: raw2proc/trunk/raw2proc/proc_cr1000_met.py
===================================================================
--- raw2proc/trunk/raw2proc/proc_cr1000_met.py (revision 494)
+++ raw2proc/trunk/raw2proc/proc_cr1000_met.py (revision 511)
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
-# Last modified:  Time-stamp: <2012-06-28 15:45:31 haines>
+# Last modified:  Time-stamp: <2013-11-26 09:02:09 haines>
 """
 how to parse data, and assert what data and info goes into
@@ -113,5 +113,6 @@
             # 
             # data['samplenum'][i] = csi[0] # sample number assigned by datalogger in table
-            data['air_press'][i] =  csi[1] # Heise Barometer (psi) to mbar
+            data['air_press'][i] =  csi[1] # Campbell Sci (Viasala) CS106 barometer (mbar)
+            # Before Jan 2012, Heise Barometer (psi) to mbar
             data['rh'][i] = csi[2] # relative humidity avg (60 samples for 1 min)
             data['rh_std'][i] = csi[3] # relative humidity std
@@ -131,5 +132,18 @@
     # for line
 
-    data['air_press'] = udconvert(data['air_press'], 'psi', 'mbar')[0]
+    # Specific to buoys using CR1000 in Fall of 2011
+    # prior to Jan 01, 2012, pressure sensor was a Heise with units psi
+    # afterwards, Campbell Sci CS106 in units mbar,
+    # also handle b1/b2 PSP data for each buoy
+    if data['dt'][0] < datetime(2012, 1, 1):
+        data['air_press'] = udconvert(data['air_press'], 'psi', 'mbar')[0]
+        # specific to buoy B1 and B2
+        if platform_info['id'] == 'b1':
+            data['psp'] = -1*data['psp']/1000
+            data['psp_std'] = -1*data['psp_std']/1000
+        if platform_info['id'] == 'b2':
+            data['psp'] = numpy.nan*data['psp']
+            data['psp_std'] = numpy.nan*data['psp_std']
+    
     # some QC
     # good = -40<at & at<60 # does not work
@@ -143,12 +157,4 @@
     data['rain'][bad] = numpy.nan 
 
-    # specific to buoy B1 and B2
-    if platform_info['id'] == 'b1':
-        data['psp'] = -1*data['psp']/1000
-        data['psp_std'] = -1*data['psp_std']/1000
-    if platform_info['id'] == 'b2':
-        data['psp'] = numpy.nan*data['psp']
-        data['psp_std'] = numpy.nan*data['psp_std']
-    
     # check that no data[dt] is set to Nan or anything but datetime
     # keep only data that has a resolved datetime
Index: raw2proc/trunk/raw2proc/proc_scintec_maindata_sfas.py
===================================================================
--- raw2proc/trunk/raw2proc/proc_scintec_maindata_sfas.py (revision 510)
+++ raw2proc/trunk/raw2proc/proc_scintec_maindata_sfas.py (revision 511)
@@ -154,5 +154,5 @@
                  'units': 'degrees_east',
                  'valid_range':(-180.,180.),
-                 'axis': 'Y',
+                 'axis': 'X',
                 },
         'z' : {'short_name': 'z',