Skip to content

Commit 1a9e3b3

Browse files
authored
Merge pull request #129 from fact-project/reuse
Reuse
2 parents 7bf25e7 + 465e839 commit 1a9e3b3

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

fact/io.py

+20-4
Original file line numberDiff line numberDiff line change
@@ -546,10 +546,26 @@ def read_simulated_spectrum(corsika_headers_path):
546546
runs = read_h5py(corsika_headers_path, key='corsika_runs')
547547

548548
summary = {}
549-
try:
550-
summary['n_showers'] = runs['n_showers'].sum()
551-
except KeyError:
552-
summary['n_showers'] = runs['n_events'].sum()
549+
if 'n_showers' in runs.columns:
550+
n_showers = runs['n_showers']
551+
else:
552+
n_showers = runs['n_events']
553+
554+
summary['n_showers'] = n_showers.sum()
555+
556+
with h5py.File(corsika_headers_path, 'r') as f:
557+
summary['n_reuse'] = f['corsika_runs'].attrs.get('n_reuse', 1)
558+
559+
if 'n_reuse' in runs.columns:
560+
# if reuse is not the same for all runs, multply n_showers
561+
# and set reuse to 1
562+
unique = runs['reuse'].unique()
563+
if len(unique) > 1:
564+
summary['n_showers'] = (n_showers * runs['n_reuse']).sum()
565+
summary['n_reuse'] = 1
566+
567+
else:
568+
summary['n_reuse'] = runs['n_reuse'].iloc[0]
553569

554570
keys = {'energy_min': u.GeV, 'energy_max': u.GeV, 'energy_spectrum_slope': None}
555571
if 'x_scatter' in runs.columns:

0 commit comments

Comments
 (0)