make ipynb examples same in docs and examples folder, remove get_wave…

…length everywhere
qpv-research-group · Sep 23, 2024 · 823eef4 · 823eef4
1 parent c692277
commit 823eef4
Show file tree

Hide file tree

Showing 16 changed files with 2,738 additions and 1,189 deletions.
diff --git a/examples/HIT_emissivity.ipynb b/examples/HIT_emissivity.ipynb
diff --git a/examples/compare_models_3Jsolarcell.ipynb b/examples/compare_models_3Jsolarcell.ipynb
diff --git a/examples/compare_models_3Jsolarcell_profile.ipynb b/examples/compare_models_3Jsolarcell_profile.ipynb
diff --git a/examples/create_rt_texture.ipynb b/examples/create_rt_texture.ipynb
diff --git a/examples/grating_pyramids_OPTOS.ipynb b/examples/grating_pyramids_OPTOS.ipynb
diff --git a/examples/rcwa_examples.ipynb b/examples/rcwa_examples.ipynb
diff --git a/examples/rcwa_tmm_validation.ipynb b/examples/rcwa_tmm_validation.ipynb
diff --git a/examples/rt_pyramids.ipynb b/examples/rt_pyramids.ipynb
diff --git a/rayflare/matrix_formalism/multiply_matrices.py b/rayflare/matrix_formalism/multiply_matrices.py
@@ -13,7 +13,7 @@
 from solcore.state import State
 
 from rayflare.structure import Interface, BulkLayer
-from rayflare.utilities import get_savepath, get_wavelength
+from rayflare.utilities import get_savepath
 
 from rayflare import logger
 
@@ -322,8 +322,6 @@ def matrix_multiplication(
     )
     n_a_in = int(len(angle_vector) / 2)
 
-    get_wavelength(options)
-
     num_wl = len(options["wavelength"])
 
     # bulk thickness in m

diff --git a/rayflare/matrix_formalism/process_structure.py b/rayflare/matrix_formalism/process_structure.py
@@ -15,7 +15,7 @@
 from rayflare.transfer_matrix_method import TMM
 from rayflare.angles import make_angle_vector
 from rayflare.matrix_formalism.ideal_cases import lambertian_matrix, mirror_matrix
-from rayflare.utilities import get_savepath, get_wavelength
+from rayflare.utilities import get_savepath
 from rayflare import logger
 
 def process_structure(SC, options, save_location="default", overwrite=False):
@@ -40,8 +40,6 @@ def process_structure(SC, options, save_location="default", overwrite=False):
     if isinstance(options, dict):
         options = State(options)
 
-    get_wavelength(options)
-
     def determine_only_incidence(sd, j1, oia):
         if sd == "front" and j1 == 0 and oia:
             only_inc = True

diff --git a/rayflare/options.py b/rayflare/options.py
@@ -58,8 +58,6 @@ def __init__(self):
         self.random_ray_angles = False
         self.n_rays = 10000
         self.maximum_passes = 0
-        self.analytical_ray_tracing = False
-        self.analytical_threshold = 0.99
 
         # TMM options
         self.lookuptable_angles = 200

diff --git a/rayflare/ray_tracing/rt_structure.py b/rayflare/ray_tracing/rt_structure.py
@@ -16,7 +16,7 @@
 from solcore.state import State
 from numba import jit
 
-from rayflare.utilities import get_savepath, get_wavelength
+from rayflare.utilities import get_savepath
 from rayflare.transfer_matrix_method.lookup_table import make_TMM_lookuptable
 from rayflare import logger
 from .analytical_rt import analytical_start, dummy_prop_rays
@@ -185,7 +185,6 @@ def calculate(self, options):
         if isinstance(options, dict):
             options = State(options)
 
-        get_wavelength(options)
         wavelengths = options.wavelength
         theta = options.theta_in
         phi = options.phi_in

diff --git a/rayflare/rigorous_coupled_wave_analysis/rcwa.py b/rayflare/rigorous_coupled_wave_analysis/rcwa.py
@@ -15,7 +15,7 @@
 from solcore.absorption_calculator import OptiStack
 
 from rayflare.angles import make_angle_vector, overall_bin
-from rayflare.utilities import get_matrices_or_paths, get_wavelength, process_pol
+from rayflare.utilities import get_matrices_or_paths, process_pol
 
 from inkstone import Inkstone
 
@@ -937,7 +937,6 @@ def __init__(self, structure, size, options, incidence, transmission):
 
         self.transmission = transmission
         self.incidence = incidence
-        get_wavelength(options)
         wavelengths = options.wavelength
 
         geom_list = []
@@ -1084,7 +1083,6 @@ def calculate(self, options):
         if isinstance(options, dict):
             options = State(options)
 
-        get_wavelength(options)
         wl = options.wavelength * 1e9
 
         pol = process_pol(options.pol)
@@ -1178,7 +1176,6 @@ def calculate_profile(self, options):
 
         parallel_func = {"s4": RCWA_wl_prof, "inkstone": RCWA_wl_prof_inkstone}
 
-        get_wavelength(options)
         wl = options.wavelength * 1e9
 
         pol = process_pol(options.pol)

diff --git a/rayflare/transfer_matrix_method/lookup_table.py b/rayflare/transfer_matrix_method/lookup_table.py
@@ -8,7 +8,6 @@
 import xarray as xr
 import numpy as np
 from rayflare.transfer_matrix_method.tmm import tmm_structure
-from rayflare.utilities import get_wavelength
 import os
 from solcore.absorption_calculator import OptiStack
 
@@ -59,7 +58,6 @@ def make_TMM_lookuptable(
         logging.info("Existing lookup table found")
         allres = xr.open_dataset(savepath)
     else:
-        get_wavelength(options)
         wavelengths = options["wavelength"]
         n_angles = options["lookuptable_angles"]
         thetas = np.linspace(0, (np.pi / 2) - 1e-3, n_angles)

diff --git a/rayflare/transfer_matrix_method/tmm.py b/rayflare/transfer_matrix_method/tmm.py
@@ -14,7 +14,7 @@
 from solcore.state import State
 
 from rayflare.angles import make_angle_vector, fold_phi
-from rayflare.utilities import get_matrices_or_paths, get_wavelength
+from rayflare.utilities import get_matrices_or_paths
 
 
 def TMM(
@@ -596,7 +596,6 @@ def calculate_profile(layers, dist=None):
         if isinstance(options, dict):
             options = State(options)
 
-        get_wavelength(options)
         wavelength = options.wavelength * 1e9
         pol = options.pol
         angle = options.theta_in

diff --git a/rayflare/utilities.py b/rayflare/utilities.py
@@ -35,7 +35,6 @@ def make_absorption_function(result, structure, options):
     from rayflare.ray_tracing import rt_structure
     from rayflare.structure import Structure
 
-    get_wavelength(options)
     # determine the type of structure to figure out how to process the result:
 
     if isinstance(structure, Structure):
@@ -339,17 +338,6 @@ def get_savepath(save_location, project_name):
     return structpath
 
 
-def get_wavelength(options):
-    # wavelengths (plural) will be deprecated and should be wavelength (singular) instead,
-    # but this is to ensure backwards compatibility for the next few versions
-
-    if "wavelengths" in options:
-        options["wavelength"] = options["wavelengths"]
-        logger.warning(
-            "The option 'wavelengths' (plural) will be deprecated in the next major version. Please use 'wavelength' (singular) instead. "
-            "Currently, wavelengths (plural) will override wavelength (singular) if both are specified."
-        )
-
 def process_pol(input_pol):
     if len(input_pol) == 2:
         pol = input_pol