Commit 472206a6 authored by Andrea Giannetti's avatar Andrea Giannetti
Browse files

Tested and fixed refactoring.

parent 0a625674

etl/main.py

+7 −7
Original line number Diff line number Diff line
@@ -16,25 +16,25 @@ from prs.prs_inspect_results import main as prs_inspection_main 


def compute_grid(tdust, nh2, line, density_keyword, dust_temperature_keyword):

    scratch_dir = os.path.join('mdl', 'scratches', str(uuid.uuid4()))

    overrides = {

    stg_overrides = {

        'grid': {

            dust_temperature_keyword: tdust,

            density_keyword: nh2,

        }

    }

    tarname = stg_main(override_config=overrides,

                       path_radmc_files=scratch_dir,

                       run_id=run_id)

    mdl_overrides = {

        'grid_lines': overrides,

    overrides = {

        'grid_lines': stg_overrides,

        'model': {

            'radmc_observation': {

                'iline': line

            }

        }

    }

    tarname = stg_main(override_config=overrides,

                       path_radmc_files=scratch_dir,

                       run_id=run_id)

    cube_fits_name = execute_radmc_script(grid_zipfile=tarname,

                                          override_config=mdl_overrides,

                                          override_config=overrides,

                                          radmc_input_path=scratch_dir,

                                          run_id=run_id)

    return nh2, tdust, line, cube_fits_name

etl/stg/stg_radmc_input_generator.py

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ def main(run_id: str, 
         compute_dust_temperature: bool = True) -> str:

    _override_config = validate_parameter(override_config, default={'grid_lines': {}, 'model': {}})

    config = load_config_file(os.path.join('stg', 'config', 'config.yml'),

                              override_config=_override_config)

                              override_config=_override_config['grid_lines'])

    config_lines = config['lines']

    config_mdl = load_config_file(os.path.join('mdl', 'config', 'config.yml'),

                                  override_config=_override_config['model'])