diff --git a/stixdcpy/transmission.py b/stixdcpy/transmission.py index a20ed92..15f14dd 100644 --- a/stixdcpy/transmission.py +++ b/stixdcpy/transmission.py @@ -19,10 +19,15 @@ ('front_window', [('solarblack', 0.005 * u.mm), ('be-s200fh', 2 * u.mm)]), ('rear_window', [('be-s200fh', 1 * u.mm)]), ('grid_covers', [('kapton', 4 * 2 * MIL_SI)]), - ('dem', [('kapton', 2 * 3 * MIL_SI)]), + ('dem', [ + ('kapton', 2 * 3 * MIL_SI), + ('al', 2 * 1000 * u.angstrom) + ]), ('attenuator', [('alum7075', 0.6 * u.mm)]), - ('mli', [('al', 1000 * u.angstrom), ('kapton', 3 * MIL_SI), - ('al', 40 * 1000 * u.angstrom), ('mylar', 20 * 0.25 * MIL_SI), + ('mli', [('al', 1000 * u.angstrom), + ('kapton', 3 * MIL_SI), + ('al', 40 * 1000 * u.angstrom), + ('mylar', 20 * 0.25 * MIL_SI), ('pet', 21 * 0.005 * u.mm), ('kapton', 3 * MIL_SI), ('al', 1000 * u.angstrom)]), ('calibration_foil', [('al', 4 * 1000 * u.angstrom), diff --git a/tests/.ipynb_checkpoints/STIX_transmission_calculator-checkpoint.ipynb b/tests/.ipynb_checkpoints/STIX_transmission_calculator-checkpoint.ipynb index b47612a..9721c77 100644 --- a/tests/.ipynb_checkpoints/STIX_transmission_calculator-checkpoint.ipynb +++ b/tests/.ipynb_checkpoints/STIX_transmission_calculator-checkpoint.ipynb @@ -2052,7 +2052,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 5, "id": "0d4fd443", "metadata": {}, "outputs": [], @@ -2063,6 +2063,7 @@ " energies=np.linspace(3,150,10000)\n", " ebins=energies.reshape((-1,2))\n", " stran=tr.Transmission(matlist=matlist)\n", + " stran.load_components(matlist)\n", " factors=stran.get_detector_transmission(detector_id,\n", " ebins, attenuator=att)\n", " ex=np.mean(ebins,axis=1)\n", @@ -2074,7 +2075,7 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": 6, "id": "bd0e9df4", "metadata": {}, "outputs": [ @@ -3046,7 +3047,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -3074,17 +3075,17 @@ }, { "cell_type": "code", - "execution_count": 28, + "execution_count": 7, "id": "3e6da957", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "0.07137356592152594" + "0.07126448935968355" ] }, - "execution_count": 28, + "execution_count": 7, "metadata": {}, "output_type": "execute_result" } @@ -3095,7 +3096,7 @@ }, { "cell_type": "code", - "execution_count": 33, + "execution_count": 8, "id": "19cc80f6", "metadata": {}, "outputs": [ @@ -4067,7 +4068,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -4105,17 +4106,17 @@ }, { "cell_type": "code", - "execution_count": 32, + "execution_count": 9, "id": "52788745", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "0.9979693946957324" + "0.9979693946957326" ] }, - "execution_count": 32, + "execution_count": 9, "metadata": {}, "output_type": "execute_result" } @@ -4126,7 +4127,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 10, "id": "9c62d3b1", "metadata": {}, "outputs": [ @@ -5098,7 +5099,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -5111,7 +5112,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "Compound(Compound(kapton 0.15239999999999998 mm 1430.0 kg / m3))\n" + "Compound(Compound(kapton 0.15239999999999998 mm 1430.0 kg / m3al 2000.0 Angstrom 2700.0 kg / m3))\n" ] } ], @@ -5145,6 +5146,22 @@ "metadata": {}, "outputs": [], "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "159601a0", + "metadata": {}, + "outputs": [], + "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "19479945", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/tests/STIX_transmission_calculator.ipynb b/tests/STIX_transmission_calculator.ipynb index b47612a..9721c77 100644 --- a/tests/STIX_transmission_calculator.ipynb +++ b/tests/STIX_transmission_calculator.ipynb @@ -2052,7 +2052,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 5, "id": "0d4fd443", "metadata": {}, "outputs": [], @@ -2063,6 +2063,7 @@ " energies=np.linspace(3,150,10000)\n", " ebins=energies.reshape((-1,2))\n", " stran=tr.Transmission(matlist=matlist)\n", + " stran.load_components(matlist)\n", " factors=stran.get_detector_transmission(detector_id,\n", " ebins, attenuator=att)\n", " ex=np.mean(ebins,axis=1)\n", @@ -2074,7 +2075,7 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": 6, "id": "bd0e9df4", "metadata": {}, "outputs": [ @@ -3046,7 +3047,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -3074,17 +3075,17 @@ }, { "cell_type": "code", - "execution_count": 28, + "execution_count": 7, "id": "3e6da957", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "0.07137356592152594" + "0.07126448935968355" ] }, - "execution_count": 28, + "execution_count": 7, "metadata": {}, "output_type": "execute_result" } @@ -3095,7 +3096,7 @@ }, { "cell_type": "code", - "execution_count": 33, + "execution_count": 8, "id": "19cc80f6", "metadata": {}, "outputs": [ @@ -4067,7 +4068,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -4105,17 +4106,17 @@ }, { "cell_type": "code", - "execution_count": 32, + "execution_count": 9, "id": "52788745", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "0.9979693946957324" + "0.9979693946957326" ] }, - "execution_count": 32, + "execution_count": 9, "metadata": {}, "output_type": "execute_result" } @@ -4126,7 +4127,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 10, "id": "9c62d3b1", "metadata": {}, "outputs": [ @@ -5098,7 +5099,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -5111,7 +5112,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "Compound(Compound(kapton 0.15239999999999998 mm 1430.0 kg / m3))\n" + "Compound(Compound(kapton 0.15239999999999998 mm 1430.0 kg / m3al 2000.0 Angstrom 2700.0 kg / m3))\n" ] } ], @@ -5145,6 +5146,22 @@ "metadata": {}, "outputs": [], "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "159601a0", + "metadata": {}, + "outputs": [], + "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "19479945", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": {