Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

edits related to production pipeline #114

Merged
merged 8 commits into from
Jul 18, 2024

Conversation

silastittes
Copy link
Contributor

Needed to make some edits to get production pipeline going. Caught a bug or two in the process.
Let's leave this open for a little bit. May need to add more commits.

Comment on lines +77 to +84
if wildcards.annots == "all_sites":
# Adding selection to the whole contig
contig.add_dfe(intervals=np.array([[0, int(contig.length)]]), DFE=dfe)
else:
## Adding annotation only seletion on exon region
annot = species.get_annotations(wildcards.annots)
annot_intervals = annot.get_chromosome_annotations(wildcards.chrms)
contig.add_dfe(intervals=annot_intervals, DFE=dfe)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can someone check this? I was getting a dfe is called before it's defined error. This logic resolves that, but I want to make sure it's correct otherwise.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks good to me

@silastittes
Copy link
Contributor Author

I think this PR is good to merge now. Still having some msmc2 hiccups with Vaquita, but I'll troubleshoot and submit some solution in a different PR (perhaps not running msmc2 on Vaquita if nothing else).

@silastittes
Copy link
Contributor Author

closes #115

@andrewkern
Copy link
Member

Silas is this ready to go? should I merge this?

@silastittes
Copy link
Contributor Author

Yeah I think so! I don't anticipate adding more changes.

@andrewkern andrewkern merged commit a20dfd3 into popsim-consortium:main Jul 18, 2024
1 check failed
Copy link
Member

@andrewkern andrewkern left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i went through this and it looks correct to me. haven't run it tho!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants