Merge lp:~maddevelopers/mg5amcnlo/2.9.3 into lp:mg5amcnlo/lts

[Olivier Mattelaer]

Pass to 2.9.3

Pure bug fix released before releasing 3.1.0 (that we should do this week).

So the plan is to release this version (2.9.3) tonight (all tests are passing in both python2/python3) and probably release 3.0.4 on Friday.

Any objection?

[lp:~maddevelopers/mg5amcnlo/2.9.3]

325. By olivier-mattelaer on 2021-03-25

force d0 for jamp computation

=== modified file 'Template/LO/SubProcesses/genps.f'
--- Template/LO/SubProcesses/genps.f	2021-01-07 14:56:38 +0000
+++ Template/LO/SubProcesses/genps.f	2021-03-25 07:55:46 +0000
@@ -1145,30 +1145,37 @@
       else
 
 c     test of impact of low t part
-         if (nt_channel.ge.2)then
-            tmin = max(tmin,  -stot)
-         endif
-      if ((tmax-tmin)/stot.gt.0.1)then
-            call sample_get_x(wgt,x(-ibranch),-ibranch,iconfig,
-     $           0d0, 1d0)
+c         if (nt_channel.ge.2)then
+c            tmin = max(tmin,  -stot)
+c         endif
+
+
+         call sample_get_x(wgt,x(-ibranch),-ibranch,iconfig,
+     $        -tmax/stot, -tmin/stot)
          t = stot*(-x(-ibranch))
+         
+
+c         if ((tmax-tmin)/stot.gt.0.1)then
+c            call sample_get_x(wgt,x(-ibranch),-ibranch,iconfig,
+c     $           0d0, 1d0)
+c         t = stot*(-x(-ibranch))
 c     if (dabs(tmax - tmin)/stot.gt.0.05d0) then
 c         call sample_get_x(wgt,x(-ibranch),-ibranch,iconfig,
 c     $        0d0,  1d0)
 c     set tmax to 0 and tmin to -1 The idea is to avoid dimension correlation
 c     the condition ensure a minimum efficiency in the generation of events
 c         t = stot*(-x(-ibranch))
-      else if (tmax.gt.-0.01.and.tmin.lt.-0.02)then
+c      else if (tmax.gt.-0.01.and.tmin.lt.-0.02)then
 c         set tmax to 0. The idea is to be sure to be able to hit zero
 c         and not to be block by numerical inacuracy
-         call sample_get_x(wgt,x(-ibranch),-ibranch,iconfig,
-     $        0d0, -tmin/stot)
-         t = stot*(-x(-ibranch))
-      else
-         call sample_get_x(wgt,x(-ibranch),-ibranch,iconfig,
-     $        -tmax/stot, -tmin/stot)
-         t = stot*(-x(-ibranch))
-      endif
+c         call sample_get_x(wgt,x(-ibranch),-ibranch,iconfig,
+c     $        0d0, -tmin/stot)
+c         t = stot*(-x(-ibranch))
+c      else
+c         call sample_get_x(wgt,x(-ibranch),-ibranch,iconfig,
+c     $        -tmax/stot, -tmin/stot)
+c         t = stot*(-x(-ibranch))
+c      endif
 
          if (t .lt. tmin .or. t .gt. tmax) then
             jac=-3d0

=== modified file 'Template/LO/SubProcesses/makefile'
--- Template/LO/SubProcesses/makefile	2020-06-18 13:17:31 +0000
+++ Template/LO/SubProcesses/makefile	2021-03-25 07:55:46 +0000
@@ -65,6 +65,8 @@
 	cd ../../Source/PDF; make
 
 # Add source so that the compiler finds the DiscreteSampler module.
+$(MATRIX): %.o: %.f
+	$(FC) $(FFLAGS) $(MATRIX_FLAG) -c $< -I../../Source/
 %.o: %.f
 	$(FC) $(FFLAGS) -c $< -I../../Source/
 

=== modified file 'Template/LO/SubProcesses/setscales.f'
--- Template/LO/SubProcesses/setscales.f	2020-03-08 20:49:57 +0000
+++ Template/LO/SubProcesses/setscales.f	2021-03-25 07:55:46 +0000
@@ -24,6 +24,7 @@
       double precision pmass(nexternal)
       common/to_mass/  pmass
 
+      
       real*8 xptj,xptb,xpta,xptl,xmtc
       real*8 xetamin,xqcut,deltaeta
       common /to_specxpt/xptj,xptb,xpta,xptl,xmtc,xetamin,xqcut,deltaeta
@@ -69,8 +70,8 @@
           enddo
           rscale=rscale/2d0
       elseif(dynamical_scale_choice.eq.4) then
-c         \sqrt(s), partonic energy
-          rscale=dsqrt(max(0d0,2d0*dot(P(0,1),P(0,2))))
+c     \sqrt(s), partonic energy
+         rscale = dsqrt(max(0d0,sumdot(p(0,1), p(0,2), 1d0)))
       elseif(dynamical_scale_choice.eq.5) then
 c         \decaying particle mass, for decays
           rscale=dsqrt(max(0d0,dot(P(0,1),P(0,1))))

=== modified file 'Template/LO/SubProcesses/unwgt.f'
--- Template/LO/SubProcesses/unwgt.f	2020-08-25 19:16:17 +0000
+++ Template/LO/SubProcesses/unwgt.f	2021-03-25 07:55:46 +0000
@@ -158,7 +158,6 @@
          else
             get_betaz = (pout(0)**2 - pin(0)**2)/(pin(0)**2 + pout(0)**2)
          endif
-         get_betaz = (pin(3) * pout(0) - pout(3) * pin(0)) / denom
       else if (pin(0).eq.pin(3)) then
          get_betaz = (pin(0)**2 - pout(0)**2)/(pin(0)**2 + pout(0)**2)
       else if (pin(0).eq.abs(pin(3))) then

=== modified file 'Template/LO/bin/internal/Gridpack/gridrun'
--- Template/LO/bin/internal/Gridpack/gridrun	2020-02-12 08:38:24 +0000
+++ Template/LO/bin/internal/Gridpack/gridrun	2021-03-25 07:55:46 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 ################################################################################
 #
@@ -18,6 +18,8 @@
 """This is the main executable, a simple frontend to set up the PYTHONPATH
 and call immediately the command line interface scripts"""
 
+from __future__ import absolute_import
+from __future__ import print_function
 import sys
 if sys.version_info[1] < 7:
     sys.exit('MadGraph/MadEvent 5 works only with python 2.7/3.7 or later.\n\
@@ -69,7 +71,7 @@
    pass
 
 if __debug__:
-        print 'Running MG5 in debug mode'
+        print('Running MG5 in debug mode')
 
 
 # Set logging level according to the logging level given by options
@@ -88,13 +90,12 @@
 # Call the cmd interface main loop
 
 
-
 try:
     cmd_line = cmd_interface.GridPackCmd(me_dir=root_path, nb_event=args[0], seed=args[1], gran=args[2])            
 except KeyboardInterrupt:
-    print 'Quit on KeyboardInterrupt' 
+    print('Quit on KeyboardInterrupt') 
 
-print 'DONE'
+print('DONE')
 
 try:
     # Remove lock file

=== modified file 'Template/NLO/SubProcesses/handling_lhe_events.f'
--- Template/NLO/SubProcesses/handling_lhe_events.f	2019-12-11 10:31:48 +0000
+++ Template/NLO/SubProcesses/handling_lhe_events.f	2021-03-25 07:55:46 +0000
@@ -806,7 +806,7 @@
  441  format(4(1x,e16.10))
  442  format(1x,e16.10,2(1x,e14.8))
  503  format(1x,i2,1x,i6,4(1x,e14.8))
- 504  format(1x,i8,1x,i2,4(1x,i4),5(1x,e14.8),2(1x,e10.4))
+ 504  format(1x,i8,1x,i2,4(1x,i4),5(1x,e24.17),2(1x,e10.4))
  601  format(a12,i4,a2,1x,e11.5,a7)
 c
       return

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2021-02-14 22:27:00 +0000
+++ UpdateNotes.txt	2021-03-25 07:55:46 +0000
@@ -1,5 +1,13 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
+2.9.3()
+      OM: Fix an issue with t-channel particles for massive initial state where sqrt(S)
+          was close to the mass of the initial mass. boundary condition on t-channnel were
+	  incorrectly setup leading to strange spectrum in various distribution (very old bug)
+      OM: Fix an issue with a crash for loop computation
+      OM: more python3 fixing bug
+	  
+
 2.9.2(14/02/21)
       MZ+RF+OM: Fix relevant to the case when PDG specific cuts are set in the NLO run_card.
         The generation of tau was not taking into account the information.

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2021-01-21 13:01:31 +0000
+++ aloha/aloha_writers.py	2021-03-25 07:55:46 +0000
@@ -216,7 +216,7 @@
             else:
                 couplings = ['COUP']
                 
-        for coup in couplings:       
+        for coup in couplings:   
             call_arg.append(('complex', coup))              
             self.declaration.add(('complex',coup))
             
@@ -793,12 +793,14 @@
         
 
         numerator = self.routine.expr
+
         if not 'Coup(1)' in self.routine.infostr:
             coup_name = 'COUP'
         else:
             coup_name = '%s' % self.change_number_format(1)
-        
-        
+
+        
+        misc.sprint(self.name, coup_name, cond="VVS11_14P1N" in self.name)
         if not self.offshell:
             if coup_name == 'COUP':
                 formatted = self.write_obj(numerator.get_rep([0]))
@@ -844,7 +846,7 @@
                 if 'P1N' not in self.tag:
                     self.declaration.add((ptype,'P%s' % self.outgoing))
                 else:
-                    coeff = 'COUP*'  
+                    coeff = '%(COUP)s*' % {'COUP': coup_name}  
             else:
                 if coup_name == 'COUP':
                     coeff = 'COUP*'

=== modified file 'aloha/template_files/Makefile_F'
--- aloha/template_files/Makefile_F	2021-01-17 19:52:23 +0000
+++ aloha/template_files/Makefile_F	2021-03-25 07:55:46 +0000
@@ -18,7 +18,7 @@
 
 BASIC_OBJS = aloha_functions.o
 
-FFLAGS += $(ALOHA_FLAF)
+FFLAGS += $(ALOHA_FLAG)
 
 include ./aloha_file.inc
 

=== modified file 'madgraph/interface/amcatnlo_interface.py'
--- madgraph/interface/amcatnlo_interface.py	2020-10-20 10:36:32 +0000
+++ madgraph/interface/amcatnlo_interface.py	2021-03-25 07:55:46 +0000
@@ -385,7 +385,7 @@
                     #check that if one requests the virt diagrams, there are virt_amplitudes
                     if args[1] == 'loop' and len(self._curr_amps) == 0:
                         raise self.InvalidCmd('No virtuals have been generated')
-                    self.draw(' '.join(args[2:]),type = args[1])
+                    self.draw(' '.join(args[2:]), Dtype = args[1])
                 else:
                     for diag_type, get_amps in get_amps_dict.items():
                         self._curr_amps = get_amps()

=== modified file 'madgraph/interface/amcatnlo_run_interface.py'
--- madgraph/interface/amcatnlo_run_interface.py	2021-02-03 20:06:18 +0000
+++ madgraph/interface/amcatnlo_run_interface.py	2021-03-25 07:55:46 +0000
@@ -1633,7 +1633,7 @@
             name = 'fo_lhe_postprocessing'
             if name in FO_card:
                 self.run_card.set(name, FO_card[name], user=False)
-                        
+
         return super(aMCatNLOCmd,self).do_treatcards(line, amcatnlo)
     
     ############################################################################

=== modified file 'madgraph/interface/common_run_interface.py'
--- madgraph/interface/common_run_interface.py	2021-01-26 19:40:23 +0000
+++ madgraph/interface/common_run_interface.py	2021-03-25 07:55:46 +0000
@@ -907,9 +907,12 @@
                 fsock.close()
                 return
             else:
+                devnull = open(os.devnull, 'w')  
                 subprocess.call(['python', 'write_param_card.py'],
-                             cwd=pjoin(self.me_dir,'bin','internal','ufomodel'))
+                             cwd=pjoin(self.me_dir,'bin','internal','ufomodel'), stdout=devnull, stderr=devnull)
                 default = pjoin(self.me_dir,'bin','internal','ufomodel','param_card.dat')
+                if not os.path.exists(default):
+                    files.cp(pjoin(self.me_dir, 'Cards','param_card_default.dat'), default)
 
 
             if amcatnlo and not keepwidth:
@@ -3298,7 +3301,8 @@
                 if cluster_class:
                     self.cluster = cluster_class(**self.options)
                 else:
-                    raise self.InvalidCmd("%s is not recognized as a supported cluster format." % cluster_name)              
+                    raise self.InvalidCmd("%s is not recognized as a supported cluster format." % cluster_name)     
+                         
     def check_param_card(self, path, run=True, dependent=False):
         """
         1) Check that no scan parameter are present
@@ -3986,7 +3990,7 @@
             if __debug__ and 'global_flag' not in run_card.user_set:
                 self.make_opts_var['GLOBAL_FLAG'] = "-O -fbounds-check"
             else:
-                self.make_opts_var['ALOHA_FLAG'] = run_card['global_flag']     
+                self.make_opts_var['GLOBAL_FLAG'] = run_card['global_flag']     
             self.make_opts_var['ALOHA_FLAG'] = run_card['aloha_flag']     
             self.make_opts_var['MATRIX_FLAG'] = run_card['matrix_flag']
 
@@ -6517,6 +6521,7 @@
         except InvalidCmd as error:
             logger.error("Invalid command: %s " % error)
         else:
+            self.reload_card(path)
             if hasattr(self, 'run_card'):
                 for pid, info in out.items():
                     total = 0
@@ -6870,6 +6875,7 @@
             logger.info('AsPerGe creates the file succesfully')
         files.mv(card, '%s.beforeasperge' % card)
         files.mv('%s.new' % card, card)
+        self.reload_card(card)
 
 
 

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2021-01-17 19:52:23 +0000
+++ madgraph/interface/madevent_interface.py	2021-03-25 07:55:46 +0000
@@ -2117,6 +2117,8 @@
 
         self.load_results_db()        
         self.results.def_web_mode(self.web)
+
+        self.Gdirs = None
         
         self.prompt = "%s>"%os.path.basename(pjoin(self.me_dir))
         self.configured = 0 # time for reading the card
@@ -2457,6 +2459,7 @@
         
         self.banner = None
         self.Gdirs = None
+        
         args = self.split_arg(line)
         # Check argument's validity
         mode = self.check_generate_events(args)
@@ -2797,6 +2800,7 @@
         self.ask_run_configuration('parton')
         self.banner = None
         self.Gdirs = None
+
         if not args:
             # No run name assigned -> assigned one automaticaly 
             self.set_run_name(self.find_available_run_name(self.me_dir))
@@ -3386,7 +3390,9 @@
             else:
                 logger.warning(''' %s SubProcesses doesn\'t have available phase-space.
             Please check mass spectrum.''' % ','.join(P_zero_result))
-                
+            self.get_Gdir()
+            for P in P_zero_result:
+                self.Gdirs[0][pjoin(self.me_dir,'SubProcesses',P)] = []
         
         self.monitor(run_type='All jobs submitted for survey', html=True)
         if not self.history or 'survey' in self.history[-1] or self.ninitial ==1  or \
@@ -3605,6 +3611,7 @@
         
         if self.run_card['gridpack'] and isinstance(self, GridPackCmd):
             return GridPackCmd.do_combine_events(self, line)
+
     
         # Define The Banner
         tag = self.run_card['run_tag']
@@ -3621,7 +3628,7 @@
         self.banner.write(pjoin(self.me_dir, 'Events', self.run_name, 
                                 '%s_%s_banner.txt' % (self.run_name, tag)))
         
-        
+
         get_wgt = lambda event: event.wgt            
         AllEvent = lhe_parser.MultiEventFile()
         AllEvent.banner = self.banner
@@ -3634,15 +3641,20 @@
             if os.path.exists(pjoin(Gdir, 'events.lhe')):
                 result = sum_html.OneResult('')
                 result.read_results(pjoin(Gdir, 'results.dat'))
+                sum_xsec += result.get('xsec')
+                sum_xerru.append(result.get('xerru'))
+                sum_axsec += result.get('axsec')
+
+                if self.run_card['gridpack'] or self.run_card['nevents']==0:
+                    os.remove(pjoin(Gdir, 'events.lhe'))
+                    continue
+
                 AllEvent.add(pjoin(Gdir, 'events.lhe'), 
                              result.get('xsec'),
                              result.get('xerru'),
                              result.get('axsec')
                              )
-                sum_xsec += result.get('xsec')
-                sum_xerru.append(result.get('xerru'))
-                sum_axsec += result.get('axsec')
-                
+ 
                 if len(AllEvent) >= 80: #perform a partial unweighting
                     AllEvent.unweight(pjoin(self.me_dir, "Events", self.run_name, "partials%s.lhe.gz" % partials),
                           get_wgt, log_level=5,  trunc_error=1e-2, event_target=self.run_card['nevents'])
@@ -3672,7 +3684,7 @@
                    
         self.results.add_detail('nb_event', nb_event)
     
-        if self.run_card['bias_module'].lower() not in  ['dummy', 'none']:
+        if self.run_card['bias_module'].lower() not in  ['dummy', 'none'] and nb_event:
             self.correct_bias()
         
         
@@ -4076,15 +4088,17 @@
                         if PY8_Card['JetMatching:qCut'] not in qCutList:
                             qCutList.append(PY8_Card['JetMatching:qCut'])
                         PY8_Card.MadGraphSet('SysCalc:qCutList', qCutList, force=True)
+            
 
-            for scale in PY8_Card['SysCalc:qCutList']:
-                if scale<(1.5*self.run_card['xqcut']):
-                    logger.error(
-        'One of the MLM merging qCut parameter you chose (%f) in the variation list'%scale+\
-        " (either via 'SysCalc:qCutList' in the PY8 shower card or "+\
-        "'sys_matchscale' in the run_card) is less than 1.5*xqcut, where xqcut is"+
-        ' the run_card parameter (=%f)\n'%self.run_card['xqcut']+
-        'It would be better/safer to use a larger qCut or a smaller xqcut.')
+            if PY8_Card['SysCalc:qCutList']!='auto':
+                for scale in PY8_Card['SysCalc:qCutList']:
+                    if scale<(1.5*self.run_card['xqcut']):
+                        logger.error(
+            'One of the MLM merging qCut parameter you chose (%f) in the variation list'%scale+\
+            " (either via 'SysCalc:qCutList' in the PY8 shower card or "+\
+            "'sys_matchscale' in the run_card) is less than 1.5*xqcut, where xqcut is"+
+            ' the run_card parameter (=%f)\n'%self.run_card['xqcut']+
+            'It would be better/safer to use a larger qCut or a smaller xqcut.')
                 
             # Specific MLM settings
             # PY8 should not implement the MLM veto since the driver should do it
@@ -4453,6 +4467,8 @@
                 shutil.copy(pythia_main,parallelization_dir)
                 # Add a safe card in parallelization
                 ParallelPY8Card = copy.copy(PY8_Card)
+                assert ParallelPY8Card['JetMatching:nJetMax'] ==  PY8_Card['JetMatching:nJetMax']
+
                 # Normalize the name of the HEPMCouput and lhe input
                 if HepMC_event_output:
                     ParallelPY8Card['HEPMCoutput:file']='events.hepmc'
@@ -5683,7 +5699,7 @@
             self.run_card['iseed'] = 0
             # Reset seed in run_card to 0, to ensure that following runs
             # will be statistically independent
-            self.run_card.write(pjoin(self.me_dir, 'Cards','run_card.dat'))
+            self.run_card.write(pjoin(self.me_dir, 'Cards','run_card.dat'), template=pjoin(self.me_dir, 'Cards','run_card.dat'))
             time_mod = max([os.path.getmtime(pjoin(self.me_dir,'Cards','run_card.dat')),
                         os.path.getmtime(pjoin(self.me_dir,'Cards','param_card.dat'))])
             self.configured = time_mod

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2021-02-14 22:27:00 +0000
+++ madgraph/interface/madgraph_interface.py	2021-03-25 07:55:46 +0000
@@ -3583,16 +3583,12 @@
                     sum([len(part) for part in
                                         self._curr_model['couplings'].values()])
             keys = list(self._curr_model['couplings'].keys())
-            def key_sort(x, y):
+            def key_sort(x):
                 if ('external',) == x:
                     return -1
-                elif ('external',) == y:
-                    return +1
-                elif  len(x) < len(y):
-                    return -1
                 else:
-                    return 1
-            keys.sort(key_sort)
+                    return len(x)
+            keys.sort(key=key_sort)
             for key in keys:
                 item = self._curr_model['couplings'][key]
                 text += '\ncouplings type: %s\n' % str(key)
@@ -5909,6 +5905,8 @@
                 fastjet_config  = misc.which(self.options['fastjet'])
                 if fastjet_config:
                     add_options.append('--with_fastjet=%s'%fastjet_config)
+                else:
+                    add_options.append('--with_fastjet')
            
             if self.options['delphes_path'] and os.path.isdir(
                   os.path.normpath(pjoin(MG5DIR,self.options['delphes_path']))):
@@ -8335,7 +8333,8 @@
             wanted_lorentz = self._curr_matrix_elements.get_used_lorentz()
             wanted_couplings = self._curr_matrix_elements.get_used_couplings()
 
-            if self._export_format == 'madevent' and not 'no_helrecycling' in flaglist:
+            if self._export_format == 'madevent' and not 'no_helrecycling' in flaglist and \
+                not isinstance(self._curr_amps[0], loop_diagram_generation.LoopAmplitude):
                 for (name, flag, out) in wanted_lorentz[:]:
                     if out == 0:
                         newflag = list(flag) + ['P1N']

=== modified file 'madgraph/interface/reweight_interface.py'
--- madgraph/interface/reweight_interface.py	2021-01-21 14:43:00 +0000
+++ madgraph/interface/reweight_interface.py	2021-03-25 07:55:46 +0000
@@ -72,7 +72,6 @@
     
     prompt = 'Reweight>'
     debug_output = 'Reweight_debug'
-    rwgt_dir_possibility = ['rw_me','rw_me_second','rw_mevirt','rw_mevirt_second']
     
     @misc.mute_logger()
     def __init__(self, event_path=None, allow_madspin=False, mother=None, *completekey, **stdin):
@@ -102,6 +101,7 @@
         self.f2pylib = {}
         self.second_model = None
         self.second_process = None
+        self.nb_library = 1
         self.dedicated_path = {}
         self.soft_threshold = None
         self.systematics = False # allow to run systematics in ouput2.0 mode
@@ -520,7 +520,7 @@
             path_me = self.me_dir 
             
         if self.second_model or self.second_process or self.dedicated_path:
-            rw_dir = pjoin(path_me, 'rw_me_second')
+            rw_dir = pjoin(path_me, 'rw_me_%s' % self.nb_library)
         else:
             rw_dir = pjoin(path_me, 'rw_me')
                 
@@ -599,7 +599,7 @@
                     output[(tag_name,name)].write(str(new_evt))
 
         # check normalisation of the events:
-        if 'event_norm' in self.run_card:
+        if self.run_card and 'event_norm' in self.run_card:
             if self.run_card['event_norm'] in ['average','bias']:
                 for key, value in cross.items():
                     cross[key] = value / (event_nb+1)
@@ -711,7 +711,7 @@
             path_me = self.me_dir 
             
         if self.second_model or self.second_process or self.dedicated_path:
-            rw_dir = pjoin(path_me, 'rw_me_second')
+            rw_dir = pjoin(path_me, 'rw_me_%s' % self.nb_library)
         else:
             rw_dir = pjoin(path_me, 'rw_me')
         
@@ -776,7 +776,7 @@
                 blockpat = re.compile(r'''<weightgroup name=\'mg_reweighting\'\s*weight_name_strategy=\'includeIdInWeightName\'>(?P<text>.*?)</weightgroup>''', re.I+re.M+re.S)
                 before, content, after = blockpat.split(self.banner['initrwgt'])
                 header_rwgt_other = before + after
-                pattern = re.compile('<weight id=\'(?:rwgt_(?P<id>\d+)|(?P<id2>[_\w]+))(?P<rwgttype>\s*|_\w+)\'>(?P<info>.*?)</weight>', re.S+re.I+re.M)
+                pattern = re.compile('<weight id=\'(?:rwgt_(?P<id>\d+)|(?P<id2>[_\w\-]+))(?P<rwgttype>\s*|_\w+)\'>(?P<info>.*?)</weight>', re.S+re.I+re.M)
                 mg_rwgt_info = pattern.findall(content)
                 
                 maxid = 0
@@ -877,7 +877,11 @@
 
         logger.info('starts to compute weight for events with the following modification to the param_card:')
         logger.info(card_diff.replace('\n','\nKEEP:'))
-        self.run_card = banner.Banner(self.banner).charge_card('run_card')
+        try:
+            self.run_card = banner.Banner(self.banner).charge_card('run_card')
+        except Exception:
+            logger.debug('no run card found -- reweight interface')
+            self.run_card = None
 
         if self.options['rwgt_name']:
             tag_name = self.options['rwgt_name']
@@ -889,7 +893,7 @@
         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):                    
-                    if 'second' in path or tag == 3:
+                    if 'rw_me_' in path or tag == 3:
                         param_card = self.new_param_card
                     else:
                         param_card = check_param_card.ParamCard(self.orig_param_card_text)
@@ -1232,10 +1236,10 @@
                     raise Exception
 
         base = os.path.basename(os.path.dirname(Pdir))
-        if '_second' in base:
+        if base == 'rw_me':
+            moduletag = (base, 2+hypp_id)
+        else:
             moduletag = (base, 2)
-        else:
-            moduletag = (base, 2+hypp_id)
         
         module = self.f2pylib[moduletag]
 
@@ -1595,7 +1599,14 @@
             #self.id_to_path = {}
             #data['id2path'] = self.id_to_path
         else:
-            data['paths'] = ['rw_me_second', 'rw_mevirt_second']
+            for key in list(self.f2pylib.keys()):
+                if 'rw_me_%s' % self.nb_library in key[0]:
+                    del self.f2pylib[key]
+                
+            self.nb_library += 1
+            data['paths'] = ['rw_me_%s' % self.nb_library, 'rw_mevirt_%s' % self.nb_library]
+
+
             # model
             if self.second_model:
                 data['mg_names'] = True
@@ -1627,14 +1638,15 @@
         else:
             path_me = self.rwgt_dir
         data['path'] = path_me
-        try:
-            shutil.rmtree(pjoin(path_me,data['paths'][0]))
-        except Exception: 
-            pass
-        try:
-            shutil.rmtree(pjoin(path_me, data['paths'][1]))
-        except Exception: 
-            pass
+
+        for i in range(2):
+            pdir = pjoin(path_me,data['paths'][i])
+        if os.path.exists(pdir):
+            try:
+                shutil.rmtree(pjoin(path_me,data['paths'][0]))
+            except Exception as error:
+                misc.sprint('fail to rm rwgt dir:', error) 
+                pass 
 
         # 1. prepare the interface----------------------------------------------
         mgcmd = self.mg5cmd
@@ -1770,7 +1782,9 @@
             path_me = self.me_dir
         else:
             path_me = self.rwgt_dir
-        for onedir in self.rwgt_dir_possibility:
+        
+        rwgt_dir_possibility =   ['rw_me','rw_me_%s' % self.nb_library,'rw_mevirt','rw_mevirt_%s' % self.nb_library]
+        for onedir in rwgt_dir_possibility:
             if not os.path.isdir(pjoin(path_me,onedir)):
                 continue
             pdir = pjoin(path_me, onedir, 'SubProcesses')
@@ -1794,7 +1808,8 @@
         
         self.id_to_path = {}
         self.id_to_path_second = {}
-        for onedir in self.rwgt_dir_possibility:
+        rwgt_dir_possibility =   ['rw_me','rw_me_%s' % self.nb_library,'rw_mevirt','rw_mevirt_%s' % self.nb_library]
+        for onedir in rwgt_dir_possibility:
             if not os.path.exists(pjoin(path_me,onedir)):
                 continue 
             pdir = pjoin(path_me, onedir, 'SubProcesses')
@@ -1811,11 +1826,13 @@
                         if six.PY3:
                             import importlib
                             mymod = importlib.import_module(mod_name,)
+                            mymod = importlib.reload(mymod)
                             #mymod = __import__(mod_name, globals(), locals(), [])
                         else:
                             mymod = __import__(mod_name, globals(), locals(), [],-1) 
                             S = mymod.SubProcesses
-                            mymod = getattr(S, 'allmatrix%spy' % tag) 
+                            mymod = getattr(S, 'allmatrix%spy' % tag)
+                            reload(mymod) 
                     else:
                         if six.PY3:
                             import importlib
@@ -1835,7 +1852,7 @@
                     break
 
             data = self.id_to_path
-            if '_second' in onedir:
+            if onedir not in ["rw_me",  "rw_mevirt"]:
                 data = self.id_to_path_second
 
             # get all the information

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2021-02-14 22:27:00 +0000
+++ madgraph/iolibs/export_v4.py	2021-03-25 07:55:46 +0000
@@ -59,6 +59,7 @@
 import models.import_ufo as import_ufo
 import models.write_param_card as param_writer
 import models.check_param_card as check_param_card
+from models import UFOError
 
 
 from madgraph import MadGraph5Error, MG5DIR, ReadWrite
@@ -908,7 +909,7 @@
             try:
                 with misc.MuteLogger(['madgraph.models'], [60]):
                     aloha_model = create_aloha.AbstractALOHAModel(os.path.basename(model.get('modelpath')))
-            except ImportError:
+            except (ImportError, UFOError):
                 aloha_model = create_aloha.AbstractALOHAModel(model.get('modelpath'))
         aloha_model.add_Lorentz_object(model.get('lorentz'))
 
@@ -1428,7 +1429,6 @@
     
                 if common_factor:
                     res = res + ')'
-    
                 res_list.append(res)
         
         if 'jamp_optim' in self.cmd_options:
@@ -1452,6 +1452,8 @@
         #misc.sprint(len(all_element))  
         
         self.myjamp_count = 0
+        for key in all_element:
+            all_element[key] = complex(all_element[key])
         new_mat, defs = self.optimise_jamp(all_element)
         if start_time:
             logger.info("Color-Flow passed to %s term in %ss. Introduce %i contraction", len(new_mat), int(time.time()-start_time), len(defs))
@@ -1466,9 +1468,11 @@
                     return "%id0/%id0" % (frac.numerator, frac.denominator)
             elif frac.real == frac:
                 #misc.sprint(frac.real, frac)
-                return str(float(frac.real)).replace('e','d')
+                return ('%.15e' % frac.real).replace('e','d')
+                #str(float(frac.real)).replace('e','d')
             else:
-                return str(frac).replace('e','d').replace('j','*imag1')
+                return ('(%.15e,%.15e)' % (frac.real, frac.imag)).replace('e','d')
+                #str(frac).replace('e','d').replace('j','*imag1')
                 
         
         
@@ -1481,9 +1485,14 @@
                 amp2 = AMP_format % amp2
             else:
                 amp2 = "TMP_JAMP(%d)" % -amp2
-                
-            res_list.append(' TMP_JAMP(%d) = %s + (%s) * %s ! used %d times' % (i,amp1, format(frac), amp2, nb))                
-                 
+            
+            if frac not in  [1., -1]:
+                res_list.append(' TMP_JAMP(%d) = %s + (%s) * %s ! used %d times' % (i,amp1, format(frac), amp2, nb))                
+            elif frac == 1.:
+                res_list.append(' TMP_JAMP(%d) = %s +  %s ! used %d times' % (i,amp1, amp2, nb))  
+            else:
+                res_list.append(' TMP_JAMP(%d) = %s - %s ! used %d times' % (i,amp1, amp2, nb))  
+
 
 #        misc.sprint(new_mat)
         jamp_res = collections.defaultdict(list)
@@ -1493,7 +1502,10 @@
                 name = AMP_format % var
             else:
                 name = "TMP_JAMP(%d)" % -var
-            jamp_res[jamp].append("(%s)*%s" % (format(factor), name))
+            if factor not in [1.]:
+                jamp_res[jamp].append("(%s)*%s" % (format(factor), name))
+            elif factor ==1:
+                jamp_res[jamp].append("%s" % (name))
             max_jamp = max(max_jamp, jamp)
         
         

=== modified file 'madgraph/iolibs/template_files/matrix_standalone_msF_v4.inc'
--- madgraph/iolibs/template_files/matrix_standalone_msF_v4.inc	2021-01-07 12:10:22 +0000
+++ madgraph/iolibs/template_files/matrix_standalone_msF_v4.inc	2021-03-25 07:55:46 +0000
@@ -96,6 +96,7 @@
       COMPLEX*16 ZTEMP
       REAL*8 CF(NCOLOR,NCOLOR)
       COMPLEX*16 AMP(NGRAPHS), JAMP(NCOLOR)
+      COMPLEX*16 TMP_JAMP(%(nb_temp_jamp)i)
       COMPLEX*16 W(18,NWAVEFUNCS)
       COMPLEX*16 DUM0,DUM1
       DATA DUM0, DUM1/(0d0, 0d0), (1d0, 0d0)/

=== modified file 'madgraph/iolibs/template_files/matrix_standalone_msP_v4.inc'
--- madgraph/iolibs/template_files/matrix_standalone_msP_v4.inc	2021-01-07 12:10:22 +0000
+++ madgraph/iolibs/template_files/matrix_standalone_msP_v4.inc	2021-03-25 07:55:46 +0000
@@ -91,6 +91,7 @@
       COMPLEX*16 ZTEMP
       REAL*8 CF(NCOLOR,NCOLOR)
       COMPLEX*16 AMP(NGRAPHS), JAMP(NCOLOR)
+      COMPLEX*16 TMP_JAMP(%(nb_temp_jamp)i)
       COMPLEX*16 W(18,NWAVEFUNCS)
       COMPLEX*16 DUM0,DUM1
       DATA DUM0, DUM1/(0d0, 0d0), (1d0, 0d0)/

=== modified file 'madgraph/iolibs/template_files/matrix_standalone_splitOrders_v4.inc'
--- madgraph/iolibs/template_files/matrix_standalone_splitOrders_v4.inc	2021-01-07 12:10:22 +0000
+++ madgraph/iolibs/template_files/matrix_standalone_splitOrders_v4.inc	2021-03-25 07:55:46 +0000
@@ -257,6 +257,7 @@
       REAL*8 CF(NCOLOR,NCOLOR)
       COMPLEX*16 AMP(NGRAPHS)
 	  COMPLEX*16 JAMP(NCOLOR,NAMPSO)
+	  COMPLEX*16 TMP_JAMP(%(nb_temp_jamp)i)
       COMPLEX*16 W(20,NWAVEFUNCS)
       COMPLEX*16 DUM0,DUM1
       DATA DUM0, DUM1/(0d0, 0d0), (1d0, 0d0)/

=== modified file 'madgraph/loop/loop_exporters.py'
--- madgraph/loop/loop_exporters.py	2020-08-20 21:22:22 +0000
+++ madgraph/loop/loop_exporters.py	2021-03-25 07:55:46 +0000
@@ -201,6 +201,15 @@
         """
         if not hasattr(self, 'aloha_model'):
             self.aloha_model = create_aloha.AbstractALOHAModel(model.get('modelpath'))
+        
+        missing_lor = []
+        for lor in model.get('lorentz'):
+            if not hasattr(self.aloha_model.model.lorentz, lor.name):
+                missing_lor.append(lor)
+        if missing_lor:
+            logger.debug("adding in aloha model %s lorentz struct" % len(missing_lor))
+            self.aloha_model.add_Lorentz_object(missing_lor)
+        
         return self.aloha_model
 
     #===========================================================================

=== modified file 'madgraph/loop/loop_helas_objects.py'
--- madgraph/loop/loop_helas_objects.py	2020-01-22 15:16:50 +0000
+++ madgraph/loop/loop_helas_objects.py	2021-03-25 07:55:46 +0000
@@ -2299,7 +2299,8 @@
         already created and can be specified here instead of being generated.
         This can make a difference for very complicated models."""
         
-        if not alohaModel:# is None:
+        if not isinstance(alohaModel, create_aloha.AbstractALOHAModel):# is None:
+            assert not alohaModel
             # Generate it here
             model = self.get('processes')[0].get('model')
             myAlohaModel = create_aloha.AbstractALOHAModel(model.get('modelpath'))

=== modified file 'madgraph/madevent/gen_ximprove.py'
--- madgraph/madevent/gen_ximprove.py	2020-10-15 06:58:22 +0000
+++ madgraph/madevent/gen_ximprove.py	2021-03-25 07:55:46 +0000
@@ -979,6 +979,12 @@
     def __new__(cls, cmd, opt):
         """Choose in which type of refine we want to be"""
 
+        if hasattr(cls, 'force_class'):
+            if cls.force_class == 'gridpack':
+                return super(gen_ximprove, cls).__new__(gen_ximprove_gridpack)
+            elif cls.force_class == 'loop_induced':
+                return super(gen_ximprove, cls).__new__(gen_ximprove_share)
+        
         if cmd.proc_characteristics['loop_induced']:
             return super(gen_ximprove, cls).__new__(gen_ximprove_share)
         elif gen_ximprove.format_variable(cmd.run_card['gridpack'], bool):
@@ -1795,8 +1801,9 @@
     gen_events_security = 1.00
 
     def __new__(cls, *args, **opts):
-        
-        return super(gen_ximprove, cls).__new__(cls, *args, **opts)
+
+        cls.force_class = 'gridpack'
+        return super(gen_ximprove_gridpack, cls).__new__(cls, *args, **opts)
 
     def __init__(self, *args, **opts):
         
@@ -1825,8 +1832,7 @@
 #        logger.info('Effective Luminosity %s pb^-1', goal_lum)
         
         all_channels = sum([list(P) for P in self.results],[])
-        all_channels.sort(cmp= lambda x,y: 1 if y.get('luminosity') - \
-                                                x.get('luminosity') > 0 else -1) 
+        all_channels.sort(key=lambda x : x.get('luminosity'), reverse=True)
                           
         to_refine = []
         for C in all_channels:

=== modified file 'madgraph/madevent/hel_recycle.py'
--- madgraph/madevent/hel_recycle.py	2021-02-09 11:02:11 +0000
+++ madgraph/madevent/hel_recycle.py	2021-03-25 07:55:46 +0000
@@ -121,7 +121,7 @@
     def get_deps(line, graph):
         old_args = get_arguments(line)
         old_name = old_args[-1].replace(' ','')
-        matches = graph.old_names() & set(old_args)
+        matches = graph.old_names() & set([old.replace(' ','') for old in old_args])
         try:
             matches.remove(old_name)
         except KeyError:
@@ -143,6 +143,7 @@
                 break
             
         if diag_number and this_comb_good and cls.ext_deps:
+
             helicity = dict([(a.get_id(), a.hel) for a in cls.ext_deps])
             this_hel = [helicity[i] for i in range(1, len(helicity)+1)] 
             hel_number = 1 + all_hel.index(tuple(this_hel))
@@ -688,7 +689,6 @@
                 self.get_gwc(line, call_type)
 
                 
-                
                 if call_type in ['external', 'internal', 'amplitude']:
                     self.template_dict['helas_calls'] += self.unfold_helicities(
                         line, call_type)

=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2021-02-12 15:28:58 +0000
+++ madgraph/various/banner.py	2021-03-25 07:55:46 +0000
@@ -974,7 +974,7 @@
         a file, a path to a file, or simply Nothing"""                
         
         if isinstance(finput, self.__class__):
-            dict.__init__(self, finput)
+            dict.__init__(self)
             for key in finput.__dict__:
                 setattr(self, key, copy.copy(getattr(finput, key)) )
             for key,value in finput.items():
@@ -1765,10 +1765,7 @@
         # Parameters which have been set by the 
         super(PY8Card, self).__init__(*args, **opts)
 
-    def __copy__(self):
-        newone = type(self)(dict(self))
-        newone.__dict__.update(self.__dict__)
-        return newone
+
 
     def add_param(self, name, value, hidden=False, always_write_to_card=True, 
                                                                   comment=None):
@@ -2484,7 +2481,7 @@
                 nline = line.split('#')[0]
                 nline = nline.split('!')[0]
                 comment = line[len(nline):]
-                nline = nline.split('=')
+                nline = nline.rsplit('=',1)
                 if python_template and nline[0].startswith('$'):
                     block_name = nline[0][1:].strip()
                     this_group = [b for b in self.blocks if b.name == block_name]
@@ -2950,7 +2947,10 @@
    %(survey_splitting)s = survey_splitting ! for loop-induced control how many core are used at survey for the computation of a single iteration.
    %(survey_nchannel_per_job)s = survey_nchannel_per_job ! control how many Channel are integrated inside a single job on cluster/multicore
    %(refine_evt_by_job)s = refine_evt_by_job ! control the maximal number of events for the first iteration of the refine (larger means less jobs)
-   %(global_flag)s = global_flag ! fortran optimization flag use for the all code
+#*********************************************************************
+# Compilation flag. No automatic re-compilation (need manual "make clean" in Source)
+#*********************************************************************   
+   %(global_flag)s = global_flag ! fortran optimization flag use for the all code.
    %(aloha_flag)s  = aloha_flag ! fortran optimization flag for aloha function. Suggestions: '-ffast-math'
    %(matrix_flag)s = matrix_flag ! fortran optimization flag for matrix.f function. Suggestions: '-O3'
 """,
@@ -3309,9 +3309,7 @@
             self['hel_recycling'] = False
             logger.warning("""Helicity recycling optimization requires Python3. This optimzation is therefore deactivated automatically. 
             In general this optimization speed up the computation be a factor of two.""")
-        elif self['hel_recycling']:
-            if self['gridpack']:
-                self.set(self, "hel_zeroamp", True, changeifuserset=False, user=False, raiseerror=False)
+
                 
         # check that ebeam is bigger than the associated mass.
         for i in [1,2]:

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2021-02-14 22:27:00 +0000
+++ madgraph/various/misc.py	2021-03-25 07:55:46 +0000
@@ -1603,7 +1603,7 @@
         def digest(text):
             """using mg5 for the hash"""
             t = hashlib.md5()
-            t.update(text.encode())
+            t.update(text)
             return t.hexdigest()
         return digest
     
@@ -2026,11 +2026,16 @@
 def plugin_import(module, error_msg, fcts=[]):
     """convenient way to import a plugin file/function"""
     
+    if six.PY2:
+        level = -1
+    else:
+        level = 0
+
     try:
-        _temp = __import__('PLUGIN.%s' % module, globals(), locals(), fcts, -1)
+        _temp = __import__('PLUGIN.%s' % module, globals(), locals(), fcts, level)
     except ImportError:
         try:
-            _temp = __import__('MG5aMC_PLUGIN.%s' % module, globals(), locals(), fcts, -1)
+            _temp = __import__('MG5aMC_PLUGIN.%s' % module, globals(), locals(), fcts, level)
         except ImportError:
             raise MadGraph5Error(error_msg)
     

=== modified file 'models/check_param_card.py'
--- models/check_param_card.py	2020-10-19 20:46:47 +0000
+++ models/check_param_card.py	2021-03-25 07:55:46 +0000
@@ -888,6 +888,11 @@
                     value = self[block].get(tuple(lhaid)).value
                 except KeyError:
                     value =defaultcard[block].get(tuple(lhaid)).value
+            elif block == 'loop' and lhaid == [1]:
+                try:
+                    value =defaultcard[block].get(tuple(lhaid)).value
+                except:
+                    value = 9.1188    
             else:
                 value =defaultcard[block].get(tuple(lhaid)).value
             #value = str(value).lower()

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2021-01-29 22:04:24 +0000
+++ models/import_ufo.py	2021-03-25 07:55:46 +0000
@@ -1976,6 +1976,21 @@
                 else:
                     raise Exception
 
+        # delete cache for coupling_order if some coupling are not present in the model anymore
+        old_order = self['coupling_orders']
+        self['coupling_orders'] = None
+        if old_order and old_order != self.get('coupling_orders'):
+            removed = set(old_order).difference(set(self.get('coupling_orders')))
+            logger.warning("Some coupling order do not have any coupling associated to them: %s", list(removed))
+            logger.warning("Those coupling order will not be valid anymore for this model")
+
+            self['order_hierarchy'] = {}
+            self['expansion_order'] = None
+            #and re-initialize it to avoid any potential side effect
+            self.get('order_hierarchy')
+            self.get('expansion_order')
+
+
 
         
     def locate_coupling(self):

=== modified file 'models/loop_sm/CT_couplings.py'
--- models/loop_sm/CT_couplings.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/CT_couplings.py	2021-03-25 07:55:46 +0000
@@ -3,8 +3,8 @@
 # Date: Fri 18 Mar 2011 18:40:51
 
 from __future__ import absolute_import
-from object_library import all_couplings, Coupling
-from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from .object_library import all_couplings, Coupling
+from .function_library import complexconjugate, re, im, csc, sec, acsc, asec
 
 ################
 # R2 couplings #

=== modified file 'models/loop_sm/CT_parameters.py'
--- models/loop_sm/CT_parameters.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/CT_parameters.py	2021-03-25 07:55:46 +0000
@@ -3,8 +3,8 @@
 # Date: Fri 18 Mar 2011 18:40:51
 
 from __future__ import absolute_import
-from object_library import all_CTparameters, CTParameter
-from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from .object_library import all_CTparameters, CTParameter
+from .function_library import complexconjugate, re, im, csc, sec, acsc, asec
 
 ################
 # R2 vertices  #

=== modified file 'models/loop_sm/CT_vertices.py'
--- models/loop_sm/CT_vertices.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/CT_vertices.py	2021-03-25 07:55:46 +0000
@@ -4,10 +4,10 @@
 
 
 from __future__ import absolute_import
-from object_library import all_vertices, all_CTvertices, Vertex, CTVertex
-import particles as P
-import CT_couplings as C
-import lorentz as L
+from .object_library import all_vertices, all_CTvertices, Vertex, CTVertex
+from . import particles as P
+from . import CT_couplings as C
+from . import lorentz as L
 
 ################
 # R2 vertices  #

=== modified file 'models/loop_sm/__init__.py'
--- models/loop_sm/__init__.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/__init__.py	2021-03-25 07:55:46 +0000
@@ -1,17 +1,17 @@
 #from __future__ import absolute_import
 from __future__ import absolute_import
-import particles
-import couplings
-import CT_couplings
-import lorentz
-import parameters
-import CT_parameters
-import vertices
-import CT_vertices
-import write_param_card
-import coupling_orders
-import object_library
-import function_library
+from . import particles
+from . import couplings
+from . import CT_couplings
+from . import lorentz
+from . import parameters
+from . import CT_parameters
+from . import vertices
+from . import CT_vertices
+from . import write_param_card
+from . import coupling_orders
+from . import object_library
+from . import function_library
 
 # model options
 gauge = [0, 1]

=== modified file 'models/loop_sm/coupling_orders.py'
--- models/loop_sm/coupling_orders.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/coupling_orders.py	2021-03-25 07:55:46 +0000
@@ -4,7 +4,7 @@
 
 
 from __future__ import absolute_import
-from object_library import all_orders, CouplingOrder
+from .object_library import all_orders, CouplingOrder
 
 QCD = CouplingOrder(name = 'QCD',
                     hierarchy = 1,

=== modified file 'models/loop_sm/couplings.py'
--- models/loop_sm/couplings.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/couplings.py	2021-03-25 07:55:46 +0000
@@ -5,8 +5,8 @@
 
 
 from __future__ import absolute_import
-from object_library import all_couplings, Coupling
-from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from .object_library import all_couplings, Coupling
+from .function_library import complexconjugate, re, im, csc, sec, acsc, asec
 
 GC_HHHH = Coupling(name = 'GC_HHHH',
                  value = '-6*complex(0,1)*lam',

=== modified file 'models/loop_sm/function_library.py'
--- models/loop_sm/function_library.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/function_library.py	2021-03-25 07:55:46 +0000
@@ -14,9 +14,9 @@
 
 import cmath
 try:
-    from object_library import all_functions, Function
+    from .object_library import all_functions, Function
 except:
-    import object_library
+    from . import object_library
     all_functions, Function = object_library.all_functions , object_library.Function
 #
 # shortcuts for functions from cmath

=== modified file 'models/loop_sm/lorentz.py'
--- models/loop_sm/lorentz.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/lorentz.py	2021-03-25 07:55:46 +0000
@@ -4,8 +4,8 @@
 
 
 from __future__ import absolute_import
-from object_library import all_lorentz, Lorentz
-from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from .object_library import all_lorentz, Lorentz
+from .function_library import complexconjugate, re, im, csc, sec, acsc, asec
 
 ###################################
 # CounterTerms Lorentz structures #

=== modified file 'models/loop_sm/parameters.py'
--- models/loop_sm/parameters.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/parameters.py	2021-03-25 07:55:46 +0000
@@ -3,8 +3,8 @@
 # Date: Wed 6 Jul 2011 14:07:37
 
 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/loop_sm/particles.py'
--- models/loop_sm/particles.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/particles.py	2021-03-25 07:55:46 +0000
@@ -5,9 +5,9 @@
 
 from __future__ import division
 from __future__ import absolute_import
-from object_library import all_particles, Particle
-import parameters as Param
-import CT_parameters as CTParam
+from .object_library import all_particles, Particle
+from . import parameters as Param
+from . import CT_parameters as CTParam
 
 # ======================================================================
 # QCD particles

=== modified file 'models/loop_sm/vertices.py'
--- models/loop_sm/vertices.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/vertices.py	2021-03-25 07:55:46 +0000
@@ -3,10 +3,10 @@
 # Date: Fri 18 Mar 2011 18:40:51
 
 from __future__ import absolute_import
-from object_library import all_vertices, all_CTvertices, Vertex, CTVertex
-import particles as P
-import couplings as C
-import lorentz as L
+from .object_library import all_vertices, all_CTvertices, Vertex, CTVertex
+from . import particles as P
+from . import couplings as C
+from . import lorentz as L
 
 # ======================================================================
 # QCD base vertices

=== modified file 'models/loop_sm/write_param_card.py'
--- models/loop_sm/write_param_card.py	2021-02-14 22:27:00 +0000
+++ models/loop_sm/write_param_card.py	2021-03-25 07:55:46 +0000
@@ -1,7 +1,12 @@
 
+from __future__ import print_function
+from __future__ import absolute_import
+from six.moves import range
 __date__ = "3 june 2010"
 __author__ = '[e-mail]'
 
+from .function_library import *
+
 class ParamCardWriter(object):
     
     header = \
@@ -13,7 +18,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']
         
@@ -30,7 +35,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 \
@@ -79,8 +84,7 @@
             self.write_block(lhablock)
             need_writing = [ param for param in all_ext_param if \
                                                      param.lhablock == lhablock]
-            from functools import cmp_to_key
-            need_writing.sort(key=cmp_to_key(self.order_param))
+            need_writing.sort(self.order_param)
             [self.write_param(param, lhablock) for param in need_writing]
             
             if self.generic_output:
@@ -115,12 +119,9 @@
     
     def write_dep_param_block(self, lhablock):
         import cmath
-        from parameters import all_parameters
+        from .parameters import all_parameters
         for parameter in all_parameters:
-            try:
-                exec("%s = %s" % (parameter.name, parameter.value))
-            except Exception:
-                pass
+            exec("%s = %s" % (parameter.name, parameter.value))
         text = "##  Not dependent paramater.\n"
         text += "## Those values should be edited following analytical the \n"
         text += "## analytical expression. Some generator could simply ignore \n"
@@ -151,7 +152,7 @@
     
     def write_qnumber(self):
         """ write qnumber """
-        from particles import all_particles
+        from .particles import all_particles
         
         text="""#===========================================================\n"""
         text += """# QUANTUM NUMBERS OF NEW STATE(S) (NON SM PDG CODE)\n"""

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_001.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_001.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_001.f	2021-03-25 07:55:46 +0000
@@ -138,11 +138,16 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (-1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(2)
-      JAMP2(2) = (1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(3)
-      JAMP2(3) = (1D0/2D0)*AMP(2)+(1D0/2D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,-1.500000000000000D+00))
+     $ *AMP(1)+(1.500000000000000D+00)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,1.500000000000000D+00))*AMP(1)
+     $ +(1.500000000000000D+00)*AMP(3)
+      JAMP2(3) = (5.000000000000000D-01)*AMP(2)+(5.000000000000000D-01)
+     $ *AMP(3)
       B_SF_001 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_002.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_002.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_002.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (-1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(2)
-      JAMP2(2) = (-0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,-1.500000000000000D+00))
+     $ *AMP(1)+(1.500000000000000D+00)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-5.000000000000000D-01))
+     $ *AMP(1)+(-5.000000000000000D-01)*AMP(3)
       B_SF_002 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_003.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_003.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_003.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(3)
-      JAMP2(2) = (0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(2)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,1.500000000000000D+00))*AMP(1)
+     $ +(1.500000000000000D+00)*AMP(3)
+      JAMP2(2) = ((0.000000000000000D+00,5.000000000000000D-01))*AMP(1)
+     $ +(-5.000000000000000D-01)*AMP(2)
       B_SF_003 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_004.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_004.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_004.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(3)
-      JAMP2(2) = (0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(2)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,1.500000000000000D+00))*AMP(1)
+     $ +(1.500000000000000D+00)*AMP(3)
+      JAMP2(2) = ((0.000000000000000D+00,5.000000000000000D-01))*AMP(1)
+     $ +(-5.000000000000000D-01)*AMP(2)
       B_SF_004 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_005.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_005.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_005.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (-1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(2)
-      JAMP2(2) = (-0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,-1.500000000000000D+00))
+     $ *AMP(1)+(1.500000000000000D+00)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-5.000000000000000D-01))
+     $ *AMP(1)+(-5.000000000000000D-01)*AMP(3)
       B_SF_005 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_006.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_006.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_006.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (0.6666666666666666*IMAG1)*AMP(1)+(-2D0/3D0)*AMP(2)
-      JAMP2(2) = (-0.6666666666666666*IMAG1)*AMP(1)+(-2D0/3D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,6.666666666666666D-01))*AMP(1)
+     $ +(-6.666666666666666D-01)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-6.666666666666666D-01))
+     $ *AMP(1)+(-6.666666666666666D-01)*AMP(3)
       B_SF_006 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_007.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_007.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_007.f	2021-03-25 07:55:46 +0000
@@ -138,11 +138,16 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (0.16666666666666666*IMAG1)*AMP(1)+(-1D0/6D0)*AMP(2)
-      JAMP2(2) = (-0.16666666666666666*IMAG1)*AMP(1)+(-1D0/6D0)*AMP(3)
-      JAMP2(3) = (1D0/2D0)*AMP(2)+(1D0/2D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,1.666666666666667D-01))*AMP(1)
+     $ +(-1.666666666666667D-01)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-1.666666666666667D-01))
+     $ *AMP(1)+(-1.666666666666667D-01)*AMP(3)
+      JAMP2(3) = (5.000000000000000D-01)*AMP(2)+(5.000000000000000D-01)
+     $ *AMP(3)
       B_SF_007 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_008.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_008.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_008.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (0.6666666666666666*IMAG1)*AMP(1)+(-2D0/3D0)*AMP(2)
-      JAMP2(2) = (-0.6666666666666666*IMAG1)*AMP(1)+(-2D0/3D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,6.666666666666666D-01))*AMP(1)
+     $ +(-6.666666666666666D-01)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-6.666666666666666D-01))
+     $ *AMP(1)+(-6.666666666666666D-01)*AMP(3)
       B_SF_008 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%born.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%born.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%born.f	2021-03-25 07:55:46 +0000
@@ -289,8 +289,10 @@
               ENDIF
             ENDDO
           ENDIF
-          JAMP(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-          JAMP(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
+          JAMP(1) = ((0.000000000000000D+00,1.000000000000000D+00))
+     $     *AMP(1)+(-1.000000000000000D+00)*AMP(2)
+          JAMP(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $     *AMP(1)+(-1.000000000000000D+00)*AMP(3)
           DO I = 1, NCOLOR
             ZTEMP = (0.D0,0.D0)
             DO J = 1, NCOLOR

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%born_hel.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%born_hel.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%born_hel.f	2021-03-25 07:55:46 +0000
@@ -140,8 +140,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
+      JAMP(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP(2) = ((0.000000000000000D+00,-1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(3)
       BORN_HEL = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_001.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_001.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_001.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/36D0)*AMP(1)
-      JAMP2(2) = (-1D0/12D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (-8.333333333333333D-02)*AMP(1)
       B_SF_001 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_002.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_002.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_002.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/36D0)*AMP(1)
-      JAMP2(2) = (7D0/12D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (5.833333333333334D-01)*AMP(1)
       B_SF_002 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_003.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_003.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_003.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (-5D0/18D0)*AMP(1)
-      JAMP2(2) = (1D0/6D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-01)*AMP(1)
+      JAMP2(2) = (1.666666666666667D-01)*AMP(1)
       B_SF_003 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_004.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_004.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_004.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (-5D0/18D0)*AMP(1)
-      JAMP2(2) = (1D0/6D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-01)*AMP(1)
+      JAMP2(2) = (1.666666666666667D-01)*AMP(1)
       B_SF_004 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_005.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_005.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_005.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/36D0)*AMP(1)
-      JAMP2(2) = (7D0/12D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (5.833333333333334D-01)*AMP(1)
       B_SF_005 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_006.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_006.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_006.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/9D0)*AMP(1)
-      JAMP2(2) = (-1D0/3D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (1.111111111111111D-01)*AMP(1)
+      JAMP2(2) = (-3.333333333333333D-01)*AMP(1)
       B_SF_006 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_007.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_007.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_007.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/36D0)*AMP(1)
-      JAMP2(2) = (-1D0/12D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (-8.333333333333333D-02)*AMP(1)
       B_SF_007 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_008.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_008.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_008.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/9D0)*AMP(1)
-      JAMP2(2) = (-1D0/3D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (1.111111111111111D-01)*AMP(1)
+      JAMP2(2) = (-3.333333333333333D-01)*AMP(1)
       B_SF_008 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%born.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%born.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%born.f	2021-03-25 07:55:46 +0000
@@ -289,8 +289,8 @@
               ENDIF
             ENDDO
           ENDIF
-          JAMP(1) = (1D0/6D0)*AMP(1)
-          JAMP(2) = (-1D0/2D0)*AMP(1)
+          JAMP(1) = (1.666666666666667D-01)*AMP(1)
+          JAMP(2) = (-5.000000000000000D-01)*AMP(1)
           DO I = 1, NCOLOR
             ZTEMP = (0.D0,0.D0)
             DO J = 1, NCOLOR

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%born_hel.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%born_hel.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%born_hel.f	2021-03-25 07:55:46 +0000
@@ -146,8 +146,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP(1) = (1D0/6D0)*AMP(1)
-      JAMP(2) = (-1D0/2D0)*AMP(1)
+      JAMP(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP(2) = (-5.000000000000000D-01)*AMP(1)
       BORN_HEL = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_001.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_001.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_001.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/36D0)*AMP(1)
-      JAMP2(2) = (1D0/12D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (8.333333333333333D-02)*AMP(1)
       B_SF_001 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_002.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_002.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_002.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (5D0/18D0)*AMP(1)
-      JAMP2(2) = (-1D0/6D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-01)*AMP(1)
+      JAMP2(2) = (-1.666666666666667D-01)*AMP(1)
       B_SF_002 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_003.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_003.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_003.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/36D0)*AMP(1)
-      JAMP2(2) = (-7D0/12D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (-5.833333333333334D-01)*AMP(1)
       B_SF_003 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_004.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_004.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_004.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/36D0)*AMP(1)
-      JAMP2(2) = (-7D0/12D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (-5.833333333333334D-01)*AMP(1)
       B_SF_004 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_005.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_005.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_005.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (5D0/18D0)*AMP(1)
-      JAMP2(2) = (-1D0/6D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-01)*AMP(1)
+      JAMP2(2) = (-1.666666666666667D-01)*AMP(1)
       B_SF_005 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_006.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_006.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_006.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/9D0)*AMP(1)
-      JAMP2(2) = (1D0/3D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-1.111111111111111D-01)*AMP(1)
+      JAMP2(2) = (3.333333333333333D-01)*AMP(1)
       B_SF_006 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_007.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_007.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_007.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/36D0)*AMP(1)
-      JAMP2(2) = (1D0/12D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (8.333333333333333D-02)*AMP(1)
       B_SF_007 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_008.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_008.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_008.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/9D0)*AMP(1)
-      JAMP2(2) = (1D0/3D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-1.111111111111111D-01)*AMP(1)
+      JAMP2(2) = (3.333333333333333D-01)*AMP(1)
       B_SF_008 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%born.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%born.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%born.f	2021-03-25 07:55:46 +0000
@@ -289,8 +289,8 @@
               ENDIF
             ENDDO
           ENDIF
-          JAMP(1) = (-1D0/6D0)*AMP(1)
-          JAMP(2) = (1D0/2D0)*AMP(1)
+          JAMP(1) = (-1.666666666666667D-01)*AMP(1)
+          JAMP(2) = (5.000000000000000D-01)*AMP(1)
           DO I = 1, NCOLOR
             ZTEMP = (0.D0,0.D0)
             DO J = 1, NCOLOR

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%born_hel.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%born_hel.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%born_hel.f	2021-03-25 07:55:46 +0000
@@ -146,8 +146,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP(1) = (-1D0/6D0)*AMP(1)
-      JAMP(2) = (1D0/2D0)*AMP(1)
+      JAMP(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP(2) = (5.000000000000000D-01)*AMP(1)
       BORN_HEL = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_001.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_001.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_001.f	2021-03-25 07:55:46 +0000
@@ -138,11 +138,16 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (-1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(2)
-      JAMP2(2) = (1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(3)
-      JAMP2(3) = (1D0/2D0)*AMP(2)+(1D0/2D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,-1.500000000000000D+00))
+     $ *AMP(1)+(1.500000000000000D+00)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,1.500000000000000D+00))*AMP(1)
+     $ +(1.500000000000000D+00)*AMP(3)
+      JAMP2(3) = (5.000000000000000D-01)*AMP(2)+(5.000000000000000D-01)
+     $ *AMP(3)
       B_SF_001 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_002.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_002.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_002.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (-1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(2)
-      JAMP2(2) = (-0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,-1.500000000000000D+00))
+     $ *AMP(1)+(1.500000000000000D+00)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-5.000000000000000D-01))
+     $ *AMP(1)+(-5.000000000000000D-01)*AMP(3)
       B_SF_002 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_003.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_003.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_003.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(3)
-      JAMP2(2) = (0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(2)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,1.500000000000000D+00))*AMP(1)
+     $ +(1.500000000000000D+00)*AMP(3)
+      JAMP2(2) = ((0.000000000000000D+00,5.000000000000000D-01))*AMP(1)
+     $ +(-5.000000000000000D-01)*AMP(2)
       B_SF_003 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_004.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_004.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_004.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(3)
-      JAMP2(2) = (0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(2)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,1.500000000000000D+00))*AMP(1)
+     $ +(1.500000000000000D+00)*AMP(3)
+      JAMP2(2) = ((0.000000000000000D+00,5.000000000000000D-01))*AMP(1)
+     $ +(-5.000000000000000D-01)*AMP(2)
       B_SF_004 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_005.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_005.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_005.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (-1.5*IMAG1)*AMP(1)+(3D0/2D0)*AMP(2)
-      JAMP2(2) = (-0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,-1.500000000000000D+00))
+     $ *AMP(1)+(1.500000000000000D+00)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-5.000000000000000D-01))
+     $ *AMP(1)+(-5.000000000000000D-01)*AMP(3)
       B_SF_005 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_006.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_006.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_006.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (0.6666666666666666*IMAG1)*AMP(1)+(-2D0/3D0)*AMP(2)
-      JAMP2(2) = (-0.6666666666666666*IMAG1)*AMP(1)+(-2D0/3D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,6.666666666666666D-01))*AMP(1)
+     $ +(-6.666666666666666D-01)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-6.666666666666666D-01))
+     $ *AMP(1)+(-6.666666666666666D-01)*AMP(3)
       B_SF_006 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_007.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_007.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_007.f	2021-03-25 07:55:46 +0000
@@ -138,11 +138,16 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (0.16666666666666666*IMAG1)*AMP(1)+(-1D0/6D0)*AMP(2)
-      JAMP2(2) = (-0.16666666666666666*IMAG1)*AMP(1)+(-1D0/6D0)*AMP(3)
-      JAMP2(3) = (1D0/2D0)*AMP(2)+(1D0/2D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,1.666666666666667D-01))*AMP(1)
+     $ +(-1.666666666666667D-01)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-1.666666666666667D-01))
+     $ *AMP(1)+(-1.666666666666667D-01)*AMP(3)
+      JAMP2(3) = (5.000000000000000D-01)*AMP(2)+(5.000000000000000D-01)
+     $ *AMP(3)
       B_SF_007 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_008.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_008.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_008.f	2021-03-25 07:55:46 +0000
@@ -138,10 +138,14 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP1(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
-      JAMP2(1) = (0.6666666666666666*IMAG1)*AMP(1)+(-2D0/3D0)*AMP(2)
-      JAMP2(2) = (-0.6666666666666666*IMAG1)*AMP(1)+(-2D0/3D0)*AMP(3)
+      JAMP1(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP1(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+(-1.000000000000000D+00)*AMP(3)
+      JAMP2(1) = ((0.000000000000000D+00,6.666666666666666D-01))*AMP(1)
+     $ +(-6.666666666666666D-01)*AMP(2)
+      JAMP2(2) = ((0.000000000000000D+00,-6.666666666666666D-01))
+     $ *AMP(1)+(-6.666666666666666D-01)*AMP(3)
       B_SF_008 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%born.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%born.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%born.f	2021-03-25 07:55:46 +0000
@@ -289,8 +289,10 @@
               ENDIF
             ENDDO
           ENDIF
-          JAMP(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-          JAMP(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
+          JAMP(1) = ((0.000000000000000D+00,1.000000000000000D+00))
+     $     *AMP(1)+(-1.000000000000000D+00)*AMP(2)
+          JAMP(2) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $     *AMP(1)+(-1.000000000000000D+00)*AMP(3)
           DO I = 1, NCOLOR
             ZTEMP = (0.D0,0.D0)
             DO J = 1, NCOLOR

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%born_hel.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%born_hel.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%born_hel.f	2021-03-25 07:55:46 +0000
@@ -140,8 +140,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP(1) = (1*IMAG1)*AMP(1)+(-1)*AMP(2)
-      JAMP(2) = (-1*IMAG1)*AMP(1)+(-1)*AMP(3)
+      JAMP(1) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(2)
+      JAMP(2) = ((0.000000000000000D+00,-1.000000000000000D+00))*AMP(1)
+     $ +(-1.000000000000000D+00)*AMP(3)
       BORN_HEL = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_1.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_1.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_1.f	2021-03-25 07:55:46 +0000
@@ -236,25 +236,36 @@
       CALL FFV1_0(W(1,4),W(1,3),W(1,11),GC_11,AMP(16))
       CALL FFV1_0(W(1,4),W(1,3),W(1,7),GC_11,AMP(17))
       CALL FFV1_0(W(1,4),W(1,3),W(1,10),GC_11,AMP(18))
-      TMP_JAMP(3) = AMP(15) + (1) * AMP(16)  ! used 4 times
-      TMP_JAMP(2) = AMP(1) + (1) * AMP(18)  ! used 4 times
-      TMP_JAMP(1) = AMP(12) + (-1) * AMP(17)  ! used 4 times
-      TMP_JAMP(10) = TMP_JAMP(3) + (-1) * TMP_JAMP(2)  ! used 2 times
-      TMP_JAMP(9) = TMP_JAMP(1) + ((-0+1*IMAG1)) * AMP(11)  ! used 2 times
-      TMP_JAMP(8) = TMP_JAMP(2) + (-1) * TMP_JAMP(1)  ! used 2 times
-      TMP_JAMP(7) = TMP_JAMP(1) + (-1*IMAG1) * AMP(10)  ! used 2 times
-      TMP_JAMP(6) = TMP_JAMP(3) + (-1) * TMP_JAMP(1)  ! used 2 times
-      TMP_JAMP(5) = TMP_JAMP(2) + (-1*IMAG1) * AMP(3)  ! used 2 times
-      TMP_JAMP(4) = TMP_JAMP(3) + ((-0+1*IMAG1)) * AMP(5)  ! used 2 times
-      JAMP(1) = (-1)*AMP(6)+(1)*TMP_JAMP(4)+(-1)*TMP_JAMP(5)
-      JAMP(2) = (-1)*AMP(4)+(-1)*TMP_JAMP(4)+(1)*TMP_JAMP(9)
-      JAMP(3) = (-1)*AMP(13)+(1)*TMP_JAMP(5)+(-1)*TMP_JAMP(7)
-      JAMP(4) = (-1)*AMP(7)+(1*IMAG1)*AMP(8)+(-1*IMAG1)*AMP(10)+(-1)
+      TMP_JAMP(3) = AMP(15) +  AMP(16)  ! used 4 times
+      TMP_JAMP(2) = AMP(1) +  AMP(18)  ! used 4 times
+      TMP_JAMP(1) = AMP(12) - AMP(17)  ! used 4 times
+      TMP_JAMP(10) = TMP_JAMP(3) - TMP_JAMP(2)  ! used 2 times
+      TMP_JAMP(9) = TMP_JAMP(1) + ((-0.000000000000000D+00
+     $ ,1.000000000000000D+00)) * AMP(11)  ! used 2 times
+      TMP_JAMP(8) = TMP_JAMP(2) - TMP_JAMP(1)  ! used 2 times
+      TMP_JAMP(7) = TMP_JAMP(1) + ((0.000000000000000D+00,
+     $ -1.000000000000000D+00)) * AMP(10)  ! used 2 times
+      TMP_JAMP(6) = TMP_JAMP(3) - TMP_JAMP(1)  ! used 2 times
+      TMP_JAMP(5) = TMP_JAMP(2) + ((0.000000000000000D+00,
+     $ -1.000000000000000D+00)) * AMP(3)  ! used 2 times
+      TMP_JAMP(4) = TMP_JAMP(3) + ((-0.000000000000000D+00
+     $ ,1.000000000000000D+00)) * AMP(5)  ! used 2 times
+      JAMP(1) = (-1.000000000000000D+00)*AMP(6)+TMP_JAMP(4)+(
+     $ -1.000000000000000D+00)*TMP_JAMP(5)
+      JAMP(2) = (-1.000000000000000D+00)*AMP(4)+(-1.000000000000000D
+     $ +00)*TMP_JAMP(4)+TMP_JAMP(9)
+      JAMP(3) = (-1.000000000000000D+00)*AMP(13)+TMP_JAMP(5)+(
+     $ -1.000000000000000D+00)*TMP_JAMP(7)
+      JAMP(4) = (-1.000000000000000D+00)*AMP(7)+((0.000000000000000D
+     $ +00,1.000000000000000D+00))*AMP(8)+((0.000000000000000D+00,
+     $ -1.000000000000000D+00))*AMP(10)+(-1.000000000000000D+00)
      $ *TMP_JAMP(6)
-      JAMP(5) = (1*IMAG1)*AMP(2)+(-1*IMAG1)*AMP(11)+(-1)*AMP(14)+(1)
-     $ *TMP_JAMP(8)
-      JAMP(6) = (-1*IMAG1)*AMP(2)+(-1*IMAG1)*AMP(8)+(-1)*AMP(9)+(1)
-     $ *TMP_JAMP(10)
+      JAMP(5) = ((0.000000000000000D+00,1.000000000000000D+00))*AMP(2)
+     $ +((0.000000000000000D+00,-1.000000000000000D+00))*AMP(11)+(
+     $ -1.000000000000000D+00)*AMP(14)+TMP_JAMP(8)
+      JAMP(6) = ((0.000000000000000D+00,-1.000000000000000D+00))*AMP(2)
+     $ +((0.000000000000000D+00,-1.000000000000000D+00))*AMP(8)+(
+     $ -1.000000000000000D+00)*AMP(9)+TMP_JAMP(10)
       MATRIX_1 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_2.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_2.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_2.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,14 @@
       CALL FFV1_2(W(1,5),W(1,2),GC_11,ZERO,ZERO,W(1,6))
 C     Amplitude(s) for diagram number 5
       CALL FFV1_0(W(1,6),W(1,1),W(1,7),GC_11,AMP(5))
-      JAMP(1) = (1D0/2D0)*AMP(2)+(0.5*IMAG1)*AMP(4)+(1D0/2D0)*AMP(5)
-      JAMP(2) = (-1D0/6D0)*AMP(2)+(-1D0/6D0)*AMP(3)
-      JAMP(3) = (1D0/2D0)*AMP(1)+(1D0/2D0)*AMP(3)+(-0.5*IMAG1)*AMP(4)
-      JAMP(4) = (-1D0/6D0)*AMP(1)+(-1D0/6D0)*AMP(5)
+      JAMP(1) = (5.000000000000000D-01)*AMP(2)+((0.000000000000000D+00
+     $ ,5.000000000000000D-01))*AMP(4)+(5.000000000000000D-01)*AMP(5)
+      JAMP(2) = (-1.666666666666667D-01)*AMP(2)+(-1.666666666666667D
+     $ -01)*AMP(3)
+      JAMP(3) = (5.000000000000000D-01)*AMP(1)+(5.000000000000000D-01)
+     $ *AMP(3)+((0.000000000000000D+00,-5.000000000000000D-01))*AMP(4)
+      JAMP(4) = (-1.666666666666667D-01)*AMP(1)+(-1.666666666666667D
+     $ -01)*AMP(5)
       MATRIX_2 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_3.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_3.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_3.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,16 @@
       CALL FFV1_1(W(1,5),W(1,2),GC_11,ZERO,ZERO,W(1,6))
 C     Amplitude(s) for diagram number 5
       CALL FFV1_0(W(1,1),W(1,6),W(1,7),GC_11,AMP(5))
-      JAMP(1) = (-1D0/2D0)*AMP(1)+(-1D0/2D0)*AMP(2)+(-0.5*IMAG1)*AMP(4)
-      JAMP(2) = (1D0/6D0)*AMP(2)+(1D0/6D0)*AMP(3)
-      JAMP(3) = (1D0/6D0)*AMP(1)+(1D0/6D0)*AMP(5)
-      JAMP(4) = (-1D0/2D0)*AMP(3)+(0.5*IMAG1)*AMP(4)+(-1D0/2D0)*AMP(5)
+      JAMP(1) = (-5.000000000000000D-01)*AMP(1)+(-5.000000000000000D
+     $ -01)*AMP(2)+((0.000000000000000D+00,-5.000000000000000D-01))
+     $ *AMP(4)
+      JAMP(2) = (1.666666666666667D-01)*AMP(2)+(1.666666666666667D-01)
+     $ *AMP(3)
+      JAMP(3) = (1.666666666666667D-01)*AMP(1)+(1.666666666666667D-01)
+     $ *AMP(5)
+      JAMP(4) = (-5.000000000000000D-01)*AMP(3)+((0.000000000000000D
+     $ +00,5.000000000000000D-01))*AMP(4)+(-5.000000000000000D-01)
+     $ *AMP(5)
       MATRIX_3 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_4.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_4.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_4.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,14 @@
       CALL FFV1_0(W(1,6),W(1,2),W(1,7),GC_11,AMP(4))
 C     Amplitude(s) for diagram number 5
       CALL VVV1_0(W(1,1),W(1,8),W(1,7),GC_10,AMP(5))
-      JAMP(1) = (1D0/2D0)*AMP(1)+(1D0/2D0)*AMP(3)+(0.5*IMAG1)*AMP(5)
-      JAMP(2) = (-1D0/6D0)*AMP(1)+(-1D0/6D0)*AMP(4)
-      JAMP(3) = (-1D0/6D0)*AMP(2)+(-1D0/6D0)*AMP(3)
-      JAMP(4) = (1D0/2D0)*AMP(2)+(1D0/2D0)*AMP(4)+(-0.5*IMAG1)*AMP(5)
+      JAMP(1) = (5.000000000000000D-01)*AMP(1)+(5.000000000000000D-01)
+     $ *AMP(3)+((0.000000000000000D+00,5.000000000000000D-01))*AMP(5)
+      JAMP(2) = (-1.666666666666667D-01)*AMP(1)+(-1.666666666666667D
+     $ -01)*AMP(4)
+      JAMP(3) = (-1.666666666666667D-01)*AMP(2)+(-1.666666666666667D
+     $ -01)*AMP(3)
+      JAMP(4) = (5.000000000000000D-01)*AMP(2)+(5.000000000000000D-01)
+     $ *AMP(4)+((0.000000000000000D+00,-5.000000000000000D-01))*AMP(5)
       MATRIX_4 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_5.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_5.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_5.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,16 @@
       CALL FFV1_0(W(1,2),W(1,6),W(1,7),GC_11,AMP(4))
 C     Amplitude(s) for diagram number 5
       CALL VVV1_0(W(1,1),W(1,8),W(1,7),GC_10,AMP(5))
-      JAMP(1) = (-1D0/2D0)*AMP(1)+(-1D0/2D0)*AMP(2)+(0.5*IMAG1)*AMP(5)
-      JAMP(2) = (1D0/6D0)*AMP(2)+(1D0/6D0)*AMP(3)
-      JAMP(3) = (1D0/6D0)*AMP(1)+(1D0/6D0)*AMP(4)
-      JAMP(4) = (-1D0/2D0)*AMP(3)+(-1D0/2D0)*AMP(4)+(-0.5*IMAG1)*AMP(5)
+      JAMP(1) = (-5.000000000000000D-01)*AMP(1)+(-5.000000000000000D
+     $ -01)*AMP(2)+((0.000000000000000D+00,5.000000000000000D-01))
+     $ *AMP(5)
+      JAMP(2) = (1.666666666666667D-01)*AMP(2)+(1.666666666666667D-01)
+     $ *AMP(3)
+      JAMP(3) = (1.666666666666667D-01)*AMP(1)+(1.666666666666667D-01)
+     $ *AMP(4)
+      JAMP(4) = (-5.000000000000000D-01)*AMP(3)+(-5.000000000000000D
+     $ -01)*AMP(4)+((0.000000000000000D+00,-5.000000000000000D-01))
+     $ *AMP(5)
       MATRIX_5 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_001.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_001.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_001.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/36D0)*AMP(1)
-      JAMP2(2) = (-1D0/12D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (-8.333333333333333D-02)*AMP(1)
       B_SF_001 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_002.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_002.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_002.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/36D0)*AMP(1)
-      JAMP2(2) = (7D0/12D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (5.833333333333334D-01)*AMP(1)
       B_SF_002 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_003.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_003.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_003.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (-5D0/18D0)*AMP(1)
-      JAMP2(2) = (1D0/6D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-01)*AMP(1)
+      JAMP2(2) = (1.666666666666667D-01)*AMP(1)
       B_SF_003 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_004.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_004.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_004.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (-5D0/18D0)*AMP(1)
-      JAMP2(2) = (1D0/6D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-01)*AMP(1)
+      JAMP2(2) = (1.666666666666667D-01)*AMP(1)
       B_SF_004 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_005.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_005.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_005.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/36D0)*AMP(1)
-      JAMP2(2) = (7D0/12D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (5.833333333333334D-01)*AMP(1)
       B_SF_005 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_006.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_006.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_006.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/9D0)*AMP(1)
-      JAMP2(2) = (-1D0/3D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (1.111111111111111D-01)*AMP(1)
+      JAMP2(2) = (-3.333333333333333D-01)*AMP(1)
       B_SF_006 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_007.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_007.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_007.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/36D0)*AMP(1)
-      JAMP2(2) = (-1D0/12D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (-8.333333333333333D-02)*AMP(1)
       B_SF_007 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_008.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_008.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_008.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1D0/6D0)*AMP(1)
-      JAMP1(2) = (-1D0/2D0)*AMP(1)
-      JAMP2(1) = (1D0/9D0)*AMP(1)
-      JAMP2(2) = (-1D0/3D0)*AMP(1)
+      JAMP1(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (-5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (1.111111111111111D-01)*AMP(1)
+      JAMP2(2) = (-3.333333333333333D-01)*AMP(1)
       B_SF_008 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%born.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%born.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%born.f	2021-03-25 07:55:46 +0000
@@ -289,8 +289,8 @@
               ENDIF
             ENDDO
           ENDIF
-          JAMP(1) = (1D0/6D0)*AMP(1)
-          JAMP(2) = (-1D0/2D0)*AMP(1)
+          JAMP(1) = (1.666666666666667D-01)*AMP(1)
+          JAMP(2) = (-5.000000000000000D-01)*AMP(1)
           DO I = 1, NCOLOR
             ZTEMP = (0.D0,0.D0)
             DO J = 1, NCOLOR

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%born_hel.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%born_hel.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%born_hel.f	2021-03-25 07:55:46 +0000
@@ -146,8 +146,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP(1) = (1D0/6D0)*AMP(1)
-      JAMP(2) = (-1D0/2D0)*AMP(1)
+      JAMP(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP(2) = (-5.000000000000000D-01)*AMP(1)
       BORN_HEL = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_1.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_1.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_1.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,14 @@
       CALL FFV1_1(W(1,2),W(1,5),GC_11,ZERO,ZERO,W(1,8))
 C     Amplitude(s) for diagram number 5
       CALL FFV1_0(W(1,1),W(1,8),W(1,7),GC_11,AMP(5))
-      JAMP(1) = (1D0/6D0)*AMP(2)+(1D0/6D0)*AMP(3)
-      JAMP(2) = (0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(2)+(-1D0/2D0)*AMP(4)
-      JAMP(3) = (-0.5*IMAG1)*AMP(1)+(-1D0/2D0)*AMP(3)+(-1D0/2D0)*AMP(5)
-      JAMP(4) = (1D0/6D0)*AMP(4)+(1D0/6D0)*AMP(5)
+      JAMP(1) = (1.666666666666667D-01)*AMP(2)+(1.666666666666667D-01)
+     $ *AMP(3)
+      JAMP(2) = ((0.000000000000000D+00,5.000000000000000D-01))*AMP(1)
+     $ +(-5.000000000000000D-01)*AMP(2)+(-5.000000000000000D-01)*AMP(4)
+      JAMP(3) = ((0.000000000000000D+00,-5.000000000000000D-01))*AMP(1)
+     $ +(-5.000000000000000D-01)*AMP(3)+(-5.000000000000000D-01)*AMP(5)
+      JAMP(4) = (1.666666666666667D-01)*AMP(4)+(1.666666666666667D-01)
+     $ *AMP(5)
       MATRIX_1 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_2.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_2.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_2.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,14 @@
       CALL FFV1_0(W(1,6),W(1,2),W(1,7),GC_11,AMP(4))
 C     Amplitude(s) for diagram number 5
       CALL VVV1_0(W(1,1),W(1,8),W(1,7),GC_10,AMP(5))
-      JAMP(1) = (1D0/2D0)*AMP(1)+(1D0/2D0)*AMP(3)+(0.5*IMAG1)*AMP(5)
-      JAMP(2) = (-1D0/6D0)*AMP(1)+(-1D0/6D0)*AMP(4)
-      JAMP(3) = (-1D0/6D0)*AMP(2)+(-1D0/6D0)*AMP(3)
-      JAMP(4) = (1D0/2D0)*AMP(2)+(1D0/2D0)*AMP(4)+(-0.5*IMAG1)*AMP(5)
+      JAMP(1) = (5.000000000000000D-01)*AMP(1)+(5.000000000000000D-01)
+     $ *AMP(3)+((0.000000000000000D+00,5.000000000000000D-01))*AMP(5)
+      JAMP(2) = (-1.666666666666667D-01)*AMP(1)+(-1.666666666666667D
+     $ -01)*AMP(4)
+      JAMP(3) = (-1.666666666666667D-01)*AMP(2)+(-1.666666666666667D
+     $ -01)*AMP(3)
+      JAMP(4) = (5.000000000000000D-01)*AMP(2)+(5.000000000000000D-01)
+     $ *AMP(4)+((0.000000000000000D+00,-5.000000000000000D-01))*AMP(5)
       MATRIX_2 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_3.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_3.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_3.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,16 @@
       CALL FFV1_1(W(1,5),W(1,2),GC_11,ZERO,ZERO,W(1,6))
 C     Amplitude(s) for diagram number 5
       CALL FFV1_0(W(1,1),W(1,6),W(1,7),GC_11,AMP(5))
-      JAMP(1) = (-1D0/2D0)*AMP(1)+(-1D0/2D0)*AMP(2)+(-0.5*IMAG1)*AMP(4)
-      JAMP(2) = (1D0/6D0)*AMP(2)+(1D0/6D0)*AMP(3)
-      JAMP(3) = (1D0/6D0)*AMP(1)+(1D0/6D0)*AMP(5)
-      JAMP(4) = (-1D0/2D0)*AMP(3)+(0.5*IMAG1)*AMP(4)+(-1D0/2D0)*AMP(5)
+      JAMP(1) = (-5.000000000000000D-01)*AMP(1)+(-5.000000000000000D
+     $ -01)*AMP(2)+((0.000000000000000D+00,-5.000000000000000D-01))
+     $ *AMP(4)
+      JAMP(2) = (1.666666666666667D-01)*AMP(2)+(1.666666666666667D-01)
+     $ *AMP(3)
+      JAMP(3) = (1.666666666666667D-01)*AMP(1)+(1.666666666666667D-01)
+     $ *AMP(5)
+      JAMP(4) = (-5.000000000000000D-01)*AMP(3)+((0.000000000000000D
+     $ +00,5.000000000000000D-01))*AMP(4)+(-5.000000000000000D-01)
+     $ *AMP(5)
       MATRIX_3 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_001.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_001.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_001.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/36D0)*AMP(1)
-      JAMP2(2) = (1D0/12D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (8.333333333333333D-02)*AMP(1)
       B_SF_001 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_002.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_002.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_002.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (5D0/18D0)*AMP(1)
-      JAMP2(2) = (-1D0/6D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-01)*AMP(1)
+      JAMP2(2) = (-1.666666666666667D-01)*AMP(1)
       B_SF_002 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_003.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_003.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_003.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/36D0)*AMP(1)
-      JAMP2(2) = (-7D0/12D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (-5.833333333333334D-01)*AMP(1)
       B_SF_003 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_004.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_004.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_004.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/36D0)*AMP(1)
-      JAMP2(2) = (-7D0/12D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (-5.833333333333334D-01)*AMP(1)
       B_SF_004 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_005.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_005.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_005.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (5D0/18D0)*AMP(1)
-      JAMP2(2) = (-1D0/6D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (2.777777777777778D-01)*AMP(1)
+      JAMP2(2) = (-1.666666666666667D-01)*AMP(1)
       B_SF_005 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_006.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_006.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_006.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/9D0)*AMP(1)
-      JAMP2(2) = (1D0/3D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-1.111111111111111D-01)*AMP(1)
+      JAMP2(2) = (3.333333333333333D-01)*AMP(1)
       B_SF_006 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_007.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_007.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_007.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/36D0)*AMP(1)
-      JAMP2(2) = (1D0/12D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-2.777777777777778D-02)*AMP(1)
+      JAMP2(2) = (8.333333333333333D-02)*AMP(1)
       B_SF_007 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_008.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_008.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_008.f	2021-03-25 07:55:46 +0000
@@ -144,10 +144,10 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1D0/6D0)*AMP(1)
-      JAMP1(2) = (1D0/2D0)*AMP(1)
-      JAMP2(1) = (-1D0/9D0)*AMP(1)
-      JAMP2(2) = (1D0/3D0)*AMP(1)
+      JAMP1(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP1(2) = (5.000000000000000D-01)*AMP(1)
+      JAMP2(1) = (-1.111111111111111D-01)*AMP(1)
+      JAMP2(2) = (3.333333333333333D-01)*AMP(1)
       B_SF_008 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%born.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%born.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%born.f	2021-03-25 07:55:46 +0000
@@ -289,8 +289,8 @@
               ENDIF
             ENDDO
           ENDIF
-          JAMP(1) = (-1D0/6D0)*AMP(1)
-          JAMP(2) = (1D0/2D0)*AMP(1)
+          JAMP(1) = (-1.666666666666667D-01)*AMP(1)
+          JAMP(2) = (5.000000000000000D-01)*AMP(1)
           DO I = 1, NCOLOR
             ZTEMP = (0.D0,0.D0)
             DO J = 1, NCOLOR

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%born_hel.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%born_hel.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%born_hel.f	2021-03-25 07:55:46 +0000
@@ -146,8 +146,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP(1) = (-1D0/6D0)*AMP(1)
-      JAMP(2) = (1D0/2D0)*AMP(1)
+      JAMP(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP(2) = (5.000000000000000D-01)*AMP(1)
       BORN_HEL = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_1.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_1.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_1.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,14 @@
       CALL FFV1_2(W(1,2),W(1,5),GC_11,ZERO,ZERO,W(1,8))
 C     Amplitude(s) for diagram number 5
       CALL FFV1_0(W(1,8),W(1,1),W(1,7),GC_11,AMP(5))
-      JAMP(1) = (-1D0/6D0)*AMP(2)+(-1D0/6D0)*AMP(3)
-      JAMP(2) = (-0.5*IMAG1)*AMP(1)+(1D0/2D0)*AMP(2)+(1D0/2D0)*AMP(5)
-      JAMP(3) = (0.5*IMAG1)*AMP(1)+(1D0/2D0)*AMP(3)+(1D0/2D0)*AMP(4)
-      JAMP(4) = (-1D0/6D0)*AMP(4)+(-1D0/6D0)*AMP(5)
+      JAMP(1) = (-1.666666666666667D-01)*AMP(2)+(-1.666666666666667D
+     $ -01)*AMP(3)
+      JAMP(2) = ((0.000000000000000D+00,-5.000000000000000D-01))*AMP(1)
+     $ +(5.000000000000000D-01)*AMP(2)+(5.000000000000000D-01)*AMP(5)
+      JAMP(3) = ((0.000000000000000D+00,5.000000000000000D-01))*AMP(1)
+     $ +(5.000000000000000D-01)*AMP(3)+(5.000000000000000D-01)*AMP(4)
+      JAMP(4) = (-1.666666666666667D-01)*AMP(4)+(-1.666666666666667D
+     $ -01)*AMP(5)
       MATRIX_1 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_2.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_2.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_2.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,16 @@
       CALL FFV1_0(W(1,2),W(1,6),W(1,7),GC_11,AMP(4))
 C     Amplitude(s) for diagram number 5
       CALL VVV1_0(W(1,1),W(1,8),W(1,7),GC_10,AMP(5))
-      JAMP(1) = (-1D0/2D0)*AMP(1)+(-1D0/2D0)*AMP(2)+(0.5*IMAG1)*AMP(5)
-      JAMP(2) = (1D0/6D0)*AMP(2)+(1D0/6D0)*AMP(3)
-      JAMP(3) = (1D0/6D0)*AMP(1)+(1D0/6D0)*AMP(4)
-      JAMP(4) = (-1D0/2D0)*AMP(3)+(-1D0/2D0)*AMP(4)+(-0.5*IMAG1)*AMP(5)
+      JAMP(1) = (-5.000000000000000D-01)*AMP(1)+(-5.000000000000000D
+     $ -01)*AMP(2)+((0.000000000000000D+00,5.000000000000000D-01))
+     $ *AMP(5)
+      JAMP(2) = (1.666666666666667D-01)*AMP(2)+(1.666666666666667D-01)
+     $ *AMP(3)
+      JAMP(3) = (1.666666666666667D-01)*AMP(1)+(1.666666666666667D-01)
+     $ *AMP(4)
+      JAMP(4) = (-5.000000000000000D-01)*AMP(3)+(-5.000000000000000D
+     $ -01)*AMP(4)+((0.000000000000000D+00,-5.000000000000000D-01))
+     $ *AMP(5)
       MATRIX_2 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_3.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_3.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_3.f	2021-03-25 07:55:46 +0000
@@ -199,10 +199,14 @@
       CALL FFV1_2(W(1,5),W(1,2),GC_11,ZERO,ZERO,W(1,6))
 C     Amplitude(s) for diagram number 5
       CALL FFV1_0(W(1,6),W(1,1),W(1,7),GC_11,AMP(5))
-      JAMP(1) = (1D0/2D0)*AMP(2)+(0.5*IMAG1)*AMP(4)+(1D0/2D0)*AMP(5)
-      JAMP(2) = (-1D0/6D0)*AMP(2)+(-1D0/6D0)*AMP(3)
-      JAMP(3) = (1D0/2D0)*AMP(1)+(1D0/2D0)*AMP(3)+(-0.5*IMAG1)*AMP(4)
-      JAMP(4) = (-1D0/6D0)*AMP(1)+(-1D0/6D0)*AMP(5)
+      JAMP(1) = (5.000000000000000D-01)*AMP(2)+((0.000000000000000D+00
+     $ ,5.000000000000000D-01))*AMP(4)+(5.000000000000000D-01)*AMP(5)
+      JAMP(2) = (-1.666666666666667D-01)*AMP(2)+(-1.666666666666667D
+     $ -01)*AMP(3)
+      JAMP(3) = (5.000000000000000D-01)*AMP(1)+(5.000000000000000D-01)
+     $ *AMP(3)+((0.000000000000000D+00,-5.000000000000000D-01))*AMP(4)
+      JAMP(4) = (-1.666666666666667D-01)*AMP(1)+(-1.666666666666667D
+     $ -01)*AMP(5)
       MATRIX_3 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%born_matrix.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%born_matrix.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%born_matrix.f	2021-03-25 07:55:46 +0000
@@ -282,6 +282,7 @@
       REAL*8 CF(NCOLOR,NCOLOR)
       COMPLEX*16 AMP(NGRAPHS)
       COMPLEX*16 JAMP(NCOLOR,NAMPSO)
+      COMPLEX*16 TMP_JAMP(0)
       COMPLEX*16 W(20,NWAVEFUNCS)
       COMPLEX*16 DUM0,DUM1
       DATA DUM0, DUM1/(0D0, 0D0), (1D0, 0D0)/
@@ -307,7 +308,7 @@
 C     Amplitude(s) for diagram number 1
       CALL FFV2_0(W(1,2),W(1,1),W(1,3),GC_11,AMP(1))
 C     JAMPs contributing to orders QCD=0
-      JAMP(1,1) = (-1)*AMP(1)
+      JAMP(1,1) = (-1.000000000000000D+00)*AMP(1)
 
       RES = 0.D0
       DO M = 1, NAMPSO

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%b_sf_001.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%b_sf_001.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%b_sf_001.f	2021-03-25 07:55:46 +0000
@@ -137,8 +137,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1)*AMP(1)
-      JAMP2(1) = (4D0/3D0)*AMP(1)
+      JAMP1(1) = (-1.000000000000000D+00)*AMP(1)
+      JAMP2(1) = (1.333333333333333D+00)*AMP(1)
       B_SF_001 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born.f	2021-03-25 07:55:46 +0000
@@ -275,7 +275,7 @@
               ENDIF
             ENDDO
           ENDIF
-          JAMP(1) = (-1)*AMP(1)
+          JAMP(1) = (-1.000000000000000D+00)*AMP(1)
           DO I = 1, NCOLOR
             ZTEMP = (0.D0,0.D0)
             DO J = 1, NCOLOR

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born_hel.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born_hel.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born_hel.f	2021-03-25 07:55:46 +0000
@@ -138,7 +138,7 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP(1) = (-1)*AMP(1)
+      JAMP(1) = (-1.000000000000000D+00)*AMP(1)
       BORN_HEL = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_1.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_1.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_1.f	2021-03-25 07:55:46 +0000
@@ -162,7 +162,8 @@
       CALL FFV1_1(W(1,1),W(1,4),GC_5,ZERO,ZERO,W(1,5))
 C     Amplitude(s) for diagram number 2
       CALL FFV2_0(W(1,2),W(1,5),W(1,3),GC_11,AMP(2))
-      JAMP(1) = (-1)*AMP(1)+(-1)*AMP(2)
+      JAMP(1) = (-1.000000000000000D+00)*AMP(1)+(-1.000000000000000D
+     $ +00)*AMP(2)
       MATRIX_1 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_2.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_2.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_2.f	2021-03-25 07:55:46 +0000
@@ -162,7 +162,7 @@
       CALL FFV1_1(W(1,4),W(1,1),GC_5,ZERO,ZERO,W(1,5))
 C     Amplitude(s) for diagram number 2
       CALL FFV2_0(W(1,2),W(1,5),W(1,3),GC_11,AMP(2))
-      JAMP(1) = (1)*AMP(1)+(1)*AMP(2)
+      JAMP(1) = AMP(1)+AMP(2)
       MATRIX_2 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_3.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_3.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_3.f	2021-03-25 07:55:46 +0000
@@ -162,7 +162,8 @@
       CALL FFV2_1(W(1,1),W(1,3),GC_11,ZERO,ZERO,W(1,5))
 C     Amplitude(s) for diagram number 2
       CALL FFV1_0(W(1,4),W(1,5),W(1,2),GC_5,AMP(2))
-      JAMP(1) = (-1)*AMP(1)+(-1)*AMP(2)
+      JAMP(1) = (-1.000000000000000D+00)*AMP(1)+(-1.000000000000000D
+     $ +00)*AMP(2)
       MATRIX_3 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%born_matrix.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%born_matrix.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%born_matrix.f	2021-03-25 07:55:46 +0000
@@ -282,6 +282,7 @@
       REAL*8 CF(NCOLOR,NCOLOR)
       COMPLEX*16 AMP(NGRAPHS)
       COMPLEX*16 JAMP(NCOLOR,NAMPSO)
+      COMPLEX*16 TMP_JAMP(0)
       COMPLEX*16 W(20,NWAVEFUNCS)
       COMPLEX*16 DUM0,DUM1
       DATA DUM0, DUM1/(0D0, 0D0), (1D0, 0D0)/
@@ -307,7 +308,7 @@
 C     Amplitude(s) for diagram number 1
       CALL FFV2_0(W(1,1),W(1,2),W(1,3),GC_11,AMP(1))
 C     JAMPs contributing to orders QCD=0
-      JAMP(1,1) = (1)*AMP(1)
+      JAMP(1,1) = AMP(1)
 
       RES = 0.D0
       DO M = 1, NAMPSO

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%b_sf_001.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%b_sf_001.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%b_sf_001.f	2021-03-25 07:55:46 +0000
@@ -137,8 +137,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (1)*AMP(1)
-      JAMP2(1) = (-4D0/3D0)*AMP(1)
+      JAMP1(1) = AMP(1)
+      JAMP2(1) = (-1.333333333333333D+00)*AMP(1)
       B_SF_001 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born.f	2021-03-25 07:55:46 +0000
@@ -275,7 +275,7 @@
               ENDIF
             ENDDO
           ENDIF
-          JAMP(1) = (1)*AMP(1)
+          JAMP(1) = AMP(1)
           DO I = 1, NCOLOR
             ZTEMP = (0.D0,0.D0)
             DO J = 1, NCOLOR

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born_hel.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born_hel.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born_hel.f	2021-03-25 07:55:46 +0000
@@ -138,7 +138,7 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP(1) = (1)*AMP(1)
+      JAMP(1) = AMP(1)
       BORN_HEL = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_1.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_1.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_1.f	2021-03-25 07:55:46 +0000
@@ -162,7 +162,7 @@
       CALL FFV1_2(W(1,1),W(1,4),GC_5,ZERO,ZERO,W(1,5))
 C     Amplitude(s) for diagram number 2
       CALL FFV2_0(W(1,5),W(1,2),W(1,3),GC_11,AMP(2))
-      JAMP(1) = (1)*AMP(1)+(1)*AMP(2)
+      JAMP(1) = AMP(1)+AMP(2)
       MATRIX_1 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_2.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_2.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_2.f	2021-03-25 07:55:46 +0000
@@ -162,7 +162,8 @@
       CALL FFV1_2(W(1,4),W(1,1),GC_5,ZERO,ZERO,W(1,5))
 C     Amplitude(s) for diagram number 2
       CALL FFV2_0(W(1,5),W(1,2),W(1,3),GC_11,AMP(2))
-      JAMP(1) = (-1)*AMP(1)+(-1)*AMP(2)
+      JAMP(1) = (-1.000000000000000D+00)*AMP(1)+(-1.000000000000000D
+     $ +00)*AMP(2)
       MATRIX_2 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_3.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_3.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_3.f	2021-03-25 07:55:46 +0000
@@ -162,7 +162,7 @@
       CALL FFV2_2(W(1,1),W(1,3),GC_11,ZERO,ZERO,W(1,5))
 C     Amplitude(s) for diagram number 2
       CALL FFV1_0(W(1,5),W(1,4),W(1,2),GC_5,AMP(2))
-      JAMP(1) = (1)*AMP(1)+(1)*AMP(2)
+      JAMP(1) = AMP(1)+AMP(2)
       MATRIX_3 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_001.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_001.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_001.f	2021-03-25 07:55:46 +0000
@@ -137,8 +137,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1)*AMP(1)
-      JAMP2(1) = (-2D0/3D0)*AMP(1)
+      JAMP1(1) = (-1.000000000000000D+00)*AMP(1)
+      JAMP2(1) = (-6.666666666666666D-01)*AMP(1)
       B_SF_001 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_002.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_002.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_002.f	2021-03-25 07:55:46 +0000
@@ -137,8 +137,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1)*AMP(1)
-      JAMP2(1) = (4D0/3D0)*AMP(1)
+      JAMP1(1) = (-1.000000000000000D+00)*AMP(1)
+      JAMP2(1) = (1.333333333333333D+00)*AMP(1)
       B_SF_002 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_003.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_003.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_003.f	2021-03-25 07:55:46 +0000
@@ -138,9 +138,9 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1)*AMP(1)
-      JAMP2(1) = (-1D0/6D0)*AMP(1)
-      JAMP2(2) = (1D0/2D0)*AMP(1)
+      JAMP1(1) = (-1.000000000000000D+00)*AMP(1)
+      JAMP2(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP2(2) = (5.000000000000000D-01)*AMP(1)
       B_SF_003 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_004.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_004.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_004.f	2021-03-25 07:55:46 +0000
@@ -138,9 +138,9 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1)*AMP(1)
-      JAMP2(1) = (1D0/6D0)*AMP(1)
-      JAMP2(2) = (-1D0/2D0)*AMP(1)
+      JAMP1(1) = (-1.000000000000000D+00)*AMP(1)
+      JAMP2(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP2(2) = (-5.000000000000000D-01)*AMP(1)
       B_SF_004 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_005.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_005.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_005.f	2021-03-25 07:55:46 +0000
@@ -137,8 +137,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1)*AMP(1)
-      JAMP2(1) = (-2D0/3D0)*AMP(1)
+      JAMP1(1) = (-1.000000000000000D+00)*AMP(1)
+      JAMP2(1) = (-6.666666666666666D-01)*AMP(1)
       B_SF_005 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_006.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_006.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_006.f	2021-03-25 07:55:46 +0000
@@ -138,9 +138,9 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1)*AMP(1)
-      JAMP2(1) = (1D0/6D0)*AMP(1)
-      JAMP2(2) = (-1D0/2D0)*AMP(1)
+      JAMP1(1) = (-1.000000000000000D+00)*AMP(1)
+      JAMP2(1) = (1.666666666666667D-01)*AMP(1)
+      JAMP2(2) = (-5.000000000000000D-01)*AMP(1)
       B_SF_006 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_007.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_007.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_007.f	2021-03-25 07:55:46 +0000
@@ -138,9 +138,9 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1)*AMP(1)
-      JAMP2(1) = (-1D0/6D0)*AMP(1)
-      JAMP2(2) = (1D0/2D0)*AMP(1)
+      JAMP1(1) = (-1.000000000000000D+00)*AMP(1)
+      JAMP2(1) = (-1.666666666666667D-01)*AMP(1)
+      JAMP2(2) = (5.000000000000000D-01)*AMP(1)
       B_SF_007 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_008.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_008.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_008.f	2021-03-25 07:55:46 +0000
@@ -137,8 +137,8 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP1(1) = (-1)*AMP(1)
-      JAMP2(1) = (4D0/3D0)*AMP(1)
+      JAMP1(1) = (-1.000000000000000D+00)*AMP(1)
+      JAMP2(1) = (1.333333333333333D+00)*AMP(1)
       B_SF_008 = 0.D0
       DO I = 1, NCOLOR1
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%born.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%born.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%born.f	2021-03-25 07:55:46 +0000
@@ -281,7 +281,7 @@
               ENDIF
             ENDDO
           ENDIF
-          JAMP(1) = (-1)*AMP(1)
+          JAMP(1) = (-1.000000000000000D+00)*AMP(1)
           DO I = 1, NCOLOR
             ZTEMP = (0.D0,0.D0)
             DO J = 1, NCOLOR

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%born_hel.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%born_hel.f	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%born_hel.f	2021-03-25 07:55:46 +0000
@@ -138,7 +138,7 @@
           AMP(I)=SAVEAMP(I,HELL)
         ENDDO
       ENDIF
-      JAMP(1) = (-1)*AMP(1)
+      JAMP(1) = (-1.000000000000000D+00)*AMP(1)
       BORN_HEL = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== modified file 'tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%matrix_1.f'
--- tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%matrix_1.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%matrix_1.f	2021-03-25 07:55:46 +0000
@@ -184,8 +184,10 @@
       CALL FFV2_3(W(1,7),W(1,3),GC_100,MDL_MW,MDL_WW,W(1,5))
 C     Amplitude(s) for diagram number 4
       CALL FFV2_0(W(1,1),W(1,2),W(1,5),GC_100,AMP(4))
-      JAMP(1) = (-1)*AMP(3)+(-1)*AMP(4)
-      JAMP(2) = (-1)*AMP(1)+(-1)*AMP(2)
+      JAMP(1) = (-1.000000000000000D+00)*AMP(3)+(-1.000000000000000D
+     $ +00)*AMP(4)
+      JAMP(2) = (-1.000000000000000D+00)*AMP(1)+(-1.000000000000000D
+     $ +00)*AMP(2)
       MATRIX_1 = 0.D0
       DO I = 1, NCOLOR
         ZTEMP = (0.D0,0.D0)

=== 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	2021-01-29 20:38:52 +0000
+++ tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/matrix1.f	2021-03-25 07:55:46 +0000
@@ -423,10 +423,11 @@
 C     Amplitude(s) for diagram number 6
       CALL FFV1_2_0(W(1,4),W(1,2),W(1,5),GUZ1,GUZ2,AMP(6))
 C     JAMPs contributing to orders ALL_ORDERS=1
-      JAMP(1,1) = (1D0/6D0)*AMP(1)+(-1)*AMP(2)+(-1)*AMP(3)+(1D0/2D0)
-     $ *AMP(4)
-      JAMP(2,1) = (-1D0/2D0)*AMP(1)+(-1D0/6D0)*AMP(4)+(1)*AMP(5)+(1)
-     $ *AMP(6)
+      JAMP(1,1) = (1.666666666666667D-01)*AMP(1)+(-1.000000000000000D
+     $ +00)*AMP(2)+(-1.000000000000000D+00)*AMP(3)+(5.000000000000000D
+     $ -01)*AMP(4)
+      JAMP(2,1) = (-5.000000000000000D-01)*AMP(1)+(-1.666666666666667D
+     $ -01)*AMP(4)+AMP(5)+AMP(6)
 
       IF(INIT_MODE)THEN
         DO I=1, NGRAPHS

=== modified file 'tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f'
--- tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f	2021-03-25 07:55:46 +0000
@@ -318,8 +318,10 @@
 C     Amplitude(s) for diagram number 3
       CALL FFV1_0(W(1,5),W(1,2),W(1,3),GQQ,AMP(3))
 C     JAMPs contributing to orders ALL_ORDERS=1
-      JAMP(1,1) = (-1*IMAG1)*AMP(1)+(1)*AMP(3)
-      JAMP(2,1) = (1*IMAG1)*AMP(1)+(1)*AMP(2)
+      JAMP(1,1) = ((0.000000000000000D+00,-1.000000000000000D+00))
+     $ *AMP(1)+AMP(3)
+      JAMP(2,1) = ((0.000000000000000D+00,1.000000000000000D+00))
+     $ *AMP(1)+AMP(2)
 
       MATRIX = 0.D0
       DO M = 1, NAMPSO

=== modified file 'tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%born_matrix.f'
--- tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%born_matrix.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%born_matrix.f	2021-03-25 07:55:46 +0000
@@ -284,6 +284,7 @@
       REAL*8 CF(NCOLOR,NCOLOR)
       COMPLEX*16 AMP(NGRAPHS)
       COMPLEX*16 JAMP(NCOLOR,NAMPSO)
+      COMPLEX*16 TMP_JAMP(0)
       COMPLEX*16 W(20,NWAVEFUNCS)
       COMPLEX*16 DUM0,DUM1
       DATA DUM0, DUM1/(0D0, 0D0), (1D0, 0D0)/

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%helas_calls_uvct_1.f	2021-03-25 07:55:46 +0000
@@ -101,24 +101,24 @@
      $ *UVWFCT_B_0_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_2+2.0D0*UVWFCT_G_1+2.0D0
-     $ *UVWFCT_T_0)
+      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1+2.0D0
+     $ *UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+2.0D0*UVWFCT_G_1+2.0D0
-     $ *UVWFCT_T_0)
+      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1+2.0D0
+     $ *UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+2.0D0*UVWFCT_G_1+2.0D0
-     $ *UVWFCT_T_0)
+      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1+2.0D0
+     $ *UVWFCT_G_2)
 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	2021-02-14 22:27:00 +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-03-25 07:55:46 +0000
@@ -85,24 +85,24 @@
      $ *UVWFCT_B_0_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_2+2.0D0*UVWFCT_G_1+2.0D0
-     $ *UVWFCT_T_0)
+      AMPL(1,81)=AMPL(1,81)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1+2.0D0
+     $ *UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+2.0D0*UVWFCT_G_1+2.0D0
-     $ *UVWFCT_T_0)
+      AMPL(1,83)=AMPL(1,83)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1+2.0D0
+     $ *UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+2.0D0*UVWFCT_G_1+2.0D0
-     $ *UVWFCT_T_0)
+      AMPL(1,85)=AMPL(1,85)*(2.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1+2.0D0
+     $ *UVWFCT_G_2)
 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_QCDsq_le_6.f'
--- tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_QCDsq_le_6.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_QCDsq_le_6.f	2021-03-25 07:55:46 +0000
@@ -332,6 +332,7 @@
       REAL*8 CF(NCOLOR,NCOLOR)
       COMPLEX*16 AMP(NGRAPHS)
       COMPLEX*16 JAMP(NCOLOR,NAMPSO)
+      COMPLEX*16 TMP_JAMP(0)
       COMPLEX*16 W(20,NWAVEFUNCS)
       COMPLEX*16 DUM0,DUM1
       DATA DUM0, DUM1/(0D0, 0D0), (1D0, 0D0)/

=== modified file 'tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_ampOrderQED2_eq_2_WGTsq_le_14_QCDsq_gt_4.f'
--- tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_ampOrderQED2_eq_2_WGTsq_le_14_QCDsq_gt_4.f	2021-01-21 13:01:31 +0000
+++ tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_ampOrderQED2_eq_2_WGTsq_le_14_QCDsq_gt_4.f	2021-03-25 07:55:46 +0000
@@ -332,6 +332,7 @@
       REAL*8 CF(NCOLOR,NCOLOR)
       COMPLEX*16 AMP(NGRAPHS)
       COMPLEX*16 JAMP(NCOLOR,NAMPSO)
+      COMPLEX*16 TMP_JAMP(0)
       COMPLEX*16 W(20,NWAVEFUNCS)
       COMPLEX*16 DUM0,DUM1
       DATA DUM0, DUM1/(0D0, 0D0), (1D0, 0D0)/

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc	2021-03-25 07:55:46 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      DOUBLE PRECISION MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      DOUBLE PRECISION MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%input.inc	2021-03-25 07:55:46 +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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM33
+     $ ,MDL_CKM3X3,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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM33
+     $ ,MDL_CKM3X3,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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
-        MDL_CKM3X3 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_CONJG__CKM3X3 = 1.000000D+00
 
+        MDL_CONJG__CKM22 = 1.000000D+00
+
+        MDL_CKM22 = 1.000000D+00
+
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CKM22 = 1.000000D+00
+        MDL_CKM3X3 = 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc	2021-03-25 07:55:46 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ,MP__MDL_MB
+      REAL*16 MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MB
      $ ,MP__MDL_MH
 
-      COMMON/MP_MASSES/ MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ
+      COMMON/MP_MASSES/ MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW
      $ ,MP__MDL_MB,MP__MDL_MH
 
 
-      REAL*16 MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      REAL*16 MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
-      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-03-25 07:55:46 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MP_MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      REAL*16 MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      REAL*16 MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MP_MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      REAL*16 MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc	2021-03-25 07:55:46 +0000
@@ -9,9 +9,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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
@@ -34,9 +34,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
-        MP__MDL_CKM3X3 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         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_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CKM22 = 1.000000E+00_16
+        MP__MDL_CKM3X3 = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/loop_matrix.f	2021-03-25 07:55:46 +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_2+1.0D0*UVWFCT_G_1)
+          AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
 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_2+1.0D0*UVWFCT_G_1)
+          AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
  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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/mp_born_amps_and_wfs.f	2021-03-25 07:55:46 +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_2+1.0D0*UVWFCT_G_1)
+          AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
 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_2+1.0D0*UVWFCT_G_1)
+          AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%coupl.inc	2021-03-25 07:55:46 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      DOUBLE PRECISION MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      DOUBLE PRECISION MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%input.inc	2021-03-25 07:55:46 +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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM33
+     $ ,MDL_CKM3X3,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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM33
+     $ ,MDL_CKM3X3,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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
-        MDL_CKM3X3 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_CONJG__CKM3X3 = 1.000000D+00
 
+        MDL_CONJG__CKM22 = 1.000000D+00
+
+        MDL_CKM22 = 1.000000D+00
+
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CKM22 = 1.000000D+00
+        MDL_CKM3X3 = 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc	2021-03-25 07:55:46 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ,MP__MDL_MB
+      REAL*16 MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MB
      $ ,MP__MDL_MH
 
-      COMMON/MP_MASSES/ MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ
+      COMMON/MP_MASSES/ MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW
      $ ,MP__MDL_MB,MP__MDL_MH
 
 
-      REAL*16 MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      REAL*16 MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
-      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-03-25 07:55:46 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MP_MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      REAL*16 MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      REAL*16 MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MP_MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      REAL*16 MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc	2021-03-25 07:55:46 +0000
@@ -9,9 +9,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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
@@ -34,9 +34,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
-        MP__MDL_CKM3X3 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         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_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CKM22 = 1.000000E+00_16
+        MP__MDL_CKM3X3 = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/loop_matrix.f	2021-03-25 07:55:46 +0000
@@ -1202,64 +1202,64 @@
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,238)=AMPL(1,238)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,240)=AMPL(1,240)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,242)=AMPL(1,242)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,244)=AMPL(1,244)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,246)=AMPL(1,246)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,248)=AMPL(1,248)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,250)=AMPL(1,250)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,252)=AMPL(1,252)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
  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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/mp_born_amps_and_wfs.f	2021-03-25 07:55:46 +0000
@@ -656,32 +656,32 @@
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,238)=AMPL(1,238)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,240)=AMPL(1,240)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,242)=AMPL(1,242)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,244)=AMPL(1,244)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,246)=AMPL(1,246)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,248)=AMPL(1,248)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,250)=AMPL(1,250)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $     *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0
-     $     +1.0D0*UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+          AMPL(1,252)=AMPL(1,252)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0
+     $     +2.0D0*UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc	2021-03-25 07:55:46 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      DOUBLE PRECISION MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      DOUBLE PRECISION MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%input.inc	2021-03-25 07:55:46 +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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM33
+     $ ,MDL_CKM3X3,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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM33
+     $ ,MDL_CKM3X3,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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
-        MDL_CKM3X3 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_CONJG__CKM3X3 = 1.000000D+00
 
+        MDL_CONJG__CKM22 = 1.000000D+00
+
+        MDL_CKM22 = 1.000000D+00
+
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CKM22 = 1.000000D+00
+        MDL_CKM3X3 = 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc	2021-03-25 07:55:46 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ,MP__MDL_MB
+      REAL*16 MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MB
      $ ,MP__MDL_MH
 
-      COMMON/MP_MASSES/ MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ
+      COMMON/MP_MASSES/ MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW
      $ ,MP__MDL_MB,MP__MDL_MH
 
 
-      REAL*16 MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      REAL*16 MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
-      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-03-25 07:55:46 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MP_MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      REAL*16 MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      REAL*16 MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MP_MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      REAL*16 MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc	2021-03-25 07:55:46 +0000
@@ -9,9 +9,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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
@@ -34,9 +34,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
-        MP__MDL_CKM3X3 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         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_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CKM22 = 1.000000E+00_16
+        MP__MDL_CKM3X3 = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/helas_calls_uvct_1.f	2021-03-25 07:55:46 +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_2+1.0D0*UVWFCT_G_1)
+      AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
 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_2+1.0D0*UVWFCT_G_1)
+      AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/mp_helas_calls_uvct_1.f	2021-03-25 07:55:46 +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_2+1.0D0*UVWFCT_G_1)
+      AMPL(1,26)=AMPL(1,26)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
 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_2+1.0D0*UVWFCT_G_1)
+      AMPL(1,28)=AMPL(1,28)*(1.0D0*UVWFCT_G_1+1.0D0*UVWFCT_G_2)
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%coupl.inc	2021-03-25 07:55:46 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      DOUBLE PRECISION MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      DOUBLE PRECISION MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%input.inc	2021-03-25 07:55:46 +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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM33
+     $ ,MDL_CKM3X3,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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV,MDL_CONJG__CKM3X3
-     $ ,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22,MDL_CKM22,MDL_CKM33
+     $ ,MDL_CKM3X3,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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
-        MDL_CKM3X3 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_CONJG__CKM3X3 = 1.000000D+00
 
+        MDL_CONJG__CKM22 = 1.000000D+00
+
+        MDL_CKM22 = 1.000000D+00
+
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CKM22 = 1.000000D+00
+        MDL_CKM3X3 = 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc	2021-03-25 07:55:46 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ,MP__MDL_MB
+      REAL*16 MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MB
      $ ,MP__MDL_MH
 
-      COMMON/MP_MASSES/ MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ
+      COMMON/MP_MASSES/ MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW
      $ ,MP__MDL_MB,MP__MDL_MH
 
 
-      REAL*16 MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      REAL*16 MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
-      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-03-25 07:55:46 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MP_MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      REAL*16 MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      REAL*16 MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MP_MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      REAL*16 MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc	2021-03-25 07:55:46 +0000
@@ -9,9 +9,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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
@@ -34,9 +34,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
-        MP__MDL_CKM3X3 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         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_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CKM22 = 1.000000E+00_16
+        MP__MDL_CKM3X3 = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/helas_calls_uvct_1.f	2021-03-25 07:55:46 +0000
@@ -101,64 +101,64 @@
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,238)=AMPL(1,238)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,240)=AMPL(1,240)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,242)=AMPL(1,242)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,244)=AMPL(1,244)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,246)=AMPL(1,246)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,248)=AMPL(1,248)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,250)=AMPL(1,250)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,252)=AMPL(1,252)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/mp_helas_calls_uvct_1.f	2021-03-25 07:55:46 +0000
@@ -85,64 +85,64 @@
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,238)=AMPL(1,238)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,240)=AMPL(1,240)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,242)=AMPL(1,242)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,244)=AMPL(1,244)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,246)=AMPL(1,246)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,248)=AMPL(1,248)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,250)=AMPL(1,250)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 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)*(4.0D0*UVWFCT_G_1_1EPS+2.0D0
      $ *UVWFCT_B_0_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_2+1.0D0*UVWFCT_B_0+1.0D0
-     $ *UVWFCT_T_0+2.0D0*UVWFCT_G_1)
+      AMPL(1,252)=AMPL(1,252)*(1.0D0*UVWFCT_B_0+1.0D0*UVWFCT_T_0+2.0D0
+     $ *UVWFCT_G_1+2.0D0*UVWFCT_G_2)
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%coupl.inc	2021-03-25 07:55:46 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      DOUBLE PRECISION MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      DOUBLE PRECISION MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%input.inc	2021-03-25 07:55:46 +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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV
-     $ ,MDL_CONJG__CKM3X3,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22
+     $ ,MDL_CKM22,MDL_CKM33,MDL_CKM3X3,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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV
-     $ ,MDL_CONJG__CKM3X3,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22
+     $ ,MDL_CKM22,MDL_CKM33,MDL_CKM3X3,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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
-        MDL_CKM3X3 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_CONJG__CKM3X3 = 1.000000D+00
 
+        MDL_CONJG__CKM22 = 1.000000D+00
+
+        MDL_CKM22 = 1.000000D+00
+
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CKM22 = 1.000000D+00
+        MDL_CKM3X3 = 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_coupl.inc	2021-03-25 07:55:46 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ,MP__MDL_MB
+      REAL*16 MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MB
      $ ,MP__MDL_MH
 
-      COMMON/MP_MASSES/ MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ
+      COMMON/MP_MASSES/ MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW
      $ ,MP__MDL_MB,MP__MDL_MH
 
 
-      REAL*16 MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      REAL*16 MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
-      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-03-25 07:55:46 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MP_MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      REAL*16 MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      REAL*16 MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MP_MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      REAL*16 MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_input.inc	2021-03-25 07:55:46 +0000
@@ -7,9 +7,9 @@
      $ ,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__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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
@@ -29,23 +29,22 @@
      $ ,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__CKM22,MP__MDL_CKM3X3,MP__MDL_LHV
-     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22,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_BWCFT_UV_FIN_,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV
+     $ ,MP__MDL_CONJG__CKM3X3,MP__MDL_CONJG__CKM22,MP__MDL_CKM22
+     $ ,MP__MDL_CKM33,MP__MDL_CKM3X3,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/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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         MP__G = 2 * SQRT(MP__AS*MP__PI)  ! for the first init
 
-        MP__MDL_CONJG__CKM22 = 1.000000E+00_16
-
-        MP__MDL_CKM3X3 = 1.000000E+00_16
-
         MP__MDL_LHV = 1.000000E+00_16
 
         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_CKM33 = 1.000000E+00_16
 
-        MP__MDL_CKM22 = 1.000000E+00_16
+        MP__MDL_CKM3X3 = 1.000000E+00_16
 
         MP__MDL_NCOL = 3.000000E+00_16
 

=== 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%coupl.inc	2021-03-25 07:55:46 +0000
@@ -14,14 +14,14 @@
       DOUBLE PRECISION NF
       PARAMETER(NF=4)
 
-      DOUBLE PRECISION MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      DOUBLE PRECISION MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      DOUBLE PRECISION MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      DOUBLE PRECISION MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%input.inc	2021-03-25 07:55:46 +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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV
-     $ ,MDL_CONJG__CKM3X3,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22
+     $ ,MDL_CKM22,MDL_CKM33,MDL_CKM3X3,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_CONJG__CKM22,MDL_CKM3X3,MDL_LHV
-     $ ,MDL_CONJG__CKM3X3,MDL_CKM33,MDL_CKM22,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_LHV,MDL_CONJG__CKM3X3,MDL_CONJG__CKM22
+     $ ,MDL_CKM22,MDL_CKM33,MDL_CKM3X3,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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%intparam_definition.inc	2021-03-25 07:55:46 +0000
@@ -8,17 +8,17 @@
 
         G = 2 * DSQRT(AS*PI)  ! for the first init
 
-        MDL_CONJG__CKM22 = 1.000000D+00
-
-        MDL_CKM3X3 = 1.000000D+00
-
         MDL_LHV = 1.000000D+00
 
         MDL_CONJG__CKM3X3 = 1.000000D+00
 
+        MDL_CONJG__CKM22 = 1.000000D+00
+
+        MDL_CKM22 = 1.000000D+00
+
         MDL_CKM33 = 1.000000D+00
 
-        MDL_CKM22 = 1.000000D+00
+        MDL_CKM3X3 = 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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl.inc	2021-03-25 07:55:46 +0000
@@ -12,16 +12,16 @@
       COMMON/MP_RSCALE/ MP__MU_R
 
 
-      REAL*16 MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ,MP__MDL_MB
+      REAL*16 MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MB
      $ ,MP__MDL_MH
 
-      COMMON/MP_MASSES/ MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW,MP__MDL_MZ
+      COMMON/MP_MASSES/ MP__MDL_MZ,MP__MDL_MT,MP__MDL_MTA,MP__MDL_MW
      $ ,MP__MDL_MB,MP__MDL_MH
 
 
-      REAL*16 MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      REAL*16 MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
-      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WH,MP__MDL_WT,MP__MDL_WW
+      COMMON/MP_WIDTHS/ MP__MDL_WZ,MP__MDL_WW,MP__MDL_WT,MP__MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl_same_name.inc	2021-03-25 07:55:46 +0000
@@ -12,14 +12,14 @@
       COMMON/MP_RSCALE/ MU_R
 
 
-      REAL*16 MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-      COMMON/MP_MASSES/ MDL_MT,MDL_MTA,MDL_MW,MDL_MZ,MDL_MB,MDL_MH
-
-
-      REAL*16 MDL_WZ,MDL_WH,MDL_WT,MDL_WW
-
-      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WH,MDL_WT,MDL_WW
+      REAL*16 MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+      COMMON/MP_MASSES/ MDL_MZ,MDL_MT,MDL_MTA,MDL_MW,MDL_MB,MDL_MH
+
+
+      REAL*16 MDL_WZ,MDL_WW,MDL_WT,MDL_WH
+
+      COMMON/MP_WIDTHS/ MDL_WZ,MDL_WW,MDL_WT,MDL_WH
 
 
       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	2021-02-14 22:27:00 +0000
+++ tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_input.inc	2021-03-25 07:55:46 +0000
@@ -9,9 +9,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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
@@ -33,9 +33,9 @@
      $ ,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_CONJG__CKM22,MP__MDL_CKM3X3
-     $ ,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3,MP__MDL_CKM33,MP__MDL_CKM22
-     $ ,MP__MDL_NCOL,MP__MDL_CA,MP__MDL_TF,MP__MDL_CF
+     $ ,MP__MDL_TWCFT_UV_FIN_,MP__MDL_LHV,MP__MDL_CONJG__CKM3X3
+     $ ,MP__MDL_CONJG__CKM22,MP__MDL_CKM22,MP__MDL_CKM33
+     $ ,MP__MDL_CKM3X3,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