|
1 | 1 | # This code is a part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS). |
2 | | -# Last modified by David J Turner (djturner@umbc.edu) 12/12/2025, 15:39. Copyright (c) The Contributors |
| 2 | +# Last modified by David J Turner (djturner@umbc.edu) 12/12/2025, 17:06. Copyright (c) The Contributors |
3 | 3 |
|
4 | 4 | import os |
5 | 5 | from copy import deepcopy, copy |
@@ -112,19 +112,34 @@ def _make_spec_cmd_info(cur_evt_list: EventList): |
112 | 112 |
|
113 | 113 | try: |
114 | 114 | if use_combine_obs and (len(source.obs_ids[cur_evt_list.telescope]) > 1): |
115 | | - check_sp = source.get_combined_spectra(outer_radii[s_ind], inst, inner_radii[s_ind], group_spec, |
116 | | - min_counts, min_sn, telescope=cur_evt_list.telescope) |
| 115 | + check_sp = source.get_combined_spectra(outer_radii[s_ind], |
| 116 | + inst, |
| 117 | + inner_radii[s_ind], |
| 118 | + group_spec, |
| 119 | + min_counts, |
| 120 | + min_sn, |
| 121 | + telescope=cur_evt_list.telescope) |
117 | 122 |
|
118 | 123 | else: |
119 | 124 | # Got to check if this spectrum already exists |
120 | | - check_sp = source.get_spectra(outer_radii[s_ind], cur_evt_list.obs_id, inst, inner_radii[s_ind], |
| 125 | + check_sp = source.get_spectra(outer_radii[s_ind], |
| 126 | + cur_evt_list.obs_id, |
| 127 | + inst, |
| 128 | + inner_radii[s_ind], |
121 | 129 | group_spec, |
122 | | - min_counts, min_sn, telescope=cur_evt_list.telescope) |
| 130 | + min_counts, |
| 131 | + min_sn, |
| 132 | + telescope=cur_evt_list.telescope) |
123 | 133 | exists = True |
124 | 134 |
|
125 | 135 | except NoProductAvailableError: |
126 | 136 | exists = False |
127 | 137 |
|
| 138 | + print(exists) |
| 139 | + print(use_combine_obs) |
| 140 | + print(inst) |
| 141 | + print(cur_evt_list.telescope) |
| 142 | + |
128 | 143 | if exists and check_sp.usable and not force_gen: |
129 | 144 | continue |
130 | 145 |
|
|
0 commit comments