From 3685fa69602710289dd2d6e14498fd42034e96d6 Mon Sep 17 00:00:00 2001 From: Shenyang Shi Date: Mon, 30 May 2022 19:57:27 -0500 Subject: [PATCH 1/2] set nronly cut default to false --- epix/run_epix.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epix/run_epix.py b/epix/run_epix.py index bfdddd9..2fd8faa 100644 --- a/epix/run_epix.py +++ b/epix/run_epix.py @@ -27,8 +27,8 @@ def main(args, return_df=False, return_wfsim_instructions=False, strax=False): outer_cylinder=args['outer_cylinder'], kwargs={'entry_start': args['entry_start'], 'entry_stop': args['entry_stop']}, - cut_by_eventid=args['cut_by_eventid'], - cut_nr_only=args['nr_only'], + cut_by_eventid=args.get('cut_by_eventid', False), + cut_nr_only=args.get('nr_only', False), ) inter, n_simulated_events = epix_file_loader.load_file() From 1a89167b9da229e3fe0f1b8dba42384afd2075b6 Mon Sep 17 00:00:00 2001 From: Shenyang Shi Date: Tue, 31 May 2022 03:55:42 -0500 Subject: [PATCH 2/2] add Cecilia suggestions --- epix/io.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epix/io.py b/epix/io.py index 9bafc9a..93d634a 100755 --- a/epix/io.py +++ b/epix/io.py @@ -130,6 +130,8 @@ def load_file(self): interactions, n_simulated_events, start, stop = self._load_root_file() elif self.file.endswith(".csv"): interactions, n_simulated_events, start, stop = self._load_csv_file() + else: + raise ValueError(f'Cannot load events from file "{self.file}": .root or .cvs file needed.') if np.any(interactions['ed'] < 0): warnings.warn('At least one of the energy deposits is negative!')