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

updated params for selection, fixed bugs, now computing stats with diploshic #108

Merged
merged 1 commit into from
Dec 4, 2023

Conversation

mufernando
Copy link
Member

@mufernando mufernando commented Nov 29, 2023

A bunch of things:

  • Changed the call ts.write_vcf, which returns 0-based positions. This is a problem bc diploSHIC assumes positions are 1-based.
  • Updated the parameters of the sweeps according to what we decided on a call.
  • Some refactoring to compute diploSHIC fvecs for both populations (in the sweeps simulations we introduce a sweep in each population individually -- so we have two sweep sims per param combination; however, for neutral and BGS sims, we can compute the stats in the two populations independently from the same simulation).
  • Added rules to merge the stats (it's a bit ugly bc of memory usage...)
  • Doubled the physical scale over which SHIC computes the stats. Right now we have CLR being computed along a grid with 20 points (about once every 250Kb), but SHIC was being computed on 100Kb windows. I was having some issues because in the simulations with sweeps variation was being completely wiped out (no snps) and SHIC simply skips windows with no SNPs.

@andrewkern
Copy link
Member

this all LGTM @mufernando -- are there draft result plots you could post here before we merge?

@mufernando
Copy link
Member Author

I just finished running all the sims and stats, so I didn't have time to run the analysis. I think we should merge this and I will open a new PR with analyses modifications and results.

@andrewkern
Copy link
Member

okay sounds good. merging.

@andrewkern andrewkern merged commit 9a823e1 into popsim-consortium:main Dec 4, 2023
1 check passed
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