Skip to content
Open
Changes from all commits
Commits
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
15 changes: 5 additions & 10 deletions lifesim/optimize/ahgs.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,11 @@ def observe_star(self,
if (not self.data.catalog.loc[idx, 'detected']) and \
(self.data.catalog.loc[idx, 'snr_current']
>= self.data.options.optimization['snr_target']):
self.data.catalog.loc[idx, 'detected'] = True
self.data.catalog.loc[idx, 't_detected'] = deepcopy(self.tot_time + int_time)
exp_cols = [col for col in self.data.catalog.columns if col.startswith('exp_')]
true_experiments = [col[4:] for col in exp_cols if self.data.catalog.loc[idx, col]]
for exp in true_experiments:
self.data.optm['exp_detected'][exp] += 1
self.data.optm['exp_detected_uni'][exp][
1,
self.data.optm['exp_detected_uni'][exp][0, :] == self.data.catalog.loc[idx, 'nuniverse']
] += 1
self.data.catalog.loc[i, 'detected'] = True
if self.data.catalog.habitable.iloc[i]:
self.data.optm['sum_detected'][
np.where(np.array(list(self.data.options.optimization['limit'].keys()))
== self.data.catalog.stype.iloc[i])] += 1
else:
raise ValueError('Delete mode not implemented for AHGS optimizer.')

Expand Down