Index: imagery/i.landsat8.swlst/i.landsat8.swlst.py
===================================================================
--- imagery/i.landsat8.swlst/i.landsat8.swlst.py	(revision 70379)
+++ imagery/i.landsat8.swlst/i.landsat8.swlst.py	(working copy)
@@ -84,7 +84,7 @@
 """
 
 #%Module
-#%  description: Practical split-window algorithm estimating Land Surface Temperature from Landsat 8 OLI/TIRS imagery (Du, Chen; Ren, Huazhong; Qin, Qiming; Meng, Jinjie; Zhao, Shaohua. 2015)
+#%  description: Practical split-window algorithm estimating Land Surface Temperature from Landsat 8 OLI/TIRS imagery
 #%  keywords: imagery
 #%  keywords: split window
 #%  keywords: column water vapor
@@ -100,22 +100,22 @@
 
 #%flag
 #%  key: k
-#%  description: Keep current computational region settings
+#%  description: Set computational region Landsat8 scene
 #%end
 
 #%flag
 #% key: t
-#% description: Time-stamping the output LST (and optional CWV) map
+#% description: Add time-stamp to the output map(s)
 #%end
 
 #%flag
 #% key: c
-#% description: Convert LST output to celsius degrees, apply color table
+#% description: Convert LST output to celsius degrees
 #%end
 
 #%flag
 #% key: n
-#% description: Set zero digital numbers in b10, b11 to NULL | ToDo: Perform in copy of input input maps!
+#% description: Set zero digital numbers in b10, b11 to NULL
 #%end
 
 #%option G_OPT_F_INPUT
@@ -207,38 +207,11 @@
 #% exclusive: b11, t11
 #%end
 
-#%option G_OPT_R_INPUT
-#% key: qab
-#% key_desc: name
-#% description: Landsat 8 Quality Assessment band
-#% required : no
-#%end
-
-#%option
-#% key: qapixel
-#% key_desc: pixelvalue
-#% description: Quality assessment pixel value for which to build a mask | Source: <http://landsat.usgs.gov/L8QualityAssessmentBand.php>.
-#% answer: 61440
-#% required: no
-#% multiple: yes
-#%end
-
 #%rules
-#% excludes: prefix, b10, b11, qab
+#% excludes: prefix, b10, b11
 #%end
 
 #%option G_OPT_R_INPUT
-#% key: clouds
-#% key_desc: name
-#% description: A raster map applied as an inverted MASK | Overrides 'qab'
-#% required : no
-#%end
-
-#%rules
-#% exclusive: qab, clouds
-#%end
-
-#%option G_OPT_R_INPUT
 #% key: emissivity
 #% key_desc: name
 #% description: Land surface emissivity map | Expert use, overrides retrieving average emissivity from landcover
@@ -309,6 +282,9 @@
 #% required: no
 #%end
 
+
+# | ToDo: Perform in copy of input input maps!
+
 # required librairies
 import os
 import sys
@@ -351,8 +327,8 @@
     grass.run_command('g.remove', flags='f', type="rast",
                       pattern='tmp.{pid}*'.format(pid=os.getpid()), quiet=True)
     
-    if grass.find_file(name='MASK', element='cell')['file']:
-        r.mask(flags='r', verbose=True)
+    # if grass.find_file(name='MASK', element='cell')['file']:
+    #     r.mask(flags='r', verbose=True)
 
 
 def tmp_map_name(name):
@@ -459,12 +435,12 @@
     class.  Zero (0) DNs set to NULL here (not via the class' function).
     """
     if null:
-        msg = "\n|i Setting zero (0) Digital Numbers in {band} to NULL"
+        msg = "Setting zero (0) Digital Numbers in {band} to NULL"
         msg = msg.format(band=band)
         g.message(msg)
         run('r.null', map=band, setnull=0)
 
-    msg = "\n|i Rescaling {band} digital numbers to spectral radiance "
+    msg = "Rescaling {band} digital numbers to spectral radiance "
     msg = msg.format(band=band)
 
     if info:
@@ -496,7 +472,7 @@
                                              instring=DUMMY_MAPCALC_STRING_RADIANCE,
                                              outstring=radiance)
 
-    msg = "\n|i Converting spectral radiance to at-Satellite Temperature "
+    msg = "Converting spectral radiance to at-Satellite Temperature "
     if info:
         msg += "| Expression: " + str(temperature_expression)
     g.message(msg)
@@ -562,8 +538,8 @@
     return tmp_brightness_temperature
 
 
+"""
 def mask_clouds(qa_band, qa_pixel):
-    """
     ToDo:
 
     - a better, independent mechanism for QA. --> see also Landsat8 class.
@@ -574,10 +550,11 @@
 
     See also:
     http://courses.neteler.org/processing-landsat8-data-in-grass-gis-7/#Applying_the_Landsat_8_Quality_Assessment_%28QA%29_Band
-    """
-    msg = ('\n|i Masking for pixel values <{qap}> '
+
+    msg = ('Masking for pixel values <{qap}> '
            'in the Quality Assessment band.'.format(qap=qa_pixel))
     g.message(msg)
+"""
 
     #tmp_cloudmask = tmp_map_name('cloudmask')
     #qabits_expression = 'if({band} == {pixel}, 1, null())'.format(band=qa_band,
@@ -587,7 +564,7 @@
     #                                         expression=qabits_expression)
     #grass.mapcalc(cloud_masking_equation)
 
-    r.mask(raster=qa_band, maskcats=qa_pixel, flags='i', overwrite=True)
+    # r.mask(raster=qa_band, maskcats=qa_pixel, flags='i', overwrite=True)
 
     # save for debuging
     #save_map(tmp_cloudmask)
@@ -694,7 +671,7 @@
     Produce an average emissivity map based on FROM-GLC map covering the region
     of interest.
     """
-    msg = ('\n|i Determining average land surface emissivity based on a '
+    msg = ('Determining average land surface emissivity based on a '
            'look-up table ')
     if info:
         msg += ('| Expression:\n\n {exp}')
@@ -726,7 +703,7 @@
     Produce a delta emissivity map based on the FROM-GLC map covering the
     region of interest.
     """
-    msg = ('\n|i Determining delta land surface emissivity based on a '
+    msg = ('Determining delta land surface emissivity based on a '
            'look-up table ')
     if info:
         msg += ('| Expression:\n\n {exp}')
@@ -821,7 +798,7 @@
     ***
 
     """
-    msg = "\n|i Estimating atmospheric column water vapor "
+    msg = "Estimating atmospheric column water vapor "
     msg += '| Mapcalc expression: '
     msg += cwv_expression
     g.message(msg)
@@ -852,7 +829,7 @@
 
             *** To Do: evaluate -- does it work correctly? *** !
     """
-    msg = "\n|i Estimating atmospheric column water vapor "
+    msg = "Estimating atmospheric column water vapor "
     if info:
         msg += '| Expression:\n'
     g.message(msg)
@@ -906,7 +883,7 @@
     - a temporary filename
     - a valid mapcalc expression
     """
-    msg = '\n|i Estimating land surface temperature '
+    msg = 'Estimating land surface temperature '
     if info:
         msg += "| Expression:\n"
     g.message(msg)
@@ -986,7 +963,7 @@
         t10 = options['t10']
         t11 = options['t11']
 
-        if not options['clouds']:
+        """        if not options['clouds']:
             qab = options['qab']
             cloud_map = False
 
@@ -993,6 +970,7 @@
         else:
             qab = False
             cloud_map = options['clouds']
+        """
 
     elif options['prefix']:
         prefix = options['prefix']
@@ -999,7 +977,7 @@
         b10 = prefix + '10'
         b11 = prefix + '11'
 
-        if not options['clouds']:
+    """        if not options['clouds']:
             qab = prefix + 'QA'
             cloud_map = False
 
@@ -1006,8 +984,9 @@
         else:
             cloud_map = options['clouds']
             qab = False
+    """
 
-    qapixel = options['qapixel']
+    # qapixel = options['qapixel']
     lst_output = options['lst']
     
     # save Brightness Temperature maps?
@@ -1060,7 +1039,7 @@
     # if not keep_region:
     if scene_extent:
         grass.use_temp_region()  # safely modify the region
-        msg = "\n|! Matching region extent to map {name}"
+        msg = "Matching region extent to map {name}"
 
         # ToDo: check if extent-B10 == extent-B11? Unnecessary?
         # Improve below!
@@ -1073,19 +1052,20 @@
             run('g.region', rast=t10, align=t10)
             msg = msg.format(name=t10)
 
-        g.message(msg)
+        grass.verbose(msg)
 
     # elif keep_region:
-    elif scene_extent:
+    """    elif scene_extent:
         grass.warning(_('Operating on current region'))
+    """
 
-    #
+    """    #
     # 1. Mask clouds
     #
 
     if cloud_map:
         # user-fed cloud map?
-        msg = '\n|i Using {cmap} as a MASK'.format(cmap=cloud_map)
+        msg = 'Using {cmap} as a MASK'.format(cmap=cloud_map)
         g.message(msg)
         r.mask(raster=cloud_map, flags='i', overwrite=True)
 
@@ -1092,6 +1072,7 @@
     else:
         # using the quality assessment band and a "QA" pixel value
         mask_clouds(qab, qapixel)
+    """
 
     #
     # 2. TIRS > Brightness Temperatures
@@ -1129,11 +1110,11 @@
                       'input option is case sensitive.')
 
         if emissivity_class == 'Random':
-            msg = "\n|! Random emissivity class selected > " + \
+            msg = "Random emissivity class selected > " + \
                 split_window_lst.landcover_class + ' '
 
         else:
-            msg = '\n|! Retrieving average emissivities *only* for {eclass} '
+            msg = 'Retrieving average emissivities *only* for {eclass} '
 
         if info:
             msg += '| Average emissivities (channels 10, 11): '
@@ -1170,9 +1151,9 @@
     
 
     if info:
-        msg = '\n|i Spatial window of size {n} for Column Water Vapor estimation: '
+        msg = 'Spatial window of size {n} for Column Water Vapor estimation: '
         msg = msg.format(n=cwv_window_size)
-        g.message(msg)
+        grass.verbose(msg)
 
     cwv = Column_Water_Vapor(cwv_window_size, t10, t11)
     citation_cwv = cwv.citation
@@ -1197,7 +1178,7 @@
     #
 
     # remove MASK
-    r.mask(flags='r', verbose=True)
+    # r.mask(flags='r', verbose=True)
 
     # time-stamping
     if timestamping:
@@ -1244,9 +1225,10 @@
 
     # restore region
     # if not keep_region:
-    if scene_extent:
+    """    if scene_extent:
         grass.del_temp_region()  # restoring previous region settings
         g.message("|! Original Region restored")
+    """
 
     # print citation
     if info:
