Commit d77933bc authored by Andrea Giannetti's avatar Andrea Giannetti
Browse files

Fixed scale for escape probability computation; now the final figure is... 

Fixed scale for escape probability computation; now the final figure is computed on the latest addition to the DB, assuming it comes from the latest computation to avoid multiplicity in the query results.
parent a5eaef66

etl/config/config.yml

+1 −1
Original line number Diff line number Diff line 
overrides:

    dust_temperature_grid_type: 'linear'

    dust_temperature_limits: [10, 30]

    dust_temperature_limits: [10, 35]

    dust_temperature_step: 5

    gas_density_grid_type: 'log'

    gas_density_limits: [1e4, 1e8]

etl/prs/prs_inspect_results.py

+2 −3
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ def get_aggregated_ratio_from_db( 
        and_(GridPars.dust_temperature == dust_temperature,

             GridPars.density_at_reference == gas_density,

             # GridPars.central_density == gas_density,

             or_(ModelPars.iline.in_(lines)))).all()

    assert len(results) == 1

    return results[0][1].aggregated_ratio

             or_(ModelPars.iline.in_(lines)))).order_by(GridPars.created_on.desc()).first()

    return results[1].aggregated_ratio





def main():

etl/stg/config/config.yml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ grid: 
    dust_temperature_powerlaw_idx: 0

    microturbulence: 1.5

    microturbulence_unit: 'km/s'

    dim1: {"size": 2, "size_units": "pc", "shape": 5, "refpix": 2}

    dim1: {"size": 2, "size_units": "pc", "shape": 21, "refpix": 10}

    velocity_field: 'solid'

    velocity_gradient: 2

    velocity_gradient_unit: "km/(s pc)"

etl/stg/stg_radmc_input_generator.py

+5 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ def write_radmc_input(filename, 
        'ncells': np.prod(grid_metadata['grid_shape']),

        'ncells_per_axis': ' '.join([str(axis_size) for axis_size in grid_metadata['grid_shape']]),

        'dust_species': 1,  ##

        'active_axes': ' '.join(['1' for i in range(len(grid_metadata['grid_shape']))]),

        'active_axes': ' '.join(['1'] * len(grid_metadata['grid_shape'])),

        'continuum_lambdas': 100,  ##

    }

    _path = validate_parameter(path, default='.')
@@ -153,9 +153,10 @@ def get_profiles(grid_metadata: dict) -> dict: 
            'distance_reference': 1.0

        },

        'escprob_lengthscale': {

            # FIXME: make the unit consistent with the max via indexing

            'central_value': min((max(grid_metadata['grid_size']) * u.Unit(grid_metadata['grid_size_units'][0]))

            .to(u.cm).value, (grid_metadata['maximum_radius'] * u.Unit(grid_metadata['maximum_radius_unit'])).to(u.cm).value),

            'central_value': min((np.max(grid_metadata['grid_size']) *

                                  u.Unit(grid_metadata['grid_size_units'][np.argmax(grid_metadata['grid_size'])[0]]))

            .to(u.cm).value, (2 * grid_metadata['maximum_radius'] * u.Unit(grid_metadata['maximum_radius_unit']))

                                 .to(u.cm).value),

            'power_law_index': 0,

            'value_at_reference': None,

            'distance_reference': 1.0