Addition of density as a free parameter for tomography #764
Conversation
"Merging changes from upstream/master to update my fork."
Conflicts: pisa/stages/osc/prob3.py pisa/stages/osc/prob3numba/numba_osc_tests.py
pisa/stages/osc/prob3.py
Outdated
| if self.neutrino_decay: | ||
| self.decay_params.decay_alpha3 = self.params.decay_alpha3.value.m_as('eV**2') | ||
|
|
||
| if self.lri_type is not None: | ||
| self.lri_params.v_lri = self.params.v_lri.value.m_as('eV') | ||
| if self.tomography_type == "mass_of_earth": | ||
| self.tomography_params.density_scale = self.params.density_scale.value.m_as('dimensionless') | ||
| self.layers = Layers(earth_model, detector_depth, prop_height,scaling_array=self.tomography_params.density_scale) |
There was a problem hiding this comment.
I think it would be better to give the Layers class something like a scale function that you can call here to not initialize the class every time the stage is called. That would simplify the entire code (not only this part) and should be faster.
There was a problem hiding this comment.
Hi Jan, I have made the modifications. Instead of calling Layers class everytime, now I am calling the scaling function. The scaling function multiplies the scaling factors with the density array. In prob3.py I update the physics parameters (density_scale for mass of Earth, core_density_scale for mass of core (with constrain), etc). Then I call the scaling function from Layers class, where the scaling is done. In this way, the density array is scaled depending on the type of tomography.
pisa/stages/osc/prob3.py
Outdated
| for container in self.data: | ||
| self.layers.calcLayers(container['true_coszen']) | ||
| container['densities'] = self.layers.density.reshape((container.size, self.layers.max_layers)) | ||
| container['distances'] = self.layers.distance.reshape((container.size, self.layers.max_layers)) |
There was a problem hiding this comment.
Do you also have to overwrite this? The scaling shouldn't change the distances, right?
There was a problem hiding this comment.
Yes right. We don't need to overwrite container['distances']. I have removed it. We only require till container['densities'].
Addition of density as a free parameter for tomography
Sharmistha Chattopadhyay
Modified
prob3.pytomography_typetomography_type- [mass of earth, mass of core (with constrain), mass of core (without constrain)density_scalecore_density_scaleIntroduced
scaling_params.pyModified
layers.pyModified
numba_osc_tests.py