Changeset 149

Timestamp:

09/09/2009 04:26:54 PM (13 years ago)

Author:

marcus

Message:

• support for setting time info entries (epoch seconds and ms)
• more tests

Location:

SHX/trunk/src/SeismicHandler

Files:

• core/shheaders.py (modified) (4 diffs)
• core/shlib.py (modified) (2 diffs)
• tests/data/MEND.asc (added)
• tests/data/MERGE.asc (added)
• tests/data/ROT.asc (added)
• tests/data/cresharp.QBN (added)
• tests/data/cresharp.QHD (added)
• tests/data/mend.pkl (added)
• tests/data/merge.pkl (added)
• tests/data/rot.pkl (added)
• tests/data/spectrogram.out (added)
• tests/test_commands.py (modified) (6 diffs)

SHX/trunk/src/SeismicHandler/core/shheaders.py

@@ -3 +3 @@
 # Copyright (C) 2008-2010 Marcus Walther (walther@szgrf.bgr.de)
 #
-# This file is part of Seismic Handler eXtended (SHX) 
+# This file is part of Seismic Handler eXtended (SHX)
 # Full details can be found at project website http://www.seismic-handler.org/
-# 
+#
 # SHX is free software; you can redistribute it and/or modify
 # it under the terms of the GNU LESSER GENERAL PUBLIC LICENSE as published by
@@ -53 +53 @@
               "char": 40,
               "time": 15,
-              "pointer": 8                          
+              "pointer": 8
 }
 
 class PARAM(C.Structure):
     """Command parameter structure
-    
+
     originally defined in cpusrdef.h as
 
@@ -64 +64 @@
     #define CPC_MAXQUAL  5
     #define CPC_LINELTH  2048
-    
+
     typedef struct param {
        int    pno;                            /* number of parameters */
@@ -85 +85 @@
 class TIME(C.Structure):
     """Time structure
-  
+
     originally defined in tcusrdef.h as
-    
+
     typedef struct timblc {
        unsigned long     hi;
        unsigned int      lo;
     } TIME;"""
-    
+
     _fields_ = [
         ("hi", C.c_ulong),

SHX/trunk/src/SeismicHandler/core/shlib.py

@@ -146 +146 @@
                "flag": "db_setf", # XXX 
                "pointer": "db_setp", # XXX not needed (still unchangeable)
-               "time": "db_sett", # XXX
+               "time": "db_sett",
                }
 
@@ -160 +160 @@
             value = vmap(value)
 
-        fct(trc, ientry, value, C.byref(status))
+        if dattype == "time":
+            fct(trc, ientry, C.byref(value), C.byref(status))
+        else:
+            fct(trc, ientry, value, C.byref(status))
 
         if status.value:

SHX/trunk/src/SeismicHandler/tests/test_commands.py

@@ -6 +6 @@
 from SeismicHandler.core.modules.Tools import convertFilename
 from SeismicHandler.core.commands import Run
+from SeismicHandler.core.shheaders import TIME
 
 import pickle
@@ -292 +293 @@
 #        self.traces[1].plot()
         self.checkTraceData(self.traces[1], cmpindex="fft")
-        
+
     def testFilter(self):
         Run("create spike 0.05 50 20 20")
         Run("fili f BP_2S_10HZ_4")
         Run("filter f 1")
-        
+
         self.checkTraceData(self.traces[1], cmpindex="filter", digits=5)
-    
+
     testFili = testFilter
-    
+
     def testFold(self):
-        Run("cresharp")        
-        Run("cresharp")
-        Run("fold 1 10 20 2")        
-        
+        Run("cresharp")
+        Run("cresharp")
+        Run("fold 1 10 20 2")
+
         self.checkTraceData(self.traces[2], cmpindex="fold", digits=5)
-        
+
     def testGoto(self):
         # This command is already replaced by python
         pass
-    
+
     def testHc(self):
         # This function is not useful in python context.
         pass
-    
+
     def testHelp(self):
         # This function is not useful in python context.
         pass
-    
+
     def testHide(self):
         # XXX Commands for visualisation are not tested yet.
         pass
-    
+
     def testIf(self):
         # This command is already replaced by python
         pass
-    
+
     def testInt(self):
         Run("cresharp")
         Run("int 1")
-        
+
         self.checkTraceData(self.traces[1], cmpindex="int", digits=5)
-        
+
     def testLocate(self):
-        # XXX not tested since it depends on AL command 
-        pass
-    
+        # XXX not tested since it depends on AL command
+        pass
+
     def testMark(self):
         # XXX Commands for visualisation are not tested yet.
         pass
-    
+
     def testMaxAmpl(self):
         Run("cresharp")
@@ -348 +349 @@
         Run("maxampl 1 35")
         self.checkTraceData(self.traces[0], cmpindex="maxampl", digits=5)
-        
+
     def testMaximum(self):
         Run("cresharp")
@@ -356 +357 @@
         self.checkTraceData(self.traces[2], cmpindex="maximum1")
         self.checkTraceData(self.traces[3], cmpindex="maximum2")
-        
-    def test2Mdir(self):
-        for i in range(3):
+
+    def testMdir(self):
+        for _ in range(3):
             Run("cresharp")
 
         Run("mirror 2")
-        
+
         Symbol.azi = 0.
         Symbol.inci = 0.
-        
+
         Run("mdir 1,2 10. 20. &azi")
         self.assertAlmostEqual(Symbol.azi, 6.271768)
-        
+
         Run("mdir 1-3 10. 20. &azi &inci")
         self.assertAlmostEqual(Symbol.azi, 263.763123, 4)
         self.assertAlmostEqual(Symbol.inci, 45.170059, 5)
-        
+
         Symbol.azi = None
-        Symbol.inci = None        
-        
+        Symbol.inci = None
+
+    def testMend(self):
+        Run("cresharp")
+        Run("mend 1 6 10 30")
+        self.checkTraceData(self.traces[0], cmpindex="mend")
+
+    def testMerge(self):
+        Run("cresharp")
+        Run("cresharp")
+
+        # shift trace #2 by 21 seconds
+        t = TIME()
+        t.hi = self.traces[1].start.hi + 21
+        t.lo = 0
+        self.traces[1].start = t
+
+        Run("merge 2 1")
+
+        self.checkTraceData(self.traces[2], cmpindex="merge")
+
+    def testMergePair(self):
+        # create three traces of which two are "mergeable" (identical source)
+        for _ in range(3):
+            Run("cresharp")
+
+        trc1 = self.traces.get(1)
+        trc2 = self.traces.get(2)
+        trc3 = self.traces.get(3)
+
+        trc1.comp = trc2.comp = trc3.comp = "Z"
+        trc1.station = trc3.station = "TST"
+        trc2.station = "TTT"
+        trc1.chan1 = trc2.chan1 = trc3.chan1 = "B"
+        trc1.chan2 = trc2.chan2 = trc3.chan2 = "H"
+
+        Symbol.one = 0
+        Symbol.two = 0
+
+        Run("merge_pair &one &two")
+
+        self.assertEqual(Symbol.one, 1)
+        self.assertEqual(Symbol.two, 3)
+
+    def testMirror(self):
+        Run("cresharp")
+        Run("mirror 1")
+
+        check = self.loadCompare("cresharp")[::-1]
+        self.checkTraceData(self.traces[0], cmp=check)
+
+    def testNorm(self):
+        # XXX Commands for visualisation are not tested yet.
+        pass
+
+    def testNr(self):
+        # XXX Commands for visualisation are not tested yet.
+        pass
+
+    def testOverlay(self):
+        # XXX Commands for visualisation are not tested yet.
+        pass
+
     def testPick(self):
         # read real world data (@ = don't convert case of this command)
@@ -381 +443 @@
         # create symbol
         Symbol.x = ""
-        
+
         Run("pick 1 0 200 &x")
         self.assertEqual(Symbol.x, " 2-NOV-2003_02:26:43.500")
-        
+
         # delete symbol
         Symbol.x = None
-    
+
+    def testPmch(self):
+        # XXX Commands for visualisation are not tested yet.
+        pass
+
+    def testPm(self):
+        # XXX Commands for visualisation are not tested yet.
+        pass
+
+    def testPolFil(self):
+        self.fail("no test case created")
+
+    def testQuit(self):
+        # no need to test this
+        pass
+
+    def testRd(self):
+        # XXX Commands for visualisation are not tested yet.
+        pass
+
+    def testRead(self):
+        Run("@READ %s 1" % convertFilename("data/cresharp"))
+        self.checkTraceData(self.traces[0], cmpindex="cresharp")
+
+    def testReada(self):
+        Run("@READA %s" % convertFilename("data/CRESHARP.asc"))
+        self.checkTraceData(self.traces[0], cmpindex="cresharp")
+
+        # I set a comment containing recipe how the trace was compiled.
+        self.assertEqual(self.traces[0].comment, "CRESHARP")
+
+    def testReadf(self):
+        # Just test for GSE2 format
+        Run("@READF/FMT=5 %s ALL" % convertFilename("data/GRF_031102_0225.GSE"))
+        self.assertEqual(int(System.tottrcs), 19)
+
+    def testReads(self):
+        self.fail("no test created yet!")
+
+    def testResample(self):
+        Run("cresharp")
+        Run("resample 1 .01")
+
+        # resample does not trigger redraw
+        EventManager.trigger(Event(EventManager.TRACEUPDATE))
+
+        self.assertAlmostEqual(self.traces[-1].delta, 0.01)
+        self.assertAlmostEqual(self.traces[-1].length, 5000)
+        self.assertAlmostEqual(self.traces[-1].alloc, 5000)
+
+    def testReturn(self):
+        # This function is not useful in python context.
+        pass
+
+    def testRms(self):
+        Run("cresharp")
+        Symbol.rms = 0.
+        Run("rms 1 ;;; &rms")
+
+        self.assertAlmostEqual(Symbol.rms, 0.2942311)
+
+        Symbol.rms = None
+
+    def testRot(self):
+        Run("cresharp")
+        Run("cresharp")
+        Run("rot 1,2 45")
+
+        # Trace 3 now contains only zeros, while trace 4 holds all energy.
+        self.checkTraceData(self.traces[2], cmp=[0.]*self.traces[-2].length)
+        self.checkTraceData(self.traces[3], cmpindex="rot", digits=6)
+
+    def testSdef(self):
+        # This function is not useful in python context.
+        pass
+
+    def testSdel(self):
+        # This function is not useful in python context.
+        pass
+
+    def testSet(self):
+        # This function is not useful in python context.
+        pass
+
+    def testShift(self):
+        # XXX Commands for visualisation are not tested yet.
+        pass
+
+    def testSpecDiv(self):
+        self.fail("no test created!")
+
+    def testSpectrogram(self):
+        import tempfile
+        tmp = tempfile.mktemp()
+        del tempfile
+
+        Run("cresharp")
+        Run("@SPECTROGRAM 1 ;;; 128 2 %s" % convertFilename(tmp))
+
+        self.assertEqual(open(tmp).readlines(), open("data/spectrogram.out").readlines())
+
+        os.remove(tmp)
+
+    def testSpectrum(self):
+        self.fail("no test created!")
+
     def testSum(self):
         # this test fails for some reason
@@ -399 +566 @@
 
         # create 2 identical synthetics with "seconds" length, 1/"delta" Hz
-        for i in xrange(2):
+        for _ in xrange(2):
             Run("CREATE SHARP %.2f %u 1. 15. .1 .5" % (delta, seconds))