Commit 88238b92 authored by Andrea Giannetti's avatar Andrea Giannetti
Browse files

Automated column selection for isothermal models; added run_id to query.

parent 98c0356a
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ def build_model_grid(run_id: str,
        for scratches in scratches_dirs:
            cleanup_directory(directory=scratches, logger=logger)
            os.rmdir(scratches)
    prs_inspection_main()
    prs_inspection_main(run_id=run_id,
                        is_isothermal=_tdust_model_type == 'isothermal')


if __name__ == '__main__':
+15 −5
Original line number Diff line number Diff line
@@ -54,7 +54,16 @@ def get_density_distribution(
        dust_temperature: float,
        gas_density: float,
        lines: Union[list, tuple],
        session: Session) -> Tuple[float, str, str, np.array, np.array]:
        run_id: str,
        session: Session,
        is_isothermal: bool = False) -> Tuple[float, str, str, np.array, np.array]:
    # Select correct column for filtering
    if is_isothermal is True:
        dust_temperature_column = GridPars.dust_temperature
    else:
        dust_temperature_column = GridPars.dust_temperature_at_reference

    # Query database
    results = session.query(GridPars, RatioMaps, GridFiles) \
        .join(GridFiles) \
        .join(StarsPars, isouter=True) \
@@ -64,11 +73,11 @@ def get_density_distribution(
              or_(RatioMaps.mom_zero_map_1,
                  RatioMaps.mom_zero_map_2)) \
        .filter(
        and_(GridPars.dust_temperature_at_reference == dust_temperature,
        and_(dust_temperature_column == dust_temperature,
             GridPars.density_at_reference == gas_density,
             GridFiles.quantity == 'gas_number_density',
             ModelPars.iline.in_(lines),
             GridPars.run_id == '55d05c03-192a-47da-9dcf-c41df1882868')).order_by(GridPars.created_on.desc()).first()
             GridPars.run_id == run_id)).order_by(GridPars.created_on.desc()).first()
    with fits.open(os.path.join('prs', 'fits', 'grids', results[2].fits_grid_name)) as fitsfile:
        grid_values = fitsfile[0].data
    with fits.open(os.path.join('prs', 'fits', 'ratios', results[1].ratio_map_name)) as ratio_fitsfile:
@@ -76,7 +85,8 @@ def get_density_distribution(
    return results[1].aggregated_ratio, results[1].ratio_map_name, results[2].fits_grid_name, grid_values, ratio_values


def main():
def main(run_id: str,
         is_isothermal: bool):
    engine = get_pg_engine(logger=logger)
    config = load_config_file(os.path.join('config', 'config.yml'))

@@ -108,4 +118,4 @@ def main():


if __name__ == '__main__':
    main()
    main(run_id='55d05c03-192a-47da-9dcf-c41df1882868', is_isothermal=False)