Format with black

lopezvoliver · Jun 7, 2021 · 6d8f1d7 · 6d8f1d7
1 parent acfbcbf
commit 6d8f1d7
Show file tree

Hide file tree

Showing 29 changed files with 6,727 additions and 2,339 deletions.
diff --git a/Py6S/Params/__init__.py b/Py6S/Params/__init__.py
@@ -26,4 +26,13 @@
 from .altitudes import Altitudes
 from .geometry import *
 
-__all__ = ["AtmosProfile", "AeroProfile", "AtmosCorr", "GroundReflectance", "Wavelength", "Geometry", "Altitudes", "PredefinedWavelengths"]
+__all__ = [
+    "AtmosProfile",
+    "AeroProfile",
+    "AtmosCorr",
+    "GroundReflectance",
+    "Wavelength",
+    "Geometry",
+    "Altitudes",
+    "PredefinedWavelengths",
+]
diff --git a/Py6S/Params/aeroprofile.py b/Py6S/Params/aeroprofile.py
@@ -16,10 +16,12 @@
 # along with Py6S.  If not, see <http://www.gnu.org/licenses/>.
 
 from collections import defaultdict
-#from sixs_exceptions import *
+
+# from sixs_exceptions import *
 from Py6S.sixs_exceptions import ParameterError
 import sys
 
+
 class AeroProfile:
 
     """Class representing options for Aerosol Profiles"""
@@ -70,13 +72,15 @@ def User(cls, **kwargs):
         """
         d = defaultdict(lambda: 0, kwargs)
 
-        dust = d['dust']
-        water = d['water']
-        oceanic = d['oceanic']
-        soot = d['soot']
+        dust = d["dust"]
+        water = d["water"]
+        oceanic = d["oceanic"]
+        soot = d["soot"]
 
-        if (((dust + water + oceanic + soot) - 1) > 0.01):
-            raise ParameterError("Aerosol Profile", "User aerosol components don't sum to 1.0")
+        if ((dust + water + oceanic + soot) - 1) > 0.01:
+            raise ParameterError(
+                "Aerosol Profile", "User aerosol components don't sum to 1.0"
+            )
 
         return "4 (User's Components)\n%f, %f, %f, %f" % (dust, water, oceanic, soot)
 
@@ -177,17 +181,29 @@ def SunPhotometerDistribution(cls, r, dvdlogr, refr_real, refr_imag):
             if type(refr_real) is float:
                 refr_real = [refr_real] * 20
             elif len(refr_real) != 20:
-                raise ParameterError("Aerosol Distribution Real Refractive Index", "You must specify the real part of the Refractive Index at 20 wavelengths.")
+                raise ParameterError(
+                    "Aerosol Distribution Real Refractive Index",
+                    "You must specify the real part of the Refractive Index at 20 wavelengths.",
+                )
         except TypeError:
-            raise ParameterError("Aerosol Distribution Imaginary Refractive Index", "You must specify the imaginary part of the Refractive Index at 20 wavelengths.")
+            raise ParameterError(
+                "Aerosol Distribution Imaginary Refractive Index",
+                "You must specify the imaginary part of the Refractive Index at 20 wavelengths.",
+            )
 
         try:
             if type(refr_imag) is float:
                 refr_imag = [refr_imag] * 20
             elif len(refr_imag) != 20:
-                raise ParameterError("Aerosol Distribution Imaginary Refractive Index", "You must specify the imaginary part of the Refractive Index at 20 wavelengths.")
+                raise ParameterError(
+                    "Aerosol Distribution Imaginary Refractive Index",
+                    "You must specify the imaginary part of the Refractive Index at 20 wavelengths.",
+                )
         except TypeError:
-            raise ParameterError("Aerosol Distribution Imaginary Refractive Index", "You must specify the imaginary part of the Refractive Index at 20 wavelengths.")
+            raise ParameterError(
+                "Aerosol Distribution Imaginary Refractive Index",
+                "You must specify the imaginary part of the Refractive Index at 20 wavelengths.",
+            )
 
         real = map(str, refr_real)
         imag = map(str, refr_imag)
@@ -196,8 +212,8 @@ def SunPhotometerDistribution(cls, r, dvdlogr, refr_real, refr_imag):
             real = list(real)
             imag = list(imag)
 
-        comp += ' '.join(real) + '\n'
-        comp += ' '.join(imag) + '\n'
+        comp += " ".join(real) + "\n"
+        comp += " ".join(imag) + "\n"
 
         return header + num + ds + comp + "0 no results saved"
 
@@ -248,13 +264,22 @@ def add_component(self, rmean, sigma, percentage_density, refr_real, refr_imag):
 
             """
             if len(self.values) >= 4:
-                raise ParameterError("Aerosol Distribution components", "You can only add a maximum of 4 components")
+                raise ParameterError(
+                    "Aerosol Distribution components",
+                    "You can only add a maximum of 4 components",
+                )
 
             if len(refr_real) != 20:
-                raise ParameterError("Aerosol Distribution Real Refractive Index", "You must specify the real part of the Refractive Index at 20 wavelengths.")
+                raise ParameterError(
+                    "Aerosol Distribution Real Refractive Index",
+                    "You must specify the real part of the Refractive Index at 20 wavelengths.",
+                )
 
             if len(refr_imag) != 20:
-                raise ParameterError("Aerosol Distribution Imaginary Refractive Index", "You must specify the imaginary part of the Refractive Index at 20 wavelengths.")
+                raise ParameterError(
+                    "Aerosol Distribution Imaginary Refractive Index",
+                    "You must specify the imaginary part of the Refractive Index at 20 wavelengths.",
+                )
 
             comp = "%f %f %f\n" % (rmean, sigma, percentage_density)
             real = map(str, refr_real)
@@ -264,14 +289,19 @@ def add_component(self, rmean, sigma, percentage_density, refr_real, refr_imag):
                 real = list(real)
                 imag = list(imag)
 
-            comp += ' '.join(real) + '\n'
-            comp += ' '.join(imag) + '\n'
+            comp += " ".join(real) + "\n"
+            comp += " ".join(imag) + "\n"
 
             self.values.append(comp)
 
         def __str__(self):
-            result = "%d\n%f %f %d\n" % (self.numtype, self.rmin, self.rmax, len(self.values))
-            components = ''.join(self.values)
+            result = "%d\n%f %f %d\n" % (
+                self.numtype,
+                self.rmin,
+                self.rmax,
+                len(self.values),
+            )
+            components = "".join(self.values)
             return result + components + "0 no results saved"
 
     class UserProfile:

diff --git a/Py6S/Params/altitudes.py b/Py6S/Params/altitudes.py
@@ -88,7 +88,7 @@ def set_sensor_custom_altitude(self, altitude, aot=-1, water=-1, ozone=-1):
 
         """
         if altitude < 0 or altitude >= 100:
-            raise ValueError('Sensor altitude must be > 0km and < 100km')
+            raise ValueError("Sensor altitude must be > 0km and < 100km")
         self.sensor_altitude = -1 * altitude
         self.aot = aot
         self.water = water
@@ -98,4 +98,10 @@ def __str__(self):
         if self.sensor_altitude is None:
             return "%f\n%f\n" % (self.target_alt_pres, self.sensor_alt_pres)
         else:
-            return "%f\n%f\n%f %f\n%f\n" % (self.target_alt_pres, self.sensor_altitude, self.water, self.ozone, self.aot)
+            return "%f\n%f\n%f %f\n%f\n" % (
+                self.target_alt_pres,
+                self.sensor_altitude,
+                self.water,
+                self.ozone,
+                self.aot,
+            )
diff --git a/Py6S/Params/atmoscorr.py b/Py6S/Params/atmoscorr.py
@@ -33,9 +33,12 @@ def AtmosCorrLambertianFromRadiance(cls, radiance):
         * ``radiance`` -- Radiance of the surface, as measured at the sensor.
 
         """
-        return """0 Atm. correction Lambertian
+        return (
+            """0 Atm. correction Lambertian
 %f radiance
-""" % radiance
+"""
+            % radiance
+        )
 
     @classmethod
     def AtmosCorrLambertianFromReflectance(cls, reflectance):
@@ -47,7 +50,9 @@ def AtmosCorrLambertianFromReflectance(cls, reflectance):
         """
         return """0 Atm. correction Lambertian
 %f reflectance
-""" % (reflectance * -1)
+""" % (
+            reflectance * -1
+        )
 
     @classmethod
     def AtmosCorrBRDFFromRadiance(cls, radiance):
@@ -57,9 +62,12 @@ def AtmosCorrBRDFFromRadiance(cls, radiance):
         * ``radiance`` -- Radiance of the surface, as measured at the sensor.
 
         """
-        return """1 BRDF
+        return (
+            """1 BRDF
 %f radiance
-""" % radiance
+"""
+            % radiance
+        )
 
     @classmethod
     def AtmosCorrBRDFFromReflectance(cls, reflectance):
@@ -71,4 +79,6 @@ def AtmosCorrBRDFFromReflectance(cls, reflectance):
         """
         return """1 BRDF
 %f reflectance
-""" % (reflectance * -1)
+""" % (
+            reflectance * -1
+        )