diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/fr.py | 15 | ||||
| -rw-r--r-- | utils/gf.py | 5 | ||||
| -rw-r--r-- | utils/param.py | 2 | ||||
| -rw-r--r-- | utils/plot.py | 7 |
4 files changed, 13 insertions, 16 deletions
diff --git a/utils/fr.py b/utils/fr.py index f529796..61b5a61 100644 --- a/utils/fr.py +++ b/utils/fr.py @@ -206,14 +206,15 @@ def estimate_scale(args): 10, np.round(np.log10(m_eign/args.energy)) - \ np.log10(args.energy**(args.dimension-3)) ) + scale_region = (scale/args.scale_region, scale*args.scale_region) elif args.energy_dependance is EnergyDependance.SPECTRAL: - scale = np.power( - 10, np.round( - np.log10(m_eign/np.power(10, np.average(np.log10(args.binning)))) \ - - np.log10(np.power(10, np.average(np.log10(args.binning)))**(args.dimension-3)) - ) - ) - return scale + lower_s = (m_eign/args.binning[-1]) / (args.binning[-1]**(args.dimension-3)) + upper_s = (m_eign/args.binning[0]) / (args.binning[0]**(args.dimension-3)) + scale = np.power(10, np.average(np.log10([lower_s, upper_s]))) + diff = upper_s / lower_s + scale_region = (lower_s/diff, upper_s*diff) + scale_region = [np.power(10, np.round(np.log10(x))) for x in scale_region] + return scale, scale_region def fr_argparse(parser): diff --git a/utils/gf.py b/utils/gf.py index 0770401..ea4f61f 100644 --- a/utils/gf.py +++ b/utils/gf.py @@ -57,14 +57,9 @@ def steering_params(args): steering_categ = args.ast params = gf.SteeringParams() params.quiet = False - params.fastmode = True params.simToLoad= steering_categ.name.lower() - params.spline_dom_efficiency = False - params.spline_hole_ice = False - params.spline_anisotrophy = False params.evalThreads = args.threads # params.evalThreads = thread_factors(args.threads)[1] - params.diffuse_fit_type = gf.DiffuseFitType.SinglePowerLaw return params diff --git a/utils/param.py b/utils/param.py index 4d8106e..f861264 100644 --- a/utils/param.py +++ b/utils/param.py @@ -242,7 +242,7 @@ def get_paramsets(args, nuisance_paramset): llh_paramset.extend([ Param(name='np_s_12^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{12}^2', tag=tag), Param(name='np_c_13^4', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{c}_{13}^4', tag=tag), - Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^4', tag=tag), + Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^2', tag=tag), Param(name='np_dcp', value=np.pi, ranges=[0., 2*np.pi], std=0.2, tex=r'\tilde{\delta_{CP}}', tag=tag) ]) if args.fix_mixing_almost: diff --git a/utils/plot.py b/utils/plot.py index 0160da4..3d94cc1 100644 --- a/utils/plot.py +++ b/utils/plot.py @@ -131,9 +131,10 @@ def gen_figtext(args): if args.likelihood is Likelihood.GAUSSIAN: t += '\nSigma = {0:.3f}'.format(args.sigma_ratio) if args.energy_dependance is EnergyDependance.SPECTRAL: - t += '\nSpectral Index = {0}\nBinning = [{1}, {2}] TeV - {3} bins'.format( - int(args.spectral_index), int(args.binning[0]/1e3), - int(args.binning[-1]/1e3), len(args.binning)-1 + if not args.fold_index: + t += '\nSpectral Index = {0}'.format(int(args.spectral_index)) + t += '\nBinning = [{0}, {1}] TeV - {2} bins'.format( + int(args.binning[0]/1e3), int(args.binning[-1]/1e3), len(args.binning)-1 ) elif args.energy_dependance is EnergyDependance.MONO: t += '\nEnergy = {0} TeV'.format(int(args.energy/1e3)) |