merging

indica-mcf · Sep 21, 2023 · 9cd5d26 · 9cd5d26
2 parents ecdbb65 + b48ea95
commit 9cd5d26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/indica/profiles_gauss.py b/indica/profiles_gauss.py
@@ -32,6 +32,7 @@ def __init__(
         self.xend = xend
         self.coord = f"rho_{coord}"
         self.x = np.linspace(0, 1, 15) ** 0.7
+        # self.x = 1-np.logspace(0, -2, 30)
         self.datatype = datatype
         if xspl is None:
             xspl = np.linspace(0, 1.0, 30)
@@ -55,6 +56,9 @@ def __init__(
 
         if parameters is None:
             parameters = get_defaults(datatype)
+        elif {"y0", "y1", "yend", "wcenter", "wped", "peaking",} >= set(parameters):
+            _parameters = get_defaults(datatype)
+            parameters = dict(_parameters, **parameters)
 
         for k, p in parameters.items():
             setattr(self, k, p)

diff --git a/indica/workflows/bayes_workflow_example.py b/indica/workflows/bayes_workflow_example.py
@@ -103,11 +103,11 @@
     # "Nimp_prof.wped",
     "Nimp_prof.peaking",
     "Te_prof.y0",
-    # "Te_prof.wped",
+    "Te_prof.wped",
     "Te_prof.wcenter",
     "Te_prof.peaking",
     "Ti_prof.y0",
-    # "Ti_prof.wped",
+    "Ti_prof.wped",
     "Ti_prof.wcenter",
     "Ti_prof.peaking",
 ]