GitLab

Projects
Groups
Snippets
Help

Loading...
Help
Sign in / Register

est

Project overview
Repository
Issues 17
Jira
- Jira
Merge Requests 3
- Merge Requests 3
CI / CD
Operations
Analytics
Wiki
- Wiki
Snippets
- Snippets
Members
- Members

Collapse sidebar

Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards

workflow
est
Merge Requests
!22

Merged

Opened Nov 28, 2019 by payno @payno11 of 13 tasks completed11/13 tasks

Report abuse

Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "fix_20" "origin/fix_20"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "fix_20"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Fix 20

Overview 5
Commits 37
Pipelines 25
Changes 63

manage different dimensions for 3D spectra
load and save dimensions from the configuration
add an interface to estimate E0 (from pymca and larch process) ?
integrate the E0 calculator in the existing interfaces (pymca & larch)
add a E0 calculator widget that is compatible with larch and pymca processes.
test with B33_30mu_1f_noEXAFS dataset
~~unable image ROI selection. should be always active~~ -> to be discuss later. Maybe not showing the RoiManager is simpler and better for the users. ?
Input widget
- ~~should run the load without freezing the gui.~~ we will see this later
- should be a Dialog with when start is selected it should hide the widget
remove copy of hdf5 files
add a widget to make a copy - saving point
error log message should specify the spectrum position when process fails.

For now we are patching the XASNormalizationParameters with the E0CalculationDialog. This part could be moved to pymca ?

* [x] manage different dimensions for 3D spectra
* [x] load and save dimensions from the configuration
* [x] add an interface to estimate E0 (from pymca and larch process) ?
* [x] integrate the E0 calculator in the existing interfaces (pymca & larch)
* [x] add a E0 calculator widget that is compatible with larch and pymca processes.
* [x] test with B33_30mu_1f_noEXAFS dataset
* [ ] ~~unable image ROI selection. should be always active~~ -> to be discuss later. Maybe not showing the RoiManager is simpler and better for the users. ?
* [x] Input widget 
    * [ ] ~~should run the load without freezing the gui.~~ we will see this later
    * [x] should be a Dialog with  when start is selected it should hide the widget
* [x] remove copy of hdf5 files
* [x] add a widget to make a copy - saving point
* [x] error log message should specify the spectrum position when process fails.

For now we are patching the XASNormalizationParameters with the E0CalculationDialog. This part could be moved to pymca ?

Edited Jan 13, 2020 by payno

Assignee

Assign to

0.3

Milestone

0.3

Assign milestone

Time tracking

0

Labels

None

Assign labels

View project labels

Reference: workflow/est!22

Revert this merge request

This will create a new commit in order to revert the existing changes.

Revert in branch

Switch branch

Cancel

A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Pick into branch

Switch branch

Cancel

A new branch will be created in your fork and a new merge request will be started.