Fix ABUNDANCE_SHIFT bugs

Author: Ezequiel92

src/analysis/data_analysis.jl

@@ -1212,7 +1212,7 @@ function daMolla2015(
         positions = filtered_dd[:stellar]["POS "]
         masses    = computeElementMass(filtered_dd, :stellar, element) ./ ATOMIC_WEIGHTS[element]
         norm      = computeElementMass(filtered_dd, :stellar, :H) ./ ATOMIC_WEIGHTS[:H]
-        scaling   = x -> 12.0 .+ log10.(ustrip.(y_unit, x))
+        scaling   = x -> ABUNDANCE_SHIFT[element] .+ log10.(ustrip.(y_unit, x))
         density   = false
 
     else
@@ -2082,8 +2082,18 @@ function daMetallicity2DProjection(
 
         end
 
+        title = if element == :all
+            "log₁₀(Z [Z⊙])"
+        else
+            if iszero(ABUNDANCE_SHIFT[element])
+                "log₁₀($(element) / H)"
+            else
+                "$(ABUNDANCE_SHIFT[element]) + log₁₀($(element) / H)"
+            end
+        end
+
         @info(
-            "\nMetallicity range - $(element == :all ? "log₁₀(Z [Z⊙])" : "$(ABUNDANCE_SHIFT[element]) + log₁₀($(element) / H)") \
+            "\nMetallicity range - $(title) \
             \n  Simulation: $(basename(filtered_dd[:sim_data].path)) \
             \n  Snapshot:   $(filtered_dd[:snap_data].global_index) \
             \n  Component:  $(component) \

src/auxiliary_functions/plotting.jl

@@ -2064,9 +2064,15 @@ function plotParams(quantity::Symbol)::PlotParams
         # See computeAbundance() in ./src/analysis/compute_quantities/masses.jl
         element = GAS_ABUNDANCE_SPLITS[quantity]
 
+        if iszero(ABUNDANCE_SHIFT[element])
+            axis_label = L"\log_{10}(\mathrm{%$element} \, / \, \mathrm{H})"
+        else
+            axis_label = L"%$(Int(ABUNDANCE_SHIFT[element])) + \log_{10}(\mathrm{%$element} \, / \, \mathrm{H})"
+        end
+
         plot_params = PlotParams(;
             request    = Dict(:gas => ["MASS", "GMET"]),
-            axis_label = L"%$(Int(ABUNDANCE_SHIFT[element])) + \log_{10}(\mathrm{%$element} \, / \, \mathrm{H})",
+            axis_label,
             cp_type    = :gas,
         )
 
@@ -2075,9 +2081,15 @@ function plotParams(quantity::Symbol)::PlotParams
         # See computeAbundance() in ./src/analysis/compute_quantities/masses.jl
         element = STELLAR_ABUNDANCE_SPLITS[quantity]
 
+        if iszero(ABUNDANCE_SHIFT[element])
+            axis_label = L"\log_{10}(\mathrm{%$element} \, / \, \mathrm{H})"
+        else
+            axis_label = L"%$(Int(ABUNDANCE_SHIFT[element])) + \log_{10}(\mathrm{%$element} \, / \, \mathrm{H})"
+        end
+
         plot_params = PlotParams(;
             request    = Dict(:stellar => ["MASS", "GME2"]),
-            axis_label = L"%$(Int(ABUNDANCE_SHIFT[element])) + \log_{10}(\mathrm{%$element} \, / \, \mathrm{H})",
+            axis_label,
             cp_type    = :stellar,
         )
 

src/plotting/post_processing.jl

@@ -1533,7 +1533,7 @@ Draw a profile for the Milky Way using the data compiled by Mollá et al. (2015)
       + `:molecular_area_density` -> Molecular mass surface density, as ``\\log10(\\Sigma_\\text{H2})``.
       + `:atomic_area_density`    -> Atomic mass surface density, as ``\\log10(\\Sigma_\\text{HI})``.
       + `:sfr_area_density`       -> Star formation rate surface density, as ``\\log10(\\Sigma_\\text{SFR})``.
-      + `:X_stellar_abundance`    -> Stellar abundance of element ``\\mathrm{X}``, as ``12 + \\log_{10}(\\mathrm{X \\, / \\, H})``. ``\\mathrm{X}`` can be O (oxygen), N (nitrogen), or C (carbon).
+      + `:X_stellar_abundance`    -> Stellar abundance of element ``\\mathrm{X}``, as [`ABUNDANCE_SHIFT`](@ref) + ``\\log_{10}(\\mathrm{X \\, / \\, H})``. ``\\mathrm{X}`` can be O (oxygen), N (nitrogen), or C (carbon).
   - `y_unit::Unitful.Units=Unitful.NoUnits`: Target unit for `quantity`.
   - `color::ColorType=WONG_RED`: Color of the line.
   - `linestyle::LineStyleType=:solid`: Style of the line.
@@ -1609,13 +1609,13 @@ function ppMolla2015!(
         y_data = (raw[!, "logΣsfr"] .± raw[!, "logΣsfr error"]) .+ factor
     elseif quantity == :O_stellar_abundance
         # dimensionless
-        y_data = raw[!, "O/H"] .± raw[!, "ΔO/H"]
+        y_data = @. (raw[!, "O/H"] - 12.0 + ABUNDANCE_SHIFT[:O]) ± raw[!, "ΔO/H"]
     elseif quantity == :N_stellar_abundance
         # dimensionless
-        y_data = raw[!, "N/H"] .± raw[!, "ΔN/H"]
+        y_data = @. (raw[!, "N/H"] - 12.0 + ABUNDANCE_SHIFT[:N]) ± raw[!, "ΔN/H"]
     elseif quantity == :C_stellar_abundance
         # dimensionless
-        y_data = raw[!, "C/H"] .± raw[!, "ΔC/H"]
+        y_data = @. (raw[!, "C/H"] - 12.0 + ABUNDANCE_SHIFT[:C]) ± raw[!, "ΔC/H"]
     else
         throw(ArgumentError("ppMolla2015: `x_quantity` can only be  :stellar_area_density, \
         :ode_molecular_area_density, :br_molecular_area_density, :ode_atomic_area_density, \