Skip to content
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.

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

i try to rebase the dp to the master #132

Merged
merged 15 commits into from
May 1, 2014

Conversation

mklauser
Copy link
Contributor

No description provided.



class PropertyTypeAbundances(PropertyType):
elements = {'neut': 0, 'h': 1, 'he': 2, 'li': 3, 'be': 4, 'b': 5, 'c': 6, 'n': 7, 'o': 8, 'f': 9, 'ne': 10,
Copy link
Member

Choose a reason for hiding this comment

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

This information is available util.symbol2atomic_number

if isinstance(self.__config_container, dict):
self.__conf = self.__config_container
else:
pdb.set_trace()
Copy link
Member

Choose a reason for hiding this comment

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

@mklauser remove pdb

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

default
default config value.
"""
return self._default
Copy link
Member

Choose a reason for hiding this comment

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

should be indented

if not item in container_dict.keys():
raise ValueError('Entry %s is missing in container [%s]' % (str(item), self.__container_path))
else:
self.__default_container[item], self.__config_container[item] = parse_container_items(
Copy link
Member

Choose a reason for hiding this comment

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

@mklauser parse_container_items - unresolved reference.

@wkerzendorf
Copy link
Member

@ssim I don't know if you want to have a look, but other than that we think is find. will be merged if no response in the next 2 h.

@ssim
Copy link
Contributor

ssim commented May 1, 2014

I'm happy for you to go ahead and merge when you are ready!

wkerzendorf added a commit that referenced this pull request May 1, 2014
i try to rebase the dp to the master
@wkerzendorf wkerzendorf merged commit da4c235 into tardis-sn:master May 1, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants