Skip to content

Commit 0d6e404

Browse files
MatthieuSchallerMatthieuSchaller
authored
Merge pull request #102 from correac/Register_Nitrogen
Adding SOAP registration of carbon and nitrogen abundances (PR ready to be reviewed)
2 parents c8fcf8a + 06e593b commit 0d6e404

File tree

2 files changed

+108
-0
lines changed

2 files changed

+108
-0
lines changed

‎velociraptor/catalogue/registration.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,18 +1087,24 @@ def registration_log_element_ratios_times_masses(
10871087
"LogIronOverHydrogen": "Fe_over_H",
10881088
"LogOxygenOverHydrogenAtomic": "O_over_H_atomic",
10891089
"LogOxygenOverHydrogenMolecular": "O_over_H_molecular",
1090+
"LogNitrogenOverOxygen": "N_over_O",
1091+
"LogCarbonOverOxygen": "C_over_O",
10901092
}[long_species]
10911093
element_name = {
10921094
"LogOxygenOverHydrogen": "Oxygen",
10931095
"LogIronOverHydrogen": "Iron",
10941096
"LogOxygenOverHydrogenAtomic": "Atomic-phase Oxygen",
10951097
"LogOxygenOverHydrogenMolecular": "Molecular-phase Oxygen",
1098+
"LogNitrogenOverOxygen": "Nitrogen over Oxygen",
1099+
"LogCarbonOverOxygen": "Carbon over Oxygen",
10961100
}[long_species]
10971101
fraction_name = {
10981102
"LogOxygenOverHydrogen": "O/H",
10991103
"LogIronOverHydrogen": "Fe/H",
11001104
"LogOxygenOverHydrogenAtomic": "O/H",
11011105
"LogOxygenOverHydrogenMolecular": "O/H",
1106+
"LogNitrogenOverOxygen": "N/O",
1107+
"LogCarbonOverOxygen": "C/O",
11021108
}[long_species]
11031109

11041110
short_floortype = {"Lo": "lowfloor", "Hi": "highfloor"}[floor_type]
@@ -1143,18 +1149,24 @@ def registration_lin_element_ratios_times_masses(
11431149
"OxygenOverHydrogen": "O_over_H",
11441150
"IronOverHydrogen": "Fe_over_H",
11451151
"IronfromSNIaOverHydrogen": "FeSNIa_over_H",
1152+
"NitrogenOverOxygen": "N_over_O",
1153+
"CarbonOverOxygen": "C_over_O",
11461154
}[long_species]
11471155
element_name = {
11481156
"TotalOxygenOverHydrogen": "Oxygen",
11491157
"OxygenOverHydrogen": "Oxygen",
11501158
"IronOverHydrogen": "Iron",
11511159
"IronfromSNIaOverHydrogen": "SNIaIron",
1160+
"NitrogenOverOxygen": "Nitrogen over Oxygen",
1161+
"CarbonOverOxygen": "Carbon over Oxygen",
11521162
}[long_species]
11531163
fraction_name = {
11541164
"TotalOxygenOverHydrogen": "O/H",
11551165
"OxygenOverHydrogen": "O/H",
11561166
"IronOverHydrogen": "Fe/H",
11571167
"IronfromSNIaOverHydrogen": "Fe(SNIa)/H",
1168+
"NitrogenOverOxygen": "N/O",
1169+
"CarbonOverOxygen": "C/O",
11581170
}[long_species]
11591171
except KeyError:
11601172
raise RegistrationDoesNotMatchError

‎velociraptor/catalogue/translator.py‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,6 +1262,102 @@ def VR_to_SOAP(particle_property_name: str) -> str:
12621262
"exclusivesphere.100kpc.linearmassweighteddiffuseoxygenoverhydrogenofgas",
12631263
-1,
12641264
),
1265+
"lin_element_ratios_times_masses.lin_N_over_O_total_times_gas_mass_30_kpc": (
1266+
"exclusivesphere.30kpc.linearmassweightednitrogenoveroxygenofgas",
1267+
-1,
1268+
),
1269+
"lin_element_ratios_times_masses.lin_N_over_O_total_times_gas_mass_50_kpc": (
1270+
"exclusivesphere.50kpc.linearmassweightednitrogenoveroxygenofgas",
1271+
-1,
1272+
),
1273+
"lin_element_ratios_times_masses.lin_N_over_O_total_times_gas_mass_100_kpc": (
1274+
"exclusivesphere.100kpc.linearmassweightednitrogenoveroxygenofgas",
1275+
-1,
1276+
),
1277+
"lin_element_ratios_times_masses.lin_N_over_O_times_gas_mass_30_kpc": (
1278+
"exclusivesphere.30kpc.linearmassweighteddiffusenitrogenoveroxygenofgas",
1279+
-1,
1280+
),
1281+
"lin_element_ratios_times_masses.lin_N_over_O_times_gas_mass_50_kpc": (
1282+
"exclusivesphere.50kpc.linearmassweighteddiffusenitrogenoveroxygenofgas",
1283+
-1,
1284+
),
1285+
"lin_element_ratios_times_masses.lin_N_over_O_times_gas_mass_100_kpc": (
1286+
"exclusivesphere.100kpc.linearmassweighteddiffusenitrogenoveroxygenofgas",
1287+
-1,
1288+
),
1289+
"log_element_ratios_times_masses.log_N_over_O_times_gas_mass_lowfloor_30_kpc": (
1290+
"exclusivesphere.30kpc.logarithmicmassweighteddiffusenitrogenoveroxygenofgaslowlimit",
1291+
-1,
1292+
),
1293+
"log_element_ratios_times_masses.log_N_over_O_times_gas_mass_lowfloor_50_kpc": (
1294+
"exclusivesphere.50kpc.logarithmicmassweighteddiffusenitrogenoveroxygenofgaslowlimit",
1295+
-1,
1296+
),
1297+
"log_element_ratios_times_masses.log_N_over_O_times_gas_mass_lowfloor_100_kpc": (
1298+
"exclusivesphere.100kpc.logarithmicmassweighteddiffusenitrogenoveroxygenofgaslowlimit",
1299+
-1,
1300+
),
1301+
"log_element_ratios_times_masses.log_N_over_O_times_gas_mass_highfloor_30_kpc": (
1302+
"exclusivesphere.30kpc.logarithmicmassweighteddiffusenitrogenoveroxygenofgashighlimit",
1303+
-1,
1304+
),
1305+
"log_element_ratios_times_masses.log_N_over_O_times_gas_mass_highfloor_50_kpc": (
1306+
"exclusivesphere.50kpc.logarithmicmassweighteddiffusenitrogenoveroxygenofgashighlimit",
1307+
-1,
1308+
),
1309+
"log_element_ratios_times_masses.log_N_over_O_times_gas_mass_highfloor_100_kpc": (
1310+
"exclusivesphere.100kpc.logarithmicmassweighteddiffusenitrogenoveroxygenofgashighlimit",
1311+
-1,
1312+
),
1313+
"lin_element_ratios_times_masses.lin_C_over_O_total_times_gas_mass_30_kpc": (
1314+
"exclusivesphere.30kpc.linearmassweightedcarbonoveroxygenofgas",
1315+
-1,
1316+
),
1317+
"lin_element_ratios_times_masses.lin_C_over_O_total_times_gas_mass_50_kpc": (
1318+
"exclusivesphere.50kpc.linearmassweightedcarbonoveroxygenofgas",
1319+
-1,
1320+
),
1321+
"lin_element_ratios_times_masses.lin_C_over_O_total_times_gas_mass_100_kpc": (
1322+
"exclusivesphere.100kpc.linearmassweightedcarbonoveroxygenofgas",
1323+
-1,
1324+
),
1325+
"lin_element_ratios_times_masses.lin_C_over_O_times_gas_mass_30_kpc": (
1326+
"exclusivesphere.30kpc.linearmassweighteddiffusecarbonoveroxygenofgas",
1327+
-1,
1328+
),
1329+
"lin_element_ratios_times_masses.lin_C_over_O_times_gas_mass_50_kpc": (
1330+
"exclusivesphere.50kpc.linearmassweighteddiffusecarbonoveroxygenofgas",
1331+
-1,
1332+
),
1333+
"lin_element_ratios_times_masses.lin_C_over_O_times_gas_mass_100_kpc": (
1334+
"exclusivesphere.100kpc.linearmassweighteddiffusecarbonoveroxygenofgas",
1335+
-1,
1336+
),
1337+
"log_element_ratios_times_masses.log_C_over_O_times_gas_mass_lowfloor_30_kpc": (
1338+
"exclusivesphere.30kpc.logarithmicmassweighteddiffusecarbonoveroxygenofgaslowlimit",
1339+
-1,
1340+
),
1341+
"log_element_ratios_times_masses.log_C_over_O_times_gas_mass_lowfloor_50_kpc": (
1342+
"exclusivesphere.50kpc.logarithmicmassweighteddiffusecarbonoveroxygenofgaslowlimit",
1343+
-1,
1344+
),
1345+
"log_element_ratios_times_masses.log_C_over_O_times_gas_mass_lowfloor_100_kpc": (
1346+
"exclusivesphere.100kpc.logarithmicmassweighteddiffusecarbonoveroxygenofgaslowlimit",
1347+
-1,
1348+
),
1349+
"log_element_ratios_times_masses.log_C_over_O_times_gas_mass_highfloor_30_kpc": (
1350+
"exclusivesphere.30kpc.logarithmicmassweighteddiffusecarbonoveroxygenofgashighlimit",
1351+
-1,
1352+
),
1353+
"log_element_ratios_times_masses.log_C_over_O_times_gas_mass_highfloor_50_kpc": (
1354+
"exclusivesphere.50kpc.logarithmicmassweighteddiffusecarbonoveroxygenofgashighlimit",
1355+
-1,
1356+
),
1357+
"log_element_ratios_times_masses.log_C_over_O_times_gas_mass_highfloor_100_kpc": (
1358+
"exclusivesphere.100kpc.logarithmicmassweighteddiffusecarbonoveroxygenofgashighlimit",
1359+
-1,
1360+
),
12651361
"log_element_ratios_times_masses.log_O_over_H_times_gas_mass_lowfloor_30_kpc": (
12661362
"exclusivesphere.30kpc.logarithmicmassweighteddiffuseoxygenoverhydrogenofgaslowlimit",
12671363
-1,

0 commit comments

Comments
 (0)