aboutsummaryrefslogtreecommitdiffstats
path: root/utils/fr.py
diff options
context:
space:
mode:
authorshivesh <s.p.mandalia@qmul.ac.uk>2018-04-30 17:09:41 -0500
committershivesh <s.p.mandalia@qmul.ac.uk>2018-04-30 17:09:41 -0500
commita1ab1014c7b2d6be8beffa99b47a57b74b90b876 (patch)
tree1e23941ed229ce83048e2f7a1a6826b894b623d4 /utils/fr.py
parent975ecb72c295a4209615bedc6c06a2719af67f6c (diff)
downloadGolemFlavor-a1ab1014c7b2d6be8beffa99b47a57b74b90b876.tar.gz
GolemFlavor-a1ab1014c7b2d6be8beffa99b47a57b74b90b876.zip
Mon Apr 30 17:09:40 CDT 2018
Diffstat (limited to 'utils/fr.py')
-rw-r--r--utils/fr.py15
1 files changed, 8 insertions, 7 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):