Skip to content

Conversation

@vincefn
Copy link
Collaborator

@vincefn vincefn commented Nov 28, 2021

This PR:

  • Adds the ability to perform QPA from a powder pattern when the crystalline phases are known, with an example notebook from the 1999 round Robin
  • Solves an issue where updating the Crystal widget would append a js output for each update
  • A few changes to setup.py to specify optional modules (but setup.py is not used anyway so this is mostly for documentation)
  • Add python 3.8 as supported (should work in 3.9 as well but needs testing)
  • There was a change in the previous version where the str() of a molecule used to return the XML output, but this has changed. A RefinableObj.xml() convenience function has been added
  • Added a PbSO4 notebook example with joint X+N optimisation
  • Solves an issue where using XMLInput() on a Crystal could lead to a crash if the structure was not empty and the scattering powers where added manually (not by importing a Molecule). DeleteRefParInDestructor is now correctly taken into account there, also with a hook to re-use existing scattering power when possible to avoid (minimise) memory leaks.
  • Solves an issue with the import of urllib.request.urlopen
  • When adding an Atom or a Molecule to a Crystal, an exception will now be raised if the used ScatteringPower are not already added to the Crystal (this could lead to a crash). Check this is OK for Diffpy-CMI
  • Update doc:
    • add references specific to the recent changes (powder pattern, crystal 3D view, global optimisation,...) including me a contact.
    • update some info about installing from source
    • replace m2r by m2r2 for sphinx as m2r seems abandoned
    • added the example notebooks in the sphinx documentation (requires nbsphinx and nbsphinx-link). The javascript 3D crystal views are even preserved.

Let me know if that's OK. I tried to change the version to 2.2.1 but not sure I got all the right places..

Add colours to powder pattern plot for labels of multiple phases.
Add access to Crystal.GetWeight(), ScatteringPowerAtom.GetAtomicWeight(), PowderPattern.GetScaleFactor()
…from sources, API docs for all classes, VFN contact. Replace m2r by m2r2 for sphinx.
* commit '2527fad516f9193b908a39dc480ef32d395fc90d':
…SpaceGroupExplorer::Run() and RunAll().

Small doc correction.
…row an exception if the corresponding ScatteringPower have not already been added to the Crystal.
@vincefn
Copy link
Collaborator Author

vincefn commented Nov 29, 2021

@st3107 @sbillinge this PR depends on diffpy/libobjcryst#16, hence all the tests failing

@st3107
Copy link
Contributor

st3107 commented Nov 29, 2021

@vincefn No worries. I saw that the PR only changed the docs. It should be fine to merge. Is it ready for merging?

@vincefn
Copy link
Collaborator Author

vincefn commented Nov 29, 2021

It should be fine for merging (after you have merged diffpy/libobjcryst#16) but there are a few changes besides the docs. I don't expect any issue from the computational changes but at least check against diffpy-CMI that the following is OK:

  • When adding an Atom or a Molecule to a Crystal, an exception will now be raised if the used ScatteringPower are not already added to the Crystal (this could lead to a crash).

@st3107
Copy link
Contributor

st3107 commented Nov 29, 2021

I will first merge and then do a check.

@st3107 st3107 merged commit 41b3e39 into diffpy:master Nov 29, 2021
@vincefn
Copy link
Collaborator Author

vincefn commented Dec 2, 2021

Hi @st3107 - thanks for the merge. Could you also tag the new versions - first on libobjcryst (v2021.1.2), then on pyobjcryst (v2.2.1) - since this is needed to trigger the automatic release of new packages ?

@st3107
Copy link
Contributor

st3107 commented Dec 3, 2021 via email

@st3107
Copy link
Contributor

st3107 commented Dec 3, 2021 via email

@vincefn
Copy link
Collaborator Author

vincefn commented Dec 11, 2021

Hi @st3107 @sbillinge - sorry to bother you again, but could you do the tag of libobjcryst and pyobjcryst ? I'm assuming this will trigger the update of the conda packages and this is required to advertise this new version. Thanks !

@sbillinge
Copy link
Contributor

sbillinge commented Dec 11, 2021 via email

@st3107
Copy link
Contributor

st3107 commented Dec 15, 2021 via email

@vincefn
Copy link
Collaborator Author

vincefn commented Dec 15, 2021

I really don't know much about the conda build - for the conda-forge channel is this triggered by updating https://github.com/conda-forge/pyobjcryst-feedstock ?

@sbillinge
Copy link
Contributor

sbillinge commented Dec 15, 2021 via email

@st3107
Copy link
Contributor

st3107 commented Dec 15, 2021 via email

@st3107
Copy link
Contributor

st3107 commented Dec 15, 2021 via email

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.

3 participants