From f3a6bd318c0af77bc8311d66f71f400cc283b080 Mon Sep 17 00:00:00 2001 From: Zineb Aly <zaly@km3net.de> Date: Tue, 6 Oct 2020 11:24:57 +0200 Subject: [PATCH] make yapf --- km3io/tools.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/km3io/tools.py b/km3io/tools.py index f9409a5..47d5d1f 100644 --- a/km3io/tools.py +++ b/km3io/tools.py @@ -284,25 +284,25 @@ def _best_track(tracks, start=None, end=None, stages=[]): def _JShower_stages(): - return set((krec.JSHOWERPREFIT, krec.JSHOWERPOSITIONFIT, - krec.JSHOWERCOMPLETEFIT, krec.JSHOWER_BJORKEN_Y, - krec.JSHOWERENERGYPREFIT, krec.JSHOWERPOINTSIMPLEX, - krec.JSHOWERDIRECTIONPREFIT)) + return set( + (krec.JSHOWERPREFIT, krec.JSHOWERPOSITIONFIT, krec.JSHOWERCOMPLETEFIT, + krec.JSHOWER_BJORKEN_Y, krec.JSHOWERENERGYPREFIT, + krec.JSHOWERPOINTSIMPLEX, krec.JSHOWERDIRECTIONPREFIT)) def _JMuon_stages(): return set((krec.JMUONPREFIT, krec.JMUONSIMPLEX, krec.JMUONGANDALF, - krec.JMUONENERGY, krec.JMUONSTART, krec.JLINEFIT)) + krec.JMUONENERGY, krec.JMUONSTART, krec.JLINEFIT)) def _AAShower_stages(): return set((krec.AASHOWERFITPREFIT, krec.AASHOWERFITPOSITIONFIT, - krec.AASHOWERFITDIRECTIONENERGYFIT)) + krec.AASHOWERFITDIRECTIONENERGYFIT)) def _DUSJShower_stages(): return set((krec.DUSJSHOWERPREFIT, krec.DUSJSHOWERPOSITIONFIT, - krec.DUSJSHOWERCOMPLETEFIT)) + krec.DUSJSHOWERCOMPLETEFIT)) def _reco_stages(reco): @@ -334,7 +334,7 @@ def best_track(tracks, reco, start=None, end=None, stages=[]): if (start is not None) and (end is not None): if (start not in valid_stages) or (end not in valid_stages): - raise KeyError( + raise ValueError( f" start and/or end are not in {reco} reconstruction stages") if len(stages) > 0: @@ -481,4 +481,4 @@ def mask(rec_stages, stages=None, start=None, end=None): return _mask_explicit_rec_stages(rec_stages, stages) if (stages is None) and (start is not None) and (end is not None): - return _mask_rec_stages_between_start_end(rec_stages, start, end) \ No newline at end of file + return _mask_rec_stages_between_start_end(rec_stages, start, end) -- GitLab