Skip to content

Merge Release-0.8.4 #46

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 342 commits into from
Jul 26, 2022
Merged

Merge Release-0.8.4 #46

merged 342 commits into from
Jul 26, 2022

Conversation

@rozyczko
Copy link
Member

@rozyczko rozyczko commented Jul 25, 2022

In preparation for releasing easyDiffractionLibrary ver. 0.0.5
To be used with easyDiffractionApp ver. 0.8.4

AndrewSazonov and others added 30 commits November 16, 2020 14:29
@AndrewSazonov
Update background label
f3e535d
@wardsimon
Sorted backgrounds
c22dd18
@AndrewSazonov
Some changes to fix background
a413ae8
@AndrewSazonov
Rename instrument resolution vars
b2da345
@wardsimon
Add point names
1869143
@wardsimon
Point upper/lower
40ee09f
@wardsimon
Scale and x_offset implemented
e0943f7
@AndrewSazonov
Modify background label
58c2cb8
@AndrewSazonov
Fix build script
cec38ed
@wardsimon
Fixup build scripts
8590fa6
@wardsimon
Merge remote-tracking branch 'origin/gsas' into gsas
0a98055
@wardsimon
Update for specie work
85e3c70
@AndrewSazonov
Recalculate sin(Th)/Lambda
3ce84de
@AndrewSazonov
Set some experimental parameters
8f07686
@wardsimon
Fixup some serialization
721d300
@AndrewSazonov
Keep temp.cif file for fitting process
7f3b9ca
@AndrewSazonov
Fix sinTh/Lambda for CFML
44d6463
@AndrewSazonov
Keep temp.cif for fitting with CFML
c2108ed
@AndrewSazonov
Update to new CFML api
710aba3
@wardsimon
Tidy up background work
efb0372
@wardsimon
More background tidying
d47bfe9
@wardsimon
Revert BG changes
f12e168
@AndrewSazonov
Debugging info for y_calc
8713633
@wardsimon
Add fitting notebook
77bff2e
@wardsimon
More fitting work
e4474af
@AndrewSazonov
Add CFML fitting notebook
40de2f0
@wardsimon
Update branches
13ec3f5
@wardsimon
Merge pull request #1 from easyScience/coreSiteWork
85802ee 
Core site work
@AndrewSazonov
Update sin(theta)/lambda
3dc75a5
@wardsimon
Example bug fixes
fda4b28
wardsimon and others added 22 commits June 27, 2022 15:07
@wardsimon
Add magnetic field option
90544e6
@AndrewSazonov
Temporarily remove normalisation
19cf5f7
@rozyczko
Added get_component getter for retrieving more information from
7fa252c 
additional_data in calculators
@rozyczko
Merge branch 'polarizedV2' of https://github.com/easyScience/easyDiff…
2e8ec8b 
…ractionLib into polarizedV2
@rozyczko
Update returned up/down profiles to match total
fd86ed2
@rozyczko
Ci fix (#45)
4a367ff 
* Try with >=3.8

* remove 3.7 in more places

* One more occurence
@wardsimon
Update pyproject.toml
4556f09
@wardsimon
Update requirements.txt
3418a02
@rozyczko
Add methods to V2
212721b
@rozyczko
Have the CFML and GSAS interfaces understand extended feature string
5710cca
@rozyczko
Disabled cryspyV2 interface for the time being
fc928ae
Fix get hkl for CrysFML calculator
747bca9
@wardsimon
Merge remote-tracking branch 'origin/release-0.8.4' into polarizedV2
bf1e114
@wardsimon
Auto stash before merge of "polarizedV2" and "origin/release-0.8.4"
32610c2
@rozyczko
Added missing methods for GSAS.
ffb3e7c
@rozyczko
Merge branch 'release-0.8.4' of https://github.com/easyScience/easyDi…
8aa0506 
…ffractionLib into release-0.8.4
@rozyczko
Removed file deletion. It messes up with fitting on Windows and the
7af2fc3 
files get removed anyway at the interface level.
@wardsimon
Added polarized notebook example.
3a95310
@rozyczko
Merge branch 'polarizedV2' into release-0.8.4
b3d6a64
Use develop branch of easyCrystallography (with undo/redo fix)
59ecaa7
@rozyczko
Added a conveience method
3c12f5b
@rozyczko
Merge branch 'release-0.8.4' of https://github.com/easyScience/easyDi…
1b1a270 
…ffractionLib into release-0.8.4
github-actions[bot]
github-actions bot requested changes Jul 25, 2022
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This pull request does not contain a valid label. Please add one of the following labels: ['chore', 'fix', 'bugfix', 'bug', 'enhancement', 'feature', 'dependencies', 'documentation']

@rozyczko rozyczko added the [scope] enhancement Adds/improves features (major.MINOR.patch) label Jul 25, 2022
@rozyczko rozyczko merged commit 2445905 into master Jul 26, 2022
@rozyczko rozyczko deleted the release-0.8.4 branch April 11, 2024 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

Assignees

No one assigned

Labels

[scope] enhancement Adds/improves features (major.MINOR.patch)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@rozyczko @AndrewSazonov @wardsimon @arm61