Merge branch 'master' into wip-color-mc

Conflicts:
	common.py
	gen/generator.py
	run/experiment.py
	run_exps.py

1 files changed, 2 insertions, 2 deletions

diff --git a/parse_exps.py b/parse_exps.py
index 98f95df..37667aa 100755
--- a/parse_exps.py
+++ b/parse_exps.py
@@ -14,7 +14,7 @@ import sys
 import traceback
 
 from collections import namedtuple
-from config.config import DEFAULTS,PARAMS
+from config.config import FILES,DEFAULTS,PARAMS
 from optparse import OptionParser
 from parse.point import ExpPoint
 from parse.tuple_table import TupleTable
@@ -94,7 +94,7 @@ def parse_exp(exp_force_base):
 
 
 def get_exp_params(data_dir, cm_builder):
-    param_file = "%s/%s" % (data_dir, DEFAULTS['params_file'])
+    param_file = "%s/%s" % (data_dir, FILES['params_file'])
     if os.path.isfile(param_file):
         params = com.load_params(param_file)