skinoptics 0.0.1b6__py3-none-any.whl → 0.0.1b8__py3-none-any.whl

skinoptics/__init__.py

@@ -1,5 +1,5 @@
 '''
-Copyright (C) 2024 Victor Lima
+Copyright (C) 2024-2025 Victor Lima
 
     | This program is free software: you can redistribute it and/or modify
     | it under the terms of the GNU General Public License as published by
@@ -17,11 +17,12 @@ Copyright (C) 2024 Victor Lima
 | Victor Lima
 | victorporto\@ifsc.usp.br
 | victor.lima\@ufscar.br
+| victorportog.github.io
 
-| Release Date:
-| October 2024
-| Last Modification:
+| Release date:
 | October 2024
+| Last modification:
+| March 2025
 
 | Version History:
 | available at <https://pypi.org/project/skinoptics/#history>
@@ -35,7 +36,7 @@ __all__ = ['utils', 'dataframes',
 __version__major = '0'
 __version__minor = '0'
 __version__micro = '1'
-__version__suffix = 'b6'
+__version__suffix = 'b8'
 
 __author__ = "Victor Lima"
 __copyright__ = "Copyright (c) 2024-2025 Victor Lima"

skinoptics/absorption_coefficient.py

@@ -1,6 +1,6 @@
 '''
 | SkinOptics
-| Copyright (C) 2024 Victor Lima
+| Copyright (C) 2024-2025 Victor Lima
 
     | This program is free software: you can redistribute it and/or modify
     | it under the terms of the GNU General Public License as published by
@@ -18,10 +18,11 @@
 | Victor Lima
 | victorporto\@ifsc.usp.br
 | victor.lima\@ufscar.br
+| victorportog.github.io
 
-| Release Date:
+| Release date:
 | October 2024
-| Last Modification:
+| Last modification:
 | October 2024
 
 | References:

skinoptics/anisotropy_factor.py

@@ -1,6 +1,6 @@
 '''
 | SkinOptics
-| Copyright (C) 2024 Victor Lima
+| Copyright (C) 2024-2025 Victor Lima
 
     | This program is free software: you can redistribute it and/or modify
     | it under the terms of the GNU General Public License as published by
@@ -18,11 +18,12 @@
 | Victor Lima
 | victorporto\@ifsc.usp.br
 | victor.lima\@ufscar.br
+| victorportog.github.io
 
-| Release Date:
+| Release date:
 | October 2024
-| Last Modification:
-| October 2025
+| Last modification:
+| March 2025
 
 | References:
 
@@ -394,7 +395,7 @@ def ptheta_TTU2(theta, g1, g2, gamma):
     
     return gamma*ptheta_U2(theta = theta, g = g1) + (1 - gamma)*ptheta_U2(theta = theta, g = g2)
 
-def theta_R_from_RND(n_RND = int(1E6)):
+def theta_R_from_RND(n_RND = int(1E6), seed_RND = None):
     r'''
     | The scattering angle distribution as a function of a set of random numbers uniformly
     | distributed over the interval [0, 1), assuming the Rayleigh scattering phase function.
@@ -402,17 +403,21 @@ def theta_R_from_RND(n_RND = int(1E6)):
     
     | :math:`\theta_{R} = \mbox{arccos}(\sqrt[3]{u + v} + \sqrt[3]{u - v})`
     | with
-    | :math:`u = -2(2 \chi - 1)`
-    | :math:`v = \sqrt{4(2 \chi - 1)^2 + 1}`
-    | in which :math:`\chi` is a random number in the interval [0, 1)
+    | :math:`u = -2(2 \xi - 1)`
+    | :math:`v = \sqrt{4(2 \xi - 1)^2 + 1}`
+    | in which :math:`\xi` is a random number in the interval [0, 1)
 
     :param n_RND: number of random numbers [-] (default to int(1E6))
     :type n_RND: int
+
+    :param seed_RND: seed for the random number generator np.random.default_rng() [-] (default to None)
+    :type seed_RND: int
     
     :return: - **theta** (*np.ndarray*) – scattering angle [degrees]
     '''
     
-    xi = np.random.rand(n_RND)
+    rng = np.random.default_rng(seed = seed_RND)
+    xi = rng.uniform(0., 1., size = n_RND)
     two_times_xi_minus_one = 2*xi - 1
     term1 = -2*two_times_xi_minus_one
     term2 = np.sqrt(4*two_times_xi_minus_one**2 + 1)
@@ -420,7 +425,7 @@ def theta_R_from_RND(n_RND = int(1E6)):
     return np.arccos(np.cbrt(term1 + term2) + np.cbrt(term1 - term2))*180/np.pi
 
 
-def theta_HG_from_RND(g, n_RND = int(1E6)):
+def theta_HG_from_RND(g, n_RND = int(1E6), seed_RND = None):
     r'''
     | The scattering angle distribution as a function of the anisotropy factor and a set of random
     | numbers uniformly distributed over the interval [0, 1), assuming the Henyey-Greenstein
@@ -429,11 +434,11 @@ def theta_HG_from_RND(g, n_RND = int(1E6)):
     
     :math:`\theta_{HG} =  
     \left \{ \begin{matrix}
-    \mbox{arccos}(2 \chi - 1) , & \mbox{if } g = 0 \\
-    \mbox{arccos}\left\{\frac{1}{2g} \left[1 + g^2 - \left(\frac{1 - g^2}{1 - g + 2g \chi}\right)^2\right]\right\}, & \mbox{if } g \ne 0
+    \mbox{arccos}(2 \xi - 1) , & \mbox{if } g = 0 \\
+    \mbox{arccos}\left\{\frac{1}{2g} \left[1 + g^2 - \left(\frac{1 - g^2}{1 - g + 2g \xi}\right)^2\right]\right\}, & \mbox{if } g \ne 0
     \end{matrix} \right.` 
    
-    in which :math:`\chi` is a random number in the interval [0, 1)
+    in which :math:`\xi` is a random number in the interval [0, 1)
 
     In this particular model :math:`g` is the anisotropy factor.
 
@@ -442,6 +447,9 @@ def theta_HG_from_RND(g, n_RND = int(1E6)):
     
     :param n_RND: number of random numbers [-] (default to int(1E6))
     :type n_RND: int
+
+    :param seed_RND: seed for the random number generator np.random.default_rng() [-] (default to None)
+    :type seed_RND: int
     
     :return: - **theta** (*np.ndarray*) – scattering angle [degrees]
     '''
@@ -450,7 +458,8 @@ def theta_HG_from_RND(g, n_RND = int(1E6)):
         msg = 'The input g = {} is out of the range [-1, 1].'.format(g)
         raise Exception(msg)
     
-    xi = np.random.rand(n_RND)
+    rng = np.random.default_rng(seed = seed_RND)
+    xi = rng.uniform(0., 1., size = n_RND)
     if g == 0:    
         theta_HG = np.arccos(2*xi - 1)*180./np.pi
     else:
@@ -465,9 +474,9 @@ def theta_U2_from_RND(g, n_RND = int(1E6)):
     | scattering phase function.
     | For details please check section 4.4.2 from Baes, Camps & Kapoor 2022 [BCK22].
     
-    :math:`\theta_{U2} = arccos\left[\frac{(1 + g)^2 - 2 \chi (1 + g^2)}{(1 + g)^2 - 4g \chi}\right]`
+    :math:`\theta_{U2} = arccos\left[\frac{(1 + g)^2 - 2 \xi (1 + g^2)}{(1 + g)^2 - 4g \xi}\right]`
 
-    in which :math:`\chi` is a random number in the interval [0, 1)
+    in which :math:`\xi` is a random number in the interval [0, 1)
 
     | In this model :math:`g` is NOT the anisotropy factor.
 
@@ -476,11 +485,15 @@ def theta_U2_from_RND(g, n_RND = int(1E6)):
     
     :param n_RND: number of random numbers [-] (default to int(1E6))
     :type n_RND: int
+
+    :param seed_RND: seed for the random number generator np.random.default_rng() [-] (default to None)
+    :type seed_RND: int
     
     :return: - **theta** (*np.ndarray*) – scattering angle [degrees]
     '''
     
-    xi = np.random.rand(n_RND)
+    rng = np.random.default_rng(seed = seed_RND)
+    xi = rng.uniform(0., 1., size = n_RND)
     
     return np.arccos(((1 + g)**2 - 2*xi*(1 + g**2))/((1 + g)**2 - 4*g*xi))*180./np.pi
 

skinoptics/colors.py

@@ -1,6 +1,6 @@
 '''
 | SkinOptics
-| Copyright (C) 2024 Victor Lima
+| Copyright (C) 2024-2025 Victor Lima
 
     | This program is free software: you can redistribute it and/or modify
     | it under the terms of the GNU General Public License as published by
@@ -18,10 +18,11 @@
 | Victor Lima
 | victorporto\@ifsc.usp.br
 | victor.lima\@ufscar.br
+| victorportog.github.io
 
-| Release Date:
+| Release date:
 | October 2024
-| Last Modification:
+| Last modification:
 | October 2024
 
 | References:

skinoptics/dataframes.py

@@ -1,6 +1,6 @@
 '''
 | SkinOptics
-| Copyright (C) 2024 Victor Lima
+| Copyright (C) 2024-2025 Victor Lima
 
     | This program is free software: you can redistribute it and/or modify
     | it under the terms of the GNU General Public License as published by
@@ -18,10 +18,11 @@
 | Victor Lima
 | victorporto\@ifsc.usp.br
 | victor.lima\@ufscar.br
+| victorportog.github.io
 
-| Release Date:
+| Release date:
 | October 2024
-| Last Modification:
+| Last modification:
 | March 2025
 
 | Example:

skinoptics/refractive_index.py

@@ -1,6 +1,6 @@
 '''
 | SkinOptics
-| Copyright (C) 2024 Victor Lima
+| Copyright (C) 2024-2025 Victor Lima
 
     | This program is free software: you can redistribute it and/or modify
     | it under the terms of the GNU General Public License as published by
@@ -18,10 +18,11 @@
 | Victor Lima
 | victorporto\@ifsc.usp.br
 | victor.lima\@ufscar.br
+| victorportog.github.io
 
-| Release Date:
+| Release date:
 | October 2024
-| Last Modification:
+| Last modification:
 | March 2025
 
 | References:

skinoptics/scattering_coefficient.py

@@ -1,6 +1,6 @@
 '''
 | SkinOptics
-| Copyright (C) 2024 Victor Lima
+| Copyright (C) 2024-2025 Victor Lima
 
     | This program is free software: you can redistribute it and/or modify
     | it under the terms of the GNU General Public License as published by
@@ -18,10 +18,11 @@
 | Victor Lima
 | victorporto\@ifsc.usp.br
 | victor.lima\@ufscar.br
+| victorportog.github.io
 
-| Release Date:
+| Release date:
 | October 2024
-| Last Modification:
+| Last modification:
 | October 2024
 
 | References:

skinoptics/utils.py

@@ -1,6 +1,6 @@
 '''
 | SkinOptics
-| Copyright (C) 2024 Victor Lima
+| Copyright (C) 2024-2025 Victor Lima
 
     | This program is free software: you can redistribute it and/or modify
     | it under the terms of the GNU General Public License as published by
@@ -18,10 +18,11 @@
 | Victor Lima
 | victorporto\@ifsc.usp.br
 | victor.lima\@ufscar.br
+| victorportog.github.io
 
-| Release Date:
+| Release date:
 | October 2024
-| Last Modification:
+| Last modification:
 | October 2024
 
 | References:

{skinoptics-0.0.1b6.dist-info → skinoptics-0.0.1b8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skinoptics
-Version: 0.0.1b6
+Version: 0.0.1b8
 Summary: SkinOptics: a python package with tools for building human skin computational models for Monte Carlo simulations of light transport
 Author-email: Victor Lima <victorporto@ifsc.usp.br>
 Project-URL: Homepage, https://github.com/victorportog/skinoptics

{skinoptics-0.0.1b6.dist-info → skinoptics-0.0.1b8.dist-info}/RECORD

@@ -1,11 +1,11 @@
-skinoptics/__init__.py,sha256=nOnK6ysDy0kcY2coRiHN6dW63XDVC64b3QD_sup6Vbg,1544
-skinoptics/absorption_coefficient.py,sha256=2CnxVqR_Ah5t6T3jZ7UXOvff7WTxLNZcbw6akk4zCM4,36261
-skinoptics/anisotropy_factor.py,sha256=VU2L0mUBnXxDWhXnnF6t5pzmNT-9h0ubVM8QbOgF_jo,37941
-skinoptics/colors.py,sha256=xRYlsX4WIfibACAYnY_jIqcO6VORgsSsewXCr_j0mn8,56728
-skinoptics/dataframes.py,sha256=oSB8TIplsskYK8Nes3BnyduC_odFQ6oseojgb3FN8zU,6454
-skinoptics/refractive_index.py,sha256=IN8_rTb7cpdYZnUwxGlYLSM5Vnn_-QVRPoQbc6yEw-w,14963
-skinoptics/scattering_coefficient.py,sha256=w7mAmR3P5CoEvhg_7cqwZh1TSAN1mUtfat1uYIR6i2Q,15214
-skinoptics/utils.py,sha256=H53ZxsTErP8gpgR5VK1j-DuoO7JTFK1qpW7NYpq9QWw,10868
+skinoptics/__init__.py,sha256=-M2YualclZt5UL2jVzxUCT3Omok7IYVlf4snsAJaXZo,1572
+skinoptics/absorption_coefficient.py,sha256=f5mKTqgEiXKk0MDhPyL6t3w3jPDriJqI3R65U8mZNy8,36292
+skinoptics/anisotropy_factor.py,sha256=lSPJtMkvo7KKTQA3JE58N_VwPmKrw4J1ahf_OBPEDQA,38577
+skinoptics/colors.py,sha256=mUAQOyLiwM-PnLjDLNSz7Lt57iRBawXutsDxDwNMY4g,56759
+skinoptics/dataframes.py,sha256=EMN1Cr0gJu0TM5fZJTP5qk8Dfu5VqvhnxUq5mcS2zQQ,6485
+skinoptics/refractive_index.py,sha256=1zuSNIjy3KkbPH30YNbkPosASENTBtkxym8IML0Uy0A,14994
+skinoptics/scattering_coefficient.py,sha256=3rsbwkqD2OeHfmu9z8bEGCBJ1RTjKzPV9fSu78gtrco,15244
+skinoptics/utils.py,sha256=qjBM3B9mTIPsYZNvt4u32rd96mnn4bovOoZfA6Y7aNA,10899
 skinoptics/datasets/colors/Lab_Alaluf2002.txt,sha256=PEmAPud84qe7U7V0kQliYvPwng3NuT-9qKLqabQWMYo,610
 skinoptics/datasets/colors/Lab_Xiao2017.txt,sha256=fx7y84PN5OFSDH6Z4rUNML6U8QOnHDr7MTWoxvNFBRs,903
 skinoptics/datasets/colors/cmfs.txt,sha256=q4Veg2SoCipCBRj2DL5pSzEH5RW4YORUmXxyVytB7KE,44381
@@ -37,8 +37,8 @@ skinoptics/datasets/optical_properties/n_and_k_wat_Segelstein.txt,sha256=EZIS515
 skinoptics/datasets/optical_properties/oxy_and_deo_Bosschaart.txt,sha256=eF96Ao44TDUYRo6-8p0L7I9Q8h6wLNpEUyrcbo7FySA,24972
 skinoptics/datasets/spectra/Xiao2016/skindatabaseSpectra/readmeSpectra.docx,sha256=ren4htGe154BIlBridkvBvbc8AYY1RRmp4CVICYwDvc,15147
 skinoptics/datasets/spectra/Xiao2016/skindatabaseSpectra/skin spectra data.xlsx,sha256=z7shS1rZzqpaRGi_Ji0nYcSzIxEmADQOtaJ_Uwcotcc,1434709
-skinoptics-0.0.1b6.dist-info/licenses/LICENSE.txt,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-skinoptics-0.0.1b6.dist-info/METADATA,sha256=gpksH_TZve1pao8T6OP1b6Bed9cvILL80IN9q-Dtatk,1324
-skinoptics-0.0.1b6.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
-skinoptics-0.0.1b6.dist-info/top_level.txt,sha256=4NYJW3uliYlvbd-Zywg2MxJOGe4wYA7Oz_I5EZF4YEQ,11
-skinoptics-0.0.1b6.dist-info/RECORD,,
+skinoptics-0.0.1b8.dist-info/licenses/LICENSE.txt,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+skinoptics-0.0.1b8.dist-info/METADATA,sha256=6QgcxQ3fpJMWUZnjX7CIhunP90jZU_v56WDc8s7BzNo,1324
+skinoptics-0.0.1b8.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+skinoptics-0.0.1b8.dist-info/top_level.txt,sha256=4NYJW3uliYlvbd-Zywg2MxJOGe4wYA7Oz_I5EZF4YEQ,11
+skinoptics-0.0.1b8.dist-info/RECORD,,

{skinoptics-0.0.1b6.dist-info → skinoptics-0.0.1b8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.1)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any