Merge branch 'develop'

mrola · May 24, 2016 · 3d14e3d · 3d14e3d
2 parents e76ebac + 97784d1
commit 3d14e3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/config/overlap_test.conf b/src/config/overlap_test.conf
@@ -1,7 +1,7 @@
 [bools]
     SAVE =              True
     GET_URLS =          True
-    READ_PREFETCHED =   False
+    READ_PREFETCHED =   True
     ANNOTATE =          True
     TEST =              False
 

diff --git a/src/scripts/overlap_test.py b/src/scripts/overlap_test.py
@@ -277,12 +277,14 @@ def plot_heat(self):
 
 
 class WrapItUp(Common):
-    def __init__(self, df, path_output):
+    def __init__(self, df, action, path_output):
         self.logger = logging.getLogger('WrapItUp')
         self.df = df
+        self.action = action
         self.path = path_output
         self.readconf = ReadConf()
-        self.doit()
+        if self.action:
+            self.doit()
 
     def show_info(self):
         """ Print some info to verify result """
@@ -352,10 +354,10 @@ def main():
     do_prefetched = readconf.retrieve('getboolean', 'bools', 'READ_PREFETCHED')
 
     gd = GetData(do_url = do_url)
-    WrapItUp(gd.df, path_output_url)
+    WrapItUp(gd.df, gd.do_url, path_output_url)
 
     gd = GetData(do_prefetched = do_prefetched)
-    WrapItUp(gd.df, path_output_prefetched)
+    WrapItUp(gd.df, gd.do_prefetched, path_output_prefetched)
 
     logger.info('Done!\n\n')