Combining multi gas scattering with simulated ins resolution in fake data generator #53
Conversation
…nalysis.py configurable
…ps://github.com/project8/mermithid into simulated_ins_resolution_in_fake_data_generator
…ra argument) in TritiumSpectrum/FakeDataGenerator.py; changed the input of recon eff parameters in MultiGasComplexLineShape.py to a list to be consistent with the fake data genetator
… the survival probabilities in all models are returned through key 'survival_prob_fit' and 'survival_prob_fit_err'
…_gaussian_lorentzian_fixed_scatter_proportion_and_survival_prob()
…elf.base_shape == 'shake'
There was a problem hiding this comment.
this really looks like a great amount of work! thank you all for completing this branch and implementing the many options the multi gas complex lineshape processor now has.
I have a few general remarks/requests/questions:
- Do we still need the KrComplexLineshape processor now we have the MultiGasLineshapeProcessor?
- Please add more descriptions to the lineshape processor functions and give the functions better names than make_spectrum_1 and fit_data_2. For some options you already did that and it makes it much more understandable what the functions do.
- The MultiGasComplexLineshape processor is too long (>3000 lines). Can you move the small support functions to the utility file.
- There are features in the MultiGasComplexLineshape processor that we will probably not use for the final analysis and I think they should not be merged to develop: for example the smeared triangle resolution and the artificial scaling of resolution widths.
| raw_data = [float(i) for i in line.split("\t")] | ||
| energyOsc[0].append(raw_data[0]) | ||
| energyOsc[1].append(raw_data[1]) | ||
| except: |
There was a problem hiding this comment.
why is there no warning or error when the try fails?
should energyOsc not always be read in from the file?
| @@ -109,11 +119,10 @@ def energy_guess_to_frequency(energy_guess, energy_guess_err, B_field_guess): | |||
| return frequency , frequency_err | |||
|
|
|||
| # Given a frequency and error, converts those to B field values assuming the line is the 17.8 keV line | |||
There was a problem hiding this comment.
update comment. error is no longer a parameter here.
| return normalized_convolved_spectrum | ||
|
|
||
| #might be untested | ||
| def convolve_smeared_triangle(self, func_to_convolve, center, scale1, scale2, exponent, sigma): |
There was a problem hiding this comment.
if we remove smeared triangle this should also be removed.
| } | ||
| return dictionary_of_fit_results | ||
|
|
||
| # same as make_spectrum except that scatter_proportion is fixed |
There was a problem hiding this comment.
I am glad there is description here in comments. I still think the make_spectrum functions should have slightly more descriptive names than _N
| current_full_spectrum += coefficient*current_working_spectrum*prob_parameter**M | ||
| return current_full_spectrum | ||
|
|
||
| def spectrum_func_1(self, bins_Hz, *p0): |
There was a problem hiding this comment.
also more descriptive name and comment for spectrum_func_N
| f[nonzero_idx] += amplitude*f_intermediate[nonzero_idx]/np.sum(f_intermediate[nonzero_idx]) | ||
| return f | ||
|
|
||
| def fit_data_1(self, freq_bins, data_hist_freq): |
There was a problem hiding this comment.
same here. what's the difference to fit_data?
| } | ||
| return dictionary_of_fit_results | ||
|
|
||
| # using simulated resolution, with multi gas scattering, reconstruction eff, without detection eff, has been used in fake data generator. However, without using detection eff is the right option for tritium fake data generation. |
There was a problem hiding this comment.
split comments over multiple lines for readability. in general, function descriptions should come after def function_name(). and they should go in between ''' '''.
|
Thanks very much for reviewing the branch, Christine. To your questions:
2-3. I believe these are items for Yu-Hao to follow up on.
|
…ution_in_fake_data_generator' of https://github.com/project8/mermithid into combining_multi_gas_scattering_with_simulated_ins_resolution_in_fake_data_generator
The combining_... branch allows for a simulated instrumental resolution distribution to be used when fitting Kr data and generating fake T2 data. It also includes various updates to the complex lineshape model, such as incorporating the reconstruction efficiency curve as a function of scattering peak order.