[bugfix] pick times are absolute times, thus for plotting the start time has to be subtracted
This commit is contained in:
		
							parent
							
								
									641cb498f0
								
							
						
					
					
						commit
						d79165a9f2
					
				
							
								
								
									
										10
									
								
								QtPyLoT.py
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								QtPyLoT.py
									
									
									
									
									
								
							| @ -45,7 +45,7 @@ from pylot.core.util.defaults import FILTERDEFAULTS | ||||
| from pylot.core.util.errors import FormatError, DatastructureError | ||||
| from pylot.core.util.connection import checkurl | ||||
| from pylot.core.util.utils import fnConstructor, createEvent, getLogin,\ | ||||
|     createCreationInfo | ||||
|     createCreationInfo, getGlobalTimes | ||||
| from pylot.core.util.widgets import FilterOptionsDialog, NewEventDlg,\ | ||||
|     MPLWidget, PropertiesDlg, HelpForm, createAction, PickDlg | ||||
| from pylot.core.util.structure import DATASTRUCTURE | ||||
| @ -659,9 +659,11 @@ class MainWindow(QMainWindow): | ||||
|             picks = stat_picks[phase] | ||||
|             colors = phase_col[phase[0].upper()] | ||||
| 
 | ||||
|             mpp = picks['mpp'] | ||||
|             epp = picks['epp'] | ||||
|             lpp = picks['lpp'] | ||||
|             stime = getGlobalTimes(self.getData().getWFData())[0] | ||||
| 
 | ||||
|             mpp = picks['mpp'] - stime | ||||
|             epp = picks['epp'] - stime | ||||
|             lpp = picks['lpp'] - stime | ||||
|             spe = picks['spe'] | ||||
| 
 | ||||
|             ax.fill_between([epp, lpp], ylims[0], ylims[1], | ||||
|  | ||||
| @ -455,8 +455,9 @@ class PickDlg(QDialog): | ||||
|         x_res = getResolutionWindow(snr) | ||||
| 
 | ||||
|         # remove mean noise level from waveforms | ||||
|         wfdata = self.getWFData().copy() | ||||
|         for trace in wfdata: | ||||
|             t = prepTimeAxis(self.getStartTime(), trace) | ||||
|             t = prepTimeAxis(trace.stats.starttime - self.getStartTime(), trace) | ||||
|             inoise = getnoisewin(t, ini_pick, noise_win, gap_win) | ||||
|             trace = demeanTrace(trace=trace, window=inoise) | ||||
| 
 | ||||
| @ -494,7 +495,7 @@ class PickDlg(QDialog): | ||||
|         data.filter(**filteroptions) | ||||
| 
 | ||||
|         for trace in data: | ||||
|             t = prepTimeAxis(self.getStartTime(), trace) | ||||
|             t = prepTimeAxis(trace.stats.starttime - self.getStartTime(), trace) | ||||
|             inoise = getnoisewin(t, ini_pick, noise_win, gap_win) | ||||
|             trace = demeanTrace(trace, inoise) | ||||
| 
 | ||||
| @ -530,14 +531,20 @@ class PickDlg(QDialog): | ||||
|         channel = self.getChannelID(round(gui_event.ydata)) | ||||
| 
 | ||||
|         wfdata = self.getWFData().copy().select(channel=channel) | ||||
|         stime = self.getStartTime() | ||||
|         # get earliest and latest possible pick and symmetric pick error | ||||
|         [epp, lpp, spe] = earllatepicker(wfdata, 1.5, (5., .5, 2.), pick) | ||||
| 
 | ||||
|         # get name of phase actually picked | ||||
|         phase = self.selectPhase.currentText() | ||||
| 
 | ||||
|         # return absolute time values for phases | ||||
|         epp = stime + epp | ||||
|         mpp = stime + pick | ||||
|         lpp = stime + lpp | ||||
| 
 | ||||
|         # save pick times for actual phase | ||||
|         phasepicks = {'epp': epp, 'lpp': lpp, 'mpp': pick, 'spe': spe} | ||||
|         phasepicks = {'epp': epp, 'lpp': lpp, 'mpp': mpp, 'spe': spe} | ||||
| 
 | ||||
|         try: | ||||
|             oldphasepick = self.picks[phase] | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user