Partial sq updated - Githubissues

mattwthompson / scattering

Functions for analyzing molecular simulations according to scattering experiments

MIT License

9 stars 9 forks source link

Partial sq updated #27

Open XiaoboLinlin opened 4 years ago

XiaoboLinlin commented 4 years ago

Modified previous 'structor_factor' function. The new 'structor_factor' function has another parameter, pair, which makes the function possible to calculate pair S(q) like cation vs cation, cation vs anion, anion vs cation, anion vs anion.

rmatsum836 commented 4 years ago

Saw you made another commit, I will take another look today. Thanks!

XiaoboLinlin commented 4 years ago

This is is called a merge conflict, which occurs when the the same lines in a file are different. GitHub actually has a pretty nice GUI to handle these merge commits. Regardless, it seems like you fixed the merge conflict correctly by removing the merge conflict notes as well as the integral = line that was in your branch.

Yeah, thank you for reminder. I will try GUI next time.