From 93597752f27d3b4e0255b911fe6e8423ceb54957 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Wed, 9 Nov 2016 18:19:13 -0500 Subject: [PATCH] Resolved @paulromano comments --- openmc/data/function.py | 9 ++++++--- openmc/data/library.py | 9 ++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/openmc/data/function.py b/openmc/data/function.py index c8fa15b768..0515a57c0c 100644 --- a/openmc/data/function.py +++ b/openmc/data/function.py @@ -407,7 +407,7 @@ class Combination(EqualityMixin): Parameters ---------- functions : Iterable of Callable - Functions which are to be added together + Functions to combine according to operations operations : Iterable of numpy.ufunc Operations to perform between functions; note that the standard order of operations will not be followed, but can be simulated by @@ -418,9 +418,12 @@ class Combination(EqualityMixin): Attributes ---------- functions : Iterable of Callable - Functions which are to be added together + Functions to combine according to operations operations : Iterable of numpy.ufunc - Operations to perform between functions + Operations to perform between functions; note that the standard order + of operations will not be followed, but can be simulated by + combinations of Combination objects. The operations parameter must have + a length one less than the number of functions. """ diff --git a/openmc/data/library.py b/openmc/data/library.py index 0363de4fc5..9f6d931467 100644 --- a/openmc/data/library.py +++ b/openmc/data/library.py @@ -22,13 +22,12 @@ class DataLibrary(EqualityMixin): def __init__(self): self.libraries = [] - def get_by_materials(self, value): - """Access a library entry by passing a value of the 'materials' - attribute of the library entry. + def get_by_material(self, value): + """Return the library dictionary containing a given material. Returns ------- - library : dict + library : dict or None Dictionary summarizing cross section data from a single file; the dictionary has keys 'path', 'type', and 'materials'. @@ -107,7 +106,7 @@ class DataLibrary(EqualityMixin): Returns ------- data : openmc.data.DataLibrary - openmc.data.DataLibrary object initialized from the provided XML + Data library object initialized from the provided XML """