Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed optika.sensors.E2VCCDAIAMaterial to E2VCCD203Material. #81

Merged
merged 2 commits into from
Sep 28, 2024
Merged

Renamed optika.sensors.E2VCCDAIAMaterial to E2VCCD203Material. #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
509e14e
Renamed `optika.sensors.E2VCCDAIAMaterial` to `E2VCCD203Material`.
byrdie Sep 28, 2024
ebe23b2
doc fixes
byrdie Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions optika/sensors/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
AbstractStern1994BackilluminatedCCDMaterial,
TektronixTK512CBMaterial,
E2VCCD97Material,
E2VCCDAIAMaterial,
E2VCCD203Material,
)
from ._sensors import (
AbstractImagingSensor,
Expand Down Expand Up @@ -53,7 +53,7 @@
"AbstractStern1994BackilluminatedCCDMaterial",
"TektronixTK512CBMaterial",
"E2VCCD97Material",
"E2VCCDAIAMaterial",
"E2VCCD203Material",
"AbstractImagingSensor",
"ImagingSensor",
"AbstractCCD",
Expand Down
4 changes: 2 additions & 2 deletions optika/sensors/_materials/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -47,5 +47,5 @@
"AbstractStern1994BackilluminatedCCDMaterial",
"TektronixTK512CBMaterial",
"E2VCCD97Material",
"E2VCCDAIAMaterial",
"E2VCCD203Material",
]
5 changes: 5 additions & 0 deletions optika/sensors/_materials/_e2v_ccd203/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from ._e2v_ccd203 import E2VCCD203Material

__all__ = [
"E2VCCD203Material",
]
8 changes: 4 additions & 4 deletions ...s/_materials/_e2v_ccd_aia/_e2v_ccd_aia.py → ...ors/_materials/_e2v_ccd203/_e2v_ccd203.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
from .._materials import AbstractStern1994BackilluminatedCCDMaterial

__all__ = [
"E2VCCDAIAMaterial",
"E2VCCD203Material",
]


class E2VCCDAIAMaterial(
class E2VCCD203Material(
AbstractStern1994BackilluminatedCCDMaterial,
):
"""
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions ...terials/_e2v_ccd_aia/_e2v_ccd_aia_test.py → ...materials/_e2v_ccd203/_e2v_ccd203_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
@pytest.mark.parametrize(
argnames="a",
argvalues=[
optika.sensors.E2VCCDAIAMaterial(),
optika.sensors.E2VCCD203Material(),
],
)
class TestE2VCCD9AIAMaterial(
class TestE2VCCD203Material(
AbstractTestAbstractStern1994BackilluminatedCCDMaterial,
):
pass
0 ...2v_ccd_aia/e2v_ccd_aia_qe_boerner2012.csv → ..._e2v_ccd203/e2v_ccd203_qe_boerner2012.csv
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions optika/sensors/_materials/_e2v_ccd97/_e2v_ccd97.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
5 changes: 0 additions & 5 deletions optika/sensors/_materials/_e2v_ccd_aia/__init__.py
View file
Open in desktop

This file was deleted.

Loading