mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-21 01:59:15 -05:00
Some cleanup of helper functions
This commit is contained in:
Emma Broman
@@ -26,192 +26,100 @@
|
||||
|
||||
namespace openspace::exoplanets {
|
||||
|
||||
std::string getSpeckStarName(std::string csvName) {
|
||||
std::string name = csvName;
|
||||
if (csvName == "HD 1237")
|
||||
name = "GJ 3021";
|
||||
else if (csvName == "MOA-2009-BLG-387L")
|
||||
name = "MOA 2009-BLG-387L";
|
||||
else if (csvName == "HD 126614 A")
|
||||
name = "HD 126614";
|
||||
else if (csvName == "epsilon Ret")
|
||||
name = "HD 27442";
|
||||
else if (csvName == "PH-1")
|
||||
name = "PH1";
|
||||
else if (csvName == "gamma Leo A")
|
||||
name = "gam 1 Leo";
|
||||
else if (csvName == "OGLE-2007-BLG-368L")
|
||||
name = "OGLE 2007-BLG-368L";
|
||||
else if (csvName == "alpha Ari")
|
||||
name = "alf Ari";
|
||||
else if (csvName == "mu Ara")
|
||||
name = "HD 160691";
|
||||
else if (csvName == "OGLE-05-169L")
|
||||
name = "OGLE 2005-BLG-169L";
|
||||
else if (csvName == "tau Gru")
|
||||
name = "HD 216435";
|
||||
else if (csvName == "iota Hor")
|
||||
name = "HR 810";
|
||||
else if (csvName == "OGLE-05-071L")
|
||||
name = "OGLE 2005-BLG-71L";
|
||||
else if (csvName == "OGLE235-MOA53")
|
||||
name = "OGLE 2003-BLG-235L";
|
||||
else if (csvName == "MOA-2008-BLG-310L")
|
||||
name = "MOA 2008-BLG-310L";
|
||||
else if (csvName == "KIC 11442793")
|
||||
name = "KOI-351";
|
||||
else if (csvName == "OGLE-2006-BLG-109L")
|
||||
name = "OGLE 2006-BLG-109L";
|
||||
else if (csvName == "HD 137388")
|
||||
name = "HD 137388 A";
|
||||
else if (csvName == "kappa CrB")
|
||||
name = "kap CrB";
|
||||
else if (csvName == "XO-2")
|
||||
name = "XO-2 N";
|
||||
else if (csvName == "epsilon Tau")
|
||||
name = "eps Tau";
|
||||
else if (csvName == "epsilon Eri")
|
||||
name = "eps Eri";
|
||||
else if (csvName == "Kepler-448")
|
||||
name = "KOI-12";
|
||||
else if (csvName == "omega Ser")
|
||||
name = "ome Ser";
|
||||
else if (csvName == "MOA-2010-BLG-477L")
|
||||
name = "MOA 2010-BLG-477L";
|
||||
else if (csvName == "GJ 176")
|
||||
name = "HD 285968";
|
||||
else if (csvName == "HIP 2247")
|
||||
name = "BD-17 63";
|
||||
else if (csvName == "MOA-2009-BLG-266L")
|
||||
name = "MOA 2009-BLG-266L";
|
||||
else if (csvName == "Kepler-89")
|
||||
name = "KOI-94";
|
||||
else if (csvName == "iota Dra")
|
||||
name = "HIP 75458";
|
||||
else if (csvName == "MOA-2007-BLG-400L")
|
||||
name = "MOA 2007-BLG-400L";
|
||||
else if (csvName == "upsilon And")
|
||||
name = "ups And";
|
||||
else if (csvName == "OGLE-2011-BLG-0251")
|
||||
name = "OGLE 2011-BLG-251L";
|
||||
else if (csvName == "OGLE-05-390L")
|
||||
name = "OGLE 2005-BLG-390L";
|
||||
else if (csvName == "Kepler-420")
|
||||
name = "KOI-1257";
|
||||
else if (csvName == "beta Pic")
|
||||
name = "bet Pic";
|
||||
else if (csvName == "gamma Cep")
|
||||
name = "gam Cep";
|
||||
else if (csvName == "MOA-2007-BLG-192L")
|
||||
name = "MOA 2007-BLG-192L";
|
||||
else if (csvName == "MOA-2009-BLG-319L")
|
||||
name = "MOA 2009-BLG-319L";
|
||||
else if (csvName == "omicron CrB")
|
||||
name = "omi CrB";
|
||||
else if (csvName == "beta Gem")
|
||||
name = "HD 62509";
|
||||
else if (csvName == "epsilon CrB")
|
||||
name = "eps CrB";
|
||||
else if (csvName == "omicron UMa")
|
||||
name = "omi UMa";
|
||||
else if (csvName == "HD 142022")
|
||||
name = "HD 142022 A";
|
||||
|
||||
return name;
|
||||
}
|
||||
|
||||
std::string getCsvStarName(std::string name) {
|
||||
std::string csvName = name;
|
||||
if (name == "GJ 3021")
|
||||
csvName = "HD 1237";
|
||||
else if (name == "MOA 2009-BLG-387L")
|
||||
csvName = "MOA-2009-BLG-387L";
|
||||
else if (name == "HD 126614")
|
||||
csvName = "HD 126614 A";
|
||||
else if (name == "HD 27442")
|
||||
csvName = "epsilon Ret";
|
||||
else if (name == "PH1")
|
||||
csvName = "PH-1";
|
||||
else if (name == "gam 1 Leo")
|
||||
csvName = "gamma Leo A";
|
||||
else if (name == "OGLE 2007-BLG-368L")
|
||||
csvName = "OGLE-2007-BLG-368L";
|
||||
else if (name == "alf Ari")
|
||||
csvName = "alpha Ari";
|
||||
else if (name == "HD 160691")
|
||||
csvName = "mu Ara";
|
||||
else if (name == "OGLE 2005-BLG-169L")
|
||||
csvName = "OGLE-05-169L";
|
||||
else if (name == "HD 216435")
|
||||
csvName = "tau Gru";
|
||||
else if (name == "HR 810")
|
||||
csvName = "iota Hor";
|
||||
else if (name == "OGLE 2005-BLG-71L")
|
||||
csvName = "OGLE-05-071L";
|
||||
else if (name == "OGLE 2003-BLG-235L")
|
||||
csvName = "OGLE235-MOA53";
|
||||
else if (name == "MOA 2008-BLG-310L")
|
||||
csvName = "MOA-2008-BLG-310L";
|
||||
else if (name == "KOI-351")
|
||||
csvName = "KIC 11442793";
|
||||
else if (name == "OGLE 2006-BLG-109L")
|
||||
csvName = "OGLE-2006-BLG-109L";
|
||||
else if (name == "HD 137388 A")
|
||||
csvName = "HD 137388";
|
||||
else if (name == "kap CrB")
|
||||
csvName = "kappa CrB";
|
||||
else if (name == "XO-2 N")
|
||||
csvName = "XO-2";
|
||||
else if (name == "eps Tau")
|
||||
csvName = "epsilon Tau";
|
||||
else if (name == "eps Eri")
|
||||
csvName = "epsilon Eri";
|
||||
else if (name == "KOI-12")
|
||||
csvName = "Kepler-448";
|
||||
else if (name == "ome Ser")
|
||||
csvName = "omega Ser";
|
||||
else if (name == "MOA 2010-BLG-477L")
|
||||
csvName = "MOA-2010-BLG-477L";
|
||||
else if (name == "HD 285968")
|
||||
csvName = "GJ 176";
|
||||
else if (name == "BD-17 63")
|
||||
csvName = "HIP 2247";
|
||||
else if (name == "MOA 2009-BLG-266L")
|
||||
csvName = "MOA-2009-BLG-266L";
|
||||
else if (name == "KOI-94")
|
||||
csvName = "Kepler-89";
|
||||
else if (name == "HIP 75458")
|
||||
csvName = "iota Dra";
|
||||
else if (name == "MOA 2007-BLG-400L")
|
||||
csvName = "MOA-2007-BLG-400L";
|
||||
else if (name == "ups And")
|
||||
csvName = "upsilon And";
|
||||
else if (name == "OGLE 2011-BLG-251L")
|
||||
csvName = "OGLE-2011-BLG-0251";
|
||||
else if (name == "OGLE 2005-BLG-390L")
|
||||
csvName = "OGLE-05-390L";
|
||||
else if (name == "KOI-1257")
|
||||
csvName = "Kepler-420";
|
||||
else if (name == "bet Pic")
|
||||
csvName = "beta Pic";
|
||||
else if (name == "gam Cep")
|
||||
csvName = "gamma Cep";
|
||||
else if (name == "MOA 2007-BLG-192L")
|
||||
csvName = "MOA-2007-BLG-192L";
|
||||
else if (name == "MOA 2009-BLG-319L")
|
||||
csvName = "MOA-2009-BLG-319L";
|
||||
else if (name == "omi CrB")
|
||||
csvName = "omicron CrB";
|
||||
else if (name == "HD 62509")
|
||||
csvName = "beta Gem";
|
||||
else if (name == "eps CrB")
|
||||
csvName = "epsilon CrB";
|
||||
else if (name == "omi UMa")
|
||||
csvName = "omicron UMa";
|
||||
else if (name == "HD 142022 A")
|
||||
csvName = "HD 142022";
|
||||
|
||||
std::string speckStarName(std::string csvName) {
|
||||
if (csvName == "HD 1237") { return "GJ 3021"; }
|
||||
if (csvName == "MOA-2009-BLG-387L") { return "MOA 2009-BLG-387L"; }
|
||||
if (csvName == "HD 126614 A") { return "HD 126614"; }
|
||||
if (csvName == "epsilon Ret") { return "HD 27442"; }
|
||||
if (csvName == "PH-1") { return "PH1"; }
|
||||
if (csvName == "gamma Leo A") { return "gam 1 Leo"; }
|
||||
if (csvName == "OGLE-2007-BLG-368L") { return "OGLE 2007-BLG-368L"; }
|
||||
if (csvName == "alpha Ari") { return "alf Ari"; }
|
||||
if (csvName == "mu Ara") { return "HD 160691"; }
|
||||
if (csvName == "OGLE-05-169L") { return "OGLE 2005-BLG-169L"; }
|
||||
if (csvName == "tau Gru") { return "HD 216435"; }
|
||||
if (csvName == "iota Hor") { return "HR 810"; }
|
||||
if (csvName == "OGLE-05-071L") { return "OGLE 2005-BLG-71L"; }
|
||||
if (csvName == "OGLE235-MOA53") { return "OGLE 2003-BLG-235L"; }
|
||||
if (csvName == "MOA-2008-BLG-310L") { return "MOA 2008-BLG-310L"; }
|
||||
if (csvName == "KIC 11442793") { return "KOI-351"; }
|
||||
if (csvName == "OGLE-2006-BLG-109L") { return "OGLE 2006-BLG-109L"; }
|
||||
if (csvName == "HD 137388") { return "HD 137388 A"; }
|
||||
if (csvName == "kappa CrB") { return "kap CrB"; }
|
||||
if (csvName == "XO-2") { return "XO-2 N"; }
|
||||
if (csvName == "epsilon Tau") { return "eps Tau"; }
|
||||
if (csvName == "epsilon Eri") { return "eps Eri"; }
|
||||
if (csvName == "Kepler-448") { return "KOI-12"; }
|
||||
if (csvName == "omega Ser") { return "ome Ser"; }
|
||||
if (csvName == "MOA-2010-BLG-477L") { return "MOA 2010-BLG-477L"; }
|
||||
if (csvName == "GJ 176") { return "HD 285968"; }
|
||||
if (csvName == "HIP 2247") { return "BD-17 63"; }
|
||||
if (csvName == "MOA-2009-BLG-266L") { return "MOA 2009-BLG-266L"; }
|
||||
if (csvName == "Kepler-89") { return "KOI-94"; }
|
||||
if (csvName == "iota Dra") { return "HIP 75458"; }
|
||||
if (csvName == "MOA-2007-BLG-400L") { return "MOA 2007-BLG-400L"; }
|
||||
if (csvName == "upsilon And") { return "ups And"; }
|
||||
if (csvName == "OGLE-2011-BLG-0251") { return "OGLE 2011-BLG-251L"; }
|
||||
if (csvName == "OGLE-05-390L") { return "OGLE 2005-BLG-390L"; }
|
||||
if (csvName == "Kepler-420") { return "KOI-1257"; }
|
||||
if (csvName == "beta Pic") { return "bet Pic"; }
|
||||
if (csvName == "gamma Cep") { return "gam Cep"; }
|
||||
if (csvName == "MOA-2007-BLG-192L") { return "MOA 2007-BLG-192L"; }
|
||||
if (csvName == "MOA-2009-BLG-319L") { return "MOA 2009-BLG-319L"; }
|
||||
if (csvName == "omicron CrB") { return "omi CrB"; }
|
||||
if (csvName == "beta Gem") { return "HD 62509"; }
|
||||
if (csvName == "epsilon CrB") { return "eps CrB"; }
|
||||
if (csvName == "omicron UMa") { return "omi UMa"; }
|
||||
if (csvName == "HD 142022") { return "HD 142022 A"; }
|
||||
return csvName;
|
||||
}
|
||||
|
||||
std::string csvStarName(std::string name) {
|
||||
if (name == "GJ 3021") { return "HD 1237"; }
|
||||
if (name == "MOA 2009-BLG-387L") { return "MOA-2009-BLG-387L"; }
|
||||
if (name == "HD 126614") { return "HD 126614 A"; }
|
||||
if (name == "HD 27442") { return "epsilon Ret"; }
|
||||
if (name == "PH1") { return "PH-1"; }
|
||||
if (name == "gam 1 Leo") { return "gamma Leo A"; }
|
||||
if (name == "OGLE 2007-BLG-368L") { return "OGLE-2007-BLG-368L"; }
|
||||
if (name == "alf Ari") { return "alpha Ari"; }
|
||||
if (name == "HD 160691") { return "mu Ara"; }
|
||||
if (name == "OGLE 2005-BLG-169L") { return "OGLE-05-169L"; }
|
||||
if (name == "HD 216435") { return "tau Gru"; }
|
||||
if (name == "HR 810") { return "iota Hor"; }
|
||||
if (name == "OGLE 2005-BLG-71L") { return "OGLE-05-071L"; }
|
||||
if (name == "OGLE 2003-BLG-235L") { return "OGLE235-MOA53"; }
|
||||
if (name == "MOA 2008-BLG-310L") { return "MOA-2008-BLG-310L"; }
|
||||
if (name == "KOI-351") { return "KIC 11442793"; }
|
||||
if (name == "OGLE 2006-BLG-109L") { return "OGLE-2006-BLG-109L"; }
|
||||
if (name == "HD 137388 A") { return "HD 137388"; }
|
||||
if (name == "kap CrB") { return "kappa CrB"; }
|
||||
if (name == "XO-2 N") { return "XO-2"; }
|
||||
if (name == "eps Tau") { return "epsilon Tau"; }
|
||||
if (name == "eps Eri") { return "epsilon Eri"; }
|
||||
if (name == "KOI-12") { return "Kepler-448"; }
|
||||
if (name == "ome Ser") { return "omega Ser"; }
|
||||
if (name == "MOA 2010-BLG-477L") { return "MOA-2010-BLG-477L"; }
|
||||
if (name == "HD 285968") { return "GJ 176"; }
|
||||
if (name == "BD-17 63") { return "HIP 2247"; }
|
||||
if (name == "MOA 2009-BLG-266L") { return "MOA-2009-BLG-266L"; }
|
||||
if (name == "KOI-94") { return "Kepler-89"; }
|
||||
if (name == "HIP 75458") { return "iota Dra"; }
|
||||
if (name == "MOA 2007-BLG-400L") { return "MOA-2007-BLG-400L"; }
|
||||
if (name == "ups And") { return "upsilon And"; }
|
||||
if (name == "OGLE 2011-BLG-251L") { return "OGLE-2011-BLG-0251"; }
|
||||
if (name == "OGLE 2005-BLG-390L") { return "OGLE-05-390L"; }
|
||||
if (name == "KOI-1257") { return "Kepler-420"; }
|
||||
if (name == "bet Pic") { return "beta Pic"; }
|
||||
if (name == "gam Cep") { return "gamma Cep"; }
|
||||
if (name == "MOA 2007-BLG-192L") { return "MOA-2007-BLG-192L"; }
|
||||
if (name == "MOA 2009-BLG-319L") { return "MOA-2009-BLG-319L"; }
|
||||
if (name == "omi CrB") { return "omicron CrB"; }
|
||||
if (name == "HD 62509") { return "beta Gem"; }
|
||||
if (name == "eps CrB") { return "epsilon CrB"; }
|
||||
if (name == "omi UMa") { return "omicron UMa"; }
|
||||
if (name == "HD 142022 A") { return "HD 142022"; }
|
||||
return name;
|
||||
}
|
||||
|
||||
} // namespace openspace::exoplanets
|
||||
|
||||
@@ -75,10 +75,10 @@ struct Exoplanet {
|
||||
};
|
||||
|
||||
// Convert csv-file specific names to the corresponding name in the speck data file
|
||||
std::string getSpeckStarName(std::string name);
|
||||
std::string speckStarName(std::string name);
|
||||
|
||||
// Convert speck-file specific names to the corresponding name in the csv data file
|
||||
std::string getCsvStarName(std::string name);
|
||||
std::string csvStarName(std::string name);
|
||||
|
||||
} // namespace openspace::exoplanets
|
||||
|
||||
|
||||
@@ -138,7 +138,7 @@ int addExoplanetSystem(lua_State* L) {
|
||||
const std::string starName = luaL_checkstring(L, StringLocation);
|
||||
|
||||
// If user have given name as in EOD, change it to speck-name
|
||||
const std::string starNameSpeck = getSpeckStarName(starName);
|
||||
const std::string starNameSpeck = speckStarName(starName);
|
||||
|
||||
const std::string starIdentifier = createIdentifier(starNameSpeck);
|
||||
const std::string guiPath = ExoplanetsGuiPath + starNameSpeck;
|
||||
@@ -469,7 +469,7 @@ int addExoplanetSystem(lua_State* L) {
|
||||
int removeExoplanetSystem(lua_State* L) {
|
||||
const int StringLocation = -1;
|
||||
const std::string starName = luaL_checkstring(L, StringLocation);
|
||||
const std::string starNameSpeck = getSpeckStarName(starName);
|
||||
const std::string starNameSpeck = speckStarName(starName);
|
||||
const std::string starIdentifier = createIdentifier(starNameSpeck);
|
||||
|
||||
openspace::global::scriptEngine.queueScript(
|
||||
|
||||
@@ -589,7 +589,7 @@ void ExoplanetsCsvToBinTask::perform(const Task::ProgressCallback& progressCallb
|
||||
getline(lineStream, data, ','); // SPECREF
|
||||
getline(lineStream, data, ','); // SPECURL
|
||||
getline(lineStream, data, ','); // STAR
|
||||
std::string speckStarname = getSpeckStarName(data);
|
||||
std::string speckStarname = speckStarName(data);
|
||||
glm::vec3 position = getStarPosition(speckStarname);
|
||||
p.POSITIONX = position[0];
|
||||
p.POSITIONY = position[1];
|
||||
|
||||
Reference in New Issue
Block a user