Merge lp:~maddevelopers/mg5amcnlo/2.8.1.py3 into lp:mg5amcnlo/lts

[Olivier Mattelaer]

pass to 2.8.1

This is a pure bug fixing release.

Fixing mainly issue with python3 (comparison operator, model loading, model conversion,...)
It has also a couple of important bug fix like for the auto-width computation.

I would like to also include this "feature" branch as well (containing better support for FxFx)
lp:~maddevelopers/mg5amcnlo/2.8.1_fxfx
But I'm still waiting approval on that one.

Olivier

=== modified file 'MadSpin/interface_madspin.py'
--- MadSpin/interface_madspin.py	2020-08-20 15:33:24 +0000
+++ MadSpin/interface_madspin.py	2020-09-22 07:07:51 +0000
@@ -451,14 +451,6 @@
             except ValueError:
                 raise self.InvalidCmd('second argument should be a real number.')
         
-        elif args[0] == 'BW_effect':
-            if args[1] in [0, False,'.false.', 'F', 'f', 'False', 'no']:
-                args[1] = 0
-            elif args[1] in [1, True,'.true.', 'T', 't', 'True', 'yes']:
-                args[1] = 1
-            else:
-                raise self.InvalidCmd('second argument should be either T or F.')
-        
         elif args[0] == 'curr_dir':
             if not os.path.isdir(args[1]):
                 raise self.InvalidCmd('second argument should be a path to a existing directory')
@@ -499,8 +491,6 @@
             opts = list(self.options.keys()) + ['seed', "spinmode"]
             return self.list_completion(text, opts) 
         elif len(args) == 2:
-            if args[1] == 'BW_effect':
-                return self.list_completion(text, ['True', 'False']) 
             if args[1] == 'ms_dir':
                 return self.path_completion(text, '.', only_dirs = True)
         elif args[1] == 'ms_dir':
@@ -517,8 +507,6 @@
         print('')
         print('-- assign to a given option a given value')
         print('   - set max_weight VALUE: pre-define the maximum_weight for the reweighting')
-        print('   - set BW_effect True|False: [default:True] reshuffle the momenta to describe')
-        print('       corrrectly the Breit-Wigner of the decayed particle')
         print('   - set seed VALUE: fix the value of the seed to a given value.')
         print('       by default use the current time to set the seed. random number are')
         print('       generated by the python module random using the Mersenne Twister generator.')
 
=== modified file 'Template/LO/Source/dsample.f'
--- Template/LO/Source/dsample.f	2020-05-13 09:45:34 +0000
+++ Template/LO/Source/dsample.f	2020-09-22 07:07:51 +0000
@@ -453,6 +453,10 @@
       CUMULATED_TIMING = t_after - CUMULATED_TIMING
 
       if (N_EVALS.eq.0) then
+         write(outUnit,*) '<lo_statistics> '
+         write(outUnit,*) '<cumulated_time>'//trim(toStr_real(CUMULATED_TIMING))
+     &        //'</cumulated_time>'
+         write(outUnit,*) '</lo_statistics>'
         return
       endif
       
 
=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2020-08-21 08:59:01 +0000
+++ UpdateNotes.txt	2020-09-22 07:07:51 +0000
@@ -1,6 +1,13 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
 
+2.8.1(22/09/22):
+      OM: Fix for the auto width for three body decay in presence of identical particles.
+      OM: add support for __header__ in UFO model
+      OM: allow restriction card to have auto-width
+      OM: fixing some html link (removed ajax link forbidden by major web browser)
+      OM: Various fix related to the python3 support
+          - including more efficient model conversion method
 2.8.0 (21/08/20):
       OM: pass to python3 by default
       OM: For LO process, you can now set lpp1 and lpp2 to "4" for process with initial photon in order to get the
 
=== modified file 'VERSION'
--- VERSION	2020-08-21 08:59:01 +0000
+++ VERSION	2020-09-22 07:07:51 +0000
@@ -1,5 +1,5 @@
-version = 2.8.0
-date = 2020-08-21
+version = 2.8.1
+date = 2020-09-22
 
 
 
 
=== modified file 'bin/mg5_aMC'
--- bin/mg5_aMC	2020-06-21 18:48:13 +0000
+++ bin/mg5_aMC	2020-09-22 07:07:51 +0000
@@ -23,8 +23,15 @@
 
 import sys
 if  sys.version_info[1] < 7:
-    sys.exit('MadGraph5_aMC@NLO works only with python 2.7 or python 3.7 (and later).\n\
-               Please upgrate your version of python.')
+    if sys.version_info[0] ==2:
+        sys.exit("MadGraph5_aMC@NLO works only with python 2.7 or python 3.7 (and later).\n"+\
+              "  You are currently using Python2.%s. Please use a more recent version of Python." % sys.version_info[1])
+    if sys.version_info[1] ==3:
+        sys.exit("MadGraph5_aMC@NLO works only with python 2.7 or python 3.7 (and later).\n"+\
+              "  You are currently using Python 3.%i. So please upgrade your version of Python." % sys.version_info[1] +\
+              "  If you have python2.7 installed you need to run the code as\n"+\
+              "      python27 ./bin/mg5_aMC \n")
+
 try:
     import six
 except ImportError:
@@ -75,8 +82,12 @@
 import logging.config
 import madgraph.interface.coloring_logging
 
+if sys.version_info[0] ==2:
+    logging.warning("\033[91mpython2 support will be removed in last quarter 2021. If you use python2 due to issue with Python3, please report them on https://bugs.launchpad.net/mg5amcnlo\033[0m")
+
+
 if ' ' in os.getcwd():
-    logging.warning("Path does contains spaces. We advise that you change your current path to avoid to have space in the path.")
+    logging.warning("\033[91mPath does contains spaces. We advise that you change your current path to avoid to have space in the path.\033[0m")
 
 try: 
     import readline
 
=== modified file 'madgraph/interface/loop_interface.py'
--- madgraph/interface/loop_interface.py	2020-03-25 14:57:21 +0000
+++ madgraph/interface/loop_interface.py	2020-09-22 07:07:51 +0000
@@ -803,6 +803,7 @@
         """Generate an amplitude for a given process and add to
         existing amplitudes
         """
+
         args = self.split_arg(line)
         # Check the validity of the arguments
         self.check_add(args)
@@ -907,6 +908,7 @@
                       amp in myproc.get('amplitudes')])
             logger.info("Process generated in %0.3f s" % \
             (cpu_time2 - cpu_time1))
+            
 
 class LoopInterfaceWeb(mg_interface.CheckValidForCmdWeb, LoopInterface):
     pass
 
=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2020-06-21 18:48:13 +0000
+++ madgraph/interface/madevent_interface.py	2020-09-22 07:07:51 +0000
@@ -3422,6 +3422,9 @@
         self.nb_refine += 1
         args = self.split_arg(line)
         treshold=None
+               
+
+        
         for a in args:
             if a.startswith('--treshold='):
                 treshold = float(a.split('=',1)[1])
 
=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2020-08-20 15:33:24 +0000
+++ madgraph/interface/madgraph_interface.py	2020-09-22 07:07:51 +0000
@@ -3082,7 +3082,7 @@
         existing amplitudes
         or merge two model
         """
-
+        
         args = self.split_arg(line)
 
         
@@ -3183,47 +3183,51 @@
                 
 
             self._curr_proc_defs.append(myprocdef)
-            
-            # Negative coupling order contraints can be given on at most one
-            # coupling order (and either in squared orders or orders, not both)
-            if len([1 for val in list(myprocdef.get('orders').values())+\
-                          list(myprocdef.get('squared_orders').values()) if val<0])>1:
-                raise MadGraph5Error("Negative coupling order constraints"+\
-                  " can only be given on one type of coupling and either on"+\
-                               " squared orders or amplitude orders, not both.")
-
-            if myprocdef.get_ninitial() ==1 and  myprocdef.get('squared_orders'):
-                logger.warning('''Computation of interference term with decay is not 100% validated.  
-                Please check carefully your result.
-                One suggestion is also to compare the generation of your process with and without
-                set group_subprocesses True
-                (to write Before the generate command)
-                ''')
-
-            cpu_time1 = time.time()
-
-            # Generate processes
-            if self.options['group_subprocesses'] == 'Auto':
-                    collect_mirror_procs = True
-            else:
-                collect_mirror_procs = self.options['group_subprocesses']
-            ignore_six_quark_processes = \
-                           self.options['ignore_six_quark_processes'] if \
-                           "ignore_six_quark_processes" in self.options \
-                           else []
-
-            myproc = diagram_generation.MultiProcess(myprocdef,
-                                     collect_mirror_procs = collect_mirror_procs,
-                                     ignore_six_quark_processes = ignore_six_quark_processes,
-                                     optimize=optimize, diagram_filter=diagram_filter)
-
-
-            for amp in myproc.get('amplitudes'):
-                if amp not in self._curr_amps:
-                    self._curr_amps.append(amp)
-                elif warning_duplicate:
-                    raise self.InvalidCmd("Duplicate process %s found. Please check your processes." % \
-                                                amp.nice_string_processes())
+
+            try:
+                # Negative coupling order contraints can be given on at most one
+                # coupling order (and either in squared orders or orders, not both)
+                if len([1 for val in list(myprocdef.get('orders').values())+\
+                              list(myprocdef.get('squared_orders').values()) if val<0])>1:
+                    raise MadGraph5Error("Negative coupling order constraints"+\
+                      " can only be given on one type of coupling and either on"+\
+                                   " squared orders or amplitude orders, not both.")
+    
+                if myprocdef.get_ninitial() ==1 and  myprocdef.get('squared_orders'):
+                    logger.warning('''Computation of interference term with decay is not 100% validated.  
+                    Please check carefully your result.
+                    One suggestion is also to compare the generation of your process with and without
+                    set group_subprocesses True
+                    (to write Before the generate command)
+                    ''')
+    
+                cpu_time1 = time.time()
+    
+                # Generate processes
+                if self.options['group_subprocesses'] == 'Auto':
+                        collect_mirror_procs = True
+                else:
+                    collect_mirror_procs = self.options['group_subprocesses']
+                ignore_six_quark_processes = \
+                               self.options['ignore_six_quark_processes'] if \
+                               "ignore_six_quark_processes" in self.options \
+                               else []
+    
+                myproc = diagram_generation.MultiProcess(myprocdef,
+                                         collect_mirror_procs = collect_mirror_procs,
+                                         ignore_six_quark_processes = ignore_six_quark_processes,
+                                         optimize=optimize, diagram_filter=diagram_filter)
+    
+    
+                for amp in myproc.get('amplitudes'):
+                    if amp not in self._curr_amps:
+                        self._curr_amps.append(amp)
+                    elif warning_duplicate:
+                        raise self.InvalidCmd( "Duplicate process %s found. Please check your processes." % \
+                                                    amp.nice_string_processes())
+            except Exception:
+                self._curr_proc_defs.pop(-1)
+                raise
 
             # Reset _done_export, since we have new process
             self._done_export = False
@@ -3329,9 +3333,13 @@
         if answer != 'y':
             return 
         
-        #Object_library (.iteritems() -> .items())
+        #Object_library 
         text = open(pjoin(model_dir, 'object_library.py')).read()
+        #(.iteritems() -> .items())
         text = text.replace('.iteritems()', '.items()')
+        # raise UFOError, "" -> raise UFOError()
+        text = re.sub('raise (\w+)\s*,\s*["\']([^"]+)["\']',
+                      'raise \g<1>("\g<2>")', text)
         text = open(pjoin(model_dir, 'object_library.py'),'w').write(text)
         
         # write_param_card.dat -> copy the one of the sm model
@@ -5166,6 +5174,7 @@
 
         # Reset _done_export, since we have new process
         self._done_export = False
+        self._curr_proc_defs.append(myprocdef)
 
         cpu_time2 = time.time()
 
@@ -5372,20 +5381,20 @@
         string. Returns a ProcessDefinition."""
 
         # Start with process number (identified by "@") and overall orders
-        proc_number_pattern = re.compile("^(.+)@\s*(\d+)\s*((\w+\s*=\s*\d+\s*)*)$")
+        proc_number_pattern = re.compile("^(.+)@\s*(\d+)\s*((\w+\s*\<?=\s*\d+\s*)*)$")
         proc_number_re = proc_number_pattern.match(line)
         overall_orders = {}
         if proc_number_re:
             proc_number = int(proc_number_re.group(2))
             line = proc_number_re.group(1)
             if proc_number_re.group(3):
-                order_pattern = re.compile("^(.*?)\s*(\w+)\s*=\s*(\d+)\s*$")
+                order_pattern = re.compile("^(.*?)\s*(\w+)\s*\<?=\s*(\d+)\s*$")
                 order_line = proc_number_re.group(3)
                 order_re = order_pattern.match(order_line)
                 while order_re:
                     overall_orders[order_re.group(2)] = int(order_re.group(3))
                     order_line = order_re.group(1)
-                    order_re = order_pattern.match(order_line)                
+                    order_re = order_pattern.match(order_line)            
             logger.info(line)
             
 
@@ -6003,9 +6012,12 @@
             if six.PY3:
                 self.options['lhapdf_py3'] = pjoin(prefix,'lhapdf6_py3','bin', 'lhapdf-config')
                 self.exec_cmd('save options %s lhapdf_py3' % config_file)
+                self.options['lhapdf'] = self.options['lhapdf_py3']
             else:
                 self.options['lhapdf_py2'] = pjoin(prefix,'lhapdf6','bin', 'lhapdf-config')
                 self.exec_cmd('save options %s lhapdf_py2' % config_file)
+                self.options['lhapdf'] = self.options['lhapdf_py2']
+            
         elif tool == 'lhapdf5':
             self.options['lhapdf'] = pjoin(prefix,'lhapdf5','bin', 'lhapdf-config')
             self.exec_cmd('save options %s lhapdf' % config_file, printcmd=False, log=False)            
@@ -6801,7 +6813,7 @@
             data['last_check'] = time.time()
 
         #check if we need to update.
-        if time.time() - data['last_check'] < update_delay:
+        if time.time() - float(data['last_check']) < float(update_delay):
             return
 
         logger.info('Checking if MG5 is up-to-date... (takes up to %ss)' % timeout)
 
=== modified file 'madgraph/iolibs/export_fks.py'
--- madgraph/iolibs/export_fks.py	2020-08-20 15:33:24 +0000
+++ madgraph/iolibs/export_fks.py	2020-09-22 07:07:51 +0000
@@ -16,7 +16,6 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
-from distutils import dir_util
 import glob
 import logging
 import os
@@ -99,8 +98,8 @@
             logger.info('initialize a new directory: %s' % \
                         os.path.basename(dir_path))
             shutil.copytree(os.path.join(mgme_dir, 'Template', 'NLO'), dir_path, True)
-            # distutils.dir_util.copy_tree since dir_path already exists
-            dir_util.copy_tree(pjoin(self.mgme_dir, 'Template', 'Common'),dir_path)
+            # misc.copytree since dir_path already exists
+            misc.copytree(pjoin(self.mgme_dir, 'Template', 'Common'),dir_path)
             # Copy plot_card
             for card in ['plot_card']:
                 if os.path.isfile(pjoin(self.dir_path, 'Cards',card + '.dat')):
@@ -3396,8 +3395,8 @@
             logger.info('initialize a new directory: %s' % \
                         os.path.basename(dir_path))
             shutil.copytree(os.path.join(mgme_dir, 'Template', 'NLO'), dir_path, True)
-            # distutils.dir_util.copy_tree since dir_path already exists
-            dir_util.copy_tree(pjoin(self.mgme_dir, 'Template', 'Common'),
+            # misc.copytree since dir_path already exists
+            misc.copytree(pjoin(self.mgme_dir, 'Template', 'Common'),
                                dir_path)
             # Copy plot_card
             for card in ['plot_card']:
 
=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2020-08-20 15:33:24 +0000
+++ madgraph/iolibs/export_v4.py	2020-09-22 07:07:51 +0000
@@ -20,7 +20,6 @@
 
 import copy
 from six import StringIO
-from distutils import dir_util
 import itertools
 import fractions
 import glob
@@ -255,8 +254,8 @@
                         os.path.basename(self.dir_path))
             shutil.copytree(pjoin(self.mgme_dir, 'Template/LO'),
                             self.dir_path, True)
-            # distutils.dir_util.copy_tree since dir_path already exists
-            dir_util.copy_tree(pjoin(self.mgme_dir, 'Template/Common'), 
+            # misc.copytree since dir_path already exists
+            misc.copytree(pjoin(self.mgme_dir, 'Template/Common'), 
                                self.dir_path)
             # copy plot_card
             for card in ['plot_card']:
@@ -269,8 +268,8 @@
         elif os.getcwd() == os.path.realpath(self.dir_path):
             logger.info('working in local directory: %s' % \
                                                 os.path.realpath(self.dir_path))
-            # distutils.dir_util.copy_tree since dir_path already exists
-            dir_util.copy_tree(pjoin(self.mgme_dir, 'Template/LO'), 
+            # misc.copytree since dir_path already exists
+            misc.copytree(pjoin(self.mgme_dir, 'Template/LO'), 
                                self.dir_path)
 #            for name in misc.glob('Template/LO/*', self.mgme_dir):
 #                name = os.path.basename(name)
@@ -279,8 +278,8 @@
 #                    files.cp(filename, pjoin(self.dir_path,name))
 #                elif os.path.isdir(filename):
 #                     shutil.copytree(filename, pjoin(self.dir_path,name), True)
-            # distutils.dir_util.copy_tree since dir_path already exists
-            dir_util.copy_tree(pjoin(self.mgme_dir, 'Template/Common'), 
+            # misc.copytree since dir_path already exists
+            misc.copytree(pjoin(self.mgme_dir, 'Template/Common'), 
                                self.dir_path)
             # Copy plot_card
             for card in ['plot_card']:
@@ -903,7 +902,11 @@
         if hasattr(self, 'aloha_model'):
             aloha_model = self.aloha_model
         else:
-            aloha_model = create_aloha.AbstractALOHAModel(os.path.basename(model.get('modelpath')))
+            try:
+                with misc.MuteLogger(['madgraph.models'], [60]):
+                    aloha_model = create_aloha.AbstractALOHAModel(os.path.basename(model.get('modelpath')))
+            except ImportError:
+                aloha_model = create_aloha.AbstractALOHAModel(model.get('modelpath'))
         aloha_model.add_Lorentz_object(model.get('lorentz'))
 
         # Compute the subroutines
 
=== modified file 'madgraph/iolibs/group_subprocs.py'
--- madgraph/iolibs/group_subprocs.py	2020-08-20 15:33:24 +0000
+++ madgraph/iolibs/group_subprocs.py	2020-09-22 07:07:51 +0000
@@ -317,7 +317,7 @@
                "Need matrix elements to run find_mapping_diagrams"
 
         if max_tpropa == 0:
-            max_tpropa = base_objects.Vertex.max_tpropa
+            max_tpropa = int(base_objects.Vertex.max_tpropa)
         
         matrix_elements = self.get('matrix_elements')
         model = matrix_elements[0].get('processes')[0].get('model')
@@ -363,7 +363,7 @@
                                 max(diagram.get_vertex_leg_numbers()) > minvert:
                     diagram_maps[ime].append(0)
                     continue
-                if diagram.get_nb_t_channel() > max_tpropa:
+                if diagram.get_nb_t_channel() > int(max_tpropa):
                     diagram_maps[ime].append(0)
                     continue
                 # Create the equivalent diagram, in the format
 
=== modified file 'madgraph/madevent/gen_crossxhtml.py'
--- madgraph/madevent/gen_crossxhtml.py	2020-06-21 18:48:13 +0000
+++ madgraph/madevent/gen_crossxhtml.py	2020-09-22 07:07:51 +0000
@@ -68,19 +68,6 @@
   }
   return http.status!=404;
 }
-function check_link(url,alt, id){
-    var obj = document.getElementById(id);
-    if ( ! UrlExists(url)){
-       if ( ! UrlExists(alt)){
-         obj.href = url;
-         return 1==1;
-        }
-       obj.href = alt;
-       return 1 == 2;
-    }
-    obj.href = url;
-    return 1==1;
-}
 </script>    
     <H2 align=center> Results in the %(model)s for %(process)s </H2> 
     <HR>
@@ -1014,14 +1001,16 @@
     def special_link(self, link, level, name):
         
         id = '%s_%s_%s_%s' % (self['run_name'],self['tag'], level, name)
-        
-        return " <a  id='%(id)s' href='%(link)s.gz' onClick=\"check_link('%(link)s.gz','%(link)s','%(id)s')\">%(name)s</a>" \
+        return " <a  id='%(id)s' href='%(link)s.gz'>%(name)s</a>" \
               % {'link': link, 'id': id, 'name':name}
+        #return " <a  id='%(id)s' href='%(link)s.gz' onClick=\"check_link('%(link)s.gz','%(link)s','%(id)s')\">%(name)s</a>" \
+        #      % {'link': link, 'id': id, 'name':name}
     
     def double_link(self, link1, link2, name, id):
-        
-         return " <a  id='%(id)s' href='%(link1)s' onClick=\"check_link('%(link1)s','%(link2)s','%(id)s')\">%(name)s</a>" \
-              % {'link1': link1, 'link2':link2, 'id': id, 'name':name}       
+        return " <a  id='%(id)s' href='%(link2)s'>%(name)s</a>" \
+              % {'link1': link1, 'link2':link2, 'id': id, 'name':name}
+        #return " <a  id='%(id)s' href='%(link2)s' onClick=\"check_link('%(link1)s','%(link2)s','%(id)s')\">%(name)s</a>" \
+        #      % {'link1': link1, 'link2':link2, 'id': id, 'name':name}       
         
     def get_links(self, level):
         """ Get the links for a given level"""
 
=== modified file 'madgraph/madevent/gen_ximprove.py'
--- madgraph/madevent/gen_ximprove.py	2020-06-21 18:48:13 +0000
+++ madgraph/madevent/gen_ximprove.py	2020-09-22 07:07:51 +0000
@@ -993,7 +993,7 @@
         f.close()
     
     def increase_precision(self, rate=3):
-        misc.sprint(rate)
+        #misc.sprint(rate)
         if rate < 3:
             self.max_event_in_iter = 20000
             self.min_events = 7500
 
=== modified file 'madgraph/madevent/sum_html.py'
--- madgraph/madevent/sum_html.py	2019-06-27 12:17:38 +0000
+++ madgraph/madevent/sum_html.py	2020-09-22 07:07:51 +0000
@@ -270,7 +270,7 @@
                           # this can happen if we force maxweight
         self.th_nunwgt = 0 # associated number of event with th_maxwgt 
                            #(this is theoretical do not correspond to a number of written event)
-
+        self.timing = 0
         return
     
     #@cluster.multiple_try(nb_try=5,sleep=20)
@@ -286,7 +286,7 @@
         
         i=0
         found_xsec_line = False
-        for line in finput:            
+        for line in finput:           
             # Exit as soon as we hit the xml part. Not elegant, but the part
             # below should eventually be xml anyway.
             if '<' in line:
@@ -347,7 +347,7 @@
             xml.append(line)
 
         if xml:
-            self.parse_xml_results('\n'.join(xml))        
+            self.parse_xml_results('\n'.join(xml))       
         
         # this is for amcatnlo: the number of events has to be read from another file
         if self.nevents == 0 and self.nunwgt == 0 and isinstance(filepath, str) and \
@@ -368,6 +368,12 @@
                 self.run_statistics.load_statistics(statistics_node[0])
             except ValueError as IndexError:
                 logger.warning('Fail to read run statistics from results.dat')
+        else:
+            lo_statistics_node = dom.getElementsByTagName("lo_statistics")[0]
+            timing = lo_statistics_node.getElementsByTagName('cumulated_time')[0]
+            timing= timing.firstChild.nodeValue
+            self.timing = 0.3 + float(timing) #0.3 is the typical latency of bash script/...
+
 
     def set_mfactor(self, value):
         self.mfactor = int(value)
@@ -448,6 +454,7 @@
         self.nunwgt = sum([one.nunwgt for one in self])  
         self.wgt = 0
         self.luminosity = min([0]+[one.luminosity for one in self])
+        self.timing = sum([one.timing for one in self])
         if update_statistics:
             self.run_statistics.aggregate_statistics([_.run_statistics for _ in self])
 
@@ -463,6 +470,7 @@
         self.xsec = sum([one.xsec for one in self]) /nbjobs
         self.xerrc = sum([one.xerrc for one in self]) /nbjobs
         self.xerru = math.sqrt(sum([one.xerru**2 for one in self])) /nbjobs
+        self.timing = sum([one.timing for one in self]) #no average here 
         if error:
             self.xerrc = error
             self.xerru = error
@@ -547,7 +555,7 @@
     table_line_template = \
 """
 <tr><td align=right>%(P_title)s</td>
-    <td align=right><a id="%(P_link)s" href=%(P_link)s onClick="check_link('%(P_link)s','%(mod_P_link)s','%(P_link)s')"> %(cross)s </a> </td>
+    <td align=right><a id="%(P_link)s" href=%(P_link)s > %(cross)s </a> </td>
     <td align=right>  %(error)s</td>
     <td align=right>  %(events)s</td>
     <td align=right>  %(unweighted)s</td>
@@ -672,6 +680,10 @@
             line = '%s %s %s %s %s %s\n' % (i+1, self.ysec_iter[i], self.yerr_iter[i], 
                       self.eff_iter[i], self.maxwgt_iter[i], self.yasec_iter[i]) 
             fsock.writelines(line)
+
+        if self.timing:
+            text = """<lo_statistics>\n<cumulated_time> %s </cumulated_time>\n</lo_statistics>"""
+            fsock.writelines(text % self.timing)
         
 
 
@@ -694,19 +706,6 @@
   }
   return http.status!=404;
 }
-function check_link(url,alt, id){
-    var obj = document.getElementById(id);
-    if ( ! UrlExists(url)){
-        if ( ! UrlExists(alt)){
-         obj.href = alt;
-         return true;
-        }
-       obj.href = alt;
-       return false;
-    }
-    obj.href = url;
-    return 1==1;
-}
 </script>
 """ 
 
@@ -716,7 +715,6 @@
     run = cmd.results.current['run_name']
     all = Combine_results(run)
 
-    
     for Pdir in cmd.get_Pdir():
         P_comb = Combine_results(Pdir)
         
@@ -759,7 +757,13 @@
         all.append(P_comb)
     all.compute_values()
 
-
+    try:
+        all_channels = sum([list(P) for P in all],[])
+        timings = sum(x.timing for x in all_channels)
+        logger.info('sum of cpu time of last step: %s', misc.format_time(timings))
+    except Exception as error:
+        logger.debug(str(error))
+        pass
 
     return all
 
 
=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2020-08-21 08:59:01 +0000
+++ madgraph/various/banner.py	2020-09-22 07:07:51 +0000
@@ -3259,6 +3259,21 @@
         if abs(self['lpp1']) in [2, 3,4] and abs(self['lpp2']) in [2, 3,4] and not self['fixed_fac_scale']:
             raise InvalidRunCard("Having both beam in elastic photon mode requires fixec_fac_scale to be on True [since this is use as cutoff]")
 
+        # check that ebeam is bigger than the associated mass.
+        for i in [1,2]:
+            if self['lpp%s' % i ] not in [1,2]:
+                continue
+            if self['mass_ion%i' % i] == -1:
+                if self['ebeam%i' % i] < 0.938:
+                    if self['ebeam%i' %i] == 0:
+                        logger.warning("At rest proton mode set: Energy beam set to 0.938")
+                        self.set('ebeam%i' %i, 0.938)
+                    else:
+                        raise InvalidRunCard("Energy for beam %i lower than proton mass. Please fix this")    
+            elif self['ebeam%i' % i] < self['mass_ion%i' % i]:    
+                if self['ebeam%i' %i] == 0:
+                    logger.warning("At rest ion mode set: Energy beam set to %s" % self['mass_ion%i' % i])
+                    self.set('ebeam%i' %i, self['mass_ion%i' % i])
 
     def update_system_parameter_for_include(self):
         
@@ -4241,6 +4256,19 @@
                 raise InvalidRunCard("'rw_fscale' has two or more identical entries. They have to be all different for the code to work correctly.")
 
 
+        # check that ebeam is bigger than the proton mass.
+        for i in [1,2]:
+            if self['lpp%s' % i ] not in [1,2]:
+                continue
+
+            if self['ebeam%i' % i] < 0.938:
+                if self['ebeam%i' %i] == 0:
+                    logger.warning("At rest proton mode set: Energy beam set to 0.938")
+                    self.set('ebeam%i' %i, 0.938)
+                else:
+                    raise InvalidRunCard("Energy for beam %i lower than proton mass. Please fix this")    
+
+
     def update_system_parameter_for_include(self):
         
         # set the pdg_for_cut fortran parameter
 
=== modified file 'madgraph/various/lhe_parser.py'
--- madgraph/various/lhe_parser.py	2020-06-21 18:48:13 +0000
+++ madgraph/various/lhe_parser.py	2020-09-22 07:07:51 +0000
@@ -2227,6 +2227,8 @@
         
         if other is None:
             return False
+        if len(self) != len(other):
+            return False
         
         for i,p in enumerate(self):
             if p.E != other[i].E:
 
=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2020-06-21 18:48:13 +0000
+++ madgraph/various/misc.py	2020-09-22 07:07:51 +0000
@@ -27,6 +27,7 @@
 import optparse
 import time
 import shutil
+import stat
 import traceback
 import gzip as ziplib
 from distutils.version import LooseVersion, StrictVersion
@@ -939,6 +940,35 @@
         
     str_out = out.stdout.read().decode().strip()
     return str_out
+
+
+
+def copytree(src, dst, symlinks = False, ignore = None):
+  if not os.path.exists(dst):
+    os.makedirs(dst)
+    shutil.copystat(src, dst)
+  lst = os.listdir(src)
+  if ignore:
+    excl = ignore(src, lst)
+    lst = [x for x in lst if x not in excl]
+  for item in lst:
+    s = os.path.join(src, item)
+    d = os.path.join(dst, item)
+    if symlinks and os.path.islink(s):
+      if os.path.lexists(d):
+        os.remove(d)
+      os.symlink(os.readlink(s), d)
+      try:
+        st = os.lstat(s)
+        mode = stat.S_IMODE(st.st_mode)
+        os.lchmod(d, mode)
+      except:
+        pass # lchmod not available
+    elif os.path.isdir(s):
+      copytree(s, d, symlinks, ignore)
+    else:
+      shutil.copy2(s, d)
+
     
 
 @multiple_try()
 
=== modified file 'mg5decay/decay_objects.py'
--- mg5decay/decay_objects.py	2020-08-20 15:33:24 +0000
+++ mg5decay/decay_objects.py	2020-09-22 07:07:51 +0000
@@ -43,6 +43,7 @@
 from __future__ import print_function
 import array
 import cmath
+import collections
 import copy
 import itertools
 import logging
@@ -1034,6 +1035,7 @@
 
         # Group channels into amplitudes
         self.group_channels_2_amplitudes(clevel, model, min_br)
+
         
 
     def connect_channel_vertex(self, sub_channel, index, vertex, model):
@@ -1170,7 +1172,11 @@
                 # Do not include the first leg (initial id)
                 if sorted([l.get('id') for l in amplt['process']['legs'][1:]])\
                         == final_pid:
-                    amplt.add_std_diagram(channel)
+                    
+                    for symchan in channel.get_symmetric_channel():
+                        amplt.add_std_diagram(symchan)
+                    
+                    
                     found = True
                     break
 
@@ -1766,6 +1772,7 @@
         interaction = self.get('interaction_dict')[vertex['id']]
         decay_parts = [p for p in interaction['particles']]
         
+        # avoid self decay
         if len([1 for p in decay_parts if abs(p['pdg_code'])==abs(initpart['pdg_code'])]) >1:
             self['invalid_Npoint'].append(vertex['id'])
             return False
@@ -1808,15 +1815,23 @@
                 
                 #check that all substructure are valid
                 #remove if any radiation and two times the same particle in a vertex
+                # 2020: relaxed to avoid only twice initial particle in the vertex
                 for v in proc['vertices']:
                     if any([get_mass(l)==0 for l in v.get('legs')]):
                         self['invalid_Npoint'].append(vertex['id'])
                         return False
-
-                    ids = set(abs(l['id']) for l in v.get('legs'))
-                    if len(ids) != len(vertex.get('legs')):
+                    init_pdg = [l['id'] for l in v.get('legs') if l['number'] ==1][0]
+                    nb_part = [1 for l in v.get('legs') if abs(l['id']) in [abs(init_pdg), abs(initpart.get('pdg_code'))]]
+                    if len(nb_part) > 1:
                         self['invalid_Npoint'].append(vertex['id'])
                         return False
+                    
+                    # before relaxation it was 
+                    #    seems to me to be always False
+                    #ids = set(abs(l['id']) for l in v.get('legs'))
+                    #if len(ids) != len(vertex.get('legs')):
+                    #    self['invalid_Npoint'].append(vertex['id'])
+                    #    return False
 
                 # check onshell/offshell status                
                 prev_mass = 0
@@ -3376,6 +3391,85 @@
         self['fermionfactor'] = 1
         
 
+    def get_symmetric_channel(self, ignore=[]):
+        
+        if self['s_factor'] == 1:
+            return [self]
+        elif len(self['vertices']) == 1:
+            return [self]
+        elif len(self['final_legs']) == len(set(l['id'] for l in self['final_legs'])):
+            return [self]
+
+        # check if all symetry are already handle:
+        if len(set(l['id'] for l in self['final_legs'] if l['id'] not in ignore)) ==\
+           len([   l['id'] for l in self['final_legs'] if l['id'] not in ignore]):
+            return [self]
+        
+        nb_id = collections.defaultdict(int)
+        for l in self['final_legs']:
+            nb_id[l['id']] += 1
+        
+        id_to_handle = [id for id in nb_id if nb_id[id] > 1 and id not in ignore]
+        
+        handling = id_to_handle[0]
+        remain_id = id_to_handle[1:]
+        out = []
+        
+        numbers = [l.get('number') for l in self['final_legs'] if l.get('id') == handling]
+        
+        for new_numbers in itertools.permutations(numbers):
+            mapping_id = dict([(o,n) for o,n in zip(numbers, new_numbers) if o!=n])        
+            if not mapping_id:
+                out.append(self)
+                continue
+            channel = copy.copy(self)
+            channel['vertices'] = base_objects.VertexList()
+                    # (real) DiagramTag
+            channel['tag'] = []
+            # IdentifyHelasTag
+            channel['helastag'] = []
+            # the number of the corresponding helas calls
+            channel['helas_number'] = None
+            # diagram written by IdentifyHelasTag
+            channel['std_diagram'] = None
+            for l,vertex in enumerate(self['vertices']):
+                new_vertex = copy.copy(vertex)
+                new_vertex['legs'] = base_objects.LegList()
+                min_id = 99
+                for leg in vertex['legs']:
+                    if leg['number'] in mapping_id:
+                        new_leg = copy.copy(leg)
+                        new_leg.set('number', mapping_id[leg['number']])
+                        new_vertex['legs'].append(new_leg)
+                    else:
+                        new_vertex['legs'].append(leg)
+                    min_id = min(min_id, leg['number'])
+                    
+                if min_id != new_vertex['legs'][-1]['number']:
+                    if l != len(self['vertices']) -1:
+                        mapping_id[new_vertex['legs'][-1]['number']] = min_id
+                        new_vertex['legs'][-1]['number'] = min_id
+                channel['vertices'].append(new_vertex)
+            out.append(channel)
+                        
+        
+        # do the recursion
+        if len(remain_id) > 1:
+            all_out = []
+            for d in out:
+                all_out += d.get_symmetric_channel(ignore=ignore)
+            return all_out
+        else:
+            return out
+        
+    
+        
+        
+
+    
+        
+
+
     def filter(self, name, value):
         """Filter for valid diagram property values."""
         
@@ -3494,6 +3588,7 @@
                     tmp.sort()
                     if base == tmp:
                         return False
+
         return True
             
 
@@ -4373,6 +4468,7 @@
             # of list.
             if count != 1:
                 self['s_factor'] = self['s_factor'] * math.factorial(count)
+                
             return math.sqrt((M ** 2+mass_list[0] ** 2-mass_list[1] ** 2) ** 2-\
                                  (2* M *mass_list[0]) ** 2)* \
                                  1./(8*math.pi*(M ** 2)*self['s_factor'])
@@ -4664,7 +4760,6 @@
         non_std_numbers = [(l.get('id'),l.get('number')) \
                                for l in new_dia.get_final_legs()]
 
-
         # initial leg
         non_std_numbers.append((new_dia.get_initial_id(model), 1))
         import operator
@@ -4680,7 +4775,6 @@
         if non_std_numbers == std_numbers:
             self['diagrams'].append(new_dia)
             return
-
         # Conversion from non_std_number to std_number
         converted_dict = dict([(num[1], std_numbers[i][1])\
                                    for i, num in enumerate(non_std_numbers)])
@@ -4728,6 +4822,7 @@
 
         # Add this standard diagram into diagrams
         self['diagrams'].append(new_dia)
+        
 
 
     def reset_width_br(self):
 
=== modified file 'models/__init__.py'
--- models/__init__.py	2020-02-11 10:57:44 +0000
+++ models/__init__.py	2020-09-22 07:07:51 +0000
@@ -43,14 +43,15 @@
             return sys.modules[model_pos]
         except Exception as error:
             pass
-        for p in os.environ['PYTHONPATH'].split(':'):
-            new_name = os.path.join(p, name)
-            try:
-                return load_model(new_name, decay)
-            except Exception:
-                pass
-            except ImportError:
-                pass
+        if 'PYTHONPATH' in os.environ:
+            for p in os.environ['PYTHONPATH'].split(':'):
+                new_name = os.path.join(p, name)
+                try:
+                    return load_model(new_name, decay)
+                except Exception:
+                    pass
+                except ImportError:
+                    pass
     elif path_split[-1] in sys.modules:
         model_path = os.path.realpath(os.sep.join(path_split))
         sys_path = os.path.realpath(os.path.dirname(sys.modules[path_split[-1]].__file__))
 
=== modified file 'models/check_param_card.py'
--- models/check_param_card.py	2019-04-17 18:52:07 +0000
+++ models/check_param_card.py	2020-09-22 07:07:51 +0000
@@ -1323,7 +1323,7 @@
                             logger.log(log,'For model consistency, update %s with id %s to value %s',
                                         (block, id, 1.0), '$MG:BOLD')                            
                         elif log:
-                            logger.log(log,'For model consistency, update %s with id %s to value %s',
+                            logger.log(log,'For model consistency, update %s with id %s to value %s' %
                                         (block, id, 1.0))
 
         
 
=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2020-02-27 13:38:00 +0000
+++ models/import_ufo.py	2020-09-22 07:07:51 +0000
@@ -18,6 +18,7 @@
 import collections
 import fractions
 import logging
+import math
 import os
 import re
 import sys
@@ -445,10 +446,27 @@
 
     def __init__(self, model, auto=False):
         """ initialize empty list for particles/interactions """
-       
-        if hasattr(model, '__arxiv__'):
-            logger.info('Please cite %s when using this model', model.__arxiv__, '$MG:color:BLACK')
-       
+
+        if hasattr(model, '__header__'):
+            header = model.__header__
+            if len(header) > 500 or header.count('\n') > 5:
+                logger.debug("Too long header")
+            else:
+                logger.info("\n"+header)
+        else:
+            f =collections.defaultdict(lambda : 'n/a')
+            for key in ['author', 'version', 'email', 'arxiv']:
+                if hasattr(model, '__%s__' % key):
+                    val = getattr(model, '__%s__' % key)
+                    if 'Duhr' in val:
+                        continue
+                    f[key] = getattr(model, '__%s__' % key)
+                    
+            if len(f)>2:
+                logger.info("This model [version %(version)s] is provided by %(author)s (email: %(email)s). Please cite %(arxiv)s" % f, '$MG:color:BLACK')
+            elif hasattr(model, '__arxiv__'):
+                logger.info('Please cite %s when using this model', model.__arxiv__, '$MG:color:BLACK')
+            
         self.particles = base_objects.ParticleList()
         self.interactions = base_objects.InteractionList()
         self.non_qcd_gluon_emission = 0 # vertex where a gluon is emitted withou QCD interaction
@@ -1860,6 +1878,11 @@
         self.rule_card = check_param_card.ParamCardRule()
         self.restrict_card = None
         self.coupling_order_dict ={}
+        self.autowidth =  []
+     
+    def modify_autowidth(self, cards, id):
+        self.autowidth.append([int(id[0])])
+        return math.log10(2*len(self.autowidth))
      
     def restrict_model(self, param_card, rm_parameter=True, keep_external=False,
                                                       complex_mass_scheme=None):
@@ -1879,7 +1902,8 @@
         # compute the value of all parameters
         # Get the list of definition of model functions, parameter values. 
         model_definitions = self.set_parameters_and_couplings(param_card, 
-                                        complex_mass_scheme=complex_mass_scheme)
+                                        complex_mass_scheme=complex_mass_scheme,
+                                        auto_width=self.modify_autowidth)
         
         # Simplify conditional statements
         logger.log(self.log_level, 'Simplifying conditional expressions')
@@ -1932,8 +1956,23 @@
                 self['parameter_dict'][name] = 1
             elif value == 0.000001e-99:
                 self['parameter_dict'][name] = 0
-
-                    
+                
+        #
+        # restore auto-width value 
+        #
+        #for lhacode in self.autowidth:
+        for parameter in self['parameters'][('external',)]:
+            if parameter.lhablock.lower() == 'decay' and parameter.lhacode in self.autowidth:
+                parameter.value = 'auto'
+                if parameter.name in self['parameter_dict']:
+                    self['parameter_dict'][parameter.name] = 'auto'
+                elif parameter.name.startswith('mdl_'):
+                    self['parameter_dict'][parameter.name[4:]] = 'auto'
+                else:
+                    raise Exception
+
+
+        
     def locate_coupling(self):
         """ create a dict couplings_name -> vertex or (particle, counterterm_key) """
         
@@ -2480,6 +2519,7 @@
             logger_mod.log(self.log_level,'remove parameters: %s' % (param))
             data = self['parameters'][param_info[param]['dep']]
             data.remove(param_info[param]['obj'])
+            
 
     def optimise_interaction(self, interaction):
         
 
=== modified file 'models/model_reader.py'
--- models/model_reader.py	2020-06-21 18:48:13 +0000
+++ models/model_reader.py	2020-09-22 07:07:51 +0000
@@ -58,7 +58,8 @@
         super(ModelReader, self).default_setup()
 
     def set_parameters_and_couplings(self, param_card = None, scale=None,
-                                                      complex_mass_scheme=None):
+                                                      complex_mass_scheme=None,
+                                                      auto_width=None):
         """Read a param_card and calculate all parameters and
         couplings. Set values directly in the parameters and
         couplings, plus add new dictionary coupling_dict from
@@ -84,6 +85,9 @@
                     raise MadGraph5Error("No such file %s" % param_card)
                 param_card_text = param_card
                 param_card = card_reader.ParamCard(param_card)
+                for param in param_card.get('decay'):
+                    if str(param.value).lower() == 'auto':
+                        param.value = auto_width(param_card, param.lhacode)
             #misc.sprint(type(param_card), card_reader.ParamCard,  isinstance(param_card, card_reader.ParamCard))
             #assert isinstance(param_card, card_reader.ParamCard),'%s is not a ParamCard: %s' % (type(param_card),  isinstance(param_card, card_reader.ParamCard))    
             
 
=== modified file 'models/write_param_card.py'
--- models/write_param_card.py	2019-06-27 12:21:53 +0000
+++ models/write_param_card.py	2020-09-22 07:07:51 +0000
@@ -243,9 +243,8 @@
         if info.startswith('mdl_'):
             info = info[4:]
     
-        if param.value.imag != 0:
+        if param.value != 'auto' and param.value.imag != 0:
             raise ParamCardWriterError('All External Parameter should be real (not the case for %s)'%param.name)
-    
 
         # avoid to keep special value used to avoid restriction
         if param.value == 9.999999e-1:
@@ -257,6 +256,8 @@
         lhacode=' '.join(['%3s' % key for key in param.lhacode])
         if lhablock != 'DECAY':
             text = """  %s %e # %s \n""" % (lhacode, param.value.real, info) 
+        elif param.value == 'auto':
+            text = '''DECAY %s auto # %s \n''' % (lhacode, info)
         else:
             text = '''DECAY %s %e # %s \n''' % (lhacode, param.value.real, info)
         self.fsock.write(text)