From 509e14e6c070f40e7caf0abc8ae79ce7c58ab029 Mon Sep 17 00:00:00 2001
From: Roy Smart <roytsmart@gmail.com>
Date: Sat, 28 Sep 2024 13:57:33 -0600
Subject: [PATCH 1/2] Renamed `optika.sensors.E2VCCDAIAMaterial` to
`E2VCCD203Material`.
---
optika/sensors/__init__.py | 4 ++--
optika/sensors/_materials/__init__.py | 4 ++--
optika/sensors/_materials/_e2v_ccd203/__init__.py | 5 +++++
.../_e2v_ccd_aia.py => _e2v_ccd203/_e2v_ccd203.py} | 8 ++++----
.../_e2v_ccd203_test.py} | 4 ++--
.../e2v_ccd203_qe_boerner2012.csv} | 0
optika/sensors/_materials/_e2v_ccd_aia/__init__.py | 5 -----
7 files changed, 15 insertions(+), 15 deletions(-)
create mode 100644 optika/sensors/_materials/_e2v_ccd203/__init__.py
rename optika/sensors/_materials/{_e2v_ccd_aia/_e2v_ccd_aia.py => _e2v_ccd203/_e2v_ccd203.py} (95%)
rename optika/sensors/_materials/{_e2v_ccd_aia/_e2v_ccd_aia_test.py => _e2v_ccd203/_e2v_ccd203_test.py} (77%)
rename optika/sensors/_materials/{_e2v_ccd_aia/e2v_ccd_aia_qe_boerner2012.csv => _e2v_ccd203/e2v_ccd203_qe_boerner2012.csv} (100%)
delete mode 100644 optika/sensors/_materials/_e2v_ccd_aia/__init__.py
diff --git a/optika/sensors/__init__.py b/optika/sensors/__init__.py
index cf181e4..1c178c2 100644
--- a/optika/sensors/__init__.py
+++ b/optika/sensors/__init__.py
@@ -24,7 +24,7 @@
AbstractStern1994BackilluminatedCCDMaterial,
TektronixTK512CBMaterial,
E2VCCD97Material,
- E2VCCDAIAMaterial,
+ E2VCCD203Material,
)
from ._sensors import (
AbstractImagingSensor,
@@ -53,7 +53,7 @@
"AbstractStern1994BackilluminatedCCDMaterial",
"TektronixTK512CBMaterial",
"E2VCCD97Material",
- "E2VCCDAIAMaterial",
+ "E2VCCD203Material",
"AbstractImagingSensor",
"ImagingSensor",
"AbstractCCD",
diff --git a/optika/sensors/_materials/__init__.py b/optika/sensors/_materials/__init__.py
index 1279f34..d4dd5aa 100644
--- a/optika/sensors/_materials/__init__.py
+++ b/optika/sensors/_materials/__init__.py
@@ -24,7 +24,7 @@
)
from ._tektronix_tk512cb import TektronixTK512CBMaterial
from ._e2v_ccd97 import E2VCCD97Material
-from ._e2v_ccd_aia import E2VCCDAIAMaterial
+from ._e2v_ccd203 import E2VCCD203Material
__all__ = [
"charge_diffusion",
@@ -47,5 +47,5 @@
"AbstractStern1994BackilluminatedCCDMaterial",
"TektronixTK512CBMaterial",
"E2VCCD97Material",
- "E2VCCDAIAMaterial",
+ "E2VCCD203Material",
]
diff --git a/optika/sensors/_materials/_e2v_ccd203/__init__.py b/optika/sensors/_materials/_e2v_ccd203/__init__.py
new file mode 100644
index 0000000..41e1b5c
--- /dev/null
+++ b/optika/sensors/_materials/_e2v_ccd203/__init__.py
@@ -0,0 +1,5 @@
+from ._e2v_ccd203 import E2VCCD203Material
+
+__all__ = [
+ "E2VCCD203Material",
+]
diff --git a/optika/sensors/_materials/_e2v_ccd_aia/_e2v_ccd_aia.py b/optika/sensors/_materials/_e2v_ccd203/_e2v_ccd203.py
similarity index 95%
rename from optika/sensors/_materials/_e2v_ccd_aia/_e2v_ccd_aia.py
rename to optika/sensors/_materials/_e2v_ccd203/_e2v_ccd203.py
index 7d83512..0b568e1 100644
--- a/optika/sensors/_materials/_e2v_ccd_aia/_e2v_ccd_aia.py
+++ b/optika/sensors/_materials/_e2v_ccd203/_e2v_ccd203.py
@@ -5,11 +5,11 @@
from .._materials import AbstractStern1994BackilluminatedCCDMaterial
__all__ = [
- "E2VCCDAIAMaterial",
+ "E2VCCD203Material",
]
-class E2VCCDAIAMaterial(
+class E2VCCD203Material(
AbstractStern1994BackilluminatedCCDMaterial,
):
"""
@@ -32,7 +32,7 @@ class E2VCCDAIAMaterial(
import optika
# Create a new instance of the e2v CCD97 light-sensitive material
- material_ccd_aia = optika.sensors.E2VCCDAIAMaterial()
+ material_ccd_aia = optika.sensors.E2VCCD203Material()
# Store the wavelengths at which the QE was measured
wavelength_measured = material_ccd_aia.quantum_efficiency_measured.inputs
@@ -121,7 +121,7 @@ def quantum_efficiency_measured(self) -> na.FunctionArray:
wavelength_4,
qe_4,
) = np.genfromtxt(
- fname=directory / "e2v_ccd_aia_qe_boerner2012.csv",
+ fname=directory / "e2v_ccd203_qe_boerner2012.csv",
skip_header=2,
delimiter=",",
unpack=True,
diff --git a/optika/sensors/_materials/_e2v_ccd_aia/_e2v_ccd_aia_test.py b/optika/sensors/_materials/_e2v_ccd203/_e2v_ccd203_test.py
similarity index 77%
rename from optika/sensors/_materials/_e2v_ccd_aia/_e2v_ccd_aia_test.py
rename to optika/sensors/_materials/_e2v_ccd203/_e2v_ccd203_test.py
index 2f44f80..d35cf71 100644
--- a/optika/sensors/_materials/_e2v_ccd_aia/_e2v_ccd_aia_test.py
+++ b/optika/sensors/_materials/_e2v_ccd203/_e2v_ccd203_test.py
@@ -6,10 +6,10 @@
@pytest.mark.parametrize(
argnames="a",
argvalues=[
- optika.sensors.E2VCCDAIAMaterial(),
+ optika.sensors.E2VCCD203Material(),
],
)
-class TestE2VCCD9AIAMaterial(
+class TestE2VCCD203Material(
AbstractTestAbstractStern1994BackilluminatedCCDMaterial,
):
pass
diff --git a/optika/sensors/_materials/_e2v_ccd_aia/e2v_ccd_aia_qe_boerner2012.csv b/optika/sensors/_materials/_e2v_ccd203/e2v_ccd203_qe_boerner2012.csv
similarity index 100%
rename from optika/sensors/_materials/_e2v_ccd_aia/e2v_ccd_aia_qe_boerner2012.csv
rename to optika/sensors/_materials/_e2v_ccd203/e2v_ccd203_qe_boerner2012.csv
diff --git a/optika/sensors/_materials/_e2v_ccd_aia/__init__.py b/optika/sensors/_materials/_e2v_ccd_aia/__init__.py
deleted file mode 100644
index 193b428..0000000
--- a/optika/sensors/_materials/_e2v_ccd_aia/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from ._e2v_ccd_aia import E2VCCDAIAMaterial
-
-__all__ = [
- "E2VCCDAIAMaterial",
-]
From ebe23b26e04f0cd876a38fd6618f9fb1dc911a04 Mon Sep 17 00:00:00 2001
From: Roy Smart <roytsmart@gmail.com>
Date: Sat, 28 Sep 2024 14:07:23 -0600
Subject: [PATCH 2/2] doc fixes
---
optika/sensors/_materials/_e2v_ccd97/_e2v_ccd97.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/optika/sensors/_materials/_e2v_ccd97/_e2v_ccd97.py b/optika/sensors/_materials/_e2v_ccd97/_e2v_ccd97.py
index f1407f1..2d13a4b 100644
--- a/optika/sensors/_materials/_e2v_ccd97/_e2v_ccd97.py
+++ b/optika/sensors/_materials/_e2v_ccd97/_e2v_ccd97.py
@@ -112,11 +112,11 @@ class E2VCCD97Material(
|
Now plot the effective quantum efficiency of the fit to this data vs. the fit
- to the data in :class:`optika.sensors.E2VCCDAIAMaterial`
+ to the data in :class:`optika.sensors.E2VCCD203Material`
.. jupyter-execute::
- material_ccd_aia = optika.sensors.E2VCCDAIAMaterial()
+ material_ccd_aia = optika.sensors.E2VCCD203Material()
qe_fit_aia = material_ccd_aia.quantum_efficiency_effective(
rays=optika.rays.RayVectorArray(