Changeset 494
- Timestamp:
- 06/28/12 17:29:53
- Files:
-
- raw2proc/trunk/raw2proc/lb1_config_20120120.py (modified) (1 diff)
- raw2proc/trunk/raw2proc/lb2_config_20120119.py (modified) (1 diff)
- raw2proc/trunk/raw2proc/lb3_config_20111216.py (modified) (2 diffs)
- raw2proc/trunk/raw2proc/proc_cr1000_ctd_v1.py (modified) (2 diffs)
- raw2proc/trunk/raw2proc/proc_cr1000_ctd_v2.py (modified) (2 diffs)
- raw2proc/trunk/raw2proc/proc_cr1000_met.py (modified) (2 diffs)
- raw2proc/trunk/raw2proc/proc_cr1000_wind.py (modified) (2 diffs)
- raw2proc/trunk/raw2proc/proc_sbe37_ctd.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
raw2proc/trunk/raw2proc/lb1_config_20120120.py
r492 r494 35 35 sensor_info = { 36 36 'ctd' : { 'id' : 'ctd', 37 'description' : ' Near-surfaceCTD Data each sample period',37 'description' : 'Bottom CTD Data each sample period', 38 38 'raw_dir' : '/seacoos/data/long_bay/level0/lb1/ctd/2012_01/', 39 39 'raw_file_glob' : '*', raw2proc/trunk/raw2proc/lb2_config_20120119.py
r492 r494 35 35 sensor_info = { 36 36 'ctd' : { 'id' : 'ctd', 37 'description' : ' Near-surfaceCTD Data each sample period',37 'description' : 'Bottom CTD Data each sample period', 38 38 'raw_dir' : '/seacoos/data/long_bay/level0/lb2/ctd/2012_01/', 39 39 'raw_file_glob' : '*', raw2proc/trunk/raw2proc/lb3_config_20111216.py
r492 r494 1 1 platform_info = { 2 'id' : 'lb 2',2 'id' : 'lb3', 3 3 'location' : 'Long Bay, NC, Upper Slope Bottom Frame', 4 4 'lat' : 32.85237, # degrees true (-) south, (+) north … … 35 35 sensor_info = { 36 36 'ctd' : { 'id' : 'ctd', 37 'description' : ' Near-surfaceCTD Data each sample period',37 'description' : 'Bottom CTD Data each sample period', 38 38 'raw_dir' : '/seacoos/data/long_bay/level0/lb3/ctd/2011_12/', 39 39 'raw_file_glob' : '*', raw2proc/trunk/raw2proc/proc_cr1000_ctd_v1.py
r491 r494 1 1 #!/usr/bin/env python 2 # Last modified: Time-stamp: <2012-0 5-01 16:12:51haines>2 # Last modified: Time-stamp: <2012-06-28 14:47:42 haines> 3 3 """ 4 4 how to parse data, and assert what data and info goes into … … 142 142 # (1) within range 143 143 # (2) if not pumped 144 good = (5<data['wtemp']) & (data['wtemp']<30) 145 bad = ~good 146 data['wtemp'][bad] = numpy.nan 147 148 good = (2<data['cond']) & (data['cond']<7) 149 bad = ~good 150 data['cond'][bad] = numpy.nan 144 151 145 152 # calculate depth, salinity and density raw2proc/trunk/raw2proc/proc_cr1000_ctd_v2.py
r490 r494 1 1 #!/usr/bin/env python 2 # Last modified: Time-stamp: <2012-0 4-23 14:12:55haines>2 # Last modified: Time-stamp: <2012-06-28 14:47:52 haines> 3 3 """ 4 4 how to parse data, and assert what data and info goes into … … 148 148 # (1) within range 149 149 # (2) if not pumped 150 # (2) if not pumped 151 good = (5<data['wtemp']) & (data['wtemp']<30) 152 bad = ~good 153 data['wtemp'][bad] = numpy.nan 154 155 good = (2<data['cond']) & (data['cond']<7) 156 bad = ~good 157 data['cond'][bad] = numpy.nan 150 158 151 159 # calculate depth, salinity and density raw2proc/trunk/raw2proc/proc_cr1000_met.py
r492 r494 1 1 #!/usr/bin/env python 2 # Last modified: Time-stamp: <2012-0 5-15 15:44:51 haines>2 # Last modified: Time-stamp: <2012-06-28 15:45:31 haines> 3 3 """ 4 4 how to parse data, and assert what data and info goes into … … 132 132 133 133 data['air_press'] = udconvert(data['air_press'], 'psi', 'mbar')[0] 134 # cannot figure out how to combine the two operations 135 # for some reason, this one liner does not work 136 # good = -40<at & at<60 137 above_tol=-40<data['air_temp'] 138 below_tol=data['air_temp']<60 139 good = above_tol & below_tol 134 # some QC 135 # good = -40<at & at<60 # does not work 136 # good = (-40<at) & (at<60) # THIS WORKS! 137 good = (5<data['air_temp']) & (data['air_temp']<30) 140 138 bad = ~good 141 139 data['air_temp'][bad] = numpy.nan 142 140 data['air_temp_std'][bad] = numpy.nan 141 data['rh'][bad] = numpy.nan 142 data['rh_std'][bad] = numpy.nan 143 data['rain'][bad] = numpy.nan 144 145 # specific to buoy B1 and B2 146 if platform_info['id'] == 'b1': 147 data['psp'] = -1*data['psp']/1000 148 data['psp_std'] = -1*data['psp_std']/1000 149 if platform_info['id'] == 'b2': 150 data['psp'] = numpy.nan*data['psp'] 151 data['psp_std'] = numpy.nan*data['psp_std'] 152 143 153 # check that no data[dt] is set to Nan or anything but datetime 144 154 # keep only data that has a resolved datetime raw2proc/trunk/raw2proc/proc_cr1000_wind.py
r488 r494 1 1 #!/usr/bin/env python 2 # Last modified: Time-stamp: <2012-0 4-23 14:13:36haines>2 # Last modified: Time-stamp: <2012-06-27 09:00:17 haines> 3 3 """ 4 4 how to parse data, and assert what data and info goes into … … 132 132 # for line 133 133 134 134 # cannot figure out how to combine the two operations 135 # for some reason, this one liner does not work 136 bad = data['wdir1']==0 # print ' ... ... Number of zero wdir1 = %d' % numpy.sum(bad) 137 data['wdir1'][bad] = numpy.nan 138 bad = data['wdir2']==0 # print ' ... ... Number of zero wdir1 = %d' % numpy.sum(bad) 139 data['wdir2'][bad] = numpy.nan 140 135 141 # check that no data[dt] is set to Nan or anything but datetime 136 142 # keep only data that has a resolved datetime raw2proc/trunk/raw2proc/proc_sbe37_ctd.py
r490 r494 1 1 #!/usr/bin/env python 2 # Last modified: Time-stamp: <2012-0 5-01 11:15:41haines>2 # Last modified: Time-stamp: <2012-06-28 14:44:14 haines> 3 3 """ 4 4 how to parse data, and assert what data and info goes into … … 188 188 # (1) within range 189 189 # (2) if not pumped 190 good = (5<data['wtemp']) & (data['wtemp']<30) 191 bad = ~good 192 data['wtemp'][bad] = numpy.nan 193 194 good = (2<data['cond']) & (data['cond']<7) 195 bad = ~good 196 data['cond'][bad] = numpy.nan 197 198 # press range depends on deployment depth and instrument transducer rating 190 199 191 200 # calculate depth, salinity and density