Compare commits
	
		
			4 Commits
		
	
	
		
			486e3dc9c3
			...
			3069e7d526
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3069e7d526 | |||
| a9aeb7aaa3 | |||
| b9adb182ad | |||
| a823eb2440 | 
| @ -280,6 +280,7 @@ def picksdict_from_picks(evt): | |||||||
|             infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in') |             infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in') | ||||||
|             print('Using default input file {}'.format(infile)) |             print('Using default input file {}'.format(infile)) | ||||||
|             parameter = PylotParameter(infile) |             parameter = PylotParameter(infile) | ||||||
|  |             pick.phase_hint = identifyPhase(pick.phase_hint) | ||||||
|             if pick.phase_hint == 'P': |             if pick.phase_hint == 'P': | ||||||
|                 errors = parameter['timeerrorsP'] |                 errors = parameter['timeerrorsP'] | ||||||
|             elif pick.phase_hint == 'S': |             elif pick.phase_hint == 'S': | ||||||
|  | |||||||
| @ -336,7 +336,7 @@ class AICPicker(AutoPicker): | |||||||
|                     self.slope = 1 / (len(dataslope) * self.Data[0].stats.delta) * (datafit[-1] - datafit[0]) |                     self.slope = 1 / (len(dataslope) * self.Data[0].stats.delta) * (datafit[-1] - datafit[0]) | ||||||
|                     # normalize slope to maximum of cf to make it unit independent |                     # normalize slope to maximum of cf to make it unit independent | ||||||
|                     self.slope /= aicsmooth[iaicmax] |                     self.slope /= aicsmooth[iaicmax] | ||||||
|             except ValueError as e: |             except Exception as e: | ||||||
|                 print("AICPicker: Problems with data fitting! {}".format(e)) |                 print("AICPicker: Problems with data fitting! {}".format(e)) | ||||||
| 
 | 
 | ||||||
|         else: |         else: | ||||||
|  | |||||||
| @ -275,7 +275,7 @@ def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=0, fig=None, linecolor='k'): | |||||||
|             try: |             try: | ||||||
|                 P1 = np.polyfit(xslope1, xraw[islope1], 1) |                 P1 = np.polyfit(xslope1, xraw[islope1], 1) | ||||||
|                 datafit1 = np.polyval(P1, xslope1) |                 datafit1 = np.polyval(P1, xslope1) | ||||||
|             except ValueError as e: |             except Exception as e: | ||||||
|                 print("fmpicker: Problems with data fit! {}".format(e)) |                 print("fmpicker: Problems with data fit! {}".format(e)) | ||||||
|                 print("Skip first motion determination!") |                 print("Skip first motion determination!") | ||||||
|                 return FM |                 return FM | ||||||
| @ -321,7 +321,7 @@ def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=0, fig=None, linecolor='k'): | |||||||
|             try: |             try: | ||||||
|                 P2 = np.polyfit(xslope2, xfilt[islope2], 1) |                 P2 = np.polyfit(xslope2, xfilt[islope2], 1) | ||||||
|                 datafit2 = np.polyval(P2, xslope2) |                 datafit2 = np.polyval(P2, xslope2) | ||||||
|             except ValueError as e: |             except Exception as e: | ||||||
|                 emsg = 'fmpicker: polyfit failed: {}'.format(e) |                 emsg = 'fmpicker: polyfit failed: {}'.format(e) | ||||||
|                 print(emsg) |                 print(emsg) | ||||||
|                 return FM |                 return FM | ||||||
|  | |||||||
| @ -271,7 +271,7 @@ class Metadata(object): | |||||||
|                     continue |                     continue | ||||||
|             invtype, robj = self._read_metadata_file(os.path.join(path_to_inventory, fname)) |             invtype, robj = self._read_metadata_file(os.path.join(path_to_inventory, fname)) | ||||||
|             try: |             try: | ||||||
|                 robj.get_coordinates(station_seed_id) |                 # robj.get_coordinates(station_seed_id)  # TODO: Commented out, failed with Parser, is this needed? | ||||||
|                 self.inventory_files[fname] = {'invtype': invtype, |                 self.inventory_files[fname] = {'invtype': invtype, | ||||||
|                                                'data': robj} |                                                'data': robj} | ||||||
|                 if station_seed_id in self.seed_ids.keys(): |                 if station_seed_id in self.seed_ids.keys(): | ||||||
|  | |||||||
| @ -3611,14 +3611,14 @@ class TuneAutopicker(QWidget): | |||||||
|         self.listWidget.scrollToBottom() |         self.listWidget.scrollToBottom() | ||||||
| 
 | 
 | ||||||
|     def get_current_event(self): |     def get_current_event(self): | ||||||
|         path = self.eventBox.currentText() |         path = self.get_current_event_fp() | ||||||
|         return self.parent().project.getEventFromPath(path) |         return self.parent().project.getEventFromPath(path) | ||||||
| 
 | 
 | ||||||
|     def get_current_event_name(self): |     def get_current_event_name(self): | ||||||
|         return self.eventBox.currentText().split('/')[-1].split('*')[0] |         return self.eventBox.currentText().split('/')[-1].rstrip('*') | ||||||
| 
 | 
 | ||||||
|     def get_current_event_fp(self): |     def get_current_event_fp(self): | ||||||
|         return self.eventBox.currentText().split('*')[0] |         return self.eventBox.currentText().rstrip('*') | ||||||
| 
 | 
 | ||||||
|     def get_current_event_picks(self, station): |     def get_current_event_picks(self, station): | ||||||
|         event = self.get_current_event() |         event = self.get_current_event() | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user