marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Compare commits

base: marcel:47bb8c432621fa7956b11a4e9d4e9757be39b18f
Branches Tags
marcel:develop
marcel:tomography
marcel:feature/residual_plot
marcel:master
marcel:correlation_picker
marcel:38-simplify-data-structure
marcel:improve-util-utils
marcel:feature/dae
marcel:darius-save
marcel:0.3
marcel:0.2
marcel:0.1a
..
compare: marcel:e35d5d6df9c1971dd26e1e7975fa65f91d211418
Branches Tags
marcel:tomography
marcel:develop
marcel:feature/residual_plot
marcel:master
marcel:correlation_picker
marcel:38-simplify-data-structure
marcel:improve-util-utils
marcel:feature/dae
marcel:darius-save
marcel:0.3
marcel:0.2
marcel:0.1a

No commits in common. "47bb8c432621fa7956b11a4e9d4e9757be39b18f" and "e35d5d6df9c1971dd26e1e7975fa65f91d211418" have entirely different histories.
47bb8c4326 ... e35d5d6df9

1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
pylot/core/pick/picker.py
View File

@ -509,9 +509,9 @@ class PragPicker(AutoPicker):
if flagpick_l > 0 and flagpick_r > 0 and cfpick_l <= 3 * cfpick_r:
self.Pick = pick_l
pickflag = 1
# elif flagpick_l > 0 and flagpick_r > 0 and cfpick_l >= cfpick_r:
# self.Pick = pick_r
# pickflag = 1
elif flagpick_l > 0 and flagpick_r > 0 and cfpick_l >= cfpick_r:
self.Pick = pick_r # MP MP there is no pick_r defined, commented out after commit of LK on 29.07.2020 (see above)
pickflag = 1
elif flagpick_l == 0 and flagpick_r > 0 and cfpick_l >= cfpick_r:
self.Pick = pick_l
pickflag = 1