Skip to content

Commit

Permalink
Merge pull request #461 from PlasmaControl/rc/hotfix
Browse files Browse the repository at this point in the history
Add missing attributes to new classes
  • Loading branch information
f0uriest authored Mar 16, 2023
2 parents 4561431 + ed19c94 commit 0122c00
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions desc/objectives/linear_objectives.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,8 @@ class FixThetaSFL(_Objective):
_scalar = False
_linear = True
_fixed = True
_print_value_fmt = "Theta - Theta SFL error: {:10.3e} (m)"
_units = "(radians)"
_print_value_fmt = "Theta - Theta SFL error: {:10.3e} "

def __init__(self, eq=None, target=0, weight=1, name="Theta SFL"):

Expand Down Expand Up @@ -569,7 +570,8 @@ class FixAxisR(_Objective):
_scalar = False
_linear = True
_fixed = False
_print_value_fmt = "R axis error: {:10.3e} (m)"
_units = "(m)"
_print_value_fmt = "R axis error: {:10.3e} "

def __init__(
self,
Expand Down Expand Up @@ -717,7 +719,8 @@ class FixAxisZ(_Objective):
_scalar = False
_linear = True
_fixed = False
_print_value_fmt = "Z axis error: {:10.3e} (m)"
_units = "(m)"
_print_value_fmt = "Z axis error: {:10.3e} "

def __init__(
self,
Expand Down Expand Up @@ -865,7 +868,8 @@ class FixModeR(_Objective):
_scalar = False
_linear = True
_fixed = True
_print_value_fmt = "Fixed-R modes error: {:10.3e} (m)"
_units = "(m)"
_print_value_fmt = "Fixed-R modes error: {:10.3e} "

def __init__(
self,
Expand Down Expand Up @@ -996,7 +1000,8 @@ class FixModeZ(_Objective):
_scalar = False
_linear = True
_fixed = True
_print_value_fmt = "Fixed-Z modes error: {:10.3e} (m)"
_units = "(m)"
_print_value_fmt = "Fixed-Z modes error: {:10.3e} "

def __init__(
self,
Expand Down Expand Up @@ -1134,7 +1139,8 @@ class FixSumModesR(_Objective):
_scalar = False
_linear = True
_fixed = False
_print_value_fmt = "Fixed-R sum modes error: {:10.3e} (m)"
_units = "(m)"
_print_value_fmt = "Fixed-R sum modes error: {:10.3e} "

def __init__(
self,
Expand Down Expand Up @@ -1285,7 +1291,8 @@ class FixSumModesZ(_Objective):
_scalar = False
_linear = True
_fixed = False
_print_value_fmt = "Fixed-Z sum modes error: {:10.3e} (m)"
_units = "(m)"
_print_value_fmt = "Fixed-Z sum modes error: {:10.3e} "

def __init__(
self,
Expand Down

0 comments on commit 0122c00

Please sign in to comment.