Skip to content

Correct Ci definition - #5106

Merged
astrofrog merged 3 commits into
astropy:masterfrom
registerrier:patch-1
Jun 17, 2016
Merged

Correct Ci definition#5106
astrofrog merged 3 commits into
astropy:masterfrom
registerrier:patch-1

Conversation

@registerrier

@registerrier registerrier commented Jun 15, 2016

Copy link
Copy Markdown
Contributor

Change defintion to Ci = Bq * 3.7e10 instead of Ci = Bq / 3.7e10

@registerrier
Correct Ci definition
e5ad4f1 
Change defintion to  Ci = Bq * 3.7e10  instead of  Ci =  Bq / 3.7e10
@mhvk mhvk added this to the v1.0.10 milestone Jun 15, 2016
@mhvk mhvk self-assigned this Jun 15, 2016
@mhvk

mhvk commented Jun 15, 2016

Copy link
Copy Markdown
Contributor

Ouch! Thanks for catching that. Could you add an entry in CHANGES.rst in the bug-fix section for 1.0? @astrofrog - is that section correct? Obviously would be nice to have in 1.2 as well...

@mhvk mhvk mentioned this pull request Jun 15, 2016
Closed
13 of 14 tasks
@astrofrog astrofrog modified the milestones: v1.0.11, v1.0.10 Jun 15, 2016
@registerrier

registerrier commented Jun 15, 2016

Copy link
Copy Markdown
Contributor Author

I added bug fix entry for v1.0.11 in CHANGE.rst

@astrofrog

astrofrog commented Jun 17, 2016

Copy link
Copy Markdown
Member

@registerrier - thanks! There is now a test failure that is due to an example in the documentation that needs updating:

316   >>> u.Hz.find_equivalent_units()
Differences (unified diff with -expected +actual):
    @@ -1,6 +1,6 @@
    -  Primary name | Unit definition | Aliases
    +  Primary name | Unit definition | Aliases
     [
       Bq           | 1 / s           | becquerel    ,
    -  Ci           | 2.7027e-11 / s  | curie        ,
    +  Ci           | 3.7e+10 / s     | curie        ,
       Hz           | 1 / s           | Hertz, hertz ,
     ]

in docs/units/equivalencies.rst. Can you change 2.7027e-11 to 3.7e+10 in that example?

@astrofrog
astrofrog merged commit 0161653 into astropy:master Jun 17, 2016
@astrofrog

astrofrog commented Jun 17, 2016

Copy link
Copy Markdown
Member

Thanks @registerrier!

astrofrog added a commit that referenced this pull request Jun 18, 2016
@astrofrog
Merge pull request #5106 from registerrier/patch-1
edb7ed4 
Correct Ci definition
astrofrog added a commit that referenced this pull request Jun 18, 2016
@astrofrog
Merge pull request #5106 from registerrier/patch-1
fc26023 
Correct Ci definition
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@mhvk mhvk

Labels

Bug units

Projects

None yet

Milestone

v1.0.11

Development

Successfully merging this pull request may close these issues.

3 participants

@registerrier @mhvk @astrofrog