From 48d0b7b684d85cdcc1e49c6cc74c1e9305c233be Mon Sep 17 00:00:00 2001
From: Robert Smallshire <robert@smallshire.org.uk>
Date: Fri, 21 Oct 2011 22:05:56 +0200
Subject: [PATCH] Minor improvements

---
 segypy.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/segypy.py b/segypy.py
index 211d0c5..b886342 100644
--- a/segypy.py
+++ b/segypy.py
@@ -44,7 +44,7 @@ from ibm_float import ibm2ieee2
 
 logger = logging.getLogger('segpy.segypy')
 
-version = '0.3.1'   # modified by A Squelch
+version = '0.3.1'
 
 REEL_HEADER_NUM_BYTES = 3600
 TRACE_HEADER_NUM_BYTES = 240
@@ -84,7 +84,7 @@ def getDefaultSegyHeader(ntraces=100, ns=100):
     """
     SH = getDefaultSegyHeader()
     """
-    # INITIALIZE DICTIONARYTraceSequenceLine
+    # TraceSequenceLine
     SH = {"Job": {"pos": 3200, "type": "int32", "def": 0}}
 
     for key in SH_def.keys(): 
@@ -152,14 +152,14 @@ def getSegyTraceHeader(SH, THN='cdp', data='none', endian='>'):  # modified by A
     return thv
 
 
-def getLastSegyTraceHeader(SH, THN='cdp', data='none', endian='>'):  # added by A Squelch
+def getLastSegyTraceHeader(SH, THN='cdp', data=None, endian='>'):  # added by A Squelch
     """
     getLastSegyTraceHeader(SH, TraceHeaderName)
     """
 
     bps = getBytePerSample(SH)
 
-    if data == 'none':
+    if data is None:
         data = open(SH["filename"]).read()
 
     # SET PARAMETERS THAT DEFINE THE LOCATION OF THE LAST HEADER
@@ -196,7 +196,7 @@ def getAllSegyTraceHeaders(SH, data='none'):
     return SegyTraceHeaders
 
 
-def readSegy(filename, endian='>'):  # modified by A Squelch
+def readSegy(filename, endian='>'):
     """
     Data, SegyHeader, SegyTraceHeaders = getSegyHeader(filename)
     """
@@ -253,7 +253,6 @@ def readSegyData(data, SH, nd, bps, index, endian='>'):  # added by A Squelch
 
     dsf = SH["DataSampleFormat"]
 
-
     try:  # block added by A Squelch
         DataDescr = SH_def["DataSampleFormat"]["descr"][revision][dsf]
     except KeyError:
@@ -428,7 +427,7 @@ def writeSegyStructure(filename, Data, SH, STH, endian='>'):  # modified by A Sq
         logger.debug('Writing Trace #' + str(itrace + 1) + '/' + str(SH['ntraces']))
         # WRITE SEGY TRACE HEADER
         for key in STH_def.keys():     
-            pos = index+STH_def[key]["pos"]
+            pos = index + STH_def[key]["pos"]
             format = STH_def[key]["type"]
             value = STH[key][itrace]
             logger.debug(str(pos) + " " + str(format) + "  Writing " + key + "=" + str(value))