arvi 0.1.3__tar.gz → 0.1.6__tar.gz

{arvi-0.1.3 → arvi-0.1.6}/.github/workflows/install.yml

@@ -5,7 +5,7 @@ name: Install-Test
 
 on:
   push:
-    branches: [ "main" ]
+    #branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
 

{arvi-0.1.3 → arvi-0.1.6}/.gitignore

@@ -1,3 +1,6 @@
+*.fits
+
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

{arvi-0.1.3 → arvi-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arvi
-Version: 0.1.3
+Version: 0.1.6
 Summary: The Automated RV Inspector
 Author-email: João Faria <joao.faria@unige.ch>
 License: MIT
@@ -20,8 +20,8 @@ Requires-Dist: dace-query
 Requires-Dist: loguru
 Requires-Dist: mpldatacursor
 Requires-Dist: tqdm
-Requires-Dist: pyexoplaneteu
 Requires-Dist: pySWEETCat
+Requires-Dist: kepmodel
 
 <p align="center">
   <img width = "140" src="https://github.com/j-faria/arvi/blob/main/docs/logo/logo.png?raw=true"/>
@@ -29,18 +29,6 @@ Requires-Dist: pySWEETCat
 
 
 
-## Goals
-
-- _Fast_:
-  all `arvi` operations must be completed in under **1 second**
-
-- _Reproducible_:
-  **everyone** must be able to use `arvi`
-
-- _Accurate_:
-  `arvi` must always provide the **correct result**
-
-
 #### Actions
 
 [![Deploy docs](https://github.com/j-faria/arvi/actions/workflows/docs-gh-pages.yml/badge.svg)](https://github.com/j-faria/arvi/actions/workflows/docs-gh-pages.yml)

{arvi-0.1.3 → arvi-0.1.6}/README.md

@@ -4,20 +4,8 @@
 
 
 
-## Goals
-
-- _Fast_:
-  all `arvi` operations must be completed in under **1 second**
-
-- _Reproducible_:
-  **everyone** must be able to use `arvi`
-
-- _Accurate_:
-  `arvi` must always provide the **correct result**
-
-
 #### Actions
 
 [![Deploy docs](https://github.com/j-faria/arvi/actions/workflows/docs-gh-pages.yml/badge.svg)](https://github.com/j-faria/arvi/actions/workflows/docs-gh-pages.yml)
 [![Install-Test](https://github.com/j-faria/arvi/actions/workflows/install.yml/badge.svg)](https://github.com/j-faria/arvi/actions/workflows/install.yml)
-[![Upload Python Package](https://github.com/j-faria/arvi/actions/workflows/python-publish.yml/badge.svg)](https://github.com/j-faria/arvi/actions/workflows/python-publish.yml)
+[![Upload Python Package](https://github.com/j-faria/arvi/actions/workflows/python-publish.yml/badge.svg)](https://github.com/j-faria/arvi/actions/workflows/python-publish.yml)

{arvi-0.1.3 → arvi-0.1.6}/arvi/__init__.py

@@ -1,5 +1,4 @@
-__version__ = '0.1.3'
-__all__ = []
+__all__ = ['RV']
 
 from .timeseries import RV
 

{arvi-0.1.3 → arvi-0.1.6}/arvi/dace_wrapper.py

@@ -38,6 +38,9 @@ def get_arrays(result, latest_pipeline=True, ESPRESSO_mode='HR11', NIRPS_mode='H
                     logger.warning(f'no observations for requested ESPRESSO mode ({ESPRESSO_mode})')
 
         if latest_pipeline:
+            if verbose and len(pipelines) > 1:
+                logger.info(f'selecting latest pipeline ({pipelines[0]}) for {inst}')
+
             pipelines = [pipelines[0]]
 
         for pipe in pipelines:
@@ -149,14 +152,22 @@ def get_observations(star, instrument=None, save_rdb=False, verbose=True):
 
 def check_existing(output_directory, files, type):
     existing = [
-        f.partition('_')[0] for f in os.listdir(output_directory)
+        f.partition('.fits')[0] for f in os.listdir(output_directory)
         if type in f
     ]
+    if os.name == 'nt':  # on Windows, be careful with ':' in filename
+        import re
+        existing = [re.sub(r'T(\d+)_(\d+)_(\d+)', r'T\1:\2:\3', f) for f in existing]
+    
+    # remove type of file (e.g. _CCF_A)
+    existing = [f.partition('_')[0] for f in existing]
+    
     missing = []
     for file in files:
         if any(other in file for other in existing):
             continue
         missing.append(file)
+
     return np.array(missing)
 
 def download(files, type, output_directory):
@@ -168,13 +179,15 @@ def download(files, type, output_directory):
 
 def extract_fits(output_directory):
     file = os.path.join(output_directory, 'spectroscopy_download.tar.gz')
-    tar = tarfile.open(file, "r")
-    files = []
-    for member in tar.getmembers():
-        if member.isreg():  # skip if the TarInfo is not a file
-            member.name = os.path.basename(member.name)  # remove the path
-            tar.extract(member, output_directory)
-            files.append(member.name)
+    with tarfile.open(file, "r") as tar:
+        files = []
+        for member in tar.getmembers():
+            if member.isreg():  # skip if the TarInfo is not a file
+                member.name = os.path.basename(member.name)  # remove the path
+                if os.name == 'nt':  # on Windows, be careful with ':' in filename
+                    member.name = member.name.replace(':', '_')
+                tar.extract(member, output_directory)
+                files.append(member.name)
     os.remove(file)
     return files
 

{arvi-0.1.3 → arvi-0.1.6}/arvi/lbl_wrapper.py

@@ -64,6 +64,9 @@ def run_lbl(self, instrument, files, id=None,
         if mode == 'HA':
             rparams['INSTRUMENT'] = 'NIRPS_HA'
             rparams['DATA_SOURCE'] = 'ESO'
+    elif 'CARMENES' in instrument:
+        rparams['INSTRUMENT'] = 'CARMENES'
+        rparams['DATA_SOURCE'] = None
 
     #       SPIROU: APERO or CADC
     #       NIRPS_HA: APERO or ESO
@@ -165,25 +168,133 @@ def run_lbl(self, instrument, files, id=None,
     lbl_wrap(rparams)
 
 
-def load_lbl(self, instrument=None, filename=None, tell=False):
+def get_lbl_apero(self):
+    main_url = 'http://apero.exoplanets.ca/ari/nirps/nirps_he_online/objects/'
+
+    translate = {
+        'LP804-27': 'LP_804M27', 'HIP79431': 'LP_804M27',
+    }
+
+    if self.star in translate:
+        star = translate[self.star]
+    else:
+        star = self.star
+
+    # special case
+    if star == 'Proxima':
+        star = star.upper()
+
+
+    got_rdb = False
+    url = main_url + f'{star}.html'
+    password = input('password: ')
+    resp = requests.get(url, auth=HTTPBasicAuth('nirps', password))
+    rdb = re.findall('href="([\w.\/]+lbl_\w+_\w+.rdb)', resp.text)
+    if len(rdb) != 0:
+        got_rdb = True
+
+    if not got_rdb:
+        url = main_url + f'{star.replace("GJ", "GL")}.html'
+        resp = requests.get(url, auth=HTTPBasicAuth('nirps', password))
+        rdb = re.findall('href="([\w.\/]+lbl_\w+_\w+.rdb)', resp.text)
+        if len(rdb) != 0:
+            got_rdb = True
+
+    if not got_rdb:
+        logger.error(f'Cannot find APERO rdb file for {star}')
+        raise ValueError
+
+    # (arbitrarily) choose first file
+    rdb = rdb[0]
+    print(main_url + rdb)
+    resp = requests.get(main_url + rdb, auth=HTTPBasicAuth('nirps', password))
+    with open(os.path.basename(rdb), 'w') as f:
+        f.write(resp.text)
+
+    with io.StringIO(resp.text) as f:
+        RDB = np.genfromtxt(f, delimiter='\t', names=True, invalid_raise=False,
+                            comments='N\tN', dtype=None, encoding=None)
+
+    s = RV.from_arrays(self.star, RDB['rjd'], RDB['vrad'], RDB['svrad'], 
+                       'NIRPS_LBL')#, mask=self.NIRPS.mask)
+
+    s._quantities = []
+
+    s.fwhm = RDB['fwhm']
+    s.fwhm_err = RDB['sig_fwhm']
+    s._quantities.append('fwhm')
+    s._quantities.append('fwhm_err')
+
+    # s.secular_acceleration()
+
+    if self._did_adjust_means:
+        s.vrad -= wmean(s.vrad, s.svrad)
+        s.fwhm -= wmean(s.fwhm, s.fwhm_err)
+
+    # store other columns
+    columns = (
+        'dW', 'sdW',
+        'contrast', 'sig_contrast>contrast_err',
+        'vrad_achromatic', 'svrad_achromatic',
+        'vrad_chromatic_slope', 'svrad_chromatic_slope',
+        # 'vrad_g', 'svrad_g',
+        # 'vrad_r', 'svrad_r',
+        # 'vrad_457nm', 'svrad_457nm',
+        # 'vrad_473nm', 'svrad_473nm',
+        # 'vrad_490nm', 'svrad_490nm',
+        # 'vrad_507nm', 'svrad_507nm',
+        # 'vrad_524nm', 'svrad_524nm',
+        # 'vrad_542nm', 'svrad_542nm',
+        # 'vrad_561nm', 'svrad_561nm',
+        # 'vrad_581nm', 'svrad_581nm',
+        # 'vrad_601nm', 'svrad_601nm',
+        # 'vrad_621nm', 'svrad_621nm',
+        # 'vrad_643nm', 'svrad_643nm',
+        # 'vrad_665nm', 'svrad_665nm',
+        # 'vrad_688nm', 'svrad_688nm',
+        # 'vrad_712nm', 'svrad_712nm',
+        # 'vrad_737nm', 'svrad_737nm'
+    )
+    for col in columns:
+        if '>' in col:  # store with a different name
+            setattr(s, col.split('>')[1], RDB[col.split('>')[0]])
+            s._quantities.append(col.split('>')[1])
+        else:
+            setattr(s, col, RDB[col])
+            s._quantities.append(col)
+
+    setattr(self, 'NIRPS_LBL', s)
+    self.instruments.append('NIRPS_LBL')
+
+
+def load_lbl(self, instrument=None, filename=None, tell=False, id=None):
     lbl_run_dir = 'LBL_run_dir'
-    print(tell)
-    if tell:
-        fits_file = os.path.join(lbl_run_dir, 'lblrdb',
-                                f'lbl_{self.star}_{instrument}_{self.star}_{instrument}_TELL.fits')
+
+    if id is None:
+        slug = f'{self.star}_{instrument}_{self.star}_{instrument}'
     else:
-        fits_file = os.path.join(lbl_run_dir, 'lblrdb',
-                                f'lbl_{self.star}_{instrument}_{self.star}_{instrument}.fits')
+        slug = f'{self.star}_{instrument}_{id}_{self.star}_{instrument}_{id}'
+
+    f = f'lbl_{slug}'
+
+    if tell:
+        f = f + f'_TELL'
+
+    f = f + '.fits'
+
+    fits_file = os.path.join(lbl_run_dir, 'lblrdb', f)
+
+    # print(fits_file, os.path.exists(fits_file))
 
-    print(fits_file)
     if not os.path.exists(fits_file):
-        if instrument is None:
-            logger.error(
-                f'File "{fits_file}" does not exist, and instrument not provided')
-            return
-        else:
-            fits_file = os.path.join(lbl_run_dir, 'lblrdb',
-                                     f'lbl_{self.star}_{instrument}_{self.star}_{instrument}.fits')
+        raise FileNotFoundError(fits_file)
+        # if instrument is None:
+        #     logger.error(
+        #         f'File "{fits_file}" does not exist, and instrument not provided')
+        #     return
+        # else:
+        #     fits_file = os.path.join(lbl_run_dir, 'lblrdb',
+        #                              f'lbl_{self.star}_{instrument}_{self.star}_{instrument}.fits')
 
     hdu = fits.open(fits_file)
     RDB = hdu[9].data
@@ -194,7 +305,7 @@ def load_lbl(self, instrument=None, filename=None, tell=False):
     s.fwhm = RDB['fwhm']
     s.fwhm_err = RDB['sig_fwhm']
 
-    s.secular_acceleration()
+    # s.secular_acceleration()
 
     if self._did_adjust_means:
         s.vrad -= wmean(s.vrad, s.svrad)
@@ -223,7 +334,9 @@ def load_lbl(self, instrument=None, filename=None, tell=False):
         'vrad_665nm', 'svrad_665nm',
         'vrad_688nm', 'svrad_688nm',
         'vrad_712nm', 'svrad_712nm',
-        'vrad_737nm', 'svrad_737nm'
+        'vrad_737nm', 'svrad_737nm',
+        # 
+        'HIERARCH ESO QC BERV>berv'
     )
     for col in columns:
         try:

arvi-0.1.6/arvi/nasaexo_wrapper.py

@@ -0,0 +1,137 @@
+from copy import copy
+
+import requests
+from io import StringIO
+import numpy as np
+
+from .setup_logger import logger
+from kepmodel.rv import RvModel
+from spleaf.term import Error
+
+
+url = 'https://exoplanetarchive.ipac.caltech.edu/TAP/sync?'
+
+STAR_QUERY = [
+    'select *',
+    'from ps',
+    'where',
+    'default_flag=1',
+    'and',
+    "hostname like '{star}'"
+]
+
+
+def run_query(query):
+    link = f'{url}query={query}&format=csv'
+    r = requests.get(link)
+    data = np.genfromtxt(StringIO(r.text), delimiter=',', names=True, 
+                         dtype=None, encoding=None)
+    return r, data
+
+class Planets:
+    def __init__(self, system):
+        self.s = system
+        self.verbose = system.verbose
+
+        self.star = system.star.replace('GJ', 'GJ ').replace('HD', 'HD ')
+
+        query = ' '.join(STAR_QUERY).replace(' ', '+')
+        query = query.format(star=self.star)
+
+        if self.verbose:
+            logger.info('querying NASA Exoplanet Archive...')
+
+        self.response, self.data = run_query(query)
+        self.np = self.data.size
+
+        # try again with other ids
+        if self.np == 0:
+            hdname = [i for i in self.s.simbad.ids if 'HD' in i]
+            if len(hdname) != 0:
+                hdname = hdname[0]
+                if self.verbose:
+                    logger.info(f"trying with the HD name '{hdname}'...")
+                STAR_QUERY_HD = STAR_QUERY[:-1]
+                STAR_QUERY_HD.append(f"hd_name like '{hdname}'")
+                query = ' '.join(STAR_QUERY_HD).replace(' ', '+')
+                self.response, self.data = run_query(query)
+                self.np = self.data.size
+            
+            hipname = [i for i in self.s.simbad.ids if 'HIP' in i]
+            if len(hipname) != 0:
+                hipname = hipname[0]
+                if self.verbose:
+                    logger.info(f"trying with the HIP name '{hipname}'...")
+                STAR_QUERY_HIP = STAR_QUERY[:-1]
+                STAR_QUERY_HIP.append(f"hip_name like '{hipname}'")
+                query = ' '.join(STAR_QUERY_HIP).replace(' ', '+')
+                self.response, self.data = run_query(query)
+                self.np = self.data.size
+
+        if self.verbose:
+            logger.info(f'found {self.np} planets')
+
+        self.set_parameters()
+
+    def set_parameters(self):
+        self.P = np.atleast_1d(self.data['pl_orbper'])
+        self.K = np.atleast_1d(self.data['pl_rvamp'])
+        self.e = np.atleast_1d(self.data['pl_orbeccen'])
+
+        ts = self.s._time_sorter
+        self.model = RvModel(self.s.time[ts], self.s.vrad[ts],
+                             err=Error(self.s.svrad[ts]))
+
+        for inst in self.s.instruments:
+            self.model.add_lin(1.0*(self.s.instrument_array[ts]==inst), f'offset_inst_{inst}')
+
+        for i in range(self.np):
+            if self.K[i] == False:
+                self.model.add_keplerian_from_period(self.P[i], fit=True)
+            else:
+                self.model.add_keplerian([self.P[i], self.K[i], self.e[i], 0.0, 0.0],
+                                        ['P', 'K', 'e', 'M0', 'omega'], fit=True)
+
+    def fit_lin(self, adjust_data=True):
+        self.model.show_param()
+        self.model.fit_lin()
+        self.model.show_param()
+        if adjust_data:
+            for inst in self.s.instruments:
+                _s = getattr(self.s, inst)
+                _s.vrad -= self.model.get_param(f'lin.offset_inst_{inst}')
+            self.s._build_arrays()
+
+    def fit_angles(self):
+        old_param = copy(self.model.fit_param)
+        fit_param = [f'kep.{i}.M0' for i in range(self.np)]
+        fit_param += [f'kep.{i}.omega' for i in range(self.np)]
+        self.model.fit_param = fit_param
+        self.model.fit()
+        self.model.fit_param = old_param
+        self.model.show_param()
+
+    def fit_all(self, adjust_data=False):
+        self.model.fit()
+
+        newP = np.array([self.model.get_param(f'kep.{i}.P') for i in range(self.np)])
+        if self.verbose and not np.allclose(self.P, newP):
+            logger.warning(f'periods changed: {self.P}  -->  {newP}')
+
+        newK = np.array([self.model.get_param(f'kep.{i}.K') for i in range(self.np)])
+        if self.verbose and not np.allclose(self.K, newK):
+            logger.warning(f'amplitudes changed: {self.K}  -->  {newK}')
+        
+        newE = np.array([self.model.get_param(f'kep.{i}.e') for i in range(self.np)])
+        if self.verbose and not np.allclose(self.e, newE):
+            logger.warning(f'eccentricities changed: {self.e}  -->  {newE}')
+
+        if adjust_data:
+            for inst in self.s.instruments:
+                _s = getattr(self.s, inst)
+                _s.vrad -= self.model.get_param(f'lin.offset_inst_{inst}')
+            self.s._build_arrays()
+
+    def __repr__(self):
+        return f'{self.star}({self.np} planets, '\
+               f'P={list(self.P)}, K={list(self.K)}, e={list(self.e)})'

{arvi-0.1.3 → arvi-0.1.6}/arvi/plots.py

@@ -12,9 +12,9 @@ from .setup_logger import logger
 from . import config
 
 
-def plot(self, ax=None, show_masked=False, time_offset=0, remove_50000=False, 
-         tooltips=True, label=None, N_in_label=False, versus_n=False, show_histogram=False,
-         **kwargs):
+def plot(self, ax=None, show_masked=False, instrument=None, time_offset=0,
+         remove_50000=False, tooltips=True, label=None, N_in_label=False,
+         versus_n=False, show_histogram=False, **kwargs):
     """ Plot the RVs
 
     Args:
@@ -22,6 +22,8 @@ def plot(self, ax=None, show_masked=False, time_offset=0, remove_50000=False,
             Axis to plot to. Defaults to None.
         show_masked (bool, optional):
             Show masked points. Defaults to False.
+        instrument (str, optional):
+            Which instrument to plot. Defaults to None, or plot all instruments.
         time_offset (int, optional):
             Value to subtract from time. Defaults to 0.
         remove_50000 (bool, optional):
@@ -55,16 +57,21 @@ def plot(self, ax=None, show_masked=False, time_offset=0, remove_50000=False,
             ax, axh = ax
         fig = ax.figure
 
-    kwargs.setdefault('fmt', 'o')
+    kwargs.setdefault('marker', 'o')
+    kwargs.setdefault('ls', '')
     kwargs.setdefault('capsize', 0)
     kwargs.setdefault('ms', 4)
 
     if remove_50000:
         time_offset = 50000
 
+    instruments = self._check_instrument(instrument)
+
     cursors = {}
-    for inst in self.instruments:
+    for inst in instruments:
         s = self if self._child else getattr(self, inst)
+        if s.mask.sum() == 0:
+            continue
 
         if label is None:
             _label = f'{inst:10s} ({s.N})' if N_in_label else inst
@@ -162,8 +169,9 @@ def plot(self, ax=None, show_masked=False, time_offset=0, remove_50000=False,
     return fig, ax
 
 
-def plot_quantity(self, quantity, ax=None, show_masked=False, time_offset=0, 
-                  remove_50000=False, tooltips=False, N_in_label=False, **kwargs):
+def plot_quantity(self, quantity, ax=None, show_masked=False, instrument=None,
+                  time_offset=0, remove_50000=False, tooltips=False,
+                  N_in_label=False, **kwargs):
     if self.N == 0:
         if self.verbose:
             logger.error('no data to plot')
@@ -178,14 +186,17 @@ def plot_quantity(self, quantity, ax=None, show_masked=False, time_offset=0,
     else:
         fig = ax.figure
 
-    kwargs.setdefault('fmt', 'o')
+    kwargs.setdefault('marker', 'o')
+    kwargs.setdefault('ls', '')
     kwargs.setdefault('capsize', 0)
     kwargs.setdefault('ms', 4)
 
     if remove_50000:
         time_offset = 50000
 
-    for inst in self.instruments:
+    instruments = self._check_instrument(instrument)
+
+    for inst in instruments:
         s = self if self._child else getattr(self, inst)
         label = f'{inst:10s} ({s.N})' if N_in_label else inst
 
@@ -218,7 +229,7 @@ def plot_quantity(self, quantity, ax=None, show_masked=False, time_offset=0,
     elif quantity == 'bispan':
         ax.set_ylabel(f'BIS [{self.units}]')
     elif quantity == 'rhk':
-        ax.set_ylabel("$\log$ R'$_{HK}$")
+        ax.set_ylabel(r"$\log$ R'$_{HK}$")
 
     if remove_50000:
         ax.set_xlabel('BJD - 2450000 [days]')
@@ -236,7 +247,7 @@ plot_bis = partialmethod(plot_quantity, quantity='bispan')
 plot_rhk = partialmethod(plot_quantity, quantity='rhk')
 
 
-def gls(self, ax=None, label=None, fap=True, picker=True, **kwargs):
+def gls(self, ax=None, label=None, fap=True, picker=True, instrument=None, **kwargs):
     if self.N == 0:
         if self.verbose:
             logger.error('no data to compute gls')
@@ -247,7 +258,21 @@ def gls(self, ax=None, label=None, fap=True, picker=True, **kwargs):
     else:
         fig = ax.figure
 
-    gls = LombScargle(self.mtime, self.mvrad, self.msvrad)
+    if instrument is not None:
+        instrument = self._check_instrument(instrument)
+        if instrument is not None:
+            instrument_mask = np.isin(self.instrument_array, instrument)
+            t = self.time[instrument_mask & self.mask]
+            y = self.vrad[instrument_mask & self.mask]
+            e = self.svrad[instrument_mask & self.mask]
+            if self.verbose:
+                logger.info(f'calculating periodogram for instrument {instrument}')
+    else:
+        t = self.time[self.mask]
+        y = self.vrad[self.mask]
+        e = self.svrad[self.mask]
+
+    self._gls = gls = LombScargle(t, y, e)
     freq, power = gls.autopower(maximum_frequency=1.0, samples_per_peak=10)
     ax.semilogx(1/freq, power, picker=picker, label=label, **kwargs)
 

{arvi-0.1.3 → arvi-0.1.6}/arvi/reports.py

@@ -92,11 +92,15 @@ def report(self, save=None):
         if save is True:
             save = f'report_{"".join(self.star.split())}.pdf'
 
-        with PdfPages(save) as pdf:
-            pdf.attach_note('hello', positionRect=[5, 15, 20, 30])
-
-            if self.verbose:
-                logger.info(f'saving to {save}')
-            pdf.savefig(fig)
-        plt.close('all')
-        # os.system(f'evince {save} &')
+        if save.endswith('.png'):
+            fig.savefig(save)
+        else:
+            with PdfPages(save) as pdf:
+                #pdf.attach_note('hello', positionRect=[5, 15, 20, 30])
+
+                if self.verbose:
+                    logger.info(f'saving to {save}')
+                pdf.savefig(fig)
+            # os.system(f'evince {save} &')
+
+    return fig

{arvi-0.1.3 → arvi-0.1.6}/arvi/simbad_wrapper.py

@@ -20,17 +20,24 @@ WHERE id = '{star}';
 """
 
 BV_QUERY = """
-SELECT B, V from allfluxes
+SELECT B, V FROM allfluxes
 JOIN ident USING(oidref)
 WHERE id = '{star}';
 """
 
 IDS_QUERY = """
-SELECT ids from ids
+SELECT ids FROM ids
 JOIN ident USING(oidref)
 WHERE id = '{star}';
 """
 
+OID_QUERY = """
+SELECT basic.OID FROM basic 
+JOIN ident ON oidref = oid 
+WHERE id = '{star}';
+"""
+
+
 def run_query(query):
     url = 'http://simbad.u-strasbg.fr/simbad/sim-tap/sync'
     response = requests.post(url,
@@ -87,6 +94,10 @@ class simbad:
             star (str): The name of the star to query simbad
         """
         self.star = star
+
+        # oid = run_query(query=OID_QUERY.format(star=star))
+        # self.oid = str(oid.split()[-1])
+
         try:
             table1 = run_query(query=QUERY.format(star=star))
             cols, values = parse_table(table1)
@@ -101,6 +112,9 @@ class simbad:
             raise ValueError(f'simbad query for {star} failed')
 
         for col, val in zip(cols, values):
+            if col == 'oid':
+                setattr(self, col, str(val))
+                continue
             try:
                 setattr(self, col, float(val))
             except ValueError:
@@ -125,7 +139,6 @@ class simbad:
             if self.sp_type[:2] in effective_temperatures:
                 self.teff = effective_temperatures[self.sp_type[:2]]
 
-
     def __repr__(self):
         V = self.V
         sp_type = self.sp_type