Merge branch 'develop' of https://git.geophysik.ruhr-uni-bochum.de/marcel/pylot into develop

pylot/core/analysis/magnitude.py

@@ -221,15 +221,15 @@ class LocalMagnitude(Magnitude):
 
         power = [np.power(tr.data, 2) for tr in st if tr.stats.channel[-1] not
                  in 'Z3']
-	# checking horizontal count and calculating power_sum accordingly
-	if len(power) == 1:
-		print ('WARNING: Only one horizontal found for station {0}.'.format(st[0].stats.station))
-		power_sum = power[0]
-	elif len(power) == 2:
-		power_sum = power[0] + power[1]
-	else: 
-		raise ValueError('Wood-Anderson aomplitude defintion only valid for'
-			' up to two horizontals: {0} given'.format(len(power)))
+        # checking horizontal count and calculating power_sum accordingly
+        if len(power) == 1:
+                print ('WARNING: Only one horizontal found for station {0}.'.format(st[0].stats.station))
+                power_sum = power[0]
+        elif len(power) == 2:
+                power_sum = power[0] + power[1]
+        else: 
+                raise ValueError('Wood-Anderson aomplitude defintion only valid for'
+                        ' up to two horizontals: {0} given'.format(len(power)))
  
         sqH = np.sqrt(power_sum)
 

pylot/core/io/data.py

@@ -275,7 +275,7 @@ class Data(object):
         # check for already existing xml-file
         if fnext == '.xml':
             if os.path.isfile(fnout + fnext):
-            	print("xml-file already exists! Check content ...")
+                print("xml-file already exists! Check content ...")
                 cat = read_events(fnout + fnext)
                 if len(cat) > 1:
                     raise IOError('Ambigious event information in file {}'.format(fnout + fnext))
@@ -287,7 +287,7 @@ class Data(object):
                     return
                 self.checkEvent(event, fcheck)
                 self.setEvtData(event)
-		
+                
             self.get_evt_data().write(fnout + fnext, format=evtformat)
 
         # try exporting event

pylot/core/io/phases.py

@@ -805,7 +805,7 @@ def writephases(arrivals, fformat, filename, parameter=None, eventinfo=None):
             return
         stime = eventsource['time']
         event = parameter.get('eventID')
-	hddID = event.split('.')[0][1:5]	
+        hddID = event.split('.')[0][1:5]        
         # write header
         fid.write('# %d  %d %d %d %d %5.2f %7.4f +%6.4f %7.4f %4.2f 0.1 0.5 %4.2f      %s\n' % (
             stime.year, stime.month, stime.day, stime.hour, stime.minute, stime.second,