Changeset 315

Timestamp:

01/08/10 11:43:28

Author:

gdusek

Message:

changes to mulitple files due to recent merge

Files:

• DPWP/trunk/DPWP/ADCP_splitter/adcpwaves.py (modified) (11 diffs)

DPWP/trunk/DPWP/ADCP_splitter/adcpwaves.py

@@ -1 +1 @@
-"""This code takes the raw waves portion of the adcp data from the splitter
-and outputs pressure, range, orbital velocity and system info text files that
-
+
+
+
+
-
-
@@ -17 +20 @@
-
-ifile = open(infileName, 'rb')
+
+# set the transducer height above bottom
+thab = 0.4
-
-
@@ -35 +41 @@
-    Header =struct.unpack('H',readFirstHeader)[0]
-    #print 'headerID=', hex(Header)
+    if Header != 31103:
+        print(' \n error with file, check to see that file is a waves file')
+        break
-
-    firstLeaderHeader=259
-    wavePingHeader=515
-    lastLeaderHeader=771
-
-
-
-
+
+
+
+
+
-
-    #read 4 bytes before the leader ID
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    readLeaderHeader=ifile.read(2)
-    leaderHeader =struct.unpack('H',readLeaderHeader)[0]
+    #print hex(leaderHeader)
-    
-    if leaderHeader != firstLeaderHeader:
@@ -141 +166 @@
-
-    # transducer height above the bottom
-0.4
+thab
-
-    # heights above transducer
@@ -149 +174 @@
-    hab = [th+elem for elem in hat]
-
+    #if the bins output = 3 or 4 need to include NaNs
+
+    if binsOut == 4:
+        sysinfoOfile.write('NaN')
+        sysinfoOfile.write('\n')
+    elif binsOut == 3:
+        sysinfoOfile.write('NaN')
+        sysinfoOfile.write('\n')        
+        sysinfoOfile.write('NaN')
+        sysinfoOfile.write('\n')
+        
-    for value in hab:
-        sysinfoOfile.write(str(value))
@@ -198 +234 @@
-    
-    #Reserved space (?)
-
+
+
+
+
+
+
+
+
-
-
@@ -211 +254 @@
-
-    
-length
-length
-length
+checksum offset
+csOffset
+csOffset
-            print('\n End of file')
-            break
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-        readLeaderHeader=ifile.read(2)
@@ -226 +282 @@
-        # if the leader header isnt the wave ping header move on to the next leader
-        if leaderHeader != wavePingHeader:
-
+ 
-
-        #read through sample number and time since burst (don't need this)
@@ -263 +319 @@
-        #read and write the orbital velocity data
-
-40
+binsOut*8
-
-        while bytes > 0:
@@ -274 +330 @@
-        orbitOfile.write('\n')
-
-        #reserved space (?)
-        ifile.read(6)
-
-    # Done with the Wave Ping Type>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
+        # if the ADCP was set up to take heading, pitch and roll measurements
+        # for every ensemble needs to include this
+
+        ID=ifile.read(2)
+        ID=struct.unpack('H',ID)[0]
+        #print hex(ID)
+
+        if ID==HPRheader:
+            heading=ifile.read(2)
+            pitch=ifile.read(2)
+            roll=ifile.read(2)
+            spare=ifile.read(2) #not sure what this is
+            cs=ifile.read(2)
+        else:
+            ifile.seek(-2, 1)
+            spare=ifile.read(2)
+            cs=ifile.read(2)
+        
+        
+        ID=ifile.read(2)
+        if len(ID) == 0:
+            break
+        ID=struct.unpack('H',ID)[0]
+    
+        
-
-    
@@ -332 +411 @@
-    stdRoll=ifile.read(2)
-
-test1
-
-test2
+cs
+
+spare
-    
-