Skip to content

Issue349 new imas reflectometer profile#350

Merged
lasofivec merged 4 commits intodevelfrom
Issue349_NewIMASReflectometerProfile
Feb 7, 2020
Merged

Issue349 new imas reflectometer profile#350
lasofivec merged 4 commits intodevelfrom
Issue349_NewIMASReflectometerProfile

Conversation

@Didou09
Copy link
Copy Markdown
Member

@Didou09 Didou09 commented Feb 7, 2020

Main changes:

  • The IMAS data dictionnary has changed a bit since the last version, this is a minor update for ids reflectometer_profile
  • Made sure tofuplot and tofucalc remain operational even without installation

@pep8speaks
Copy link
Copy Markdown

pep8speaks commented Feb 7, 2020

Hello @Didou09! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2020-02-07 10:57:34 UTC

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #350 into devel will decrease coverage by 0.07%.
The diff coverage is 9.09%.

Impacted file tree graph

@@            Coverage Diff             @@
##            devel     #350      +/-   ##
==========================================
- Coverage   39.65%   39.58%   -0.08%     
==========================================
  Files          81       81              
  Lines       24355    24363       +8     
==========================================
- Hits         9659     9644      -15     
- Misses      14696    14719      +23
Impacted Files Coverage Δ
tofu/imas2tofu/_core.py 0.65% <ø> (ø) ⬆️
tofu/scripts/tofuplot.py 0% <0%> (ø) ⬆️
tofu/scripts/tofucalc.py 0% <0%> (ø) ⬆️
tofu/version.py 100% <100%> (ø) ⬆️
tofu/data/_core_new.py 13.15% <0%> (-0.47%) ⬇️
tofu/geom/_core_optics.py 14.35% <0%> (-0.35%) ⬇️
tofu/geom/_comp.py 59.69% <0%> (-0.22%) ⬇️
tofu/data/_core.py 38.79% <0%> (-0.18%) ⬇️
tofu/geom/_plot.py 65.55% <0%> (-0.11%) ⬇️
tofu/geom/_core.py 63.06% <0%> (-0.11%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e4a1177...099b760. Read the comment docs.

Comment thread tofu/scripts/tofucalc.py
# tofu
# test if in a tofu git repo
_HERE = os.path.abspath(os.path.dirname(__file__))
_HERE = os.path.dirname(os.path.dirname(_HERE))
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

where is _HERE first defined ?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

one line above

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Here we are taking _HERE as the directory of the module:
_HERE = os.path.abspath(os.path.dirname(__file__))

and then we go 2 parents directories up:
_HERE = os.path.dirname(os.path.dirname(_HERE))

That's because tofuplot and tofucalc were moved from the root directory down to tofu/scripts

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

yes sorry, somehow i didn't see the line above (twice)

Comment thread tofu/scripts/tofuplot.py
# tofu
# test if in a tofu git repo
_HERE = os.path.abspath(os.path.dirname(__file__))
_HERE = os.path.dirname(os.path.dirname(_HERE))
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

same question...

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

same answer ;-)

@lasofivec lasofivec merged commit dd17eb2 into devel Feb 7, 2020
@lasofivec lasofivec deleted the Issue349_NewIMASReflectometerProfile branch February 7, 2020 14:16
@Didou09 Didou09 mentioned this pull request Mar 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants