fixes so that effective area tests pass (#310)

* Fix paths to spectral model files in temperature response The path to the model for hybrid abundances and photospheric abundances were switched. * Fix atol in test_temperature_response_coronal.py Made atol scaled to temperature response to provide a more stringent test. * Fix atol in test_temperature_response_hybrid.py Made atol scaled to temperature response to provide a more stringent test. * Fix atol in test_temperature_response_photospheric.py Made atol scaled to temperature response to provide a more stringent test. * Fix atol in test_temperature_response.py Made atol scaled to temperature response to provide a more stringent test. * Fix atol, rtol values in test_temperature_response.py Use atol and rtol values that should lead to passing all tests. * Fix atol, rtol values in test_temperature_response_coronal.py Use atol, rtol values that should lead to passing all tests. * Fix atol, rtol values in test_temperature_response_hybrid.py Use atol, rtol values that should lead to passing all tests. * Fix atol, rtol values in test_temperature_response_photospheric.py Use atol, rtol values that should lead to passing all tests. * Another fix to test_temperature_response_hybrid.py needed to scale atol to max value of temperature response * Another fix to test_temperature_response_coronal.py need to scale atol to the max value of temperature response * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Created new directory, image_correction, and moved xrt_remove_lightleak and xrt_deconvolve to that directory. Also moved associated tests and data * small changes to image_correction/__init__.py * Changed from print statements to logger in temperature_from_filter_ratio. Also added fits keywords HGLN_OBS and HGLT_OBS to returned map metadata. * Merge branch 'main' of https://github.com/jslavin/xrtpy --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
HinodeXRT · Dec 19, 2024 · e468feb · e468feb
1 parent c8fb333
commit e468feb
Show file tree

Hide file tree

Showing 101 changed files with 33,788 additions and 33,772 deletions.
diff --git a/xrtpy/response/effective_area.py b/xrtpy/response/effective_area.py
@@ -525,8 +525,7 @@ def _CCD_contamination_transmission(self):
     def wavelength(self):
         """Array of wavelengths for every X-ray channel in Angstroms (Å)."""
         _wave = self._channel.wavelength.to_value("AA")
-        delta_wave = 0.01
-        return np.arange(_wave[0], _wave[-1], delta_wave) * u.Angstrom
+        return _wave * u.Angstrom
 
     @property
     def channel_geometry_aperture_area(self):

diff --git a/...nse/tests/data/effective_area_IDL_testing_files/Al_med/Al_med_20060922_effective_area.txt b/...nse/tests/data/effective_area_IDL_testing_files/Al_med/Al_med_20060922_effective_area.txt
@@ -1,5 +1,5 @@
 Filter Al-med
-observation_date 22-Sept-2006 22:40:45
+observation_date 2006-09-22 22:40:45
 wavelength effective area
       1.00000   2.66387e-10
       1.10000   7.49534e-10
@@ -143,7 +143,7 @@ wavelength effective area
       14.9000    0.00132290
       15.0000    0.00115932
       15.1000    0.00101372
-      15.2000   0.000887360
+      15.2000   0.000887361
       15.3000   0.000775592
       15.4000   0.000676337
       15.5000   0.000588347
@@ -159,7 +159,7 @@ wavelength effective area
       16.5000   0.000136229
       16.6000   0.000116809
       16.7000   0.000100283
-      16.8000   8.57477e-05
+      16.8000   8.57478e-05
       16.9000   7.30103e-05
       17.0000   6.22291e-05
       17.1000   5.31010e-05
@@ -290,7 +290,7 @@ wavelength effective area
       29.6000   2.14983e-18
       29.7000   1.56707e-18
       29.8000   1.11505e-18
-      29.9000   8.38542e-19
+      29.9000   8.38543e-19
       30.0000   5.68737e-19
       30.1000   4.39320e-19
       30.2000   3.10338e-19
@@ -327,7 +327,7 @@ wavelength effective area
       33.3000   7.19747e-24
       33.4000   5.40716e-24
       33.5000   3.62273e-24
-      33.6000   2.47039e-24
+      33.6000   2.47038e-24
       33.7000   1.79917e-24
       33.8000   1.13007e-24
       33.9000   8.30977e-25
@@ -1795,7 +1795,7 @@ wavelength effective area
       180.100   5.76309e-10
       180.200   5.80552e-10
       180.300   5.84819e-10
-      180.400   5.89120e-10
+      180.400   5.89121e-10
       180.500   5.93450e-10
       180.600   5.97802e-10
       180.700   6.02184e-10
@@ -1811,7 +1811,7 @@ wavelength effective area
       181.700   6.49425e-10
       181.800   6.54351e-10
       181.900   6.59312e-10
-      182.000   6.64312e-10
+      182.000   6.64313e-10
       182.100   6.69340e-10
       182.200   6.74414e-10
       182.300   6.79513e-10
@@ -1846,7 +1846,7 @@ wavelength effective area
       185.200   8.68792e-10
       185.300   8.76924e-10
       185.400   8.85119e-10
-      185.500   8.93370e-10
+      185.500   8.93371e-10
       185.600   9.01688e-10
       185.700   9.10076e-10
       185.800   9.18521e-10
@@ -2039,21 +2039,21 @@ wavelength effective area
       204.500   8.05045e-10
       204.600   7.96520e-10
       204.700   7.88093e-10
-      204.800   7.79769e-10
+      204.800   7.79768e-10
       204.900   7.71539e-10
       205.000   7.63402e-10
       205.100   7.55357e-10
       205.200   7.47401e-10
       205.300   7.39537e-10
       205.400   7.31760e-10
       205.500   7.24069e-10
-      205.600   7.15898e-10
+      205.600   7.15899e-10
       205.700   7.07307e-10
       205.800   6.98745e-10
-      205.900   6.90296e-10
+      205.900   6.90295e-10
       206.000   6.81955e-10
       206.100   6.73714e-10
-      206.200   6.65571e-10
+      206.200   6.65572e-10
       206.300   6.57532e-10
       206.400   6.49591e-10
       206.500   6.41740e-10
@@ -2182,7 +2182,7 @@ wavelength effective area
       218.800   8.80943e-11
       218.900   8.66014e-11
       219.000   8.51330e-11
-      219.100   8.36891e-11
+      219.100   8.36892e-11
       219.200   8.22698e-11
       219.300   8.08740e-11
       219.400   7.95012e-11
@@ -2201,8 +2201,8 @@ wavelength effective area
       220.700   6.36070e-11
       220.800   6.25214e-11
       220.900   6.14545e-11
-      221.000   6.04049e-11
-      221.100   5.93725e-11
+      221.000   6.04050e-11
+      221.100   5.93726e-11
       221.200   5.83578e-11
       221.300   5.73598e-11
       221.400   5.63783e-11
@@ -2329,12 +2329,12 @@ wavelength effective area
       233.500   6.27684e-12
       233.600   6.15651e-12
       233.700   6.03841e-12
-      233.800   5.90807e-12
+      233.800   5.90808e-12
       233.900   5.77864e-12
       234.000   5.65193e-12
       234.100   5.52800e-12
       234.200   5.40676e-12
-      234.300   5.28812e-12
+      234.300   5.28813e-12
       234.400   5.17205e-12
       234.500   5.05849e-12
       234.600   4.94736e-12
@@ -2474,7 +2474,7 @@ wavelength effective area
       248.000   2.26208e-13
       248.100   2.20928e-13
       248.200   2.15768e-13
-      248.300   2.10725e-13
+      248.300   2.10726e-13
       248.400   2.05799e-13
       248.500   2.00985e-13
       248.600   1.96282e-13
@@ -2632,7 +2632,7 @@ wavelength effective area
       263.800   8.56143e-15
       263.900   8.47559e-15
       264.000   8.39058e-15
-      264.100   8.30641e-15
+      264.100   8.30642e-15
       264.200   8.22308e-15
       264.300   8.14065e-15
       264.400   8.05904e-15
@@ -2685,7 +2685,7 @@ wavelength effective area
       269.100   5.04196e-15
       269.200   4.99262e-15
       269.300   4.94377e-15
-      269.400   4.89541e-15
+      269.400   4.89542e-15
       269.500   4.84755e-15
       269.600   4.80024e-15
       269.700   4.75338e-15
@@ -2711,7 +2711,7 @@ wavelength effective area
       271.700   3.91314e-15
       271.800   3.87550e-15
       271.900   3.83824e-15
-      272.000   3.80135e-15
+      272.000   3.80136e-15
       272.100   3.76483e-15
       272.200   3.72866e-15
       272.300   3.69286e-15
@@ -2924,7 +2924,7 @@ wavelength effective area
       293.000   4.41909e-16
       293.100   4.37400e-16
       293.200   4.32938e-16
-      293.300   4.28522e-16
+      293.300   4.28523e-16
       293.400   4.24159e-16
       293.500   4.19840e-16
       293.600   4.15569e-16
@@ -3152,7 +3152,7 @@ wavelength effective area
       314.950   6.55476e-17
       315.047   6.50780e-17
       315.144   6.46118e-17
-      315.241   6.41490e-17
+      315.241   6.41491e-17
       315.338   6.36899e-17
       315.435   6.32341e-17
       315.532   6.27818e-17
@@ -3424,12 +3424,12 @@ wavelength effective area
       342.438   9.49655e-18
       342.544   9.42293e-18
       342.649   9.35046e-18
-      342.754   9.27868e-18
+      342.754   9.27869e-18
       342.860   9.20665e-18
       342.965   9.13585e-18
       343.071   9.06504e-18
       343.176   8.99537e-18
-      343.282   8.92555e-18
+      343.282   8.92556e-18
       343.388   8.85635e-18
       343.493   8.78880e-18
       343.599   8.72530e-18
@@ -3527,7 +3527,7 @@ wavelength effective area
       353.004   4.66867e-18
       353.098   4.64047e-18
       353.192   4.61245e-18
-      353.287   4.58435e-18
+      353.287   4.58436e-18
       353.381   4.55673e-18
       353.475   4.52930e-18
       353.569   4.50201e-18
@@ -3871,7 +3871,7 @@ wavelength effective area
       386.895   6.29435e-19
       386.998   6.27358e-19
       387.101   6.25287e-19
-      387.204   6.23221e-19
+      387.204   6.23222e-19
       387.308   6.21153e-19
       387.411   6.19111e-19
       387.514   6.17077e-19
@@ -3907,7 +3907,7 @@ wavelength effective area
       390.625   5.59657e-19
       390.729   5.57856e-19
       390.833   5.56064e-19
-      390.937   5.54280e-19
+      390.937   5.54281e-19
       391.041   5.52505e-19
       391.145   5.50733e-19
       391.250   5.48957e-19
@@ -3923,12 +3923,12 @@ wavelength effective area
       392.294   5.31698e-19
       392.398   5.30020e-19
       392.503   5.28333e-19
-      392.607   5.26666e-19
+      392.607   5.26667e-19
       392.712   5.24997e-19
       392.817   5.23328e-19
       392.921   5.21689e-19
       393.026   5.20036e-19
-      393.131   5.18392e-19
+      393.131   5.18393e-19
       393.236   5.16752e-19
       393.340   5.15140e-19
       393.445   5.13519e-19
@@ -3968,15 +3968,15 @@ wavelength effective area
       397.026   4.61895e-19
       397.132   4.60466e-19
       397.238   4.59042e-19
-      397.344   4.57620e-19
+      397.344   4.57621e-19
       397.450   4.56207e-19
       397.556   4.54795e-19
       397.662   4.53389e-19
       397.768   4.51989e-19
       397.874   4.50597e-19
       397.980   4.49202e-19
       398.086   4.47818e-19
-      398.192   4.46433e-19
+      398.192   4.46434e-19
       398.298   4.45055e-19
       398.404   4.43686e-19
       398.510   4.42316e-19