cleaning

Author: jackaraz

madanalysis/core/script_stack.py

@@ -24,10 +24,7 @@
 
 from __future__ import absolute_import
 import logging
-import glob
 import os
-import sys
-import shutil
 
 class ScriptStack:
 

madanalysis/interpreter/interpreter_base.py

@@ -24,17 +24,23 @@
 
 """  A file containing different extension of the cmd basic python library"""
 from __future__ import absolute_import
-from madanalysis.core.script_stack            import ScriptStack
-from madanalysis.interpreter.history          import History
 
 # Python import
 import cmd
 import logging
 import os
-import subprocess
 import readline
+import subprocess
+
 from six.moves import range
 
+from madanalysis.core.script_stack import ScriptStack
+from madanalysis.interpreter.history import History
+
+
+class InvalidCmd(Exception):
+    """expected error for wrong command"""
+
 
 #===============================================================================
 # InterpreterBase
@@ -46,15 +52,6 @@ class InterpreterBase(cmd.Cmd):
     internal call to cmdline, path completion,...
     this class should be MG5 independent"""
 
-    class InvalidCmd(Exception):
-        """expected error for wrong command"""
-        pass    
- 
-        debug_output = 'debug'
-        error_debug = """Please report this bug to developers\nMore information can be found in '%s'."""
-        error_debug += """\nPlease attach this file to your report."""
-        keyboard_stop_msg = """Stopping all current operations. Program must exited. Please type 'exit'"""
-
     interpreter_operators = ['(',')','[',']','&','|','&',\
                              '^','!','=','>','<',',']
 

madanalysis/misc/run_recast.py

@@ -38,18 +38,12 @@
 from string_tools import StringTools
 
 from madanalysis.configuration.delphes_configuration import DelphesConfiguration
-from madanalysis.configuration.delphesMA5tune_configuration import (
-    DelphesMA5tuneConfiguration,
-)
+from madanalysis.configuration.delphesMA5tune_configuration import DelphesMA5tuneConfiguration
 from madanalysis.install.detector_manager import DetectorManager
 from madanalysis.IOinterface.folder_writer import FolderWriter
 from madanalysis.IOinterface.job_writer import JobWriter
 from madanalysis.IOinterface.library_writer import LibraryWriter
-from madanalysis.misc.histfactory_reader import (
-    HF_Background,
-    HF_Signal,
-    construct_histfactory_dictionary,
-)
+from madanalysis.misc.histfactory_reader import HF_Background, HF_Signal, construct_histfactory_dictionary
 from madanalysis.misc.theoretical_error_setup import error_dict_setup
 
 # pylint: disable=logging-fstring-interpolation,import-outside-toplevel
@@ -541,7 +535,9 @@ def run_SimplifiedFastSim(self, dataset, card, analysislist):
             self.logger.error("run over '" + dataset.name + "' aborted.")
             return False
         self.logger.info("    *******************************************************")
-
+        
+        os.environ["FASTJET_FLAG"] = ""
+        
         if not os.path.isdir(self.dirname + "/Output/SAF/" + dataset.name):
             os.mkdir(self.dirname + "/Output/SAF/" + dataset.name)
         for analysis in analysislist:
@@ -1126,10 +1122,7 @@ def compute_cls(self, analyses, dataset):
         import spey
         from spey.system.webutils import get_bibtex
 
-        from .statistical_models import (
-            compute_poi_upper_limits,
-            initialise_statistical_models,
-        )
+        from .statistical_models import compute_poi_upper_limits, initialise_statistical_models
 
         ## Checking whether the CLs module can be used
         ET = self.check_xml_scipy_methods()