From 205c958a10943d48838078a232c82ce4e844c9c7 Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Mon, 2 Jan 2023 09:15:53 +0000 Subject: [PATCH] 'Refactored by Sourcery' --- gdsfactory/circuitviz.py | 4 ++-- gdsfactory/read/from_yaml.py | 6 +----- gdsfactory/simulation/eme/meow_eme.py | 4 +--- gdsfactory/simulation/fem/mode_solver.py | 17 +++++++--------- gdsfactory/simulation/fem/test_mode_solver.py | 12 +++++------ .../simulation/gmsh/tests/test_meshing.py | 20 +++++++++---------- gdsfactory/technology/layer_views.py | 6 +++--- .../tests/test_klayout/test_klayout_tech.py | 4 ++-- 8 files changed, 31 insertions(+), 42 deletions(-) diff --git a/gdsfactory/circuitviz.py b/gdsfactory/circuitviz.py index 62a9cc74849..376aa9f7a1a 100644 --- a/gdsfactory/circuitviz.py +++ b/gdsfactory/circuitviz.py @@ -401,10 +401,10 @@ def viz_instance( } for layer, polys in polys_by_layer.items(): - xs = [[p.points[:, 0]] for p in polys] - ys = [[p.points[:, 1]] for p in polys] color_info = colors_by_ldt.get(layer) if color_info: + xs = [[p.points[:, 0]] for p in polys] + ys = [[p.points[:, 1]] for p in polys] lp = LayerPolygons( tag=instance_name, xs=xs, diff --git a/gdsfactory/read/from_yaml.py b/gdsfactory/read/from_yaml.py index e7cfcea9d12..224acf16b44 100644 --- a/gdsfactory/read/from_yaml.py +++ b/gdsfactory/read/from_yaml.py @@ -599,11 +599,7 @@ def from_yaml( settings = conf.get("settings", {}) - if "mode" in kwargs: - mode = kwargs.pop("mode") - else: - mode = "layout" - + mode = kwargs.pop("mode") if "mode" in kwargs else "layout" for key, value in kwargs.items(): if key not in settings: raise ValueError(f"{key!r} not in {settings.keys()}") diff --git a/gdsfactory/simulation/eme/meow_eme.py b/gdsfactory/simulation/eme/meow_eme.py index d8cb0e63c49..a2bd51e7853 100644 --- a/gdsfactory/simulation/eme/meow_eme.py +++ b/gdsfactory/simulation/eme/meow_eme.py @@ -335,7 +335,7 @@ def compute_sparameters(self) -> Dict[str, np.ndarray]: if not self.overwrite: logger.info(f"Simulation loaded from {self.filepath!r}") return dict(np.load(self.filepath)) - elif self.overwrite: + else: self.filepath.unlink() start = time.time() @@ -373,8 +373,6 @@ def compute_sparameters(self) -> Dict[str, np.ndarray]: return sp - return sp - if __name__ == "__main__": c = gf.components.taper(length=10, width2=2) diff --git a/gdsfactory/simulation/fem/mode_solver.py b/gdsfactory/simulation/fem/mode_solver.py index 5a5ee0e6b63..ed6fb3c0c47 100644 --- a/gdsfactory/simulation/fem/mode_solver.py +++ b/gdsfactory/simulation/fem/mode_solver.py @@ -67,7 +67,7 @@ def compute_cross_section_modes( epsilon[basis0.get_dofs(elements=layername)] = ( _ACTIVE_PDK.materials_index[layer.material](wl) ** 2 ) - if "background_tag" in kwargs.keys(): + if "background_tag" in kwargs: epsilon[basis0.get_dofs(elements=kwargs["background_tag"])] = ( _ACTIVE_PDK.materials_index[kwargs["background_tag"]](wl) ** 2 ) @@ -85,9 +85,6 @@ def compute_cross_section_modes( return lams, basis, xs - def plot_cross_section_modes(): - return True - if __name__ == "__main__": filtered_layerstack = LayerStack( @@ -104,12 +101,12 @@ def plot_cross_section_modes(): filtered_layerstack.layers["core"].thickness = 0.2 - resolutions = {} - resolutions["core"] = {"resolution": 0.02, "distance": 2} - resolutions["clad"] = {"resolution": 0.2, "distance": 1} - resolutions["box"] = {"resolution": 0.2, "distance": 1} - resolutions["slab90"] = {"resolution": 0.05, "distance": 1} - + resolutions = { + "core": {"resolution": 0.02, "distance": 2}, + "clad": {"resolution": 0.2, "distance": 1}, + "box": {"resolution": 0.2, "distance": 1}, + "slab90": {"resolution": 0.05, "distance": 1}, + } compute_cross_section_modes( cross_section="rib", layerstack=filtered_layerstack, diff --git a/gdsfactory/simulation/fem/test_mode_solver.py b/gdsfactory/simulation/fem/test_mode_solver.py index bb8d09beba3..00bf1eb816a 100644 --- a/gdsfactory/simulation/fem/test_mode_solver.py +++ b/gdsfactory/simulation/fem/test_mode_solver.py @@ -20,12 +20,12 @@ def test_compute_cross_section_mode(): filtered_layerstack.layers["core"].thickness = 0.2 - resolutions = {} - resolutions["core"] = {"resolution": 0.02, "distance": 2} - resolutions["clad"] = {"resolution": 0.2, "distance": 1} - resolutions["box"] = {"resolution": 0.2, "distance": 1} - resolutions["slab90"] = {"resolution": 0.05, "distance": 1} - + resolutions = { + "core": {"resolution": 0.02, "distance": 2}, + "clad": {"resolution": 0.2, "distance": 1}, + "box": {"resolution": 0.2, "distance": 1}, + "slab90": {"resolution": 0.05, "distance": 1}, + } lams, basis, xs = compute_cross_section_modes( cross_section="rib", layerstack=filtered_layerstack, diff --git a/gdsfactory/simulation/gmsh/tests/test_meshing.py b/gdsfactory/simulation/gmsh/tests/test_meshing.py index 738dd5b3ab3..a2b86e81522 100644 --- a/gdsfactory/simulation/gmsh/tests/test_meshing.py +++ b/gdsfactory/simulation/gmsh/tests/test_meshing.py @@ -22,11 +22,11 @@ def test_gmsh_uz_xsection_mesh(): } ) - resolutions = {} - resolutions["core"] = {"resolution": 0.05, "distance": 2} - resolutions["slab90"] = {"resolution": 0.03, "distance": 1} - resolutions["via_contact"] = {"resolution": 0.1, "distance": 1} - + resolutions = { + "core": {"resolution": 0.05, "distance": 2}, + "slab90": {"resolution": 0.03, "distance": 1}, + "via_contact": {"resolution": 0.1, "distance": 1}, + } uz_xsection_mesh( waveguide, [(4, -15), (4, 15)], @@ -34,7 +34,6 @@ def test_gmsh_uz_xsection_mesh(): resolutions=resolutions, background_tag="Oxide", ) - assert True def test_gmsh_xy_xsection_mesh(): @@ -56,10 +55,10 @@ def test_gmsh_xy_xsection_mesh(): } ) - resolutions = {} - resolutions["core"] = {"resolution": 0.05, "distance": 0.1} - resolutions["via_contact"] = {"resolution": 0.1, "distance": 0} - + resolutions = { + "core": {"resolution": 0.05, "distance": 0.1}, + "via_contact": {"resolution": 0.1, "distance": 0}, + } xy_xsection_mesh( component=waveguide, z=0.09, @@ -67,4 +66,3 @@ def test_gmsh_xy_xsection_mesh(): resolutions=resolutions, background_tag="Oxide", ) - assert True diff --git a/gdsfactory/technology/layer_views.py b/gdsfactory/technology/layer_views.py index 934db49daf4..d02006a0244 100644 --- a/gdsfactory/technology/layer_views.py +++ b/gdsfactory/technology/layer_views.py @@ -213,9 +213,9 @@ def _build_xml_element(self, tag: str, name: str) -> ET.Element: "marked": str(self.marked).lower(), "xfill": str(self.xfill).lower(), "animation": self.animation, - "name": name - if not self.layer_in_name - else f"{name} {self.layer[0]}/{self.layer[1]}", + "name": f"{name} {self.layer[0]}/{self.layer[1]}" + if self.layer_in_name + else name, "source": f"{self.layer[0]}/{self.layer[1]}@1" if self.layer is not None else "*/*@*", diff --git a/gdsfactory/tests/test_klayout/test_klayout_tech.py b/gdsfactory/tests/test_klayout/test_klayout_tech.py index 1c5f5819aa3..aa76ad6ba54 100644 --- a/gdsfactory/tests/test_klayout/test_klayout_tech.py +++ b/gdsfactory/tests/test_klayout/test_klayout_tech.py @@ -14,9 +14,9 @@ def test_klayout_tech_create( data_regression: DataRegressionFixture, check: bool = True ) -> None: - lyp = LayerDisplayProperties.from_lyp(str(PATH.klayout_lyp)) - if check: + lyp = LayerDisplayProperties.from_lyp(str(PATH.klayout_lyp)) + data_regression.check(lyp.dict())