Skip to content
Snippets Groups Projects
Commit 6b802ea6 authored by Robert Butora's avatar Robert Butora
Browse files

vlkb-obscore: changes data_rights naming PRIVATE -> PROPRIETARY

parent 59cbe4ba
No related branches found
No related tags found
No related merge requests found
survey_id,name,species,transition,rest_frequency,restf_fits_unit,velocity_fits_unit,storage_path,file_filter,description,dataproduct_type,calib_level,o_ucd,fitskey_facility_name,fitskey_instrument_name,auth_policy
1,ExtMaps,distance,rm10,0,Hz,kpc,extinction_maps,%_rm10.fits,"Galactic Plane Extinction maps (Arab & Cambresy 2017) - 10 armin resolution using 2MASS",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PRIVATE
2,ExtMaps,distance,rm5,0,Hz,kpc,extinction_maps,%_rm5.fits,"Galactic Plane Extinction maps (Arab & Cambresy 2017) - 5 armin resolution using 2MASS",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PRIVATE
3,"Mopra GPS",12CO,1-0,115271000000,Hz,m.s**-1,MOPRA/12CO,%.fits,"Mopra Galactic Plane Survey (Burton et al. 2017)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PRIVATE
4,"Mopra GPS",13CO,1-0,110201000000,Hz,m.s**-1,MOPRA/13CO,%.fits,"Mopra Galactic Plane Survey (Burton et al. 2017)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PRIVATE
5,"Mopra GPS",C17O,1-0,112359000000,Hz,m.s**-1,MOPRA/C17O,%.fits,"Mopra Galactic Plane Survey (Burton et al. 2017)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PRIVATE
6,"Mopra GPS",C18O,1-0,109782000000,Hz,m.s**-1,MOPRA/C18O,%.fits,"Mopra Galactic Plane Survey (Burton et al. 2017)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PRIVATE
1,ExtMaps,distance,rm10,0,Hz,kpc,extinction_maps,%_rm10.fits,"Galactic Plane Extinction maps (Arab & Cambresy 2017) - 10 armin resolution using 2MASS",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PROPRIETARY
2,ExtMaps,distance,rm5,0,Hz,kpc,extinction_maps,%_rm5.fits,"Galactic Plane Extinction maps (Arab & Cambresy 2017) - 5 armin resolution using 2MASS",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PROPRIETARY
3,"Mopra GPS",12CO,1-0,115271000000,Hz,m.s**-1,MOPRA/12CO,%.fits,"Mopra Galactic Plane Survey (Burton et al. 2017)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PROPRIETARY
4,"Mopra GPS",13CO,1-0,110201000000,Hz,m.s**-1,MOPRA/13CO,%.fits,"Mopra Galactic Plane Survey (Burton et al. 2017)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PROPRIETARY
5,"Mopra GPS",C17O,1-0,112359000000,Hz,m.s**-1,MOPRA/C17O,%.fits,"Mopra Galactic Plane Survey (Burton et al. 2017)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PROPRIETARY
6,"Mopra GPS",C18O,1-0,109782000000,Hz,m.s**-1,MOPRA/C18O,%.fits,"Mopra Galactic Plane Survey (Burton et al. 2017)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PROPRIETARY
7,CHIMPS,C18O,3-2,329331000000,Hz,km.s**-1,CHIMPS,CHIMPS_C18O_%.fits,"JCMT CHIMPS Survey (Rigby et al. 2016, MNRAS 456, 2885)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PUBLIC
8,CHIMPS,13CO,3-2,330588000000,Hz,km.s**-1,CHIMPS,CHIMPS_13CO_%.fits,"JCMT CHIMPS Survey (Rigby et al. 2016, MNRAS 456, 2885)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PUBLIC
9,CHaMP,HCO+,1-0,89188520000,Hz,m.s**-1,CHaMP,%,"Mopra CHaMP Survey (Barnes et al. 2011, ApJS 196, 12)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PUBLIC
......@@ -56,10 +56,10 @@ survey_id,name,species,transition,rest_frequency,restf_fits_unit,velocity_fits_u
55,WISE,Continuum,"12 um",24982704833333,,,continuum/wise,%-w3-%,"WISE All-sky Survey (Wright et al. 2010, AJ 140, 1868)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PUBLIC
56,WISE,Continuum,"22 um",13626929909091,,,continuum/wise,%-w4-%,"WISE All-sky Survey (Wright et al. 2010, AJ 140, 1868)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PUBLIC
57,MAGPIS,Continuum,"20 cm",1498962290,,,continuum/magpis,magpis.%.fits,"VLA 20cm Galactic Plane Survey (White, Becker & Helfand 2005, AJ 130, 586)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PUBLIC
58,ARO-FQS LowRes,12CO,1-0,115271000000,Hz,m.s**-1,ARO,map12co_fb2_%-cube.fits,"Arizona Radio Observatory 3rd Quadrant Survey (Benedettini et al. 2017)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PRIVATE
59,ARO-FQS HighRes,12CO,1-0,115271000000,Hz,m.s**-1,ARO,map12co_fb1_%-cube.fits,"Arizona Radio Observatory 3rd Quadrant Survey (Benedettini et al. 2017)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PRIVATE
60,ARO-FQS LowRes,13CO,1-0,110201000000,Hz,m.s**-1,ARO,map13co_fb2_%-cube.fits,"Arizona Radio Observatory 3rd Quadrant Survey (Benedettini et al. 2017)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PRIVATE
61,ARO-FQS HighRes,13CO,1-0,110201000000,Hz,m.s**-1,ARO,map13co_fb1_%-cube.fits,"Arizona Radio Observatory 3rd Quadrant Survey (Benedettini et al. 2017)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PRIVATE
58,ARO-FQS LowRes,12CO,1-0,115271000000,Hz,m.s**-1,ARO,map12co_fb2_%-cube.fits,"Arizona Radio Observatory 3rd Quadrant Survey (Benedettini et al. 2017)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PROPRIETARY
59,ARO-FQS HighRes,12CO,1-0,115271000000,Hz,m.s**-1,ARO,map12co_fb1_%-cube.fits,"Arizona Radio Observatory 3rd Quadrant Survey (Benedettini et al. 2017)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PROPRIETARY
60,ARO-FQS LowRes,13CO,1-0,110201000000,Hz,m.s**-1,ARO,map13co_fb2_%-cube.fits,"Arizona Radio Observatory 3rd Quadrant Survey (Benedettini et al. 2017)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PROPRIETARY
61,ARO-FQS HighRes,13CO,1-0,110201000000,Hz,m.s**-1,ARO,map13co_fb1_%-cube.fits,"Arizona Radio Observatory 3rd Quadrant Survey (Benedettini et al. 2017)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PROPRIETARY
62,ATLASGAL,Continuum,"870 um",344589032184,,,continuum/ATLASGAL,%.fits,"ESO-APEX Laboca Galactic Plane Survey (Schuller et al. 2009, A&A 504, 415)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PUBLIC
63,"CSO BGPS",Continuum,"1.1 mm",272538598182,,,continuum/BOLOCAMGPS,%.fits,"CSO Bolocam Galactic Plane Survey (Ginsburg et al. 2013, ApJS 208, 14)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PUBLIC
64,"GLIMPSE 360",Continuum,"3.6 um",83275682777778,,,continuum/GLIMPSE/360/1.2_mosaics/corr,%I1.fits,"Spitzer GLIMPSE 360 Survey - Outer Galaxy Extension (Benjamin et al. 2003, PASP 115, 953)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PUBLIC
......@@ -92,13 +92,13 @@ survey_id,name,species,transition,rest_frequency,restf_fits_unit,velocity_fits_u
91,THOR,OH,"1.612 GHz",1612553669,Hz,m.s**-1,THOR/OH,%1612mhz%.fits,"VLA THOR Survey Inner Galactic Plane (Beuther et al. 2016, A&A 595, 32)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PUBLIC
92,THOR,OH,"1.665-1.667 GHz",1665000000,Hz,m.s**-1,THOR/OH,%166%mhz%.fits,"VLA THOR Survey Inner Galactic Plane (Beuther et al. 2016, A&A 595, 32)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PUBLIC
93,THOR,OH,"1.720 GHz",1720000000,Hz,m.s**-1,THOR/OH,%1720mhz%.fits,"VLA THOR Survey Inner Galactic Plane (Beuther et al. 2016, A&A 595, 32)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PUBLIC
94,SEDIGISM,13CO,2-1,220398680000,Hz,m.s**-1,SEDIGISM/13CO,%_13CO21_%.fits,"SEDIGISM (Schuller et al. 2017, A&A 601, 124)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PRIVATE
95,SEDIGISM,C18O,2-1,219560360000,Hz,m.s**-1,SEDIGISM/C18O,%_C18O21_%.fits,"SEDIGISM (Schuller et al. 2017, A&A 601, 124)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PRIVATE
94,SEDIGISM,13CO,2-1,220398680000,Hz,m.s**-1,SEDIGISM/13CO,%_13CO21_%.fits,"SEDIGISM (Schuller et al. 2017, A&A 601, 124)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PROPRIETARY
95,SEDIGISM,C18O,2-1,219560360000,Hz,m.s**-1,SEDIGISM/C18O,%_C18O21_%.fits,"SEDIGISM (Schuller et al. 2017, A&A 601, 124)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PROPRIETARY
96,FUGIN,12CO,1-0,115271203000,Hz,m.s**-1,FUGIN,%_12CO_%_cube.fits,"Nobeyama-45m Galactic Plane Survey (Umemoto et al. 2017, PASJ 69, 78)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PUBLIC
97,FUGIN,13CO,1-0,110201370000,Hz,m.s**-1,FUGIN,%_13CO_%_cube.fits,"Nobeyama-45m Galactic Plane Survey (Umemoto et al. 2017, PASJ 69, 78)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PUBLIC
98,FUGIN,C18O,1-0,109782182000,Hz,m.s**-1,FUGIN,%_C18O_%_cube.fits,"Nobeyama-45m Galactic Plane Survey (Umemoto et al. 2017, PASJ 69, 78)",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PUBLIC
99,"NANTEN2 GPS",12CO,1-0,115271000000,Hz,m.s**-1,NANTEN2,%,"NANTEN2 Galactic Plane Survey",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PRIVATE
100,ALMAGAL,Continuum,"220 GHz",220000000000,,,continuum/ALMAGAL,%.fits,"ALMA - ALMAGAL Survey (Molinari et al. 2023, in prep.)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PRIVATE
99,"NANTEN2 GPS",12CO,1-0,115271000000,Hz,m.s**-1,NANTEN2,%,"NANTEN2 Galactic Plane Survey",cube,2,spect.dopplerVeloc,TELESCOP,INSTRUME,PROPRIETARY
100,ALMAGAL,Continuum,"220 GHz",220000000000,,,continuum/ALMAGAL,%.fits,"ALMA - ALMAGAL Survey (Molinari et al. 2023, in prep.)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PROPRIETARY
101,HGBS,Continuum,70 um,4282749400000,,,continuum/hgbs/blue,%_blue%,"Herschel Gould Belt Survey (Andre et al. 2010, A&A 518, L102)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PUBLIC
102,HGBS,Continuum,160 um,1873702862500,,,continuum/hgbs/red,%_red%,"Herschel Gould Belt Survey (Andre et al. 2010, A&A 518, L102)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PUBLIC
103,HGBS,Continuum,250 um,1199169832000,,,continuum/hgbs/PSW,%_PSW%,"Herschel Gould Belt Survey (Andre et al. 2010, A&A 518, L102)",image,2,phot.flux;em.radio,TELESCOP,INSTRUME,PUBLIC
......
......@@ -43,7 +43,11 @@ string authPolicyToSQLEnum(string csvPolicy)
{
return "FREE";
}
else if(csvPolicy.compare("PRIVATE") == 0)
else if(csvPolicy.compare("SECURE") == 0)
{
return "FREE";
}
else if(csvPolicy.compare("PROPRIETARY") == 0)
{
return "PRIV";
}
......
......@@ -245,7 +245,7 @@ int cmd_dbAdd(int argc, char * argv[])
int max_hdupos = 1;
int min_hdupos = 1;
const string groups = ""; // NOTE: uses separate cmd 'dbmodgroups' to add groups to enable access to PRIVATE surveys
const string groups = ""; // NOTE: uses cmd 'dbmodgroups' to add groups
int sid_from, sid_to;
int rc = 0;
......
......@@ -57,7 +57,8 @@ string to_string(authorization_policy p)
string str;
switch(p)
{
case authorization_policy::PRIVATE : str = "PRIVATE"; break;
case authorization_policy::PROPRIETARY : str = "PROPRIETARY"; break;
case authorization_policy::SECURE : str = "SECURE"; break;
case authorization_policy::PUBLIC : str = "PUBLIC"; break;
}
my_assert(!str.empty(), __FILE__,__LINE__, "unrecognized value of authorization_policy type");
......@@ -66,9 +67,10 @@ string to_string(authorization_policy p)
authorization_policy to_authorization_policy(string raw_string)
{
if(trim(raw_string).compare("PRIVATE") == 0) return authorization_policy::PRIVATE;
if(trim(raw_string).compare("PROPRIETARY") == 0) return authorization_policy::PROPRIETARY;
else if(trim(raw_string).compare("SECURE") == 0) return authorization_policy::SECURE;
else if(trim(raw_string).compare("PUBLIC") == 0) return authorization_policy::PUBLIC;
else throw invalid_argument("'authorization_policy' type must be 'PRIVATE' or 'PUBLIC' but was: " + raw_string);
else throw invalid_argument("'authorization_policy' type must be 'PROPRIETARY', 'SECURE' or 'PUBLIC' but was: " + raw_string);
}
......
......@@ -8,7 +8,7 @@ enum class dataproduct {IMAGE, CUBE};
std::string to_string(dataproduct d);
dataproduct to_dataproduct(std::string raw_string);
enum class authorization_policy {PRIVATE, PUBLIC};
enum class authorization_policy {PROPRIETARY, SECURE, PUBLIC};
std::string to_string(authorization_policy p);
authorization_policy to_authorization_policy(std::string raw_string);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment