From 5057664b1dae8452cbcd118e9cfcaafc00d1bf1e Mon Sep 17 00:00:00 2001
From: Marcel Paffrath <marcel.paffrath@rub.de>
Date: Wed, 25 May 2016 14:24:19 +0200
Subject: [PATCH] code changes for parallelization

---
 pylot/core/active/activeSeismoPick.py | 29 +++++++++++++++++----------
 pylot/core/active/seismicshot.py      |  2 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pylot/core/active/activeSeismoPick.py b/pylot/core/active/activeSeismoPick.py
index 3cd098b5..aec7e19f 100644
--- a/pylot/core/active/activeSeismoPick.py
+++ b/pylot/core/active/activeSeismoPick.py
@@ -9,6 +9,12 @@ from pylot.core.util.utils import worker, _pickle_method
 
 copy_reg.pickle(types.MethodType, _pickle_method)
 
+def ppick(shot):
+    picks = []
+    for traceID in shot.getTraceIDlist():
+        picks.append((shot.getShotnumber(), traceID, shot.pickTrace(traceID)))
+    return picks
+
 class Survey(object):
     def __init__(self, path, sourcefile, receiverfile, useDefaultParas=False):
         '''
@@ -200,11 +206,11 @@ class Survey(object):
         plt.xlabel('Difference in time (auto - manual) [s]')
         return diffs
 
-    def pickShot(self, shTr):
-        shotnumber, traceID = shTr
-        shot = self.getShotForShotnumber(shotnumber)
-        traceID, pick = shot.pickTrace(traceID)
-        return shotnumber, traceID, pick
+    # def pickShot(self, shTr):
+    #     shotnumber, traceID = shTr
+    #     shot = self.getShotForShotnumber(shotnumber)
+    #     traceID, pick = shot.pickTrace(traceID)
+    #     return shotnumber, traceID, pick
 
     def pickAllShots(self, vmin=333, vmax=5500, folm=0.6, HosAic='hos',
                      aicwindow=(10, 0)):
@@ -228,7 +234,7 @@ class Survey(object):
         count = 0
         tpicksum = starttime - starttime
 
-        shTr = []
+        shotlist = []
 
         for shot in self.data.values():
             tstartpick = datetime.now()
@@ -237,13 +243,14 @@ class Survey(object):
             count += 1
             #shot.pickParallel(folm)
             shot.setPickParameters(folm = folm, method = HosAic, aicwindow = aicwindow)
-            for traceID in shot.getTraceIDlist():
-                shTr.append((shot.getShotnumber(), traceID))
+            shotlist.append(shot)
 
-        picks = worker(self.pickShot, shTr, async = True)
+        picks = worker(ppick, shotlist, cores = 16)
 
-        for shotnumber, traceID, pick in picks.get():
-            self.getShotForShotnumber(shotnumber).setPick(traceID, pick)
+        for item in picks:
+            for it in item:
+                shotnumber, traceID, pick = it
+                self.getShotForShotnumber(shotnumber).setPick(traceID, pick)
             
             # tpicksum += (datetime.now() - tstartpick);
             # tpick = tpicksum / count
diff --git a/pylot/core/active/seismicshot.py b/pylot/core/active/seismicshot.py
index cbf1deb8..27470fe0 100644
--- a/pylot/core/active/seismicshot.py
+++ b/pylot/core/active/seismicshot.py
@@ -383,7 +383,7 @@ class SeismicShot(object):
         setHosAic = {'hos': hoscftime,
                      'aic': aiccftime}
 
-        return traceID, setHosAic[self.getMethod()]
+        return setHosAic[self.getMethod()]
 
     def setEarllatepick(self, traceID, nfac=1.5):
         tgap = self.getTgap()