Commit 9de7e4a2 authored by Andrea Giannetti's avatar Andrea Giannetti
Browse files

Refined DB structure; fixed problem in archive path.

parent dbf15991

etl/main.py

+6 −3
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ def build_model_grid(): 
                                             config=config)

    lines = config['overrides']['lines_to_process']



    grid_tarfiles = []



    for (tdust, nh2) in product(dust_temperatures, central_densities):

        overrides = {

            'grid': {
@@ -25,8 +27,9 @@ def build_model_grid(): 
                'central_density': nh2,

            }

        }

        tarfile_filename = stg_main(override_config=overrides)

        grid_tarfiles.append(stg_main(override_config=overrides))

        cube_fits = []

        ratio_fits = []

        for line in lines:

            mdl_overrides = {

                'lines': {},
@@ -36,9 +39,9 @@ def build_model_grid(): 
                    }

                }

            }

            cube_fits.append(execute_radmc_script(grid_tarfile=tarfile_filename,

            cube_fits.append(execute_radmc_script(grid_tarfile=grid_tarfiles[-1],

                                                  override_config=mdl_overrides))

        prs_main(cube_fits_list=cube_fits)

        ratio_fits.append(prs_main(cube_fits_list=cube_fits))





if __name__ == '__main__':

etl/mdl/mdl_execute_radmc_command.py

+3 −2
Original line number Diff line number Diff line
@@ -123,12 +123,13 @@ def main(grid_tarfile: str, 


    populate_species_and_partner_table(config_lines, engine, executed_on, grid_tarfile)



    populate_model_table(config_mdl, cube_filename, engine, executed_on)

    populate_model_table(config_mdl, grid_tarfile, cube_filename, engine, executed_on)

    return cube_filename





def populate_model_table(config_mdl, cube_filename, engine, executed_on):

def populate_model_table(config_mdl, grid_tarfile, cube_filename, engine, executed_on):

    model_pars_dict = {

        'zipped_grid_name': grid_tarfile,

        'fits_cube_name': cube_filename,

        'nphotons': config_mdl['radmc_postprocessing']['nphotons'],

        'scattering_mode_max': int(config_mdl['radmc_postprocessing']['scattering_mode_max']),

etl/prs/prs_compute_integrated_fluxes_and_ratios.py

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ def compute_image_ratios(fits1: str, 


def main(cube_fits_list: List[str],

         mom0_out_cube1: Union[str, None] = None,

         mom0_out_cube2: Union[str, None] = None):

         mom0_out_cube2: Union[str, None] = None) -> str:

    assert len(cube_fits_list) == 2

    _mom0_out_cube1 = validate_parameter(mom0_out_cube1, default=cube_fits_list[0].replace('.fits', '_mom0.fits'))

    _mom0_out_cube2 = validate_parameter(mom0_out_cube2, default=cube_fits_list[1].replace('.fits', '_mom0.fits'))
@@ -212,6 +212,7 @@ def main(cube_fits_list: List[str], 
                               aggregated_ratio=aggregated_image_ratio,

                               engine=engine,

                               executed_on=executed_on)

    return ratio_fits_name





if __name__ == '__main__':

etl/stg/stg_build_db_structure.py

+7 −8
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ engine = get_pg_engine(logger=logger) 
class GridPars(Base):

    __tablename__ = "grid_parameters"

    zipped_grid_name = Column(String(150), primary_key=True)

    fits_cube_name = relationship("ModelPars", cascade="all, delete-orphan")

    grid_type = Column(String)

    coordinate_system = Column(String)

    central_density = Column(Float)
@@ -45,11 +46,6 @@ class GridPars(Base): 
    grid_shape_3 = Column(Float)

    grid_refpix_3 = Column(Float)

    created_on = Column(DateTime)

    # addresses = relationship(

    #     "Address", back_populates="user", cascade="all, delete-orphan"

    # )

    # def __repr__(self):

    #     return f"User(id={self.id!r}, name={self.name!r}, fullname={self.fullname!r})"





class LinePars(Base):
@@ -71,7 +67,9 @@ class SpeciesAndPartners(Base): 


class ModelPars(Base):

    __tablename__ = "model_parameters"

    zipped_grid_name = Column(String(150), ForeignKey('grid_parameters.zipped_grid_name'), nullable=False)

    fits_cube_name = Column(String(150), primary_key=True)

    mom_zero_name = relationship("MomentZeroMaps", cascade="all, delete-orphan")

    nphotons = Column(Float)

    scattering_mode_max = Column(Integer)

    iranfreqmode = Column(Integer)
@@ -89,7 +87,8 @@ class ModelPars(Base): 
class MomentZeroMaps(Base):

    __tablename__ = "moment_zero_maps"

    mom_zero_name = Column(String(150), primary_key=True)

    fits_cube_name = Column(String(150))

    ratio_map_name = relationship("MomentZeroMaps", cascade="all, delete-orphan")

    fits_cube_name = Column(String(150), ForeignKey('model_parameters.fits_cube_name'), nullable=False)

    integration_limit_low = Column(Float)

    integration_limit_high = Column(Float)

    aggregated_moment_zero = Column(Float)
@@ -100,8 +99,8 @@ class MomentZeroMaps(Base): 
class RatioMaps(Base):

    __tablename__ = "ratio_maps"

    ratio_map_name = Column(String(150), primary_key=True)

    mom_zero_name_1 = Column(String(150))

    mom_zero_name_2 = Column(String(150))

    mom_zero_name_1 = Column(String(150), ForeignKey('moment_zero_maps.mom_zero_name'), nullable=False)

    mom_zero_name_2 = Column(String(150), ForeignKey('moment_zero_maps.mom_zero_name'), nullable=False)

    aggregated_ratio = Column(Float)

    aggregation_function = Column(String(20))

    created_on = Column(DateTime)