Skip to content

Commit

Permalink
Merge pull request pyne#825 from makeclean/fix_hydrogen
Browse files Browse the repository at this point in the history
fixes the hydrogen issue
  • Loading branch information
scopatz committed Mar 2, 2016
2 parents 6655c13 + a28a676 commit 4ddb759
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/nucname.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ bool pyne::nucname::iselement(int nuc) {
return false;
}

if (n <= 10000000)
if (n < 10000000)
return false;
int zzz = znum(n);
int aaa = anum(n);
Expand Down
10 changes: 9 additions & 1 deletion tests/test_nucname.py
Original file line number Diff line number Diff line change
Expand Up @@ -508,14 +508,22 @@ def test_isnuclide():
for nuc in arent:
yield assert_false, nucname.isnuclide(nuc)

def test_iselement():
def test_iselement_U235():
are = [92, 'U']
arent = [922350, 'U235']
for nuc in are:
yield assert_true, nucname.iselement(nuc)
for nuc in arent:
yield assert_false, nucname.iselement(nuc)

def test_iselement_H1():
are = [1, 'H']
arent = [1001, 'H1']
for nuc in are:
yield assert_true, nucname.iselement(nuc)
for nuc in arent:
yield assert_false, nucname.iselement(nuc)

def test_state_id_to_id():
assert_equal(nucname.state_id_to_id(190380015), 190380002)

Expand Down

0 comments on commit 4ddb759

Please sign in to comment.