Merging changes to branch dev; to be reverted

AshDetection/AshDetection.py

+from matplotlib import use
+use('Agg')
+
 import numpy as np
 import sys
 import copy

AshDetection/config.py

@@ -19,19 +19,32 @@ __version__ = VERSION
 # Default locations of SEVIRI raw files and more. Remember trailing
 #    slashes.
 ####################################################################
-#_PATH_ROOT = "/homevip/espen/"
-_PATH_ROOT = "/viper/nadir/home/satdata"
-#PATH_NETCDF = _PATH_ROOT + "NVAP-ncout/"
-PATH_TMP = _PATH_ROOT + "/tmp/"
-#PATH_SEVIRI_RAW = "/storage/home/eso/Data/RAW/"
-
-# Can find older files here (~60-90 days)
-PATH_SEVIRI_RAW = "/urd-tmp/products/IcelandEurope/raw_MSG3_IcelandEurope_1088_0088_1537x494/"
-PATH_ASH_PROP_TABLES = _PATH_ROOT + "/repos/ash-seviri/data/BTtables/"
-PATH_ERBT = _PATH_ROOT + "/repos/ash-seviri/data/"
-PATH_GEO =  _PATH_ROOT + "/repos/ash-seviri/data/"
-PATH_EXE =  _PATH_ROOT + "/repos/ash-seviri/AshDetection/"
-PATH_PLOT =  _PATH_ROOT + "/NVAP-ncout/plots/"
+# _PATH_ROOT = "/viper/nadir/home/satdata"
+# PATH_TMP = _PATH_ROOT + "/tmp/"
+
+# # Can find older files here (~60-90 days)
+# PATH_SEVIRI_RAW = "/urd-tmp/products/IcelandEurope/raw_MSG3_IcelandEurope_1088_0088_1537x494/"
+# PATH_ASH_PROP_TABLES = _PATH_ROOT + "/repos/ash-seviri/data/BTtables/"
+# PATH_ERBT = _PATH_ROOT + "/repos/ash-seviri/data/"
+# PATH_GEO =  _PATH_ROOT + "/repos/ash-seviri/data/"
+# PATH_EXE =  _PATH_ROOT + "/repos/ash-seviri/AshDetection/"
+# PATH_PLOT =  _PATH_ROOT + "/NVAP-ncout/plots/"
+
+
+####################################################################
+# For testing @esolap
+####################################################################
+_PATH_ROOT = "/home/eso/repos/ash_detection/"
+PATH_NETCDF = "."
+PATH_TMP = "/tmp/"
+#PATH_SEVIRI_RAW = "/sat_data/products/IcelandEurope/raw_MSG3_IcelandEurope_1088_0088_1537x494/"
+PATH_SEVIRI_RAW = _PATH_ROOT + "testdata_seviri/"
+
+PATH_ASH_PROP_TABLES = _PATH_ROOT + "/data/BTtables/"
+PATH_ERBT = _PATH_ROOT + "/data/"
+PATH_GEO =  _PATH_ROOT + "/data/"
+PATH_EXE =  _PATH_ROOT + "/AshDetection/"
+FILE_PATH_LSMASK =  PATH_GEO + "LandSeaMask"