Changeset 142

Timestamp:

08/19/2009 06:29:41 PM (14 years ago)

Author:

marcus

Message:

• Trace update
• test for "sum" issue (resulting trace never has a length greater than 100 seconds)

Location:

SHX/trunk/src/SeismicHandler

Files:

• core/modules/Trace.py (modified) (7 diffs)
• tests/test_traces.py (modified) (3 diffs)

SHX/trunk/src/SeismicHandler/core/modules/Trace.py

@@ -60 +60 @@
 
     def __len__(self):
-        return self.delta * self.length 
-    
+        """return length of trace in milliseconds"""
+        
+        return self.delta * self.length * 1000
+
     def __getattr__(self, name):
         """allow access to trace metadata by querying as attribute
@@ -125 +127 @@
             return False
 
-        self.logger.info("updating from memory block, trace id %s" % self.id)
+        self.logger.info("updating from memory block, trace id %s, address %u" % (self.id, self.address))
 
         mb = kwargs.get("memblc")
@@ -180 +182 @@
     traces = []
     tracedata = {}
+    progress = 0
 
     def __init__(self):
@@ -188 +191 @@
 
     def __getitem__(self, number):
-        return self.tracedata[self.traces[number]]
+        return self.tracedata[self.traces[number-1]]
 
     def update(self, event=None):
+        if self.progress:
+            self.logger.debug("update already running, skip!")
+        else:
+            self.progress = 1
+
         # refresh root pointer
         slib = self.sh
@@ -209 +217 @@
 
         addresses = []
-        old_addresses = self.traces
+        # save copy(!) of already known addresses
+        old_addresses = self.traces[:]
 
         p = root.pm[0]
@@ -230 +239 @@
 
         for addr in gone:
-            # clean up
-            self.tracedata[addr].delete()
-            # delete reference
-            del self.tracedata[addr]
+            # may we get a trigger for a already deleted traces
+            try:
+                # clean up
+                self.tracedata[addr].delete()
+                # delete reference
+                del self.tracedata[addr]
+            except KeyError:
+                pass
+
             del self.traces[self.traces.index(addr)]
+
+        self.progress = 0
 
         self.logger.debug("new traces: %s" % new)
@@ -250 +266 @@
     # create 2 hours of synthetic data (100 Hz)
     # position set by counter
-    for i in range(2):
+    for i in range(5):
         Run("CREATE SHARP 0.05 100 1. %u .1 .5" % (10+i*6))
 #        Run("create sharp 0.1 7200 1 %u 0.005 .05" % 5**(i+1))

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

@@ -12 +12 @@
         Run("cresharp")
         self.traces = Traces()
-        self.trace = self.traces[0]
+        # count starts from one!
+        self.trace = self.traces[1]
 
     def tearDown(self):
@@ -164 +165 @@
 
     def testInfoEntriesPyChars(self):
-        # set values via python - only one (e.g. comp missing => defaults to 
+        # set values via python - only one (e.g. comp missing => defaults to
         # null byte character
         self.trace.chan1 = "E"
@@ -190 +191 @@
             self.fail("non existing failure")
 
+    def testSumCommand(self):
+        # this test fails for some reason
+        # the summed trace has *never* a length greater 100 seconds
+        
+        EventManager.block(Event(EventManager.REDRAW))
+        
+        seconds, delta = 110., 0.01
+        
+        Run("del 1")
+        # create 2 identical synthetics with "seconds" length, 1/"delta" Hz 
+        for i in xrange(2):
+            Run("CREATE SHARP %.2f %u 1. 15. .1 .5" % (delta, seconds))
+            
+        Run("sum all")
+        
+#        Run("fili f BP_2S_10HZ_4")
+#        Run("filter f 1")
+            
+        EventManager.unblock(Event(EventManager.REDRAW))
+        
+        for i in range(len(self.traces)):
+            print i
+            trc = self.traces[i+1]
+            self.assertAlmostEqual(trc.delta, delta, 6)
+            self.assertEqual(trc.length, seconds/delta)
+            self.assertAlmostEqual(len(trc)/1000., seconds, 1)
+             
 def suite():
     return unittest.makeSuite(eventsTestCase, 'test')