diff --git a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.cpp b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.cpp index c9d2f68ca4e3c6138812d0335d5d93e2b5ef1047..29cd65d968531440a6597e9a57ba67cdfdc65283 100644 --- a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.cpp +++ b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.cpp @@ -308,7 +308,9 @@ void SqlSchema_INSERT::appendRow( // surv.survTransition "num unit" <-- for images try { - double val{parse_transition(surv.survTransition)}; + //double val{parse_transition(surv.survTransition)}; + const double SPEED_OF_LIGHT{299792458};// [m/s] + double val{SPEED_OF_LIGHT / surv.restFrequency}; obscoreRow[em_min] = to_string(val); //get_wavelen(EM_PRECISION, hdu.key_values); } catch(const std::exception& ex) diff --git a/data-access/engine/src/vlkb-obscore/src/parse_surveys_csv.cpp b/data-access/engine/src/vlkb-obscore/src/parse_surveys_csv.cpp index 0b3725176d82941e79caca2792062e5586b51006..76d82ce4caba2e5af6b560b4299764744c100b8a 100644 --- a/data-access/engine/src/vlkb-obscore/src/parse_surveys_csv.cpp +++ b/data-access/engine/src/vlkb-obscore/src/parse_surveys_csv.cpp @@ -201,7 +201,7 @@ vector<survey> parse_surveys(string filename, bool skip_first_row) case 2: surv.species = field; break; case 3: surv.transition = field; break; // vlkb-internal extra-data - case 4: surv.rest_frequency_Hz = stoul(field); break; + case 4: surv.rest_frequency_Hz = stoull(field); break; case 5: break; // NOT USED surv.restf_fits_unit = to_stringN(field, 20); break; case 6: surv.velocity_fits_unit = to_velocity_unit(field); break; // vlkb-internal did-resolution @@ -218,7 +218,8 @@ vector<survey> parse_surveys(string filename, bool skip_first_row) // security case 15: surv.auth_policy = to_authorization_policy(field); break; default: - my_assert(false, __FILE__,__LINE__, "too many fileds in a row of surveys metadata file: " + filename); + my_assert(false, __FILE__,__LINE__, + "too many fileds in a row of surveys metadata file: " + filename); } } surveys.push_back(surv); diff --git a/data-access/engine/src/vlkb-obscore/src/parse_surveys_csv.hpp b/data-access/engine/src/vlkb-obscore/src/parse_surveys_csv.hpp index c03fec65cc5ab0f32b92e90e76ba2123884d5541..82f8ef7ff3a24ed764fa13a38df6d824e266a89f 100644 --- a/data-access/engine/src/vlkb-obscore/src/parse_surveys_csv.hpp +++ b/data-access/engine/src/vlkb-obscore/src/parse_surveys_csv.hpp @@ -28,7 +28,7 @@ struct survey std::string name; std::string species; std::string transition; - unsigned long rest_frequency_Hz; + unsigned long long rest_frequency_Hz; // std::string restf_fits_unit; // NOT used velocity_unit velocity_fits_unit; std::string storage_path;