fix bug in energy spectrum

1 files changed, 9 insertions, 20 deletions

diff --git a/plot_sens.py b/plot_sens.py
index 2e3b1c6..9aa5089 100755
--- a/plot_sens.py
+++ b/plot_sens.py
@@ -145,10 +145,6 @@ def parse_args(args=None):
         help='Make sensitivity plots'
     )
     parser.add_argument(
-        '--data', type=misc_utils.parse_bool, default='False',
-        help='Use HESE7 data'
-    )
-    parser.add_argument(
         '--plot-statistic', type=misc_utils.parse_bool, default='False',
         help='Plot MultiNest evidence or LLH value'
     )
@@ -231,13 +227,11 @@ def main():
                 infile += '/golemfit/'
             elif args.likelihood is Likelihood.GAUSSIAN:
                 infile += '/gaussian/'
-            # infile += '/DIM{0}/fix_ifr/HESESim'.format(dim)
-            # infile += '/DIM{0}/fix_ifr/'.format(dim)
-            infile += '/DIM{0}/fix_ifr/data'.format(dim)
             if args.likelihood is Likelihood.GAUSSIAN:
                 infile += '{0}/'.format(str(args.sigma_ratio).replace('.', '_'))
-            infile += 'fr_stat/{0}/{1}/fr_stat'.format(args.stat_method, args.run_method) \
-                + misc_utils.gen_identifier(argsc)
+            infile += '/{0}/{1}/{2}/fr_stat'.format(
+                *map(misc_utils.parse_enum, [args.stat_method, args.run_method, args.data])
+            ) + misc_utils.gen_identifier(argsc)
             print '== {0:<25} = {1}'.format('infile', infile)
 
             if args.split_jobs:
@@ -279,17 +273,14 @@ def main():
             argsc.dimension = dim
             _, scale_region = fr_utils.estimate_scale(argsc)
             argsc.scale_region = scale_region
-            # infile = base_infile + '/DIM{0}/fix_ifrHESESim/'.format(dim)
-            # infile = base_infile + '/DIM{0}/fix_ifr/'.format(dim)
-            infile = base_infile + '/DIM{0}/fix_ifr/data'.format(dim)
             if args.likelihood is Likelihood.GAUSSIAN:
                 infile += '{0}/'.format(str(args.sigma_ratio).replace('.', '_'))
-            infile += 'fr_stat/'
 
             for isrc, src in enumerate(args.source_ratios):
                 argsc.source_ratio = src
-                finfile = infile +'/{0}/{1}/fr_stat'.format(args.stat_method, args.run_method) \
-                    + misc_utils.gen_identifier(argsc)
+                finfile = infile +'/{0}/{1}/{2}/fr_stat'.format(
+                    *map(misc_utils.parse_enum, [args.stat_method, args.run_method, args.data])
+                ) + misc_utils.gen_identifier(argsc)
                 basename = os.path.dirname(finfile) + '/statrun/'
                 baseoutfile = basename[:5]+basename[5:].replace('data', 'plots')
                 if args.data:
@@ -343,11 +334,9 @@ def main():
         print 'Plotting sensitivities'
 
         basename = args.infile[:5]+args.infile[5:].replace('data', 'plots')
-        if args.likelihood in [Likelihood.GOLEMFIT, Likelihood.GF_FREQ]:
-            baseoutfile = basename + 'golemfit/{1}'.format(args.likelihood, args.stat_method)
-            if args.data: baseoutfile += '/data'
-        elif args.likelihood is Likelihood.GAUSSIAN:
-            baseoutfile = basename + 'gaussian/{1}'.format(args.likelihood, args.stat_method)
+        baseoutfile = basename + '/{1}/{2}/{3}'.format(
+            *map(misc_utils.parse_enum, [args.likelihood, args.stat_method, args.data])
+        )
 
         if args.run_method is SensitivityCateg.FULL:
             plot_utils.plot_sens_full(