forked from i4Ds/STIX-GSW
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into XSPEC-conversion
* main: (45 commits) Add silent keyword and print ELUT name (i4Ds#201) Update of "stx_estimate_flare_location" (i4Ds#209) Automatic formatting Update VERSION.txt Lightcurve demo fix (i4Ds#208) Spectroscopy demo fix (i4Ds#207) fixed i4Ds#205 (fix by Dominic Zarro) Update VERSION.txt Update stx_imaging_demo (i4Ds#203) Remove unused keyword from structure Add IDL_STARTUP file to stix/setup which will be run every time SSWIDL is started. Currently this only calls stx_check_config_files (i4Ds#196) Skip ELUT (i4Ds#182) Bugfix release stx_read_fits : uncommented call to mrdfits to prevent compilation issue when getting version number preparing a new release Fixed bug in selection of energy indices of pixel data matrix (i4Ds#185) stx_subc_transmission: Improved accuracy of message displayed if simple_transm keyword is set. Update by Massa, P. - use simplified version of the subcollimator transmission for imaging (temporary solution) Some Improvement in aspect processing (i4Ds#179) Initial release of basic routines for downloading L2 AUX ephemeris files given a date and L1 science data fits files given a UID. (i4Ds#189) ... # Conflicts: # stix/idl/processing/spectrogram/stx_convert_pixel_data.pro # stix/idl/processing/spectrogram/stx_convert_spectrogram.pro # stix/idl/processing/spectrogram/stx_fsw_sd_spectrogram2ospex.pro # stix/idl/processing/spectrogram/stx_write_ospex_fits.pro
- Loading branch information
Showing
62 changed files
with
3,484 additions
and
980 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,3 +39,4 @@ stx_scenario_* | |
/*.fits | ||
|
||
.vscode | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
v0.4.0 | ||
v0.5.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,57 +1,57 @@ | ||
ENERGY BINNING,,,,,,,14-6-2019 | ||
,,,,,,,15-6-2019 | ||
Revised Suggestion for Science Energy Binning,,,,,,, | ||
,,,,,,, | ||
Criteria,,,,,,, | ||
,Quasi-Logarithmic spacing between Emin and Emax,,,,,, | ||
,Monatonically increasing bin width,,,,,, | ||
,Energy edges at integral values of keV,,,,,, | ||
,"Fine resolution through microflare regime, 4-15 keV",,,,,, | ||
,"Bracket Ba=133 lines at 31, 35 and 81 keV",,,,,, | ||
,Boundary at Tungsten K-edge at 70 keV,,,,,, | ||
,Include channels <4kev and >150keV,,,,,, | ||
,,,,,,, | ||
Basic constraint,,,,,,, | ||
,Emin,0,,,,, | ||
,Emax,>1000,,,,, | ||
,Number of bins,32,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
Channel Number,Channel Edge,Energy Edge ,Elower,Eupper ,BinWidth,dE/E,QL channel | ||
,,,,,,, | ||
,,,,,,, | ||
0,0,0,0,4,4,2,n/a | ||
1,1,4,4,5,1,0.222,0 | ||
2,2,5,5,6,1,0.182,0 | ||
3,3,6,6,7,1,0.154,0 | ||
4,4,7,7,8,1,0.133,0 | ||
5,5,8,8,9,1,0.118,0 | ||
6,6,9,9,10,1,0.105,0 | ||
7,7,10,10,11,1,0.095,1 | ||
8,8,11,11,12,1,0.087,1 | ||
9,9,12,12,13,1,0.08,1 | ||
10,10,13,13,14,1,0.074,1 | ||
11,11,14,14,15,1,0.069,1 | ||
12,12,15,15,16,1,0.065,2 | ||
13,13,16,16,18,2,0.061,2 | ||
14,14,18,18,20,2,0.105,2 | ||
15,15,20,20,22,2,0.095,2 | ||
16,16,22,22,25,3,0.128,2 | ||
17,17,25,25,28,3,0.113,3 | ||
18,18,28,28,32,4,0.133,3 | ||
19,19,32,32,36,4,0.118,3 | ||
20,20,36,36,40,4,0.105,3 | ||
21,21,40,40,45,5,0.118,3 | ||
22,22,45,45,50,5,0.105,3 | ||
23,23,50,50,56,6,0.113,4 | ||
24,24,56,56,63,7,0.118,4 | ||
25,25,63,63,70,7,0.105,4 | ||
26,26,70,70,76,6,0.082,4 | ||
27,27,76,76,84,8,0.1,4 | ||
28,28,84,84,100,16,0.174,4 | ||
29,29,100,100,120,20,0.182,4 | ||
30,30,120,120,150,30,0.222,4 | ||
31,31,150,150,maxADC,n/a,n/a,n/a | ||
,32,max ADC,,,,, | ||
ENERGY BINNING,,,,,,,14.06.19 | ||
,,,,,,,15.06.19 | ||
Revised Suggestion for Science Energy Binning,,,,,,, | ||
,,,,,,, | ||
Criteria,,,,,,, | ||
,Quasi-Logarithmic spacing between Emin and Emax,,,,,, | ||
,Monatonically increasing bin width,,,,,, | ||
,Energy edges at integral values of keV,,,,,, | ||
,"Fine resolution through microflare regime, 4-15 keV",,,,,, | ||
,"Bracket Ba=133 lines at 31, 35 and 81 keV",,,,,, | ||
,Boundary at Tungsten K-edge at 70 keV,,,,,, | ||
,Include channels <4kev and >150keV,,,,,, | ||
,,,,,,, | ||
Basic constraint,,,,,,, | ||
,Emin,0,,,,, | ||
,Emax,>1000,,,,, | ||
,Number of bins,32,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
Channel Number,Channel Edge,Energy Edge ,Elower,Eupper ,BinWidth,dE/E,QL channel | ||
,,,,,,, | ||
,,,,,,, | ||
0,0,0,0,4,4,2,n/a | ||
1,1,4,4,5,1,0.222,0 | ||
2,2,5,5,6,1,0.182,0 | ||
3,3,6,6,7,1,0.154,0 | ||
4,4,7,7,8,1,0.133,0 | ||
5,5,8,8,9,1,0.118,0 | ||
6,6,9,9,10,1,0.105,0 | ||
7,7,10,10,11,1,0.095,1 | ||
8,8,11,11,12,1,0.087,1 | ||
9,9,12,12,13,1,0.08,1 | ||
10,10,13,13,14,1,0.074,1 | ||
11,11,14,14,15,1,0.069,1 | ||
12,12,15,15,16,1,0.065,2 | ||
13,13,16,16,18,2,0.061,2 | ||
14,14,18,18,20,2,0.105,2 | ||
15,15,20,20,22,2,0.095,2 | ||
16,16,22,22,25,3,0.128,2 | ||
17,17,25,25,28,3,0.113,3 | ||
18,18,28,28,32,4,0.133,3 | ||
19,19,32,32,36,4,0.118,3 | ||
20,20,36,36,40,4,0.105,3 | ||
21,21,40,40,45,5,0.118,3 | ||
22,22,45,45,50,5,0.105,3 | ||
23,23,50,50,56,6,0.113,4 | ||
24,24,56,56,63,7,0.118,4 | ||
25,25,63,63,70,7,0.105,4 | ||
26,26,70,70,76,6,0.082,4 | ||
27,27,76,76,84,8,0.1,4 | ||
28,28,84,84,100,16,0.174,n/a | ||
29,29,100,100,120,20,0.182,n/a | ||
30,30,120,120,150,30,0.222,n/a | ||
31,31,150,150,maxADC,n/a,n/a,n/a | ||
,32,max ADC,,,,, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
ENERGY BINNING,,,,,,,16.12.22 | ||
,,,,,,, | ||
Revised Suggestion for Science Energy Binning,,,,,,, | ||
,,,,,,, | ||
Criteria,,,,,,, | ||
,Increasing bin width between 4 keV and 150 keV,,,,Include LLD and ULD channels < 4kev and > 150keV,, | ||
,"Fine (< 1kev) resolution through microflare regime, 4-11 keV",,,,"Bracket Ba-133 lines at 31, 35 and 81 keV",, | ||
,Bin centres at 6.7 and 8.0 keV (Fe and Fe/Ni line complexes),,,,,, | ||
,Sufficient coverage over full range,,,,,, | ||
,"Match current QL boundaries at 4, 10, 15, 25, 50, and 84 keV",,,,,, | ||
,Boundary at Tungsten K-edge at 70 keV,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
Basic constraint,,,,,,, | ||
,Emin,0,,,,, | ||
,Emax,>1000,,,,, | ||
,Number of bins,32,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
Channel Number,Channel Edge,Energy Edge ,Elower,Eupper ,BinWidth,dE/E,QL channel | ||
,,,,,,, | ||
,,,,,,, | ||
0,0,0,0,4,4,2,n/a | ||
1,1,4,4,4.45,0.45,0.106508876,0 | ||
2,2,4.45,4.45,4.95,0.5,0.106382979,0 | ||
3,3,4.95,4.95,5.45,0.5,0.096153846,0 | ||
4,4,5.45,5.45,5.95,0.5,0.087719298,0 | ||
5,5,5.95,5.95,6.45,0.5,0.080645161,0 | ||
6,6,6.45,6.45,6.95,0.5,0.074626866,0 | ||
7,7,6.95,6.95,7.35,0.4,0.055944056,0 | ||
8,8,7.35,7.35,7.75,0.4,0.052980132,0 | ||
9,9,7.75,7.75,8.25,0.5,0.0625,0 | ||
10,10,8.25,8.25,8.75,0.5,0.058823529,0 | ||
11,11,8.75,8.75,9.25,0.5,0.055555556,0 | ||
12,12,9.25,9.25,10,0.75,0.077922078,0 | ||
13,13,10,10,10.5,0.5,0.048780488,1 | ||
14,14,10.5,10.5,11,0.5,0.046511628,1 | ||
15,15,11,11,12,1,0.086956522,1 | ||
16,16,12,12,13,1,0.08,1 | ||
17,17,13,13,15,2,0.142857143,1 | ||
18,18,15,15,18,3,0.181818182,2 | ||
19,19,18,18,21,3,0.153846154,2 | ||
20,20,21,21,25,4,0.173913043,2 | ||
21,21,25,25,28,3,0.113207547,3 | ||
22,22,28,28,32,4,0.133333333,3 | ||
23,23,32,32,36,4,0.117647059,3 | ||
24,24,36,36,43,7,0.17721519,3 | ||
25,25,43,43,50,7,0.150537634,3 | ||
26,26,50,50,59,9,0.165137615,4 | ||
27,27,59,59,70,11,0.170542636,4 | ||
28,28,70,70,84,14,0.181818182,4 | ||
29,29,84,84,110,26,0.268041237,n/a | ||
30,30,110,110,150,40,0.307692308,n/a | ||
31,31,150,150,max ADC,n/a,n/a,n/a | ||
,32,max ADC,,,,, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
ENERGY BINNING,,,,,,,01.02.23 | ||
,,,,,,, | ||
Energy binning with masks reset after January 2023 fine energy test but ELUT unchanged.,,,,,,, | ||
,,,,,,, | ||
Criteria,,,,,,, | ||
,Increasing bin width between 4 keV and 150 keV,,,,Include LLD and ULD channels < 4kev and > 150keV,, | ||
,"Fine (< 1kev) resolution through microflare regime, 4-11 keV",,,,,, | ||
,Bin centres at 6.7 and 8.0 keV (Fe and Fe/Ni line complexes),,,,,, | ||
,Sufficient coverage over full range,,,,,, | ||
,"Bracket Ba-133 lines at 31, 35 and 81 keV",,,,,, | ||
,Boundary at Tungsten K-edge at 70 keV,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
Basic constraint,,,,,,, | ||
,Emin,0,,,,, | ||
,Emax,>1000,,,,, | ||
,Number of bins,32,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
Channel Number,Channel Edge,Energy Edge ,Elower,Eupper ,BinWidth,dE/E,QL channel | ||
,,,,,,, | ||
,,,,,,, | ||
0,0,0,0,4,4,2,n/a | ||
1,1,4,4,4.45,0.45,0.106508876,0 | ||
2,2,4.45,4.45,4.95,0.5,0.106382979,0 | ||
3,3,4.95,4.95,5.45,0.5,0.096153846,0 | ||
4,4,5.45,5.45,5.95,0.5,0.087719298,0 | ||
5,5,5.95,5.95,6.45,0.5,0.080645161,0 | ||
6,6,6.45,6.45,6.95,0.5,0.074626866,0 | ||
7,7,6.95,6.95,7.35,0.4,0.055944056,1 | ||
8,8,7.35,7.35,7.75,0.4,0.052980132,1 | ||
9,9,7.75,7.75,8.25,0.5,0.0625,1 | ||
10,10,8.25,8.25,8.75,0.5,0.058823529,1 | ||
11,11,8.75,8.75,9.25,0.5,0.055555556,1 | ||
12,12,9.25,9.25,10,0.75,0.077922078,2 | ||
13,13,10,10,10.5,0.5,0.048780488,2 | ||
14,14,10.5,10.5,11,0.5,0.046511628,2 | ||
15,15,11,11,12,1,0.086956522,2 | ||
16,16,12,12,13,1,0.08,2 | ||
17,17,13,13,15,2,0.142857143,3 | ||
18,18,15,15,18,3,0.181818182,3 | ||
19,19,18,18,21,3,0.153846154,3 | ||
20,20,21,21,25,4,0.173913043,3 | ||
21,21,25,25,28,3,0.113207547,3 | ||
22,22,28,28,32,4,0.133333333,3 | ||
23,23,32,32,36,4,0.117647059,4 | ||
24,24,36,36,43,7,0.17721519,4 | ||
25,25,43,43,50,7,0.150537634,4 | ||
26,26,50,50,59,9,0.165137615,4 | ||
27,27,59,59,70,11,0.170542636,4 | ||
28,28,70,70,84,14,0.181818182,n/a | ||
29,29,84,84,110,26,0.268041237,n/a | ||
30,30,110,110,150,40,0.307692308,n/a | ||
31,31,150,150,max ADC,n/a,n/a,n/a | ||
,32,max ADC,,,,, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
ENERGY BINNING,,,,,,ECMD,19.05.23 | ||
,,,,,,, | ||
Revised Suggestion for Science Energy Binning,,,,,,, | ||
,,,,,,, | ||
Criteria,,,,,,, | ||
,Generally increasing bin width between 4 keV and 150 keV,,,,Include LLD and ULD channels < 4kev and > 150keV,, | ||
,"Fine (< 1kev) resolution through microflare regime, 4-11 keV",,,,"Bracket Ba-133 lines at 31, 35 and 81 keV",, | ||
,Bin centres at 6.7 and 8.0 keV (Fe and Fe/Ni line complexes),,,,,, | ||
,Sufficient coverage over full range,,,,,, | ||
,"Match current QL boundaries at 4, 10, 15, 25, 50, and 84 keV",,,,,, | ||
,Sufficient coverage over full range,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
Basic constraint,,,,,,, | ||
,Emin,0,,,,, | ||
,Emax,>1000,,,,, | ||
,Number of bins,32,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
,,,,,,, | ||
Channel Number,Channel Edge,Energy Edge ,Elower,Eupper ,BinWidth,dE/E,QL channel | ||
,,,,,,, | ||
,,,,,,, | ||
0,0,0,0,4,4,2,n/a | ||
1,1,4,4,5.5,1.5,0.32,0 | ||
2,2,5.5,5.5,6.3,0.8,0.14,0 | ||
3,3,6.3,6.3,6.56,0.26,0.04,0 | ||
4,4,6.56,6.56,6.8,0.24,0.04,0 | ||
5,5,6.8,6.8,7.3,0.5,0.07,0 | ||
6,6,7.3,7.3,8,0.7,0.09,0 | ||
7,7,8,8,9,1,0.12,0 | ||
8,8,9,9,10,1,0.11,0 | ||
9,9,10,10,11,1,0.1,1 | ||
10,10,11,11,13,2,0.17,1 | ||
11,11,13,13,15,2,0.14,1 | ||
12,12,15,15,17,2,0.13,2 | ||
13,13,17,17,19,2,0.11,2 | ||
14,14,19,19,21,2,0.1,2 | ||
15,15,21,21,23,2,0.09,2 | ||
16,16,23,23,25,2,0.08,2 | ||
17,17,25,25,28,3,0.11,3 | ||
18,18,28,28,32,4,0.13,3 | ||
19,19,32,32,36,4,0.12,3 | ||
20,20,36,36,40,4,0.11,3 | ||
21,21,40,40,45,5,0.12,3 | ||
22,22,45,45,50,5,0.11,3 | ||
23,23,50,50,56,6,0.11,4 | ||
24,24,56,56,63,7,0.12,4 | ||
25,25,63,63,70,7,0.11,4 | ||
26,26,70,70,76,6,0.08,4 | ||
27,27,76,76,84,8,0.1,4 | ||
28,28,84,84,100,16,0.17,n/a | ||
29,29,100,100,120,20,0.18,n/a | ||
30,30,120,120,150,30,0.22,n/a | ||
31,31,150,150,max ADC,n/a,n/a,n/a | ||
,32,max ADC,,,,, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,14 @@ | ||
index, start_date, end_date, elut_file | ||
0, 2020-02-14T00:00:00, 2021-01-01T00:00:00, elut_table_20200519.csv | ||
1, 2021-01-01T00:00:00, 2021-05-25T14:55:49, elut_table_20201204.csv | ||
2, 2021-05-25T14:55:49, 2021-12-09T00:00:00, elut_table_20210625.csv | ||
3, 2021-12-09T00:00:00, 2022-06-01T00:00:00, elut_table_20211209.csv | ||
4, 2022-06-01T00:00:00, 2022-09-18T00:00:00, elut_table_20220601.csv | ||
5, 2022-09-18T00:00:00, 2023-01-19T17:02:40, elut_table_20220918.csv | ||
6, 2023-01-19T17:02:40, 2023-01-30T00:04:35, elut_table_20221214.csv | ||
7, 2023-01-30T00:04:35, 2023-02-02T16:06:12, elut_table_20221220.csv | ||
8, 2023-02-02T16:06:12, none, elut_table_20221214.csv | ||
index, start_date, end_date, elut_file | ||
0, 2020-02-14T00:00:00, 2021-01-01T00:00:00, elut_table_20200519.csv | ||
1, 2021-01-01T00:00:00, 2021-05-25T14:55:49, elut_table_20201204.csv | ||
2, 2021-05-25T14:55:49, 2021-12-09T00:00:00, elut_table_20210625.csv | ||
3, 2021-12-09T00:00:00, 2022-06-01T00:00:00, elut_table_20211209.csv | ||
4, 2022-06-01T00:00:00, 2022-09-18T00:00:00, elut_table_20220601.csv | ||
5, 2022-09-18T00:00:00, 2023-01-19T17:02:40, elut_table_20220918.csv | ||
6, 2023-01-19T17:02:40, 2023-01-30T00:04:35, elut_table_20221214.csv | ||
7, 2023-01-30T00:04:35, 2023-02-02T16:06:12, elut_table_20221220.csv | ||
8, 2023-02-02T16:06:12, 2023-06-19T00:04:35, elut_table_20221214.csv | ||
9, 2023-06-19T00:04:35, 2023-07-03T00:04:52 , elut_table_20230606.csv | ||
10, 2023-07-03T00:04:52 , 2023-07-31T00:05:58, elut_table_20230612.csv | ||
11, 2023-07-31T00:05:58, 2023-11-05T00:01:00, elut_table_20230710.csv | ||
12, 2023-11-05T00:01:00, none, elut_table_20231019.csv |
Oops, something went wrong.