Changeset 1191 for SHX


Ignore:
Timestamp:
14.04.2016 21:09:56 (3 years ago)
Author:
klaus
Message:

changes due to new obspy version

Location:
SHX/trunk/SeismicHandler
Files:
37 edited

Legend:

Unmodified
Added
Removed
  • SHX/trunk/SeismicHandler/basics/analysispar.py

    r1188 r1191  
    1515from SeismicHandler.basics.error import ShxError 
    1616from obspy.core import UTCDateTime 
    17 try: 
    18     # older obspy version 
    19     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    20 except: 
    21     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    22     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     17from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     18from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    2319 
    2420PICKTYPE_MANUAL = 1 
  • SHX/trunk/SeismicHandler/basics/tools.py

    r1185 r1191  
    77import time 
    88from obspy.core import AttribDict, UTCDateTime 
    9 try: 
    10     # older obspy version 
    11     from obspy.sh.core import toUTCDateTime 
    12 except: 
    13     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     9from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    1410 
    1511__all__ = ["Property", "Singleton","timeit","timestore"] 
  • SHX/trunk/SeismicHandler/commands/al.py

    r1185 r1191  
    1010from SeismicHandler.basics import timeit 
    1111from SeismicHandler.modules.traces import traces_from_list 
    12 try: 
    13     # older obspy version 
    14     from obspy.sh.core import toUTCDateTime 
    15 except: 
    16     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     12from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    1713 
    1814provides = {"al": "al"} 
  • SHX/trunk/SeismicHandler/commands/calc.py

    r1185 r1191  
    2222from SeismicHandler.utils import formatstring 
    2323from obspy.core import UTCDateTime 
    24 try: 
    25     # older obspy version 
    26     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    27 except: 
    28     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    29     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     24from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     25from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    3026 
    3127provides = {"calc": "calc"} 
  • SHX/trunk/SeismicHandler/commands/call.py

    r1185 r1191  
    1212from SeismicHandler.basics import timeit 
    1313from SeismicHandler.modules.traveltime import LocalTravelTime, TaupiTravelTime 
    14 from obspy.core.util.geodetics import gps2DistAzimuth 
    15 try: 
    16     # older obspy version 
    17     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    18 except: 
    19     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    20     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     14from obspy.geodetics import gps2dist_azimuth 
     15from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     16from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    2117 
    2218DEG_TO_KM = 111.19 
     
    189185            except: 
    190186                raise ShxError( "Cannot parse lat,lon pairs" ) 
    191             dist, az, baz = gps2DistAzimuth( elat, elon, slat, slon ) 
     187            dist, az, baz = gps2dist_azimuth( elat, elon, slat, slon ) 
    192188            dist /= (1000.*DEG_TO_KM) 
    193189            distvar = self.parameters[5][1:] 
  • SHX/trunk/SeismicHandler/commands/compare_location.py

    r1185 r1191  
    99from SeismicHandler.modules.seismics import locateTeleEvent, compareLocation 
    1010from SeismicHandler.config import Settings 
    11 try: 
    12     # older obspy version 
    13     from obspy.sh.core import toUTCDateTime 
    14 except: 
    15     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     11from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    1612 
    1713 
  • SHX/trunk/SeismicHandler/commands/events.py

    r1185 r1191  
    99from SeismicHandler.basics.error import ShxError 
    1010from SeismicHandler.config import Settings 
    11 from obspy.fdsn.client import Client 
     11from obspy.clients.fdsn.client import Client 
    1212from obspy.core import UTCDateTime 
    13 from obspy.core.util.geodetics import gps2DistAzimuth 
     13from obspy.geodetics import gps2dist_azimuth 
    1414from obspy.taup import TauPyModel 
    15 try: 
    16     # older obspy version 
    17     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    18 except: 
    19     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    20     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     15from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     16from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    2117 
    2218DEG_TO_KM = 111.19 
     
    211207            offtime = orig.time - offset 
    212208            if refphase: 
    213                 dist, az, baz = gps2DistAzimuth( orig.latitude, orig.longitude, 
     209                dist, az, baz = gps2dist_azimuth( orig.latitude, orig.longitude, 
    214210                    reflat, reflon ) 
    215211                dist /= (1000.*DEG_TO_KM) 
  • SHX/trunk/SeismicHandler/commands/fdsnws.py

    r1185 r1191  
    1616    resolveStations 
    1717from obspy.core import UTCDateTime 
    18 from obspy.fdsn.client import Client 
    19 try: 
    20     # older obspy version 
    21     from obspy.sh.core import toUTCDateTime 
    22 except: 
    23     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     18from obspy.clients.fdsn.client import Client 
     19from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    2420 
    2521provides = {"fdsnws": "fdsnws"} 
  • SHX/trunk/SeismicHandler/commands/fetch.py

    r1185 r1191  
    1515                                                                       Stations 
    1616from obspy.core import Stream 
    17 from obspy.arclink.client import Client 
    18 try: 
    19     # older obspy version 
    20     from obspy.sh.core import toUTCDateTime 
    21 except: 
    22     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     17from obspy.clients.arclink.client import Client 
     18from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    2319 
    2420 
  • SHX/trunk/SeismicHandler/commands/fetch_area.py

    r1185 r1191  
    1717                                                                       Stations 
    1818from obspy.core import Stream, UTCDateTime 
    19 from obspy.arclink.client import Client 
    20 try: 
    21     # older obspy version 
    22     from obspy.sh.core import toUTCDateTime 
    23 except: 
    24     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     19from obspy.clients.arclink.client import Client 
     20from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    2521 
    2622import fetch 
  • SHX/trunk/SeismicHandler/commands/findgap.py

    r1172 r1191  
    1111from SeismicHandler.basics import timeit 
    1212from SeismicHandler.modules.traces import traces_from_list 
    13 from obspy.sh.core import fromUTCDateTime 
     13from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    1414 
    1515 
  • SHX/trunk/SeismicHandler/commands/fit_depth.py

    r1170 r1191  
    88from SeismicHandler.basics.command import BaseCommand 
    99from SeismicHandler.modules.seismics import determineDepthFromDepthPhases 
    10 from obspy.sh.core import fromUTCDateTime 
     10from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    1111 
    1212 
  • SHX/trunk/SeismicHandler/commands/flinn_engdahl.py

    r1170 r1191  
    88from SeismicHandler.basics.command import BaseCommand 
    99from SeismicHandler.modules.seismics import determineDepthFromDepthPhases 
    10 from obspy.core.util.geodetics.flinnengdahl import FlinnEngdahl 
     10from obspy.geodetics.flinnengdahl import FlinnEngdahl 
    1111 
    1212provides = {"flinn_engdahl": "flinn_engdahl"} 
  • SHX/trunk/SeismicHandler/commands/locate.py

    r1171 r1191  
    1010from SeismicHandler.basics.analysispar import AnalysisPar 
    1111from SeismicHandler.basics.messages import ui_event 
    12 from obspy.sh.core import fromUTCDateTime 
     12from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    1313 
    1414provides = {"locate": "locate"} 
  • SHX/trunk/SeismicHandler/commands/locate_tele.py

    r1169 r1191  
    88from SeismicHandler.basics.command import BaseCommand 
    99from SeismicHandler.modules.seismics import locateTeleEvent 
    10 from obspy.sh.core import fromUTCDateTime 
     10from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    1111 
    1212 
  • SHX/trunk/SeismicHandler/commands/magnitude.py

    r1186 r1191  
    1717from SeismicHandler.modules.traces import traces_from_list, getDistance 
    1818import matplotlib.pyplot as plt 
    19 try: 
    20     # older obspy version 
    21     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    22 except: 
    23     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    24     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     19from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     20from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    2521 
    2622DEG_TO_KM = 111.19 
  • SHX/trunk/SeismicHandler/commands/mark.py

    r1185 r1191  
    1111from SeismicHandler.basics import timeit 
    1212from SeismicHandler.modules.traces import addNetcode 
    13 try: 
    14     # older obspy version 
    15     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    16 except: 
    17     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    18     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     13from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     14from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    1915 
    2016provides = {"mark": "mark"} 
  • SHX/trunk/SeismicHandler/commands/meta.py

    r1182 r1191  
    1515from SeismicHandler.basics import timeit 
    1616from SeismicHandler.basics.error import ShxError 
    17 from obspy.fdsn.client import Client 
     17from obspy.clients.fdsn.client import Client 
    1818 
    1919provides = {"meta": "meta"} 
  • SHX/trunk/SeismicHandler/commands/param.py

    r1172 r1191  
    1010from SeismicHandler.basics.messages import ui_event 
    1111from SeismicHandler.modules.traces import traces_from_list 
    12 from obspy.sh.core import fromUTCDateTime 
     12from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    1313 
    1414provides = {"param": "param"} 
  • SHX/trunk/SeismicHandler/commands/phase.py

    r1187 r1191  
    1616    getDistance 
    1717from SeismicHandler.config import Settings 
    18 try: 
    19     # older obspy version 
    20     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    21 except: 
    22     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    23     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     18from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     19from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    2420 
    2521DEG_TO_KM = 111.19 
  • SHX/trunk/SeismicHandler/commands/pick.py

    r1172 r1191  
    1414from SeismicHandler.lib.headers import shc 
    1515from obspy.core import Stream 
    16 from obspy.sh.core import fromUTCDateTime 
     16from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    1717 
    1818 
  • SHX/trunk/SeismicHandler/commands/psd.py

    r1172 r1191  
    7474                start, end = map(float, self.parameters[1:3]) 
    7575        except ValueError: 
    76             raise ShxError("float conversion error", status=1108) 
     76            #raise ShxError("float conversion error", status=1108) 
     77            start, end = Screen.timewdw() 
    7778        try: 
    7879            nfft = int( self.parameters[3] ) 
  • SHX/trunk/SeismicHandler/commands/readl.py

    r1185 r1191  
    1212from SeismicHandler.modules.stations import Stations, resolveStations 
    1313from SeismicHandler.basics.messages import msgs 
    14 try: 
    15     # older obspy version 
    16     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    17 except: 
    18     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    19     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     14from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     15from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    2016 
    2117provides = {"readl": "readl"} 
  • SHX/trunk/SeismicHandler/commands/reads.py

    r1185 r1191  
    1313from SeismicHandler.config import Settings 
    1414from obspy.core import read 
    15 try: 
    16     # older obspy version 
    17     from obspy.sh.core import toUTCDateTime 
    18 except: 
    19     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     15from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    2016 
    2117 
  • SHX/trunk/SeismicHandler/commands/spectrogram.py

    r1172 r1191  
    6969 
    7070     * <lo-t>, <hi-t> ''parameter type: real''[[BR]] 
    71        Time window on input trace. If not specified the current display window is used. If <lo-t> is an astrisk ("*") you can select the window by graphic cursor. 
     71       Time window on input trace. If not specified the current display window 
     72       is used. If <lo-t> is an astrisk ("*") you can select the window by 
     73       graphic cursor. 
    7274 
    7375     * <spgwidth> ''parameter type: integer''[[BR]] 
    74        Width of an FFT window in samples. Must be a power of 2. Is number N in above description. 
     76       Width of an FFT window in samples. Must be a power of 2. Is number N in 
     77       above description. 
    7578 
    7679     * <spgstep> ''parameter type: integer''[[BR]] 
     
    132135                start, end = map(float, self.parameters[1:3]) 
    133136        except ValueError: 
    134             raise ShxError("float conversion error", status=1108) 
     137            start, end = Screen.timewdw() 
    135138        try: 
    136139            nfft = int( self.parameters[3] ) 
     
    152155        if self.qualifiers["SHOW"]: 
    153156            show = True 
    154          
     157                 
    155158        if nfft == None: 
    156             wlen = None 
     159            wlen = (end-start)/10. 
    157160        else: 
    158161            wlen = nfft*trc.stats.delta 
  • SHX/trunk/SeismicHandler/commands/theophase.py

    r1185 r1191  
    1414from SeismicHandler.basics.analysispar import AnalysisPar, PhaseList 
    1515from SeismicHandler.modules.stations import Stations 
    16 try: 
    17     # older obspy version 
    18     from obspy.sh.core import toUTCDateTime 
    19 except: 
    20     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     16from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    2117 
    2218DEG_TO_KM = 111.19 
  • SHX/trunk/SeismicHandler/config/runtime.py

    r1183 r1191  
    131131            "GRSN * * HH?,EH?", 
    132132        ], 
     133        # drag and drop position 
     134        "RUNTIME:dragdrop_trace": None, 
     135        "RUNTIME:dragdrop_time": None, 
    133136    }) 
    134137 
  • SHX/trunk/SeismicHandler/modules/filters.py

    r872 r1191  
    1313 
    1414import os 
    15 from obspy.core.util import complexifyString 
     15from obspy.core.util import complexify_string 
    1616from SeismicHandler.basics import Singleton 
    1717from SeismicHandler.basics.error import ShxError 
     
    4242        self.input_coeff = [] 
    4343        for _i in self.zeros: 
    44             self.input_coeff.append(complexifyString(_i)) 
     44            self.input_coeff.append(complexify_string(_i)) 
    4545        self.output_coeff = [] 
    4646        for _i in self.poles: 
    47             self.output_coeff.append(complexifyString(_i)) 
     47            self.output_coeff.append(complexify_string(_i)) 
    4848 
    4949    def inverse(self): 
  • SHX/trunk/SeismicHandler/modules/miniseed.py

    r1185 r1191  
    1313from SeismicHandler.config import Settings 
    1414from obspy.core import AttribDict 
    15 try: 
    16     # older obspy version 
    17     from obspy.sh.core import toUTCDateTime 
    18 except: 
    19     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     15from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    2016 
    2117 
  • SHX/trunk/SeismicHandler/modules/parse.py

    r1190 r1191  
    694694        "TOTTRCS": "_internalvars", 
    695695        "STATUS": "_internalvars", 
     696        "DRAGDROP_TRACE": "_internalvars", 
     697        "DRAGDROP_TIME": "_internalvars", 
    696698        "TITLESTYLE": '8', 
    697699        "TRCINFOSTYLE": '9', 
     
    952954    @staticmethod 
    953955    def _internalvars(name): 
    954         return Settings.Runtime[name.lower()] 
     956        try: 
     957            return Settings.Runtime[name.lower()] 
     958        except: 
     959            return Settings.Runtime["RUNTIME:"+name.lower()] 
    955960 
    956961 
  • SHX/trunk/SeismicHandler/modules/seismics.py

    r1169 r1191  
    1414from SeismicHandler.basics.analysispar import PhaseList 
    1515from SeismicHandler.modules.stations import Stations 
    16 from obspy.core.util.geodetics import gps2DistAzimuth 
    17 from obspy.fdsn.client import Client 
     16from obspy.geodetics import gps2dist_azimuth 
     17from obspy.clients.fdsn.client import Client 
    1818try: 
    1919    from geographiclib.geodesic import Geodesic 
     
    5858    slat = float( r.latitude ) 
    5959    slon = float( r.longitude ) 
    60     dist, az, baz = gps2DistAzimuth( elat, elon, slat, slon ) 
     60    dist, az, baz = gps2dist_azimuth( elat, elon, slat, slon ) 
    6161    dist /= (DEG_TO_KM*1000.) 
    6262    model = TauPyModel(model="iasp91") 
     
    176176        except: 
    177177            continue 
    178         dist, az, baz = gps2DistAzimuth( epilat, epilon, lat, lon ) 
     178        dist, az, baz = gps2dist_azimuth( epilat, epilon, lat, lon ) 
    179179        dist /= (1000.*DEG_TO_KM) 
    180180        try: 
     
    572572            origdiff = origin - orig.time 
    573573            depdiff = depth - orig.depth/1000. 
    574             dist, az, baz = gps2DistAzimuth( lat, lon, orig.latitude, 
     574            dist, az, baz = gps2dist_azimuth( lat, lon, orig.latitude, 
    575575                orig.longitude ) 
    576576            kmdist = dist / 1000. 
     
    581581            if centerlat == None or centerlon == None: 
    582582                continue 
    583             dist, az, baz = gps2DistAzimuth( centerlat, centerlon, 
     583            dist, az, baz = gps2dist_azimuth( centerlat, centerlon, 
    584584                orig.latitude, orig.longitude ) 
    585585            evdist = dist / (1000.*DEG_TO_KM) 
  • SHX/trunk/SeismicHandler/modules/traces.py

    r1179 r1191  
    1414from SeismicHandler.config import Settings, set_dsptrcs, set_tottrcs 
    1515from SeismicHandler.modules.stations import Stations 
    16 from obspy.core.util.geodetics import gps2DistAzimuth 
     16from obspy.geodetics import gps2dist_azimuth 
    1717 
    1818 
     
    499499    except: 
    500500        return None 
    501     dist, az, baz = gps2DistAzimuth( lat, lon, slat, slon ) 
     501    dist, az, baz = gps2dist_azimuth( lat, lon, slat, slon ) 
    502502    return (dist/1000./DEG_TO_KM) 
    503503     
  • SHX/trunk/SeismicHandler/modules/wx_.py

    r1190 r1191  
    2121from SeismicHandler.basics.analysispar import PhaseList, AnalysisPar 
    2222from obspy.core import read, UTCDateTime 
    23 try: 
    24     # older obspy version 
    25     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    26 except: 
    27     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    28     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     23from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     24from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    2925 
    3026 
     
    179175            _sendShCommand( "@PHASE DEFINE %s %s ;;; %s %s" % (station.upper(), 
    180176                fromUTCDateTime(abstime),self.trc.stats.channel[-1].upper(), 
    181                 qredraw), name="mouse evt" ) 
     177                qredraw) ) 
    182178        self.refresh() 
    183179        self._mousedouble = False 
     
    668664         
    669665        # prepare as drop target for file input 
    670         dt = MyFileDropTarget(self) 
     666        dt = ShxFileDropTarget(self) 
    671667        self.SetDropTarget(dt) 
    672668 
     
    10201016            _sendShCommand( "@PHASE DEFINE %s %s ;;; %s %s" % (station.upper(), 
    10211017                fromUTCDateTime(tracetime),trace.stats.channel[-1].upper(), 
    1022                 qredraw), name="mouse evt" ) 
     1018                qredraw) ) 
    10231019            self._drawSinglePick( trace, tracetime ) 
    10241020            if plotter.magnify: 
     
    33513347 
    33523348 
    3353 class MyFileDropTarget(wx.FileDropTarget): 
     3349class ShxFileDropTarget(wx.FileDropTarget): 
    33543350    "React on drag and drop actions into the main drawing window." 
    33553351    def __init__(self, window): 
     
    33593355    def OnDropFiles(self, x, y, filenames): 
    33603356        #print "%d file(s) dropped at (%d,%d):\n" % (len(filenames), x, y) 
     3357        trace, timestamp = plotter.canvas.ScreenToTraceAndTime( x, y ) 
     3358        if trace == None: 
     3359            set_runtime( "dragdrop_trace", None ) 
     3360        else: 
     3361            set_runtime( "dragdrop_trace", trace.index(True) ) 
     3362        set_runtime( "dragdrop_time", timestamp ) 
    33613363        for fname in filenames: 
    33623364            if fname.endswith('.SHC'): 
  • SHX/trunk/SeismicHandler/modules/wxdialog.py

    r1186 r1191  
    1111from SeismicHandler.basics.tools import EventTextParser 
    1212from obspy.core import UTCDateTime 
    13 try: 
    14     # older obspy version 
    15     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    16 except: 
    17     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    18     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     13from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     14from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    1915 
    2016 
  • SHX/trunk/SeismicHandler/patches/obspy_.py

    r1185 r1191  
    2424from SeismicHandler.utils import nearest_int 
    2525from SeismicHandler.basics import timeit, timestore 
    26 try: 
    27     # older obspy version 
    28     from obspy.sh.core import toUTCDateTime, fromUTCDateTime 
    29 except: 
    30     from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    31     from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
     26from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
     27from obspy.io.sh.core import from_utcdatetime as fromUTCDateTime 
    3228 
    3329 
  • SHX/trunk/SeismicHandler/tools/FdsnMeta2Db.py

    r1184 r1191  
    1919 
    2020import pickle 
    21 from obspy.fdsn.client import Client 
     21from obspy.clients.fdsn.client import Client 
    2222from obspy.core import UTCDateTime 
    2323from SeismicHandler.modules.stations import ChannelMeta, Stations 
  • SHX/trunk/SeismicHandler/tools/import_inventory.py

    r924 r1191  
    2222from SeismicHandler.modules.filters import FilterFile 
    2323from obspy.core import UTCDateTime 
    24 from obspy.sh.core import toUTCDateTime 
     24from obspy.io.sh.core import to_utcdatetime as toUTCDateTime 
    2525 
    2626 
Note: See TracChangeset for help on using the changeset viewer.