Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ift
IMAGINE
Commits
44b10efa
Commit
44b10efa
authored
Jan 21, 2017
by
Theo Steininger
Browse files
Modified descriptor in magnetic field classes.
parent
f145f40d
Changes
4
Hide whitespace changes
Inline
Side-by-side
imagine/magnetic_fields/__init__.py
View file @
44b10efa
...
...
@@ -3,4 +3,6 @@
from
magnetic_field_factory
import
MagneticFieldFactory
from
magnetic_field
import
MagneticField
from
constant_field_factory
import
ConstantFieldFactory
from
jf12_factory
import
JF12Factory
imagine/magnetic_fields/jf12_factory.py
View file @
44b10efa
...
...
@@ -6,7 +6,9 @@ from magnetic_field_factory import MagneticFieldFactory
class
JF12Factory
(
MagneticFieldFactory
):
@
property
def
descriptor
(
self
):
return
'JF12'
result_descriptor
=
super
(
JF12Factory
,
self
).
descriptor
result_descriptor
+=
[
'JF12'
]
return
result_descriptor
def
_initialize_parameter_defaults
(
self
):
self
.
_parameter_defaults
=
{
'b51_ran_b1'
:
10.8
,
...
...
imagine/magnetic_fields/magnetic_field.py
View file @
44b10efa
...
...
@@ -11,9 +11,11 @@ class MagneticField(Loggable, object):
def
__init__
(
self
,
box_dimensions
,
resolution
,
descriptor
,
parameters
=
{},
create_array
=
None
):
self
.
_box_dimensions
=
box_dimensions
self
.
_resolution
=
resolution
self
.
_descriptor
=
str
(
descriptor
)
self
.
_box_dimensions
=
np
.
empty
(
3
)
self
.
_box_dimensions
[:]
=
box_dimensions
self
.
_resolution
=
np
.
empty
(
3
)
self
.
_resolution
[:]
=
resolution
self
.
_descriptor
=
descriptor
self
.
_parameters
=
{}
for
(
key
,
value
)
in
parameters
.
items
():
...
...
imagine/magnetic_fields/magnetic_field_factory.py
View file @
44b10efa
...
...
@@ -20,7 +20,7 @@ class MagneticFieldFactory(Loggable, object):
@
abc
.
abstractproperty
def
descriptor
(
self
):
r
aise
NotImplementedError
r
eturn
[]
def
_initialize_parameter_defaults
(
self
):
self
.
_parameter_defaults
=
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment