Commit 1c9a7d25 authored by Andrea Giannetti's avatar Andrea Giannetti
Browse files

Minor refactoring; radmc parameters mapping in constants.

parent 9ba00235
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ import glob
import logging
import sys
import astropy.units
import sqlalchemy
import yaml
import numpy as np
import shutil
@@ -10,7 +9,6 @@ import os
import urllib.request
import base64
import json
import tarfile
import sqlalchemy as sqla
from sqlalchemy.orm import Session
from sqlalchemy.dialects.postgresql import insert
@@ -372,7 +370,7 @@ def convert_frequency_to_wavelength(frequency: astropy.units.Quantity,
    return frequency.to(output_units, equivalencies=u.spectral())


def get_pg_engine(logger: logging.Logger) -> sqlalchemy.engine.Engine:
def get_pg_engine(logger: logging.Logger) -> sqla.engine.Engine:
    """
    Return the SQLAlchemy engine, given the credentials in the external file
    :param logger: the logger to use
@@ -380,8 +378,8 @@ def get_pg_engine(logger: logging.Logger) -> sqlalchemy.engine.Engine:
    """
    credentials = get_credentials(logger=logger,
                                  credentials_filename=os.path.join('credentials', 'db_credentials.yml'))
    url = f"postgresql://{credentials['DB_USER']}:{credentials['DB_PASS']}@{credentials['DB_HOST']}:{credentials['DB_PORT']}/{credentials['DB_NAME']}"
    engine = sqlalchemy.create_engine(url)
    url = f'postgresql://{credentials["DB_USER"]}:{credentials["DB_PASS"]}@{credentials["DB_HOST"]}:{credentials["DB_PORT"]}/{credentials["DB_NAME"]}'
    engine = sqla.create_engine(url)
    return engine


+3 −1
Original line number Diff line number Diff line
@@ -56,7 +56,9 @@ radmc_options_mapping = {
    'iline': 'iline',
    'width_kms': 'widthkms',
    'nchannels': 'linenlam',
    'npix': 'npix'
    'npix': 'npix',
    'image_size_pc': 'sizepc',
    'threads': 'setthreads'
}

aggregation_function_mapping = {