Merge pull request #84 from james-trayford/new_metaldust_properties

New metaldust properties

Author: bwvdnbro

tests/test_load_catalogue.py

@@ -6,7 +6,7 @@
 
 
 def test_basic_load_catalogue_no_crash(
-    filename="/Users/mphf18/Desktop/halo_027_z00p101.properties"
+    filename="/Users/mphf18/Desktop/halo_027_z00p101.properties",
 ):
     catalogue = load(filename)
 

velociraptor/catalogue/registration.py

@@ -1081,19 +1081,27 @@ def registration_log_element_ratios_times_masses(
         floor_type = match.group(2)
         part_type = match.group(3)
         aperture_size = match.group(4)
-
         try:
             short_species = {
                 "LogOxygenOverHydrogen": "O_over_H",
                 "LogIronOverHydrogen": "Fe_over_H",
+                "LogSNIaIronOverHydrogen": "SNIaFe_over_H",
+                "LogOxygenOverHydrogenAtomic": "O_over_H_atomic",
+                "LogOxygenOverHydrogenMolecular": "O_over_H_molecular",
             }[long_species]
             element_name = {
                 "LogOxygenOverHydrogen": "Oxygen",
                 "LogIronOverHydrogen": "Iron",
+                "LogSNIaIronOverHydrogen": "SNIa Iron",
+                "LogOxygenOverHydrogenAtomic": "Atomic-phase Oxygen",
+                "LogOxygenOverHydrogenMolecular": "Molecular-phase Oxygen",
             }[long_species]
             fraction_name = {
                 "LogOxygenOverHydrogen": "O/H",
                 "LogIronOverHydrogen": "Fe/H",
+                "LogSNIaIronOverHydrogen": "Fe_SNIa/H",
+                "LogOxygenOverHydrogenAtomic": "O/H",
+                "LogOxygenOverHydrogenMolecular": "O/H",
             }[long_species]
 
             short_floortype = {"Lo": "lowfloor", "Hi": "highfloor"}[floor_type]
@@ -1184,11 +1192,44 @@ def registration_dust_masses(
             short_species = {
                 "GraphiteMasses": "graphite",
                 "SilicatesMasses": "silicates",
+                "SmallGrainMasses": "small_grain",
+                "LargeGrainMasses": "large_grain",
+                "GraphiteMassesAtomic": "atomic_graphite",
+                "SilicatesMassesAtomic": "atomic_silicates",
+                "SmallGrainMassesAtomic": "atomic_small_grain",
+                "LargeGrainMassesAtomic": "atomic_large_grain",
+                "GraphiteMassesMolecular": "molecular_graphite",
+                "SilicatesMassesMolecular": "molecular_silicates",
+                "SmallGrainMassesMolecular": "molecular_small_grain",
+                "LargeGrainMassesMolecular": "molecular_large_grain",
+                "GraphiteMassesColdDense": "cold_dense_graphite",
+                "SilicatesMassesColdDense": "cold_dense_silicates",
+                "SmallGrainMassesColdDense": "cold_dense_small_grain",
+                "LargeGrainMassesColdDense": "cold_dense_large_grain",
+            }[long_species]
+            pretty_name = {
+                "GraphiteMasses": "Graphite Dust Mass",
+                "SilicatesMasses": "Silicate Dust Mass",
+                "SmallGrainMasses": "small_grain",
+                "LargeGrainMasses": "large_grain",
+                "GraphiteMassesAtomic": "Graphite Dust Mass in Atomic Gas",
+                "SilicatesMassesAtomic": "Silicate Dust Mass in Atomic Gas",
+                "SmallGrainMassesAtomic": "atomic_small_grain",
+                "LargeGrainMassesAtomic": "atomic_large_grain",
+                "GraphiteMassesMolecular": "Graphite Dust Mass in Molecular Gas",
+                "SilicatesMassesMolecular": "Silicate Dust Mass in Molecular Gas",
+                "SmallGrainMassesMolecular": "molecular_small_grain",
+                "LargeGrainMassesMolecular": "molecular_large_grain",
+                "GraphiteMassesColdDense": "Graphite Dust Mass in Cold-Dense Gas",
+                "SilicatesMassesColdDense": "Silicate Dust Mass in Cold-Dense Gas",
+                "SmallGrainMassesColdDense": "cold_dense_small_grain",
+                "LargeGrainMassesColdDense": "cold_dense_large_grain",
             }[long_species]
+
         except KeyError:
             raise RegistrationDoesNotMatchError
 
-        full_name = f"{short_species} Dust Mass ({aperture_size} kpc)"
+        full_name = f"{pretty_name} ({aperture_size} kpc)"
         snake_case = f"{short_species}_mass_{aperture_size}_kpc"
 
         return unit, full_name, snake_case