Skip to content
Merged
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
9 changes: 5 additions & 4 deletions bin/cosmic-pop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,11 @@ if __name__ == '__main__':
if hasattr(args, "m2_min") and (args.m2_min is not None):
if args.m2_min < metisse_m_min:
args.m2_min = metisse_m_min
elif sampling["m2_min"] is not None:
args.m2_min = sampling["m2_min"]
if args.m2_min > m1_min:
args.m2_min = m1_min
elif "m2_min" in sampling:
if sampling["m2_min"] is not None:
args.m2_min = sampling["m2_min"]
if args.m2_min > m1_min:
args.m2_min = m1_min
else:
# Check m1_min
m1_min = args.m1_min
Expand Down
Loading