Merge lp:~maddevelopers/mg5amcnlo/question_for_reduction_tools_installation into lp:~maddevelopers/mg5amcnlo/2.5.0

[Olivier Mattelaer]

Hi Valentin,

I have a little bit of fun with the installation of the reduction tools in order to be able to have a better/easier control on them.

Basically the only thing changed is that the first time that you run a NLO/loop process. It will ask you a question with the tools that you want to install.

Cheers,

Olivier

PS: I have also implemented the “save options ninja” which only modifies ninja in the configuration file.

[lp:~maddevelopers/mg5amcnlo/question_for_reduction_tools_installation]

292. By Olivier Mattelaer on 2016-08-15

copy library if path is specified for iregi/cuttools

293. By Olivier Mattelaer on 2016-08-15

merge from plugin_mode the change to vendor applied by Valentin

294. By Olivier Mattelaer on 2016-08-15

put a warning for invalid entry

295. By Valentin Hirschi on 2016-08-15

1. Improved the appearance of the question.

296. By Valentin Hirschi on 2016-08-15

1. Fixed an issue with the display of recommended which also applied to the other tools than Ninja and Collier.

[Valentin Hirschi (valentin-hirschi)]

Great! Thanks a bunch for having written this! We have looked at it and improved it together on Skype, so I accept this merge.

review: Approve

[lp:~maddevelopers/mg5amcnlo/question_for_reduction_tools_installation]

297. By Olivier Mattelaer on 2016-08-15

fix timer

298. By Valentin Hirschi on 2016-08-15

1. Final touch to the display of the reudciton installation question

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2016-08-15 23:58:50 +0000
+++ UpdateNotes.txt	2016-08-15 23:58:53 +0000
@@ -1,8 +1,5 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
-<<<<<<< TREE
-2.4.3 (01/08/16)
-=======
 2.5.0
        OM: Modify the structure of the output format such that all the internal format have the same structure
        OM: Adding the Plugin directory. Three kind of plugin are currently supported
@@ -15,7 +12,6 @@
        OM: add the check that the param_card is compatible with the model restriction.
      
 2.4.3 (01/08/16)
->>>>>>> MERGE-SOURCE
         OM: Reduce the amount of log file/output generated for LO run (output can use up to three times less output).
         OM: For the LO combination of events (unweighting) pass to the method previously used for loop-induced.
             This method is faster and requires less I/O operation.

=== modified file 'VERSION'
--- VERSION	2016-08-15 23:58:50 +0000
+++ VERSION	2016-08-15 23:58:53 +0000
@@ -1,10 +1,5 @@
-<<<<<<< TREE
-version = 2.4.3
-date = 2016-08-01
-=======
 version = 2.5.0.alpha
 date = 2016-08-01
->>>>>>> MERGE-SOURCE
 
 
 

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2016-08-15 23:58:50 +0000
+++ madgraph/core/base_objects.py	2016-08-15 23:58:53 +0000
@@ -3016,15 +3016,9 @@
                 mystr = mystr + " ".join(to_add) + ' '
 
         if self['constrained_orders']:
-<<<<<<< TREE
-            mystr = mystr + " ".join('%s%s%d' % (key, 
-              self['constrained_orders'][key][1], self['constrained_orders'][key][0]) 
-                    for (key,(value,type)) in sorted(self['constrained_orders'].keys()))  + ' '
-=======
             mystr = mystr + " ".join('%s%s%d' % (key, 
               self['constrained_orders'][key][1], self['constrained_orders'][key][0]) 
                     for key in sorted(self['constrained_orders'].keys()))  + ' '
->>>>>>> MERGE-SOURCE
 
         # Add perturbation_couplings
         if self['perturbation_couplings']:

=== modified file 'madgraph/interface/extended_cmd.py'
--- madgraph/interface/extended_cmd.py	2016-08-15 23:58:50 +0000
+++ madgraph/interface/extended_cmd.py	2016-08-15 23:58:53 +0000
@@ -679,7 +679,7 @@
             prefix += os.path.sep
 
         if only_dirs:
-            completion = [prefix + f
+            completion = [prefix + f + os.path.sep
                           for f in os.listdir(base_dir)
                           if f.startswith(text) and \
                           os.path.isdir(os.path.join(base_dir, f)) and \
@@ -1020,7 +1020,7 @@
         else:
             path_msg = []
             
-        if timeout:
+        if timeout is True:
             try:
                 timeout = self.options['timeout']
             except Exception:
@@ -1089,6 +1089,7 @@
                 value = alias[value]
         except TypeError:
             pass
+
         if value == default and ask_class:
             value = question_instance.default(default)
         return value

=== modified file 'madgraph/interface/loop_interface.py'
--- madgraph/interface/loop_interface.py	2016-08-15 23:58:50 +0000
+++ madgraph/interface/loop_interface.py	2016-08-15 23:58:53 +0000
@@ -25,6 +25,7 @@
 import madgraph
 from madgraph import MG4DIR, MG5DIR, MadGraph5Error
 import madgraph.interface.madgraph_interface as mg_interface
+import madgraph.interface.extended_cmd as cmd
 import madgraph.interface.launch_ext_program as launch_ext
 import madgraph.interface.extended_cmd as extended_cmd
 import madgraph.core.base_objects as base_objects
@@ -490,8 +491,100 @@
         # Put aloha back in its original mode.
         aloha.mp_precision = aloha_original_quad_mode
 
+
+    def install_reduction_library(self):
+        """Code to install the reduction library if needed"""
+        
+        opt = self.options
+        
+        
+        # Check if first time:
+        if (opt['ninja'] is None) or (os.path.isfile(pjoin(opt['ninja'],'libninja.a'))): 
+            return
+        
+        logger.info("First output using loop matrix-elements has been detected. Now asking for loop reduction:", '$MG:color:BLACK')
+        to_install = self.ask('install', '0',  ask_class=AskLoopInstaller, timeout=300, 
+                              path_msg=' ')
+        
+
+        for key, value in to_install.items():
+            if key in ['cuttools', 'iregi']:
+                if os.path.sep not in value:
+                    continue
+                import madgraph.iolibs.files as files
+                if key == 'cuttools':
+                    if os.path.exists(pjoin(value, 'includects')):
+                        path = pjoin(value, 'includects')
+                    elif os.path.exists(pjoin(value, 'CutTools','includects')):
+                        path = pjoin(value, 'CutTools', 'includects')
+                    elif os.path.exists(pjoin(value, 'vendor','CutTools','includects')):
+                        path = pjoin(value, 'vendor','CutTools', 'includects')
+                    else:
+                        logger.warning('invalid path for cuttools import')
+                        continue
+                    
+                    target = pjoin(MG5DIR,'vendor','CutTools','includects')
+                    if not os.path.exists(target):
+                        os.mkdir(target)
+                    files.cp(pjoin(path,'libcts.a'), target)
+                    files.cp(pjoin(path,'mpmodule.mod'), target, log=True)
+                    if os.path.exists(pjoin(path,'compiler_version.log')):
+                        files.cp(pjoin(path,'compiler_version.log'), target)
+
+                if key == 'iregi':
+                    if os.path.exists(pjoin(value, 'src','IREGI4ML5_interface.f90')):
+                        path = pjoin(value, 'src')
+                    elif os.path.exists(pjoin(value, 'IREGI','src','IREGI4ML5_interface.f90')):
+                        path = pjoin(value, 'IREGI', 'src')
+                    elif os.path.exists(pjoin(value, 'vendor','IREGI','src','IREGI4ML5_interface.f90')):
+                        path = pjoin(value, 'vendor', 'IREGI', 'src')
+                    else:
+                        logger.warning('invalid path for IREGI import')
+                        continue    
+                                         
+                    target = pjoin(MG5DIR,'vendor','IREGI','src')
+                    files.cp(pjoin(path,'libiregi.a'), target, log=True)
+            elif value == 'local':
+                ## LOCAL INSTALLATION OF NINJA/COLLIER
+                    logger.info(
+"""MG5aMC will now install the loop reduction tool '%(p)s' from the local offline installer.
+Use the command 'install $(p)s' if you want to update to the latest online version.
+This installation can take some time but only needs to be performed once.""" %{'p': key},'$MG:color:GREEN')
+                    additional_options = ['--ninja_tarball=%s'%pjoin(MG5DIR,'vendor','%s.tar.gz' % key)]
+                    if key == 'ninja':
+                        additional_options.append('--oneloop_tarball=%s'%pjoin(MG5DIR,'vendor','oneloop.tar.gz'))
+                    
+                    try:
+                        self.do_install(key,paths={'HEPToolsInstaller':
+                                pjoin(MG5DIR,'vendor','OfflineHEPToolsInstaller.tar.gz')},
+                        additional_options=additional_options)
+                    except self.InvalidCmd:
+                            logger.warning(
+"""The offline installation of %(p)s was unsuccessful, and MG5aMC disabled it.
+In the future, if you want to reactivate Ninja, you can do so by re-attempting
+its online installation with the command 'install %(p)s' or install it on your
+own and set the path to its library in the MG5aMC option '%(p)s'.""" % {'p': key})
+                            self.exec_cmd("set %s ''" % key)
+                            self.exec_cmd('save options')
+            
+            # ONLINE INSTALLATION
+            elif value == 'install':
+                prog = {'pjfry': 'PJFry', 'golem': 'Golem95'}
+                if key in prog:
+                    self.exec_cmd('install %s' % prog[key])
+                else:
+                    self.exec_cmd('install %s' % key)
+            # Not install
+            elif value == 'off':
+                self.exec_cmd("set %s ''" % key)
+                self.exec_cmd('save options %s' % key)
+            else:
+                self.exec_cmd("set %s %s" % (key,value))
+                self.exec_cmd('save options %s' % key)                
+        
+        
+    
     # Export a matrix element
-    
     def ML5export(self, nojpeg = False, main_file_name = ""):
         """Export a generated amplitude to file"""
 
@@ -542,14 +635,8 @@
         if self._export_format in self.supported_ML_format:
             for unique_id, me in enumerate(matrix_elements):
                 calls = calls + \
-<<<<<<< TREE
-                        self._curr_exporter.generate_subprocess_directory_v4(\
-                            me, self._curr_fortran_model, (unique_id+1))
-            self._curr_exporter.write_global_specs(matrix_elements)
-=======
                         self._curr_exporter.generate_subprocess_directory(\
                             me, self._curr_helas_model)
->>>>>>> MERGE-SOURCE
             # If all ME's do not share the same maximum loop vertex rank and the
             # same loop maximum wavefunction size, we need to set the maximum
             # in coef_specs.inc of the HELAS Source. The SubProcesses/P* directory
@@ -562,7 +649,6 @@
                 if len(set(max_lwfspins))>1 or len(set(max_loop_vert_ranks))>1:
                     self._curr_exporter.fix_coef_specs(max(max_lwfspins),\
                                                        max(max_loop_vert_ranks))
-                self._curr_exporter.write_global_specs(matrix_elements)
 
         # Just the matrix.f files
         if self._export_format == 'matrix':
@@ -799,3 +885,207 @@
 class LoopInterfaceWeb(mg_interface.CheckValidForCmdWeb, LoopInterface):
     pass
 
+
+class AskLoopInstaller(cmd.OneLinePathCompletion):
+    
+    local_installer = ['ninja', 'collier']
+    required = ['cuttools', 'iregi']
+    order = ['cuttools', 'iregi', 'ninja', 'collier', 'golem', 'pjfry']
+    
+    @property
+    def answer(self):
+        return self.code
+    
+    
+    def __init__(self, question, *args, **opts):
+
+        import urllib2
+        try:
+            response=urllib2.urlopen('http://madgraph.phys.ucl.ac.be/F1.html', timeout=3)
+            self.online=True
+        except urllib2.URLError as err: 
+            self.online=False        
+        
+        self.code = {'ninja': 'install',
+                     'collier': 'install',
+                     'golem': 'off',
+                     'pjfry':'off',
+                     'cuttools': 'required',
+                     'iregi': 'required'}
+        if not self.online:
+            self.code['ninja'] = 'local'
+            self.code['collier'] = 'local'
+            self.code['pjfry'] = 'fail'
+            self.code['golem'] = 'fail'
+        if not misc.which('cmake'):
+            self.code['collier'] = 'off'
+            
+            
+
+        
+        # 1. create the question
+        question, allowed_answer = self.create_question(first=True)
+        
+        opts['allow_arg'] = allowed_answer
+        
+        cmd.OneLinePathCompletion.__init__(self, question, *args, **opts)
+        
+
+    def create_question(self, first = False):
+        """ """
+
+        question = "For loop computations, MadLoop requires dedicated tools to"+\
+        " perform the reduction of loop Feynman diagrams using OPP-based and/or TIR approaches.\n"+\
+        "\nWhich one do you want to install? (this needs to be done only once)\n"
+        
+        allowed_answer = set(['0','done'])
+        
+        descript =  {'cuttools': ['cuttools','(OPP)','[0711.3596]'],
+                     'iregi': ['iregi','(TIR)','[1405.0301]'],
+                     'ninja': ['ninja','(OPP)','[1403.1229]'],
+                     'pjfry': ['pjfry','(TIR)','[1112.0500]'],
+                     'golem': ['golem','(TIR)','[0807.0605]'],
+                     'collier': ['collier','(TIR)','[1604.06792]']} 
+
+        
+        status = {'off': '%(start_red)sdo not install%(stop)s',
+                  'install': '%(start_green)swill be installed %(stop)s',
+                  'local': '%(start_green)swill be installed %(stop)s(offline installation from local repository)',
+                  'fail': 'not available without internet connection',
+                  'required': 'will be installed (required)'}
+        
+        for i,key in enumerate(self.order,1):
+            if os.path.sep not in self.code[key]:
+                question += '%s. %%(start_blue)s%-9s %-5s %-13s%%(stop)s : %s%s\n' % \
+                   tuple([i,]+descript[key]+[status[self.code[key]],]+\
+                     ['(recommended)' if key in ['ninja','collier'] and self.code[key] in ['install'] else ''])
+            else:
+                question += '%s. %%(start_blue)s%-9s %-5s %-13s%%(stop)s : %s\n' % tuple([i,]+descript[key]+[self.code[key],])
+            if key in self.required:
+                continue
+            allowed_answer.update([str(i), key])
+            if key in self.local_installer:
+                allowed_answer.update(['key=local','key=off'])
+            if self.online:
+                allowed_answer.update(['key=on','key=install', 'key=off'])
+                
+        question += "You can:\n -> hit 'enter' to proceed\n -> type a number to cycle its options\n -> enter the following command:\n"+\
+          '    %(start_blue)s{tool_name}%(stop)s [%(start_blue)sinstall%(stop)s|%(start_blue)snoinstall%(stop)s|'+\
+          '%(start_blue)s{prefixed_installation_path}%(stop)s]\n'
+        if first:
+            question += '\n%(start_bold)s%(start_red)sIf you are unsure about what this question means, just type enter to proceed. %(stop)s'
+
+        question = question % {'start_green' : '\033[92m',
+                               'start_red' : '\033[91m',
+                               'start_blue' : '\033[34m',
+     'stop':  '\033[0m',
+     'start_bold':'\033[1m', 
+     }
+        return question, allowed_answer
+        
+    def default(self, line):
+        """Default action if line is not recognized"""
+        
+        line = line.strip()
+        args = line.split()
+
+        if line in ['0', 'done','','EOF']:
+            self.value = 'done'
+            return self.answer
+        self.value = 'repeat'        
+        if args:
+            if len(args) ==1 and '=' in args[0]:
+                args = args[0].split('=')
+            args[0] = args[0].lower()
+            if len(args) == 1:
+                # loop over the possibility
+                if args[0].isdigit():
+                    if len(self.order) < int(args[0]):
+                        logger.warning('Invalid integer %s. Please Retry' % args[0])
+                        return 
+                    args[0] = self.order[int(args[0])-1]
+                key = args[0]
+                if key in self.code:
+                    if self.code[key] in ['off']:
+                        if self.online:
+                            self.code[key] = 'install'
+                        elif key in self.local_installer:
+                            self.code[key] = 'local'
+                    elif self.code[key] == 'install':
+                        if key in self.local_installer:
+                            self.code[key] = 'local'
+                        else:
+                            self.code[key] = 'off'
+                    elif self.code[key] == 'local':
+                        self.code[key] = 'off'
+                else: 
+                    logger.warning('Unknown entry \'%s\'. Please retry' % key)
+                    return 
+            elif len(args) == 2:
+                key = args[0]
+                if key not in self.code:
+                    logger.warning('unknown %s type of entry. Bypass command.')
+                    return                     
+                if os.path.sep not in args[1]:
+                    value = args[1].lower()
+                    if value in ['off', 'not','noinstall']:
+                        self.code[key] = 'off'
+                    elif value in ['on', 'install']:
+                        if self.online:
+                            self.code[key] = 'install'
+                        elif key in self.local_installer:
+                            self.code[key] = 'local'
+                        else:
+                            logger.warning('offline installer not available for %s', key)
+                            self.code[key] = 'off'
+                    elif value in ['local']:
+                        if key in self.local_installer:
+                            self.code[key] = 'local'
+                        else:
+                            logger.warning('offline installer not available for %s', key)
+                            self.code[key] = 'off'
+                else:
+                    self.code[key] = args[1]
+            else:
+                self.value = 0
+        self.question,self.allow_arg = self.create_question()
+        return self.answer
+
+    def apply_name(self, name, line):
+
+        if line.startswith('='):
+            line = line[1:]
+        return self.default('%s %s' % (name,line))
+
+
+    do_ninja = lambda self,line : self.apply_name('ninja', line)
+    do_pjfry = lambda self,line : self.apply_name('pjfry', line)
+    do_collier = lambda self,line : self.apply_name('collier', line)
+    do_golem = lambda self,line : self.apply_name('golem', line)
+    do_cuttools = lambda self,line : self.apply_name('cuttools', line)
+    do_iregi =  lambda self,line : self.apply_name('iregi', line)
+    
+ 
+    def complete_prog(self, text, line, begidx, endidx, formatting=True):
+        
+        if os.path.sep in line:
+            args = line[0:begidx].split()
+            if args[-1].endswith(os.path.sep):
+                return self.path_completion(text,
+                                        pjoin(*[a for a in args if a.endswith(os.path.sep)]),
+                                        only_dirs = True)
+            else:
+                return self.path_completion(text, '.', only_dirs = True)
+        else:
+            return self.list_completion(text, ['install', 'noinstall', 'local'], line)
+    
+    complete_ninja = complete_prog 
+    complete_pjfry = complete_prog
+    complete_collier = complete_prog
+    complete_golem = complete_prog
+    complete_cuttools = complete_prog
+    complete_iregi = complete_prog
+    
+    
+               
+   

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2016-08-15 23:58:50 +0000
+++ madgraph/interface/madgraph_interface.py	2016-08-15 23:58:53 +0000
@@ -1312,7 +1312,7 @@
         if args[0] == 'options':
             has_path = None
             for arg in args[1:]:
-                if arg in ['--auto', '--all']:
+                if arg in ['--auto', '--all'] or arg in self.options:
                     continue
                 elif arg.startswith('--'):
                     raise self.InvalidCmd('unknow command for \'save options\'')
@@ -6669,37 +6669,53 @@
                 raise self.InvalidCmd('No processes to save!')
 
         elif args[0] == 'options':
-            # First look at options which should be put in MG5DIR/input
+            partial_save = False
             to_define = {}
-            for key, default in self.options_configuration.items():
-                if self.options_configuration[key] != self.options[key] and not self.options_configuration[key] is None:
-                    to_define[key] = self.options[key]
-
-            if not '--auto' in args:
-                for key, default in self.options_madevent.items():
-                    if self.options_madevent[key] != self.options[key] != None:
-                        if '_path' in key and os.path.basename(self.options[key]) == 'None':
-                            continue
-                        to_define[key] = self.options[key]
-                    elif key == 'cluster_queue' and self.options[key] is None:
-                        to_define[key] = self.options[key]
-
-            if '--all' in args:
-                for key, default in self.options_madgraph.items():
-                    if self.options_madgraph[key] != self.options[key] != None and \
-                      key != 'stdout_level':
-                        to_define[key] = self.options[key]
-            elif not '--auto' in args:
-                for key, default in self.options_madgraph.items():
-                    if self.options_madgraph[key] != self.options[key] != None and  key != 'stdout_level':
-                        logger.info('The option %s is modified [%s] but will not be written in the configuration files.' \
-                                    % (key,self.options_madgraph[key]) )
-                        logger.info('If you want to make this value the default for future session, you can run \'save options --all\'')
-            if len(args) >1 and not args[1].startswith('--'):
+            if any(not arg.startswith('--') and arg in self.options 
+                                                               for arg in args):
+                # store in file only those ones
+                partial_save = True
+                all_arg = [arg for arg in args[1:] if not arg.startswith('--') and
+                           arg in self.options]
+                for key in all_arg:
+                    to_define[key] = self.options[key] 
+            else:
+                # First look at options which should be put in MG5DIR/input
+                for key, default in self.options_configuration.items():
+                    if self.options_configuration[key] != self.options[key] and not self.options_configuration[key] is None:
+                        to_define[key] = self.options[key]
+    
+                if not '--auto' in args:
+                    for key, default in self.options_madevent.items():
+                        if self.options_madevent[key] != self.options[key] != None:
+                            if '_path' in key and os.path.basename(self.options[key]) == 'None':
+                                continue
+                            to_define[key] = self.options[key]
+                        elif key == 'cluster_queue' and self.options[key] is None:
+                            to_define[key] = self.options[key]
+    
+                if '--all' in args:
+                    for key, default in self.options_madgraph.items():
+                        if self.options_madgraph[key] != self.options[key] != None and \
+                          key != 'stdout_level':
+                            to_define[key] = self.options[key]
+                elif not '--auto' in args:
+                    for key, default in self.options_madgraph.items():
+                        if self.options_madgraph[key] != self.options[key] != None and  key != 'stdout_level':
+                            logger.info('The option %s is modified [%s] but will not be written in the configuration files.' \
+                                        % (key,self.options_madgraph[key]) )
+                            logger.info('If you want to make this value the default for future session, you can run \'save options --all\'')
+                
+            if len(args) >1 and not args[1].startswith('--') and args[1] not in self.options:
                 filepath = args[1]
             else:
                 filepath = pjoin(MG5DIR, 'input', 'mg5_configuration.txt')
-            basefile = pjoin(MG5DIR, 'input', '.mg5_configuration_default.txt')
+            
+            if partial_save:
+                basefile = filepath
+            else:
+                basefile = pjoin(MG5DIR, 'input', '.mg5_configuration_default.txt')
+                
             basedir = MG5DIR
 
             if to_keep:
@@ -7323,14 +7339,8 @@
         if self._export_format == 'madevent':
             path = pjoin(path, 'SubProcesses')
             calls += self._curr_exporter.export_processes(self._curr_matrix_elements,
-<<<<<<< TREE
-                                                 self._curr_fortran_model)
-            self._curr_exporter.write_global_specs(
-                               self._curr_matrix_elements.get_matrix_elements())
-=======
                                                          self._curr_helas_model)
 
->>>>>>> MERGE-SOURCE
             
             # Write the procdef_mg5.dat file with process info
             card_path = pjoin(path, os.path.pardir, 'SubProcesses', \

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2016-08-15 23:58:50 +0000
+++ madgraph/iolibs/export_v4.py	2016-08-15 23:58:53 +0000
@@ -164,16 +164,9 @@
         
         calls = 0
         if isinstance(matrix_elements, group_subprocs.SubProcessGroupList):
-            unique_id=1
             for (group_number, me_group) in enumerate(matrix_elements):
-<<<<<<< TREE
-                calls = calls + self.generate_subprocess_directory_v4(\
-                    me_group, fortran_model, group_number, unique_id=unique_id)
-                unique_id += len(me_group.get('matrix_elements'))
-=======
                 calls = calls + self.generate_subprocess_directory(\
                                           me_group, fortran_model, group_number)
->>>>>>> MERGE-SOURCE
         else:
             for me_number, me in enumerate(matrix_elements.get_matrix_elements()):
                 calls = calls + self.generate_subprocess_directory(\
@@ -181,21 +174,7 @@
                         
         return calls    
         
-<<<<<<< TREE
-    #===========================================================================
-    #  Generate an include file with global quantities about all ME's output.
-    #===========================================================================
-    def write_global_specs(self, matrix_elements):
-        """ Writes the file global_specs.inc which contains general information
-        about *all* the ME's output in this directory."""
-        
-        # Do nothing here, but daughter classes such as LoopOptimizedExporterFortran
-        # overwrites this.
-        pass
-
-=======
-
->>>>>>> MERGE-SOURCE
+
     #===========================================================================
     #  create the run_card 
     #===========================================================================
@@ -4587,16 +4566,10 @@
     #===========================================================================
     def generate_subprocess_directory(self, subproc_group,
                                          fortran_model,
-                                         group_number,
-                                         unique_id=None):
+                                         group_number):
         """Generate the Pn directory for a subprocess group in MadEvent,
         including the necessary matrix_N.f files, configs.inc and various
-<<<<<<< TREE
-        other helper files. Unique_id is dummy here, but not in 
-        LoopInducedExporterMEGroup, so it must be kept."""
-=======
         other helper files."""
->>>>>>> MERGE-SOURCE
 
         assert isinstance(subproc_group, group_subprocs.SubProcessGroup), \
                                       "subproc_group object not SubProcessGroup"
@@ -6398,54 +6371,13 @@
                 (not curr_proc is None) and \
                 (curr_proc.get('perturbation_couplings') != [] and \
                 not curr_proc.get('NLO_mode') in [None,'real','tree','LO','LOonly'])
+
     # An installation is required then, but only if the specified path is the
     # default local one and that the Ninja library appears missing.
     if requires_reduction_tool:
-        if (not opt['ninja'] is None) and\
-            os.path.abspath(opt['ninja'])==pjoin(MG5DIR,'HEPTools','lib') and\
-            not os.path.isfile(pjoin(MG5DIR,'HEPTools','lib','libninja.a')):
-            # Then install Ninja here from the tarballs in the vendor
-            # directory so that it would work offline too.
-            logger.info(
-"""MG5aMC will now install the loop reduction tool 'Ninja' from the local offline installer.
-Use the command 'install ninja' if you want to update to the latest online version.
-This installation can take some time but only needs to be performed once.""",'$MG:color:GREEN')
-            try:
-                cmd.do_install('ninja',paths={'HEPToolsInstaller':
-                        pjoin(MG5DIR,'vendor','OfflineHEPToolsInstaller.tar.gz')},
-                additional_options=[
-                  '--ninja_tarball=%s'%pjoin(MG5DIR,'vendor','ninja.tar.gz'),
-                  '--oneloop_tarball=%s'%pjoin(MG5DIR,'vendor','oneloop.tar.gz')])
-            except InvalidCmd:
-                    logger.warning(
-"""The offline installation of Ninja was unsuccessful, and MG5aMC disabled it.
-In the future, if you want to reactivate Ninja, you can do so by re-attempting
-its online installation with the command 'install ninja' or install it on your
-own and set the path to its library in the MG5aMC option 'ninja'.""")
-                    cmd.exec_cmd("set ninja ''")
-                    cmd.exec_cmd('save options')
-        if (not opt['collier'] is None) and\
-            os.path.abspath(opt['collier'])==pjoin(MG5DIR,'HEPTools','lib') and\
-            not os.path.isfile(pjoin(MG5DIR,'HEPTools','lib','libcollier.a')):
-            # Then install Collier here from the tarballs in the vendor
-            # directory so that it would work offline too.
-            logger.info(
-"""MG5aMC will now install the loop reduction tool 'COLLIER' from the local offline installer.
-Use the command 'install collier' if you want to update to the latest online version.
-This installation can take some time but only needs to be performed once.""",'$MG:color:GREEN')
-            try:
-                cmd.do_install('collier',paths={'HEPToolsInstaller':
-                        pjoin(MG5DIR,'vendor','OfflineHEPToolsInstaller.tar.gz')},
-                additional_options=[
-                  '--collier_tarball=%s'%pjoin(MG5DIR,'vendor','collier.tar.gz')])
-            except InvalidCmd:
-                    logger.warning(
-"""The offline installation of COLLIER was unsuccessful, and MG5aMC disabled it.
-In the future, if you want to reactivate COLLIER, you can do so by re-attempting
-its online installation with the command 'install collier' or install it on your
-own and set the path to its library in the MG5aMC option 'collier'.""")
-                    cmd.exec_cmd("set collier ''")
-                    cmd.exec_cmd('save options')
+        cmd.install_reduction_library()
+        
+
 
 
     # ==========================================================================
@@ -6591,16 +6523,10 @@
     #===========================================================================
     def generate_subprocess_directory(self, subproc_group,
                                          fortran_model,
-                                         group_number,
-                                         unique_id=None):
+                                         group_number):
         """Generate the Pn directory for a subprocess group in MadEvent,
         including the necessary matrix_N.f files, configs.inc and various
-<<<<<<< TREE
-        other helper files. Unique_id is dummy here, but not in 
-        LoopInducedExporterMEGroup, so it must be kept."""
-=======
         other helper files."""
->>>>>>> MERGE-SOURCE
 
         if not isinstance(subproc_group, group_subprocs.SubProcessGroup):
             raise base_objects.PhysicsObject.PhysicsObjectError,\

=== modified file 'madgraph/loop/loop_exporters.py'
--- madgraph/loop/loop_exporters.py	2016-08-15 23:58:50 +0000
+++ madgraph/loop/loop_exporters.py	2016-08-15 23:58:53 +0000
@@ -1029,24 +1029,14 @@
 
         writer.writelines(proc_include)
                                 
-<<<<<<< TREE
-    def generate_subprocess_directory_v4(self, matrix_element, fortran_model,
-                                                                     unique_id):
-=======
                                 
     def generate_subprocess_directory(self, matrix_element, fortran_model):
->>>>>>> MERGE-SOURCE
         """ To overload the default name for this function such that the correct
         function is used when called from the command interface """
         
-<<<<<<< TREE
-        return self.generate_loop_subprocess(matrix_element,fortran_model,
-                                                            unique_id=unique_id)
-=======
         self.unique_id +=1
         return self.generate_loop_subprocess(matrix_element,fortran_model,
                                                             unique_id=self.unique_id)
->>>>>>> MERGE-SOURCE
 
     def write_check_sa(self, writer, matrix_element):
         """Writes out the steering code check_sa. In the optimized output mode,
@@ -2469,29 +2459,6 @@
 
         writer.writelines(file,context=self.get_context(matrix_element))
     
-<<<<<<< TREE
-    def write_global_specs(self, matrix_element_list):
-        """ From the list of matrix element, or the single matrix element, derive
-        the global quantities to write in global_coef_specs.inc"""
-        
-        if isinstance(matrix_element_list, list):
-            me_list = matrix_element_list
-        else:
-            me_list = [matrix_element_list]    
-
-        open(pjoin(self.dir_path,'SubProcesses','global_specs.inc'),'w').write(
-"""      integer MAXNEXTERNAL
-      parameter(MAXNEXTERNAL=%d)
-      integer OVERALLMAXRANK
-      parameter(OVERALLMAXRANK=%d)
-      integer NPROCS
-      parameter(NPROCS=%d)"""%(
-         max(me.get_nexternal_ninitial()[0] for me in me_list),
-         max(me.get_max_loop_rank() for me in me_list),
-         len(me_list)))    
-
-    
-=======
     def write_global_specs(self, matrix_element_list):
         """ From the list of matrix element, or the single matrix element, derive
         the global quantities to write in global_coef_specs.inc"""
@@ -2517,7 +2484,6 @@
          len(me_list)))    
 
     
->>>>>>> MERGE-SOURCE
     def fix_coef_specs(self, overall_max_lwf_spin, overall_max_loop_vert_rank):
         """ If processes with different maximum loop wavefunction size or
         different maximum loop vertex rank have to be output together, then
@@ -3090,25 +3056,12 @@
         # care of MadLoop virtuals initialization
         LoopInducedExporterME.finalize(self,*args,**opts)
         
-<<<<<<< TREE
-    def generate_subprocess_directory_v4(self, subproc_group,
-                            fortran_model,group_number, unique_id=None):
-=======
     def generate_subprocess_directory(self, subproc_group,
                                                     fortran_model,group_number):
->>>>>>> MERGE-SOURCE
         """Generate the Pn directory for a subprocess group in MadEvent,
         including the necessary matrix_N.f files, configs.inc and various
         other helper files"""
-<<<<<<< TREE
-        
-        if unique_id is None:
-            raise MadGraph5Error, 'A unique_id must be provided to '+\
-                'generate_subprocess_directory_v4 in LoopInducedExporterMEGroup.'
-
-=======
-        
->>>>>>> MERGE-SOURCE
+        
         # Generate the MadLoop files
         calls = 0
         matrix_elements = subproc_group.get('matrix_elements')
@@ -3117,13 +3070,8 @@
             calls += self.generate_loop_subprocess(matrix_element,fortran_model,
                               group_number = group_number, proc_id = str(ime+1),
 #          group_number = str(subproc_group.get('number')), proc_id = str(ime+1),
-<<<<<<< TREE
-          config_map = subproc_group.get('diagram_maps')[ime],
-          unique_id=unique_id+ime)
-=======
                             config_map = subproc_group.get('diagram_maps')[ime],
                             unique_id=self.unique_id)
->>>>>>> MERGE-SOURCE
         
         # Then generate the MadEvent files
         export_v4.ProcessExporterFortranMEGroup.generate_subprocess_directory(
@@ -3274,17 +3222,10 @@
 
         # And the finilize_v4 from LoopInducedExporterME which essentially takes
         # care of MadLoop virtuals initialization
-<<<<<<< TREE
-        LoopInducedExporterME.finalize_v4_directory(self,*args,**opts)
-
-    def generate_subprocess_directory_v4(self, matrix_element, fortran_model,
-                                                                     me_number):
-=======
         LoopInducedExporterME.finalize(self, *args, **opts)
 
 
     def generate_subprocess_directory(self, matrix_element, fortran_model, me_number):
->>>>>>> MERGE-SOURCE
         """Generate the Pn directory for a subprocess group in MadEvent,
         including the necessary matrix_N.f files, configs.inc and various
         other helper files"""
@@ -3292,12 +3233,8 @@
         self.unique_id += 1
         # Then generate the MadLoop files
         calls = self.generate_loop_subprocess(matrix_element,fortran_model,                           
-<<<<<<< TREE
-                                  group_number = me_number, unique_id=me_number)
-=======
                                   group_number = me_number, 
                                   unique_id=self.unique_id)
->>>>>>> MERGE-SOURCE
         
         
         # First generate the MadEvent files

=== modified file 'madgraph/various/process_checks.py'
--- madgraph/various/process_checks.py	2016-08-15 23:58:50 +0000
+++ madgraph/various/process_checks.py	2016-08-15 23:58:53 +0000
@@ -611,15 +611,9 @@
             
             FortranExporter = exporter_class(export_dir, MLoptions)
             FortranModel = helas_call_writers.FortranUFOHelasCallWriter(model)
-<<<<<<< TREE
-            FortranExporter.copy_v4template(modelname=model.get('name'))
-            FortranExporter.generate_subprocess_directory_v4(matrix_element, FortranModel, 1)
-            FortranExporter.write_global_specs(matrix_element)
-=======
             FortranExporter.copy_template(model)
             FortranExporter.generate_subprocess_directory(matrix_element, FortranModel)
             #FortranExporter.write_global_specs(matrix_element)
->>>>>>> MERGE-SOURCE
             wanted_lorentz = list(set(matrix_element.get_used_lorentz()))
             wanted_couplings = list(set([c for l in matrix_element.get_used_couplings() \
                                                                     for c in l]))
@@ -1157,14 +1151,8 @@
             start=time.time()
             FortranExporter = exporter_class(export_dir, MLoptions)
             FortranModel = helas_call_writers.FortranUFOHelasCallWriter(model)
-<<<<<<< TREE
-            FortranExporter.copy_v4template(modelname=model.get('name'))
-            FortranExporter.generate_subprocess_directory_v4(matrix_element, FortranModel, 1)
-            FortranExporter.write_global_specs(matrix_element)
-=======
             FortranExporter.copy_template(model)
             FortranExporter.generate_subprocess_directory(matrix_element, FortranModel)
->>>>>>> MERGE-SOURCE
             wanted_lorentz = list(set(matrix_element.get_used_lorentz()))
             wanted_couplings = list(set([c for l in matrix_element.get_used_couplings() \
                                                                 for c in l]))

=== modified file 'tests/IOTests.py'
--- tests/IOTests.py	2016-08-15 23:58:50 +0000
+++ tests/IOTests.py	2016-08-15 23:58:53 +0000
@@ -154,14 +154,9 @@
         hel_amp=loop_helas_objects.LoopHelasMatrixElement(\
                                         myloopamp,optimized_output=isOptimized)
 
-<<<<<<< TREE
-        self.exporter.copy_v4template(model.get('name'))
-        self.exporter.generate_loop_subprocess(hel_amp, self.helasModel,unique_id=1)
-=======
         self.exporter.copy_template(model)
         self.exporter.generate_loop_subprocess(hel_amp, self.helasModel,unique_id=1)
 
->>>>>>> MERGE-SOURCE
         wanted_lorentz = hel_amp.get_used_lorentz()
         wanted_couplings = list(set(sum(hel_amp.get_used_couplings(),[])))
         self.exporter.convert_model(model,wanted_lorentz,wanted_couplings)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%COLLIER_interface.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%COLLIER_interface.f	2016-08-15 23:58:50 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%COLLIER_interface.f	2016-08-15 23:58:53 +0000
@@ -1,737 +1,3 @@
-<<<<<<< TREE
-      SUBROUTINE COLLIERLOOP(CTMODE, NLOOPLINE,RANK,PL,PDEN,M2L
-     $ ,TIRCOEFS,TIRCOEFSERRORS)
-C     
-C     Generated by MadGraph5_aMC@NLO v. %(version)s, %(date)s
-C     By the MadGraph5_aMC@NLO Development Team
-C     Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
-C     
-C     Interface between MG5 and COLLIER.
-C     It supports any rank when 1 < NLOOPLINE < 7.
-C     
-C     Process: d~ u > w+ WEIGHTED<=2 QED<=1 [ all = QCD ]
-C     Process: s~ c > w+ WEIGHTED<=2 QED<=1 [ all = QCD ]
-C     
-C     
-C     MODULES
-C     
-      USE COLLIER
-      IMPLICIT NONE
-C     
-C     CONSTANTS 
-C     
-      LOGICAL CHECKPCONSERVATION
-      PARAMETER (CHECKPCONSERVATION=.TRUE.)
-      REAL*8 PIVALUE
-      PARAMETER(PIVALUE=3.14159265358979323846D0)
-      INTEGER MAXRANK
-      PARAMETER (MAXRANK=2)
-      INTEGER NLOOPGROUPS
-      PARAMETER (NLOOPGROUPS=1)
-      INCLUDE 'loop_max_coefs.inc'
-C     
-C     ARGUMENTS 
-C     
-      INTEGER NLOOPLINE, RANK, CTMODE
-      REAL*8 PL(0:3,NLOOPLINE)
-      REAL*8 PDEN(0:3,NLOOPLINE-1)
-      COMPLEX*16 M2L(NLOOPLINE)
-      COMPLEX*16 RES(3)
-      COMPLEX*16 TIRCOEFS(0:LOOPMAXCOEFS-1,3)
-      COMPLEX*16 TIRCOEFSERRORS(0:LOOPMAXCOEFS-1,3)
-
-C     
-C     LOCAL VARIABLES 
-C     
-      INTEGER N, I, J, K, L
-      INTEGER C0,C1,C2,C3
-      INTEGER N_CACHES
-      INTEGER CURR_RANK, SGN
-      INTEGER CURR_INDEX
-      INTEGER CURR_MAXCOEF
-      REAL*8 RBUFF(0:3)
-
-      INTEGER COEFMAP_ZERO(0:LOOPMAXCOEFS-1)
-      INTEGER COEFMAP_ONE(0:LOOPMAXCOEFS-1)
-      INTEGER COEFMAP_TWO(0:LOOPMAXCOEFS-1)
-      INTEGER COEFMAP_THREE(0:LOOPMAXCOEFS-1)
-      DATA (COEFMAP_ZERO(I),I=  0,  9) / 0, 1, 0, 0, 0, 2, 1, 0, 1, 0/
-      DATA (COEFMAP_ZERO(I),I= 10, 14) / 0, 1, 0, 0, 0/
-      DATA (COEFMAP_ONE(I),I=  0,  9) / 0, 0, 1, 0, 0, 0, 1, 2, 0, 1/
-      DATA (COEFMAP_ONE(I),I= 10, 14) / 0, 0, 1, 0, 0/
-      DATA (COEFMAP_TWO(I),I=  0,  9) / 0, 0, 0, 1, 0, 0, 0, 0, 1, 1/
-      DATA (COEFMAP_TWO(I),I= 10, 14) / 2, 0, 0, 1, 0/
-      DATA (COEFMAP_THREE(I),I=  0,  9) / 0, 0, 0, 0, 1, 0, 0, 0, 0, 0/
-      DATA (COEFMAP_THREE(I),I= 10, 14) / 0, 1, 1, 1, 2/
-
-      REAL*8 REF_NORMALIZATION
-
-      DOUBLE COMPLEX M2LCOLLIER(0:NLOOPLINE-1)
-      DOUBLE COMPLEX MOMVEC(0:3,NLOOPLINE-1)
-      DOUBLE COMPLEX MOMINV((NLOOPLINE*(NLOOPLINE-1))/2)
-
-      DOUBLE COMPLEX TNTEN(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE COMPLEX TNTENUV(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE PRECISION TNTENERR(0:RANK)
-
-      REAL*8 MAXCOEFFORRANK(0:RANK)
-
-C     These quantities are for the pole evaluation
-      DOUBLE COMPLEX TNTEN_UV(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE COMPLEX TNTENUV_UV(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE PRECISION TNTENERR_UV(0:RANK)
-      DOUBLE COMPLEX TNTEN_IR1(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE COMPLEX TNTENUV_IR1(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE PRECISION TNTENERR_IR1(0:RANK)
-      DOUBLE COMPLEX TNTEN_IR2(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE COMPLEX TNTENUV_IR2(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE PRECISION TNTENERR_IR2(0:RANK)
-C     
-C     GLOBAL VARIABLES
-C     
-      INCLUDE 'coupl.inc'
-      INCLUDE 'MadLoopParams.inc'
-      INCLUDE 'unique_id.inc'
-      INCLUDE 'global_specs.inc'
-
-      INTEGER ID,SQSOINDEX,R
-      COMMON/LOOP/ID,SQSOINDEX,R
-
-C     
-C     These global variables cache the coefficients already computed
-C      by COLLIER
-C     so that they can be reused. In particular, in CTMODE 2, the
-C      cached ERROR 
-C     quantities for eahc rank will be used to make use of COLLIER's
-C      internal
-C     assessment of the numerical accuracy.
-C     
-      LOGICAL LOOP_ID_DONE(NLOOPGROUPS)
-      DATA LOOP_ID_DONE/NLOOPGROUPS*.FALSE./
-      COMPLEX*16 TIR_COEFS_DIRECT_MODE(0:LOOPMAXCOEFS-1,3,NLOOPGROUPS)
-      REAL*8 TIR_COEFS_ERROR(0:MAXRANK,NLOOPGROUPS)
-      COMMON/COLLIER_TIR_COEFS/TIR_COEFS_DIRECT_MODE,TIR_COEFS_ERROR
-     $ ,LOOP_ID_DONE
-
-      INTEGER COLLIER_CACHE_ACTIVE, NCALLS_IN_CACHE(4),
-     $  NCOLLIERCALLS(4)
-      LOGICAL MUST_INIT_EVENT
-      COMMON/COLLIER_CACHE_STATUS/COLLIER_CACHE_ACTIVE,NCALLS_IN_CACHE
-     $ , NCOLLIERCALLS,MUST_INIT_EVENT
-
-      LOGICAL CTINIT, TIRINIT, GOLEMINIT, SAMURAIINIT, NINJAINIT,
-     $  COLLIERINIT
-      COMMON/REDUCTIONCODEINIT/CTINIT, TIRINIT,GOLEMINIT,SAMURAIINIT
-     $ ,NINJAINIT, COLLIERINIT
-
-C     ----------
-C     BEGIN CODE
-C     ----------
-
-      IF (COLLIERUSECACHEFORPOLES) THEN
-        N_CACHES = 4
-      ELSE
-        N_CACHES =1
-      ENDIF
-
-C     Initialize COLLIER if needed 
-      IF (COLLIERINIT) THEN
-        COLLIERINIT=.FALSE.
-        CALL INITCOLLIER()
-      ENDIF
-
-C     Initialize the event if it is the first time collier is called
-C      on this PS point
-      IF(MUST_INIT_EVENT) THEN
-        MUST_INIT_EVENT = .FALSE.
-        IF (COLLIERGLOBALCACHE.EQ.0) THEN
-          CALL INITEVENT_CLL()
-        ELSE
-          DO I=1,N_CACHES
-C           Record how many events where put in the cache. On the
-C            first PS point.
-            IF (NCALLS_IN_CACHE(I).EQ.-1.AND.NCOLLIERCALLS(I).GT.0)
-     $        THEN
-              NCALLS_IN_CACHE(I) = NCOLLIERCALLS(I)
-            ENDIF
-          ENDDO
-          DO I=1,N_CACHES
-C           Now apply a safety check that our last event had as many
-C            calls as the cache is setup for.
-C           The only case for now when it can be half of the calls
-C            when we are doing the true loop-direction test with also
-C            the computation of a rotated PS point (which is computed
-C            for one mode only).
-            IF (NCALLS_IN_CACHE(I).NE.-1.AND..NOT. ( NCOLLIERCALLS(I)
-     $       .EQ.NCALLS_IN_CACHE(I).OR. ( CTMODERUN.EQ.
-     $       -1.AND..NOT.COLLIERUSEINTERNALSTABILITYTEST.AND.NROTATIONS
-     $_DP.GT.0.AND.MOD(NCALLS_IN_CACHE(I),2).EQ.0.AND.(NCALLS_IN_CACHE(
-     $I)/2).EQ.NCOLLIERCALLS(I) ) ) ) THEN
-              WRITE(*,*) 'WARNING: A consistency check in MadLoop'
-     $         //' failed and, for safety, forced MadLoop to'
-     $         //' reinitialize the global cache of COLLIER. Report'
-     $         //' this to MadLoop authors. The problematic cache was'
-     $         //' number ',I
-              IF (COLLIERGLOBALCACHE.EQ.-1) THEN
-                CALL INITCACHESYSTEM_CLL(N_CACHES*NPROCS,MAXNEXTERNAL)
-              ELSE
-                CALL INITCACHESYSTEM_CLL(N_CACHES*NPROCS
-     $           ,COLLIERGLOBALCACHE)
-              ENDIF
-C             Make sure all caches are switched off at first.
-              CALL SWITCHOFFCACHESYSTEM_CLL()
-C             Reset the cache design property
-              NCALLS_IN_CACHE(:) = -1
-              NCOLLIERCALLS(:)   = 0
-              IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-                CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-              ENDIF
-C             No need to check the other caches since we already had
-C              to reset here.
-              EXIT
-            ENDIF
-          ENDDO
-          CALL INITEVENT_CLL((UNIQUE_ID-1)*N_CACHES+1)
-          NCOLLIERCALLS(1) = 0
-          IF(COLLIERCOMPUTEUVPOLES.AND.COLLIERUSECACHEFORPOLES) THEN
-            CALL INITEVENT_CLL((UNIQUE_ID-1)*N_CACHES+2)
-            NCOLLIERCALLS(2) = 0
-          ENDIF
-          IF(COLLIERCOMPUTEIRPOLES.AND.COLLIERUSECACHEFORPOLES) THEN
-            CALL INITEVENT_CLL((UNIQUE_ID-1)*N_CACHES+3)
-            NCOLLIERCALLS(3) = 0
-            CALL INITEVENT_CLL((UNIQUE_ID-1)*N_CACHES+4)
-            NCOLLIERCALLS(4) = 0
-          ENDIF
-        ENDIF
-        CALL SETDELTAIR_CLL(0.0D0,(PIVALUE**2)/6.0D0)
-        CALL SETDELTAUV_CLL(0.0D0)
-        CALL SETMUIR2_CLL(MU_R**2)
-        CALL SETMUUV2_CLL(MU_R**2)
-      ENDIF
-
-C     Now really start the reduction with COLLIER
-
-C     Number of coefficients for the current rank
-      CURR_MAXCOEF = 0
-      DO I=0,RANK
-        CURR_MAXCOEF=CURR_MAXCOEF+(3+I)*(2+I)*(1+I)/6
-      ENDDO
-
-      IF (CTMODE.NE.1.AND.CTMODE.NE.2) THEN
-        WRITE(*,*) 'ERROR: COLLIER only support the computational mode'
-     $   //' CTMODE equal to 1 or 2, not',CTMODE
-        STOP 'Incorrect computational mode specified to the COLLIER'
-     $   //' MG5aMC interface.'
-      ENDIF
-
-      DO I=0,CURR_MAXCOEF-1
-        DO K=1,3
-          TIRCOEFSERRORS(I,K)=DCMPLX(0.0D0,0.0D0)
-        ENDDO
-      ENDDO
-
-      IF (COLLIERUSEINTERNALSTABILITYTEST) THEN
-C       Use MADLOOP internal cache dedicated to COLLIER that emulates
-C        the CTMODE 2
-        IF (LOOP_ID_DONE(ID)) THEN
-          DO I=0,CURR_MAXCOEF-1
-            DO K=1,3
-              TIRCOEFS(I,K)=TIR_COEFS_DIRECT_MODE(I,K,ID)
-            ENDDO
-          ENDDO
-          DO I=0,RANK
-            MAXCOEFFORRANK(I) = 0.0D0
-          ENDDO
-          DO I=0,CURR_MAXCOEF-1
-            CURR_RANK = COEFMAP_ZERO(I)+COEFMAP_ONE(I)+COEFMAP_TWO(I)
-     $       +COEFMAP_THREE(I)
-            MAXCOEFFORRANK(CURR_RANK)=MAX(MAXCOEFFORRANK(CURR_RANK)
-     $       ,ABS(TIR_COEFS_DIRECT_MODE(I,1,ID)))
-          ENDDO
-          DO I=0,CURR_MAXCOEF-1
-            CURR_RANK = COEFMAP_ZERO(I)+COEFMAP_ONE(I)+COEFMAP_TWO(I)
-     $       +COEFMAP_THREE(I)
-            IF (MAXCOEFFORRANK(CURR_RANK).NE.0.0D0) THEN
-              DO K=1,3
-C               The expression below is like taking the absolute value
-C                when summing errors linearly
-C               TIRCOEFSERRORS(I,K)=(TIR_COEFS_ERROR(CURR_RANK,ID)/MaxC
-C               oefForRank(CURR_RANK))*DCMPLX( ABS(DBLE(TIRCOEFS(I,K)))
-C               ,ABS(DIMAG(TIRCOEFS(I,K))) )
-C               But empirically, I observed that retaining the
-C                original complex phase leads to slightly more
-C                accurate estimates
-                TIRCOEFSERRORS(I,K)=(TIR_COEFS_ERROR(CURR_RANK,ID)
-     $           /MAXCOEFFORRANK(CURR_RANK))*TIRCOEFS(I,K)
-              ENDDO
-            ENDIF
-          ENDDO
-          RETURN
-        ENDIF
-      ELSE
-C       Apply the loop-direction switching here.
-        CALL SWITCH_ORDER(CTMODE,NLOOPLINE,PL,PDEN,M2L)
-      ENDIF
-
-C     Make sure masses are complex 
-      DO I=1,NLOOPLINE
-        M2LCOLLIER(I-1)=DCMPLX(M2L(I))
-      ENDDO
-
-C     Now convert the loop offset momenta to COLLIER conventions
-      DO I=0,3
-        DO J=1,NLOOPLINE-1
-          MOMVEC(I,J)=DCMPLX(PDEN(I,J),0.0D0)
-        ENDDO
-      ENDDO
-
-C     This first do loop spans over 'N' in '\foreach_N'
-C     //' \foreach_i(k_i+k_{i+1}+..+k_{i+N})^2'
-      CURR_INDEX = 0
-      DO N=0,NLOOPLINE-1
-C       We stop whenever we reached the target number of invariants
-        IF (CURR_INDEX.GE.((NLOOPLINE*(NLOOPLINE-1))/2)) THEN
-          EXIT
-        ENDIF
-C       This do loop spans over 'i' in the expression above.
-        DO I=1,NLOOPLINE
-          IF (CURR_INDEX.GE.((NLOOPLINE*(NLOOPLINE-1))/2)) THEN
-            EXIT
-          ENDIF
-
-          CURR_INDEX = CURR_INDEX+1
-          RBUFF(:) = 0.0D0
-          DO J=I,I+N
-            RBUFF(:) = RBUFF(:) + PL(:,MOD(J-1,NLOOPLINE)+1)
-          ENDDO
-          MOMINV(CURR_INDEX) = DCMPLX(RBUFF(0)**2-RBUFF(1)**2-RBUFF(2)
-     $     **2-RBUFF(3)**2,0.0D0)
-
-C         Now regularize the onshell behavior of the kinematic
-C          invarients
-C         All loop masses are tested, but that might be a bit too
-C          inclusive.
-          DO K=1,NLOOPLINE
-            IF(ABS(M2L(K)).NE.0.0D0) THEN
-              IF(ABS((MOMINV(CURR_INDEX)-M2L(K))/M2L(K)).LT.OSTHRES)
-     $          THEN
-                MOMINV(CURR_INDEX)=DCMPLX(M2L(K))
-              ENDIF
-            ENDIF
-          ENDDO
-C         For the massless onshell-case, we base the threshold only on
-C          the energy component
-          REF_NORMALIZATION=0.0D0
-          DO L=0,0
-            REF_NORMALIZATION = REF_NORMALIZATION + ABS(RBUFF(L))
-          ENDDO
-          REF_NORMALIZATION = (REF_NORMALIZATION/(N+1))**2
-          IF(REF_NORMALIZATION.NE.0.0D0)THEN
-            IF(ABS(MOMINV(CURR_INDEX)/REF_NORMALIZATION).LT.OSTHRES)
-     $       THEN
-              MOMINV(CURR_INDEX)=DCMPLX(0.0D0,0.0D0)
-            ENDIF
-          ENDIF
-
-        ENDDO
-      ENDDO
-
-C     We can now call COLLIER
-      IF (NLOOPLINE.NE.1) THEN
-        CALL TNTEN_CLL(TNTEN, TNTENUV, MOMVEC, MOMINV, M2LCOLLIER,
-     $    NLOOPLINE, RANK, TNTENERR)
-      ELSE
-        CALL TNTEN_CLL(TNTEN, TNTENUV, M2LCOLLIER, NLOOPLINE, RANK,
-     $    TNTENERR)
-      ENDIF
-      IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-        NCOLLIERCALLS(1) = NCOLLIERCALLS(1)+1
-      ENDIF
-
-C     Now compute the UV poles if asked for
-      IF (COLLIERCOMPUTEUVPOLES) THEN
-        IF(COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-          IF(COLLIERUSECACHEFORPOLES) THEN
-            CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+2)
-          ENDIF
-        ENDIF
-        CALL SETDELTAUV_CLL(1.0D0)
-        IF (NLOOPLINE.NE.1) THEN
-          CALL TNTEN_CLL(TNTEN_UV, TNTENUV_UV, MOMVEC, MOMINV,
-     $      M2LCOLLIER, NLOOPLINE, RANK, TNTENERR_UV)
-        ELSE
-          CALL TNTEN_CLL(TNTEN_UV, TNTENUV_UV, M2LCOLLIER, NLOOPLINE,
-     $      RANK, TNTENERR_UV)
-        ENDIF
-        IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          NCOLLIERCALLS(2) = NCOLLIERCALLS(2)+1
-        ENDIF
-        IF(COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          IF(COLLIERUSECACHEFORPOLES) THEN
-            CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+2)
-          ENDIF
-          CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-        ENDIF
-        CALL SETDELTAUV_CLL(0.0D0)
-      ENDIF
-
-C     Now compute the IR poles if asked for
-      IF (COLLIERCOMPUTEIRPOLES) THEN
-        IF(COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-          IF(COLLIERUSECACHEFORPOLES) THEN
-            CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+3)
-          ENDIF
-        ENDIF
-        CALL SETDELTAIR_CLL(1.0D0,(PIVALUE**2)/6.0D0)
-        IF (NLOOPLINE.NE.1) THEN
-          CALL TNTEN_CLL(TNTEN_IR1, TNTENUV_IR1, MOMVEC, MOMINV,
-     $      M2LCOLLIER, NLOOPLINE, RANK, TNTENERR_IR1)
-        ELSE
-          CALL TNTEN_CLL(TNTEN_IR1, TNTENUV_IR1, M2LCOLLIER, NLOOPLINE
-     $     , RANK, TNTENERR_IR1)
-        ENDIF
-        IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          NCOLLIERCALLS(3) = NCOLLIERCALLS(3)+1
-        ENDIF
-        IF(COLLIER_CACHE_ACTIVE.EQ.1.AND.COLLIERUSECACHEFORPOLES) THEN
-          CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+3)
-          CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+4)
-        ENDIF
-        CALL SETDELTAIR_CLL(0.0D0,1.0D0+(PIVALUE**2)/6.0D0)
-        IF (NLOOPLINE.NE.1) THEN
-          CALL TNTEN_CLL(TNTEN_IR2, TNTENUV_IR2, MOMVEC, MOMINV,
-     $      M2LCOLLIER, NLOOPLINE, RANK, TNTENERR_IR2)
-        ELSE
-          CALL TNTEN_CLL(TNTEN_IR2, TNTENUV_IR2, M2LCOLLIER, NLOOPLINE
-     $     , RANK, TNTENERR_IR2)
-        ENDIF
-        IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          NCOLLIERCALLS(4) = NCOLLIERCALLS(4)+1
-        ENDIF
-        IF(COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          IF(COLLIERUSECACHEFORPOLES) THEN
-            CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+4)
-          ENDIF
-          CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-        ENDIF
-        CALL SETDELTAIR_CLL(0.0D0,(PIVALUE**2)/6.0D0)
-      ENDIF
-
-      DO I=0,(CURR_MAXCOEF-1)
-        C0 = COEFMAP_ZERO(I)
-        C1 = COEFMAP_ONE(I)
-        C2 = COEFMAP_TWO(I)
-        C3 = COEFMAP_THREE(I)
-        CURR_RANK = C0+C1+C2+C3
-C       Because we must set q -> -q, we apply a minus sign to coefs of
-C        odd rank
-        IF (MOD(CURR_RANK,2).EQ.1) THEN
-          SGN = -1
-        ELSE
-          SGN = 1
-        ENDIF
-        TIRCOEFS(I,1) = SGN*TNTEN(C0,C1,C2,C3)
-        IF (COLLIERCOMPUTEUVPOLES) THEN
-          TIRCOEFS(I,2) = SGN*( TNTEN_UV(C0,C1,C2,C3)-TNTEN(C0,C1,C2
-     $     ,C3) )
-        ELSE
-          TIRCOEFS(I,2) = DCMPLX(0.0D0,0.0D0)
-        ENDIF
-        IF (COLLIERCOMPUTEIRPOLES) THEN
-          TIRCOEFS(I,2) = TIRCOEFS(I,2) + SGN*( TNTEN_IR1(C0,C1,C2,C3)
-     $     -TNTEN(C0,C1,C2,C3) )
-          TIRCOEFS(I,3) = SGN*( TNTEN_IR2(C0,C1,C2,C3)-TNTEN(C0,C1,C2
-     $     ,C3) )
-        ELSE
-          TIRCOEFS(I,3) = DCMPLX(0.0D0,0.0D0)
-        ENDIF
-      ENDDO
-
-      IF (COLLIERUSEINTERNALSTABILITYTEST) THEN
-C       Finish by caching the coefficients and error just computed
-        LOOP_ID_DONE(ID) = .TRUE.
-        DO J=0,CURR_MAXCOEF-1
-          DO K=1,3
-            TIR_COEFS_DIRECT_MODE(J,K,ID) = TIRCOEFS(J,K)
-          ENDDO
-        ENDDO
-        DO J=0,RANK
-          TIR_COEFS_ERROR(J,ID)=TNTENERR(J)
-        ENDDO
-
-C       Now compute the errors on each coefficient
-        DO I=0,RANK
-          MAXCOEFFORRANK(I) = 0.0D0
-        ENDDO
-        DO I=0,CURR_MAXCOEF-1
-          CURR_RANK = COEFMAP_ZERO(I)+COEFMAP_ONE(I)+COEFMAP_TWO(I)
-     $     +COEFMAP_THREE(I)
-          MAXCOEFFORRANK(CURR_RANK)=MAX(MAXCOEFFORRANK(CURR_RANK)
-     $     ,ABS(TIRCOEFS(I,1)))
-        ENDDO
-        DO I=0,CURR_MAXCOEF-1
-          CURR_RANK = COEFMAP_ZERO(I)+COEFMAP_ONE(I)+COEFMAP_TWO(I)
-     $     +COEFMAP_THREE(I)
-          IF (MAXCOEFFORRANK(CURR_RANK).NE.0.0D0) THEN
-            DO K=1,3
-C             The expression below is like taking the absolute value
-C              when summing errors linearly
-C             TIRCOEFSERRORS(I,K)=(TNtenerr(CURR_RANK)/MaxCoefForRank(C
-C             URR_RANK))*DCMPLX( ABS(DBLE(TIRCOEFS(I,K))),ABS(DIMAG(TIR
-C             COEFS(I,K))) )			
-C             But empirically, I observed that retaining the original
-C              complex phase leads to slightly more accurate estimates
-              TIRCOEFSERRORS(I,K)=(TNTENERR(CURR_RANK)
-     $         /MAXCOEFFORRANK(CURR_RANK))*TIRCOEFS(I,K)
-            ENDDO
-          ENDIF
-        ENDDO
-
-      ENDIF
-
-      END SUBROUTINE COLLIERLOOP
-
-      SUBROUTINE CLEAR_COLLIER_CACHE()
-
-      USE COLLIER
-
-      INCLUDE 'loop_max_coefs.inc'
-      INTEGER NLOOPGROUPS
-      PARAMETER (NLOOPGROUPS=1)
-      INTEGER MAXRANK
-      PARAMETER (MAXRANK=2)
-
-      INTEGER I,J,K
-
-      INCLUDE 'MadLoopParams.inc'
-
-      LOGICAL LOOP_ID_DONE(NLOOPGROUPS)
-      COMPLEX*16 TIR_COEFS_DIRECT_MODE(0:LOOPMAXCOEFS-1,3,NLOOPGROUPS)
-      COMPLEX*16 TIR_COEFS_ERROR(0:MAXRANK,NLOOPGROUPS)
-      COMMON/COLLIER_TIR_COEFS/TIR_COEFS_DIRECT_MODE,TIR_COEFS_ERROR
-     $ ,LOOP_ID_DONE
-
-      INTEGER COLLIER_CACHE_ACTIVE, NCALLS_IN_CACHE(4),
-     $  NCOLLIERCALLS(4)
-      LOGICAL MUST_INIT_EVENT
-      COMMON/COLLIER_CACHE_STATUS/COLLIER_CACHE_ACTIVE,NCALLS_IN_CACHE
-     $ , NCOLLIERCALLS,MUST_INIT_EVENT
-
-C     Make sure that next time the COLLIER Subroutine is called it
-C      will call the subroutine initEvent of Collier.
-      MUST_INIT_EVENT = .TRUE.
-
-C     Reinitialize the ML cache for COLLIER
-      DO I=1,NLOOPGROUPS
-        LOOP_ID_DONE(I) = .FALSE.
-        DO J=0,LOOPMAXCOEFS-1
-          DO K=1,3
-            TIR_COEFS_DIRECT_MODE(J,K,I) = DCMPLX(0.0D0,0.0D0)
-          ENDDO
-        ENDDO
-        DO J=0,MAXRANK
-          TIR_COEFS_ERROR(J,I)=0.0D0
-        ENDDO
-      ENDDO
-
-      END
-
-      SUBROUTINE SET_COLLIER_GLOBAL_CACHE(ONOFF)
-C     
-C     This routine is used by loop_matrix.f to turn on the global
-C     cache of COLLIER when it the main SLOOP subroutine starts and
-C     turn it off when it ends.
-C     However several checks are performed to verify that it is safe
-C     to turn it on and to reinitialize it if necessary.
-C     
-C     MODULES
-C     
-      USE COLLIER
-      IMPLICIT NONE
-C     
-C     ARGUMENTS
-C     
-      LOGICAL ONOFF
-C     
-C     LOCAL VARIABLES
-C     
-      LOGICAL NEED_REINITIALIZATION
-      INTEGER N_CACHES
-C     
-C     GLOBAL VARIABLES
-C     
-C     
-C     This common blocks saves the relevant ML parameters when
-C      activating the
-C     global cache of COLLIER so that we know when we must
-C      reinitialize it.
-C     COLLIER_CACHE_ACTIVE is set to -1 when it has never been turned
-C      on yet and
-C     to 1 for 'Active' and 0 for 'Inactive'.
-C     The integer NCALLS_IN_CACHE saves how many calls the cache is
-C      setup for, for each of the up to four caches.
-C     When it is the first PS points, it is set to -1.
-      INTEGER COLLIER_CACHE_ACTIVE, NCALLS_IN_CACHE(4),
-     $  NCOLLIERCALLS(4)
-      DATA COLLIER_CACHE_ACTIVE/-1/
-      DATA NCALLS_IN_CACHE/-1,-1,-1,-1/
-      DATA NCOLLIERCALLS/0,0,0,0/
-C     This is a flag to tell the COLLIER subroutine that it must init
-C      the event when called.
-      LOGICAL MUST_INIT_EVENT
-      DATA MUST_INIT_EVENT/.TRUE./
-      COMMON/COLLIER_CACHE_STATUS/COLLIER_CACHE_ACTIVE,
-     $  NCALLS_IN_CACHE, NCOLLIERCALLS,MUST_INIT_EVENT
-
-      LOGICAL COLLIERUSEINTERNALSTABILITYTEST_BU
-      INTEGER USERHEL_BU, SQSO_TARGET_BU, COLLIERMODE_BU,CTMODERUN_BU
-      COMMON/COLLIER_CACHE_RELEVANT_PARAMS/USERHEL_BU,SQSO_TARGET_BU
-     $ ,COLLIERMODE_BU,CTMODERUN_BU,COLLIERUSEINTERNALSTABILITYTEST_BU
-
-C     The common blocks below are to retrieve the necessary
-C      information about
-C     MadLoop running mode and store it in the sCOLLIER_CACHE_RELEVANT_
-C     PARAMS common block.
-
-      INCLUDE 'MadLoopParams.inc'
-      INCLUDE 'unique_id.inc'
-      INCLUDE 'global_specs.inc'
-
-      LOGICAL CTINIT, TIRINIT, GOLEMINIT, SAMURAIINIT, NINJAINIT,
-     $  COLLIERINIT
-      COMMON/REDUCTIONCODEINIT/CTINIT, TIRINIT,GOLEMINIT,SAMURAIINIT
-     $ ,NINJAINIT, COLLIERINIT
-
-      LOGICAL CHECKPHASE
-      LOGICAL HELDOUBLECHECKED
-      COMMON/INIT/CHECKPHASE, HELDOUBLECHECKED
-
-      INTEGER USERHEL
-      COMMON/USERCHOICE/USERHEL
-
-      INTEGER SQSO_TARGET
-      COMMON/SOCHOICE/SQSO_TARGET
-
-C     
-C     BEGIN CODE
-C     
-
-      IF (COLLIERUSECACHEFORPOLES) THEN
-        N_CACHES = 4
-      ELSE
-        N_CACHES =1
-      ENDIF
-
-C     Do nothing if COLLIER still has to be initialized or if global
-C      caches are disabled
-      IF(COLLIERINIT.OR.COLLIERGLOBALCACHE.EQ.0) THEN
-        RETURN
-      ENDIF
-
-C     Never activate anything in the checkphase
-      IF (ONOFF.AND.CHECKPHASE) THEN
-        RETURN
-      ENDIF
-
-C     Handle the request of turning off the caching
-      IF (.NOT.ONOFF) THEN
-        IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*4+1)
-          COLLIER_CACHE_ACTIVE = 0
-        ENDIF
-C       If we were asked to turn the cache off but it was already so,
-C        then do nothing		  
-        RETURN
-      ENDIF
-
-C     Handle the request of turning on the caching
-
-C     If asked to activate it but already active, then do nothing
-      IF (ONOFF.AND.COLLIER_CACHE_ACTIVE.EQ.1) THEN
-        RETURN
-      ENDIF
-
-C     We are now in the position where we are asked to activate the
-C      global cache but it was *not* already active.
-
-C     If we activate it for the first time, make sure to store the
-C      value of the relevant parameters, activate and return.
-      IF (COLLIER_CACHE_ACTIVE.EQ.-1) THEN
-        USERHEL_BU         = USERHEL
-        SQSO_TARGET_BU     = SQSO_TARGET
-        COLLIERMODE_BU     = COLLIERMODE
-        COLLIERUSEINTERNALSTABILITYTEST_BU = COLLIERUSEINTERNALSTABILIT
-     $YTEST
-        CTMODERUN_BU       = CTMODERUN
-        CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*4+1)
-        COLLIER_CACHE_ACTIVE = 1
-        RETURN
-      ENDIF
-
-C     Now perform sanity check before the activation to decide if we
-C      need to reinitialize the cache system first.
-      NEED_REINITIALIZATION = .FALSE.
-
-      IF (SQSO_TARGET.NE.SQSO_TARGET_BU) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-      IF (COLLIERMODE.NE.COLLIERMODE_BU) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-      IF (COLLIERUSEINTERNALSTABILITYTEST.NEQV.COLLIERUSEINTERNALSTABIL
-     $ITYTEST_BU) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-      IF (CTMODERUN_BU.NE.CTMODERUN.AND.(.NOT.COLLIERUSEINTERNALSTABILI
-     $TYTEST)) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-C     When doing amplitude reduction the parameter USERHEL does not
-C      impact the number/order of COLLIER calls
-C     except if the LoopFilter is ON which really shouldn't be the
-C      case anymore.
-      IF(USELOOPFILTER.AND.(USERHEL.NE.USERHEL_BU)) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-      IF(NEED_REINITIALIZATION) THEN
-C       Log the event because if it happens a lot of time and floods
-C        the screen, the user must see it
-C       and either change its usage of MadLoop or turnoff COLLIER cache
-        WRITE(*,*) 'INFO: MadLoop detected that the global cache of'
-     $   //' COLLIER had to be reset because of a change in your use'
-     $   //' of MadLoop. This should not happend for each event.'
-        USERHEL_BU         = USERHEL
-        SQSO_TARGET_BU     = SQSO_TARGET
-        COLLIERMODE_BU     = COLLIERMODE
-        COLLIERUSEINTERNALSTABILITYTEST_BU = COLLIERUSEINTERNALSTABILIT
-     $YTEST
-        CTMODERUN_BU       = CTMODERUN
-        IF (COLLIERGLOBALCACHE.EQ.-1) THEN
-          CALL INITCACHESYSTEM_CLL(N_CACHES*NPROCS,MAXNEXTERNAL)
-        ELSE
-          CALL INITCACHESYSTEM_CLL(N_CACHES*NPROCS,COLLIERGLOBALCACHE)
-        ENDIF
-        NCOLLIERCALLS(:)   = 0
-        NCALLS_IN_CACHE(:) = -1
-C       Make sure all caches are switched off at first.
-        CALL SWITCHOFFCACHESYSTEM_CLL()
-      ENDIF
-
-C     Now we can finally activate the cache
-      CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*4+1)
-      COLLIER_CACHE_ACTIVE = 1
-
-      END
-
-=======
       SUBROUTINE COLLIERLOOP(CTMODE, NLOOPLINE,RANK,PL,PDEN,M2L
      $ ,TIRCOEFS,TIRCOEFSERRORS)
 C     
@@ -1464,4 +730,3 @@
 
       END
 
->>>>>>> MERGE-SOURCE

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%loop_matrix.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%loop_matrix.f	2016-08-15 23:58:50 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%loop_matrix.f	2016-08-15 23:58:53 +0000
@@ -237,15 +237,9 @@
       COMMON/MP_DONE/MP_DONE
 C     A FLAG TO DENOTE WHETHER THE CORRESPONDING LOOPLIBS ARE
 C      AVAILABLE OR NOT
-<<<<<<< TREE
-      LOGICAL LOOPLIBS_AVAILABLE(NLOOPLIB)
-      DATA LOOPLIBS_AVAILABLE/.TRUE.,.TRUE.,.TRUE.,.TRUE.,.FALSE.
-     $ ,.TRUE.,.TRUE./
-=======
       LOGICAL LOOPLIBS_AVAILABLE(NLOOPLIB)
       DATA LOOPLIBS_AVAILABLE/.TRUE.,.FALSE.,.TRUE.,.TRUE.,.FALSE.
      $ ,.TRUE.,.TRUE./
->>>>>>> MERGE-SOURCE
       COMMON/LOOPLIBS_AV/ LOOPLIBS_AVAILABLE
 C     A FLAG TO DENOTE WHETHER THE CORRESPONDING DIRECTION TESTS
 C      AVAILABLE OR NOT IN THE LOOPLIBS

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%COLLIER_interface.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%COLLIER_interface.f	2016-08-15 23:58:50 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%COLLIER_interface.f	2016-08-15 23:58:53 +0000
@@ -1,737 +1,3 @@
-<<<<<<< TREE
-      SUBROUTINE COLLIERLOOP(CTMODE, NLOOPLINE,RANK,PL,PDEN,M2L
-     $ ,TIRCOEFS,TIRCOEFSERRORS)
-C     
-C     Generated by MadGraph5_aMC@NLO v. %(version)s, %(date)s
-C     By the MadGraph5_aMC@NLO Development Team
-C     Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
-C     
-C     Interface between MG5 and COLLIER.
-C     It supports any rank when 1 < NLOOPLINE < 7.
-C     
-C     Process: u d~ > w+ WEIGHTED<=2 QED<=1 [ all = QCD ]
-C     Process: c s~ > w+ WEIGHTED<=2 QED<=1 [ all = QCD ]
-C     
-C     
-C     MODULES
-C     
-      USE COLLIER
-      IMPLICIT NONE
-C     
-C     CONSTANTS 
-C     
-      LOGICAL CHECKPCONSERVATION
-      PARAMETER (CHECKPCONSERVATION=.TRUE.)
-      REAL*8 PIVALUE
-      PARAMETER(PIVALUE=3.14159265358979323846D0)
-      INTEGER MAXRANK
-      PARAMETER (MAXRANK=2)
-      INTEGER NLOOPGROUPS
-      PARAMETER (NLOOPGROUPS=1)
-      INCLUDE 'loop_max_coefs.inc'
-C     
-C     ARGUMENTS 
-C     
-      INTEGER NLOOPLINE, RANK, CTMODE
-      REAL*8 PL(0:3,NLOOPLINE)
-      REAL*8 PDEN(0:3,NLOOPLINE-1)
-      COMPLEX*16 M2L(NLOOPLINE)
-      COMPLEX*16 RES(3)
-      COMPLEX*16 TIRCOEFS(0:LOOPMAXCOEFS-1,3)
-      COMPLEX*16 TIRCOEFSERRORS(0:LOOPMAXCOEFS-1,3)
-
-C     
-C     LOCAL VARIABLES 
-C     
-      INTEGER N, I, J, K, L
-      INTEGER C0,C1,C2,C3
-      INTEGER N_CACHES
-      INTEGER CURR_RANK, SGN
-      INTEGER CURR_INDEX
-      INTEGER CURR_MAXCOEF
-      REAL*8 RBUFF(0:3)
-
-      INTEGER COEFMAP_ZERO(0:LOOPMAXCOEFS-1)
-      INTEGER COEFMAP_ONE(0:LOOPMAXCOEFS-1)
-      INTEGER COEFMAP_TWO(0:LOOPMAXCOEFS-1)
-      INTEGER COEFMAP_THREE(0:LOOPMAXCOEFS-1)
-      DATA (COEFMAP_ZERO(I),I=  0,  9) / 0, 1, 0, 0, 0, 2, 1, 0, 1, 0/
-      DATA (COEFMAP_ZERO(I),I= 10, 14) / 0, 1, 0, 0, 0/
-      DATA (COEFMAP_ONE(I),I=  0,  9) / 0, 0, 1, 0, 0, 0, 1, 2, 0, 1/
-      DATA (COEFMAP_ONE(I),I= 10, 14) / 0, 0, 1, 0, 0/
-      DATA (COEFMAP_TWO(I),I=  0,  9) / 0, 0, 0, 1, 0, 0, 0, 0, 1, 1/
-      DATA (COEFMAP_TWO(I),I= 10, 14) / 2, 0, 0, 1, 0/
-      DATA (COEFMAP_THREE(I),I=  0,  9) / 0, 0, 0, 0, 1, 0, 0, 0, 0, 0/
-      DATA (COEFMAP_THREE(I),I= 10, 14) / 0, 1, 1, 1, 2/
-
-      REAL*8 REF_NORMALIZATION
-
-      DOUBLE COMPLEX M2LCOLLIER(0:NLOOPLINE-1)
-      DOUBLE COMPLEX MOMVEC(0:3,NLOOPLINE-1)
-      DOUBLE COMPLEX MOMINV((NLOOPLINE*(NLOOPLINE-1))/2)
-
-      DOUBLE COMPLEX TNTEN(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE COMPLEX TNTENUV(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE PRECISION TNTENERR(0:RANK)
-
-      REAL*8 MAXCOEFFORRANK(0:RANK)
-
-C     These quantities are for the pole evaluation
-      DOUBLE COMPLEX TNTEN_UV(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE COMPLEX TNTENUV_UV(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE PRECISION TNTENERR_UV(0:RANK)
-      DOUBLE COMPLEX TNTEN_IR1(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE COMPLEX TNTENUV_IR1(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE PRECISION TNTENERR_IR1(0:RANK)
-      DOUBLE COMPLEX TNTEN_IR2(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE COMPLEX TNTENUV_IR2(0:RANK,0:RANK,0:RANK,0:RANK)
-      DOUBLE PRECISION TNTENERR_IR2(0:RANK)
-C     
-C     GLOBAL VARIABLES
-C     
-      INCLUDE 'coupl.inc'
-      INCLUDE 'MadLoopParams.inc'
-      INCLUDE 'unique_id.inc'
-      INCLUDE 'global_specs.inc'
-
-      INTEGER ID,SQSOINDEX,R
-      COMMON/LOOP/ID,SQSOINDEX,R
-
-C     
-C     These global variables cache the coefficients already computed
-C      by COLLIER
-C     so that they can be reused. In particular, in CTMODE 2, the
-C      cached ERROR 
-C     quantities for eahc rank will be used to make use of COLLIER's
-C      internal
-C     assessment of the numerical accuracy.
-C     
-      LOGICAL LOOP_ID_DONE(NLOOPGROUPS)
-      DATA LOOP_ID_DONE/NLOOPGROUPS*.FALSE./
-      COMPLEX*16 TIR_COEFS_DIRECT_MODE(0:LOOPMAXCOEFS-1,3,NLOOPGROUPS)
-      REAL*8 TIR_COEFS_ERROR(0:MAXRANK,NLOOPGROUPS)
-      COMMON/COLLIER_TIR_COEFS/TIR_COEFS_DIRECT_MODE,TIR_COEFS_ERROR
-     $ ,LOOP_ID_DONE
-
-      INTEGER COLLIER_CACHE_ACTIVE, NCALLS_IN_CACHE(4),
-     $  NCOLLIERCALLS(4)
-      LOGICAL MUST_INIT_EVENT
-      COMMON/COLLIER_CACHE_STATUS/COLLIER_CACHE_ACTIVE,NCALLS_IN_CACHE
-     $ , NCOLLIERCALLS,MUST_INIT_EVENT
-
-      LOGICAL CTINIT, TIRINIT, GOLEMINIT, SAMURAIINIT, NINJAINIT,
-     $  COLLIERINIT
-      COMMON/REDUCTIONCODEINIT/CTINIT, TIRINIT,GOLEMINIT,SAMURAIINIT
-     $ ,NINJAINIT, COLLIERINIT
-
-C     ----------
-C     BEGIN CODE
-C     ----------
-
-      IF (COLLIERUSECACHEFORPOLES) THEN
-        N_CACHES = 4
-      ELSE
-        N_CACHES =1
-      ENDIF
-
-C     Initialize COLLIER if needed 
-      IF (COLLIERINIT) THEN
-        COLLIERINIT=.FALSE.
-        CALL INITCOLLIER()
-      ENDIF
-
-C     Initialize the event if it is the first time collier is called
-C      on this PS point
-      IF(MUST_INIT_EVENT) THEN
-        MUST_INIT_EVENT = .FALSE.
-        IF (COLLIERGLOBALCACHE.EQ.0) THEN
-          CALL INITEVENT_CLL()
-        ELSE
-          DO I=1,N_CACHES
-C           Record how many events where put in the cache. On the
-C            first PS point.
-            IF (NCALLS_IN_CACHE(I).EQ.-1.AND.NCOLLIERCALLS(I).GT.0)
-     $        THEN
-              NCALLS_IN_CACHE(I) = NCOLLIERCALLS(I)
-            ENDIF
-          ENDDO
-          DO I=1,N_CACHES
-C           Now apply a safety check that our last event had as many
-C            calls as the cache is setup for.
-C           The only case for now when it can be half of the calls
-C            when we are doing the true loop-direction test with also
-C            the computation of a rotated PS point (which is computed
-C            for one mode only).
-            IF (NCALLS_IN_CACHE(I).NE.-1.AND..NOT. ( NCOLLIERCALLS(I)
-     $       .EQ.NCALLS_IN_CACHE(I).OR. ( CTMODERUN.EQ.
-     $       -1.AND..NOT.COLLIERUSEINTERNALSTABILITYTEST.AND.NROTATIONS
-     $_DP.GT.0.AND.MOD(NCALLS_IN_CACHE(I),2).EQ.0.AND.(NCALLS_IN_CACHE(
-     $I)/2).EQ.NCOLLIERCALLS(I) ) ) ) THEN
-              WRITE(*,*) 'WARNING: A consistency check in MadLoop'
-     $         //' failed and, for safety, forced MadLoop to'
-     $         //' reinitialize the global cache of COLLIER. Report'
-     $         //' this to MadLoop authors. The problematic cache was'
-     $         //' number ',I
-              IF (COLLIERGLOBALCACHE.EQ.-1) THEN
-                CALL INITCACHESYSTEM_CLL(N_CACHES*NPROCS,MAXNEXTERNAL)
-              ELSE
-                CALL INITCACHESYSTEM_CLL(N_CACHES*NPROCS
-     $           ,COLLIERGLOBALCACHE)
-              ENDIF
-C             Make sure all caches are switched off at first.
-              CALL SWITCHOFFCACHESYSTEM_CLL()
-C             Reset the cache design property
-              NCALLS_IN_CACHE(:) = -1
-              NCOLLIERCALLS(:)   = 0
-              IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-                CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-              ENDIF
-C             No need to check the other caches since we already had
-C              to reset here.
-              EXIT
-            ENDIF
-          ENDDO
-          CALL INITEVENT_CLL((UNIQUE_ID-1)*N_CACHES+1)
-          NCOLLIERCALLS(1) = 0
-          IF(COLLIERCOMPUTEUVPOLES.AND.COLLIERUSECACHEFORPOLES) THEN
-            CALL INITEVENT_CLL((UNIQUE_ID-1)*N_CACHES+2)
-            NCOLLIERCALLS(2) = 0
-          ENDIF
-          IF(COLLIERCOMPUTEIRPOLES.AND.COLLIERUSECACHEFORPOLES) THEN
-            CALL INITEVENT_CLL((UNIQUE_ID-1)*N_CACHES+3)
-            NCOLLIERCALLS(3) = 0
-            CALL INITEVENT_CLL((UNIQUE_ID-1)*N_CACHES+4)
-            NCOLLIERCALLS(4) = 0
-          ENDIF
-        ENDIF
-        CALL SETDELTAIR_CLL(0.0D0,(PIVALUE**2)/6.0D0)
-        CALL SETDELTAUV_CLL(0.0D0)
-        CALL SETMUIR2_CLL(MU_R**2)
-        CALL SETMUUV2_CLL(MU_R**2)
-      ENDIF
-
-C     Now really start the reduction with COLLIER
-
-C     Number of coefficients for the current rank
-      CURR_MAXCOEF = 0
-      DO I=0,RANK
-        CURR_MAXCOEF=CURR_MAXCOEF+(3+I)*(2+I)*(1+I)/6
-      ENDDO
-
-      IF (CTMODE.NE.1.AND.CTMODE.NE.2) THEN
-        WRITE(*,*) 'ERROR: COLLIER only support the computational mode'
-     $   //' CTMODE equal to 1 or 2, not',CTMODE
-        STOP 'Incorrect computational mode specified to the COLLIER'
-     $   //' MG5aMC interface.'
-      ENDIF
-
-      DO I=0,CURR_MAXCOEF-1
-        DO K=1,3
-          TIRCOEFSERRORS(I,K)=DCMPLX(0.0D0,0.0D0)
-        ENDDO
-      ENDDO
-
-      IF (COLLIERUSEINTERNALSTABILITYTEST) THEN
-C       Use MADLOOP internal cache dedicated to COLLIER that emulates
-C        the CTMODE 2
-        IF (LOOP_ID_DONE(ID)) THEN
-          DO I=0,CURR_MAXCOEF-1
-            DO K=1,3
-              TIRCOEFS(I,K)=TIR_COEFS_DIRECT_MODE(I,K,ID)
-            ENDDO
-          ENDDO
-          DO I=0,RANK
-            MAXCOEFFORRANK(I) = 0.0D0
-          ENDDO
-          DO I=0,CURR_MAXCOEF-1
-            CURR_RANK = COEFMAP_ZERO(I)+COEFMAP_ONE(I)+COEFMAP_TWO(I)
-     $       +COEFMAP_THREE(I)
-            MAXCOEFFORRANK(CURR_RANK)=MAX(MAXCOEFFORRANK(CURR_RANK)
-     $       ,ABS(TIR_COEFS_DIRECT_MODE(I,1,ID)))
-          ENDDO
-          DO I=0,CURR_MAXCOEF-1
-            CURR_RANK = COEFMAP_ZERO(I)+COEFMAP_ONE(I)+COEFMAP_TWO(I)
-     $       +COEFMAP_THREE(I)
-            IF (MAXCOEFFORRANK(CURR_RANK).NE.0.0D0) THEN
-              DO K=1,3
-C               The expression below is like taking the absolute value
-C                when summing errors linearly
-C               TIRCOEFSERRORS(I,K)=(TIR_COEFS_ERROR(CURR_RANK,ID)/MaxC
-C               oefForRank(CURR_RANK))*DCMPLX( ABS(DBLE(TIRCOEFS(I,K)))
-C               ,ABS(DIMAG(TIRCOEFS(I,K))) )
-C               But empirically, I observed that retaining the
-C                original complex phase leads to slightly more
-C                accurate estimates
-                TIRCOEFSERRORS(I,K)=(TIR_COEFS_ERROR(CURR_RANK,ID)
-     $           /MAXCOEFFORRANK(CURR_RANK))*TIRCOEFS(I,K)
-              ENDDO
-            ENDIF
-          ENDDO
-          RETURN
-        ENDIF
-      ELSE
-C       Apply the loop-direction switching here.
-        CALL SWITCH_ORDER(CTMODE,NLOOPLINE,PL,PDEN,M2L)
-      ENDIF
-
-C     Make sure masses are complex 
-      DO I=1,NLOOPLINE
-        M2LCOLLIER(I-1)=DCMPLX(M2L(I))
-      ENDDO
-
-C     Now convert the loop offset momenta to COLLIER conventions
-      DO I=0,3
-        DO J=1,NLOOPLINE-1
-          MOMVEC(I,J)=DCMPLX(PDEN(I,J),0.0D0)
-        ENDDO
-      ENDDO
-
-C     This first do loop spans over 'N' in '\foreach_N'
-C     //' \foreach_i(k_i+k_{i+1}+..+k_{i+N})^2'
-      CURR_INDEX = 0
-      DO N=0,NLOOPLINE-1
-C       We stop whenever we reached the target number of invariants
-        IF (CURR_INDEX.GE.((NLOOPLINE*(NLOOPLINE-1))/2)) THEN
-          EXIT
-        ENDIF
-C       This do loop spans over 'i' in the expression above.
-        DO I=1,NLOOPLINE
-          IF (CURR_INDEX.GE.((NLOOPLINE*(NLOOPLINE-1))/2)) THEN
-            EXIT
-          ENDIF
-
-          CURR_INDEX = CURR_INDEX+1
-          RBUFF(:) = 0.0D0
-          DO J=I,I+N
-            RBUFF(:) = RBUFF(:) + PL(:,MOD(J-1,NLOOPLINE)+1)
-          ENDDO
-          MOMINV(CURR_INDEX) = DCMPLX(RBUFF(0)**2-RBUFF(1)**2-RBUFF(2)
-     $     **2-RBUFF(3)**2,0.0D0)
-
-C         Now regularize the onshell behavior of the kinematic
-C          invarients
-C         All loop masses are tested, but that might be a bit too
-C          inclusive.
-          DO K=1,NLOOPLINE
-            IF(ABS(M2L(K)).NE.0.0D0) THEN
-              IF(ABS((MOMINV(CURR_INDEX)-M2L(K))/M2L(K)).LT.OSTHRES)
-     $          THEN
-                MOMINV(CURR_INDEX)=DCMPLX(M2L(K))
-              ENDIF
-            ENDIF
-          ENDDO
-C         For the massless onshell-case, we base the threshold only on
-C          the energy component
-          REF_NORMALIZATION=0.0D0
-          DO L=0,0
-            REF_NORMALIZATION = REF_NORMALIZATION + ABS(RBUFF(L))
-          ENDDO
-          REF_NORMALIZATION = (REF_NORMALIZATION/(N+1))**2
-          IF(REF_NORMALIZATION.NE.0.0D0)THEN
-            IF(ABS(MOMINV(CURR_INDEX)/REF_NORMALIZATION).LT.OSTHRES)
-     $       THEN
-              MOMINV(CURR_INDEX)=DCMPLX(0.0D0,0.0D0)
-            ENDIF
-          ENDIF
-
-        ENDDO
-      ENDDO
-
-C     We can now call COLLIER
-      IF (NLOOPLINE.NE.1) THEN
-        CALL TNTEN_CLL(TNTEN, TNTENUV, MOMVEC, MOMINV, M2LCOLLIER,
-     $    NLOOPLINE, RANK, TNTENERR)
-      ELSE
-        CALL TNTEN_CLL(TNTEN, TNTENUV, M2LCOLLIER, NLOOPLINE, RANK,
-     $    TNTENERR)
-      ENDIF
-      IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-        NCOLLIERCALLS(1) = NCOLLIERCALLS(1)+1
-      ENDIF
-
-C     Now compute the UV poles if asked for
-      IF (COLLIERCOMPUTEUVPOLES) THEN
-        IF(COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-          IF(COLLIERUSECACHEFORPOLES) THEN
-            CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+2)
-          ENDIF
-        ENDIF
-        CALL SETDELTAUV_CLL(1.0D0)
-        IF (NLOOPLINE.NE.1) THEN
-          CALL TNTEN_CLL(TNTEN_UV, TNTENUV_UV, MOMVEC, MOMINV,
-     $      M2LCOLLIER, NLOOPLINE, RANK, TNTENERR_UV)
-        ELSE
-          CALL TNTEN_CLL(TNTEN_UV, TNTENUV_UV, M2LCOLLIER, NLOOPLINE,
-     $      RANK, TNTENERR_UV)
-        ENDIF
-        IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          NCOLLIERCALLS(2) = NCOLLIERCALLS(2)+1
-        ENDIF
-        IF(COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          IF(COLLIERUSECACHEFORPOLES) THEN
-            CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+2)
-          ENDIF
-          CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-        ENDIF
-        CALL SETDELTAUV_CLL(0.0D0)
-      ENDIF
-
-C     Now compute the IR poles if asked for
-      IF (COLLIERCOMPUTEIRPOLES) THEN
-        IF(COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-          IF(COLLIERUSECACHEFORPOLES) THEN
-            CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+3)
-          ENDIF
-        ENDIF
-        CALL SETDELTAIR_CLL(1.0D0,(PIVALUE**2)/6.0D0)
-        IF (NLOOPLINE.NE.1) THEN
-          CALL TNTEN_CLL(TNTEN_IR1, TNTENUV_IR1, MOMVEC, MOMINV,
-     $      M2LCOLLIER, NLOOPLINE, RANK, TNTENERR_IR1)
-        ELSE
-          CALL TNTEN_CLL(TNTEN_IR1, TNTENUV_IR1, M2LCOLLIER, NLOOPLINE
-     $     , RANK, TNTENERR_IR1)
-        ENDIF
-        IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          NCOLLIERCALLS(3) = NCOLLIERCALLS(3)+1
-        ENDIF
-        IF(COLLIER_CACHE_ACTIVE.EQ.1.AND.COLLIERUSECACHEFORPOLES) THEN
-          CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+3)
-          CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+4)
-        ENDIF
-        CALL SETDELTAIR_CLL(0.0D0,1.0D0+(PIVALUE**2)/6.0D0)
-        IF (NLOOPLINE.NE.1) THEN
-          CALL TNTEN_CLL(TNTEN_IR2, TNTENUV_IR2, MOMVEC, MOMINV,
-     $      M2LCOLLIER, NLOOPLINE, RANK, TNTENERR_IR2)
-        ELSE
-          CALL TNTEN_CLL(TNTEN_IR2, TNTENUV_IR2, M2LCOLLIER, NLOOPLINE
-     $     , RANK, TNTENERR_IR2)
-        ENDIF
-        IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          NCOLLIERCALLS(4) = NCOLLIERCALLS(4)+1
-        ENDIF
-        IF(COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          IF(COLLIERUSECACHEFORPOLES) THEN
-            CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*N_CACHES+4)
-          ENDIF
-          CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*N_CACHES+1)
-        ENDIF
-        CALL SETDELTAIR_CLL(0.0D0,(PIVALUE**2)/6.0D0)
-      ENDIF
-
-      DO I=0,(CURR_MAXCOEF-1)
-        C0 = COEFMAP_ZERO(I)
-        C1 = COEFMAP_ONE(I)
-        C2 = COEFMAP_TWO(I)
-        C3 = COEFMAP_THREE(I)
-        CURR_RANK = C0+C1+C2+C3
-C       Because we must set q -> -q, we apply a minus sign to coefs of
-C        odd rank
-        IF (MOD(CURR_RANK,2).EQ.1) THEN
-          SGN = -1
-        ELSE
-          SGN = 1
-        ENDIF
-        TIRCOEFS(I,1) = SGN*TNTEN(C0,C1,C2,C3)
-        IF (COLLIERCOMPUTEUVPOLES) THEN
-          TIRCOEFS(I,2) = SGN*( TNTEN_UV(C0,C1,C2,C3)-TNTEN(C0,C1,C2
-     $     ,C3) )
-        ELSE
-          TIRCOEFS(I,2) = DCMPLX(0.0D0,0.0D0)
-        ENDIF
-        IF (COLLIERCOMPUTEIRPOLES) THEN
-          TIRCOEFS(I,2) = TIRCOEFS(I,2) + SGN*( TNTEN_IR1(C0,C1,C2,C3)
-     $     -TNTEN(C0,C1,C2,C3) )
-          TIRCOEFS(I,3) = SGN*( TNTEN_IR2(C0,C1,C2,C3)-TNTEN(C0,C1,C2
-     $     ,C3) )
-        ELSE
-          TIRCOEFS(I,3) = DCMPLX(0.0D0,0.0D0)
-        ENDIF
-      ENDDO
-
-      IF (COLLIERUSEINTERNALSTABILITYTEST) THEN
-C       Finish by caching the coefficients and error just computed
-        LOOP_ID_DONE(ID) = .TRUE.
-        DO J=0,CURR_MAXCOEF-1
-          DO K=1,3
-            TIR_COEFS_DIRECT_MODE(J,K,ID) = TIRCOEFS(J,K)
-          ENDDO
-        ENDDO
-        DO J=0,RANK
-          TIR_COEFS_ERROR(J,ID)=TNTENERR(J)
-        ENDDO
-
-C       Now compute the errors on each coefficient
-        DO I=0,RANK
-          MAXCOEFFORRANK(I) = 0.0D0
-        ENDDO
-        DO I=0,CURR_MAXCOEF-1
-          CURR_RANK = COEFMAP_ZERO(I)+COEFMAP_ONE(I)+COEFMAP_TWO(I)
-     $     +COEFMAP_THREE(I)
-          MAXCOEFFORRANK(CURR_RANK)=MAX(MAXCOEFFORRANK(CURR_RANK)
-     $     ,ABS(TIRCOEFS(I,1)))
-        ENDDO
-        DO I=0,CURR_MAXCOEF-1
-          CURR_RANK = COEFMAP_ZERO(I)+COEFMAP_ONE(I)+COEFMAP_TWO(I)
-     $     +COEFMAP_THREE(I)
-          IF (MAXCOEFFORRANK(CURR_RANK).NE.0.0D0) THEN
-            DO K=1,3
-C             The expression below is like taking the absolute value
-C              when summing errors linearly
-C             TIRCOEFSERRORS(I,K)=(TNtenerr(CURR_RANK)/MaxCoefForRank(C
-C             URR_RANK))*DCMPLX( ABS(DBLE(TIRCOEFS(I,K))),ABS(DIMAG(TIR
-C             COEFS(I,K))) )			
-C             But empirically, I observed that retaining the original
-C              complex phase leads to slightly more accurate estimates
-              TIRCOEFSERRORS(I,K)=(TNTENERR(CURR_RANK)
-     $         /MAXCOEFFORRANK(CURR_RANK))*TIRCOEFS(I,K)
-            ENDDO
-          ENDIF
-        ENDDO
-
-      ENDIF
-
-      END SUBROUTINE COLLIERLOOP
-
-      SUBROUTINE CLEAR_COLLIER_CACHE()
-
-      USE COLLIER
-
-      INCLUDE 'loop_max_coefs.inc'
-      INTEGER NLOOPGROUPS
-      PARAMETER (NLOOPGROUPS=1)
-      INTEGER MAXRANK
-      PARAMETER (MAXRANK=2)
-
-      INTEGER I,J,K
-
-      INCLUDE 'MadLoopParams.inc'
-
-      LOGICAL LOOP_ID_DONE(NLOOPGROUPS)
-      COMPLEX*16 TIR_COEFS_DIRECT_MODE(0:LOOPMAXCOEFS-1,3,NLOOPGROUPS)
-      COMPLEX*16 TIR_COEFS_ERROR(0:MAXRANK,NLOOPGROUPS)
-      COMMON/COLLIER_TIR_COEFS/TIR_COEFS_DIRECT_MODE,TIR_COEFS_ERROR
-     $ ,LOOP_ID_DONE
-
-      INTEGER COLLIER_CACHE_ACTIVE, NCALLS_IN_CACHE(4),
-     $  NCOLLIERCALLS(4)
-      LOGICAL MUST_INIT_EVENT
-      COMMON/COLLIER_CACHE_STATUS/COLLIER_CACHE_ACTIVE,NCALLS_IN_CACHE
-     $ , NCOLLIERCALLS,MUST_INIT_EVENT
-
-C     Make sure that next time the COLLIER Subroutine is called it
-C      will call the subroutine initEvent of Collier.
-      MUST_INIT_EVENT = .TRUE.
-
-C     Reinitialize the ML cache for COLLIER
-      DO I=1,NLOOPGROUPS
-        LOOP_ID_DONE(I) = .FALSE.
-        DO J=0,LOOPMAXCOEFS-1
-          DO K=1,3
-            TIR_COEFS_DIRECT_MODE(J,K,I) = DCMPLX(0.0D0,0.0D0)
-          ENDDO
-        ENDDO
-        DO J=0,MAXRANK
-          TIR_COEFS_ERROR(J,I)=0.0D0
-        ENDDO
-      ENDDO
-
-      END
-
-      SUBROUTINE SET_COLLIER_GLOBAL_CACHE(ONOFF)
-C     
-C     This routine is used by loop_matrix.f to turn on the global
-C     cache of COLLIER when it the main SLOOP subroutine starts and
-C     turn it off when it ends.
-C     However several checks are performed to verify that it is safe
-C     to turn it on and to reinitialize it if necessary.
-C     
-C     MODULES
-C     
-      USE COLLIER
-      IMPLICIT NONE
-C     
-C     ARGUMENTS
-C     
-      LOGICAL ONOFF
-C     
-C     LOCAL VARIABLES
-C     
-      LOGICAL NEED_REINITIALIZATION
-      INTEGER N_CACHES
-C     
-C     GLOBAL VARIABLES
-C     
-C     
-C     This common blocks saves the relevant ML parameters when
-C      activating the
-C     global cache of COLLIER so that we know when we must
-C      reinitialize it.
-C     COLLIER_CACHE_ACTIVE is set to -1 when it has never been turned
-C      on yet and
-C     to 1 for 'Active' and 0 for 'Inactive'.
-C     The integer NCALLS_IN_CACHE saves how many calls the cache is
-C      setup for, for each of the up to four caches.
-C     When it is the first PS points, it is set to -1.
-      INTEGER COLLIER_CACHE_ACTIVE, NCALLS_IN_CACHE(4),
-     $  NCOLLIERCALLS(4)
-      DATA COLLIER_CACHE_ACTIVE/-1/
-      DATA NCALLS_IN_CACHE/-1,-1,-1,-1/
-      DATA NCOLLIERCALLS/0,0,0,0/
-C     This is a flag to tell the COLLIER subroutine that it must init
-C      the event when called.
-      LOGICAL MUST_INIT_EVENT
-      DATA MUST_INIT_EVENT/.TRUE./
-      COMMON/COLLIER_CACHE_STATUS/COLLIER_CACHE_ACTIVE,
-     $  NCALLS_IN_CACHE, NCOLLIERCALLS,MUST_INIT_EVENT
-
-      LOGICAL COLLIERUSEINTERNALSTABILITYTEST_BU
-      INTEGER USERHEL_BU, SQSO_TARGET_BU, COLLIERMODE_BU,CTMODERUN_BU
-      COMMON/COLLIER_CACHE_RELEVANT_PARAMS/USERHEL_BU,SQSO_TARGET_BU
-     $ ,COLLIERMODE_BU,CTMODERUN_BU,COLLIERUSEINTERNALSTABILITYTEST_BU
-
-C     The common blocks below are to retrieve the necessary
-C      information about
-C     MadLoop running mode and store it in the sCOLLIER_CACHE_RELEVANT_
-C     PARAMS common block.
-
-      INCLUDE 'MadLoopParams.inc'
-      INCLUDE 'unique_id.inc'
-      INCLUDE 'global_specs.inc'
-
-      LOGICAL CTINIT, TIRINIT, GOLEMINIT, SAMURAIINIT, NINJAINIT,
-     $  COLLIERINIT
-      COMMON/REDUCTIONCODEINIT/CTINIT, TIRINIT,GOLEMINIT,SAMURAIINIT
-     $ ,NINJAINIT, COLLIERINIT
-
-      LOGICAL CHECKPHASE
-      LOGICAL HELDOUBLECHECKED
-      COMMON/INIT/CHECKPHASE, HELDOUBLECHECKED
-
-      INTEGER USERHEL
-      COMMON/USERCHOICE/USERHEL
-
-      INTEGER SQSO_TARGET
-      COMMON/SOCHOICE/SQSO_TARGET
-
-C     
-C     BEGIN CODE
-C     
-
-      IF (COLLIERUSECACHEFORPOLES) THEN
-        N_CACHES = 4
-      ELSE
-        N_CACHES =1
-      ENDIF
-
-C     Do nothing if COLLIER still has to be initialized or if global
-C      caches are disabled
-      IF(COLLIERINIT.OR.COLLIERGLOBALCACHE.EQ.0) THEN
-        RETURN
-      ENDIF
-
-C     Never activate anything in the checkphase
-      IF (ONOFF.AND.CHECKPHASE) THEN
-        RETURN
-      ENDIF
-
-C     Handle the request of turning off the caching
-      IF (.NOT.ONOFF) THEN
-        IF (COLLIER_CACHE_ACTIVE.EQ.1) THEN
-          CALL SWITCHOFFCACHE_CLL((UNIQUE_ID-1)*4+1)
-          COLLIER_CACHE_ACTIVE = 0
-        ENDIF
-C       If we were asked to turn the cache off but it was already so,
-C        then do nothing		  
-        RETURN
-      ENDIF
-
-C     Handle the request of turning on the caching
-
-C     If asked to activate it but already active, then do nothing
-      IF (ONOFF.AND.COLLIER_CACHE_ACTIVE.EQ.1) THEN
-        RETURN
-      ENDIF
-
-C     We are now in the position where we are asked to activate the
-C      global cache but it was *not* already active.
-
-C     If we activate it for the first time, make sure to store the
-C      value of the relevant parameters, activate and return.
-      IF (COLLIER_CACHE_ACTIVE.EQ.-1) THEN
-        USERHEL_BU         = USERHEL
-        SQSO_TARGET_BU     = SQSO_TARGET
-        COLLIERMODE_BU     = COLLIERMODE
-        COLLIERUSEINTERNALSTABILITYTEST_BU = COLLIERUSEINTERNALSTABILIT
-     $YTEST
-        CTMODERUN_BU       = CTMODERUN
-        CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*4+1)
-        COLLIER_CACHE_ACTIVE = 1
-        RETURN
-      ENDIF
-
-C     Now perform sanity check before the activation to decide if we
-C      need to reinitialize the cache system first.
-      NEED_REINITIALIZATION = .FALSE.
-
-      IF (SQSO_TARGET.NE.SQSO_TARGET_BU) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-      IF (COLLIERMODE.NE.COLLIERMODE_BU) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-      IF (COLLIERUSEINTERNALSTABILITYTEST.NEQV.COLLIERUSEINTERNALSTABIL
-     $ITYTEST_BU) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-      IF (CTMODERUN_BU.NE.CTMODERUN.AND.(.NOT.COLLIERUSEINTERNALSTABILI
-     $TYTEST)) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-C     When doing amplitude reduction the parameter USERHEL does not
-C      impact the number/order of COLLIER calls
-C     except if the LoopFilter is ON which really shouldn't be the
-C      case anymore.
-      IF(USELOOPFILTER.AND.(USERHEL.NE.USERHEL_BU)) THEN
-        NEED_REINITIALIZATION = .TRUE.
-      ENDIF
-
-      IF(NEED_REINITIALIZATION) THEN
-C       Log the event because if it happens a lot of time and floods
-C        the screen, the user must see it
-C       and either change its usage of MadLoop or turnoff COLLIER cache
-        WRITE(*,*) 'INFO: MadLoop detected that the global cache of'
-     $   //' COLLIER had to be reset because of a change in your use'
-     $   //' of MadLoop. This should not happend for each event.'
-        USERHEL_BU         = USERHEL
-        SQSO_TARGET_BU     = SQSO_TARGET
-        COLLIERMODE_BU     = COLLIERMODE
-        COLLIERUSEINTERNALSTABILITYTEST_BU = COLLIERUSEINTERNALSTABILIT
-     $YTEST
-        CTMODERUN_BU       = CTMODERUN
-        IF (COLLIERGLOBALCACHE.EQ.-1) THEN
-          CALL INITCACHESYSTEM_CLL(N_CACHES*NPROCS,MAXNEXTERNAL)
-        ELSE
-          CALL INITCACHESYSTEM_CLL(N_CACHES*NPROCS,COLLIERGLOBALCACHE)
-        ENDIF
-        NCOLLIERCALLS(:)   = 0
-        NCALLS_IN_CACHE(:) = -1
-C       Make sure all caches are switched off at first.
-        CALL SWITCHOFFCACHESYSTEM_CLL()
-      ENDIF
-
-C     Now we can finally activate the cache
-      CALL SWITCHONCACHE_CLL((UNIQUE_ID-1)*4+1)
-      COLLIER_CACHE_ACTIVE = 1
-
-      END
-
-=======
       SUBROUTINE COLLIERLOOP(CTMODE, NLOOPLINE,RANK,PL,PDEN,M2L
      $ ,TIRCOEFS,TIRCOEFSERRORS)
 C     
@@ -1464,4 +730,3 @@
 
       END
 
->>>>>>> MERGE-SOURCE

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%loop_matrix.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%loop_matrix.f	2016-08-15 23:58:50 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%loop_matrix.f	2016-08-15 23:58:53 +0000
@@ -237,15 +237,9 @@
       COMMON/MP_DONE/MP_DONE
 C     A FLAG TO DENOTE WHETHER THE CORRESPONDING LOOPLIBS ARE
 C      AVAILABLE OR NOT
-<<<<<<< TREE
-      LOGICAL LOOPLIBS_AVAILABLE(NLOOPLIB)
-      DATA LOOPLIBS_AVAILABLE/.TRUE.,.TRUE.,.TRUE.,.TRUE.,.FALSE.
-     $ ,.TRUE.,.TRUE./
-=======
       LOGICAL LOOPLIBS_AVAILABLE(NLOOPLIB)
       DATA LOOPLIBS_AVAILABLE/.TRUE.,.FALSE.,.TRUE.,.TRUE.,.FALSE.
      $ ,.TRUE.,.TRUE./
->>>>>>> MERGE-SOURCE
       COMMON/LOOPLIBS_AV/ LOOPLIBS_AVAILABLE
 C     A FLAG TO DENOTE WHETHER THE CORRESPONDING DIRECTION TESTS
 C      AVAILABLE OR NOT IN THE LOOPLIBS

=== modified file 'tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%MadLoopCommons.f'
--- tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%MadLoopCommons.f	2016-08-15 23:58:50 +0000
+++ tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%MadLoopCommons.f	2016-08-15 23:58:53 +0000
@@ -740,15 +740,9 @@
      $           //'                                                  '
      $           //'   .JMML.     '//CHAR(27)//'[0m'//'       }'
                 WRITE(*,*) '{       '//CHAR(27)//'[32m'//CHAR(27)/
-<<<<<<< TREE
-     $           /'[0m'//'v%(version)s (%(date)s), Ref: arXiv:1103.0621v2,'
-     $           //' arXiv:1405.0301'//CHAR(27)//'[32m'//'            '
-     $           //'    '//CHAR(27)//'[0m'//'       }'
-=======
      $           /'[0m'//'v%(version)s (%(date)s), Ref:'
      $           //' arXiv:1103.0621v2, arXiv:1405.0301'//CHAR(27)/
      $           /'[32m'//'          '//CHAR(27)//'[0m'//'       }'
->>>>>>> MERGE-SOURCE
                 WRITE(*,*) '{       '//CHAR(27)//'[32m'//'            '
      $           //'                                                  '
      $           //'              '//CHAR(27)//'[0m'//'       }'

=== modified file 'tests/time_db'
--- tests/time_db	2016-08-15 23:58:50 +0000
+++ tests/time_db	2016-08-14 00:17:23 +0000
@@ -1,9 +1,5 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasDiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000161170959473
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_particle>]> 0.000631093978882
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_add>]> 0.0435810089111
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_remove_line>]> 8.89301300049e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_get_length>]> 0.000235080718994
@@ -36,11 +32,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddadd>]> 0.0001380443573
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_1>]> 0.00120282173157
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_gg_gogo>]> 0.014230966568
-<<<<<<< TREE
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_multiple_lorentz_subset>]> 0.0512928962708
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_building>]> 0.000118970870972
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_apx_decaywidth>]> 0.572462081909
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_set_color_links>]> 1.08148097992
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_raise_invalid_path_hwpp>]> 69.1746711731
@@ -49,6 +40,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_export_fks.IOExportFKSTest testMethod=testIO_test_tdecay_fksreal>]> 3.01861190796
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_cc_file>]> 0.0698401927948
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_gg_hh_QCD>]> 0.00105404853821
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_uuxuux>]> 0.00294399261475
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_gg_ng>]> 1.61963582039
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sm>]> 6.53617286682
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_put_parameters_to_zero>]> 0.0871658325195
@@ -63,21 +55,14 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_epem_elpelmepem>]> 0.0915629863739
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFVC>]> 0.0635468959808
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_group_channels2amplitudes>]> 0.346367835999
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_file_writers.FortranWriterTest testMethod=test_write_fortran_error>]> 0.000140190124512
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testsummultadd>]> 0.000198841094971
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_epem_ddx>]> 0.67814207077
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_interaction_list>]> 0.000237941741943
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fks_loonly>]> 3.13605904579
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_decay_chain_pp_jj>]> 0.284907102585
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_particle>]> 0.000303030014038
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.00014591217041
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000181913375854
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_matrix_element_fks_EW>]> 4.6968460083e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_e_e_collision>]> 36.1715919971
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_f_d_product>]> 0.00230002403259
@@ -86,12 +71,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_even_more_special_group_decay_chain>]> 0.344223976135
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_interaction>]> 0.000319004058838
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_no_fsr>]> 0.15252494812
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductlorentz>]> 0.00251793861389
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_basis_uux_aggg>]> 0.256009817123
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductlorentz>]> 0.00251793861389
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p1>]> 502.181219816
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarvar>]> 6.98566436768e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_process_init>]> 1.48353791237
@@ -102,13 +83,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setgetinit_correct>]> 0.111829996109
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_all_gg_gg>]> 0.0899338722229
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_gg_gg>]> 0.0423669815063
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_events_nlo_py6pt_fsr>]> 1.46954607964
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_writeMLparam>]> 0.00127387046814
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_ud_ggdu>]> 1.26658701897
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_0>]> 0.000486850738525
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_pythia8_output>]> 2.83663797379
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_remove_interactions>]> 0.0940480232239
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_gg_ttxg_QED>]> 0.0011260509491
@@ -116,22 +92,10 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_def_level>]> 8.58306884766e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_V>]> 0.000189065933228
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_wpwm_QED>]> 0.00110411643982
-<<<<<<< TREE
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_setget_matrix_element_exceptions>]> 0.00100207328796
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_lhe_parser.TESTLHEParser testMethod=test_read_write_gzip>]> 0.054230928421
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1xg_QCD>]> 167.044816017
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_short_ML5_sm_vs_stored_ML5>]> 148.365936041
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarint>]> 9.91821289062e-05
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_triplet_diquarks>]> 8.50123596191
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarint>]> 9.91821289062e-05
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_conjugate_index>]> 0.00273394584656
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_Tr_simplify>]> 0.000442028045654
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_representation>]> 0.000744104385376
@@ -158,13 +122,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_nexternal_file_EW>]> 0.000327110290527
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=testIO_check_html_long_process_strings>]> 26.8152999878
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_setget_process_correct>]> 0.000624895095825
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate_wronginput>]> 0.000245809555054
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_ddx_wpwmg>]> 29.0255608559
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddadd>]> 0.000109910964966
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_ddx_wpwmg>]> 29.0255608559
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=testIO_write_dec_multiprocess_files>]> 0.408844947815
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_zero_iden_couplings>]> 0.08682513237
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_export_v4.TestMadWeight testMethod=test_ungrouping_lepton>]> 0.0430071353912
@@ -222,11 +181,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massivecase>]> 0.000519037246704
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_lh_order>]> 0.000610113143921
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_gd>]> 2.84897994995
-<<<<<<< TREE
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_level_with_flipping_triangle>]> 0.00130605697632
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_file_EW>]> 0.000738143920898
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_representation>]> 0.389190196991
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_fortran>]> 0.0229299068451
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_different_order_process_symmetry>]> 0.120674848557
@@ -259,7 +213,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_projector>]> 0.00798106193542
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_fortranwriter_C>]> 0.0338780879974
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_ij_lines_EW>]> 0.0349681377411
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_F77writer_complex_mass_scheme>]> 0.0230450630188
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_props_file_born>]> 0.00461411476135
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_initial_setups>]> 0.125522851944
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_maxconfigs>]> 0.00495791435242
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_max_WEIGHTED>]> 0.000354051589966
@@ -275,12 +229,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_orders>]> 0.00100803375244
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_cross_gauge>]> 115.8441329
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_identical_parameters>]> 0.0867898464203
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testequality>]> 0.000180006027222
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testequality>]> 0.000180006027222
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_begin_end_wrong_input>]> 0.000144958496094
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_full_write>]> 0.0754480361938
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_sm_equivalence>]> 0.110821008682
@@ -289,22 +239,15 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization3>]> 0.000184774398804
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_sort_fks_proc>]> 0.163259029388
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures>]> 0.016254901886
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_F77writer_complex_mass_scheme>]> 0.0230450630188
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_pythia8_export_functions>]> 0.0397579669952
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_props_file_born>]> 0.00461411476135
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_python_export_functions>]> 0.0172030925751
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_leg_list>]> 0.000253915786743
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_IR>]> 0.0010769367218
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_notion_of_egality>]> 0.000488996505737
-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_help_category>]> 0.00062894821167
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_mssm1>]> 4.24386501312
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order1>]> 0.0381689071655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_8fs>]> 0.104753017426
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_colorize_uux_ggg>]> 0.0345070362091
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF3>]> 0.317361831665
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_matrix_element_v4_standalone>]> 0.0386159420013
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter>]> 0.0264060497284
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_complete_decay_chain_process>]> 0.748803853989
@@ -372,7 +315,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_dictionaries>]> 0.000564098358154
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_stop_decay>]> 0.01522397995
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_uuxddx_SplitOrders_vs_stored_ML5>]> 0.000785827636719
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_CT_vertices_generation_gg_gg>]> 1.53292918205
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_define_level>]> 0.000642061233521
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_ssx_azg>]> 30.228260994
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_setget_process_definition_exceptions>]> 0.000463008880615
@@ -409,11 +351,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_generate_events_nlo_py6pt_fsr>]> 40.1788899899
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_make_valid>]> 0.00246596336365
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFV2C1>]> 0.00976991653442
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp_output_consistency>]> 16.2466862202
-=======
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_mssm_equivalence>]> 4.6789290905
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_uuxa_QCD_QED>]> 0.00129103660583
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_sqso_udx_ddxgwp_QCDeq6_QEDeq4>]> 0.00180292129517
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_ppwy>]> 74.0841259956
@@ -429,26 +367,12 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_f_d_sum>]> 0.000365018844604
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_to_fks_leg_s>]> 0.00046181678772
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasintersection>]> 0.00135803222656
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hhh_EW>]> 179.770503998
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm3>]> 36.7921011448
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_load_feynman>]> 0.416143894196
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_handling_list_of_values>]> 0.000817060470581
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_handling_list_of_values>]> 0.000530958175659
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_4_e500>]> 21.2130401134
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingOption testMethod=test_option_6g_second>]> 0.0498158931732
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_model_name>]> 0.19921207428
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000181913375854
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.00014591217041
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_e_p_collision>]> 21.8384239674
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_inverse_pid_for_type>]> 0.000257968902588
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_misc.TEST_misc testMethod=test_equal>]> 0.000149965286255
@@ -466,6 +390,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummulvar>]> 0.000131845474243
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_change_number_format_python>]> 0.000586986541748
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_singletop_fastjet>]> 140.989368916
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt_with_subprocess_group>]> 0.0958831310272
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection_failure>]> 0.000155925750732
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_mssm_subset_creation>]> 0.190835952759
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_process>]> 1.05374503136
@@ -475,11 +400,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_aa_ttx_EW>]> 12.4905250072
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOExportMadLoopUnitTest testMethod=testIO_ProcOutputIOTests>]> 8.39789509773
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uux_uuxuux>]> 0.461228847504
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCALLWriterComplexMass testMethod=test_UFO_Python_helas_call_writer>]> 0.197067022324
-=======
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_split_evt_gen>]> 82.7131781578
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_ppwy>]> 41.3791599274
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_python_export_functions>]> 0.0172030925751
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_Pslashproperty>]> 0.0238058567047
@@ -492,7 +415,6 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_hh_hh_QED>]> 0.00143194198608
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_ZPZZ>]> 0.0636489391327
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_gluons>]> 0.00796890258789
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmbbx>]> 61.837485075
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_ppzjj>]> 100.601984024
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_parse_to_cpp>]> 0.0238230228424
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_gauge_loop_p1>]> 427.859879017
@@ -514,15 +436,10 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testsetrepresentation>]> 0.00259184837341
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_hh_hhh_QED>]> 0.00109815597534
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_setup_particles>]> 0.195822954178
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00016188621521
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_read>]> 0.000303030014038
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.HelasModelTest testMethod=test_setget_helas_model_correct>]> 0.00146913528442
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorSextetModel testMethod=test_uu_to_six_g>]> 0.172813892365
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00016188621521
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_fixed_indices>]> 0.000831842422485
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.TestDiagramTag testMethod=test_reorder_permutation>]> 0.0726900100708
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_group_subprocess>]> 68.4718120098
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_amcatnlo_from_file>]> 35.7223939896
@@ -544,13 +461,8 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_ppgogo_nlo>]> 76.1395959854
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testbasicoperation>]> 0.000213861465454
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_add_ab_interaction>]> 0.129942893982
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_Tr_pair_simplify>]> 0.000292062759399
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testeinsteinsum2>]> 0.00269603729248
-=======
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_reweight>]> 17.0126521587
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T_simplify>]> 0.000298023223877
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_mparticles>]> 0.00264000892639
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_Plorentz>]> 0.0568020343781
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_fks_info_file>]> 0.0162961483002
@@ -566,12 +478,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.000133991241455
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_den_factor_lines_EW>]> 2.82828497887
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell1 testMethod=test_import_model>]> 0.106930971146
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testgetrepresentation>]> 0.002366065979
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_representation>]> 5.91278076172e-05
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testgetrepresentation>]> 0.002366065979
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.TestModelCreation testMethod=test_all>]> 0.951196908951
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_epsilon_object>]> 0.000172138214111
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFV>]> 0.10179400444
@@ -596,12 +504,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Fortranwriter_spin3half>]> 0.154531002045
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_wa_refine>]> 11.0905270576
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_cpp>]> 0.000547170639038
-<<<<<<< TREE
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_Fortranwriter_spin3half>]> 0.141327142715
->>>>>>> MERGE-SOURCE
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nfksconfigs_file>]> 0.0158369541168
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_ref_dict_multiple_interactions>]> 0.000741004943848
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=test_short_power>]> 0.000148057937622
@@ -611,20 +514,11 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultmul>]> 0.000133991241455
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hh_EW>]> 13.6150200367
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcantlo_script>]> 46.4756779671
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_enu_enu>]> 0.008131980896
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_coeff_string>]> 0.028568983078
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct_MP>]> 0.0654561519623
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_short_gauge_loop>]> 37.5182161331
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_values_for_prop>]> 0.110687971115
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000126123428345
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_base_amplitude>]> 0.140361070633
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_sum_object>]> 0.000658988952637
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_standard>]> 3.79085540771e-05
@@ -634,25 +528,19 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_4g_decay_chain_process>]> 0.395421028137
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_error_particle_save>]> 4.19616699219e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uu_susug>]> 0.0533299446106
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_define_order>]> 0.214026927948
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_reset_decaywidth>]> 0.13299202919
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_python_routine_are_exec>]> 0.00516891479492
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_histograms.IOTest_Histogram testMethod=testIO_gnuplot_histo_output>]> 0.224948883057
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF3>]> 0.325031042099
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_epem_sepsemepem>]> 0.074609041214
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_get_max_level>]> 0.132587909698
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp>]> 0.000180959701538
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj>]> 0.145397901535
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_read_particles>]> 0.000508069992065
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest2 testMethod=test_change_to_complex_mass_scheme>]> 0.152688980103
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_launch_amcatnlo_name>]> 49.5285630226
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_cms_aem_emvevex>]> 0.289308071136
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_custom_propa>]> 1.53734087944
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_particle_save>]> 0.000370025634766
@@ -670,7 +558,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_Python_helas_call_writer>]> 0.0118069648743
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testspinsum>]> 0.00285291671753
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp>]> 12.2329871655
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testsummultadd>]> 0.000198841094971
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_epem_ddx>]> 0.67814207077
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_udx_htbx>]> 12.6998720169
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghgg_gghg>]> 0.115737915039
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWW>]> 0.0192968845367
@@ -696,44 +584,24 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_aa_wpwm_EW>]> 14.6227889061
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_ddxuux_split_orders>]> 4.17919182777
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_uuddg_uudd>]> 0.0242109298706
-<<<<<<< TREE
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrappedWithReturnPath>]> 0.00258612632751
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hw6_analyse>]> 0.000184059143066
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_representation>]> 0.00148892402649
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF>]> 0.00619888305664
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_complex_equality>]> 0.453453063965
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_gg_ggg>]> 0.137652873993
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization4>]> 0.000862836837769
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_expand_list>]> 0.00167798995972
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testEinsteinsum>]> 0.00298190116882
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testEinsteinsum>]> 0.00415802001953
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_epem_EW>]> 7.10565686226
-=======
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_calculate_xsect_script>]> 54.8990449905
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_info_str_error>]> 0.0325899124146
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testEinsteinsum>]> 0.00415802001953
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_histograms.TestHistograms testMethod=test_histograms_operations>]> 0.181525945663
-<<<<<<< TREE
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00219416618347
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sqso1>]> 0.000553131103516
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductspin>]> 0.070338010788
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_shower_scripts>]> 107.744693995
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_f_object>]> 0.000140905380249
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter>]> 0.0236639976501
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_permutation.TestPermutation testMethod=test_all_permutation>]> 0.000955820083618
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testCAlgebraDefinition>]> 0.0397760868073
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_ddxwpduxgg_gdxwpuxgg>]> 1.28763198853
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testCAlgebraDefinition>]> 0.0397760868073
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_dec_multiprocess_files>]> 0.481742143631
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_helpers>]> 0.0438580513
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_22>]> 360.097683191
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_running_couplings>]> 7.48882603645
@@ -741,23 +609,13 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_epem_ttxa_EW>]> 46.6009709835
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_setget_process_exceptions>]> 0.000452041625977
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.ExportUFOModelPythia8Test testMethod=test_write_pythia8_parameter_files>]> 0.082643032074
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate>]> 0.00022292137146
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_0>]> 0.000486850738525
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvaradd>]> 9.3936920166e-05
-=======
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_lo>]> 26.0977950096
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_change_number_format_python>]> 0.000586986541748
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvaradd>]> 9.3936920166e-05
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_model_initialization>]> 0.000297069549561
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_has_symmetries>]> 0.000720024108887
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testlistindices>]> 0.00581979751587
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddadd>]> 0.000109910964966
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt_with_subprocess_group>]> 0.0958831310272
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_ufo_aloha>]> 1.4953649044
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_py6_stdhep>]> 107.259223938
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_decaytable_string>]> 0.357012033463
@@ -768,12 +626,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestExtendedCmd testMethod=test_the_exit_from_child_cmd>]> 0.000255107879639
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_other>]> 4.91142272949e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_set>]> 45.5628159046
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0103709697723
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.000159025192261
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0103709697723
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_born_fks>]> 0.057590007782
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups>]> 7.51800894737
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ddx>]> 2.72820210457
@@ -809,17 +663,13 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_hw6_set>]> 102.896171808
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_helas_diagrams_gg_gogo_go_tt1x_t_wpb>]> 0.0463981628418
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_find_vertexlist>]> 0.113565921783
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_script>]> 30.6620099545
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_ga_QCD_QED>]> 0.00132417678833
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_save_load>]> 1.68547606468
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramFDStructTest testMethod=test_gg_5gglgl_bubble_tag>]> 0.00427198410034
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_coeff_string>]> 0.0342230796814
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_script>]> 30.6620099545
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_13>]> 41.2373769283
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromPdirectory testMethod=test_run_fromP>]> 21.0784730911
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_attx>]> 40.257420063
@@ -838,7 +688,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testConjugateOperator>]> 0.0876400470734
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_replace>]> 0.000373125076294
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4IOTest testMethod=testIO_export_matrix_element_v4_madevent_group>]> 0.124577045441
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETag testMethod=test_identify_me_tag_qq_qqg>]> 0.144216060638
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_multiple_lorentz_subset>]> 0.0512928962708
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_export_matrix_element_python_madevent_group>]> 0.0395710468292
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj_with_required_s_channel>]> 0.195080041885
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFT2>]> 0.0807220935822
@@ -857,15 +707,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_fct>]> 0.220015048981
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_split>]> 0.00737619400024
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_file_EW>]> 5.29289245605e-05
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000127792358398
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000127792358398
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_modified_mssm_general>]> 8.70347595215
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_def_position>]> 0.000124931335449
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_sum_object>]> 0.000125885009766
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_F77writer_feynman>]> 0.027764081955
@@ -879,25 +723,14 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator3>]> 0.0653259754181
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_vertexlist>]> 1.92569303513
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_values_for_prop>]> 8.10623168945e-05
-<<<<<<< TREE
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zccx>]> 41.9109280109
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_loop_convert_diagram>]> 0.000792026519775
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zccx>]> 41.9109280109
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_loop_convert_diagram>]> 0.000792026519775
->>>>>>> MERGE-SOURCE
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zccx>]> 41.9109280109
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_loop_convert_diagram>]> 0.000792026519775
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_ug_ttxz>]> 0.11712884903
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_equality>]> 0.000420093536377
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddint>]> 9.20295715332e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0104720592499
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_real_process_init>]> 0.16713809967
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_generate_loop.TestGenerateLoopFKS testMethod=test_generate_virtuals_helas_matrix_element>]> 2.81991004944
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testequality>]> 0.000127077102661
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdMatchBox testMethod=testIO_MatchBoxOutput>]> 3.16356706619
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_get_fks_j_from_i_lines_EW>]> 7.70092010498e-05
@@ -912,25 +745,16 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testgetrepresentation>]> 0.00228095054626
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p3>]> 27.4707448483
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_matrix_element_fks>]> 0.0163419246674
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testsumaddint>]> 0.0001060962677
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_multi_gluons>]> 0.251565933228
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testsumaddint>]> 0.0001060962677
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_uu_uug>]> 0.0557870864868
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_equal_decay_chains>]> 0.134434938431
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_name>]> 66.2333741188
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_full_epem_ttx>]> 42.7599339485
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_helper_lcm_functions>]> 0.000735998153687
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarint>]> 6.48498535156e-05
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_full_lept>]> 29.0376198292
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_representation>]> 0.000728130340576
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_duxhuduxux_guxhuuxux>]> 1.03614902496
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_forbidden_s_channel_decay_chain>]> 0.0207369327545
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_sqso_ddx_ddx_WEIGHTEDgt6>]> 20.8691658974
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_vevex_epem_QED>]> 0.000979900360107
@@ -941,15 +765,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_ML_card>]> 0.0261669158936
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_export_fks.IOExportFKSTest testMethod=testIO_test_ppw_fksall>]> 8.56060409546
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_values_for_prop>]> 0.000351905822754
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_w_production_with_ms_decay>]> 56.5486888885
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_uuxng>]> 0.343585014343
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_generate_loop.TestGenerateLoopFKS testMethod=test_generate_virtuals_helas_matrix_element>]> 2.81991004944
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_define_not_dep_param>]> 0.0775101184845
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_writeMLparam>]> 0.00127387046814
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_name>]> 66.2333741188
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_multi_leg_list>]> 0.00020694732666
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_part_spin32propagator>]> 0.0181658267975
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization2>]> 0.000219821929932
@@ -960,30 +778,17 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_rambo_validity_check>]> 0.000271081924438
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_get_final_ids_after_decay>]> 0.000993013381958
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_particle_list>]> 0.000241994857788
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultmult>]> 0.000176906585693
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_ddxng>]> 0.179573059082
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxu_wpgg>]> 25.1864910126
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_ddxng>]> 0.179573059082
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_mparticles_EW>]> 4.60147857666e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_w_nlo_gen_gosam>]> 0.396389007568
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_cmd.TestInstall testMethod=test_configuration_file>]> 0.000146865844727
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_tdecay_fksreal>]> 3.07783889771
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_conjugate_index_majoranas>]> 0.00603890419006
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=test_short_split>]> 0.00639200210571
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_interaction_save>]> 0.000285148620605
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultadd_legacy>]> 0.000187873840332
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_nlo_py6pt_stdhep>]> 106.276311159
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_find_fks_j_from_i>]> 0.0350108146667
-=======
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_ppgogo_amcatnlo>]> 252.850306988
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultadd_legacy>]> 0.000187873840332
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_find_optimal_order>]> 0.190226793289
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_find_fks_j_from_i>]> 0.0350108146667
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_fortranwriter_C>]> 0.0298249721527
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_get_rank>]> 0.103627204895
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0196721553802
@@ -993,6 +798,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madspin_gridpack>]> 31.1755411625
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testTraceofObject>]> 0.000325918197632
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_h_file>]> 0.0427629947662
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1x_QCD>]> 69.1381390095
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_leshouche_sextet_diquarks>]> 2.94189381599
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_default>]> 0.000207901000977
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_input_string>]> 0.00074315071106
@@ -1010,23 +816,12 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_regular_expression_propa>]> 0.00087308883667
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator5>]> 0.182165145874
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_gauge_loop_p2>]> 3480.223248
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group_decay_chain>]> 8.28355312347
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_representation>]> 7.29560852051e-05
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxu_wpgg>]> 25.1864910126
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_C>]> 0.0504019260406
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_ttx_wpwm_EW>]> 20.03905797
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_couplings>]> 0.000503063201904
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrappedWithReturnPath>]> 0.00258612632751
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct>]> 0.000214099884033
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator>]> 0.128522157669
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_w_nlo_gen>]> 0.38791513443
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct>]> 0.000214099884033
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_ue_dve>]> 0.00433206558228
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_parse_to_fortran>]> 0.0236949920654
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_file_writers.CPPWriterTest testMethod=test_write_cplusplus_error>]> 0.000188827514648
@@ -1049,13 +844,8 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_multiple_lorentz>]> 0.000393867492676
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_values_for_prop>]> 0.110687971115
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_get_fks_info_list>]> 0.993493080139
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_launch_amcatnlo_name>]> 49.5285630226
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_fortran>]> 0.000572919845581
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_decay_width_nlo_model>]> 14.2313911915
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_gg_ttxh_EW>]> 60.816671133
@@ -1088,7 +878,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_2>]> 400.482264042
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_4_fermion>]> 0.0460660457611
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestRunCard testMethod=test_basic>]> 0.00432300567627
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testsummultint>]> 0.000155925750732
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingOption testMethod=test_option_6g_second>]> 0.0498158931732
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETag testMethod=test_non_identify_me_tag_qq_qqg>]> 0.221249103546
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFONoSideEffect testMethod=test_ImportUFONoSideEffectLO>]> 0.0163459777832
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_setget_interaction_correct>]> 0.000202894210815
@@ -1099,12 +889,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_UFOExpressionParserPythonIF>]> 0.0719270706177
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_stdhep>]> 50.4594700336
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_fuse_vertex>]> 0.000200033187866
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmbbx>]> 61.837485075
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1x_QCD>]> 69.1381390095
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_def_begin_end_point>]> 9.89437103271e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator>]> 0.128522157669
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestMadSpinFCT_in_interface testMethod=test_get_final_part>]> 0.12849187851
@@ -1118,7 +903,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8_analyse>]> 0.000602960586548
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_ppgogo_amcatnlo>]> 252.850306988
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_butdg_butd>]> 0.0965809822083
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_full_lept>]> 29.0376198292
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_comparison>]> 0.225214958191
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_interaction>]> 0.000797033309937
@@ -1144,20 +929,11 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_den_factor_lines>]> 2.02332401276
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_flipping>]> 0.0031681060791
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_eventsnlo_py6pt_fsr>]> 16.2141349316
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_file_EW>]> 0.000738143920898
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_MP_mode>]> 0.0349721908569
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin32propagator>]> 0.208134174347
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000134944915771
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_configs_file_born_EW>]> 5.07831573486e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.00016713142395
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_add_ab_particle>]> 0.127122163773
@@ -1173,30 +949,15 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_aa_QED>]> 0.00227403640747
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_add_time_of_flight>]> 19.5163040161
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_nfksconfigs_file_EW>]> 0.0351588726044
-<<<<<<< TREE
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_special_group_decay_chain>]> 0.162132024765
->>>>>>> MERGE-SOURCE
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_output>]> 0.0474369525909
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator2>]> 0.152077913284
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_Fortranwriter_spin3half>]> 0.141327142715
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator3>]> 0.0580358505249
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_file>]> 0.00247812271118
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000146865844727
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_pdgs>]> 0.0846738815308
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000146865844727
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hwpp_set>]> 29.2329268456
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFONoSideEffect testMethod=test_ImportUFOcheckgoldstone>]> 0.0369899272919
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_setget_particle_correct>]> 0.000205039978027
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testscalarmanipulation>]> 0.000520944595337
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_representation>]> 0.000245809555054
@@ -1205,25 +966,15 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghg_ggh>]> 0.0988841056824
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_pmass_file>]> 0.00053882598877
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uxd_wmz_QED>]> 0.00210380554199
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_ud_ggdu>]> 1.26658701897
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testemptyisFalse>]> 5.00679016113e-05
-=======
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_events_nlo_py6pt_fsr>]> 1.46954607964
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testemptyisFalse>]> 5.00679016113e-05
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCALLWriterComplexMass testMethod=test_UFO_CPP_helas_call_writer>]> 0.197350025177
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_triplet_diquarks>]> 8.50123596191
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_colormultiplicity>]> 0.125108957291
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testIdentityMatrix>]> 0.0275120735168
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarvar>]> 8.98838043213e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_py6pt_stdhep>]> 58.9974210262
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_find_process_classes_and_mapping_diagrams>]> 3.02310013771
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testIdentityMatrix>]> 0.0275120735168
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarvar>]> 8.98838043213e-05
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_gogo_QCD>]> 122.287805796
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvaradd>]> 7.20024108887e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testsummultmul>]> 0.000190019607544
@@ -1232,18 +983,12 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_CT_vertices_generation_ddx_ddx>]> 0.930881977081
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_ddx_ddx>]> 3.87537407875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_d_object>]> 0.00014591217041
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_uuxng>]> 0.343585014343
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_split_leg>]> 0.00107002258301
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_nlo_py6_stdhep>]> 119.165311098
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testrsumvarvar>]> 7.60555267334e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_complex_conjugate>]> 8.20159912109e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_VVS>]> 0.0273261070251
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_special_group_decay_chain>]> 0.162132024765
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_4_fermion>]> 0.0415799617767
-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_madweight_card>]> 0.015398979187
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppz>]> 1.70217895508
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_OR>]> 0.00101685523987
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_setget_amplitude_correct>]> 0.00019097328186
@@ -1251,25 +996,15 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T_pair_simplify>]> 0.000263929367065
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_ppzz_in_RS>]> 5.40944194794
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_lh_order_EW>]> 0.000322818756104
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarint>]> 8.79764556885e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_profile_epem_ttx>]> 15.8373379707
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarint>]> 8.79764556885e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_LO_draw_with_NLO_generation>]> 0.695207118988
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestLorentzInvariance testMethod=test_boost_momenta>]> 5.30410599709
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_gluons>]> 0.0548150539398
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_complex_mass_SA>]> 1.51796483994
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=test_short_sumofLorentzObj>]> 0.00596499443054
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_fks_EW>]> 4.79221343994e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_python_routine_are_exec>]> 0.00470900535583
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_fks_EW>]> 4.79221343994e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_unused_decays_in_decay_chain_pp_jj>]> 0.199378967285
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin32propagator>]> 0.232930898666
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_splittings>]> 0.0126750469208
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_epem_ttxg_EW>]> 28.9463288784
@@ -1281,20 +1016,14 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_4_fermion>]> 0.0415799617767
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_setget_model_correct>]> 0.00034499168396
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_ddx_wpwmg>]> 26.4144010544
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_CT_vertices_generation_gg_gg>]> 1.53292918205
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWWA>]> 0.132983922958
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_pass_in_standard_name>]> 0.0025041103363
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_gg_ggg_EW>]> 46.1178190708
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization>]> 0.000458955764771
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testrsumvarvar>]> 9.29832458496e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductspin>]> 0.0698981285095
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm3>]> 36.7921011448
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testrsumvarvar>]> 9.29832458496e-05
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductspin>]> 0.0698981285095
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hhh_EW>]> 179.770503998
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_multi_amp_majorana_process>]> 0.00927495956421
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gg_ggg>]> 0.551722049713
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setgetinit_exceptions>]> 0.111714839935
@@ -1339,25 +1068,15 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_complex_mass_scheme>]> 0.02272605896
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massless>]> 0.000313997268677
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_insert_legs>]> 0.000980854034424
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.UFO_model_to_mg4_Test testMethod=test_case_sensitive>]> 0.122036933899
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_uuxuux>]> 0.00294399261475
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_help_generate_ab_amplitude>]> 0.233986139297
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.00019907951355
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_level_with_flipping_triangle>]> 0.00130605697632
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_mssm_equivalence>]> 4.6789290905
-=======
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultmult>]> 0.000176906585693
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_helper_lcm_functions>]> 0.000735998153687
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0128040313721
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_reorder_permutation>]> 5.41210174561e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000126123428345
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00191402435303
@@ -1371,29 +1090,17 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_legs_to_color_link_string>]> 0.00512909889221
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_sort_fksleglist>]> 0.00221490859985
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_I>]> 0.000235080718994
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_representation>]> 7.29560852051e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_real_me_wrapper_EW>]> 5.69820404053e-05
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testsumaddadd>]> 0.000117063522339
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator5>]> 0.182165145874
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_files.TestFilesGestion testMethod=test_is_uptodate>]> 1.0137488842
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization5>]> 0.00028395652771
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_particles_uux_uuxng>]> 0.0401759147644
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_initial_vertex_position>]> 0.000370979309082
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_loop_induced>]> 50.1276230812
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_duxhuduxux_guxhuuxux>]> 1.03614902496
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hw6_analyse>]> 0.000184059143066
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_representation>]> 0.000728130340576
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_helicity_states>]> 0.000174045562744
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_output_files.IOExportMadLoopAcceptanceTest testMethod=test_IOTests>]> 22.2488629818
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputIOTest testMethod=testIO_sqso_uux_uuxuuxx>]> 1.1301419735
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_append_remove>]> 0.000144958496094
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000118970870972
@@ -1425,7 +1132,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_line_orientation>]> 0.000136137008667
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_udxwpg_udxwp>]> 0.0118889808655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_values_for_prop>]> 0.000183820724487
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_ML5EW_sm_vs_stored_ML5EW_sqso>]> 0.00940799713135
+<__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_get_color_data_lines_from_color_matrix>]> 1.95838093758
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_epem_ddx>]> 25.6196660995
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_diagram_list_nice_string>]> 0.00311493873596
@@ -1433,17 +1140,10 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_info_str_error>]> 0.0325899124146
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6>]> 0.000173807144165
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_expand_veto>]> 0.00168204307556
-<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarvar>]> 6.89029693604e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestEvent testMethod=test_madspin_event>]> 0.00227999687195
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00219416618347
-=======
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_restrict_from_a_param_card>]> 0.106390953064
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_epem_sepsemepem>]> 0.074609041214
->>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testGammaAlgebraDefinition>]> 1.01560497284
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_flow_string_epsilon>]> 0.00355815887451
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_add_line>]> 0.000107049942017