Thu 6 Sep 16:23:59 CDT 2018

1 files changed, 4 insertions, 4 deletions

diff --git a/fr.py b/fr.py
index 30f9793..aaf6787 100755
--- a/fr.py
+++ b/fr.py
@@ -21,8 +21,8 @@ from utils import likelihood as llh_utils
 from utils import mcmc as mcmc_utils
 from utils import misc as misc_utils
 from utils import plot as plot_utils
-from utils.enums import EnergyDependance, Likelihood, MCMCSeedType
-from utils.enums import ParamTag, PriorsCateg
+from utils.enums import EnergyDependance, Likelihood, MixingScenario
+from utils.enums import MCMCSeedType, ParamTag, PriorsCateg
 from utils.param import Param, ParamSet, get_paramsets
 
 
@@ -69,9 +69,9 @@ def nuisance_argparse(parser):
 
 def process_args(args):
     """Process the input args."""
-    if args.fix_mixing and args.fix_scale:
+    if args.fix_mixing is not MixingScenario.NONE and args.fix_scale:
         raise NotImplementedError('Fixed mixing and scale not implemented')
-    if args.fix_mixing and args.fix_mixing_almost:
+    if args.fix_mixing is not MixingScenario.NONE and args.fix_mixing_almost:
         raise NotImplementedError(
             '--fix-mixing and --fix-mixing-almost cannot be used together'
         )