Re-initialized autoPyLoT from GUI, new input parameter eventid to make sure processing the right event. Buggy!

QtPyLoT.py

@@ -1311,11 +1311,13 @@ class MainWindow(QMainWindow):
                                                              % self.infile)
         autopick_parameter = self._inputs
         self.addListItem(str(autopick_parameter))
-
+        ep = self.get_current_event_path().split('/')
+        eventid = ep[len(ep) - 1]
         self.thread = AutoPickThread(parent=self,
                                      func=autoPyLoT,
                                      infile = self.infile, 
                                      fnames=self.fnames,
+                                     eventid=eventid,
                                      savepath=self.autosave)
 
         self.thread.message.connect(self.addListItem)

autoPyLoT.py

@@ -29,7 +29,7 @@ from pylot.core.util.version import get_git_version as _getVersionString
 __version__ = _getVersionString()
 
 
-def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, savepath=None, station='all', iplot=0):
+def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, eventid=None, savepath=None, station='all', iplot=0):
     """
     Determine phase onsets automatically utilizing the automatic picking
     algorithms by Kueperkoch et al. 2010/2012.
@@ -141,7 +141,10 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, save
             events = glob.glob(os.path.join(datapath, parameter.get('eventID')))
         else:
             # autoPyLoT was initialized from GUI
-            events = fnames
+            events = eventid
+            event = eventid
+            evID = eventid
+            locflag = 2
 
         for event in events:
             if fnames == 'None':
@@ -164,12 +167,12 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, save
                 data.setWFData(fnames)
                 event = savepath
                 now = datetime.datetime.now()
-                evID = '%d%02d%02d%02d%02d' % (now.year,
-                                               now.month,
-                                               now.day,
-                                               now.hour,
-                                               now.minute)
-                parameter.setParam(eventID=evID)
+                #evID = '%d%02d%02d%02d%02d' % (now.year,
+                #                               now.month,
+                #                               now.day,
+                #                               now.hour,
+                #                               now.minute)
+                parameter.setParam(eventID=eventid)
             wfdat = data.getWFData()  # all available streams
             if not station == 'all':
                 wfdat = wfdat.select(station=station)
@@ -192,7 +195,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, save
                 picks = autopickevent(wfdat, parameter, iplot=iplot)
             ##########################################################
             # locating
-            if locflag == 1:
+            if locflag > 0:
                 # write phases to NLLoc-phase file
                 nll.export(picks, phasefile, parameter)
 
@@ -282,6 +285,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, save
                                 print("autoPyLoT: No more bad onsets found, stop iterative picking!")
                                 nlloccounter = maxnumit
                         evt = read_events(nllocfile)[0]
+                        if locflag < 2:
                             # calculating seismic moment Mo and moment magnitude Mw
                             moment_mag = MomentMagnitude(corr_dat, evt, parameter.get('vp'),
                                                          parameter.get('Qp'),
@@ -361,6 +365,9 @@ if __name__ == "__main__":
     parser.add_argument('-f', '-F', '--fnames', type=str,
                         action='store',
                         help='''optional, list of data file names''')
+    parser.add_argument('-e', '-E', '--eventid', type=str,
+                        action='store',
+                        help='''optional, event ID''')
     # parser.add_argument('-p', '-P', '--plot', action='store',
     #                     help='show interactive plots')
     parser.add_argument('-s', '-S', '--spath', type=str,
@@ -373,4 +380,5 @@ if __name__ == "__main__":
     cla = parser.parse_args()
 
     picks, mainFig = autoPyLoT(inputfile=str(cla.inputfile),
-                               fnames=str(cla.fnames), savepath=str(cla.spath))
+                               fnames=str(cla.fnames), eventid=str(cla.eventid), 
+                               savepath=str(cla.spath))

pylot/RELEASE-VERSION

@@ -1 +1 @@
-cf971-dirty
+e911-dirty

pylot/core/util/thread.py

@@ -8,18 +8,19 @@ class AutoPickThread(QThread):
     message = Signal(str)
     finished = Signal()
 
-    def __init__(self, parent, func, infile, fnames, savepath):
+    def __init__(self, parent, func, infile, fnames, eventid, savepath):
         super(AutoPickThread, self).__init__()
         self.setParent(parent)
         self.func = func
         self.infile = infile
         self.fnames = fnames
+        self.eventid = eventid
         self.savepath = savepath
 
     def run(self):
         sys.stdout = self
 
-        picks = self.func(self.infile, self.fnames, self.savepath)
+        picks = self.func(None, None, self.infile, self.fnames, self.eventid, self.savepath)
 
         print("Autopicking finished!\n")