Merge lp:~mg5core1/mg5amcnlo/2.8.3.py3 into lp:mg5amcnlo/lts

[Olivier Mattelaer]

This is a bug fixing only merge (mainly a lot of python3 issue fixed in this branch).

This is designed to be quickly replaced by 2.9.0 version of the code that includes plenty of change at LO (including new phase-space and new method to evaluate the marix-element, optimization on colour matrix)

[lp:~mg5core1/mg5amcnlo/2.8.3.py3]

308. By olivier-mattelaer on 2021-01-21

fix one more py3 issue (MadSpin)

309. By olivier-mattelaer on 2021-01-21

re-allow helicity per helicity reweighting

310. By olivier-mattelaer on 2021-01-21

fixing one more test

311. By olivier-mattelaer on 2021-01-26

fix an issue of input_string syntax for loop-induced (foound because of maddm)

312. By olivier-mattelaer on 2021-01-26

Update Version/updates notes

[Olivier Mattelaer (olivier-mattelaer)]

I will go with this bug fix release.
And likely release 2.9.0 in a day or two.

review: Approve

=== modified file 'MadSpin/decay.py'
--- MadSpin/decay.py	2020-10-09 22:09:19 +0000
+++ MadSpin/decay.py	2021-01-26 14:28:22 +0000
@@ -3371,8 +3371,8 @@
                     if key[0]=='full':
                         path=key[1]
                         end_signal="5 0 0 0 0\n"  # before closing, write down the seed 
-                        external.stdin.write(end_signal)
-                        ranmar_state=external.stdout.readline()
+                        external.stdin.write(end_signal.encode())
+                        ranmar_state=external.stdout.readline().decode()
                         ranmar_file=pjoin(path,'ranmar_state.dat')
                         ranmar=open(ranmar_file, 'w')
                         ranmar.write(ranmar_state)
 
=== modified file 'Template/LO/Source/PDF/pdg2pdf_lhapdf6.f'
--- Template/LO/Source/PDF/pdg2pdf_lhapdf6.f	2020-08-07 14:49:25 +0000
+++ Template/LO/Source/PDF/pdg2pdf_lhapdf6.f	2021-01-26 14:28:22 +0000
@@ -142,7 +142,8 @@
       else if(abs(ih).eq.3.or.abs(ih).eq.4) then       !from the electron
             pdg2pdf=epa_lepton(x,xmu*xmu, ih)
       else if(ih.eq.2) then ! photon from a proton without breaking
-          pdg2pdf = epa_proton(x,xmu*xmu)
+          pdg2pdf = epa_proton(x,xmu*xmu, beamid)
+
       else
          write (*,*) 'beam type not supported in lhadpf'
          stop 1
 
=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2020-10-30 21:06:51 +0000
+++ UpdateNotes.txt	2021-01-26 14:28:22 +0000
@@ -1,5 +1,22 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
+2.8.3 (26/01/21):
+      OM: Buch of bunch fixing related to python3 issue (mainly related to unicode encoding)
+      OM: Various fix for reweighting with loop (mainly with python3 as well)
+      OM: Fix a potential bug for polarized sample with at least three polarised particles with a least two
+          identical particles and one different polarised particle.
+      OM: Fix various bug for maddm interface (thanks Daniele)
+      OM: Fix various issue with overall order usage
+      OM: Fix compatibility with MacOS 11
+      OM: fix additional GCC10 compatibility issue
+      OM: fix issue for 1>n process where width were set to zero automatically (introduced in 2.8.0)
+      OM: fix aloha output mode for python output
+      OM: avoid a bug with helicity filtering that was kept for all benchmark when using
+          multiple successive re-weighting
+      OM: Edition of the reweighting card via "set" command is not starting from the original param_card
+          used to generated the events file and not from the model default anymore.
+      OM: Interference have now their default dynamical scale set to HT/2
+
 
 2.8.2 (30/10/20):
       OM: Fix a bug when setting width to zero where they were actually set to 1e-6 times the width
 
=== modified file 'VERSION'
--- VERSION	2020-10-30 21:06:51 +0000
+++ VERSION	2021-01-26 14:28:22 +0000
@@ -1,5 +1,5 @@
-version = 2.8.2
-date = 2020-10-30
+version = 2.8.3
+date = 2021-01-26
 
 
 
 
=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2020-08-20 21:22:22 +0000
+++ aloha/create_aloha.py	2021-01-26 14:28:22 +0000
@@ -1109,7 +1109,8 @@
 
         ext_files  = []
         for path in paths:
-            ext_files = misc.glob('%s.%s' % (name, ext), path)
+            base, amp = name.rsplit('_',1)
+            ext_files = misc.glob('%s*_%s.%s' % (base,amp, ext), path)
             if ext_files:
                 break
         else: 
@@ -1121,6 +1122,7 @@
             for filepath in ext_files:
                 
                 files.cp(filepath, output_dir)
+
         return ext_files
                     
         
 
=== modified file 'bin/compile.py'
--- bin/compile.py	2019-04-17 14:39:47 +0000
+++ bin/compile.py	2021-01-26 14:28:22 +0000
@@ -280,7 +280,7 @@
     def install_package(self, programs=[]):
         print("installing external package")
         if not programs:
-            programs = ['pythia-pgs','Delphes','ExRootAnalysis','MadAnalysis4','SysCalc']
+            programs = ['pythia8','Delphes','ExRootAnalysis','MadAnalysis5']
             
         for prog in programs:
             self.cmd.exec_cmd('install %s' % prog)
 
=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2020-08-20 15:33:24 +0000
+++ madgraph/core/base_objects.py	2021-01-26 14:28:22 +0000
@@ -2557,7 +2557,7 @@
 
 
         if max_n_loop == 0:
-            max_n_loop = Vertex.max_n_loop_for_multichanneling
+            max_n_loop = int(Vertex.max_n_loop_for_multichanneling)
         
         res = [len(v.get('legs')) for v in self.get('vertices') if (v.get('id') \
                                   not in veto_inter_id) or (v.get('id')==-2 and 
@@ -3138,7 +3138,7 @@
             mystr = mystr + '[ '
             if self['NLO_mode']:
                 mystr = mystr + self['NLO_mode']
-                if not self['has_born']:
+                if not self['has_born'] and self['NLO_mode'] != 'noborn':
                     mystr = mystr + '^2'
                 mystr = mystr + '= '
                 
 
=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2020-06-21 18:48:13 +0000
+++ madgraph/core/diagram_generation.py	2021-01-26 14:28:22 +0000
@@ -377,8 +377,19 @@
                 return True
             elif isinstance(self.vertex_id[0], tuple) and isinstance(other.vertex_id[0], int):
                 return False
+            elif isinstance(self.vertex_id[0], str) and isinstance(other.vertex_id[0], tuple):
+                return True
+            elif isinstance(self.vertex_id[0], tuple) and isinstance(other.vertex_id[0], str):
+                return False            
             else:
-                return self.vertex_id[0] < other.vertex_id[0]
+                try:
+                    return self.vertex_id[0] < other.vertex_id[0]
+                except TypeError as error:
+                    if error.args == "'<' not supported between instances of 'tuple' and 'str'":
+                        return False
+                    else:
+                        return True
+                    
 
         for i, link in enumerate(self.links):
             if i > len(other.links) - 1:
 
=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2020-09-27 06:02:45 +0000
+++ madgraph/core/helas_objects.py	2021-01-26 14:28:22 +0000
@@ -5457,7 +5457,6 @@
                         )      
                     # Add the decays to the list
                     decay_list.append(list(zip(fs_numbers[fs_id], prod)))
-
                 decay_lists.append(decay_list)
                  
             # Finally combine all decays for this process,
@@ -5490,12 +5489,13 @@
                              ", ".join([d.get('processes')[0].nice_string().\
                                         replace('Process: ', '') \
                                         for d in decay_dict.values()])))
-
-                if pols:
-                    if hasattr(matrix_element,'ordering_for_pol'):
-                        matrix_element.ordering_for_pol[fs_id] = ordered_for_pol
-                    else:
-                        matrix_element.ordering_for_pol = {fs_id: ordered_for_pol}
+                
+                for fs_id in set(fs_ids):
+                    if fs_pols_dict[fs_id]:
+                        if hasattr(matrix_element,'ordering_for_pol'):
+                            matrix_element.ordering_for_pol[fs_id] = ordered_for_pol
+                        else:
+                            matrix_element.ordering_for_pol = {fs_id: ordered_for_pol}
                         
                     
                 matrix_element.insert_decay_chains(decay_dict)
 
=== modified file 'madgraph/interface/common_run_interface.py'
--- madgraph/interface/common_run_interface.py	2020-09-30 18:46:18 +0000
+++ madgraph/interface/common_run_interface.py	2021-01-26 14:28:22 +0000
@@ -5977,13 +5977,13 @@
                         logger.error("ptj cut [in run_card: %s] is more than half the value of QCUT [shower_card: %s] This is not recommended:\n see http://amcatnlo.web.cern.ch/amcatnlo/FxFx_merging.htm ",
                                      self.run_card['ptj'], self.shower_card['qcut'])
                         
-                if self.shower_card['njmax'] == -1:
-                    if not proc_charac: #shoud not happen in principle 
-                        raise Exception( "Impossible to setup njmax automatically. Please setup that value manually.")
-                    njmax = proc_charac['max_n_matched_jets']
-                    self.do_set('shower_card njmax %i' % njmax) 
-                if self.shower_card['njmax'] == 0:
-                    raise Exception("Invalid njmax parameter. Can not be set to 0")
+                    if self.shower_card['njmax'] == -1:
+                        if not proc_charac: #shoud not happen in principle 
+                            raise Exception( "Impossible to setup njmax automatically. Please setup that value manually.")
+                        njmax = proc_charac['max_n_matched_jets']
+                        self.do_set('shower_card njmax %i' % njmax) 
+                    if self.shower_card['njmax'] == 0:
+                        raise Exception("Invalid njmax parameter. Can not be set to 0")
                     
                 
        
@@ -6024,7 +6024,7 @@
 
                 # This precompiler flag is in principle useful for the analysis if it writes HEPMC
                 # events, but there is unfortunately no way for now to specify it in the shower_card.
-                supports_HEPMCHACK = '-DHEPMC2HACK' in stdout
+                supports_HEPMCHACK = '-DHEPMC2HACK' in stdout.decode()
                 
                 #3. ensure that those flag are in the shower card
                 for L in paths:
 
=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2020-10-30 12:03:19 +0000
+++ madgraph/interface/madgraph_interface.py	2021-01-26 14:28:22 +0000
@@ -6604,7 +6604,7 @@
 
         def apply_patch(filetext):
             """function to apply the patch"""
-            text = filetext.read()
+            text = filetext.read().decode()
             
             pattern = re.compile(r'''=== renamed directory \'(?P<orig>[^\']*)\' => \'(?P<new>[^\']*)\'''')
             #=== renamed directory 'Template' => 'Template/LO'
 
=== modified file 'madgraph/interface/reweight_interface.py'
--- madgraph/interface/reweight_interface.py	2020-10-19 20:46:47 +0000
+++ madgraph/interface/reweight_interface.py	2021-01-26 14:28:22 +0000
@@ -559,6 +559,8 @@
             if (event_nb==10001): logger.info('reducing number of print status. Next status update in 10000 events')
             if (event_nb==100001): logger.info('reducing number of print status. Next status update in 100000 events')
 
+
+                
             weight = self.calculate_weight(event)
             if not isinstance(weight, dict):
                 weight = {'':weight}
@@ -717,7 +719,8 @@
         if not '--keep_card' in args:
             if self.has_nlo and self.rwgt_mode != "LO":
                 rwdir_virt = rw_dir.replace('rw_me', 'rw_mevirt')
-                
+            with open(pjoin(rw_dir, 'Cards', 'param_card.dat'), 'w') as fsock:
+                fsock.write(self.banner['slha']) 
             out, cmd = common_run_interface.CommonRunCmd.ask_edit_card_static(cards=['param_card.dat'],
                                    ask=self.ask, pwd=rw_dir, first_cmd=self.stored_line,
                                    write_file=False, return_instance=True
@@ -885,19 +888,21 @@
         #initialise module.
         for (path,tag), module in self.f2pylib.items():
             with misc.chdir(pjoin(os.path.dirname(rw_dir), path)):
-                with misc.stdchannel_redirected(sys.stdout, os.devnull):
+                with misc.stdchannel_redirected(sys.stdout, os.devnull):                    
                     if 'second' in path or tag == 3:
                         param_card = self.new_param_card
                     else:
                         param_card = check_param_card.ParamCard(self.orig_param_card_text)
-                    
+                    module.initialise('../Cards/param_card.dat')
                     for block in param_card:
-
+                        if block.lower() == 'qnumbers':
+                            continue
                         for param   in param_card[block]:
                             lhacode = param.lhacode
                             value = param.value
                             name = '%s_%s' % (block.upper(), '_'.join([str(i) for i in lhacode]))
                             module.change_para(name, value)
+#                    misc.sprint("recompute module")
                     module.update_all_coup()
                         
         return param_card_iterator, tag_name
@@ -960,7 +965,6 @@
     dynamical_scale_warning=True
     def change_kinematics(self, event):
  
-
         if isinstance(self.run_card, banner.RunCardLO):
             jac = event.change_ext_mass(self.new_param_card)
             new_event = event
@@ -1063,6 +1067,7 @@
             w_orig = self.calculate_matrix_element(cevent, 0)
             w_new =  self.calculate_matrix_element(cevent, 1)
             ratio_T = w_new/w_orig
+
             if need_V:
                 scale2 = cevent.wgts[0].scales2[0]
                 #for scale2 in set(c.scales2[1] for c in cevent.wgts): 
@@ -1283,6 +1288,12 @@
         if not self.use_eventid:
             pid = -1
         
+        if not scale2: 
+            if hasattr(event, 'scale'):
+                scale2 = event.scale**2
+            else:
+                scale2 = 0
+                
         with misc.chdir(Pdir):
             with misc.stdchannel_redirected(sys.stdout, os.devnull):
                 me_value = module.smatrixhel(pdg, pid, p, event.aqcd, scale2, nhel)
 
=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2020-10-30 12:03:51 +0000
+++ madgraph/iolibs/export_v4.py	2021-01-26 14:28:22 +0000
@@ -2080,6 +2080,7 @@
 %(python_information)s
   subroutine smatrixhel(pdgs, procid, npdg, p, ALPHAS, SCALE2, nhel, ANS)
   IMPLICIT NONE
+C ALPHAS is given at scale2 (SHOULD be different of 0 for loop induced, ignore for LO)  
 
 CF2PY double precision, intent(in), dimension(0:3,npdg) :: p
 CF2PY integer, intent(in), dimension(npdg) :: pdgs
@@ -2097,7 +2098,7 @@
   PI = 3.141592653589793D0
   G = 2* DSQRT(ALPHAS*PI)
   CALL UPDATE_AS_PARAM()
-  if (scale2.ne.0d0) stop 1
+c  if (scale2.ne.0d0) stop 1
 
 %(smatrixhel)s
 
@@ -2121,10 +2122,14 @@
 
       character*512 name
       double precision value
+      
+      %(helreset_def)s
 
       include '../Source/MODEL/input.inc'
       include '../Source/MODEL/coupl.inc'
 
+      %(helreset_setup)s
+
       SELECT CASE (name)
          %(parameter_setup)s
          CASE DEFAULT
@@ -2165,7 +2170,7 @@
  
   
         """
-         
+        
         allids = list(self.prefix_info.keys())
         allprefix = [self.prefix_info[key][0] for key in allids]
         min_nexternal = min([len(ids[0]) for ids in allids])
@@ -2206,6 +2211,14 @@
             parameter_setup.append('        CASE ("%s")\n          %s = value' 
                                    % (key, var))
 
+        # part for the resetting of the helicity
+        helreset_def = []
+        helreset_setup = []
+        for prefix in set(allprefix):
+            helreset_setup.append(' %shelreset = .true. ' % prefix)
+            helreset_def.append(' logical %shelreset \n common /%shelreset/ %shelreset' % (prefix, prefix, prefix))
+        
+
         formatting = {'python_information':'\n'.join(info), 
                           'smatrixhel': '\n'.join(text),
                           'maxpart': max_nexternal,
@@ -2215,6 +2228,8 @@
                           'prefix':'\',\''.join(allprefix),
                           'pids': ','.join(str(pid) for (pdg,pid) in allids),
                           'parameter_setup': '\n'.join(parameter_setup),
+                          'helreset_def' : '\n'.join(helreset_def),
+                          'helreset_setup' : '\n'.join(helreset_setup),
                           }
         formatting['lenprefix'] = len(formatting['prefix'])
         text = template % formatting
 
=== modified file 'madgraph/iolibs/file_writers.py'
--- madgraph/iolibs/file_writers.py	2020-06-21 18:48:13 +0000
+++ madgraph/iolibs/file_writers.py	2021-01-26 14:28:22 +0000
@@ -64,7 +64,7 @@
     def write_line(self, line):
         """Write a line with proper indent and splitting of long lines
         for the language in question."""
-
+        return ['%s\n' % l for l in line.split('\n')]
         pass
 
     def write_comment_line(self, line):
@@ -982,13 +982,13 @@
     
     def write_comments(self, text):
         text = '#%s\n' % text.replace('\n','\n#')
-        file.write(self, text)
+        self.write(text)
         
 class MakefileWriter(FileWriter):
     
     def write_comments(self, text):
         text = '#%s\n' % text.replace('\n','\n#')
-        file.write(self, text)
+        self.write(text)
         
     def writelines(self, lines):
         """Extends the regular file.writeline() function to write out
 
=== modified file 'madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc'
--- madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc	2016-10-20 23:12:29 +0000
+++ madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc	2021-01-26 14:28:22 +0000
@@ -16,26 +16,26 @@
     if os.path.isfile(pjoin(root_path,'makefile')) and \
        os.path.isfile(pjoin(root_path,'f2py_wrapper.f')) and \
        not os.path.isfile(pjoin(root_path,'matrix2py.so')):
-        print "Trying to automatically generate the python module 'matrix2py.so' with f2py..."
+        print("Trying to automatically generate the python module 'matrix2py.so' with f2py...")
         p = subprocess.Popen(['make','matrix2py.so'], stdout=subprocess.PIPE, 
                              stderr=subprocess.PIPE, cwd=root_path)
         (out, err) = p.communicate()
         if p.returncode or not os.path.isfile(pjoin(root_path,'matrix2py.so')):
-            print "ERROR: Failed to produce 'matrix2py.so' with 'make matrix2py.so' in '%s'. The error was:\n%s"%(root_path,err)
+            print("ERROR: Failed to produce 'matrix2py.so' with 'make matrix2py.so' in '%s'. The error was:\n%s"%(root_path,err))
             sys.exit(0)
         try:
             import matrix2py
         except:
-            print "ERROR: Could not load the f2py module 'matrix2py.so'. The following error occurred:\n",sys.exc_info()[0]
+            print("ERROR: Could not load the f2py module 'matrix2py.so'. The following error occurred:\n",sys.exc_info()[0])
             sys.exit(0)
     else:
         if os.path.exists(pjoin(root_path,'matrix2py.so')):
-            print "ERROR: Could not load the f2py module 'matrix2py.so'. The following error occurred:\n",sys.exc_info()[0]
+            print("ERROR: Could not load the f2py module 'matrix2py.so'. The following error occurred:\n",sys.exc_info()[0])
             sys.exit(0)
         else:
-            print "ERROR: Could not find the 'matrix2py.so' f2py module. Please generate it by running:\n"+\
+            print("ERROR: Could not find the 'matrix2py.so' f2py module. Please generate it by running:\n"+\
                   "  > make matrix2py.so\n"+\
-                  "in the <PROC_OUTPUT>/SubProcesses/P<chosen_proc> directory."
+                  "in the <PROC_OUTPUT>/SubProcesses/P<chosen_proc> directory.")
             sys.exit(0)
 
 # Now we can use this MadLoop python module.
@@ -44,8 +44,10 @@
 # print help(matrix2py)
 
 # Read the model parameters
-matrix2py.{2}initialise(os.path.abspath(pjoin(root_path,os.pardir,os.pardir,'Cards','param_card.dat')))
-
+try:
+    matrix2py.{2}initialise(os.path.abspath(pjoin(root_path,os.pardir,os.pardir,'Cards','param_card.dat')))
+except:
+    matrix2py.initialise(os.path.abspath(pjoin(root_path,os.pardir,os.pardir,'Cards','param_card.dat')))
 
 def invert_momenta(p):
         """ fortran/C-python do not order table in the same order"""
@@ -63,18 +65,18 @@
 {0}
 if p[0][0] is None:
     if not os.path.isfile(pjoin(root_path,'PS.input')):
-        print "\n\n==================================================================================================================="
-        print "*                                           No kinematics defined!                                                *"
-        print "*                                   -------------------------------------                                         *"
-        print "* Please either define your kinematic configuration directly in check_sa.py or in a file 'PS.input'. Exiting now. *"
-        print "===================================================================================================================\n\n"
+        print( "\n\n===================================================================================================================")
+        print( "*                                           No kinematics defined!                                                *")
+        print( "*                                   -------------------------------------                                         *")
+        print( "* Please either define your kinematic configuration directly in check_sa.py or in a file 'PS.input'. Exiting now. *")
+        print( "===================================================================================================================\n\n")
         sys.exit(0)
     try:
         for i, line in enumerate(open(pjoin(root_path,'PS.input'),'r').readlines()):
             if i==len(p): break        
             p[i]=[float(line.split()[j]) for j in range(4)]
     except:
-        print "ERROR: File PS.input is malformed. Error was:\n",sys.exc_info()[0]
+        print("ERROR: File PS.input is malformed. Error was:\n",sys.exc_info()[0])
         sys.exit(0)
 P =invert_momenta(p)
 # Alpha_s value
@@ -86,21 +88,23 @@
 # Choice of renormalization scale
 renormalization_scale = 91.188
 
-finite_loop_me, return_code = matrix2py.{2}get_me(P, alphas, renormalization_scale, nhel)
-
-
-print '='*112
-print '* %-108s *'%' MadLoop evaluation for the process '
-print '* %-108s *'%'  {1}'
-print '* %-108s *'%' and the kinematic configuration:'
-print '* %-108s *'%((' %-3s'+' %-25s'*4)%('#','E',' p_x',' p_y',' p_z'))
+try:
+    finite_loop_me, return_code = matrix2py.{2}get_me(P, alphas, renormalization_scale, nhel)
+except:
+    finite_loop_me, return_code = matrix2py.get_me(P, alphas, renormalization_scale, nhel)
+
+print( '='*112)
+print( '* %-108s *'%' MadLoop evaluation for the process ')
+print( '* %-108s *'%'  {1}')
+print( '* %-108s *'%' and the kinematic configuration:')
+print( '* %-108s *'%((' %-3s'+' %-25s'*4)%('#','E',' p_x',' p_y',' p_z')))
 for i,k in enumerate(p):
     # The complicated printout below is just so as to align the digits negative numbers with positive ones
-    print '* %-108s *'%((' %-3d%s')%(i,
-      ''.join([' %-25.15e'%e if j==0 or e<0.0 else '  %-24.15e'%e for j,e in enumerate(k)])))
-print '* %-108s *'%('-'*108)
-print '* %-108s *'%(' Finite part obtained for the loop matrix element (Madloop return_code=%d )'%return_code)
-print '* %-108s *'%''
-print '* %-108s *'%('      %.18e'%finite_loop_me)
-print '* %-108s *'%''
-print '='*112
+    print( '* %-108s *'%((' %-3d%s')%(i,
+      ''.join([' %-25.15e'%e if j==0 or e<0.0 else '  %-24.15e'%e for j,e in enumerate(k)]))))
+print( '* %-108s *'%('-'*108))
+print( '* %-108s *'%(' Finite part obtained for the loop matrix element (Madloop return_code=%d )'%return_code))
+print( '* %-108s *'%'')
+print( '* %-108s *'%('      %.18e'%finite_loop_me))
+print( '* %-108s *'%'')
+print( '='*112)
 
=== modified file 'madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc'
--- madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc	2020-08-20 15:33:24 +0000
+++ madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc	2021-01-26 14:28:22 +0000
@@ -49,8 +49,9 @@
 # Specify where MadLoop5_resources is
 allmatrix2py.set_madloop_path(os.path.abspath(pjoin(root_path,'MadLoop5_resources')))
 # List all processes available in this module
+pdgs_order, pids = allmatrix2py.get_pdg_order()
+all_procs_available = list(zip(pdgs_order, pids))
 
-all_procs_available = [[(pdg,pids[i]) for i, pdg in enumerate(proc_pdgs) if pdg!=0] for (proc_pdgs, pids) in allmatrix2py.get_pdg_order()]
 print( "Available processes are:")
 for process_pdgs in all_procs_available:
     print( "   --> %s: process id: %i "%str(process_pdgs[0], process_pdgs[1]))
@@ -63,8 +64,7 @@
 
 # The kinematic configuration in the convention (E, px, py, pz) and with particles ordered as in the process definition.
 # This is the structure of this dictionary.
-p= dict( (tuple(process_pdgs[0]),[[None,]*4]*len(process_pdgs[0])) for process_pdgs in all_procs_available)
-
+p= dict( (tuple(process_pdgs),[[None,]*4]*len(process_pdgs)) for (process_pdgs,pid) in all_procs_available)
 if (p.values()[0])[0][0] is None:
     if not os.path.isfile(pjoin(root_path,'PS.input')):
         print( "\n\n===================================================================================================================")
 
=== modified file 'madgraph/iolibs/template_files/matrix_standalone_v4.inc'
--- madgraph/iolibs/template_files/matrix_standalone_v4.inc	2020-10-26 15:18:03 +0000
+++ madgraph/iolibs/template_files/matrix_standalone_v4.inc	2021-01-26 14:28:22 +0000
@@ -85,7 +85,10 @@
       INTEGER USERHEL
 	  COMMON/%(proc_prefix)sHELUSERCHOICE/USERHEL
 	  DATA USERHEL/-1/	  
-
+      LOGICAL HELRESET
+      common/%(proc_prefix)shelreset/HELRESET
+      data HELRESET/.true./
+      
 %(helicity_lines)s
 %(den_factor_line)s
 
@@ -98,6 +101,17 @@
 C
       LOGICAL %(proc_prefix)sIS_BORN_HEL_SELECTED
 
+c----------
+c   Check if helreset mode is on
+c---------
+if (HELRESET) then
+   NTRY = 0
+   do i=1,NCOMB
+      GOODHEL(I) = .false.
+   enddo
+   HELRESET = .false.
+endif
+
 C ----------
 C BEGIN CODE
 C ----------
 
=== modified file 'madgraph/madevent/combine_grid.py'
--- madgraph/madevent/combine_grid.py	2019-04-17 14:39:47 +0000
+++ madgraph/madevent/combine_grid.py	2021-01-26 14:28:22 +0000
@@ -59,7 +59,7 @@
         self.nb_sample += 1 
         if isinstance(path, str):
             finput = open(path)
-        elif isinstance(path, file):
+        elif hasattr(path, "read") and hasattr(path, 'name'):
             finput=path
         else:
             raise Exception("path should be a path or a file descriptor")
@@ -151,7 +151,7 @@
         if isinstance(path, str):
             finput = open(path)
             fname = path
-        elif isinstance(path, file):
+        elif hasattr(path, 'read') and hasattr(path, 'name'):
             finput=path
             fname = finput.name
         else:
@@ -694,7 +694,7 @@
                     bin_ref.n_entries = self.min_bin_probing_points                 
 
         #remove bin if entry if zero
-        for key in self.keys():
+        for key in list(self.keys()):
             if not self[key].abs_weight:
                 del self[key]
     
@@ -740,13 +740,7 @@
         
         #order the bin from higest contribution to lowest
         bins = [o for o in self.items()]
-        def compare(x,y):
-            if x[1].weight - y[1].weight <0:
-                return 1
-            else:
-                return -1
-
-        bins.sort(cmp=compare)
+        bins.sort(key=lambda x: x[1].weight, reverse=True)
             
         data = {'name': self.name,
                 'min_bin_probing_points': self.min_bin_probing_points,
 
=== modified file 'madgraph/madevent/sum_html.py'
--- madgraph/madevent/sum_html.py	2020-10-09 22:09:19 +0000
+++ madgraph/madevent/sum_html.py	2021-01-26 14:28:22 +0000
@@ -279,7 +279,7 @@
         
         if isinstance(filepath, str):
             finput = open(filepath)
-        elif isinstance(filepath, file):
+        elif hasattr(filepath, 'read') and hasattr(filepath, 'name'):
             finput = filepath
         else:
             raise Exception("filepath should be a path or a file descriptor")
 
=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2020-10-30 12:03:51 +0000
+++ madgraph/various/banner.py	2021-01-26 14:28:22 +0000
@@ -3479,20 +3479,23 @@
         # For interference module, the systematics are wrong.
         # automatically set use_syst=F and set systematics_program=none
         no_systematics = False
+        interference = False
         for proc in proc_def:
             for oneproc in proc:
                 if '^2' in oneproc.nice_string():
-                    no_systematics = True
+                    interference = True
                     break
             else:
                 continue
             break
 
         
-        if no_systematics:
+        if interference or no_systematics:
             self['use_syst'] = False
             self['systematics_program'] = 'none'
-        
+        if interference:
+            self['dynamical_scale_choice'] = 3
+            
         # if polarization is used, set the choice of the frame in the run_card
         # But only if polarization is used for massive particles
         for plist in proc_def:
 
=== modified file 'madgraph/various/cluster.py'
--- madgraph/various/cluster.py	2020-10-09 22:09:19 +0000
+++ madgraph/various/cluster.py	2021-01-26 14:28:22 +0000
@@ -274,7 +274,7 @@
         if target.endswith('/'):
             target = target[:-1]   
 
-        target = misc.digest(target)[-self.identifier_length:]
+        target = misc.digest(target.encode())[-self.identifier_length:]
         if not target[0].isalpha():
             target = 'a' + target[1:]
 
@@ -1696,7 +1696,7 @@
         id = output_arr[3].rstrip()
 
         if not id.isdigit():
-            id = re.findall('Submitted batch job ([\d\.]+)', output[0])
+            id = re.findall('Submitted batch job ([\d\.]+)', ' '.join(output_arr))
             
             if not id or len(id)>1:
                 raise ClusterManagmentError( 'fail to submit to the cluster: \n%s' \
 
=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2020-10-30 12:03:19 +0000
+++ madgraph/various/misc.py	2021-01-26 14:28:22 +0000
@@ -734,17 +734,26 @@
             libraries.append('rt')                                                                                                                                                                          
     """
 
-    try:
-        oldstdchannel = os.dup(stdchannel.fileno())
-        dest_file = open(dest_filename, 'w')
-        os.dup2(dest_file.fileno(), stdchannel.fileno())
-        yield
-    finally:
-        if oldstdchannel is not None:
-            os.dup2(oldstdchannel, stdchannel.fileno())
-            os.close(oldstdchannel)
-        if dest_file is not None:
-            dest_file.close()
+    if logger.getEffectiveLevel()>5:
+        #deactivate this for hard-core debugging level
+        try:
+            oldstdchannel = os.dup(stdchannel.fileno())
+            dest_file = open(dest_filename, 'w')
+            os.dup2(dest_file.fileno(), stdchannel.fileno())
+            yield
+        finally:
+            if oldstdchannel is not None:
+                os.dup2(oldstdchannel, stdchannel.fileno())
+                os.close(oldstdchannel)
+            if dest_file is not None:
+                dest_file.close()
+    else:
+        try:
+            logger.debug('no stdout/stderr redirection due to debug level')
+            yield
+        finally:
+            return
+        
         
 def get_open_fds():
     '''
@@ -1590,7 +1599,7 @@
         def digest(text):
             """using mg5 for the hash"""
             t = hashlib.md5()
-            t.update(text)
+            t.update(text.encode())
             return t.hexdigest()
         return digest
     
 
=== modified file 'madgraph/various/process_checks.py'
--- madgraph/various/process_checks.py	2020-06-21 18:48:13 +0000
+++ madgraph/various/process_checks.py	2021-01-26 14:28:22 +0000
@@ -290,8 +290,8 @@
                                                 mode='mg5',
                                                 language = 'Python'))
         for routine in aloha_model.external_routines:
-            aloha_routines.append(
-                     open(aloha_model.locate_external(routine, 'Python')).read())
+            for path in aloha_model.locate_external(routine, 'Python'):
+                aloha_routines.append(open(path).read())
 
         # Define the routines to be available globally
         previous_globals = list(globals().keys())
 
=== modified file 'models/MSSM_SLHA2/__init__.py'
--- models/MSSM_SLHA2/__init__.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/__init__.py	2021-01-26 14:28:22 +0000
@@ -1,13 +1,13 @@
+import object_library 
 
-from __future__ import absolute_import
-from . import particles
-from . import couplings
-from . import lorentz
-from . import parameters
-from . import vertices
-from . import coupling_orders
-from . import write_param_card
-from . import function_library
+import particles
+import couplings
+import lorentz
+import parameters
+import vertices
+import coupling_orders
+import write_param_card
+import function_library
 
 all_particles = particles.all_particles
 all_vertices = vertices.all_vertices
@@ -18,14 +18,14 @@
 all_functions = function_library.all_functions
 
 try:
-   from . import decays
+   import decays
 except ImportError:
    pass
 else:
    all_decays = decays.all_decays
 
 try:
-   from . import build_restrict
+   import build_restrict
 except ImportError:
    pass
 
 
=== modified file 'models/MSSM_SLHA2/build_restrict.py'
--- models/MSSM_SLHA2/build_restrict.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/build_restrict.py	2021-01-26 14:28:22 +0000
@@ -15,7 +15,6 @@
 """ This part is not part of the UFO Model but only of MG5 suite. 
 This files defines how the restrict card can be build automatically """ 
 
-from __future__ import absolute_import
 import models.build_restriction_lib as build_restrict_lib
 all_categories = []
 
 
=== modified file 'models/MSSM_SLHA2/coupling_orders.py'
--- models/MSSM_SLHA2/coupling_orders.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/coupling_orders.py	2021-01-26 14:28:22 +0000
@@ -3,8 +3,7 @@
 # Date: Tue 31 Jul 2012 19:55:22
 
 
-from __future__ import absolute_import
-from .object_library import all_orders, CouplingOrder
+from object_library import all_orders, CouplingOrder
 
 
 QCD = CouplingOrder(name = 'QCD',
 
=== modified file 'models/MSSM_SLHA2/couplings.py'
--- models/MSSM_SLHA2/couplings.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/couplings.py	2021-01-26 14:28:22 +0000
@@ -3,10 +3,9 @@
 # Date: Tue 31 Jul 2012 19:55:14
 
 
-from __future__ import absolute_import
-from .object_library import all_couplings, Coupling
+from object_library import all_couplings, Coupling
 
-from .function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
 
 
 
 
=== modified file 'models/MSSM_SLHA2/decays.py'
--- models/MSSM_SLHA2/decays.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/decays.py	2021-01-26 14:28:22 +0000
@@ -3,9 +3,8 @@
 # Date: Tue 31 Jul 2012 19:55:22
 
 
-from __future__ import absolute_import
-from .object_library import all_decays, Decay
-from . import particles as P
+from object_library import all_decays, Decay
+import particles as P
 
 
 Decay_h02 = Decay(name = 'Decay_h02',
 
=== modified file 'models/MSSM_SLHA2/function_library.py'
--- models/MSSM_SLHA2/function_library.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/function_library.py	2021-01-26 14:28:22 +0000
@@ -8,12 +8,11 @@
 #
 #
 
-from __future__ import absolute_import
 __date__ = "22 July 2010"
 __author__ = "[e-mail]"
 
 import cmath
-from .object_library import all_functions, Function
+from object_library import all_functions, Function
 
 #
 # shortcuts for functions from cmath
 
=== modified file 'models/MSSM_SLHA2/lorentz.py'
--- models/MSSM_SLHA2/lorentz.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/lorentz.py	2021-01-26 14:28:22 +0000
@@ -3,10 +3,9 @@
 # Date: Tue 31 Jul 2012 19:55:14
 
 
-from __future__ import absolute_import
-from .object_library import all_lorentz, Lorentz
+from object_library import all_lorentz, Lorentz
 
-from .function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
 
 
 
 
=== modified file 'models/MSSM_SLHA2/object_library.py'
--- models/MSSM_SLHA2/object_library.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/object_library.py	2021-01-26 14:28:22 +0000
@@ -7,9 +7,7 @@
 ##
 ##
 
-from __future__ import absolute_import
 import cmath
-import six
 
 
 class UFOBaseClass(object):
@@ -129,7 +127,7 @@
         if self.selfconjugate:
             raise Exception('%s has no anti particle.' % self.name) 
         outdic = {}
-        for k,v in six.iteritems(self.__dict__):
+        for k,v in self.__dict__.items():
             if k not in self.require_args_all:                
                 outdic[k] = -v
         if self.color in [1,8]:
 
=== modified file 'models/MSSM_SLHA2/parameters.py'
--- models/MSSM_SLHA2/parameters.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/parameters.py	2021-01-26 14:28:22 +0000
@@ -4,11 +4,10 @@
 
 
 
-from __future__ import absolute_import
-from .object_library import all_parameters, Parameter
-
-
-from .function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from object_library import all_parameters, Parameter
+
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
 
 # This is a default parameter object representing 0.
 ZERO = Parameter(name = 'ZERO',
 
=== modified file 'models/MSSM_SLHA2/particles.py'
--- models/MSSM_SLHA2/particles.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/particles.py	2021-01-26 14:28:22 +0000
@@ -4,9 +4,8 @@
 
 
 from __future__ import division
-from __future__ import absolute_import
-from .object_library import all_particles, Particle
-from . import parameters as Param
+from object_library import all_particles, Particle
+import parameters as Param
 
 a = Particle(pdg_code = 22,
              name = 'a',
 
=== modified file 'models/MSSM_SLHA2/vertices.py'
--- models/MSSM_SLHA2/vertices.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/vertices.py	2021-01-26 14:28:22 +0000
@@ -3,11 +3,10 @@
 # Date: Tue 31 Jul 2012 19:55:14
 
 
-from __future__ import absolute_import
-from .object_library import all_vertices, Vertex
-from . import particles as P
-from . import couplings as C
-from . import lorentz as L
+from object_library import all_vertices, Vertex
+import particles as P
+import couplings as C
+import lorentz as L
 
 
 V_1 = Vertex(name = 'V_1',
 
=== modified file 'models/MSSM_SLHA2/write_param_card.py'
--- models/MSSM_SLHA2/write_param_card.py	2019-04-17 14:39:47 +0000
+++ models/MSSM_SLHA2/write_param_card.py	2021-01-26 14:28:22 +0000
@@ -1,12 +1,7 @@
 
-from __future__ import absolute_import
-from __future__ import print_function
-from six.moves import range
-__date__ = "22 Sept 2011"
+__date__ = "3 june 2010"
 __author__ = '[e-mail]'
 
-from .function_library import *
-
 class ParamCardWriter(object):
     
     header = \
@@ -18,7 +13,7 @@
         """write a valid param_card.dat"""
         
         if not list_of_parameters:
-            from .parameters import all_parameters
+            from parameters import all_parameters
             list_of_parameters = [param for param in all_parameters if \
                                                        param.nature=='external']
         
@@ -35,7 +30,7 @@
     def define_not_dep_param(self, list_of_parameters):
         """define self.dep_mass and self.dep_width in case that they are 
         requested in the param_card.dat"""
-        from .particles import all_particles
+        from particles import all_particles
         
         self.dep_mass = [(part, part.mass) for part in all_particles \
                             if part.pdg_code > 0 and \
@@ -84,7 +79,8 @@
             self.write_block(lhablock)
             need_writing = [ param for param in all_ext_param if \
                                                      param.lhablock == lhablock]
-            need_writing.sort(self.order_param)
+            from functools import cmp_to_key
+            need_writing.sort(key=cmp_to_key(self.order_param))
             [self.write_param(param, lhablock) for param in need_writing]
             
             if self.generic_output:
@@ -119,9 +115,12 @@
     
     def write_dep_param_block(self, lhablock):
         import cmath
-        from .parameters import all_parameters
+        from parameters import all_parameters
         for parameter in all_parameters:
-            exec("%s = %s" % (parameter.name, parameter.value))
+            try:
+                exec("%s = %s" % (parameter.name, parameter.value))
+            except Exception:
+                pass
         text = "##  Not dependent paramater.\n"
         text += "## Those values should be edited following analytical the \n"
         text += "## analytical expression. Some generator could simply ignore \n"
@@ -152,9 +151,8 @@
     
     def write_qnumber(self):
         """ write qnumber """
-        from .particles import all_particles
-        from . import particles
-        print(particles.__file__)
+        from particles import all_particles
+        
         text="""#===========================================================\n"""
         text += """# QUANTUM NUMBERS OF NEW STATE(S) (NON SM PDG CODE)\n"""
         text += """#===========================================================\n\n"""
@@ -165,7 +163,7 @@
             text += self.data % {'pdg': part.pdg_code,
                                  'name': part.name,
                                  'charge': 3 * part.charge,
-                                 'spin': part.spin,
+                                 'spin': 2 * part.spin + 1,
                                  'color': part.color,
                                  'antipart': part.name != part.antiname and 1 or 0}
         
 
=== modified file 'tests/acceptance_tests/test_cmd_reweight.py'
--- tests/acceptance_tests/test_cmd_reweight.py	2020-08-20 15:33:24 +0000
+++ tests/acceptance_tests/test_cmd_reweight.py	2021-01-26 14:28:22 +0000
@@ -254,7 +254,8 @@
         else:
             me_cmd.run_cmd('reweight run_01 --from_cards')
         #solutions = [41.511565, 41.930505, 41.511565, 41.511565, 41.586169, 41.511565, 41.511565, 41.511565, 41.511565, 42.046806, 41.511565, 44.164503, 41.511565, -41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.778368, 41.511565, 42.05448, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 42.115494, 41.511854, 41.511567, 41.511565, 42.00028, 42.120605, 41.514867, -41.511565, 41.511565, 45.125706, 41.511565, 42.180208, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.997509, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.513926, 41.511565, 41.882499, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 47.532736, 41.511565, 41.809063, 41.511565, 41.511565, 41.511565, 41.927695, 41.511565, 41.511565, 41.555692, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, -41.511565, 41.511565, 42.029675, 41.725129, 41.511565, 41.511565, 41.511778, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 42.050439, 41.511565, 41.511565, 41.511565, -41.511565, 42.071105, 41.511565, 41.511565]
-        solutions =  [41.511565, 41.75164, 41.511565, 41.511565, 41.557009, 41.511565, 41.511565, 41.511565, 41.511565, 41.759881, 41.511565, 44.717244, 41.511565, -41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 42.041827, 41.511565, 41.663092, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.920917, 41.511736, 41.511566, 41.511565, 205.29791, 42.538389, 41.513573, -41.511565, 41.511565, 44.650974, 41.511565, 42.549187, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.431553, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.513265, 41.511565, 43.902643, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 8853.0397, 41.511565, 333.38491, 41.511565, 41.511565, 41.511565, 75.701362, 41.511565, 41.511565, 41.54695, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, -41.511565, 41.511565, 41.454923, 41.53984, 41.511565, 41.511565, 41.511743, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.732627, 41.511565, 41.511565, 41.511565, -41.511565, 41.395865, 41.511565, 41.511565]
+        #solutions =  [41.511565, 41.75164, 41.511565, 41.511565, 41.557009, 41.511565, 41.511565, 41.511565, 41.511565, 41.759881, 41.511565, 44.717244, 41.511565, -41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 42.041827, 41.511565, 41.663092, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.920917, 41.511736, 41.511566, 41.511565, 205.29791, 42.538389, 41.513573, -41.511565, 41.511565, 44.650974, 41.511565, 42.549187, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.431553, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.513265, 41.511565, 43.902643, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 8853.0397, 41.511565, 333.38491, 41.511565, 41.511565, 41.511565, 75.701362, 41.511565, 41.511565, 41.54695, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, -41.511565, 41.511565, 41.454923, 41.53984, 41.511565, 41.511565, 41.511743, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.732627, 41.511565, 41.511565, 41.511565, -41.511565, 41.395865, 41.511565, 41.511565]
+        solutions = [41.511565, 42.03619, 41.511565, 41.511565, 41.60499, 41.511565, 41.511565, 41.511565, 41.511565, 42.18183, 41.511565, 44.833753, 41.511565, -41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.845674, 41.511565, 42.19144, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 42.267845, 41.511927, 41.511567, 41.511565, 42.123567, 42.274246, 41.515701, -41.511565, 41.511565, 46.037437, 41.511565, 42.348885, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 42.120097, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.514522, 41.511565, 41.976074, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 49.051683, 41.511565, 41.884112, 41.511565, 41.511565, 41.511565, 42.032671, 41.511565, 41.511565, 41.566824, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, -41.511565, 41.511565, 42.160378, 41.779005, 41.511565, 41.511565, 41.511832, 41.511565, 41.511565, 41.511565, 41.511565, 41.511565, 42.186379, 41.511565, 41.511565, 41.511565, -41.511565, 42.212259, 41.511565, 41.511565]
         lhe = lhe_parser.EventFile(pjoin(self.run_dir,'Events','run_01', 'rwgt_events_tree_rwgt_1.lhe.gz'))
         lhe_orig = lhe_parser.EventFile(pjoin(self.run_dir,'Events','run_01', 'events.lhe.gz'))
         
@@ -264,9 +265,9 @@
             i+=1
             rwgt_data = event_orig.parse_reweight()
             #solutions.append(rwgt_data['rwgt_1_tree'])
-            #continue
             self.assertTrue('rwgt_1_tree' in rwgt_data)
             self.assertEqual(event.wgt, rwgt_data['rwgt_1_tree'])
+            #misc.sprint(i, event.wgt, solutions[i])
             self.assertTrue(misc.equal(event.wgt, solutions[i]))
             nlo1 = event.parse_nlo_weight()
             nlo2 = event_orig.parse_nlo_weight()
@@ -306,7 +307,10 @@
         lhe2=  lhe_parser.EventFile(pjoin(self.run_dir,'Events','run_01', 'rwgt_events_tree_rwgt_1.lhe.gz'))
         solutions = [-113.54512, -113.58961, 113.54938, 113.48467, 113.54938, 113.12672, -113.4863, 113.54938, 113.54938, -113.26805, 105.5589, 110.41614, -113.57167, -113.26911, 113.53355, 113.54938, 113.54869, 113.43885, 113.4151, 113.43279, -113.59921, -113.54938, 113.47688, -113.41315, 113.54938, 113.54938, 113.50453, 113.54938, -113.34559, 113.41821, 113.50674, 113.54273, -113.55721, 113.5204, 113.54938, 113.9101, 113.54938, 110.76533, 85.233315, 113.38153, 113.4684, 113.41541, 113.54272, 114.08548, -113.54938, -113.48963, 113.47811, 86.336518, -113.53947, 113.62442, 113.54938, 119.1288, -113.54595, 113.39149, 113.6222, -113.50107, 114.29253, 81.891469, 113.43238, 113.59844, 112.58522, 113.53639, 111.24306, -113.52251, -113.42222, 113.53443, 113.52775, 113.59714, 101.79775, -173.10123, -113.64323, -113.52939, 113.76665, 113.38901, 113.54938, -113.85094, 112.01344, 113.52052, 113.54769, 113.54938, 113.54938, -113.74874, 114.35555, 113.49268, 113.1658, -113.54938, 113.54938, 113.45114, -106.86842, -113.25424, 113.54488, -113.70535, 113.53027, 113.02052, 113.54938, 113.54938, 113.48797, 113.5419, 113.47777, 113.53698, -113.54938, 113.58857, -113.59011, -113.53687, -113.5632, -113.54938, 50.881047, 113.54904, 113.54696, -113.53998, 98.021403, 113.52701, 113.54544, 112.85106, 113.54891, 113.54938, 113.48127, 113.27728, 113.43749, 113.4915, 113.5246, 113.48554, 113.48386, 112.76115, -113.51762, 113.54938, 112.42106, 113.47272, 115.03299, -113.53507, 113.3365, 113.48839, -113.62701, 113.54938, 113.54019, 115.84251, 113.45177, -113.5123, 113.54938, 113.53011, 109.36941, 112.78596, 113.53325, -113.62137, 113.19992, 114.3632, 113.557, 113.54938, 113.5199, 113.42012, -113.57844, 49.469316, 112.17603, 113.51455, 113.51559, 113.54938]
         for i,event in enumerate(lhe): 
-            event2 = next(lhe2)
+            try:
+                event2 = next(lhe2)
+            except StopIteration:
+                raise Exception('incomplete rwgt file')
             rwgt_data = event.parse_reweight()
             #solutions.append(rwgt_data['MYNLO_tree'])
             if i < len(solutions):
 
=== modified file 'tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/matrix1.f'
--- tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/matrix1.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/matrix1.f	2021-01-26 14:28:22 +0000
@@ -312,10 +312,10 @@
       COMPLEX*16 DUM0,DUM1
       DATA DUM0, DUM1/(0D0, 0D0), (1D0, 0D0)/
 
+      DOUBLE PRECISION FK_WZ
       DOUBLE PRECISION FK_ZERO
-      DOUBLE PRECISION FK_WZ
+      SAVE FK_WZ
       SAVE FK_ZERO
-      SAVE FK_WZ
 
       LOGICAL FIRST
       DATA FIRST /.TRUE./
 
=== modified file 'tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_standalone/matrix.f'
--- tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_standalone/matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_standalone/matrix.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,5) /-1, 1,-1,-1,-1/
       DATA (NHEL(I,   2),I=1,5) /-1, 1,-1,-1, 1/
@@ -132,6 +135,17 @@
       LOGICAL IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%helas_calls_uvct_1.f'
--- tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%helas_calls_uvct_1.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%helas_calls_uvct_1.f	2021-01-26 14:28:22 +0000
@@ -101,24 +101,24 @@
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 41
       CALL FFV1_0(W(1,4),W(1,3),W(1,5),GC_5,AMPL(1,81))
-      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 42
       CALL FFV1_0(W(1,4),W(1,6),W(1,2),GC_5,AMPL(2,82))
       AMPL(2,82)=AMPL(2,82)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 43
       CALL FFV1_0(W(1,4),W(1,6),W(1,2),GC_5,AMPL(1,83))
-      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 44
       CALL FFV1_0(W(1,7),W(1,3),W(1,2),GC_5,AMPL(2,84))
       AMPL(2,84)=AMPL(2,84)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 45
       CALL FFV1_0(W(1,7),W(1,3),W(1,2),GC_5,AMPL(1,85))
-      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     At this point, all UVCT amps needed for (QCD=6), i.e. of split
 C      order ID=1, are computed.
       IF(FILTER_SO.AND.SQSO_TARGET.EQ.1) GOTO 3000
 
=== modified file 'tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%mp_helas_calls_uvct_1.f'
--- tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%mp_helas_calls_uvct_1.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%mp_helas_calls_uvct_1.f	2021-01-26 14:28:22 +0000
@@ -85,24 +85,24 @@
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 41
       CALL MP_FFV1_0(W(1,4),W(1,3),W(1,5),GC_5,AMPL(1,81))
-      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 42
       CALL MP_FFV1_0(W(1,4),W(1,6),W(1,2),GC_5,AMPL(2,82))
       AMPL(2,82)=AMPL(2,82)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 43
       CALL MP_FFV1_0(W(1,4),W(1,6),W(1,2),GC_5,AMPL(1,83))
-      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 44
       CALL MP_FFV1_0(W(1,7),W(1,3),W(1,2),GC_5,AMPL(2,84))
       AMPL(2,84)=AMPL(2,84)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 45
       CALL MP_FFV1_0(W(1,7),W(1,3),W(1,2),GC_5,AMPL(1,85))
-      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     At this point, all UVCT amps needed for (QCD=6), i.e. of split
 C      order ID=1, are computed.
       IF(FILTER_SO.AND.SQSO_TARGET.EQ.1) GOTO 3000
 
=== modified file 'tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_NoSQSO.f'
--- tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_NoSQSO.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_NoSQSO.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,6) / 1,-1,-1, 1,-1, 1/
       DATA (NHEL(I,   2),I=1,6) / 1,-1,-1, 1,-1,-1/
@@ -164,6 +167,17 @@
       LOGICAL IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc	2021-01-26 14:28:22 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      DOUBLE PRECISION MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      DOUBLE PRECISION MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       DOUBLE COMPLEX GC_4, GC_5, R2_GQQ, R2_QQQ, UV_GQQG_1EPS,
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%input.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%input.inc	2021-01-26 14:28:22 +0000
@@ -8,18 +8,17 @@
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_,MDL_GWCFT_UV_B_FIN_
      $ ,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_,MDL_TWCFT_UV_FIN_
-     $ ,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3,MDL_CKM33
-     $ ,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
-     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
-     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
-     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
-     $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
-     $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
-     $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
-     $ ,MDL_VECTORWMDXU,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD
-     $ ,MDL_GW__EXP__2,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2
-     $ ,MDL_YB__EXP__2,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT
-     $ ,MDL_YMTAU
+     $ ,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM3X3
+     $ ,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF,MDL_MZ__EXP__2
+     $ ,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2,MDL_NCOL__EXP__2
+     $ ,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW,MDL_SQRT__AEW,MDL_EE
+     $ ,MDL_MW__EXP__2,MDL_SW2,MDL_CW,MDL_SQRT__SW2,MDL_SW,MDL_G1
+     $ ,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM,MDL_YB,MDL_YT,MDL_YTAU
+     $ ,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN,MDL_VECTORZUP
+     $ ,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN,MDL_VECTORWMDXU
+     $ ,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD,MDL_GW__EXP__2
+     $ ,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2,MDL_YB__EXP__2
+     $ ,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT,MDL_YMTAU
 
       COMMON/PARAMS_R/ MDL_SQRT__AS,MDL_G__EXP__4,MDL_G__EXP__2
      $ ,MDL_R2MIXEDFACTOR_FIN_,MDL_G_UVG_1EPS_,MDL_G_UVB_1EPS_
@@ -27,18 +26,17 @@
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_,MDL_GWCFT_UV_B_FIN_
      $ ,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_,MDL_TWCFT_UV_FIN_
-     $ ,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3,MDL_CKM33
-     $ ,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
-     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
-     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
-     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
-     $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
-     $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
-     $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
-     $ ,MDL_VECTORWMDXU,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD
-     $ ,MDL_GW__EXP__2,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2
-     $ ,MDL_YB__EXP__2,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT
-     $ ,MDL_YMTAU
+     $ ,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM3X3
+     $ ,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF,MDL_MZ__EXP__2
+     $ ,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2,MDL_NCOL__EXP__2
+     $ ,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW,MDL_SQRT__AEW,MDL_EE
+     $ ,MDL_MW__EXP__2,MDL_SW2,MDL_CW,MDL_SQRT__SW2,MDL_SW,MDL_G1
+     $ ,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM,MDL_YB,MDL_YT,MDL_YTAU
+     $ ,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN,MDL_VECTORZUP
+     $ ,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN,MDL_VECTORWMDXU
+     $ ,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD,MDL_GW__EXP__2
+     $ ,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2,MDL_YB__EXP__2
+     $ ,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT,MDL_YMTAU
 
 
       DOUBLE COMPLEX MDL_COMPLEXI,MDL_I1X33,MDL_I2X33,MDL_I3X33
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
+        MDL_CONJG__CKM3X3 = 1.000000D+00
+
+        MDL_CONJG__CKM22 = 1.000000D+00
+
         MDL_CKM22 = 1.000000D+00
 
         MDL_CKM3X3 = 1.000000D+00
 
-        MDL_CONJG__CKM3X3 = 1.000000D+00
-
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_NCOL = 3.000000D+00
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc	2021-01-26 14:28:22 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT,MP__MDL_MW
-     $ ,MP__MDL_MB
-
-      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT
-     $ ,MP__MDL_MW,MP__MDL_MB
-
-
-      REAL*16 MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
-
-      COMMON/MP_WIDTHS/ MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
+      REAL*16 MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW,MP__MDL_MH
+     $ ,MP__MDL_MZ
+
+      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW
+     $ ,MP__MDL_MH,MP__MDL_MZ
+
+
+      REAL*16 MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
+
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
 
 
       COMPLEX*32 MP__GC_4,MP__GC_5,MP__R2_GQQ,MP__R2_QQQ
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl_same_name.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl_same_name.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-01-26 14:28:22 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MP_MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      REAL*16 MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/MP_WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      REAL*16 MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MP_MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      REAL*16 MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       COMPLEX*32 GC_4,GC_5,R2_GQQ,R2_QQQ,UV_GQQG_1EPS,UV_GQQB_1EPS
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc	2021-01-26 14:28:22 +0000
@@ -9,22 +9,22 @@
      $ ,MP__MDL_TWCFT_UV_1EPS_,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2
      $ ,MP__MDL_G_UVB_FIN_,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
       COMMON/MP_PARAMS_R/ MP__MDL_SQRT__AS,MP__MDL_G__EXP__4
      $ ,MP__MDL_G__EXP__2,MP__MDL_R2MIXEDFACTOR_FIN_
@@ -34,22 +34,22 @@
      $ ,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2,MP__MDL_G_UVB_FIN_
      $ ,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
 
       COMPLEX*32 MP__MDL_COMPLEXI,MP__MDL_I1X33,MP__MDL_I2X33
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
+        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
+
+        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
+
         MP__MDL_CKM22 = 1.000000E+00_16
 
         MP__MDL_CKM3X3 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
-
         MP__MDL_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/born_matrix.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/born_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/born_matrix.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/ML5_0_HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/ML5_0_HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,5) / 1,-1,-1, 1,-1/
       DATA (NHEL(I,   2),I=1,5) / 1,-1,-1, 1, 1/
@@ -132,6 +135,17 @@
       LOGICAL ML5_0_IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/loop_matrix.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/loop_matrix.f	2020-09-28 07:37:07 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/loop_matrix.f	2021-01-26 14:28:22 +0000
@@ -795,13 +795,13 @@
           AMPL(2,25)=AMPL(2,25)*(2.0D0*UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 15
           CALL FFV2_0(W(1,6,H),W(1,2,H),W(1,7,H),GC_11,AMPL(1,26))
-          AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
+          AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_2+1.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 16
           CALL FFV2_0(W(1,1,H),W(1,8,H),W(1,7,H),GC_11,AMPL(2,27))
           AMPL(2,27)=AMPL(2,27)*(2.0D0*UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 17
           CALL FFV2_0(W(1,1,H),W(1,8,H),W(1,7,H),GC_11,AMPL(1,28))
-          AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
+          AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_2+1.0D0*UVWFCT_G_1)
  300      CONTINUE
 
 
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/mp_born_amps_and_wfs.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/mp_born_amps_and_wfs.f	2020-09-28 07:37:07 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/mp_born_amps_and_wfs.f	2021-01-26 14:28:22 +0000
@@ -180,13 +180,13 @@
           AMPL(2,25)=AMPL(2,25)*(2.0D0*UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 15
           CALL MP_FFV2_0(W(1,6,H),W(1,2,H),W(1,7,H),GC_11,AMPL(1,26))
-          AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
+          AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_2+1.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 16
           CALL MP_FFV2_0(W(1,1,H),W(1,8,H),W(1,7,H),GC_11,AMPL(2,27))
           AMPL(2,27)=AMPL(2,27)*(2.0D0*UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 17
           CALL MP_FFV2_0(W(1,1,H),W(1,8,H),W(1,7,H),GC_11,AMPL(1,28))
-          AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
+          AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_2+1.0D0*UVWFCT_G_1)
 C         Copy the qp wfs to the dp ones as they are used to setup the
 C          CT calls.
           DO I=1,NWAVEFUNCS
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%coupl.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%coupl.inc	2021-01-26 14:28:22 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      DOUBLE PRECISION MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      DOUBLE PRECISION MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       DOUBLE COMPLEX GC_4, GC_5, GC_6, R2_3GQ, R2_3GG, R2_GQQ, R2_GGQ,
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%input.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%input.inc	2021-01-26 14:28:22 +0000
@@ -8,18 +8,17 @@
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_,MDL_GWCFT_UV_B_FIN_
      $ ,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_,MDL_TWCFT_UV_FIN_
-     $ ,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3,MDL_CKM33
-     $ ,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
-     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
-     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
-     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
-     $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
-     $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
-     $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
-     $ ,MDL_VECTORWMDXU,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD
-     $ ,MDL_GW__EXP__2,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2
-     $ ,MDL_YB__EXP__2,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT
-     $ ,MDL_YMTAU
+     $ ,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM3X3
+     $ ,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF,MDL_MZ__EXP__2
+     $ ,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2,MDL_NCOL__EXP__2
+     $ ,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW,MDL_SQRT__AEW,MDL_EE
+     $ ,MDL_MW__EXP__2,MDL_SW2,MDL_CW,MDL_SQRT__SW2,MDL_SW,MDL_G1
+     $ ,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM,MDL_YB,MDL_YT,MDL_YTAU
+     $ ,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN,MDL_VECTORZUP
+     $ ,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN,MDL_VECTORWMDXU
+     $ ,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD,MDL_GW__EXP__2
+     $ ,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2,MDL_YB__EXP__2
+     $ ,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT,MDL_YMTAU
 
       COMMON/PARAMS_R/ MDL_SQRT__AS,MDL_G__EXP__4,MDL_G__EXP__2
      $ ,MDL_R2MIXEDFACTOR_FIN_,MDL_G_UVG_1EPS_,MDL_G_UVB_1EPS_
@@ -27,18 +26,17 @@
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_,MDL_GWCFT_UV_B_FIN_
      $ ,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_,MDL_TWCFT_UV_FIN_
-     $ ,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3,MDL_CKM33
-     $ ,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
-     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
-     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
-     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
-     $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
-     $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
-     $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
-     $ ,MDL_VECTORWMDXU,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD
-     $ ,MDL_GW__EXP__2,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2
-     $ ,MDL_YB__EXP__2,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT
-     $ ,MDL_YMTAU
+     $ ,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM3X3
+     $ ,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF,MDL_MZ__EXP__2
+     $ ,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2,MDL_NCOL__EXP__2
+     $ ,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW,MDL_SQRT__AEW,MDL_EE
+     $ ,MDL_MW__EXP__2,MDL_SW2,MDL_CW,MDL_SQRT__SW2,MDL_SW,MDL_G1
+     $ ,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM,MDL_YB,MDL_YT,MDL_YTAU
+     $ ,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN,MDL_VECTORZUP
+     $ ,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN,MDL_VECTORWMDXU
+     $ ,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD,MDL_GW__EXP__2
+     $ ,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2,MDL_YB__EXP__2
+     $ ,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT,MDL_YMTAU
 
 
       DOUBLE COMPLEX MDL_BMASS_UV_1EPS_,MDL_TMASS_UV_1EPS_
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
+        MDL_CONJG__CKM3X3 = 1.000000D+00
+
+        MDL_CONJG__CKM22 = 1.000000D+00
+
         MDL_CKM22 = 1.000000D+00
 
         MDL_CKM3X3 = 1.000000D+00
 
-        MDL_CONJG__CKM3X3 = 1.000000D+00
-
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_NCOL = 3.000000D+00
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc	2021-01-26 14:28:22 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT,MP__MDL_MW
-     $ ,MP__MDL_MB
-
-      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT
-     $ ,MP__MDL_MW,MP__MDL_MB
-
-
-      REAL*16 MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
-
-      COMMON/MP_WIDTHS/ MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
+      REAL*16 MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW,MP__MDL_MH
+     $ ,MP__MDL_MZ
+
+      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW
+     $ ,MP__MDL_MH,MP__MDL_MZ
+
+
+      REAL*16 MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
+
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
 
 
       COMPLEX*32 MP__GC_4,MP__GC_5,MP__GC_6,MP__R2_3GQ,MP__R2_3GG
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_coupl_same_name.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-01-26 14:28:22 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MP_MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      REAL*16 MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/MP_WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      REAL*16 MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MP_MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      REAL*16 MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       COMPLEX*32 GC_4,GC_5,GC_6,R2_3GQ,R2_3GG,R2_GQQ,R2_GGQ,R2_GGB
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc	2021-01-26 14:28:22 +0000
@@ -9,22 +9,22 @@
      $ ,MP__MDL_TWCFT_UV_1EPS_,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2
      $ ,MP__MDL_G_UVB_FIN_,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
       COMMON/MP_PARAMS_R/ MP__MDL_SQRT__AS,MP__MDL_G__EXP__4
      $ ,MP__MDL_G__EXP__2,MP__MDL_R2MIXEDFACTOR_FIN_
@@ -34,22 +34,22 @@
      $ ,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2,MP__MDL_G_UVB_FIN_
      $ ,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
 
       COMPLEX*32 MP__MDL_BMASS_UV_1EPS_,MP__MDL_TMASS_UV_1EPS_
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
+        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
+
+        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
+
         MP__MDL_CKM22 = 1.000000E+00_16
 
         MP__MDL_CKM3X3 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
-
         MP__MDL_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/born_matrix.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/born_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/born_matrix.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/ML5_0_HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/ML5_0_HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,5) /-1,-1, 1,-1, 1/
       DATA (NHEL(I,   2),I=1,5) /-1,-1, 1,-1,-1/
@@ -148,6 +151,17 @@
       LOGICAL ML5_0_IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/loop_matrix.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/loop_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/loop_matrix.f	2021-01-26 14:28:22 +0000
@@ -1202,64 +1202,64 @@
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 136
           CALL FFV1_0(W(1,5,H),W(1,7,H),W(1,6,H),GC_5,AMPL(1,238))
-          AMPL(1,238)=AMPL(1,238)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,238)=AMPL(1,238)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 137
           CALL FFV1_0(W(1,8,H),W(1,4,H),W(1,6,H),GC_5,AMPL(2,239))
           AMPL(2,239)=AMPL(2,239)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 138
           CALL FFV1_0(W(1,8,H),W(1,4,H),W(1,6,H),GC_5,AMPL(1,240))
-          AMPL(1,240)=AMPL(1,240)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,240)=AMPL(1,240)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 139
           CALL FFV2_0(W(1,10,H),W(1,9,H),W(1,3,H),GC_11,AMPL(2,241))
           AMPL(2,241)=AMPL(2,241)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 140
           CALL FFV2_0(W(1,10,H),W(1,9,H),W(1,3,H),GC_11,AMPL(1,242))
-          AMPL(1,242)=AMPL(1,242)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,242)=AMPL(1,242)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 141
           CALL FFV1_0(W(1,8,H),W(1,9,H),W(1,2,H),GC_5,AMPL(2,243))
           AMPL(2,243)=AMPL(2,243)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 142
           CALL FFV1_0(W(1,8,H),W(1,9,H),W(1,2,H),GC_5,AMPL(1,244))
-          AMPL(1,244)=AMPL(1,244)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,244)=AMPL(1,244)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 143
           CALL FFV2_0(W(1,11,H),W(1,12,H),W(1,3,H),GC_11,AMPL(2,245))
           AMPL(2,245)=AMPL(2,245)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 144
           CALL FFV2_0(W(1,11,H),W(1,12,H),W(1,3,H),GC_11,AMPL(1,246))
-          AMPL(1,246)=AMPL(1,246)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,246)=AMPL(1,246)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 145
           CALL FFV1_0(W(1,11,H),W(1,7,H),W(1,2,H),GC_5,AMPL(2,247))
           AMPL(2,247)=AMPL(2,247)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 146
           CALL FFV1_0(W(1,11,H),W(1,7,H),W(1,2,H),GC_5,AMPL(1,248))
-          AMPL(1,248)=AMPL(1,248)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,248)=AMPL(1,248)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 147
           CALL FFV1_0(W(1,8,H),W(1,12,H),W(1,1,H),GC_5,AMPL(2,249))
           AMPL(2,249)=AMPL(2,249)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 148
           CALL FFV1_0(W(1,8,H),W(1,12,H),W(1,1,H),GC_5,AMPL(1,250))
-          AMPL(1,250)=AMPL(1,250)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,250)=AMPL(1,250)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 149
           CALL FFV1_0(W(1,10,H),W(1,7,H),W(1,1,H),GC_5,AMPL(2,251))
           AMPL(2,251)=AMPL(2,251)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 150
           CALL FFV1_0(W(1,10,H),W(1,7,H),W(1,1,H),GC_5,AMPL(1,252))
-          AMPL(1,252)=AMPL(1,252)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,252)=AMPL(1,252)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
  300      CONTINUE
 
 
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/mp_born_amps_and_wfs.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/mp_born_amps_and_wfs.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/mp_born_amps_and_wfs.f	2021-01-26 14:28:22 +0000
@@ -656,32 +656,32 @@
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 136
           CALL MP_FFV1_0(W(1,5,H),W(1,7,H),W(1,6,H),GC_5,AMPL(1,238))
-          AMPL(1,238)=AMPL(1,238)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,238)=AMPL(1,238)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 137
           CALL MP_FFV1_0(W(1,8,H),W(1,4,H),W(1,6,H),GC_5,AMPL(2,239))
           AMPL(2,239)=AMPL(2,239)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 138
           CALL MP_FFV1_0(W(1,8,H),W(1,4,H),W(1,6,H),GC_5,AMPL(1,240))
-          AMPL(1,240)=AMPL(1,240)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,240)=AMPL(1,240)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 139
           CALL MP_FFV2_0(W(1,10,H),W(1,9,H),W(1,3,H),GC_11,AMPL(2,241))
           AMPL(2,241)=AMPL(2,241)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 140
           CALL MP_FFV2_0(W(1,10,H),W(1,9,H),W(1,3,H),GC_11,AMPL(1,242))
-          AMPL(1,242)=AMPL(1,242)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,242)=AMPL(1,242)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 141
           CALL MP_FFV1_0(W(1,8,H),W(1,9,H),W(1,2,H),GC_5,AMPL(2,243))
           AMPL(2,243)=AMPL(2,243)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 142
           CALL MP_FFV1_0(W(1,8,H),W(1,9,H),W(1,2,H),GC_5,AMPL(1,244))
-          AMPL(1,244)=AMPL(1,244)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,244)=AMPL(1,244)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 143
           CALL MP_FFV2_0(W(1,11,H),W(1,12,H),W(1,3,H),GC_11,AMPL(2,245)
      $     )
@@ -690,32 +690,32 @@
 C         Amplitude(s) for UVCT diagram with ID 144
           CALL MP_FFV2_0(W(1,11,H),W(1,12,H),W(1,3,H),GC_11,AMPL(1,246)
      $     )
-          AMPL(1,246)=AMPL(1,246)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,246)=AMPL(1,246)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 145
           CALL MP_FFV1_0(W(1,11,H),W(1,7,H),W(1,2,H),GC_5,AMPL(2,247))
           AMPL(2,247)=AMPL(2,247)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 146
           CALL MP_FFV1_0(W(1,11,H),W(1,7,H),W(1,2,H),GC_5,AMPL(1,248))
-          AMPL(1,248)=AMPL(1,248)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,248)=AMPL(1,248)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 147
           CALL MP_FFV1_0(W(1,8,H),W(1,12,H),W(1,1,H),GC_5,AMPL(2,249))
           AMPL(2,249)=AMPL(2,249)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 148
           CALL MP_FFV1_0(W(1,8,H),W(1,12,H),W(1,1,H),GC_5,AMPL(1,250))
-          AMPL(1,250)=AMPL(1,250)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,250)=AMPL(1,250)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 149
           CALL MP_FFV1_0(W(1,10,H),W(1,7,H),W(1,1,H),GC_5,AMPL(2,251))
           AMPL(2,251)=AMPL(2,251)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 150
           CALL MP_FFV1_0(W(1,10,H),W(1,7,H),W(1,1,H),GC_5,AMPL(1,252))
-          AMPL(1,252)=AMPL(1,252)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+          AMPL(1,252)=AMPL(1,252)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +1.0D0*UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C         Copy the qp wfs to the dp ones as they are used to setup the
 C          CT calls.
           DO I=1,NWAVEFUNCS
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc	2021-01-26 14:28:22 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      DOUBLE PRECISION MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      DOUBLE PRECISION MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       DOUBLE COMPLEX GC_4, GC_5, R2_GQQ, R2_QQQ, UV_GQQG_1EPS,
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%input.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%input.inc	2021-01-26 14:28:22 +0000
@@ -8,18 +8,17 @@
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_,MDL_GWCFT_UV_B_FIN_
      $ ,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_,MDL_TWCFT_UV_FIN_
-     $ ,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3,MDL_CKM33
-     $ ,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
-     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
-     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
-     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
-     $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
-     $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
-     $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
-     $ ,MDL_VECTORWMDXU,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD
-     $ ,MDL_GW__EXP__2,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2
-     $ ,MDL_YB__EXP__2,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT
-     $ ,MDL_YMTAU
+     $ ,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM3X3
+     $ ,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF,MDL_MZ__EXP__2
+     $ ,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2,MDL_NCOL__EXP__2
+     $ ,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW,MDL_SQRT__AEW,MDL_EE
+     $ ,MDL_MW__EXP__2,MDL_SW2,MDL_CW,MDL_SQRT__SW2,MDL_SW,MDL_G1
+     $ ,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM,MDL_YB,MDL_YT,MDL_YTAU
+     $ ,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN,MDL_VECTORZUP
+     $ ,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN,MDL_VECTORWMDXU
+     $ ,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD,MDL_GW__EXP__2
+     $ ,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2,MDL_YB__EXP__2
+     $ ,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT,MDL_YMTAU
 
       COMMON/PARAMS_R/ MDL_SQRT__AS,MDL_G__EXP__4,MDL_G__EXP__2
      $ ,MDL_R2MIXEDFACTOR_FIN_,MDL_G_UVG_1EPS_,MDL_G_UVB_1EPS_
@@ -27,18 +26,17 @@
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_,MDL_GWCFT_UV_B_FIN_
      $ ,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_,MDL_TWCFT_UV_FIN_
-     $ ,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3,MDL_CKM33
-     $ ,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
-     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
-     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
-     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
-     $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
-     $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
-     $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
-     $ ,MDL_VECTORWMDXU,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD
-     $ ,MDL_GW__EXP__2,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2
-     $ ,MDL_YB__EXP__2,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT
-     $ ,MDL_YMTAU
+     $ ,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM3X3
+     $ ,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF,MDL_MZ__EXP__2
+     $ ,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2,MDL_NCOL__EXP__2
+     $ ,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW,MDL_SQRT__AEW,MDL_EE
+     $ ,MDL_MW__EXP__2,MDL_SW2,MDL_CW,MDL_SQRT__SW2,MDL_SW,MDL_G1
+     $ ,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM,MDL_YB,MDL_YT,MDL_YTAU
+     $ ,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN,MDL_VECTORZUP
+     $ ,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN,MDL_VECTORWMDXU
+     $ ,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD,MDL_GW__EXP__2
+     $ ,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2,MDL_YB__EXP__2
+     $ ,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT,MDL_YMTAU
 
 
       DOUBLE COMPLEX MDL_COMPLEXI,MDL_I1X33,MDL_I2X33,MDL_I3X33
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
+        MDL_CONJG__CKM3X3 = 1.000000D+00
+
+        MDL_CONJG__CKM22 = 1.000000D+00
+
         MDL_CKM22 = 1.000000D+00
 
         MDL_CKM3X3 = 1.000000D+00
 
-        MDL_CONJG__CKM3X3 = 1.000000D+00
-
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_NCOL = 3.000000D+00
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc	2021-01-26 14:28:22 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT,MP__MDL_MW
-     $ ,MP__MDL_MB
-
-      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT
-     $ ,MP__MDL_MW,MP__MDL_MB
-
-
-      REAL*16 MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
-
-      COMMON/MP_WIDTHS/ MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
+      REAL*16 MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW,MP__MDL_MH
+     $ ,MP__MDL_MZ
+
+      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW
+     $ ,MP__MDL_MH,MP__MDL_MZ
+
+
+      REAL*16 MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
+
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
 
 
       COMPLEX*32 MP__GC_4,MP__GC_5,MP__R2_GQQ,MP__R2_QQQ
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl_same_name.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl_same_name.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-01-26 14:28:22 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MP_MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      REAL*16 MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/MP_WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      REAL*16 MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MP_MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      REAL*16 MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       COMPLEX*32 GC_4,GC_5,R2_GQQ,R2_QQQ,UV_GQQG_1EPS,UV_GQQB_1EPS
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc	2021-01-26 14:28:22 +0000
@@ -9,22 +9,22 @@
      $ ,MP__MDL_TWCFT_UV_1EPS_,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2
      $ ,MP__MDL_G_UVB_FIN_,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
       COMMON/MP_PARAMS_R/ MP__MDL_SQRT__AS,MP__MDL_G__EXP__4
      $ ,MP__MDL_G__EXP__2,MP__MDL_R2MIXEDFACTOR_FIN_
@@ -34,22 +34,22 @@
      $ ,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2,MP__MDL_G_UVB_FIN_
      $ ,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
 
       COMPLEX*32 MP__MDL_COMPLEXI,MP__MDL_I1X33,MP__MDL_I2X33
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
+        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
+
+        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
+
         MP__MDL_CKM22 = 1.000000E+00_16
 
         MP__MDL_CKM3X3 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
-
         MP__MDL_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/born_matrix.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/born_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/born_matrix.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/ML5_0_HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/ML5_0_HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,5) / 1,-1,-1, 1,-1/
       DATA (NHEL(I,   2),I=1,5) / 1,-1,-1, 1, 1/
@@ -132,6 +135,17 @@
       LOGICAL ML5_0_IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/helas_calls_uvct_1.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/helas_calls_uvct_1.f	2020-09-28 07:37:07 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/helas_calls_uvct_1.f	2021-01-26 14:28:22 +0000
@@ -100,13 +100,13 @@
       AMPL(2,25)=AMPL(2,25)*(2.0D0*UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 15
       CALL FFV2_0(W(1,6),W(1,2),W(1,7),GC_11,AMPL(1,26))
-      AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
+      AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_2+1.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 16
       CALL FFV2_0(W(1,1),W(1,8),W(1,7),GC_11,AMPL(2,27))
       AMPL(2,27)=AMPL(2,27)*(2.0D0*UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 17
       CALL FFV2_0(W(1,1),W(1,8),W(1,7),GC_11,AMPL(1,28))
-      AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
+      AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_2+1.0D0*UVWFCT_G_1)
 
       GOTO 1001
  3000 CONTINUE
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/mp_helas_calls_uvct_1.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/mp_helas_calls_uvct_1.f	2020-09-28 07:37:07 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/mp_helas_calls_uvct_1.f	2021-01-26 14:28:22 +0000
@@ -84,13 +84,13 @@
       AMPL(2,25)=AMPL(2,25)*(2.0D0*UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 15
       CALL MP_FFV2_0(W(1,6),W(1,2),W(1,7),GC_11,AMPL(1,26))
-      AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
+      AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_2+1.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 16
       CALL MP_FFV2_0(W(1,1),W(1,8),W(1,7),GC_11,AMPL(2,27))
       AMPL(2,27)=AMPL(2,27)*(2.0D0*UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 17
       CALL MP_FFV2_0(W(1,1),W(1,8),W(1,7),GC_11,AMPL(1,28))
-      AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
+      AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_2+1.0D0*UVWFCT_G_1)
 
       GOTO 1001
  3000 CONTINUE
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%coupl.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%coupl.inc	2021-01-26 14:28:22 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      DOUBLE PRECISION MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      DOUBLE PRECISION MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       DOUBLE COMPLEX GC_4, GC_5, GC_6, R2_3GQ, R2_3GG, R2_GQQ, R2_GGQ,
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%input.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%input.inc	2021-01-26 14:28:22 +0000
@@ -8,18 +8,17 @@
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_,MDL_GWCFT_UV_B_FIN_
      $ ,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_,MDL_TWCFT_UV_FIN_
-     $ ,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3,MDL_CKM33
-     $ ,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
-     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
-     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
-     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
-     $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
-     $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
-     $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
-     $ ,MDL_VECTORWMDXU,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD
-     $ ,MDL_GW__EXP__2,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2
-     $ ,MDL_YB__EXP__2,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT
-     $ ,MDL_YMTAU
+     $ ,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM3X3
+     $ ,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF,MDL_MZ__EXP__2
+     $ ,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2,MDL_NCOL__EXP__2
+     $ ,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW,MDL_SQRT__AEW,MDL_EE
+     $ ,MDL_MW__EXP__2,MDL_SW2,MDL_CW,MDL_SQRT__SW2,MDL_SW,MDL_G1
+     $ ,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM,MDL_YB,MDL_YT,MDL_YTAU
+     $ ,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN,MDL_VECTORZUP
+     $ ,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN,MDL_VECTORWMDXU
+     $ ,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD,MDL_GW__EXP__2
+     $ ,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2,MDL_YB__EXP__2
+     $ ,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT,MDL_YMTAU
 
       COMMON/PARAMS_R/ MDL_SQRT__AS,MDL_G__EXP__4,MDL_G__EXP__2
      $ ,MDL_R2MIXEDFACTOR_FIN_,MDL_G_UVG_1EPS_,MDL_G_UVB_1EPS_
@@ -27,18 +26,17 @@
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_,MDL_GWCFT_UV_B_FIN_
      $ ,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_,MDL_TWCFT_UV_FIN_
-     $ ,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3,MDL_CKM33
-     $ ,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
-     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
-     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
-     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
-     $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
-     $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
-     $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
-     $ ,MDL_VECTORWMDXU,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD
-     $ ,MDL_GW__EXP__2,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2
-     $ ,MDL_YB__EXP__2,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT
-     $ ,MDL_YMTAU
+     $ ,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM3X3
+     $ ,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF,MDL_MZ__EXP__2
+     $ ,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2,MDL_NCOL__EXP__2
+     $ ,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW,MDL_SQRT__AEW,MDL_EE
+     $ ,MDL_MW__EXP__2,MDL_SW2,MDL_CW,MDL_SQRT__SW2,MDL_SW,MDL_G1
+     $ ,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM,MDL_YB,MDL_YT,MDL_YTAU
+     $ ,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN,MDL_VECTORZUP
+     $ ,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN,MDL_VECTORWMDXU
+     $ ,MDL_AXIALWMDXU,MDL_VECTORWPUXD,MDL_AXIALWPUXD,MDL_GW__EXP__2
+     $ ,MDL_CW__EXP__2,MDL_EE__EXP__2,MDL_SW__EXP__2,MDL_YB__EXP__2
+     $ ,MDL_YT__EXP__2,AEWM1,MDL_GF,AS,MDL_YMB,MDL_YMT,MDL_YMTAU
 
 
       DOUBLE COMPLEX MDL_BMASS_UV_1EPS_,MDL_TMASS_UV_1EPS_
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
+        MDL_CONJG__CKM3X3 = 1.000000D+00
+
+        MDL_CONJG__CKM22 = 1.000000D+00
+
         MDL_CKM22 = 1.000000D+00
 
         MDL_CKM3X3 = 1.000000D+00
 
-        MDL_CONJG__CKM3X3 = 1.000000D+00
-
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_NCOL = 3.000000D+00
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc	2021-01-26 14:28:22 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT,MP__MDL_MW
-     $ ,MP__MDL_MB
-
-      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT
-     $ ,MP__MDL_MW,MP__MDL_MB
-
-
-      REAL*16 MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
-
-      COMMON/MP_WIDTHS/ MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
+      REAL*16 MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW,MP__MDL_MH
+     $ ,MP__MDL_MZ
+
+      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW
+     $ ,MP__MDL_MH,MP__MDL_MZ
+
+
+      REAL*16 MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
+
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
 
 
       COMPLEX*32 MP__GC_4,MP__GC_5,MP__GC_6,MP__R2_3GQ,MP__R2_3GG
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_coupl_same_name.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-01-26 14:28:22 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MP_MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      REAL*16 MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/MP_WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      REAL*16 MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MP_MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      REAL*16 MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       COMPLEX*32 GC_4,GC_5,GC_6,R2_3GQ,R2_3GG,R2_GQQ,R2_GGQ,R2_GGB
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc	2021-01-26 14:28:22 +0000
@@ -9,22 +9,22 @@
      $ ,MP__MDL_TWCFT_UV_1EPS_,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2
      $ ,MP__MDL_G_UVB_FIN_,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
       COMMON/MP_PARAMS_R/ MP__MDL_SQRT__AS,MP__MDL_G__EXP__4
      $ ,MP__MDL_G__EXP__2,MP__MDL_R2MIXEDFACTOR_FIN_
@@ -34,22 +34,22 @@
      $ ,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2,MP__MDL_G_UVB_FIN_
      $ ,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
 
       COMPLEX*32 MP__MDL_BMASS_UV_1EPS_,MP__MDL_TMASS_UV_1EPS_
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
+        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
+
+        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
+
         MP__MDL_CKM22 = 1.000000E+00_16
 
         MP__MDL_CKM3X3 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
-
         MP__MDL_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/born_matrix.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/born_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/born_matrix.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/ML5_0_HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/ML5_0_HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,5) /-1,-1, 1,-1, 1/
       DATA (NHEL(I,   2),I=1,5) /-1,-1, 1,-1,-1/
@@ -148,6 +151,17 @@
       LOGICAL ML5_0_IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/helas_calls_uvct_1.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/helas_calls_uvct_1.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/helas_calls_uvct_1.f	2021-01-26 14:28:22 +0000
@@ -101,64 +101,64 @@
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 136
       CALL FFV1_0(W(1,5),W(1,7),W(1,6),GC_5,AMPL(1,238))
-      AMPL(1,238)=AMPL(1,238)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,238)=AMPL(1,238)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 137
       CALL FFV1_0(W(1,8),W(1,4),W(1,6),GC_5,AMPL(2,239))
       AMPL(2,239)=AMPL(2,239)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 138
       CALL FFV1_0(W(1,8),W(1,4),W(1,6),GC_5,AMPL(1,240))
-      AMPL(1,240)=AMPL(1,240)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,240)=AMPL(1,240)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 139
       CALL FFV2_0(W(1,10),W(1,9),W(1,3),GC_11,AMPL(2,241))
       AMPL(2,241)=AMPL(2,241)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 140
       CALL FFV2_0(W(1,10),W(1,9),W(1,3),GC_11,AMPL(1,242))
-      AMPL(1,242)=AMPL(1,242)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,242)=AMPL(1,242)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 141
       CALL FFV1_0(W(1,8),W(1,9),W(1,2),GC_5,AMPL(2,243))
       AMPL(2,243)=AMPL(2,243)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 142
       CALL FFV1_0(W(1,8),W(1,9),W(1,2),GC_5,AMPL(1,244))
-      AMPL(1,244)=AMPL(1,244)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,244)=AMPL(1,244)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 143
       CALL FFV2_0(W(1,11),W(1,12),W(1,3),GC_11,AMPL(2,245))
       AMPL(2,245)=AMPL(2,245)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 144
       CALL FFV2_0(W(1,11),W(1,12),W(1,3),GC_11,AMPL(1,246))
-      AMPL(1,246)=AMPL(1,246)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,246)=AMPL(1,246)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 145
       CALL FFV1_0(W(1,11),W(1,7),W(1,2),GC_5,AMPL(2,247))
       AMPL(2,247)=AMPL(2,247)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 146
       CALL FFV1_0(W(1,11),W(1,7),W(1,2),GC_5,AMPL(1,248))
-      AMPL(1,248)=AMPL(1,248)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,248)=AMPL(1,248)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 147
       CALL FFV1_0(W(1,8),W(1,12),W(1,1),GC_5,AMPL(2,249))
       AMPL(2,249)=AMPL(2,249)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 148
       CALL FFV1_0(W(1,8),W(1,12),W(1,1),GC_5,AMPL(1,250))
-      AMPL(1,250)=AMPL(1,250)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,250)=AMPL(1,250)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 149
       CALL FFV1_0(W(1,10),W(1,7),W(1,1),GC_5,AMPL(2,251))
       AMPL(2,251)=AMPL(2,251)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 150
       CALL FFV1_0(W(1,10),W(1,7),W(1,1),GC_5,AMPL(1,252))
-      AMPL(1,252)=AMPL(1,252)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,252)=AMPL(1,252)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 
       GOTO 1001
  3000 CONTINUE
 
=== modified file 'tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/mp_helas_calls_uvct_1.f'
--- tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/mp_helas_calls_uvct_1.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/mp_helas_calls_uvct_1.f	2021-01-26 14:28:22 +0000
@@ -85,64 +85,64 @@
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 136
       CALL MP_FFV1_0(W(1,5),W(1,7),W(1,6),GC_5,AMPL(1,238))
-      AMPL(1,238)=AMPL(1,238)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,238)=AMPL(1,238)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 137
       CALL MP_FFV1_0(W(1,8),W(1,4),W(1,6),GC_5,AMPL(2,239))
       AMPL(2,239)=AMPL(2,239)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 138
       CALL MP_FFV1_0(W(1,8),W(1,4),W(1,6),GC_5,AMPL(1,240))
-      AMPL(1,240)=AMPL(1,240)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,240)=AMPL(1,240)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 139
       CALL MP_FFV2_0(W(1,10),W(1,9),W(1,3),GC_11,AMPL(2,241))
       AMPL(2,241)=AMPL(2,241)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 140
       CALL MP_FFV2_0(W(1,10),W(1,9),W(1,3),GC_11,AMPL(1,242))
-      AMPL(1,242)=AMPL(1,242)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,242)=AMPL(1,242)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 141
       CALL MP_FFV1_0(W(1,8),W(1,9),W(1,2),GC_5,AMPL(2,243))
       AMPL(2,243)=AMPL(2,243)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 142
       CALL MP_FFV1_0(W(1,8),W(1,9),W(1,2),GC_5,AMPL(1,244))
-      AMPL(1,244)=AMPL(1,244)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,244)=AMPL(1,244)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 143
       CALL MP_FFV2_0(W(1,11),W(1,12),W(1,3),GC_11,AMPL(2,245))
       AMPL(2,245)=AMPL(2,245)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 144
       CALL MP_FFV2_0(W(1,11),W(1,12),W(1,3),GC_11,AMPL(1,246))
-      AMPL(1,246)=AMPL(1,246)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,246)=AMPL(1,246)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 145
       CALL MP_FFV1_0(W(1,11),W(1,7),W(1,2),GC_5,AMPL(2,247))
       AMPL(2,247)=AMPL(2,247)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 146
       CALL MP_FFV1_0(W(1,11),W(1,7),W(1,2),GC_5,AMPL(1,248))
-      AMPL(1,248)=AMPL(1,248)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,248)=AMPL(1,248)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 147
       CALL MP_FFV1_0(W(1,8),W(1,12),W(1,1),GC_5,AMPL(2,249))
       AMPL(2,249)=AMPL(2,249)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 148
       CALL MP_FFV1_0(W(1,8),W(1,12),W(1,1),GC_5,AMPL(1,250))
-      AMPL(1,250)=AMPL(1,250)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,250)=AMPL(1,250)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 149
       CALL MP_FFV1_0(W(1,10),W(1,7),W(1,1),GC_5,AMPL(2,251))
       AMPL(2,251)=AMPL(2,251)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 150
       CALL MP_FFV1_0(W(1,10),W(1,7),W(1,1),GC_5,AMPL(1,252))
-      AMPL(1,252)=AMPL(1,252)*(2.0D0*UVWFCT_G_1+1.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2+1.0D0*UVWFCT_B_0)
+      AMPL(1,252)=AMPL(1,252)*(1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+1.0D0
+     $ *UVWFCT_B_0+2.0D0*UVWFCT_G_1)
 
       GOTO 1001
  3000 CONTINUE
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%coupl.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%coupl.inc	2021-01-26 14:28:22 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      DOUBLE PRECISION MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      DOUBLE PRECISION MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       DOUBLE COMPLEX GC_5, R2_GGHB, R2_GGHT, R2_GGHHB, R2_GGHHT, GC_30
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%input.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%input.inc	2021-01-26 14:28:22 +0000
@@ -6,11 +6,11 @@
      $ ,MDL_GWCFT_UV_B_1EPS_,MDL_GWCFT_UV_T_1EPS_,MDL_BWCFT_UV_1EPS_
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_GWCFT_UV_B_FIN_,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_
-     $ ,MDL_TWCFT_UV_FIN_,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF
-     $ ,MDL_CF,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2
-     $ ,MDL_MH__EXP__2,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2
-     $ ,MDL_AEW,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
+     $ ,MDL_TWCFT_UV_FIN_,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22
+     $ ,MDL_CKM3X3,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
+     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
+     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
+     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
      $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
      $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
      $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
@@ -23,11 +23,11 @@
      $ ,MDL_GWCFT_UV_B_1EPS_,MDL_GWCFT_UV_T_1EPS_,MDL_BWCFT_UV_1EPS_
      $ ,MDL_TWCFT_UV_1EPS_,MDL_G__EXP__3,MDL_MU_R__EXP__2
      $ ,MDL_GWCFT_UV_B_FIN_,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_
-     $ ,MDL_TWCFT_UV_FIN_,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF
-     $ ,MDL_CF,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2
-     $ ,MDL_MH__EXP__2,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2
-     $ ,MDL_AEW,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
+     $ ,MDL_TWCFT_UV_FIN_,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22
+     $ ,MDL_CKM3X3,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
+     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
+     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
+     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
      $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
      $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
      $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%intparam_definition.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
+        MDL_CONJG__CKM3X3 = 1.000000D+00
+
+        MDL_CONJG__CKM22 = 1.000000D+00
+
         MDL_CKM22 = 1.000000D+00
 
         MDL_CKM3X3 = 1.000000D+00
 
-        MDL_CONJG__CKM3X3 = 1.000000D+00
-
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_NCOL = 3.000000D+00
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_coupl.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_coupl.inc	2021-01-26 14:28:22 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT,MP__MDL_MW
-     $ ,MP__MDL_MB
-
-      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT
-     $ ,MP__MDL_MW,MP__MDL_MB
-
-
-      REAL*16 MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
-
-      COMMON/MP_WIDTHS/ MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
+      REAL*16 MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW,MP__MDL_MH
+     $ ,MP__MDL_MZ
+
+      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW
+     $ ,MP__MDL_MH,MP__MDL_MZ
+
+
+      REAL*16 MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
+
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
 
 
       COMPLEX*32 MP__GC_5,MP__R2_GGHB,MP__R2_GGHT,MP__R2_GGHHB
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_coupl_same_name.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_coupl_same_name.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-01-26 14:28:22 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MP_MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      REAL*16 MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/MP_WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      REAL*16 MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MP_MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      REAL*16 MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       COMPLEX*32 GC_5,R2_GGHB,R2_GGHT,R2_GGHHB,R2_GGHHT,GC_30,GC_33
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_input.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_input.inc	2021-01-26 14:28:22 +0000
@@ -7,32 +7,10 @@
      $ ,MP__MDL_BWCFT_UV_1EPS_,MP__MDL_TWCFT_UV_1EPS_
      $ ,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
-
-      COMMON/MP_PARAMS_R/ MP__MDL_SQRT__AS,MP__MDL_G__EXP__4
-     $ ,MP__MDL_G__EXP__2,MP__MDL_GWCFT_UV_B_1EPS_
-     $ ,MP__MDL_GWCFT_UV_T_1EPS_,MP__MDL_BWCFT_UV_1EPS_
-     $ ,MP__MDL_TWCFT_UV_1EPS_,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2
-     $ ,MP__MDL_GWCFT_UV_B_FIN_,MP__MDL_GWCFT_UV_T_FIN_
-     $ ,MP__MDL_BWCFT_UV_FIN_,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22
-     $ ,MP__MDL_CKM3X3,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33
-     $ ,MP__MDL_CONJG__CKM22,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA
-     $ ,MP__MDL_TF,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
      $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
      $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
      $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
@@ -46,6 +24,29 @@
      $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
      $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
+      COMMON/MP_PARAMS_R/ MP__MDL_SQRT__AS,MP__MDL_G__EXP__4
+     $ ,MP__MDL_G__EXP__2,MP__MDL_GWCFT_UV_B_1EPS_
+     $ ,MP__MDL_GWCFT_UV_T_1EPS_,MP__MDL_BWCFT_UV_1EPS_
+     $ ,MP__MDL_TWCFT_UV_1EPS_,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2
+     $ ,MP__MDL_GWCFT_UV_B_FIN_,MP__MDL_GWCFT_UV_T_FIN_
+     $ ,MP__MDL_BWCFT_UV_FIN_,MP__MDL_TWCFT_UV_FIN_
+     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CONJG__CKM22,MP__MDL_CKM22
+     $ ,MP__MDL_CKM3X3,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL
+     $ ,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF,MP__MDL_MZ__EXP__2
+     $ ,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2
+     $ ,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2
+     $ ,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2
+     $ ,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1
+     $ ,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB
+     $ ,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP
+     $ ,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN
+     $ ,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU
+     $ ,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD
+     $ ,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2
+     $ ,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2
+     $ ,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB,MP__MDL_YMT
+     $ ,MP__MDL_YMTAU
+
 
       COMPLEX*32 MP__MDL_COMPLEXI,MP__MDL_I1X33,MP__MDL_I2X33
      $ ,MP__MDL_I3X33,MP__MDL_I4X33,MP__MDL_VECTOR_TBGP
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_intparam_definition.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
+        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
+
+        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
+
         MP__MDL_CKM22 = 1.000000E+00_16
 
         MP__MDL_CKM3X3 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
-
         MP__MDL_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/born_matrix.f'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/born_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/born_matrix.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/ML5_0_HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/ML5_0_HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,4) / 1,-1,-1, 1/
       DATA (NHEL(I,   2),I=1,4) / 1,-1,-1,-1/
@@ -116,6 +119,17 @@
       LOGICAL ML5_0_IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%coupl.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%coupl.inc	2021-01-26 14:28:22 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      DOUBLE PRECISION MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      DOUBLE PRECISION MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       DOUBLE COMPLEX GC_4, GC_5, GC_6, R2_3GQ, R2_3GG, R2_GQQ, R2_GGQ,
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%input.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%input.inc	2021-01-26 14:28:22 +0000
@@ -7,11 +7,11 @@
      $ ,MDL_GWCFT_UV_T_1EPS_,MDL_BWCFT_UV_1EPS_,MDL_TWCFT_UV_1EPS_
      $ ,MDL_G__EXP__3,MDL_MU_R__EXP__2,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_
      $ ,MDL_GWCFT_UV_B_FIN_,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_
-     $ ,MDL_TWCFT_UV_FIN_,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF
-     $ ,MDL_CF,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2
-     $ ,MDL_MH__EXP__2,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2
-     $ ,MDL_AEW,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
+     $ ,MDL_TWCFT_UV_FIN_,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22
+     $ ,MDL_CKM3X3,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
+     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
+     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
+     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
      $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
      $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
      $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
@@ -25,11 +25,11 @@
      $ ,MDL_GWCFT_UV_T_1EPS_,MDL_BWCFT_UV_1EPS_,MDL_TWCFT_UV_1EPS_
      $ ,MDL_G__EXP__3,MDL_MU_R__EXP__2,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_
      $ ,MDL_GWCFT_UV_B_FIN_,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_
-     $ ,MDL_TWCFT_UV_FIN_,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF
-     $ ,MDL_CF,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2
-     $ ,MDL_MH__EXP__2,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2
-     $ ,MDL_AEW,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
+     $ ,MDL_TWCFT_UV_FIN_,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22
+     $ ,MDL_CKM3X3,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
+     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
+     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
+     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
      $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
      $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
      $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%intparam_definition.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
+        MDL_CONJG__CKM3X3 = 1.000000D+00
+
+        MDL_CONJG__CKM22 = 1.000000D+00
+
         MDL_CKM22 = 1.000000D+00
 
         MDL_CKM3X3 = 1.000000D+00
 
-        MDL_CONJG__CKM3X3 = 1.000000D+00
-
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_NCOL = 3.000000D+00
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl.inc	2021-01-26 14:28:22 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT,MP__MDL_MW
-     $ ,MP__MDL_MB
-
-      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT
-     $ ,MP__MDL_MW,MP__MDL_MB
-
-
-      REAL*16 MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
-
-      COMMON/MP_WIDTHS/ MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
+      REAL*16 MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW,MP__MDL_MH
+     $ ,MP__MDL_MZ
+
+      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW
+     $ ,MP__MDL_MH,MP__MDL_MZ
+
+
+      REAL*16 MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
+
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
 
 
       COMPLEX*32 MP__GC_4,MP__GC_5,MP__GC_6,MP__R2_3GQ,MP__R2_3GG
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl_same_name.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-01-26 14:28:22 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MP_MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      REAL*16 MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/MP_WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      REAL*16 MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MP_MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      REAL*16 MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       COMPLEX*32 GC_4,GC_5,GC_6,R2_3GQ,R2_3GG,R2_GQQ,R2_GGQ,R2_GGB
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_input.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_input.inc	2021-01-26 14:28:22 +0000
@@ -9,22 +9,22 @@
      $ ,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2,MP__MDL_G_UVB_FIN_
      $ ,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
       COMMON/MP_PARAMS_R/ MP__MDL_SQRT__AS,MP__MDL_G__EXP__4
      $ ,MP__MDL_G__EXP__2,MP__MDL_G_UVG_1EPS_,MP__MDL_G_UVB_1EPS_
@@ -33,22 +33,22 @@
      $ ,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2,MP__MDL_G_UVB_FIN_
      $ ,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
 
       COMPLEX*32 MP__MDL_TMASS_UV_1EPS_,MP__MDL_TMASS_UV_FIN_
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_intparam_definition.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
+        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
+
+        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
+
         MP__MDL_CKM22 = 1.000000E+00_16
 
         MP__MDL_CKM3X3 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
-
         MP__MDL_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/born_matrix.f'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/born_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/born_matrix.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/ML5_0_HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/ML5_0_HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,4) /-1,-1,-1, 1/
       DATA (NHEL(I,   2),I=1,4) /-1,-1,-1,-1/
@@ -116,6 +119,17 @@
       LOGICAL ML5_0_IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/loop_matrix.f'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/loop_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/loop_matrix.f	2021-01-26 14:28:22 +0000
@@ -891,24 +891,24 @@
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 41
           CALL FFV1_0(W(1,4,H),W(1,3,H),W(1,5,H),GC_5,AMPL(1,81))
-          AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2)
+          AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 42
           CALL FFV1_0(W(1,4,H),W(1,6,H),W(1,2,H),GC_5,AMPL(2,82))
           AMPL(2,82)=AMPL(2,82)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 43
           CALL FFV1_0(W(1,4,H),W(1,6,H),W(1,2,H),GC_5,AMPL(1,83))
-          AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2)
+          AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 44
           CALL FFV1_0(W(1,7,H),W(1,3,H),W(1,2,H),GC_5,AMPL(2,84))
           AMPL(2,84)=AMPL(2,84)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 45
           CALL FFV1_0(W(1,7,H),W(1,3,H),W(1,2,H),GC_5,AMPL(1,85))
-          AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2)
+          AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +2.0D0*UVWFCT_G_1)
  300      CONTINUE
 
 
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/mp_born_amps_and_wfs.f'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/mp_born_amps_and_wfs.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/mp_born_amps_and_wfs.f	2021-01-26 14:28:22 +0000
@@ -281,24 +281,24 @@
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 41
           CALL MP_FFV1_0(W(1,4,H),W(1,3,H),W(1,5,H),GC_5,AMPL(1,81))
-          AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2)
+          AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 42
           CALL MP_FFV1_0(W(1,4,H),W(1,6,H),W(1,2,H),GC_5,AMPL(2,82))
           AMPL(2,82)=AMPL(2,82)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 43
           CALL MP_FFV1_0(W(1,4,H),W(1,6,H),W(1,2,H),GC_5,AMPL(1,83))
-          AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2)
+          AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +2.0D0*UVWFCT_G_1)
 C         Amplitude(s) for UVCT diagram with ID 44
           CALL MP_FFV1_0(W(1,7,H),W(1,3,H),W(1,2,H),GC_5,AMPL(2,84))
           AMPL(2,84)=AMPL(2,84)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $     *UVWFCT_G_1_1EPS)
 C         Amplitude(s) for UVCT diagram with ID 45
           CALL MP_FFV1_0(W(1,7,H),W(1,3,H),W(1,2,H),GC_5,AMPL(1,85))
-          AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0
-     $     +2.0D0*UVWFCT_G_2)
+          AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2
+     $     +2.0D0*UVWFCT_G_1)
 C         Copy the qp wfs to the dp ones as they are used to setup the
 C          CT calls.
           DO I=1,NWAVEFUNCS
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/born_matrix.f'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/born_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/born_matrix.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/ML5_0_HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/ML5_0_HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,4) / 1,-1,-1, 1/
       DATA (NHEL(I,   2),I=1,4) / 1,-1,-1,-1/
@@ -116,6 +119,17 @@
       LOGICAL ML5_0_IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%coupl.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%coupl.inc	2021-01-26 14:28:22 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      DOUBLE PRECISION MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      DOUBLE PRECISION MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       DOUBLE COMPLEX GC_4, GC_5, GC_6, R2_3GQ, R2_3GG, R2_GQQ, R2_GGQ,
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%input.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%input.inc	2021-01-26 14:28:22 +0000
@@ -7,11 +7,11 @@
      $ ,MDL_GWCFT_UV_T_1EPS_,MDL_BWCFT_UV_1EPS_,MDL_TWCFT_UV_1EPS_
      $ ,MDL_G__EXP__3,MDL_MU_R__EXP__2,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_
      $ ,MDL_GWCFT_UV_B_FIN_,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_
-     $ ,MDL_TWCFT_UV_FIN_,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF
-     $ ,MDL_CF,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2
-     $ ,MDL_MH__EXP__2,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2
-     $ ,MDL_AEW,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
+     $ ,MDL_TWCFT_UV_FIN_,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22
+     $ ,MDL_CKM3X3,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
+     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
+     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
+     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
      $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
      $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
      $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
@@ -25,11 +25,11 @@
      $ ,MDL_GWCFT_UV_T_1EPS_,MDL_BWCFT_UV_1EPS_,MDL_TWCFT_UV_1EPS_
      $ ,MDL_G__EXP__3,MDL_MU_R__EXP__2,MDL_G_UVB_FIN_,MDL_G_UVT_FIN_
      $ ,MDL_GWCFT_UV_B_FIN_,MDL_GWCFT_UV_T_FIN_,MDL_BWCFT_UV_FIN_
-     $ ,MDL_TWCFT_UV_FIN_,MDL_CKM22,MDL_CKM3X3,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CONJG__CKM22,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF
-     $ ,MDL_CF,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2
-     $ ,MDL_MH__EXP__2,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2
-     $ ,MDL_AEW,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
+     $ ,MDL_TWCFT_UV_FIN_,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22
+     $ ,MDL_CKM3X3,MDL_CKM33,MDL_LHV,MDL_NCOL,MDL_CA,MDL_TF,MDL_CF
+     $ ,MDL_MZ__EXP__2,MDL_MZ__EXP__4,MDL_SQRT__2,MDL_MH__EXP__2
+     $ ,MDL_NCOL__EXP__2,MDL_MB__EXP__2,MDL_MT__EXP__2,MDL_AEW
+     $ ,MDL_SQRT__AEW,MDL_EE,MDL_MW__EXP__2,MDL_SW2,MDL_CW
      $ ,MDL_SQRT__SW2,MDL_SW,MDL_G1,MDL_GW,MDL_V,MDL_V__EXP__2,MDL_LAM
      $ ,MDL_YB,MDL_YT,MDL_YTAU,MDL_MUH,MDL_AXIALZUP,MDL_AXIALZDOWN
      $ ,MDL_VECTORZUP,MDL_VECTORZDOWN,MDL_VECTORAUP,MDL_VECTORADOWN
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%intparam_definition.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
+        MDL_CONJG__CKM3X3 = 1.000000D+00
+
+        MDL_CONJG__CKM22 = 1.000000D+00
+
         MDL_CKM22 = 1.000000D+00
 
         MDL_CKM3X3 = 1.000000D+00
 
-        MDL_CONJG__CKM3X3 = 1.000000D+00
-
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_NCOL = 3.000000D+00
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_coupl.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_coupl.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_coupl.inc	2021-01-26 14:28:22 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT,MP__MDL_MW
-     $ ,MP__MDL_MB
-
-      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MH,MP__MDL_MZ,MP__MDL_MT
-     $ ,MP__MDL_MW,MP__MDL_MB
-
-
-      REAL*16 MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
-
-      COMMON/MP_WIDTHS/ MP__MDL_WH,MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT
+      REAL*16 MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW,MP__MDL_MH
+     $ ,MP__MDL_MZ
+
+      COMMON/MP_MASSES/ MP__MDL_MTA,MP__MDL_MT,MP__MDL_MB,MP__MDL_MW
+     $ ,MP__MDL_MH,MP__MDL_MZ
+
+
+      REAL*16 MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
+
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WT,MP__MDL_WH,MP__MDL_WW
 
 
       COMPLEX*32 MP__GC_4,MP__GC_5,MP__GC_6,MP__R2_3GQ,MP__R2_3GG
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_coupl_same_name.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-01-26 14:28:22 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-      COMMON/MP_MASSES/ MDL_MTA,MDL_MH,MDL_MZ,MDL_MT,MDL_MW,MDL_MB
-
-
-      REAL*16 MDL_WH,MDL_WZ,MDL_WW,MDL_WT
-
-      COMMON/MP_WIDTHS/ MDL_WH,MDL_WZ,MDL_WW,MDL_WT
+      REAL*16 MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+      COMMON/MP_MASSES/ MDL_MTA,MDL_MT,MDL_MB,MDL_MW,MDL_MH,MDL_MZ
+
+
+      REAL*16 MDL_WZ,MDL_WT,MDL_WH,MDL_WW
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WT,MDL_WH,MDL_WW
 
 
       COMPLEX*32 GC_4,GC_5,GC_6,R2_3GQ,R2_3GG,R2_GQQ,R2_GGQ,R2_GGB
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_input.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_input.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_input.inc	2021-01-26 14:28:22 +0000
@@ -9,22 +9,22 @@
      $ ,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2,MP__MDL_G_UVB_FIN_
      $ ,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
       COMMON/MP_PARAMS_R/ MP__MDL_SQRT__AS,MP__MDL_G__EXP__4
      $ ,MP__MDL_G__EXP__2,MP__MDL_G_UVG_1EPS_,MP__MDL_G_UVB_1EPS_
@@ -33,22 +33,22 @@
      $ ,MP__MDL_G__EXP__3,MP__MDL_MU_R__EXP__2,MP__MDL_G_UVB_FIN_
      $ ,MP__MDL_G_UVT_FIN_,MP__MDL_GWCFT_UV_B_FIN_
      $ ,MP__MDL_GWCFT_UV_T_FIN_,MP__MDL_BWCFT_UV_FIN_
-     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CONJG__CKM22
-     $ ,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
-     $ ,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4,MP__MDL_SQRT__2
-     $ ,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2,MP__MDL_MB__EXP__2
-     $ ,MP__MDL_MT__EXP__2,MP__MDL_AEW,MP__MDL_SQRT__AEW,MP__MDL_EE
-     $ ,MP__MDL_MW__EXP__2,MP__MDL_SW2,MP__MDL_CW,MP__MDL_SQRT__SW2
-     $ ,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW,MP__MDL_V,MP__MDL_V__EXP__2
-     $ ,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT,MP__MDL_YTAU,MP__MDL_MUH
-     $ ,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN,MP__MDL_VECTORZUP
-     $ ,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP,MP__MDL_VECTORADOWN
-     $ ,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU,MP__MDL_VECTORWPUXD
-     $ ,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2,MP__MDL_CW__EXP__2
-     $ ,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2,MP__MDL_YB__EXP__2
-     $ ,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF,MP__AS,MP__MDL_YMB
-     $ ,MP__MDL_YMT,MP__MDL_YMTAU
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM3X3
+     $ ,MP__MDL_CKM33,MP__MDL_LHV,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF
+     $ ,MP__MDL_CF,MP__MDL_MZ__EXP__2,MP__MDL_MZ__EXP__4
+     $ ,MP__MDL_SQRT__2,MP__MDL_MH__EXP__2,MP__MDL_NCOL__EXP__2
+     $ ,MP__MDL_MB__EXP__2,MP__MDL_MT__EXP__2,MP__MDL_AEW
+     $ ,MP__MDL_SQRT__AEW,MP__MDL_EE,MP__MDL_MW__EXP__2,MP__MDL_SW2
+     $ ,MP__MDL_CW,MP__MDL_SQRT__SW2,MP__MDL_SW,MP__MDL_G1,MP__MDL_GW
+     $ ,MP__MDL_V,MP__MDL_V__EXP__2,MP__MDL_LAM,MP__MDL_YB,MP__MDL_YT
+     $ ,MP__MDL_YTAU,MP__MDL_MUH,MP__MDL_AXIALZUP,MP__MDL_AXIALZDOWN
+     $ ,MP__MDL_VECTORZUP,MP__MDL_VECTORZDOWN,MP__MDL_VECTORAUP
+     $ ,MP__MDL_VECTORADOWN,MP__MDL_VECTORWMDXU,MP__MDL_AXIALWMDXU
+     $ ,MP__MDL_VECTORWPUXD,MP__MDL_AXIALWPUXD,MP__MDL_GW__EXP__2
+     $ ,MP__MDL_CW__EXP__2,MP__MDL_EE__EXP__2,MP__MDL_SW__EXP__2
+     $ ,MP__MDL_YB__EXP__2,MP__MDL_YT__EXP__2,MP__AEWM1,MP__MDL_GF
+     $ ,MP__AS,MP__MDL_YMB,MP__MDL_YMT,MP__MDL_YMTAU
 
 
       COMPLEX*32 MP__MDL_TMASS_UV_1EPS_,MP__MDL_TMASS_UV_FIN_
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_intparam_definition.inc'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_intparam_definition.inc	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-01-26 14:28:22 +0000
@@ -8,16 +8,16 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
+        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
+
+        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
+
         MP__MDL_CKM22 = 1.000000E+00_16
 
         MP__MDL_CKM3X3 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM3X3 = 1.000000E+00_16
-
         MP__MDL_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/born_matrix.f'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/born_matrix.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/born_matrix.f	2021-01-26 14:28:22 +0000
@@ -87,6 +87,9 @@
       INTEGER USERHEL
       COMMON/ML5_0_HELUSERCHOICE/USERHEL
       DATA USERHEL/-1/
+      LOGICAL HELRESET
+      COMMON/ML5_0_HELRESET/HELRESET
+      DATA HELRESET/.TRUE./
 
       DATA (NHEL(I,   1),I=1,4) /-1,-1,-1, 1/
       DATA (NHEL(I,   2),I=1,4) /-1,-1,-1,-1/
@@ -116,6 +119,17 @@
       LOGICAL ML5_0_IS_BORN_HEL_SELECTED
 
 C     ----------
+C     Check if helreset mode is on
+C     ---------
+      IF (HELRESET) THEN
+        NTRY = 0
+        DO I=1,NCOMB
+          GOODHEL(I) = .FALSE.
+        ENDDO
+        HELRESET = .FALSE.
+      ENDIF
+
+C     ----------
 C     BEGIN CODE
 C     ----------
       IF(USERHEL.EQ.-1) NTRY=NTRY+1
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/helas_calls_uvct_1.f'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/helas_calls_uvct_1.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/helas_calls_uvct_1.f	2021-01-26 14:28:22 +0000
@@ -101,24 +101,24 @@
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 41
       CALL FFV1_0(W(1,4),W(1,3),W(1,5),GC_5,AMPL(1,81))
-      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 42
       CALL FFV1_0(W(1,4),W(1,6),W(1,2),GC_5,AMPL(2,82))
       AMPL(2,82)=AMPL(2,82)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 43
       CALL FFV1_0(W(1,4),W(1,6),W(1,2),GC_5,AMPL(1,83))
-      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 44
       CALL FFV1_0(W(1,7),W(1,3),W(1,2),GC_5,AMPL(2,84))
       AMPL(2,84)=AMPL(2,84)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 45
       CALL FFV1_0(W(1,7),W(1,3),W(1,2),GC_5,AMPL(1,85))
-      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 
       GOTO 1001
  3000 CONTINUE
 
=== modified file 'tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/mp_helas_calls_uvct_1.f'
--- tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/mp_helas_calls_uvct_1.f	2020-10-30 12:03:19 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/mp_helas_calls_uvct_1.f	2021-01-26 14:28:22 +0000
@@ -85,24 +85,24 @@
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 41
       CALL MP_FFV1_0(W(1,4),W(1,3),W(1,5),GC_5,AMPL(1,81))
-      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 42
       CALL MP_FFV1_0(W(1,4),W(1,6),W(1,2),GC_5,AMPL(2,82))
       AMPL(2,82)=AMPL(2,82)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 43
       CALL MP_FFV1_0(W(1,4),W(1,6),W(1,2),GC_5,AMPL(1,83))
-      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 C     Amplitude(s) for UVCT diagram with ID 44
       CALL MP_FFV1_0(W(1,7),W(1,3),W(1,2),GC_5,AMPL(2,84))
       AMPL(2,84)=AMPL(2,84)*(2.0D0*UVWFCT_B_0_1EPS+4.0D0
      $ *UVWFCT_G_1_1EPS)
 C     Amplitude(s) for UVCT diagram with ID 45
       CALL MP_FFV1_0(W(1,7),W(1,3),W(1,2),GC_5,AMPL(1,85))
-      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_T_0+2.0D0
-     $ *UVWFCT_G_2)
+      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_2+2.0D0
+     $ *UVWFCT_G_1)
 
       GOTO 1001
  3000 CONTINUE
 
=== added file 'tests/input_files/param_card_nlo.dat'
--- tests/input_files/param_card_nlo.dat	1970-01-01 00:00:00 +0000
+++ tests/input_files/param_card_nlo.dat	2021-01-26 14:28:22 +0000
@@ -0,0 +1,87 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY MG5 FOLLOWING UFO MODEL   ####
+######################################################################
+##                                                                  ##
+##  Width set on Auto will be computed following the information    ##
+##        present in the decay.py files of the model.               ##
+##        See  arXiv:1402.1178 for more details.                    ##
+##                                                                  ##
+######################################################################
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block mass 
+    5 4.700000e+00 # MB 
+    6 1.730000e+02 # MT 
+   15 1.777000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.250000e+02 # MH 
+## Dependent parameters, given by model restrictions.
+## Those values should be edited following the 
+## analytical expression. MG5 ignores those values 
+## but they are important for interfacing the output of MG5
+## to external program such as Pythia.
+  1 0.000000e+00 # d : 0.0 
+  2 0.000000e+00 # u : 0.0 
+  3 0.000000e+00 # s : 0.0 
+  4 0.000000e+00 # c : 0.0 
+  11 0.000000e+00 # e- : 0.0 
+  12 0.000000e+00 # ve : 0.0 
+  13 0.000000e+00 # mu- : 0.0 
+  14 0.000000e+00 # vm : 0.0 
+  16 0.000000e+00 # vt : 0.0 
+  21 0.000000e+00 # g : 0.0 
+  22 0.000000e+00 # a : 0.0 
+  24 8.041900e+01 # w+ : cmath.sqrt(MZ__exp__2/2. + cmath.sqrt(MZ__exp__4/4. - (aEW*cmath.pi*MZ__exp__2)/(Gf*sqrt__2))) 
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block sminputs 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS (Note that Parameter not used if you use a PDF set) 
+
+###################################
+## INFORMATION FOR YUKAWA
+###################################
+Block yukawa 
+    5 4.700000e+00 # ymb 
+    6 1.730000e+02 # ymt 
+   15 1.777000e+00 # ymtau 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500e+00 # WT 
+DECAY  23 2.441404e+00 # WZ 
+DECAY  24 2.047600e+00 # WW 
+DECAY  25 6.382339e-03 # WH 
+## Dependent parameters, given by model restrictions.
+## Those values should be edited following the 
+## analytical expression. MG5 ignores those values 
+## but they are important for interfacing the output of MG5
+## to external program such as Pythia.
+DECAY  1 0.000000e+00 # d : 0.0 
+DECAY  2 0.000000e+00 # u : 0.0 
+DECAY  3 0.000000e+00 # s : 0.0 
+DECAY  4 0.000000e+00 # c : 0.0 
+DECAY  5 0.000000e+00 # b : 0.0 
+DECAY  11 0.000000e+00 # e- : 0.0 
+DECAY  12 0.000000e+00 # ve : 0.0 
+DECAY  13 0.000000e+00 # mu- : 0.0 
+DECAY  14 0.000000e+00 # vm : 0.0 
+DECAY  15 0.000000e+00 # ta- : 0.0 
+DECAY  16 0.000000e+00 # vt : 0.0 
+DECAY  21 0.000000e+00 # g : 0.0 
+DECAY  22 0.000000e+00 # a : 0.0 
+#===========================================================
+# QUANTUM NUMBERS OF NEW STATE(S) (NON SM PDG CODE)
+#===========================================================
+
+Block QNUMBERS 82  # gh 
+        1 0  # 3 times electric charge
+        2 1  # number of spin states (2S+1)
+        3 8  # colour rep (1: singlet, 3: triplet, 8: octet)
+        4 1  # Particle/Antiparticle distinction (0=own anti)