Fixed error in carbon density and redundant loads

gafusion · Sep 21, 2023 · 3c19d7b · 3c19d7b
1 parent 2b0ff47
commit 3c19d7b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/omas/machine_mappings/d3d.py b/omas/machine_mappings/d3d.py
@@ -1402,7 +1402,6 @@ def core_profiles_profile_1d(ods, pulse, PROFILES_tree="OMFIT_PROFS", PROFILES_r
         query["electrons.temperature_fit.psi_norm"] = "PS_T_E"
         query["ion[1].density_fit.psi_norm"] = "PS_N_C"
         query["ion[1].temperature_fit.psi_norm"] = "PS_T_C"
-        query["ion[1].density_fit.psi_norm"] = "PS_T_C"
         query["ion[1].velocity.toroidal_fit.psi_norm"]= "PS_V_TOR_C"
         #query["j_total"] = "J_TOT"
         #query["pressure_perpendicular"] = "P_TOT"

diff --git a/omas/omas_machine.py b/omas/omas_machine.py
@@ -128,7 +128,7 @@ def machine_to_omas(ods, machine, pulse, location, options={}, branch='', user_m
     if location.endswith(".*"):
         root = location.split(".*")[0]
         for key in mappings:
-            if root in key:
+            if root in key and key not in ods:
                 try:
                     resolve_mapped(ods, machine, pulse, mappings, key, idm, options_with_defaults, branch, cache=cache)
                 except (TreeNODATA, MdsIpException) as e: