Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

autoPyLoT.py

@@ -132,7 +132,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
         datastructure.setExpandFields(exf)
 
         # check if default location routine NLLoc is available
-        if parameter['nllocbin'] and locflag:
+        if real_None(parameter['nllocbin']) and locflag:
             # get NLLoc-root path
             nllocroot = parameter.get('nllocroot')
             # get path to NLLoc executable
@@ -417,8 +417,10 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
             data.applyEVTData(picks)
             if savexml:
                 if savepath == 'None' or savepath == None:
-                    savepath = eventpath
-                fnqml = '%s/PyLoT_%s' % (savepath, evID)
+                    saveEvtPath = eventpath
+                else:
+                    saveEvtPath = savepath
+                fnqml = '%s/PyLoT_%s' % (saveEvtPath, evID)
                 data.exportEvent(fnqml, fnext='.xml', fcheck=['auto', 'magnitude', 'origin'])
             if locflag == 1:
                 # HYPO71