Merge lp:~mg5core1/mg5amcnlo/2.6.6 into lp:mg5amcnlo/lts

[Olivier Mattelaer]

Time to release this branch

[lp:~mg5core1/mg5amcnlo/2.6.6]

332. By olivier-mattelaer on 2019-06-26

fix an issue with small width treatment at NLO + full forbid of genrate LO + add NLO (or the opposite)

333. By olivier-mattelaer on 2019-06-26

fixing some tests and add security on some feature (MLM limitation)

334. By olivier-mattelaer on 2019-06-26

fix issue with pythia8 mode

335. By olivier-mattelaer on 2019-06-27

update gnuplot

336. By olivier-mattelaer on 2019-06-27

fixing small issue from the review + adding info in UpdatesNotes

[Olivier Mattelaer (olivier-mattelaer)]

All tests are passing now.
And I made a review of the code and everything sounds fine.
This is a quite minor release (bug fixing)
before two "big" one in the 2.x series
2.7.0 will contains a LOT of new feature
2.8.0 will (only) be the porting to python3.0

review: Approve

=== modified file 'Template/LO/Cards/run_card.dat'
--- Template/LO/Cards/run_card.dat	2018-05-29 13:11:53 +0000
+++ Template/LO/Cards/run_card.dat	2019-06-27 13:48:48 +0000
@@ -26,7 +26,6 @@
 #*********************************************************************
 # Number of events and rnd seed                                      *
 # Warning: Do not generate more than 1M events in a single run       *
-# If you want to run Pythia, avoid more than 50k events in a run.    *
 #*********************************************************************
   %(nevents)s = nevents ! Number of unweighted events requested 
   %(iseed)s   = iseed   ! rnd seed (0=assigned automatically=default))
@@ -121,19 +120,7 @@
  %(missetmax)s  = missetmax ! maximum missing Et (sum of neutrino's momenta)
  %(pt_min_pdg)s = pt_min_pdg ! pt cut for other particles (use pdg code). Applied on particle and anti-particle
  %(pt_max_pdg)s	= pt_max_pdg ! pt cut for other particles (syntax e.g. {6: 100, 25: 50}) 
-#*********************************************************************
-# Minimum and maximum E's (in the center of mass frame)              *
-#*********************************************************************
-  %(ej)s  = ej     ! minimum E for the jets 
-  %(eb)s  = eb     ! minimum E for the b 
-  %(ea)s  = ea     ! minimum E for the photons 
-  %(el)s  = el     ! minimum E for the charged leptons 
-  %(ejmax)s   = ejmax ! maximum E for the jets
- %(ebmax)s   = ebmax ! maximum E for the b
- %(eamax)s   = eamax ! maximum E for the photons
- %(elmax)s   = elmax ! maximum E for the charged leptons
- %(e_min_pdg)s = e_min_pdg ! E cut for other particles (use pdg code). Applied on particle and anti-particle
- %(e_max_pdg)s = e_max_pdg ! E cut for other particles (syntax e.g. {6: 100, 25: 50}) 
+$ecut
 #*********************************************************************
 # Maximum and minimum absolute rapidity (for max, -1 means no cut)   *
 #*********************************************************************

=== modified file 'Template/LO/Source/BIAS/ptj_bias/makefile'
--- Template/LO/Source/BIAS/ptj_bias/makefile	2016-08-13 05:32:47 +0000
+++ Template/LO/Source/BIAS/ptj_bias/makefile	2019-06-27 13:48:48 +0000
@@ -19,9 +19,5 @@
 # 'VALID' is the keyword that *must* be returned if everything is in order.
 #
 requirements:	
-ifeq ($(shell $(call CHECK_MG5AMC_VERSION,2.4.2)),True)
 	@echo "VALID"
-else
-	@echo "Error:: MG5aMC is not recent enough (found "$(MG5AMC_VERSION)")"
-	@echo "FAIL"
-endif
+

=== modified file 'Template/LO/Source/PDF/pdg2pdf.f'
--- Template/LO/Source/PDF/pdg2pdf.f	2018-03-07 23:11:46 +0000
+++ Template/LO/Source/PDF/pdg2pdf.f	2019-06-27 13:48:48 +0000
@@ -58,12 +58,14 @@
       endif
 
       ipart=ipdg
-      if(iabs(ipart).eq.21) ipart=0
-      if(iabs(ipart).eq.22) ipart=7
-      iporg=ipart
-
+      if(iabs(ipart).eq.21) then
+         ipart=0
+      else if(iabs(ipart).eq.22) then
+         ipart=7
+      else if(iabs(ipart).eq.7) then
+         ipart=7
 c     This will be called for any PDG code, but we only support up to 7
-      if(iabs(ipart).gt.7)then
+      else if(iabs(ipart).gt.7)then
          write(*,*) 'PDF not supported for pdg ',ipdg
          write(*,*) 'For lepton colliders, please set the lpp* '//
      $    'variables to 0 in the run_card'  
@@ -72,6 +74,7 @@
          stop 1
       endif
 
+      iporg=ipart
       ireuse = 0
       do i=1,2
 c     Check if result can be reused since any of last two calls

=== modified file 'Template/LO/Source/PDF/pdg2pdf_lhapdf.f'
--- Template/LO/Source/PDF/pdg2pdf_lhapdf.f	2018-03-07 23:11:46 +0000
+++ Template/LO/Source/PDF/pdg2pdf_lhapdf.f	2019-06-27 13:48:48 +0000
@@ -57,6 +57,7 @@
       ipart=ipdg
       if(ipart.eq.21) ipart=0
       if(iabs(ipart).eq.22) ipart=7
+      if(iabs(ipart).eq.7) ipart=7
       iporg=ipart
 
 c     This will be called for any PDG code, but we only support up to 7

=== modified file 'Template/LO/Source/PDF/pdg2pdf_lhapdf6.f'
--- Template/LO/Source/PDF/pdg2pdf_lhapdf6.f	2018-03-07 23:11:46 +0000
+++ Template/LO/Source/PDF/pdg2pdf_lhapdf6.f	2019-06-27 13:48:48 +0000
@@ -54,12 +54,14 @@
       endif
 
       ipart=ipdg
-      if(iabs(ipart).eq.21) ipart=0
-      if(iabs(ipart).eq.22) ipart=7
-      iporg=ipart
-
+      if(iabs(ipart).eq.21) then
+         ipart=0
+      else if(iabs(ipart).eq.22) then 
+         ipart=7
+      else if (iabs(ipart).eq.7) then
+         ipart=7
 c     This will be called for any PDG code, but we only support up to 7
-      if(iabs(ipart).gt.7)then
+      else if(iabs(ipart).gt.7)then
          write(*,*) 'PDF not supported for pdg ',ipdg
          write(*,*) 'For lepton colliders, please set the lpp* '//
      $    'variables to 0 in the run_card'  
@@ -68,6 +70,7 @@
          stop 1
       endif
 
+      iporg=ipart
 c     Determine the iset used in lhapdf
       call getnset(iset)
       if (iset.ne.1) then

=== modified file 'Template/LO/SubProcesses/dummy_fct.f'
--- Template/LO/SubProcesses/dummy_fct.f	2018-01-11 16:16:25 +0000
+++ Template/LO/SubProcesses/dummy_fct.f	2019-06-27 13:48:48 +0000
@@ -86,3 +86,13 @@
       shat = x(1)*x(2)*ebeam(1)*ebeam(2)
       return 
       end
+
+
+      logical  function dummy_boostframe()
+      implicit none
+c
+c      
+      dummy_boostframe = .false.
+      return
+      end
+      

=== modified file 'Template/LO/SubProcesses/genps.f'
--- Template/LO/SubProcesses/genps.f	2018-06-27 09:03:22 +0000
+++ Template/LO/SubProcesses/genps.f	2019-06-27 13:48:48 +0000
@@ -185,7 +185,8 @@
 c     External function
       double precision SumDot
       external SumDot
-
+      logical dummy_boostframe
+      external dummy_boostframe
 c
 c     data
 c
@@ -304,8 +305,12 @@
 c     First Generate Momentum for initial state particles
 c
       if (lpp(1).eq.9.or.lpp(2).eq.9)then
-         p(:,1) = pi1(:)
-         p(:,2) = pi2(:)
+         if (dummy_boostframe())then
+            call mom2cx(m(-nbranch),m(1),m(2),1d0,0d0,p(0,1),p(0,2))
+         else
+            p(:,1) = pi1(:)
+            p(:,2) = pi2(:)
+         endif
       else if(nincoming.eq.2) then
         call mom2cx(m(-nbranch),m(1),m(2),1d0,0d0,p(0,1),p(0,2))
       else
@@ -840,7 +845,7 @@
          m12 = m(itree(2,ibranch))**2
          mn2 = m(ibranch-1)**2
 c         write(*,*) 'Enertering yminmax',sqrt(s1),sqrt(m12),sqrt(mn2)
-         call yminmax(s1,t,m12,ma2,mb2,mn2,tmin,tmax)
+         call yminmax(s1,0d0,m12,ma2,mb2,mn2,tmin,tmax)
 c
 c     Call for 0<x<1
 c
@@ -1114,6 +1119,7 @@
 C     This is the G function from Particle Kinematics by
 C     E. Byckling and K. Kajantie, Chapter 4 p. 91 eqs 5.28
 C     It is used to determine physical limits for Y based on inputs
+C     Y is not used in this formula (called with dummy value)
 C**************************************************************************
       implicit none
 c

=== modified file 'Template/LO/SubProcesses/myamp.f'
--- Template/LO/SubProcesses/myamp.f	2018-10-08 04:02:27 +0000
+++ Template/LO/SubProcesses/myamp.f	2019-06-27 13:48:48 +0000
@@ -501,7 +501,7 @@
 c           Use 1/10000 of sqrt(s) as minimum, to always get integration
             xo = xo*xo/stot
             if (xo.eq.0d0)then
-               xo=1d0/stot
+               xo=1/10000d0
                write(*,*) 'Warning: No cutoff for shat integral found'
                write(*,*) '         Minimum set to ', xo
             endif

=== modified file 'Template/LO/SubProcesses/reweight.f'
--- Template/LO/SubProcesses/reweight.f	2019-01-25 10:41:09 +0000
+++ Template/LO/SubProcesses/reweight.f	2019-06-27 13:48:48 +0000
@@ -399,7 +399,7 @@
 c       exotic q > gluon q'
         ipart(1,imo)=ipart(1,ida1)
         ipart(2,imo)=0
-      else if (get_color(idmo).eq.1.or.get_color(idmo).eq.2) then
+      else if (get_color(idmo).eq.1.or.get_color(idmo).eq.2.or.get_color(idda1).eq.2.or.get_color(idda2).eq.2) then
 c     Color singlet
          ipart(1,imo)=ipart(1,ida1)
          ipart(2,imo)=ipart(1,ida2)

=== modified file 'Template/LO/SubProcesses/setcuts.f'
--- Template/LO/SubProcesses/setcuts.f	2018-03-11 12:10:19 +0000
+++ Template/LO/SubProcesses/setcuts.f	2019-06-27 13:48:48 +0000
@@ -664,14 +664,21 @@
          endif
       enddo
 
-c     ensure symmetry of s_min(i,j)
+c     ensure symmetry of s_min(i,j) + mass effect
       do i=nincoming+1,nexternal-1
         do j=nincoming+1,nexternal-1
            if(j.lt.i)then
-               s_min(i,j) = max(s_min(j,i),s_min(i,j))
+               s_min(i,j) = max(s_min(j,i), s_min(i,j), (pmass(i)+pmass(j))**2)
             endif
         enddo
       enddo
+
+c     ensure that smin is bigger than mass threshold
+      smin_p = 0d0
+      do i=nincoming+1, nexternal
+         smin_p = smin_p + pmass(i)
+      enddo
+      smin = max(smin, smin_p**2)
       write(*,*) "Define smin to", smin
 
 c Check that results are consistent among all the grouped subprocesses

=== modified file 'Template/NLO/Source/PDF/pdg2pdf.f'
--- Template/NLO/Source/PDF/pdg2pdf.f	2015-10-21 14:57:34 +0000
+++ Template/NLO/Source/PDF/pdg2pdf.f	2019-06-27 13:48:48 +0000
@@ -66,12 +66,14 @@
       endif
 
       ipart=ipdg
-      if(iabs(ipart).eq.21) ipart=0
-      if(iabs(ipart).eq.22) ipart=7
-      iporg=ipart
-
+      if(iabs(ipart).eq.21) then
+         ipart=0
+      else if(iabs(ipart).eq.22) then
+         ipart=7
+      else if(iabs(ipart).eq.7) then
+         ipart=7
+      else if(iabs(ipart).gt.7)then
 c     This will be called for any PDG code, but we only support up to 7
-      if(iabs(ipart).gt.7)then
          write(*,*) 'PDF not supported for pdg ',ipdg
          write(*,*) 'For lepton colliders, please set the lpp* '//
      $    'variables to 0 in the run_card'  
@@ -80,6 +82,7 @@
          stop 1
       endif
 
+      iporg=ipart
       ireuse = 0
       ii=i_replace
       do i=1,20

=== modified file 'Template/NLO/Source/PDF/pdg2pdf_lhapdf.f'
--- Template/NLO/Source/PDF/pdg2pdf_lhapdf.f	2016-02-09 14:17:01 +0000
+++ Template/NLO/Source/PDF/pdg2pdf_lhapdf.f	2019-06-27 13:48:48 +0000
@@ -64,12 +64,14 @@
       endif
 
       ipart=ipdg
-      if(iabs(ipart).eq.21) ipart=0
-      if(iabs(ipart).eq.22) ipart=7
-      iporg=ipart
-
+      if(iabs(ipart).eq.21) then
+         ipart=0
+      else if(iabs(ipart).eq.22) then
+         ipart=7
+      else if(iabs(ipart).eq.7) then
+         ipart=7
+      else if(iabs(ipart).gt.7)then
 c     This will be called for any PDG code, but we only support up to 7
-      if(iabs(ipart).gt.7)then
          write(*,*) 'PDF not supported for pdg ',ipdg
          write(*,*) 'For lepton colliders, please set the lpp* '//
      $    'variables to 0 in the run_card'  
@@ -82,6 +84,7 @@
 c     Determine the member of the set (function of lhapdf)
       call getnmem(iset,imem)
 
+      iporg=ipart
       ireuse = 0
       ii=i_replace
       do i=1,20

=== modified file 'Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f'
--- Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f	2016-02-11 19:09:10 +0000
+++ Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f	2019-06-27 13:48:48 +0000
@@ -65,12 +65,14 @@
       endif
 
       ipart=ipdg
-      if(iabs(ipart).eq.21) ipart=0
-      if(iabs(ipart).eq.22) ipart=7
-      iporg=ipart
-
+      if(iabs(ipart).eq.21) then
+         ipart=0
+      else if(iabs(ipart).eq.22) then
+         ipart=7
+      else if(iabs(ipart).eq.7) then
+         ipart=7
+      else if(iabs(ipart).gt.7)then
 c     This will be called for any PDG code, but we only support up to 7
-      if(iabs(ipart).gt.7)then
          write(*,*) 'PDF not supported for pdg ',ipdg
          write(*,*) 'For lepton colliders, please set the lpp* '//
      $    'variables to 0 in the run_card'  
@@ -82,6 +84,7 @@
 c     Determine the member of the set (function of lhapdf)
       call getnmem(iset,imem)
 
+      iporg=ipart
       ireuse = 0
       ii=i_replace
       do i=1,20

=== modified file 'Template/NLO/SubProcesses/fks_singular.f'
--- Template/NLO/SubProcesses/fks_singular.f	2018-03-12 07:20:30 +0000
+++ Template/NLO/SubProcesses/fks_singular.f	2019-06-27 13:48:48 +0000
@@ -2896,10 +2896,12 @@
      &                                            pjet,njet,jet)
                do i=1,NN
                   di(i)=sqrt(amcatnlo_fastjetdmergemax(i-1))
-                  if (i.gt.1.and.di(i).gt.di(i-1))then
-                     write(*,*)'Error in set_shower_scale_noshape'
-                     write(*,*)NN,i,di(i),di(i-1)
-                     stop
+                  if (i.gt.1)then
+                     if(di(i).gt.di(i-1))then
+                        write(*,*)'Error in set_shower_scale_noshape'
+                        write(*,*)NN,i,di(i),di(i-1)
+                        stop
+                     endif
                   endif
                enddo
                if(iSH.eq.1)shower_S_scale(iFKS)=di(NN)

=== modified file 'Template/NLO/SubProcesses/genps_fks.f'
--- Template/NLO/SubProcesses/genps_fks.f	2017-06-16 08:20:04 +0000
+++ Template/NLO/SubProcesses/genps_fks.f	2019-06-27 13:48:48 +0000
@@ -1512,6 +1512,7 @@
       xp(3,2)=-xp(0,2)
 c
       xp(0,i_fks)=E_i_fks*(chy_lbst-shy_lbst*yijdir)
+      p_i_fks(0)=p_i_fks(0)*(chy_lbst-shy_lbst*yijdir)
       xpifksred(1)=sinth_i_fks*cosphi_i_fks    
       xpifksred(2)=sinth_i_fks*sinphi_i_fks    
       xpifksred(3)=chy_lbst*yijdir-shy_lbst

=== modified file 'Template/NLO/SubProcesses/handling_lhe_events.f'
--- Template/NLO/SubProcesses/handling_lhe_events.f	2017-06-15 19:31:40 +0000
+++ Template/NLO/SubProcesses/handling_lhe_events.f	2019-06-27 13:48:48 +0000
@@ -602,7 +602,7 @@
       endif
       write(ifile,'(a)')
      # '  </init>'
- 501  format(2(1x,i6),2(1x,e14.8),2(1x,i2),2(1x,i6),1x,i2,1x,i3)
+ 501  format(2(1x,i6),2(1x,e14.8),2(1x,i2),2(1x,i8),1x,i2,1x,i3)
  502  format(3(1x,e14.8),1x,i6)
 c
       return

=== modified file 'Template/NLO/SubProcesses/write_event.f'
--- Template/NLO/SubProcesses/write_event.f	2017-07-26 11:45:39 +0000
+++ Template/NLO/SubProcesses/write_event.f	2019-06-27 13:48:48 +0000
@@ -149,7 +149,7 @@
       write(lunlhe,502)XSECUP(1),XERRUP(1),XMAXUP(1),LPRUP(1)
       write(lunlhe,'(a)')'  </init>'
  250  format(1x,i8)
- 501  format(2(1x,i6),2(1x,d14.8),2(1x,i2),2(1x,i6),1x,i2,1x,i3)
+ 501  format(2(1x,i6),2(1x,d14.8),2(1x,i2),2(1x,i8),1x,i2,1x,i3)
  502  format(3(1x,d14.8),1x,i6)
 
       return

=== modified file 'Template/loop_material/StandAlone/SubProcesses/makefile'
--- Template/loop_material/StandAlone/SubProcesses/makefile	2017-09-01 09:45:48 +0000
+++ Template/loop_material/StandAlone/SubProcesses/makefile	2019-06-27 13:48:48 +0000
@@ -119,11 +119,11 @@
 endif
 matrix$(MENUM)py.so: ../$(OLP)_static f2py_wrapper.f 
 	touch __init__.py
-	$(F2PY) $(MADLOOP_LIB) -m matrix$(MENUM)py -c f2py_wrapper.f --fcompiler=$(FC)   -L../../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB)
+	$(F2PY) $(MADLOOP_LIB) -m matrix$(MENUM)py -c f2py_wrapper.f --f77exec=$(FC)   -L../../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB)
 
 allmatrix$(MENUM)py.so: $(OLP)_static all_matrix.f $(LIBS) $(WRAPPER)
 	touch __init__.py
-	$(F2PY) $(MADLOOP_LIB)  -m allmatrix$(MENUM)py -c all_matrix.f $(wildcard $(LOOP_PREFIX)*/f2py_wrapper.f) --fcompiler=$(FC)   -L../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB)
+	$(F2PY) $(MADLOOP_LIB)  -m allmatrix$(MENUM)py -c all_matrix.f $(wildcard $(LOOP_PREFIX)*/f2py_wrapper.f) --f77exec=$(FC)   -L../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB)
 
 clean:
 	@rm -f *.o *.so *.$(libext) *.$(dylibext)

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2019-02-03 21:25:06 +0000
+++ UpdateNotes.txt	2019-06-27 13:48:48 +0000
@@ -1,5 +1,21 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
+2.6.6(27/07/19)
+      OM: Bug in the edition of the shower_card. The set command of logical parameter was never setting the 
+          parameter to False. (Thanks to Richard Ruiz) 
+      RF: Fixed a bug in the creation of the energy-stripped i_FKS momentum. Tested for several processes,
+          and seems to have been completely harmless.
+      OM: Forbidding the use of CKKW/default scale for some UFO model allowing gluon emission from quark with
+          no dependence in aS
+      OM: Add an option "keep_ordering" for reweighting feature to allow to sometimes use decay chain even if
+          you have ambiguity between final state particles.
+      OM: Fixed an issue with interference which sometimes happens when some polarization contribution were negative but not all of them.
+      VH: Change in the pythia8 output mode (thanks to Peter Skands)
+      OM: Any number in the cards (not only integer) can use multiplication, division and k/M suffix for times 1000 and 1 million respectively
+      OM: Energy cut (at LO) are now hidden by default for LHC type of run but visible for lepton collider ones.
+      OM: Same for beam polarization
+
+
 2.6.5 (03/02/19)
       OM: Fix some speed issue with the generated gridpack --speed issue introduced in 2.6.1--
       OM: Fix a bug in the computation of systematics when running with Python 2.6.
@@ -12,6 +28,7 @@
       OM: Fix issue for BSM model with additional colored particle where the default dynamical scale choice 
           was crashing
 
+
 2.6.4 (09/11/18)
       OM: add specific treatement for small width (at LO only and not for loop-induced)
           if the width is smaller than 1e-6 times the mass, a fake width (at that value) is used for the

=== modified file 'VERSION'
--- VERSION	2019-02-03 21:25:06 +0000
+++ VERSION	2019-06-27 13:48:48 +0000
@@ -1,4 +1,4 @@
-version = 2.6.5
+version = 2.6.6.1
 date = 2018-02-03
 
 

=== modified file 'bin/mg5_aMC'
--- bin/mg5_aMC	2018-11-28 22:24:56 +0000
+++ bin/mg5_aMC	2019-06-27 13:48:48 +0000
@@ -127,6 +127,13 @@
 if __debug__ and time.time() - start > 0.5:
     print( 'WARNING: loading of madgraph too slow!!!', time.time() - start)
 
+try:
+    import madgraph.various.misc as misc
+    misc.EasterEgg('loading')
+except:
+    pass
+
+
 if options.plugin:
     if not os.path.exists(os.path.join(root_path, 'PLUGIN', options.plugin)):
         print( "ERROR: %s is not present in the PLUGIN directory. Please install it first")

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2018-12-03 22:10:49 +0000
+++ madgraph/core/base_objects.py	2019-06-27 13:48:48 +0000
@@ -1044,6 +1044,8 @@
         self['version_tag'] = None # position of the directory (for security)
         self['gauge'] = [0, 1]
         self['case_sensitive'] = True
+        self['allow_pickle'] = True
+        self['limitations'] = [] # MLM means that the model can sometimes have issue with MLM/default scale. 
         # attribute which might be define if needed
         #self['name2pdg'] = {'name': pdg}
         

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2018-12-03 22:10:49 +0000
+++ madgraph/core/diagram_generation.py	2019-06-27 13:48:48 +0000
@@ -1334,7 +1334,7 @@
     def __init__(self, argument = None, collect_mirror_procs = False,
                  ignore_six_quark_processes = False, loop_filter=None, diagram_filter=False):
         """Allow initialization with Process and with ProcessDefinition"""
-
+ 
         if isinstance(argument, base_objects.Process):
             super(DecayChainAmplitude, self).__init__()
             from madgraph.loop.loop_diagram_generation import LoopMultiProcess
@@ -1373,7 +1373,8 @@
                           " incoming particle"
                 self['decay_chains'].append(\
                     DecayChainAmplitude(process, collect_mirror_procs,
-                                        ignore_six_quark_processes))
+                                        ignore_six_quark_processes,
+                                        diagram_filter=diagram_filter))
 
             # Flag decaying legs in the core diagrams by onshell = True
             decay_ids = sum([[a.get('process').get('legs')[0].get('id') \
@@ -1782,7 +1783,7 @@
                 if not process.get('required_s_channels') and \
                    not process.get('forbidden_onsh_s_channels') and \
                    not process.get('forbidden_s_channels') and \
-                   not process.get('is_decay_chain'):
+                   not process.get('is_decay_chain') and not diagram_filter:
                     try:
                         crossed_index = success_procs.index(sorted_legs)
                         # The relabeling of legs for loop amplitudes is cumbersome

=== modified file 'madgraph/core/drawing.py'
--- madgraph/core/drawing.py	2016-08-29 15:09:16 +0000
+++ madgraph/core/drawing.py	2019-06-27 13:48:48 +0000
@@ -1663,7 +1663,7 @@
         # Set variable for storing text        
         self.text = ''
         # Do we have to write a file? -> store in self.file
-        if file:
+        if filename:
             self.file = True # Note that this variable will be overwritten. THis
                              #will be the object file. [initialize]
         else:

=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2018-10-26 08:20:43 +0000
+++ madgraph/core/helas_objects.py	2019-06-27 13:48:48 +0000
@@ -458,7 +458,7 @@
                          'loop_orders':vertex.get('loop_orders')}
         else:
             # Not that it is going to be used here, but it might be eventually
-            inter = model.get_interaction(vertex.get('id'))
+            #inter = model.get_interaction(vertex.get('id'))
             loop_info = {}
 
         if last_vertex:
@@ -4888,7 +4888,7 @@
 
         return output
 
-    def get_used_couplings(self):
+    def get_used_couplings(self, output=str):
         """Return a list with all couplings used by this
         HelasMatrixElement."""
 
@@ -4896,7 +4896,10 @@
                 self.get_all_wavefunctions() + self.get_all_amplitudes() \
                 if wa.get('interaction_id') not in [0,-1]]
         #some coupling have a minus one associated -> need to remove those
-        return [ [t] if not t.startswith('-') else [t[1:]] for t2 in tmp for t in t2]
+        if output == str:
+            return [ [t] if not t.startswith('-') else [t[1:]] for t2 in tmp for t in t2]
+        elif output=="set":
+            return set(sum([ [t] if not t.startswith('-') else [t[1:]] for t2 in tmp for t in t2],[]))
 
 
     def get_mirror_processes(self):

=== modified file 'madgraph/fks/fks_common.py'
--- madgraph/fks/fks_common.py	2019-02-03 21:24:20 +0000
+++ madgraph/fks/fks_common.py	2019-06-27 13:48:48 +0000
@@ -454,12 +454,26 @@
     for i, ii in model.get('interaction_dict').items():
         # i want interections of pert_order: 1 (from LO to NLO), 
         # without any other orders
+        # and of "base" type
+        if ii.get('type') != 'base': continue
+
         if ii.get('orders') == {pert_order:1} and len(ii['particles']) == 3 :
             masslist = [p.get('mass').lower() for p in ii['particles']]
-                # check that there is at least a massless particle, and that the 
-                # remaining ones have the same mass 
-                # (otherwise the real emission final state will not be degenerate
-                # with the born one
+            
+            # require that at least one particle be soft and of even spin for the interaction to be IR singular
+            found_soft_even_spin_particle = False
+            for p in ii['particles']:
+                if p.get('mass').lower()=='zero':
+                    if p.get('spin')%2==1:
+                        found_soft_even_spin_particle = True
+                        break
+            if not found_soft_even_spin_particle:
+                continue
+            
+            # check that there is at least a massless particle, and that the 
+            # remaining ones have the same mass 
+            # (otherwise the real emission final state will not be degenerate
+            # with the born one
             try:
                 masslist.remove('zero')
             except ValueError:

=== modified file 'madgraph/fks/fks_helas_objects.py'
--- madgraph/fks/fks_helas_objects.py	2017-06-16 12:58:46 +0000
+++ madgraph/fks/fks_helas_objects.py	2019-06-27 13:48:48 +0000
@@ -847,6 +847,19 @@
     def __eq__(self, other):
         """Equality operator:
         compare two FKSHelasRealProcesses by comparing their dictionaries"""
+        
+        if self.__dict__ == other.__dict__:
+            return True
+        else:
+#            failed = []
+#            for key in self.__dict__:
+#                if self.__dict__[key] != other.__dict__[key]:
+#                    failed.append(key)
+#            import madgraph.various.misc as misc
+
+            return False
+                
+        
         return self.__dict__ == other.__dict__
     
     def __ne__(self, other):

=== modified file 'madgraph/interface/common_run_interface.py'
--- madgraph/interface/common_run_interface.py	2019-01-16 11:18:08 +0000
+++ madgraph/interface/common_run_interface.py	2019-06-27 13:48:48 +0000
@@ -2267,8 +2267,6 @@
         """Require MG5 directory: Compute automatically the widths of a set 
         of particles"""
 
-
-
         args = self.split_arg(line)
         opts = self.check_compute_widths(args)
 
@@ -2287,9 +2285,14 @@
                 (' '.join([str(i) for i in opts['particles']]),
                  ' '.join('--%s=%s' % (key,value) for (key,value) in opts.items()
                         if key not in ['model', 'force', 'particles'] and value))
-        cmd.exec_cmd(line, model=opts['model'])
+        out = cmd.exec_cmd(line, model=opts['model'])
+        
+    
         self.child = None
         del cmd
+        return out
+        
+        
 
     ############################################################################ 
     def do_print_results(self, line):
@@ -3316,7 +3319,11 @@
                 logger.warning('Missing mass in the lhef file (%s) . Please fix this (use the "update missing" command if needed)', param.lhacode[0])
                 continue
             if mass and abs(width/mass) < 1e-12:
-                logger.error('The width of particle %s is too small for an s-channel resonance (%s). If you have this particle in an s-channel, this is likely to create numerical instabilities .', param.lhacode[0], width)
+                if hasattr(interface, 'run_card') and isinstance(interface.run_card, banner_mod.RunCardLO):
+                    if interface.run_card['small_width_treatment'] < 1e-12:
+                        logger.error('The width of particle %s is too small for an s-channel resonance (%s) and the small_width_paramer is too small to prevent numerical issues. If you have this particle in an s-channel, this is likely to create numerical instabilities .', param.lhacode[0], width)
+                else:
+                    logger.error('The width of particle %s is too small for an s-channel resonance (%s). If you have this particle in an s-channel, this is likely to create numerical instabilities .', param.lhacode[0], width)
                 if CommonRunCmd.sleep_for_error:
                     time.sleep(5)
                     CommonRunCmd.sleep_for_error = False
@@ -3677,7 +3684,7 @@
         madspin_cmd.mg5cmd.options.update(self.options)
         for key, value in self.options.items():
             if isinstance(value, str):
-                madspin_cmd.mg5cmd.exec_cmd( 'set %s %s' %(key,value), errorhandling=False, printcmd=False, precmd=False, postcmd=True)
+                madspin_cmd.mg5cmd.exec_cmd( 'set %s %s --no_save' %(key,value), errorhandling=False, printcmd=False, precmd=False, postcmd=True)
         madspin_cmd.cluster = self.cluster
         
         madspin_cmd.update_status = lambda *x,**opt: self.update_status(*x, level='madspin',**opt)
@@ -4481,10 +4488,23 @@
         if from_banner is None:
             self.from_banner = {}
             return
-        misc.sprint(from_banner)
+
         self.from_banner = {}
-        for card in from_banner:
-            self.from_banner[card] = banner.charge_card(card)
+        try:
+            for card in from_banner:
+                self.from_banner[card] = banner.charge_card(card)
+        except KeyError:
+            if from_banner == ['param', 'run'] and banner.keys() == ['mgversion']:
+                if self.mother_interface:
+                    results = self.mother_interface.results
+                    run_name = self.mother_interface.run_name 
+                    run_tag = self.mother_interface.run_tag
+                    banner = banner_mod.recover_banner(results, 'parton', run_name, run_tag)
+                    self.mother_interface.banner = banner
+                    return self.init_from_banner(from_banner, banner)
+                else:
+                    raise
+
         return self.from_banner
     
 
@@ -5413,7 +5433,7 @@
                     val = ' '.join(args[start+1:])
                     val = val.split('#')[0]
                 else:
-                    val = args[start+1]
+                    val = ' '.join(args[start+1:])
                 self.setR(args[start], val)
             self.modified_card.add('run') # delayed writing of the run_card
         # special mode for set run_card nocut T (generated by set no_parton_cut
@@ -5585,7 +5605,7 @@
             else:
                 args_str = ' '.join(str(a) for a in args[start+1:len(args)])
                 self.shower_card.set_param(args[start],args_str,self.paths['shower'])
-     
+
         # MadLoop Parameter  ---------------------------------------------------
         elif self.has_ml and args[start] in self.ml_vars \
                                                and card in ['', 'MadLoop_card']:
@@ -5768,22 +5788,53 @@
                 
                 if mass:
                     if abs(width/mass) < self.run_card['small_width_treatment']:
-                        logger.warning("Particle %s will use a fake width  ( %s instead of %s ).\n" +
-                          "Cross-section will be rescaled according to NWA if needed."  +
-                          "To force exact treatment reduce the value of 'small_width_treatment' parameter of the run_card",
-                          param.lhacode[0], abs(mass*self.run_card['small_width_treatment']), width)
+                        logger.warning("Particle %s with small width detected (%s): See https://answers.launchpad.net/mg5amcnlo/+faq/3053 to learn the special handling of that case",
+                                    param.lhacode[0], width)
                     elif abs(width/mass) < 1e-12:
                         logger.error('The width of particle %s is too small for an s-channel resonance (%s). If you have this particle in an s-channel, this is likely to create numerical instabilities .', param.lhacode[0], width)
                     if CommonRunCmd.sleep_for_error:
                         time.sleep(5)
                         CommonRunCmd.sleep_for_error = False
-
+                        
+            # @LO if PY6 shower => event_norm on sum
+            if 'pythia_card.dat' in self.cards and 'run' in self.allow_arg:
+                if self.run_card['event_norm'] != 'sum':
+                    logger.info('Pythia6 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' )
+                    self.do_set('run_card event_norm sum') 
+            # @LO if PY6 shower => event_norm on sum
+            elif 'pythia8_card.dat' in self.cards:
+                if self.run_card['event_norm'] == 'sum':
+                    logger.info('Pythia8 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' )
+                    self.do_set('run_card event_norm average')  
+                
+            if 'MLM' in proc_charac['limitations']:
+                if self.run_card['dynamical_scale_choice'] == -1:
+                    raise InvalidCmd, "Your model is identified as not fully supported within MG5aMC.\n" +\
+                        "As your process seems to be impacted by the issue,\n"+\
+                      "You can NOT run with CKKW dynamical scale for this model. Please choose another one." 
+                if self.run_card['ickkw']:
+                    raise InvalidCmd, "Your model is identified as not fully supported within MG5aMC.\n" +\
+                        "As your process seems to be impacted by the issue,\n" +\
+                      "You can NOT run with MLM matching/merging. Please check if merging outside MG5aMC are suitable or refrain to use merging with this model" 
+                
 
         ########################################################################
         #       NLO specific check
         ########################################################################
         # For NLO run forbid any pdg specific cut on massless particle
         if isinstance(self.run_card,banner_mod.RunCardNLO):
+            
+            try:
+                proc_charac = self.mother_interface.proc_characteristics
+            except:
+                proc_charac = None
+
+            if proc_charac and 'MLM' in proc_charac['limitations']:
+                if self.run_card['ickkw']:
+                    raise Exception, "Your model is identified as not fully supported within MG5aMC.\n" +\
+                      "You can NOT run with FxFx/UnLOPS matching/merging. Please check if merging outside MG5aMC are suitable or refrain to use merging with this model" 
+                            
+            
             for pdg in set(self.run_card['pt_min_pdg'].keys()+self.run_card['pt_max_pdg'].keys()+
                            self.run_card['mxx_min_pdg'].keys()): 
             
@@ -5792,9 +5843,8 @@
                 if self.param_card.get_value('mass', int(pdg), default=0) ==0:
                     raise Exception, "For NLO runs, you can use PDG specific cuts only for massive particles: (failed for %s)" % pdg
         
-        # if NLO reweighting is ON: ensure that we keep the rwgt information
-        if 'reweight' in self.allow_arg and 'run' in self.allow_arg and \
-            isinstance(self.run_card,banner_mod.RunCardNLO) and \
+            # if NLO reweighting is ON: ensure that we keep the rwgt information
+            if 'reweight' in self.allow_arg and 'run' in self.allow_arg and \
             not self.run_card['store_rwgt_info']:
             #check if a NLO reweighting is required
                 re_pattern = re.compile(r'''^\s*change\s*mode\s* (LO\+NLO|LO|NLO|NLO_tree)\s*(?:#|$)''', re.M+re.I)
@@ -5804,25 +5854,15 @@
                     logger.info('NLO reweighting is on ON. Automatically set store_rwgt_info to True', '$MG:BOLD' )
                     self.do_set('run_card store_rwgt_info True')
         
-        # if external computation for the systematics are asked then switch 
-        #automatically the book-keeping of the weight for NLO
-        if 'run' in self.allow_arg and \
-                    self.run_card['systematics_program'] == 'systematics' and \
-                    isinstance(self.run_card,banner_mod.RunCardNLO) and \
-                    not self.run_card['store_rwgt_info']:
-            logger.warning('To be able to run systematics program, we set store_rwgt_info to True')
-            self.do_set('run_card store_rwgt_info True')
+            # if external computation for the systematics are asked then switch 
+            #automatically the book-keeping of the weight for NLO
+            if 'run' in self.allow_arg and \
+                        self.run_card['systematics_program'] == 'systematics'  and \
+                        not self.run_card['store_rwgt_info']:
+                logger.warning('To be able to run systematics program, we set store_rwgt_info to True')
+                self.do_set('run_card store_rwgt_info True')
         
-        # @LO if PY6 shower => event_norm on sum
-        if 'pythia_card.dat' in self.cards and 'run' in self.allow_arg:
-            if self.run_card['event_norm'] != 'sum':
-                logger.info('Pythia6 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' )
-                self.do_set('run_card event_norm sum') 
-        # @LO if PY6 shower => event_norm on sum
-        elif 'pythia8_card.dat' in self.cards:
-            if self.run_card['event_norm'] == 'sum':
-                logger.info('Pythia8 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' )
-                self.do_set('run_card event_norm average')         
+       
         
         # Check the extralibs flag.
         if self.has_shower and isinstance(self.run_card, banner_mod.RunCardNLO):
@@ -5961,7 +6001,7 @@
             elif pattern_width.search(param_text):
                 self.do_compute_widths('')
                 self.param_card = param_card_mod.ParamCard(self.paths['param'])
-        
+                
             # calling the routine doing the work    
             self.update_dependent(self.mother_interface, self.me_dir, self.param_card,
                                    self.paths['param'], timer)
@@ -6011,7 +6051,7 @@
             if name in self.modified_card:
                 self.modified_card.remove(name)
         else:
-            raise Exception, "Need to add the associate writter proxy"
+            raise Exception, "Need to add the associate writter proxy for %s" % name
         
     def write_card_run(self):
         """ write the run_card """
@@ -6329,9 +6369,29 @@
             line += ' --nlo'
 
         try:
-            return self.mother_interface.do_compute_widths(line)
+            out = self.mother_interface.do_compute_widths(line)
         except InvalidCmd, error:
             logger.error("Invalid command: %s " % error)
+        else:
+            if hasattr(self, 'run_card'):
+                for pid, info in out.items():
+                    total = 0
+                    for key, partial in info:
+                        total += partial
+                    mass = self.param_card.get_value('mass', pid)
+                    try:
+                        small_width_treatment = self.run_card['small_width_treatment']
+                    except Exception: #NLO
+                        small_width_treatment = 0
+                    
+                    if total and total/mass < small_width_treatment:
+                        text = "Particle %s with very small width (%g): Learn about special handling here: https://answers.launchpad.net/mg5amcnlo/+faq/3053"
+                        logger.warning(text,pid,total)
+                    elif total and total/mass < 1e-11:
+                        text = "Particle %s with very small width (%g): Numerical inaccuracies can occur if that particle is in a s-channel"
+                        logger.critical(text,pid,total)                        
+                        
+            
 
     def help_compute_widths(self):
         signal.alarm(0) # avoid timer if any

=== modified file 'madgraph/interface/extended_cmd.py'
--- madgraph/interface/extended_cmd.py	2018-11-28 22:12:28 +0000
+++ madgraph/interface/extended_cmd.py	2019-06-27 13:48:48 +0000
@@ -2332,11 +2332,11 @@
             elif line and hasattr(self, 'do_%s' % line.split()[0]):
                 # go to retry
                 reprint_opt = True 
-            elif self.value == 'repeat':
+            elif self.value in ['repeat', 'reask']:
                 reprint_opt = True         
             else:
                 raise Exception
-        except Exception, error:            
+        except Exception, error:  
             print """not valid argument. Valid argument are file path or value in (%s).""" \
                           % ','.join(self.allow_arg)
             print 'please retry'
@@ -2421,6 +2421,7 @@
             allowed_args += ['%s=%s;' % (key,s) for s in self.get_allowed(key)]
         # adding special mode
         allowed_args += [key[4:]+';' for key in dir(self) if key.startswith('ans_')]
+        allowed_args += [arg[:-1] for arg in allowed_args if arg[-1] == ';']
         if 'allow_arg' in opts:
             allowed_args += opts['allow_arg']
             del opts['allow_arg']

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2019-01-24 13:43:19 +0000
+++ madgraph/interface/madevent_interface.py	2019-06-27 13:48:48 +0000
@@ -2557,7 +2557,11 @@
                 
                     
                 self.create_plot('parton')            
-                self.exec_cmd('store_events', postcmd=False)            
+                self.exec_cmd('store_events', postcmd=False) 
+                if self.run_card['boost_event'].strip()  and self.run_card['boost_event'] != 'False':
+                    self.boost_events()
+                            
+                                       
                 self.exec_cmd('reweight -from_cards', postcmd=False)            
                 self.exec_cmd('decay_events -from_cards', postcmd=False)
                 if self.run_card['time_of_flight']>=0:
@@ -2580,6 +2584,49 @@
                                                  self.results.current['cross'],
                                                  self.results.current['error']))
     
+    def boost_events(self):
+        
+        if not self.run_card['boost_event']:
+            return
+        
+        if self.run_card['boost_event'].startswith('lambda'):
+            if not isinstance(self, cmd.CmdShell):
+                raise Exception, "boost not allowed online"
+            filter = eval(self.run_card['boost_event'])
+        else:
+            raise Exception
+            
+        path = [pjoin(self.me_dir, 'Events', self.run_name, 'unweighted_events.lhe.gz'),
+                    pjoin(self.me_dir, 'Events', self.run_name, 'unweighted_events.lhe'),
+                    pjoin(self.me_dir, 'Events', self.run_name, 'events.lhe.gz'),
+                    pjoin(self.me_dir, 'Events', self.run_name, 'events.lhe')]
+            
+        for p in path:
+            if os.path.exists(p):
+                event_path = p
+                break
+        else:
+            raise Exception, "fail to find event file for the boost"
+            
+            
+        lhe = lhe_parser.EventFile(event_path)
+        with misc.TMP_directory() as tmp_dir:
+            output =  lhe_parser.EventFile(pjoin(tmp_dir, os.path.basename(event_path)), 'w')
+            #write the banner to the output file
+            output.write(lhe.banner)
+            # Loop over all events
+            for event in lhe:
+                event.boost(filter)
+                #write this modify event
+                output.write(str(event))
+            output.write('</LesHouchesEvent>\n') 
+            lhe.close()
+            files.mv(pjoin(tmp_dir, os.path.basename(event_path)), event_path) 
+         
+            
+            
+            
+    
     def do_initMadLoop(self,line):
         """Compile and run MadLoop for a certain number of PS point so as to 
         initialize MadLoop (setup the zero helicity and loop filter.)"""
@@ -3356,8 +3403,7 @@
         #fsock.close()
         
         # Compile
-        for name in ['../bin/internal/gen_ximprove', 'all', 
-                     '../bin/internal/combine_events']:
+        for name in ['../bin/internal/gen_ximprove', 'all']:
             self.compile(arg=[name], cwd=os.path.join(self.me_dir, 'Source'))
         
         
@@ -3516,11 +3562,9 @@
         args = self.split_arg(line)
         # Check argument's validity
         self.check_combine_events(args)
-
         self.update_status('Combining Events', level='parton')
 
         
-
         if self.run_card['gridpack'] and isinstance(self, GridPackCmd):
             return GridPackCmd.do_combine_events(self, line)
     
@@ -3546,7 +3590,9 @@
         
         partials = 0 # if too many file make some partial unweighting
         sum_xsec, sum_xerru, sum_axsec = 0,[],0
-        for Gdir in self.get_Gdir():
+        Gdirs = self.get_Gdir()
+        Gdirs.sort()
+        for Gdir in Gdirs:
             if os.path.exists(pjoin(Gdir, 'events.lhe')):
                 result = sum_html.OneResult('')
                 result.read_results(pjoin(Gdir, 'results.dat'))
@@ -3555,7 +3601,6 @@
                              result.get('xerru'),
                              result.get('axsec')
                              )
-
                 sum_xsec += result.get('xsec')
                 sum_xerru.append(result.get('xerru'))
                 sum_axsec += result.get('axsec')
@@ -3580,7 +3625,6 @@
                           get_wgt, trunc_error=1e-2, event_target=self.run_card['nevents'],
                           log_level=logging.DEBUG, normalization=self.run_card['event_norm'],
                           proc_charac=self.proc_characteristic)
-        
         if partials:
             for i in range(partials):
                 try:
@@ -5587,7 +5631,6 @@
         elif self.run_card['python_seed'] >= 0:
             import random
             random.seed(self.run_card['python_seed'])
-                                                               
         if self.run_card['ickkw'] == 2:
             logger.info('Running with CKKW matching')
             self.treat_ckkw_matching()
@@ -5603,7 +5646,7 @@
         logger.info("compile Source Directory")
         
         # Compile
-        for name in [ 'all', '../bin/internal/combine_events']:
+        for name in [ 'all']:#, '../bin/internal/combine_events']:
             self.compile(arg=[name], cwd=os.path.join(self.me_dir, 'Source'))
         
         bias_name = os.path.basename(self.run_card['bias_module'])
@@ -6193,7 +6236,7 @@
         
         if not banner:
             banner = self.banner
-        
+            
         if auto:
             self.ask_edit_cards(cards, from_banner=['param', 'run'], 
                                 mode='auto', plot=(pythia_version==6), banner=banner
@@ -6570,7 +6613,9 @@
         
         partials = 0 # if too many file make some partial unweighting
         sum_xsec, sum_xerru, sum_axsec = 0,[],0
-        for Gdir in self.get_Gdir():
+        Gdirs = self.get_Gdir()
+        Gdirs.sort()
+        for Gdir in Gdirs:
             #mfactor already taken into accoun in auto_dsig.f
             if os.path.exists(pjoin(Gdir, 'events.lhe')):
                 result = sum_html.OneResult('')
@@ -6598,7 +6643,8 @@
         
         if not hasattr(self,'proc_characteristic'):
             self.proc_characteristic = self.get_characteristics()
-            
+        
+        self.banner.add_generation_info(sum_xsec, self.nb_event)
         nb_event = AllEvent.unweight(pjoin(outdir, self.run_name, "unweighted_events.lhe.gz"),
                           get_wgt, trunc_error=1e-2, event_target=self.nb_event,
                           log_level=logging.DEBUG, normalization=self.run_card['event_norm'],
@@ -6613,75 +6659,10 @@
                     os.remove(pjoin(outdir, self.run_name, "partials%s.lhe" % i))
                    
         self.results.add_detail('nb_event', nb_event)
-    
+        self.banner.add_generation_info(sum_xsec, nb_event)
         if self.run_card['bias_module'].lower() not in  ['dummy', 'none']:
             self.correct_bias()
 
-    def do_combine_events_v4(self, line):
-        """Advanced commands: Launch combine events"""    
-        
-        args = self.split_arg(line)
-    
-        # Check argument's validity
-        self.check_combine_events(args)
-
-        self.update_status('Combining Events', level='parton')
-
-        try:
-            os.remove(pjoin(self.me_dir,'SubProcesses', 'combine.log'))
-        except Exception:
-            pass
-        
-        if not self.readonly:        
-            run_dir = pjoin(self.me_dir,'SubProcesses')
-            stdout_file = pjoin(self.me_dir,'SubProcesses', 'combine.log')
-        else:
-            run_dir = pjoin('SubProcesses')
-            stdout_file = pjoin('SubProcesses', 'combine.log')
-
-        cluster.onecore.launch_and_wait('../bin/internal/run_combine', 
-                                       args=[self.run_name],
-                                       cwd=run_dir,
-                                       stdout=stdout_file,
-                                       required_output=[pjoin(self.me_dir,'SubProcesses', 'combine.log')])
-            
-        output = misc.mult_try_open(stdout_file).read()
-        # Store the number of unweighted events for the results object
-        pat = re.compile(r'''\s*Unweighting\s*selected\s*(\d+)\s*events''')
-        try:      
-            nb_event = pat.search(output).groups()[0]
-        except AttributeError:
-            time.sleep(10)
-            output = misc.mult_try_open(pjoin(self.me_dir,'SubProcesses','combine.log')).read()
-            try:
-                nb_event = pat.search(output).groups()[0]
-            except AttributeError:
-                logger.warning('Fail to read the number of unweighted events in the combine.log file')
-                nb_event = 0
-        self.results.add_detail('nb_event', nb_event)
-        
-        # Define The Banner
-        tag = self.run_card['run_tag']
-        
-        # Update the banner with the pythia card
-        if not self.banner:
-            self.banner = banner_mod.recover_banner(self.results, 'parton')
-        self.banner.load_basic(self.me_dir)
-        # Add cross-section/event information
-        self.banner.add_generation_info(self.results.current['cross'], nb_event)
-        if not hasattr(self, 'random_orig'): self.random_orig = 0
-        self.banner.change_seed(self.random_orig)
-        if not os.path.exists(pjoin(self.me_dir, 'Events', self.run_name)):
-            os.mkdir(pjoin(self.me_dir, 'Events', self.run_name))
-        self.banner.write(pjoin(self.me_dir, 'Events', self.run_name, 
-                                     '%s_%s_banner.txt' % (self.run_name, tag)))
-        
-        
-        self.banner.add_to_file(pjoin(self.me_dir,'Events', 'events.lhe'),
-                                out=pjoin(self.me_dir,'Events', self.run_name, 'events.lhe'))
-        self.banner.add_to_file(pjoin(self.me_dir,'Events', 'unweighted_events.lhe'),        
-                                out=pjoin(self.me_dir,'Events', self.run_name, 'unweighted_events.lhe'))        
-
 
 class MadLoopInitializer(object):
     """ A container class for the various methods for initializing MadLoop. It is

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2019-02-03 21:24:20 +0000
+++ madgraph/interface/madgraph_interface.py	2019-06-27 13:48:48 +0000
@@ -1447,12 +1447,18 @@
             if not args[1].isdigit():
                 raise self.InvalidCmd('%s values should be a integer' % args[0])
 
+        if args[0] in ['low_mem_multicore_nlo_generation']:
+            if sys.version_info[0] == 2 and sys.version_info[1] == 6:
+                raise self.InvalidCmd('python2.6 does not support such functionalities please use python2.7')
+        
+
         if args[0] in ['loop_optimized_output', 'loop_color_flows', 'low_mem_multicore_nlo_generation']:
             try:
                 args[1] = banner_module.ConfigFile.format_variable(args[1], bool, args[0])
             except Exception:
                 raise self.InvalidCmd('%s needs argument True or False'%args[0])
 
+
         if args[0] in ['gauge']:
             if args[1] not in ['unitary','Feynman']:
                 raise self.InvalidCmd('gauge needs argument unitary or Feynman.')
@@ -3081,6 +3087,14 @@
                   " can only be given on one type of coupling and either on"+\
                                " squared orders or amplitude orders, not both.")
 
+            if myprocdef.get_ninitial() ==1 and  myprocdef.get('squared_orders'):
+                logger.warning('''Computation of interference term with decay is not 100% validated.  
+                Please check carefully your result.
+                One suggestion is also to compare the generation of your process with and without
+                set group_subprocesses True
+                (to write Before the generate command)
+                ''')
+
             cpu_time1 = time.time()
 
             # Generate processes
@@ -4718,7 +4732,7 @@
             split_orders=list(set(perturbation_couplings_list+squared_orders.keys()))
             try:
                 split_orders.sort(key=lambda elem: 0 if elem=='WEIGHTED' else
-                                       self._curr_model['order_hierarchy']
+                                       self._curr_model.get('order_hierarchy')
                                        [elem if not elem.endswith('.sqrt') else elem[:-5]])
             except KeyError:
                 raise self.InvalidCmd, "The loaded model does not defined a "+\
@@ -5825,8 +5839,8 @@
                           'MadAnalysis':['arXiv:1206.1599'],
                           'collier':['arXiv:1604.06792'],
                           'oneloop':['arXiv:1007.4716'],
-                          'maddm':['arXiv:1505.04190'],
-                          'maddump':['arXiv:1806.xxxxx']}
+                          'maddm':['arXiv:1804.00444'],
+                          'maddump':['arXiv:1812.06771']}
     
     install_server = ['http://madgraph.phys.ucl.ac.be/package_info.dat',
                          'http://madgraph.physics.illinois.edu/package_info.dat']
@@ -7292,7 +7306,11 @@
                 # We don't want to go through the MasterCommand again
                 # because it messes with the interface switching when
                 # importing a loop model from MG5
-                MadGraphCmd.do_import(self,'model %s' %model_name, force=True)
+                if 'modelname' in self.history.get('full_model_line'):
+                    opts = '--modelname'
+                else:
+                    opts=''
+                MadGraphCmd.do_import(self,'model %s %s' % (model_name, opts), force=True)
             elif log:
                 logger.info('Note that you have to reload the model')
 
@@ -8132,7 +8150,7 @@
                 madevent_interface.MadEventCmd.update_width_in_param_card(decay_info,
                                                        opts['path'], opts['output'])
                 if float(opts['body_decay']) == 2:
-                    return
+                    return  decay_info
         else:
             skip_2body = True
 
@@ -8153,7 +8171,7 @@
             
             
             
-            return
+            return  decay_info
 
         # Do the MadEvent integration!!
         with misc.TMP_directory(dir=os.getcwd()) as path:
@@ -8161,6 +8179,15 @@
             logger_mg.info('More info in temporary files:\n    %s/index.html' % (decay_dir))
             with misc.MuteLogger(['madgraph','ALOHA','cmdprint','madevent'], [40,40,40,40]):
                 self.exec_cmd('output %s -f' % decay_dir,child=False)
+                
+                #modify some parameter of the default run_card
+                run_card = banner_module.RunCard(pjoin(decay_dir,'Cards','run_card.dat'))
+                if run_card['ickkw']:
+                    run_card['ickkw'] = 0
+                    run_card['xqcut'] = 0
+                    run_card.remove_all_cut()
+                    run_card.write(pjoin(decay_dir,'Cards','run_card.dat'))
+                
                 # Need to write the correct param_card in the correct place !!!
                 if os.path.exists(opts['output']):
                     files.cp(opts['output'], pjoin(decay_dir, 'Cards', 'param_card.dat'))
@@ -8223,7 +8250,7 @@
 
         if self._curr_model['name'] == 'mssm' or self._curr_model['name'].startswith('mssm-'):
             check_param_card.convert_to_slha1(opts['output'])
-        return
+        return decay_info
 
 
 

=== modified file 'madgraph/interface/master_interface.py'
--- madgraph/interface/master_interface.py	2018-04-02 14:02:36 +0000
+++ madgraph/interface/master_interface.py	2019-06-27 13:48:48 +0000
@@ -47,7 +47,7 @@
 import madgraph.iolibs.files as files
 import madgraph.various.misc as misc
 
-from madgraph import MG4DIR, MG5DIR, MadGraph5Error
+from madgraph import MG4DIR, MG5DIR, MadGraph5Error, InvalidCmd
 
 logger = logging.getLogger('cmdprint') # -> stdout
 
@@ -198,6 +198,10 @@
 
     def do_add(self, line, *args, **opts):
         
+        allow_switch = True
+        if self._curr_proc_defs:
+           allow_switch = False
+        
         argss = cmd.Cmd.split_arg(line)
         if len(argss)>=1 and argss[0] in ['process','timing','profile']:
             proc_line = ' '.join(argss[1:])
@@ -207,17 +211,17 @@
                     'The NLO mode %s is not valid. Please choose one among: %s' \
                     % (nlo_mode, ' '.join(self._valid_nlo_modes)))
                 elif nlo_mode in ['all', 'real', 'LOonly']:
-                    self.change_principal_cmd('aMC@NLO')
+                    self.change_principal_cmd('aMC@NLO', allow_switch)
                 elif nlo_mode in ['virt', 'sqrvirt']:
-                    self.change_principal_cmd('MadLoop')
+                    self.change_principal_cmd('MadLoop', allow_switch)
                 elif nlo_mode == 'noborn': 
-                    self.change_principal_cmd('MadLoop')
+                    self.change_principal_cmd('MadLoop', allow_switch)
                     self.cmd.validate_model(self, loop_type=nlo_mode,
                                                             coupling_type=orders)
-                    self.change_principal_cmd('MadGraph')
+                    self.change_principal_cmd('MadGraph', allow_switch)
                     return self.cmd.create_loop_induced(self, line, *args, **opts)
             else:
-                self.change_principal_cmd('MadGraph') 
+                self.change_principal_cmd('MadGraph', allow_switch) 
         try:
             return  self.cmd.do_add(self, line, *args, **opts)
         except fks_base.NoBornException:
@@ -225,7 +229,7 @@
             logger.info(" No Born diagrams found. Now switching to the loop-induced mode.        ", '$MG:BOLD')
             logger.info(" Please cite ref. 'arXiv:1507.00020' when using results from this mode. ", '$MG:BOLD')
             logger.info("------------------------------------------------------------------------", '$MG:BOLD')            
-            self.change_principal_cmd('MadGraph')
+            self.change_principal_cmd('MadGraph',allow_switch)
             return self.cmd.create_loop_induced(self, line, *args, **opts)
 
         
@@ -608,9 +612,15 @@
                             %args[0]+" Valid interfaces are %s"\
                             %','.join(interface_quick_name.keys()))
         
-    def change_principal_cmd(self, name):
+    def change_principal_cmd(self, name, allow_switch=True):
+
 
         old_cmd=self.current_interface
+        if old_cmd == name:
+            return
+        elif not allow_switch:
+            raise InvalidCmd, "Command not compatible with previous command: Can not combine LO/NLO feature."
+            
         if name in self.interface_names.keys():
             self.prompt= self.interface_names[name][0]+'>'
             self.cmd= self.interface_names[name][1]

=== modified file 'madgraph/interface/reweight_interface.py'
--- madgraph/interface/reweight_interface.py	2018-09-19 12:07:16 +0000
+++ madgraph/interface/reweight_interface.py	2019-06-27 13:48:48 +0000
@@ -108,7 +108,7 @@
         self.has_nlo = False
         self.rwgt_dir = None
         self.exitted = False # Flag to know if do_quit was already called.
-        
+        self.keep_ordering = False
         if event_path:
             logger.info("Extracting the banner ...")
             self.do_import(event_path, allow_madspin=allow_madspin)
@@ -354,6 +354,8 @@
             if self.has_standalone_dir:
                 self.terminate_fortran_executables()
                 self.has_standalone_dir = False
+        elif args[0] == "keep_ordering":
+            self.keep_ordering = banner.ConfigFile.format_variable(args[1], bool, "keep_ordering")
         elif args[0] == "process":
             nb_f2py_module += 1
             if self.has_standalone_dir:
@@ -747,7 +749,6 @@
         if 'initrwgt' in self.banner and self.output_type == 'default': 
             if 'name=\'mg_reweighting\'' in self.banner['initrwgt']:
                 blockpat = re.compile(r'''<weightgroup name=\'mg_reweighting\'\s*weight_name_strategy=\'includeIdInWeightName\'>(?P<text>.*?)</weightgroup>''', re.I+re.M+re.S)
-                misc.sprint(blockpat, self.banner['initrwgt'])
                 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)
@@ -1144,6 +1145,9 @@
             nb_retry, sleep = 5, 20 
         
         tag, order = event.get_tag_and_order()
+        if self.keep_ordering:
+            old_tag = tuple(tag)
+            tag = (tag[0], tuple(order[1])) 
         if isinstance(hypp_id, str) and hypp_id.startswith('V'):
             tag = (tag,'V')
             hypp_id = int(hypp_id[1:])
@@ -1404,6 +1408,7 @@
             else:
                 proc = proc.replace('[', '[ virt=')
                 commandline += "add process %s ;" % proc
+        commandline = re.sub('@\s*\d+', '', commandline)
         # deactivate golem since it creates troubles
         old_options = dict(mgcmd.options)
         if mgcmd.options['golem'] or mgcmd.options['pjfry']:
@@ -1776,7 +1781,8 @@
                     outgoing = pdg[2:]
                 order = (list(incoming), list(outgoing))
                 incoming.sort()
-                outgoing.sort()
+                if not self.keep_ordering:
+                    outgoing.sort()
                 tag = (tuple(incoming), tuple(outgoing))
                 if 'virt' in onedir:
                     tag = (tag, 'V')
@@ -1797,10 +1803,12 @@
                             misc.sprint(order, pdir,)
                             raise Exception                                
                     else: 
+                        misc.sprint(all_prefix[all_pdgs.index(pdg)])
+                        misc.sprint(all_prefix[all_pdgs.index(oldpdg)])
                         misc.sprint(tag, onedir)
                         misc.sprint(data[tag][:-1])
                         misc.sprint(order, pdir,)
-                        raise Exception
+                        raise Exception, "two different matrix-element have the same initial/final state. Leading to an ambiguity. If your events are ALWAYS written in the correct-order (look at the numbering in the Feynman Diagram). Then you can add inside your reweight_card the line 'change keep_ordering True'." 
 
                 data[tag] = order, pdir, hel
              

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2018-12-22 20:33:20 +0000
+++ madgraph/iolibs/export_v4.py	2019-06-27 13:48:48 +0000
@@ -3840,7 +3840,12 @@
         # indicate that the output type is not grouped
         if  not isinstance(self, ProcessExporterFortranMEGroup):
             self.proc_characteristic['grouped_matrix'] = False
+        
         self.proc_characteristic['complex_mass_scheme'] = mg5options['complex_mass_scheme']
+
+        # set limitation linked to the model
+    
+        
         # indicate the PDG of all initial particle
         try:
             pdgs1 = [p.get_initial_pdg(1) for me in matrix_elements for m in me.get('matrix_elements') for p in m.get('processes') if p.get_initial_pdg(1)]
@@ -3971,6 +3976,22 @@
             # Set lowercase/uppercase Fortran code
             writers.FortranWriter.downcase = False
 
+        # check if MLM/.../ is supported for this matrix-element and update associate flag
+        if self.model and 'MLM' in self.model["limitations"]:
+            if 'MLM' not in self.proc_characteristic["limitations"]:
+                used_couplings = matrix_element.get_used_couplings(output="set") 
+                for vertex in self.model.get('interactions'):
+                    particles = [p for p in vertex.get('particles')]
+                    if 21 in [p.get('pdg_code') for p in particles]:
+                        colors = [par.get('color') for par in particles]
+                        if 1 in colors:
+                            continue
+                        elif 'QCD' not in vertex.get('orders'):
+                            for bad_coup in vertex.get('couplings').values():
+                                if bad_coup in used_couplings:
+                                    self.proc_characteristic["limitations"].append('MLM')
+                                    break
+
         # The proc prefix is not used for MadEvent output so it can safely be set
         # to an empty string.
         replace_dict = {'proc_prefix':''}
@@ -4103,7 +4124,7 @@
         replace_dict['ampsplitorders']='\n'.join(amp_so)
         replace_dict['sqsplitorders']='\n'.join(sqamp_so)
         
-        
+
         # Extract JAMP lines
         # If no split_orders then artificiall add one entry called 'ALL_ORDERS'
         jamp_lines = self.get_JAMP_lines_split_order(\
@@ -5120,6 +5141,16 @@
 
         filename = 'symfact_orig.dat'
         self.write_symfact_file(open(filename, 'w'), symmetry)
+        
+        # check consistency
+        for i, sym_fact in enumerate(symmetry):
+            if sym_fact > 0:
+                continue
+            if nqcd_list[i] != nqcd_list[abs(sym_fact)-1]:
+                misc.sprint(i, sym_fact, nqcd_list[i], nqcd_list[abs(sym_fact)])
+                raise Exception, "identical diagram with different QCD powwer" 
+                                      
+        
 
         filename = 'symperms.inc'
         self.write_symperms_file(writers.FortranWriter(filename),

=== modified file 'madgraph/iolibs/template_files/madevent_makefile_source'
--- madgraph/iolibs/template_files/madevent_makefile_source	2017-08-14 08:21:48 +0000
+++ madgraph/iolibs/template_files/madevent_makefile_source	2019-06-27 13:48:48 +0000
@@ -26,8 +26,7 @@
 
 # Binaries
 
-BINARIES = $(BINDIR)gen_ximprove $(BINDIR)combine_events \
-           $(BINDIR)gensudgrid $(BINDIR)combine_runs
+BINARIES = $(BINDIR)gen_ximprove $(BINDIR)gensudgrid $(BINDIR)combine_runs
 
 # Compile commands
 
@@ -54,8 +53,8 @@
 
 $(BINDIR)gen_ximprove: gen_ximprove.o ranmar.o rw_routines.o open_file.o 
 	$(FC) $(LDFLAGS) -o $@ $^
-$(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext) run_card.inc $(LIBDIR)libbias.$(libext)
-			 $(FC) -o $@ $(COMBINE) -L$(LIBDIR) -lmodel -lpdf $(llhapdf) $(LDFLAGS) -lbias
+#$(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext) run_card.inc $(LIBDIR)libbias.$(libext)
+#			 $(FC) -o $@ $(COMBINE) -L$(LIBDIR) -lmodel -lpdf $(llhapdf) $(LDFLAGS) -lbias
 $(BINDIR)gensudgrid: $(GENSUDGRID) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libcernlib.$(libext)
 	$(FC) -o $@ $(GENSUDGRID) -L$(LIBDIR) -lmodel -lpdf -lcernlib $(llhapdf) $(LDFLAGS)
 
@@ -66,7 +65,7 @@
 invarients.o: invarients.f genps.inc
 setrun.o: setrun.f nexternal.inc leshouche.inc genps.inc
 gen_ximprove.o: gen_ximprove.f run_config.inc run_card.inc
-combine_events.o: combine_events.f run_config.inc run_card.inc
+#combine_events.o: combine_events.f run_config.inc run_card.inc
 combine_runs.o: combine_runs.f run_config.inc run_card.inc
 select_events.o: select_events.f run_config.inc
 setrun.o: setrun.f nexternal.inc leshouche.inc run_card.inc run_config.inc

=== modified file 'madgraph/iolibs/template_files/matrix_madevent_v4.inc'
--- madgraph/iolibs/template_files/matrix_madevent_v4.inc	2018-10-26 08:20:43 +0000
+++ madgraph/iolibs/template_files/matrix_madevent_v4.inc	2019-06-27 13:48:48 +0000
@@ -132,7 +132,7 @@
           JHEL = 1
           IF(NTRY.LE.MAXTRIES)THEN
            DO I=1,NCOMB
-              IF (.NOT.GOODHEL(I) .AND. (TS(I).GT.ANS*LIMHEL/NCOMB)) THEN
+              IF (.NOT.GOODHEL(I) .AND. (DABS(TS(I)).GT.ANS*LIMHEL/NCOMB)) THEN
                  GOODHEL(I)=.TRUE.
                  NGOOD = NGOOD +1
                  IGOOD(NGOOD) = I        

=== modified file 'madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_cc.inc'
--- madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_cc.inc	2015-09-14 15:08:12 +0000
+++ madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_cc.inc	2019-06-27 13:48:48 +0000
@@ -7,48 +7,50 @@
 #include "Parameters_%(model_name)s.h"
 #include "%(include_prefix)sPythiaStdlib.h"
 
-namespace Pythia8 {
-
-    // Initialize static instance
-    Parameters_%(model_name)s* Parameters_%(model_name)s::instance = 0;
-
-    // Function to get static instance - only one instance per program
-    Parameters_%(model_name)s* Parameters_%(model_name)s::getInstance(){
-	if (instance == 0)
-	    instance = new Parameters_%(model_name)s();
-
-	return instance;
-    }
-
-    void Parameters_%(model_name)s::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
-	%(set_independent_parameters)s
-    }
-    void Parameters_%(model_name)s::setIndependentCouplings(){
-	%(set_independent_couplings)s
-    }
-    void Parameters_%(model_name)s::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
-	%(set_dependent_parameters)s
-    }
-    void Parameters_%(model_name)s::setDependentCouplings(){
-	%(set_dependent_couplings)s
-    }
-
-    // Routines for printing out parameters
-    void Parameters_%(model_name)s::printIndependentParameters(){
-	cout << "%(model_name)s model parameters independent of event kinematics:" << endl;
-	%(print_independent_parameters)s
-    }
-    void Parameters_%(model_name)s::printIndependentCouplings(){
-	cout << "%(model_name)s model couplings independent of event kinematics:" << endl;
-	%(print_independent_couplings)s
-    }
-    void Parameters_%(model_name)s::printDependentParameters(){
-	cout << "%(model_name)s model parameters dependent on event kinematics:" << endl;
-	%(print_dependent_parameters)s
-    }
-    void Parameters_%(model_name)s::printDependentCouplings(){
-	cout << "%(model_name)s model couplings dependent on event kinematics:" << endl;
-	%(print_dependent_couplings)s
-    }
-
-} // end namespace Pythia8
+using namespace Pythia8;
+
+// Initialize static instance
+Parameters_%(model_name)s* Parameters_%(model_name)s::instance = 0;
+
+// Function to get static instance - only one instance per program
+Parameters_%(model_name)s* Parameters_%(model_name)s::getInstance(){
+if (instance == 0)
+    instance = new Parameters_%(model_name)s();
+
+return instance;
+}
+
+void Parameters_%(model_name)s::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
+%(set_independent_parameters)s
+}
+void Parameters_%(model_name)s::setIndependentCouplings(){
+%(set_independent_couplings)s
+}
+
+void Parameters_%(model_name)s::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
+%(set_dependent_parameters)s
+}
+
+
+void Parameters_%(model_name)s::setDependentCouplings(){
+%(set_dependent_couplings)s
+}
+
+// Routines for printing out parameters
+void Parameters_%(model_name)s::printIndependentParameters(){
+cout << "%(model_name)s model parameters independent of event kinematics:" << endl;
+%(print_independent_parameters)s
+}
+void Parameters_%(model_name)s::printIndependentCouplings(){
+cout << "%(model_name)s model couplings independent of event kinematics:" << endl;
+%(print_independent_couplings)s
+}
+void Parameters_%(model_name)s::printDependentParameters(){
+cout << "%(model_name)s model parameters dependent on event kinematics:" << endl;
+%(print_dependent_parameters)s
+}
+void Parameters_%(model_name)s::printDependentCouplings(){
+cout << "%(model_name)s model couplings dependent on event kinematics:" << endl;
+%(print_dependent_couplings)s
+}
+

=== modified file 'madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_h.inc'
--- madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_h.inc	2015-09-14 15:08:12 +0000
+++ madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_h.inc	2019-06-27 13:48:48 +0000
@@ -14,7 +14,7 @@
 
 using namespace std;
 
-namespace Pythia8 {
+using namespace Pythia8;
 
 class Parameters_%(model_name)s
 {
@@ -33,6 +33,10 @@
 void setIndependentCouplings();
 // Set parameters that are changed event by event
 void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS);
+// TMP: hardcoded bogus implementation with no arguments since this
+// is being called from within the matrix elements.
+void setDependentParameters() {};
+
 // Set couplings that are changed event by event
 void setDependentCouplings();
 
@@ -45,10 +49,8 @@
 // Print couplings that are changed event by event
 void printDependentCouplings();
 
-
   private:
 static Parameters_%(model_name)s* instance;
 };
 
-} // end namespace Pythia8
 #endif // Pythia8_parameters_%(model_name)s_H

=== modified file 'madgraph/loop/loop_exporters.py'
--- madgraph/loop/loop_exporters.py	2018-06-03 12:13:47 +0000
+++ madgraph/loop/loop_exporters.py	2019-06-27 13:48:48 +0000
@@ -3053,7 +3053,7 @@
         Not needed for StandAlone so we need to call the correct one 
         """
         
-        return export_v4.ProcessExporterFortranMEGroup.write_procdef_mg5(
+        return export_v4.ProcessExporterFortran.write_procdef_mg5(
             self, file_pos, modelname, process_str)
 
     def get_source_libraries_list(self):

=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2018-12-18 20:16:08 +0000
+++ madgraph/various/banner.py	2019-06-27 13:48:48 +0000
@@ -686,13 +686,19 @@
         try:    
             _tag = results_object[run].tags[-1] 
         except Exception,error:
-            return Banner()      
+            if os.path.exists( pjoin(results_object.path,'Events','%s_banner.txt' % (run))):
+                tag = None
+            else:
+                return Banner()      
     else:
         _tag = tag
-                                          
+    
     path = results_object.path
-    banner_path = pjoin(path,'Events',run,'%s_%s_banner.txt' % (run, tag))
-    
+    if tag:               
+        banner_path = pjoin(path,'Events',run,'%s_%s_banner.txt' % (run, tag))
+    else:
+        banner_path = pjoin(results_object.path,'Events','%s_banner.txt' % (run))
+      
     if not os.path.exists(banner_path):
         if level != "parton" and tag != _tag:
             return recover_banner(results_object, level, _run, results_object[_run].tags[0])
@@ -712,6 +718,7 @@
 
         # security if the banner was remove (or program canceled before created it)
         return Banner()  
+    
     banner = Banner(banner_path)
     
     
@@ -1207,8 +1214,8 @@
             if value in allowed:
                 valid=True     
             elif isinstance(value, str):
-                value = value.lower()
-                allowed = [v.lower() for v in allowed]
+                value = value.lower().strip()
+                allowed = [str(v).lower() for v in allowed]
                 if value in allowed:
                     i = allowed.index(value)
                     value = self.allowed_value[lower_name][i]
@@ -1343,25 +1350,7 @@
                 elif value.endswith(('k', 'M')) and value[:-1].isdigit():
                     convert = {'k':1000, 'M':1000000}
                     value =int(value[:-1]) * convert[value[-1]] 
-                else:
-                    try:
-                        value = float(value.replace('d','e'))
-                    except ValueError:
-                        raise InvalidCmd, "%s can not be mapped to an integer" % value                    
-                    try:
-                        new_value = int(value)
-                    except ValueError:
-                        raise InvalidCmd, "%s can not be mapped to an integer" % value
-                    else:
-                        if value == new_value:
-                            value = new_value
-                        else:
-                            raise InvalidCmd, "incorect input: %s need an integer for %s" % (value,name)
-            elif targettype == float:
-                value = value.replace('d','e') # pass from Fortran formatting
-                try:
-                    value = float(value)
-                except ValueError:
+                elif '/' in value or '*' in value:               
                     try:
                         split = re.split('(\*|/)',value)
                         v = float(split[0])
@@ -1372,9 +1361,48 @@
                                 v /=  float(split[2*i+2])
                     except:
                         v=0
-                        raise InvalidCmd, "%s can not be mapped to a float" % value
+                        raise InvalidCmd, "%s can not be mapped to an integer" % value
                     finally:
-                        value = v
+                        value = int(v)
+                        if value != v:
+                            raise InvalidCmd, "%s can not be mapped to an integer" % v
+                else:
+                    try:
+                        value = float(value.replace('d','e'))
+                    except ValueError:
+                        raise InvalidCmd, "%s can not be mapped to an integer" % value                    
+                    try:
+                        new_value = int(value)
+                    except ValueError:
+                        raise InvalidCmd, "%s can not be mapped to an integer" % value
+                    else:
+                        if value == new_value:
+                            value = new_value
+                        else:
+                            raise InvalidCmd, "incorect input: %s need an integer for %s" % (value,name)
+                     
+            elif targettype == float:
+                if value.endswith(('k', 'M')) and value[:-1].isdigit():
+                    convert = {'k':1000, 'M':1000000}
+                    value = 1.*int(value[:-1]) * convert[value[-1]] 
+                else:
+                    value = value.replace('d','e') # pass from Fortran formatting
+                    try:
+                        value = float(value)
+                    except ValueError:
+                        try:
+                            split = re.split('(\*|/)',value)
+                            v = float(split[0])
+                            for i in range((len(split)//2)):
+                                if split[2*i+1] == '*':
+                                    v *=  float(split[2*i+2])
+                                else:
+                                    v /=  float(split[2*i+2])
+                        except:
+                            v=0
+                            raise InvalidCmd, "%s can not be mapped to a float" % value
+                        finally:
+                            value = v
             else:
                 raise InvalidCmd, "type %s is not handle by the card" % targettype
             
@@ -1434,7 +1462,8 @@
         self.add_param('colored_pdgs', [1,2,3,4,5])
         self.add_param('complex_mass_scheme', False)
         self.add_param('pdg_initial1', [0])
-        self.add_param('pdg_initial2', [0])        
+        self.add_param('pdg_initial2', [0])
+        self.add_param('limitations', [], typelist=str)        
 
     def read(self, finput):
         """Read the input file, this can be a path to a file, 
@@ -2744,8 +2773,26 @@
 #
 """, 
     template_off= '# Syscalc is deprecated but to see the associate options type\'update syscalc\''),
-    ]
-    
+
+#    ECUT block (hidden it by default but for e+ e- collider)             
+        runblock(name='ecut', fields=('ej','eb','ea','el','ejmax','ebmax','eamax','elmax','e_min_pdg','e_max_pdg'),
+              template_on=\
+"""#*********************************************************************
+# Minimum and maximum E's (in the center of mass frame)              *
+#*********************************************************************
+  %(ej)s  = ej     ! minimum E for the jets
+  %(eb)s  = eb     ! minimum E for the b
+  %(ea)s  = ea     ! minimum E for the photons
+  %(el)s  = el     ! minimum E for the charged leptons
+  %(ejmax)s   = ejmax ! maximum E for the jets
+ %(ebmax)s   = ebmax ! maximum E for the b
+ %(eamax)s   = eamax ! maximum E for the photons
+ %(elmax)s   = elmax ! maximum E for the charged leptons
+ %(e_min_pdg)s = e_min_pdg ! E cut for other particles (use pdg code). Applied on particle and anti-particle
+ %(e_max_pdg)s = e_max_pdg ! E cut for other particles (syntax e.g. {6: 100, 25: 50})
+""", 
+    template_off= '#\n# For display option for energy cut in the partonic center of mass frame type \'update ecut\'\n#'),
+    ]    
     
     
     def default_setup(self):
@@ -2807,6 +2854,7 @@
         self.add_param("asrwgtflavor", 5,                                       comment = 'highest quark flavor for a_s reweighting in MLM')
         self.add_param("clusinfo", True)
         self.add_param("lhe_version", 3.0)
+        self.add_param("boost_event", "False", hidden=True, include=False,      comment="allow to boost the full event. The boost put at rest the sume of 4-momenta of the particle selected by the filter defined here. example going to the higgs rest frame: lambda p: p.pid==25")
         self.add_param("event_norm", "average", allowed=['sum','average', 'unity'],
                         include=False, sys_default='sum')
         #cut
@@ -2828,14 +2876,14 @@
         self.add_param("ptlmax", -1.0, cut=True)
         self.add_param("missetmax", -1.0, cut=True)
         # E cut
-        self.add_param("ej", 0.0, cut=True)
-        self.add_param("eb", 0.0, cut=True)
-        self.add_param("ea", 0.0, cut=True)
-        self.add_param("el", 0.0, cut=True)
-        self.add_param("ejmax", -1.0, cut=True)
-        self.add_param("ebmax", -1.0, cut=True)
-        self.add_param("eamax", -1.0, cut=True)
-        self.add_param("elmax", -1.0, cut=True)
+        self.add_param("ej", 0.0, cut=True, hidden=True)
+        self.add_param("eb", 0.0, cut=True, hidden=True)
+        self.add_param("ea", 0.0, cut=True, hidden=True)
+        self.add_param("el", 0.0, cut=True, hidden=True)
+        self.add_param("ejmax", -1.0, cut=True, hidden=True)
+        self.add_param("ebmax", -1.0, cut=True, hidden=True)
+        self.add_param("eamax", -1.0, cut=True, hidden=True)
+        self.add_param("elmax", -1.0, cut=True, hidden=True)
         # Eta cut
         self.add_param("etaj", 5.0, cut=True)
         self.add_param("etab", -1.0, cut=True)
@@ -2958,8 +3006,8 @@
         # Special syntax are related to those. (can not be edit directly)
         self.add_param('pt_min_pdg',{'__type__':0.}, include=False)
         self.add_param('pt_max_pdg',{'__type__':0.}, include=False)
-        self.add_param('E_min_pdg',{'__type__':0.}, include=False)
-        self.add_param('E_max_pdg',{'__type__':0.}, include=False)
+        self.add_param('E_min_pdg',{'__type__':0.}, include=False, hidden=True)
+        self.add_param('E_max_pdg',{'__type__':0.}, include=False, hidden=True)
         self.add_param('eta_min_pdg',{'__type__':0.}, include=False)
         self.add_param('eta_max_pdg',{'__type__':0.}, include=False)
         self.add_param('mxx_min_pdg',{'__type__':0.}, include=False)
@@ -2975,6 +3023,7 @@
         self.add_param('mxxmin4pdg',[-1.], system=True)
         self.add_param('mxxpart_antipart', [False], system=True)
                      
+        
              
     def check_validity(self):
         """ """
@@ -3155,10 +3204,13 @@
                 self['ebeam1'] = 500
                 self['ebeam2'] = 500
                 self['use_syst'] = False
+                self.display_block.append('beam_pol')
+                self.display_block.append('ecut')
             else:
                 self['lpp1'] = 0
                 self['lpp2'] = 0    
-                self['use_syst'] = False            
+                self['use_syst'] = False   
+                self.display_block.append('beam_pol')         
                 
         # Check if need matching
         min_particle = 99
@@ -3211,9 +3263,19 @@
             else:
                 continue
             break
+
+        
         if no_systematics:
             self['use_syst'] = False
             self['systematics_program'] = 'none'
+
+        if 'MLM' in proc_characteristic['limitations']:
+            if self['dynamical_scale_choice'] ==  -1:
+                self['dynamical_scale_choice'] = 3
+            if self['ickkw']  == 1:
+                logger.critical("MLM matching/merging not compatible with the model! You need to use another method to remove the double counting!")
+            self['ickkw'] = 0
+            
             
     def write(self, output_file, template=None, python_template=False,
               **opt):

=== modified file 'madgraph/various/diagram_symmetry.py'
--- madgraph/various/diagram_symmetry.py	2016-06-27 19:14:20 +0000
+++ madgraph/various/diagram_symmetry.py	2019-06-27 13:48:48 +0000
@@ -348,13 +348,18 @@
         interaction color, mass, width."""
 
         inter = model.get_interaction(vertex.get('id'))
-                   
+            
         if last_vertex:
             return (0,)
         else:
             part = model.get_particle(vertex.get('legs')[-1].get('id'))
+            try:
+                QCD = inter.get('orders')['QCD']
+            except Exception, error:
+                QCD = 0
+
             return ((part.get('color'),
-                     part.get('mass'), part.get('width')),)
+                     part.get('mass'), part.get('width'), QCD),)
 
 def find_symmetry_subproc_group(subproc_group):
     """Find symmetric configs by directly comparing the configurations

=== modified file 'madgraph/various/histograms.py'
--- madgraph/various/histograms.py	2018-01-31 19:07:21 +0000
+++ madgraph/various/histograms.py	2019-06-27 13:48:48 +0000
@@ -2108,7 +2108,8 @@
           ratio_correlations=True, arg_string='', 
           jet_samples_to_keep=None,
           auto_open=True,
-          lhapdfconfig='lhapdf-config'):
+          lhapdfconfig='lhapdf-config',
+          assigned_colours=None):
         """ Ouput this histogram to a file, stream or string if path is kept to
         None. The supported format are for now. Chose whether to print the header
         or not."""
@@ -2160,6 +2161,24 @@
         
         self[:] = matching_histo_lists
 
+        # the histogram colours:
+        coli=['col1','col2','col3','col4','col5','col6','col7','col8']
+        colours={coli[0] : "#009e73",
+                 coli[1] : "#0072b2",
+                 coli[2] : "#d55e00",
+                 coli[3] : "#f0e442",
+                 coli[4] : "#56b4e9",
+                 coli[5] : "#cc79a7",
+                 coli[6] : "#e69f00",
+                 coli[7] : "black"}
+        if assigned_colours:
+            for index, item in enumerate(assigned_colours):
+                if (item != None): colours[coli[index]]=item
+
+        replace_dict=colours
+        replace_dict['arg_string']=arg_string
+        replace_dict['output_base_name']=output_base_name
+
         # Write the gnuplot header
         gnuplot_output_list_v4 = [
 """
@@ -2173,7 +2192,7 @@
 # For more information, visit madgraph.phys.ucl.ac.be and amcatnlo.web.cern.ch
 #
 ################################################################################
-# %s
+# %(arg_string)s
 reset
 
 set lmargin 10
@@ -2183,60 +2202,60 @@
 #set terminal pdf enhanced font "Helvetica 12" lw 1.0 dashed size 29.7cm, 21cm
 set key font ",9"
 set key samplen "2"
-set output "%s.ps"
+set output "%(output_base_name)s.ps"
 
 # This is the "PODO" color palette of gnuplot v.5, but with the order
 # changed: palette of colors selected to be easily distinguishable by
 # color-blind individuals with either protanopia or deuteranopia. Bang
 # Wong [2011] Nature Methods 8, 441.
 
-set style line  1 lt 1 lc rgb "#009e73" lw 2.5
-set style line 11 lt 2 lc rgb "#009e73" lw 2.5
-set style line 21 lt 4 lc rgb "#009e73" lw 2.5
-set style line 31 lt 6 lc rgb "#009e73" lw 2.5
-set style line 41 lt 8 lc rgb "#009e73" lw 2.5
-
-set style line  2 lt 1 lc rgb "#0072b2" lw 2.5
-set style line 12 lt 2 lc rgb "#0072b2" lw 2.5
-set style line 22 lt 4 lc rgb "#0072b2" lw 2.5
-set style line 32 lt 6 lc rgb "#0072b2" lw 2.5
-set style line 42 lt 8 lc rgb "#0072b2" lw 2.5
-
-set style line  3 lt 1 lc rgb "#d55e00" lw 2.5
-set style line 13 lt 2 lc rgb "#d55e00" lw 2.5
-set style line 23 lt 4 lc rgb "#d55e00" lw 2.5
-set style line 33 lt 6 lc rgb "#d55e00" lw 2.5
-set style line 43 lt 8 lc rgb "#d55e00" lw 2.5
-
-set style line  4 lt 1 lc rgb "#f0e442" lw 2.5
-set style line 14 lt 2 lc rgb "#f0e442" lw 2.5
-set style line 24 lt 4 lc rgb "#f0e442" lw 2.5
-set style line 34 lt 6 lc rgb "#f0e442" lw 2.5
-set style line 44 lt 8 lc rgb "#f0e442" lw 2.5
-
-set style line  5 lt 1 lc rgb "#56b4e9" lw 2.5
-set style line 15 lt 2 lc rgb "#56b4e9" lw 2.5
-set style line 25 lt 4 lc rgb "#56b4e9" lw 2.5
-set style line 35 lt 6 lc rgb "#56b4e9" lw 2.5
-set style line 45 lt 8 lc rgb "#56b4e9" lw 2.5
-
-set style line  6 lt 1 lc rgb "#cc79a7" lw 2.5
-set style line 16 lt 2 lc rgb "#cc79a7" lw 2.5
-set style line 26 lt 4 lc rgb "#cc79a7" lw 2.5
-set style line 36 lt 6 lc rgb "#cc79a7" lw 2.5
-set style line 46 lt 8 lc rgb "#cc79a7" lw 2.5
-
-set style line  7 lt 1 lc rgb "#e69f00" lw 2.5
-set style line 17 lt 2 lc rgb "#e69f00" lw 2.5
-set style line 27 lt 4 lc rgb "#e69f00" lw 2.5
-set style line 37 lt 6 lc rgb "#e69f00" lw 2.5
-set style line 47 lt 8 lc rgb "#e69f00" lw 2.5
-
-set style line  8 lt 1 lc rgb "black" lw 2.5
-set style line 18 lt 2 lc rgb "black" lw 2.5
-set style line 28 lt 4 lc rgb "black" lw 2.5
-set style line 38 lt 6 lc rgb "black" lw 2.5
-set style line 48 lt 7 lc rgb "black" lw 2.5
+set style line  1 lt 1 lc rgb "%(col1)s" lw 2.5
+set style line 11 lt 2 lc rgb "%(col1)s" lw 2.5
+set style line 21 lt 4 lc rgb "%(col1)s" lw 2.5
+set style line 31 lt 6 lc rgb "%(col1)s" lw 2.5
+set style line 41 lt 8 lc rgb "%(col1)s" lw 2.5
+
+set style line  2 lt 1 lc rgb "%(col2)s" lw 2.5
+set style line 12 lt 2 lc rgb "%(col2)s" lw 2.5
+set style line 22 lt 4 lc rgb "%(col2)s" lw 2.5
+set style line 32 lt 6 lc rgb "%(col2)s" lw 2.5
+set style line 42 lt 8 lc rgb "%(col2)s" lw 2.5
+
+set style line  3 lt 1 lc rgb "%(col3)s" lw 2.5
+set style line 13 lt 2 lc rgb "%(col3)s" lw 2.5
+set style line 23 lt 4 lc rgb "%(col3)s" lw 2.5
+set style line 33 lt 6 lc rgb "%(col3)s" lw 2.5
+set style line 43 lt 8 lc rgb "%(col3)s" lw 2.5
+
+set style line  4 lt 1 lc rgb "%(col4)s" lw 2.5
+set style line 14 lt 2 lc rgb "%(col4)s" lw 2.5
+set style line 24 lt 4 lc rgb "%(col4)s" lw 2.5
+set style line 34 lt 6 lc rgb "%(col4)s" lw 2.5
+set style line 44 lt 8 lc rgb "%(col4)s" lw 2.5
+
+set style line  5 lt 1 lc rgb "%(col5)s" lw 2.5
+set style line 15 lt 2 lc rgb "%(col5)s" lw 2.5
+set style line 25 lt 4 lc rgb "%(col5)s" lw 2.5
+set style line 35 lt 6 lc rgb "%(col5)s" lw 2.5
+set style line 45 lt 8 lc rgb "%(col5)s" lw 2.5
+
+set style line  6 lt 1 lc rgb "%(col6)s" lw 2.5
+set style line 16 lt 2 lc rgb "%(col6)s" lw 2.5
+set style line 26 lt 4 lc rgb "%(col6)s" lw 2.5
+set style line 36 lt 6 lc rgb "%(col6)s" lw 2.5
+set style line 46 lt 8 lc rgb "%(col6)s" lw 2.5
+
+set style line  7 lt 1 lc rgb "%(col7)s" lw 2.5
+set style line 17 lt 2 lc rgb "%(col7)s" lw 2.5
+set style line 27 lt 4 lc rgb "%(col7)s" lw 2.5
+set style line 37 lt 6 lc rgb "%(col7)s" lw 2.5
+set style line 47 lt 8 lc rgb "%(col7)s" lw 2.5
+
+set style line  8 lt 1 lc rgb "%(col8)s" lw 2.5
+set style line 18 lt 2 lc rgb "%(col8)s" lw 2.5
+set style line 28 lt 4 lc rgb "%(col8)s" lw 2.5
+set style line 38 lt 6 lc rgb "%(col8)s" lw 2.5
+set style line 48 lt 7 lc rgb "%(col8)s" lw 2.5
 
 
 set style line 999 lt 1 lc rgb "gray" lw 2.5
@@ -2246,7 +2265,7 @@
 set style data histeps
 set key invert
 
-"""%(arg_string,output_base_name)
+"""%(replace_dict)
 ]
         
         gnuplot_output_list_v5 = [
@@ -2261,7 +2280,7 @@
 # For more information, visit madgraph.phys.ucl.ac.be and amcatnlo.web.cern.ch
 #
 ################################################################################
-# %s
+# %(arg_string)s
 reset
 
 set lmargin 10
@@ -2271,69 +2290,68 @@
 #set terminal pdf enhanced font "Helvetica 12" lw 1.0 dashed size 29.7cm, 21cm
 set key font ",9"
 set key samplen "2"
-set output "%s.ps"
+set output "%(output_base_name)s.ps"
 
 # This is the "PODO" color palette of gnuplot v.5, but with the order
 # changed: palette of colors selected to be easily distinguishable by
 # color-blind individuals with either protanopia or deuteranopia. Bang
 # Wong [2011] Nature Methods 8, 441.
 
-set style line  1 lt 1 lc rgb "#009e73" lw 1.3
-set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3)
-set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
-set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
-set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
-set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
-
-set style line  2 lt 1 lc rgb "#0072b2" lw 1.3
-set style line  102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
-set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
-set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
-set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
-set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
-
-
-set style line  3 lt 1 lc rgb "#d55e00" lw 1.3
-set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3)
-set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
-set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
-set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
-set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
-
-set style line  4 lt 1 lc rgb "#f0e442" lw 1.3
-set style line  104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
-set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
-set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
-set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
-set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
-
-set style line  5 lt 1 lc rgb "#56b4e9" lw 1.3
-set style line  105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
-set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
-set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
-set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
-set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
-
-set style line  6 lt 1 lc rgb "#cc79a7" lw 1.3
-set style line  106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
-set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
-set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
-set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
-set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
-
-set style line  7 lt 1 lc rgb "#e69f00" lw 1.3
-set style line  107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
-set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
-set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
-set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
-set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
-
-set style line  8 lt 1 lc rgb "black" lw 1.3
-set style line  108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
-set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
-set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
-set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
-set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
+set style line   1 lt 1 lc rgb "%(col1)s" lw 1.3
+set style line 101 lt 1 lc rgb "%(col1)s" lw 1.3 dt (6,3)
+set style line  11 lt 2 lc rgb "%(col1)s" lw 1.3 dt (6,3)
+set style line  21 lt 4 lc rgb "%(col1)s" lw 1.3 dt (3,2)
+set style line  31 lt 6 lc rgb "%(col1)s" lw 1.3 dt (2,1)
+set style line  41 lt 8 lc rgb "%(col1)s" lw 1.3 dt (4,3)
+
+set style line   2 lt 1 lc rgb "%(col2)s" lw 1.3
+set style line 102 lt 1 lc rgb "%(col2)s" lw 1.3 dt (6,3)
+set style line  12 lt 2 lc rgb "%(col2)s" lw 1.3 dt (6,3)
+set style line  22 lt 4 lc rgb "%(col2)s" lw 1.3 dt (3,2)
+set style line  32 lt 6 lc rgb "%(col2)s" lw 1.3 dt (2,1)
+set style line  42 lt 8 lc rgb "%(col2)s" lw 1.3 dt (4,3)
+
+set style line   3 lt 1 lc rgb "%(col3)s" lw 1.3
+set style line 103 lt 1 lc rgb "%(col3)s" lw 1.3 dt (6,3)
+set style line  13 lt 2 lc rgb "%(col3)s" lw 1.3 dt (6,3)
+set style line  23 lt 4 lc rgb "%(col3)s" lw 1.3 dt (3,2)
+set style line  33 lt 6 lc rgb "%(col3)s" lw 1.3 dt (2,1)
+set style line  43 lt 8 lc rgb "%(col3)s" lw 1.3 dt (4,3)
+
+set style line   4 lt 1 lc rgb "%(col4)s" lw 1.3
+set style line 104 lt 1 lc rgb "%(col4)s" lw 1.3 dt (6,3)
+set style line  14 lt 2 lc rgb "%(col4)s" lw 1.3 dt (6,3)
+set style line  24 lt 4 lc rgb "%(col4)s" lw 1.3 dt (3,2)
+set style line  34 lt 6 lc rgb "%(col4)s" lw 1.3 dt (2,1)
+set style line  44 lt 8 lc rgb "%(col4)s" lw 1.3 dt (4,3)
+
+set style line   5 lt 1 lc rgb "%(col5)s" lw 1.3
+set style line 105 lt 1 lc rgb "%(col5)s" lw 1.3 dt (6,3)
+set style line  15 lt 2 lc rgb "%(col5)s" lw 1.3 dt (6,3)
+set style line  25 lt 4 lc rgb "%(col5)s" lw 1.3 dt (3,2)
+set style line  35 lt 6 lc rgb "%(col5)s" lw 1.3 dt (2,1)
+set style line  45 lt 8 lc rgb "%(col5)s" lw 1.3 dt (4,3)
+
+set style line   6 lt 1 lc rgb "%(col6)s" lw 1.3
+set style line 106 lt 1 lc rgb "%(col6)s" lw 1.3 dt (6,3)
+set style line  16 lt 2 lc rgb "%(col6)s" lw 1.3 dt (6,3)
+set style line  26 lt 4 lc rgb "%(col6)s" lw 1.3 dt (3,2)
+set style line  36 lt 6 lc rgb "%(col6)s" lw 1.3 dt (2,1)
+set style line  46 lt 8 lc rgb "%(col6)s" lw 1.3 dt (4,3)
+
+set style line   7 lt 1 lc rgb "%(col7)s" lw 1.3
+set style line 107 lt 1 lc rgb "%(col7)s" lw 1.3 dt (6,3)
+set style line  17 lt 2 lc rgb "%(col7)s" lw 1.3 dt (6,3)
+set style line  27 lt 4 lc rgb "%(col7)s" lw 1.3 dt (3,2)
+set style line  37 lt 6 lc rgb "%(col7)s" lw 1.3 dt (2,1)
+set style line  47 lt 8 lc rgb "%(col7)s" lw 1.3 dt (4,3)
+
+set style line   8 lt 1 lc rgb "%(col8)s" lw 1.3
+set style line 108 lt 1 lc rgb "%(col8)s" lw 1.3 dt (6,3)
+set style line  18 lt 2 lc rgb "%(col8)s" lw 1.3 dt (6,3)
+set style line  28 lt 4 lc rgb "%(col8)s" lw 1.3 dt (3,2)
+set style line  38 lt 6 lc rgb "%(col8)s" lw 1.3 dt (2,1)
+set style line  48 lt 8 lc rgb "%(col8)s" lw 1.3 dt (4,3)
 
 
 set style line 999 lt 1 lc rgb "gray" lw 1.3
@@ -2343,7 +2361,7 @@
 set style data histeps
 set key invert
 
-"""%(arg_string,output_base_name)
+"""%(replace_dict)
 ]
         
         # determine the gnuplot version
@@ -3382,6 +3400,7 @@
            '--show_full'     to show the complete output of what was read.
            '--show_short'    to show a summary of what was read.
            '--simple_ratios' to turn off correlations and error propagation in the ratio.
+           '--colours=<colour1>,<colour2>,...' to assign a non-default colour to GnuPlot histograms (max 8 colours)
            '--sum'           To sum all identical histograms together
            '--average'       To average over all identical histograms
            '--rebin=<n>'     Rebin the plots by merging n-consecutive bins together.  
@@ -3420,7 +3439,7 @@
                       '--no_scale','--no_pdf','--no_stat','--no_merging','--no_alpsfact',
                       '--only_scale','--only_pdf','--only_stat','--only_merging','--only_alpsfact',
                       '--variations','--band','--central_only', '--lhapdf-config','--titles',
-                      '--keep_all_weights']
+                      '--keep_all_weights','--colours']
     n_ratios   = -1
     uncertainties = ['scale','pdf','statistical','merging_scale','alpsfact']
     # The list of type of uncertainties for which to use bands. None is a 'smart' default
@@ -3466,6 +3485,12 @@
             assigned_types = [(type if type!='None' else None) for type in \
                                                              arg[15:].split(',')]
 
+    assigned_colours = []
+    for arg in sys.argv[1:]:
+        if arg.startswith('--colours='):
+            assigned_colours = [(colour if colour!='None' else None) for colour in \
+                                                             arg[10:].split(',')]
+
     jet_samples_to_keep = None
     
     lhapdfconfig = ['lhapdf-config']
@@ -3623,7 +3648,8 @@
             jet_samples_to_keep=jet_samples_to_keep,
             use_band=use_band,
             auto_open=auto_open,
-            lhapdfconfig=lhapdfconfig)
+            lhapdfconfig=lhapdfconfig,
+            assigned_colours=assigned_colours)
         # Tell the user that everything went for the best
         log("%d histograms have been output in " % len(histo_list)+\
                 "the gnuplot format at '%s.[HwU|gnuplot]'." % OutName)

=== modified file 'madgraph/various/lhe_parser.py'
--- madgraph/various/lhe_parser.py	2018-10-23 20:08:08 +0000
+++ madgraph/various/lhe_parser.py	2019-06-27 13:48:48 +0000
@@ -976,13 +976,13 @@
             self.seek(0)
         else:
             # check special case without PDF for one (or both) beam
-            if init_information["idbmup1"] == 0:
+            if init_information["idbmup1"] in [0,9]:
                 event = self.next()
                 init_information["idbmup1"]= event[0].pdg
                 if init_information["idbmup2"] == 0:
                     init_information["idbmup2"]= event[1].pdg
                 self.seek(0)
-            if init_information["idbmup2"] == 0:
+            if init_information["idbmup2"] in [0,9]:
                 event = self.next()
                 init_information["idbmup2"] = event[1].pdg
                 self.seek(0)
@@ -1572,7 +1572,7 @@
             if old_scales:
                 self.matched_scale_data.append(old_scales[initial_pos+jet_position])
             # compute and assign the new four_momenta
-            new_momentum = this_4mom.boost(FourMomentum(new_particle))
+            new_momentum = FourMomentum(new_particle).boost(this_4mom)
             new_particle.set_momentum(new_momentum)
             # compute the new mother
             for tag in ['mother1', 'mother2']:
@@ -1726,6 +1726,25 @@
         
         return new_event
 
+    def boost(self, filter=None):
+        """modify the current event to boost it according to the current filter"""
+        if filter is None:
+            filter = lambda p: p.status==-1
+            
+        pboost = FourMomentum()
+        for p in self:
+            if filter(p):
+                pboost += p
+
+        # change sign of three-component due to helas convention
+        pboost.px *=-1
+        pboost.py *=-1
+        pboost.pz *=-1 
+        for p in self:
+            b= FourMomentum(p).boost(pboost)
+            p.E, p.px, p.py, p.pz = b.E, b.px, b.py, b.pz 
+        
+        return self
             
     def check(self):
         """check various property of the events"""
@@ -2493,18 +2512,20 @@
     def boost(self, mom):
         """mom 4-momenta is suppose to be given in the rest frame of this 4-momenta.
         the output is the 4-momenta in the frame of this 4-momenta
-        function copied from HELAS routine."""
+        function copied from HELAS routine.
+        if the current momenta is (E,\vec{p}), in order to go to the rest frame
+        of the current particle, mom should be (E, -\vec{p})
+        """
 
-        
-        pt = self.px**2 + self.py**2 + self.pz**2
-        if pt:
+        pnorm = mom.px**2 + mom.py**2 + mom.pz**2
+        if pnorm:
             s3product = self.px * mom.px + self.py * mom.py + self.pz * mom.pz
-            mass = self.mass
-            lf = (mom.E + (self.E - mass) * s3product / pt ) / mass
+            mass = mom.mass
+            lf = (self.E + (mom.E - mass) * s3product / pnorm ) / mass
             return FourMomentum(E=(self.E*mom.E+s3product)/mass,
-                           px=mom.px + self.px * lf,
-                           py=mom.py + self.py * lf,
-                           pz=mom.pz + self.pz * lf)
+                           px=self.px + mom.px * lf,
+                           py=self.py + mom.py * lf,
+                           pz=self.pz + mom.pz * lf)
         else:
             return FourMomentum(mom)
 

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2018-06-01 13:06:03 +0000
+++ madgraph/various/misc.py	2019-06-27 13:48:48 +0000
@@ -121,11 +121,16 @@
 
     if info_str:
         info_dict = parse_info_str(StringIO.StringIO(info_str))
+        return info_dict
 
+    if PACKAGE_INFO:
+        return PACKAGE_INFO
+    
     elif MADEVENT:
         info_dict ={}
         info_dict['version'] = open(pjoin(internal.__path__[0],'..','..','MGMEVersion.txt')).read().strip()
-        info_dict['date'] = '20xx-xx-xx'                        
+        info_dict['date'] = '20xx-xx-xx'
+        PACKAGE_INFO = info_dict                        
     else:
         if PACKAGE_INFO:
             return PACKAGE_INFO
@@ -867,10 +872,10 @@
                 return f(arg, *args, **opt)
             except OSError, error:
                 logger.debug('try to recover from %s' % error)
-                if isinstance(arg, list):
+                if isinstance(arg, (list,tuple)):
                     prog =  arg[0]
                 else:
-                    prog = arg[0]
+                    prog = arg
                 
                 # Permission denied
                 if error.errno == 13:     
@@ -1704,10 +1709,49 @@
                    "May the mass times acceleration be with you.",
                    "NOTE: This product may actually be nine-dimensional. If this is the case, functionality is not affected by the extra five dimensions.",
                    "IMPORTANT: This product is composed of 100%% matter: It is the responsibility of the User to make sure that it does not come in contact with antimatter.",
+                   "",
                    'The fish are out of jokes. See you next year for more!'],
-         'loading': ['Hi %(user)s, You are Loading Madgraph. Please be patient, we are doing the work.'],
-         'quit': ['Thanks %(user)s for using MadGraph5_aMC@NLO, even on April 1st!']
+#         'loading': ['Hi %(user)s, You are Loading Madgraph. Please be patient, we are doing the work.'],
+#         'quit': ['Thanks %(user)s for using MadGraph5_aMC@NLO, even on April 1st!']
                }
+
+    default_banner_1 =  "************************************************************\n" + \
+        "*                                                          *\n" + \
+        "*                     W E L C O M E to                     *\n" + \
+        "*              M A D G R A P H 5 _ a M C @ N L O           *\n" + \
+        "*                                                          *\n" + \
+        "*                                                          *\n" 
+
+
+    default_banner_2 =        "*                                                          *\n" + \
+        "%s" + \
+        "*                                                          *\n" + \
+        "*    The MadGraph5_aMC@NLO Development Team - Find us at   *\n" + \
+        "*    https://server06.fynu.ucl.ac.be/projects/madgraph     *\n" + \
+        "*                            and                           *\n" + \
+        "*            http://amcatnlo.web.cern.ch/amcatnlo/         *\n" + \
+        "*                                                          *\n" + \
+        "*               Type 'help' for in-line help.              *\n" + \
+        "*           Type 'tutorial' to learn how MG5 works         *\n" + \
+        "*    Type 'tutorial aMCatNLO' to learn how aMC@NLO works   *\n" + \
+        "*    Type 'tutorial MadLoop' to learn how MadLoop works    *\n" + \
+        "*                                                          *\n" + \
+        "************************************************************"
+
+    May4_banner = "*                           _____                          *\n" + \
+        "*                       ,-~\"     \"~-.                      *\n" + \
+        "*        *            ,^ ___         ^.             *      *\n" + \
+        "*          *         / .^   ^.         \         *         *\n" + \
+        "*            *      Y  l  o  !          Y      *           *\n" + \
+        "*              *   l_  `.___.'         _,[   *             *\n" + \
+        "*                * |^~\"--------------~\"\"^| *               *\n" + \
+        "*              *   !     May the 4th     !   *             *\n" + \
+        "*            *       \                 /       *           *\n" + \
+        "*          *          ^.             .^          *         *\n" + \
+        "*        *              \"-.._____.,-\"              *       *\n"
+
+    special_banner = {(4,5): May4_banner}
+
     
     def __init__(self, msgtype):
 
@@ -1726,6 +1770,9 @@
                         msg = choices[random.randint(0,len(choices)-2)]
                     EasterEgg.message_aprilfirst[msgtype].remove(msg)
                     
+            elif msgtype=='loading' and date in self.special_banner:
+                self.change_banner(date)
+                return
             else:
                 return
             if MADEVENT:
@@ -1749,6 +1796,13 @@
         except:
             pass
             
+    def change_banner(self, date):
+        if MADEVENT:
+            return
+        import madgraph.interface.madgraph_interface as madgraph_interface
+        madgraph_interface.CmdExtended.intro_banner= self.default_banner_1 + self.special_banner[date] + self.default_banner_2
+        
+
     def call_apple(self, msg):
         
         #1. control if the volume is on or not
@@ -1790,17 +1844,6 @@
         os.system(fishCmd)
 
 
-if __debug__:
-    try:
-        import os 
-        import pwd
-        username =pwd.getpwuid( os.getuid() )[ 0 ]
-        if 'hirschi' in username or 'vryonidou' in username and __debug__:
-            EasterEgg('loading')
-    except:
-        pass
-
-
 def get_older_version(v1, v2):
     """ return v2  if v1>v2
         return v1 if v1<v2

=== modified file 'madgraph/various/shower_card.py'
--- madgraph/various/shower_card.py	2016-02-18 16:59:22 +0000
+++ madgraph/various/shower_card.py	2019-06-27 13:48:48 +0000
@@ -18,7 +18,17 @@
 import re
 import os
 import logging
-
+try:
+    import madgraph
+except ImportError:
+    import internal.misc as misc
+    import internal.banner as banner
+    from internal import InvalidCmd
+else:
+    import madgraph.various.misc as misc
+    import madgraph.various.banner as banner
+    from madgraph import InvalidCmd
+    
 logger = logging.getLogger('madgraph.shower_card') 
 
 pjoin = os.path.join
@@ -92,20 +102,20 @@
         lines = content.split('\n')
         list_dm = []
         for l in lines:
-          if '#' in l:
-             l = l.split('#',1)[0]
-          if '=' not in l:
-             continue
-          args = l.split('=',1) # here the 1 is important in case of string passed
-          key = args[0].strip().lower()
-          value = args[1].strip()
-          self.set_param(key, value)
-          if str(key).upper().startswith('DM'):
-              list_dm.append(int(key.split('_',1)[1]))
-          #special case for DM_*
-          for i in range(1,100):
-              if not i in list_dm: 
-                  self['dm_'+str(i)] = ''
+            if '#' in l:
+                l = l.split('#',1)[0]
+            if '=' not in l:
+                continue
+            args = l.split('=',1) # here the 1 is important in case of string passed
+            key = args[0].strip().lower()
+            value = args[1].strip()
+            self.set_param(key, value)
+            if str(key).upper().startswith('DM'):
+                list_dm.append(int(key.split('_',1)[1]))
+            #special case for DM_*
+            for i in range(1,100):
+                if not i in list_dm: 
+                    self['dm_'+str(i)] = ''
 
         self.text=content
 
@@ -116,14 +126,12 @@
         if not testing write_to is an input path, if testing the text is
         returned by the function
         """
+        
         if key in self.logical_vars:
-            if str(value).lower() in self.true:
-                self[key] = True
-            elif str(value).lower() in self.false:
-                self[key] = False
-            else:
-                raise ShowerCardError('%s is not a valid value for %s' % \
-                        (value, key))
+            try:
+                self[key] = banner.ConfigFile.format_variable(value, bool, key)
+            except InvalidCmd, error:
+                raise ShowerCardError(str(error))
         elif key in self.string_vars:
             if value.lower() == 'none':
                 self[key] = ''
@@ -131,16 +139,14 @@
                 self[key] = value
         elif key in self.int_vars:
             try:
-                self[key] = int(value)
-            except ValueError:
-                raise ShowerCardError('%s is not a valid value for %s. An integer number is expected' % \
-                        (value, key))
+                self[key] = banner.ConfigFile.format_variable(value, int, key)
+            except InvalidCmd, error:
+                raise ShowerCardError(str(error))
         elif key in self.float_vars:
             try:
-                self[key] = float(value)
-            except ValueError:
-                raise ShowerCardError('%s is not a valid value for %s. A floating point number is expected' % \
-                        (value, key))
+                self[key] =  banner.ConfigFile.format_variable(value, float, key)
+            except InvalidCmd, error:
+                raise ShowerCardError(str(error))
         else:
             raise ShowerCardError('Unknown entry: %s = %s' % (key, value))
         self.keylist.append(key)
@@ -160,7 +166,8 @@
                     if key not in self.logical_vars:
                         newlines.append('%s = %s #%s' % (key, value, comment))
                     else:
-                        if key:
+
+                        if self[key]:
                             newlines.append('%s = %s #%s' % (key, 'T', comment))
                         else:
                             newlines.append('%s = %s #%s' % (key, 'F', comment))

=== modified file 'models/check_param_card.py'
--- models/check_param_card.py	2018-10-19 08:27:34 +0000
+++ models/check_param_card.py	2019-06-27 13:48:48 +0000
@@ -93,6 +93,9 @@
             data, self.comment = text.split('#',1)
         else:
             data, self.comment = text, ""
+            
+        if ']]>' in data:
+            data = data.split(']]>',1)[0]
 
 
         data = data.split()

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2019-01-30 19:32:17 +0000
+++ models/import_ufo.py	2019-06-27 13:48:48 +0000
@@ -422,7 +422,7 @@
     model.set('version_tag', os.path.realpath(path) +'##'+ str(misc.get_pkg_info()))
     
     # save in a pickle files to fasten future usage
-    if ReadWrite:
+    if ReadWrite and model['allow_pickle']:
         save_load_object.save_to_file(os.path.join(model_path, pickle_name),
                                    model, log=False)
 
@@ -444,6 +444,8 @@
        
         self.particles = base_objects.ParticleList()
         self.interactions = base_objects.InteractionList()
+        self.non_qcd_gluon_emission = 0 # vertex where a gluon is emitted withou QCD interaction
+                                  # only trigger if all particles are of QCD type (not h>gg)
         self.wavefunction_CT_couplings = []
  
         # Check here if we can extract the couplings perturbed in this model
@@ -545,6 +547,14 @@
         for interaction_info in self.ufomodel.all_vertices:
             self.add_interaction(interaction_info, color_info)
 
+        if self.non_qcd_gluon_emission:
+            logger.critical("Model with non QCD emission of gluon (found %i of those).\n  This type of model is not fully supported within MG5aMC.\n"+\
+            "  Restriction on LO dynamical scale and MLM matching/merging can occur for some processes.\n"+\
+            "  Use such features with care.", self.non_qcd_gluon_emission)
+
+            self.model['allow_pickle'] = False 
+            self.model['limitations'].append('MLM')
+            
         if self.perturbation_couplings:
             try:
                 self.ufomodel.add_NLO()
@@ -1294,6 +1304,7 @@
                                              helas.name, helas.structure, error)
             raise InvalidModel, text
         
+     
         
         
         # Now consider the name only
@@ -1319,10 +1330,18 @@
                 coupling_sign = ''            
             for coupling in couplings:
                 order = tuple(coupling.order.items())
-                if '1' in order:
+
+                if '1' in coupling.order:
                     raise InvalidModel, '''Some couplings have \'1\' order. 
                     This is not allowed in MG. 
                     Please defines an additional coupling to your model''' 
+                # check that gluon emission from quark are QCD tagged
+                if 21 in [particle.pdg_code for particle in interaction_info.particles] and\
+                    'QCD' not in  coupling.order:
+                    col = [par.get('color') for par in particles]
+                    if 1 not in col:
+                        self.non_qcd_gluon_emission +=1
+       
                 if order in order_to_int:
                     order_to_int[order].get('couplings')[key] = '%s%s' % \
                                                (coupling_sign,coupling.name)
@@ -1340,7 +1359,8 @@
                     order_to_int[order] = interaction                        
                     # add to the interactions
                     self.interactions.append(interaction)
-        
+
+            
         # check if this interaction conserve the charge defined
  #       if type=='base':
         for charge in list(self.conservecharge): #duplicate to allow modification
@@ -1353,7 +1373,7 @@
             if abs(total) > 1e-12:
                 logger.info('The model has interaction violating the charge: %s' % charge)
                 self.conservecharge.discard(charge)
-        
+
         
         
     def get_sign_flow(self, flow, nb_fermion):
@@ -1940,6 +1960,7 @@
                 logger.debug('coupling with small value %s: %s treated as zero' %
                              (name, value))
                 zero_coupling.append(name)
+                continue
             elif not strict_zero and abs(value) < 1e-10:
                 return self.detect_identical_couplings(strict_zero=True)
 
@@ -2234,8 +2255,10 @@
             else:
                 arg = 'width'
             change_name = [p.name for (p,f) in parameters[1:]]
+            factor_for_name = [f for (p,f)  in parameters[1:]]
             [p.set(arg, new_name) for p in self['particle_dict'].values() 
-                                                       if p[arg] in change_name]
+                                                       if p[arg] in change_name and 
+                                                       factor_for_name[change_name.index(p[arg])]==1]
             
     def remove_interactions(self, zero_couplings):
         """ remove the interactions and particle counterterms 

=== modified file 'models/write_param_card.py'
--- models/write_param_card.py	2018-12-05 10:22:23 +0000
+++ models/write_param_card.py	2019-06-27 13:48:48 +0000
@@ -242,6 +242,7 @@
 
         if lhablock == 'MASS':
             data = self.dep_mass
+            #misc.sprint(data)
             prefix = " "
         elif lhablock == 'DECAY':
             data = self.dep_width
@@ -266,7 +267,7 @@
             if self.model['parameter_dict'][param.name].imag:
                 raise ParamCardWriterError, 'All Mass/Width Parameter should be real (not the case for %s)'%param.name
             value = complex(self.model['parameter_dict'][param.name]).real
-            text += """%s %s %f # %s : %s \n""" %(prefix, part["pdg_code"], 
+            text += """%s %s %e # %s : %s \n""" %(prefix, part["pdg_code"], 
                         value, part["name"], param.expr.replace('mdl_',''))  
         
         # Add duplicate parameter
@@ -281,9 +282,9 @@
             if self.model['parameter_dict'][param.name].imag:
                 raise ParamCardWriterError, 'All Mass/Width Parameter should be real'
             value = complex(self.model['parameter_dict'][param.name]).real
-            text += """%s %s %f # %s : %s \n""" %(prefix, part["pdg_code"], 
+            text += """%s %s %e # %s : %s \n""" %(prefix, part["pdg_code"], 
                         value, part["name"], part[name].replace('mdl_',''))
-            
+
         if not text:
             return
          

=== modified file 'tests/acceptance_tests/test_cmd.py'
--- tests/acceptance_tests/test_cmd.py	2018-03-09 15:38:21 +0000
+++ tests/acceptance_tests/test_cmd.py	2019-06-27 13:48:48 +0000
@@ -1089,12 +1089,12 @@
                                                'lib', 'libpdf.a')))
         # Check that combine_events, gen_ximprove, combine_runs 
         # compile
-        status = subprocess.call(['make', '../bin/internal/combine_events'],
-                                 stdout=devnull, 
-                                 cwd=os.path.join(self.out_dir, 'Source'))
-        self.assertEqual(status, 0)
-        self.assertTrue(os.path.exists(os.path.join(self.out_dir,
-                                               'bin','internal', 'combine_events')))
+        #status = subprocess.call(['make', '../bin/internal/combine_events'],
+        #                         stdout=devnull, 
+        #                         cwd=os.path.join(self.out_dir, 'Source'))
+        #self.assertEqual(status, 0)
+        #self.assertTrue(os.path.exists(os.path.join(self.out_dir,
+        #                                       'bin','internal', 'combine_events')))
         status = subprocess.call(['make', '../bin/internal/gen_ximprove'],
                                  stdout=devnull, 
                                  cwd=os.path.join(self.out_dir, 'Source'))

=== 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	2018-11-08 22:24:49 +0000
+++ tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f	2019-06-27 13:48:48 +0000
@@ -152,8 +152,8 @@
           JHEL = 1
           IF(NTRY.LE.MAXTRIES)THEN
             DO I=1,NCOMB
-              IF (.NOT.GOODHEL(I) .AND. (TS(I).GT.ANS*LIMHEL/NCOMB))
-     $          THEN
+              IF (.NOT.GOODHEL(I) .AND. (DABS(TS(I)).GT.ANS*LIMHEL
+     $         /NCOMB)) THEN
                 GOODHEL(I)=.TRUE.
                 NGOOD = NGOOD +1
                 IGOOD(NGOOD) = I

=== modified file 'tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/CKKWL_djrs_output.gnuplot'
--- tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/CKKWL_djrs_output.gnuplot	2016-08-23 02:41:28 +0000
+++ tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/CKKWL_djrs_output.gnuplot	2019-06-27 13:48:48 +0000
@@ -26,62 +26,61 @@
 # color-blind individuals with either protanopia or deuteranopia. Bang
 # Wong [2011] Nature Methods 8, 441.
 
-set style line  1 lt 1 lc rgb "#009e73" lw 1.3
+set style line   1 lt 1 lc rgb "#009e73" lw 1.3
 set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3)
-set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
-set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
-set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
-set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
-
-set style line  2 lt 1 lc rgb "#0072b2" lw 1.3
-set style line  102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
-set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
-set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
-set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
-set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
-
-
-set style line  3 lt 1 lc rgb "#d55e00" lw 1.3
+set style line  11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
+set style line  21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
+set style line  31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
+set style line  41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
+
+set style line   2 lt 1 lc rgb "#0072b2" lw 1.3
+set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
+set style line  12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
+set style line  22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
+set style line  32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
+set style line  42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
+
+set style line   3 lt 1 lc rgb "#d55e00" lw 1.3
 set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3)
-set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
-set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
-set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
-set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
-
-set style line  4 lt 1 lc rgb "#f0e442" lw 1.3
-set style line  104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
-set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
-set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
-set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
-set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
-
-set style line  5 lt 1 lc rgb "#56b4e9" lw 1.3
-set style line  105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
-set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
-set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
-set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
-set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
-
-set style line  6 lt 1 lc rgb "#cc79a7" lw 1.3
-set style line  106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
-set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
-set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
-set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
-set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
-
-set style line  7 lt 1 lc rgb "#e69f00" lw 1.3
-set style line  107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
-set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
-set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
-set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
-set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
-
-set style line  8 lt 1 lc rgb "black" lw 1.3
-set style line  108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
-set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
-set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
-set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
-set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
+set style line  13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
+set style line  23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
+set style line  33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
+set style line  43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
+
+set style line   4 lt 1 lc rgb "#f0e442" lw 1.3
+set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
+set style line  14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
+set style line  24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
+set style line  34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
+set style line  44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
+
+set style line   5 lt 1 lc rgb "#56b4e9" lw 1.3
+set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
+set style line  15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
+set style line  25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
+set style line  35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
+set style line  45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
+
+set style line   6 lt 1 lc rgb "#cc79a7" lw 1.3
+set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
+set style line  16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
+set style line  26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
+set style line  36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
+set style line  46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
+
+set style line   7 lt 1 lc rgb "#e69f00" lw 1.3
+set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
+set style line  17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
+set style line  27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
+set style line  37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
+set style line  47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
+
+set style line   8 lt 1 lc rgb "black" lw 1.3
+set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
+set style line  18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
+set style line  28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
+set style line  38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
+set style line  48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
 
 
 set style line 999 lt 1 lc rgb "gray" lw 1.3

=== modified file 'tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/MLM_djrs_output.gnuplot'
--- tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/MLM_djrs_output.gnuplot	2016-08-23 02:41:28 +0000
+++ tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/MLM_djrs_output.gnuplot	2019-06-27 13:48:48 +0000
@@ -26,62 +26,61 @@
 # color-blind individuals with either protanopia or deuteranopia. Bang
 # Wong [2011] Nature Methods 8, 441.
 
-set style line  1 lt 1 lc rgb "#009e73" lw 1.3
+set style line   1 lt 1 lc rgb "#009e73" lw 1.3
 set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3)
-set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
-set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
-set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
-set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
-
-set style line  2 lt 1 lc rgb "#0072b2" lw 1.3
-set style line  102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
-set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
-set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
-set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
-set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
-
-
-set style line  3 lt 1 lc rgb "#d55e00" lw 1.3
+set style line  11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
+set style line  21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
+set style line  31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
+set style line  41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
+
+set style line   2 lt 1 lc rgb "#0072b2" lw 1.3
+set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
+set style line  12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
+set style line  22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
+set style line  32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
+set style line  42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
+
+set style line   3 lt 1 lc rgb "#d55e00" lw 1.3
 set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3)
-set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
-set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
-set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
-set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
-
-set style line  4 lt 1 lc rgb "#f0e442" lw 1.3
-set style line  104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
-set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
-set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
-set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
-set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
-
-set style line  5 lt 1 lc rgb "#56b4e9" lw 1.3
-set style line  105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
-set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
-set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
-set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
-set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
-
-set style line  6 lt 1 lc rgb "#cc79a7" lw 1.3
-set style line  106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
-set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
-set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
-set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
-set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
-
-set style line  7 lt 1 lc rgb "#e69f00" lw 1.3
-set style line  107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
-set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
-set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
-set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
-set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
-
-set style line  8 lt 1 lc rgb "black" lw 1.3
-set style line  108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
-set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
-set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
-set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
-set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
+set style line  13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
+set style line  23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
+set style line  33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
+set style line  43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
+
+set style line   4 lt 1 lc rgb "#f0e442" lw 1.3
+set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
+set style line  14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
+set style line  24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
+set style line  34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
+set style line  44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
+
+set style line   5 lt 1 lc rgb "#56b4e9" lw 1.3
+set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
+set style line  15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
+set style line  25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
+set style line  35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
+set style line  45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
+
+set style line   6 lt 1 lc rgb "#cc79a7" lw 1.3
+set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
+set style line  16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
+set style line  26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
+set style line  36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
+set style line  46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
+
+set style line   7 lt 1 lc rgb "#e69f00" lw 1.3
+set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
+set style line  17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
+set style line  27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
+set style line  37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
+set style line  47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
+
+set style line   8 lt 1 lc rgb "black" lw 1.3
+set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
+set style line  18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
+set style line  28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
+set style line  38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
+set style line  48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
 
 
 set style line 999 lt 1 lc rgb "gray" lw 1.3

=== modified file 'tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.gnuplot'
--- tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.gnuplot	2016-06-09 00:59:23 +0000
+++ tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.gnuplot	2019-06-27 13:48:48 +0000
@@ -26,62 +26,61 @@
 # color-blind individuals with either protanopia or deuteranopia. Bang
 # Wong [2011] Nature Methods 8, 441.
 
-set style line  1 lt 1 lc rgb "#009e73" lw 1.3
+set style line   1 lt 1 lc rgb "#009e73" lw 1.3
 set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3)
-set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
-set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
-set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
-set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
-
-set style line  2 lt 1 lc rgb "#0072b2" lw 1.3
-set style line  102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
-set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
-set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
-set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
-set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
-
-
-set style line  3 lt 1 lc rgb "#d55e00" lw 1.3
+set style line  11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
+set style line  21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
+set style line  31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
+set style line  41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
+
+set style line   2 lt 1 lc rgb "#0072b2" lw 1.3
+set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
+set style line  12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
+set style line  22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
+set style line  32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
+set style line  42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
+
+set style line   3 lt 1 lc rgb "#d55e00" lw 1.3
 set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3)
-set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
-set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
-set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
-set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
-
-set style line  4 lt 1 lc rgb "#f0e442" lw 1.3
-set style line  104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
-set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
-set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
-set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
-set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
-
-set style line  5 lt 1 lc rgb "#56b4e9" lw 1.3
-set style line  105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
-set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
-set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
-set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
-set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
-
-set style line  6 lt 1 lc rgb "#cc79a7" lw 1.3
-set style line  106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
-set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
-set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
-set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
-set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
-
-set style line  7 lt 1 lc rgb "#e69f00" lw 1.3
-set style line  107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
-set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
-set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
-set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
-set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
-
-set style line  8 lt 1 lc rgb "black" lw 1.3
-set style line  108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
-set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
-set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
-set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
-set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
+set style line  13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
+set style line  23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
+set style line  33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
+set style line  43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
+
+set style line   4 lt 1 lc rgb "#f0e442" lw 1.3
+set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
+set style line  14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
+set style line  24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
+set style line  34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
+set style line  44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
+
+set style line   5 lt 1 lc rgb "#56b4e9" lw 1.3
+set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
+set style line  15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
+set style line  25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
+set style line  35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
+set style line  45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
+
+set style line   6 lt 1 lc rgb "#cc79a7" lw 1.3
+set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
+set style line  16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
+set style line  26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
+set style line  36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
+set style line  46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
+
+set style line   7 lt 1 lc rgb "#e69f00" lw 1.3
+set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
+set style line  17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
+set style line  27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
+set style line  37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
+set style line  47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
+
+set style line   8 lt 1 lc rgb "black" lw 1.3
+set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
+set style line  18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
+set style line  28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
+set style line  38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
+set style line  48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
 
 
 set style line 999 lt 1 lc rgb "gray" lw 1.3

=== modified file 'tests/time_db'
--- tests/time_db	2018-11-09 20:46:26 +0000
+++ tests/time_db	2019-06-27 13:48:48 +0000
@@ -1,5 +1,5 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasDiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000161170959473
-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_madweight_card>]> 0.015398979187
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_add>]> 0.0435810089111
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_remove_line>]> 8.89301300049e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_get_length>]> 0.000235080718994
@@ -45,16 +45,17 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_gg_ng>]> 1.61963582039
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sm>]> 6.53617286682
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_put_parameters_to_zero>]> 0.0871658325195
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000128984451294
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_InvalidCmd>]> 0.300333976746
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order3>]> 0.0537929534912
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_python>]> 0.000648021697998
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_generate>]> 0.143531084061
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_float_handling>]> 0.000519990921021
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOTestMadLoopSquaredOrdersExport testMethod=testIO_ProcOutputIOTests>]> 5.7862739563
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_part_antipart_after_output>]> 0.00266885757446
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_four_fermion_vertex_normal_fermion_flow>]> 0.0366899967194
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_epem_elpelmepem>]> 0.0915629863739
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFVC>]> 0.0635468959808
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_identify_particle>]> 0.0015971660614
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_group_channels2amplitudes>]> 0.346367835999
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_wmdxu>]> 27.2295429707
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_file_writers.FortranWriterTest testMethod=test_write_fortran_error>]> 0.000140190124512
@@ -65,7 +66,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_decay_chain_pp_jj>]> 0.284907102585
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_particle>]> 0.000303030014038
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.00014591217041
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_matrix_element_fks_EW>]> 4.6968460083e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_e_e_collision>]> 36.1715919971
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_f_d_product>]> 0.00230002403259
@@ -136,6 +136,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_emep_emep>]> 0.00920605659485
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_decay_chains>]> 0.378351926804
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_flow_string>]> 0.00816702842712
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_particle_list>]> 0.000241994857788
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_part_spin32propagator>]> 0.0205278396606
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.TestMadWeight testMethod=test_mw_wproduction>]> 11.4712297916
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_decayBW_file_EW>]> 0.00243401527405
@@ -166,14 +167,12 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_replace_indices>]> 0.000101089477539
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestImportUFO testMethod=test_simple_import>]> 0.130714893341
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_jet_veto_xsec>]> 49.1917068958
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_Plorentz>]> 0.0777571201324
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.ProcCardV4ReaderTest testMethod=test_check_init>]> 0.0175278186798
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_uu_to_tt_sch>]> 0.152179956436
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrapped>]> 0.00549483299255
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization5>]> 0.000308036804199
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_get_final_state_particle>]> 0.134166002274
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_ggd>]> 0.405319929123
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=test_obj_are_not_modified>]> 0.000224113464355
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain_and_fermion_flow>]> 0.0173728466034
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain>]> 0.0154418945312
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_vertex_at_level>]> 0.00156879425049
@@ -186,7 +185,6 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator5>]> 0.16034078598
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massivecase>]> 0.000519037246704
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_lh_order>]> 0.000610113143921
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testEpsilonProperty>]> 0.054888010025
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_gd>]> 2.84897994995
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_representation>]> 0.389190196991
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_generate_events_shower_scripts>]> 85.5048270226
@@ -198,10 +196,10 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_ttx_wpwm_QED>]> 0.00127792358398
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_color_string_canonical>]> 0.000113010406494
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_str>]> 6.41345977783e-05
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_histograms.IOHistogramTest testMethod=testIO_DJR_histograms>]> 6.34016513824
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_find_optimal_order>]> 0.190226793289
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_setget_multi_leg_correct>]> 6.60419464111e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_creating_matched_plot>]> 59.4369688034
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_fortran>]> 0.0229299068451
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_full_sm_aloha>]> 1.30430817604
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_use_as_benchmark>]> 0.165615081787
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_add>]> 0.199738025665
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_httx>]> 33.0537629128
@@ -221,10 +219,11 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pmass_file_EW>]> 0.000478029251099
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_projector>]> 0.00798106193542
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_fortranwriter_C>]> 0.0338780879974
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_multiprocess>]> 0.708781957626
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_ij_lines_EW>]> 0.0349681377411
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_props_file_born>]> 0.00461411476135
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_F77writer_complex_mass_scheme>]> 0.0230450630188
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_initial_setups>]> 0.125522851944
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_maxconfigs>]> 0.00495791435242
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_fortran>]> 0.0229299068451
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_max_WEIGHTED>]> 0.000354051589966
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_orders>]> 0.0471241474152
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_6_e90>]> 96.6206810474
@@ -236,10 +235,11 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_read_param_card>]> 2.07473993301
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testGammaAlgebraDefinition>]> 1.02981591225
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_orders>]> 0.00100803375244
-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestExtendedCmd testMethod=test_the_exit_from_child_cmd2>]> 0.000120162963867
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_cross_gauge>]> 115.8441329
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_identical_parameters>]> 0.0867898464203
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testequality>]> 0.000180006027222
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_process_overall_orders>]> 0.876585006714
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_begin_end_wrong_input>]> 0.000144958496094
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_full_write>]> 0.0754480361938
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_sm_equivalence>]> 0.110821008682
@@ -248,7 +248,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization3>]> 0.000184774398804
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_sort_fks_proc>]> 0.163259029388
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures>]> 0.016254901886
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_F77writer_complex_mass_scheme>]> 0.0230450630188
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_props_file_born>]> 0.00461411476135
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_pythia8_export_functions>]> 0.0397579669952
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_leg_list>]> 0.000253915786743
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_IR>]> 0.0010769367218
@@ -258,9 +258,11 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order1>]> 0.0381689071655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_8fs>]> 0.104753017426
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_colorize_uux_ggg>]> 0.0345070362091
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_maxconfigs>]> 0.00495791435242
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_matrix_element_v4_standalone>]> 0.0386159420013
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter>]> 0.0264060497284
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_complete_decay_chain_process>]> 0.748803853989
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 85.3567028046
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_horizontal_mode>]> 0.00118708610535
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm_nobmass>]> 0.0748410224915
@@ -278,9 +280,9 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.Testmadweight testMethod=test_tt_semi>]> 8.710709095
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000133991241455
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_external_parameters>]> 0.000850200653076
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct_MP>]> 0.0654561519623
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_ddx_uux>]> 1.11160707474
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gg_wpwmttx>]> 1.00893592834
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_values_for_prop>]> 0.000379085540771
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_param_card>]> 0.0154800415039
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testmassisdiffaswidth>]> 0.000320911407471
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_shell_string>]> 0.000377893447876
@@ -318,8 +320,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_expand_veto>]> 0.00188112258911
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_dec_multiprocess_files>]> 0.481742143631
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcatnlo_from_file>]> 71.3001720905
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETag testMethod=test_identify_me_tag_qq_qqg>]> 0.144216060638
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization>]> 0.000678062438965
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_process_overall_orders>]> 0.876585006714
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_identical_parameters>]> 0.0875990390778
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_phi4_vertex>]> 0.000259876251221
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_dictionaries>]> 0.000564098358154
@@ -336,17 +339,16 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_parity_for_epsilon>]> 0.000375032424927
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_wrapper_EW>]> 0.0362520217896
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_fermion_flow_clash>]> 0.034786939621
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_cross_gauge>]> 115.8441329
+<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestExtendedCmd testMethod=test_the_exit_from_child_cmd2>]> 0.000120162963867
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Cppwriter_C>]> 0.034628868103
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 93.4157910347
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000109910964966
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_info_file_EW>]> 0.0766789913177
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testConjugateOperator>]> 0.0886290073395
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.000133991241455
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_multiprocess>]> 0.708781957626
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000128984451294
+<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_madweight_card>]> 0.015398979187
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_decay_chain>]> 8.23388409615
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uxu_zz_QCD>]> 0.00123119354248
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_complex_equality>]> 0.453453063965
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_FFVC>]> 0.0554978847504
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setget_channel>]> 0.227739095688
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6_analyse>]> 0.000179052352905
@@ -363,7 +365,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_getsetvertexlist_exceptions>]> 0.110853910446
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_generate_events_nlo_py6pt_fsr>]> 40.1788899899
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_make_valid>]> 0.00246596336365
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFV2C1>]> 0.00976991653442
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp_output_consistency>]> 16.2466862202
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_uuxa_QCD_QED>]> 0.00129103660583
@@ -373,7 +374,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.TestDiagramTag testMethod=test_diagram_tag_to_diagram_uux_nglue>]> 0.129276990891
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_jet_veto_xsec>]> 61.7360379696
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_epem_aaa>]> 0.317636966705
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_0>]> 0.000486850738525
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_change_number_format_python>]> 0.000586986541748
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.HelasModelTest testMethod=test_set_wavefunctions>]> 0.00166797637939
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T6_simplify>]> 0.00021505355835
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=test_short_obj_are_not_modified>]> 0.000195980072021
@@ -383,9 +384,11 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_config_iadd>]> 9.70363616943e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasintersection>]> 0.00135803222656
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hhh_EW>]> 179.770503998
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_load_feynman>]> 0.416143894196
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_handling_list_of_values>]> 0.000817060470581
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_check_eejjj_lo_lhapdf>]> 63.6095659733
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000134944915771
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_4_e500>]> 21.2130401134
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_model_name>]> 0.19921207428
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000181913375854
@@ -406,7 +409,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_findchannels>]> 8.38987207413
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummulvar>]> 0.000131845474243
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_singletop_fastjet>]> 140.989368916
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt_with_subprocess_group>]> 0.0958831310272
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection_failure>]> 0.000155925750732
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_mssm_subset_creation>]> 0.190835952759
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_process>]> 1.05374503136
@@ -424,7 +426,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_VVS1>]> 0.028205871582
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_restrict_from_a_param_card>]> 0.106390953064
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_w_nlo_gen>]> 0.38791513443
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_multidiagram_decay_chains>]> 0.431716918945
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 10.1859381199
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_color_links>]> 0.00164699554443
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0140371322632
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_hh_hh_QED>]> 0.00143194198608
@@ -468,6 +470,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=test_power>]> 0.000131845474243
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarmult>]> 9.3936920166e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttxa_QED>]> 0.00152993202209
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_loop_induced>]> 50.1276230812
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_VVS>]> 0.0257358551025
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domainintersection>]> 0.000596046447754
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_group_subprocs_and_get_diagram_maps>]> 0.33548283577
@@ -491,7 +494,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_timing_epem_ttx>]> 14.4036149979
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.LoopDiagramDrawerTest testMethod=test_fuse_line>]> 0.00980591773987
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_dxuhuuuxdx_guhuuux>]> 1.06607508659
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_histograms.IOHistogramTest testMethod=testIO_DJR_histograms>]> 6.34016513824
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.000133991241455
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_den_factor_lines_EW>]> 2.82828497887
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell1 testMethod=test_import_model>]> 0.106930971146
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testgetrepresentation>]> 0.002366065979
@@ -507,6 +510,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_ij_lines>]> 0.0146369934082
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarMult>]> 0.000117063522339
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_oneloop_reweighting>]> 0.519333124161
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_integer_handling>]> 0.00176501274109
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_find_reals>]> 0.0384328365326
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.security_issue.TestSecurity testMethod=test_security_scan>]> 0.276997804642
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.010556936264
@@ -518,48 +522,47 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testbasicoperation>]> 0.000247955322266
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_get_proc_with_decay_NLO>]> 0.584362983704
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm2>]> 23.508852005
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_sign_flips_to_order>]> 8.08238983154e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Fortranwriter_spin3half>]> 0.154531002045
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_wa_refine>]> 11.0905270576
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_cpp>]> 0.000547170639038
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nfksconfigs_file>]> 0.0158369541168
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_ref_dict_multiple_interactions>]> 0.000741004943848
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=test_short_power>]> 0.000148057937622
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0189230442047
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_fks_real_process_get_leg_i_j>]> 0.0138988494873
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_photons>]> 0.107678890228
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_dxd_gz>]> 2.18089485168
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultmul>]> 0.000133991241455
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hh_EW>]> 13.6150200367
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcantlo_script>]> 46.4756779671
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_enu_enu>]> 0.008131980896
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_coeff_string>]> 0.028568983078
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_mssm>]> 11.2124068737
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct_MP>]> 0.0654561519623
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_short_gauge_loop>]> 37.5182161331
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_base_amplitude>]> 0.140361070633
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_sum_object>]> 0.000658988952637
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_standard>]> 3.79085540771e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_semi>]> 125.299013853
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportMatchBox testMethod=test_write_match_go_process_cc_file>]> 0.0377099514008
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_cpp>]> 0.0238170623779
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_4g_decay_chain_process>]> 0.395421028137
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_error_particle_save>]> 4.19616699219e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uu_susug>]> 0.0533299446106
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_madspin_ON_and_onshell_atNLO>]> 0.381196022034
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_define_order>]> 0.214026927948
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_python_routine_are_exec>]> 0.00516891479492
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_histograms.IOTest_Histogram testMethod=testIO_gnuplot_histo_output>]> 0.224948883057
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF3>]> 0.325031042099
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting_comb>]> 7.06551980972
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_get_max_level>]> 0.132587909698
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp>]> 0.000180959701538
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj>]> 0.145397901535
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_ga_EW>]> 15.2475500107
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_read_particles>]> 0.000508069992065
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest2 testMethod=test_change_to_complex_mass_scheme>]> 0.152688980103
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_cms_aem_emvevex>]> 0.289308071136
@@ -582,9 +585,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_epem_ddx>]> 0.67814207077
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madevent.test_combine_runs.TestCombineRuns testMethod=test_get_fortran_str>]> 0.000144004821777
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_udx_htbx>]> 12.6998720169
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghgg_gghg>]> 0.115737915039
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_ppgogo_amcatnlo_nlo>]> 56.4734661579
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWW>]> 0.0192968845367
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting>]> 15.5831661224
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_for_loop>]> 0.000102043151855
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator4>]> 0.025171995163
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_analyse>]> 0.000509977340698
@@ -609,7 +612,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_uuddg_uudd>]> 0.0242109298706
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_representation>]> 0.00148892402649
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF>]> 0.00619888305664
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_gg_gogog_QCD>]> 258.932424068
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_complex_equality>]> 0.453453063965
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_gg_ggg>]> 0.137652873993
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization4>]> 0.000862836837769
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_expand_list>]> 0.00167798995972
@@ -617,7 +620,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testEinsteinsum>]> 0.00415802001953
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_epem_EW>]> 7.10565686226
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_histograms.TestHistograms testMethod=test_histograms_operations>]> 0.181525945663
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00219416618347
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sqso1>]> 0.000553131103516
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductspin>]> 0.070338010788
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_shower_scripts>]> 107.744693995
@@ -634,13 +637,13 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_setget_process_exceptions>]> 0.000452041625977
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.ExportUFOModelPythia8Test testMethod=test_write_pythia8_parameter_files>]> 0.082643032074
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate>]> 0.00022292137146
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_change_number_format_python>]> 0.000586986541748
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_0>]> 0.000486850738525
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvaradd>]> 9.3936920166e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator3>]> 0.0580358505249
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_model_initialization>]> 0.000297069549561
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_has_symmetries>]> 0.000720024108887
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testlistindices>]> 0.00581979751587
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt_with_subprocess_group>]> 0.0958831310272
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_ufo_aloha>]> 1.4953649044
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_py6_stdhep>]> 107.259223938
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_decaytable_string>]> 0.357012033463
@@ -655,7 +658,6 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_power>]> 0.000319957733154
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_set>]> 45.5628159046
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0103709697723
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_born_fks>]> 0.057590007782
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups>]> 7.51800894737
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ddx>]> 2.72820210457
@@ -679,7 +681,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_ML5EW_gg_ttxh_QCD>]> 0.000695943832397
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp_analyse>]> 0.000179052352905
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSProcess_gggg>]> 0.369121789932
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_Fortranwriter_spin3half>]> 0.141327142715
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_gg_gogog_QCD>]> 258.932424068
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_calculate_xsect_script>]> 54.8990449905
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_add_std_diagram>]> 0.336571931839
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_non_integer_external>]> 0.000808000564575
@@ -690,10 +692,10 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_hw6_set>]> 102.896171808
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_helas_diagrams_gg_gogo_go_tt1x_t_wpb>]> 0.0463981628418
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_find_vertexlist>]> 0.113565921783
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_ga_QCD_QED>]> 0.00132417678833
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_save_load>]> 1.68547606468
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testemptyisFalse>]> 6.60419464111e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_coeff_string>]> 0.0342230796814
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_script>]> 30.6620099545
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_13>]> 41.2373769283
@@ -701,13 +703,13 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_attx>]> 40.257420063
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.HelasModelTest testMethod=test_setget_helas_model_error>]> 0.00156712532043
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testsetrepresentation>]> 0.00262403488159
-<__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_export_v4.TestMadWeight testMethod=test_modification_to_cuts>]> 0.0898389816284
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_no_cutting_line>]> 0.0152459144592
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_group_decay_chains>]> 0.305987119675
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_regular_expression_propa>]> 0.000612020492554
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_sort_proc>]> 0.0744910240173
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_full_sm_aloha>]> 1.30430817604
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_mssm>]> 11.2124068737
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_setget_interaction_exceptions>]> 0.000231027603149
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_multistage_decay_chain_process>]> 0.127142906189
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_launch_amcatnlo_name>]> 68.1794371605
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_auto_handling>]> 0.000450134277344
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_za_QED>]> 0.0014591217041
@@ -717,7 +719,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4IOTest testMethod=testIO_export_matrix_element_v4_madevent_group>]> 0.124577045441
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmbbx>]> 61.837485075
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_export_matrix_element_python_madevent_group>]> 0.0395710468292
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj_with_required_s_channel>]> 0.195080041885
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFT2>]> 0.0807220935822
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm_nomasses>]> 0.0792789459229
@@ -735,9 +736,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_fct>]> 0.220015048981
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_split>]> 0.00737619400024
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_file_EW>]> 5.29289245605e-05
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF3>]> 0.317361831665
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_modified_mssm_general>]> 8.70347595215
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000127792358398
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_def_position>]> 0.000124931335449
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_sum_object>]> 0.000125885009766
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_F77writer_feynman>]> 0.027764081955
@@ -745,26 +746,27 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_sborn_sf>]> 0.00146198272705
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group>]> 9.28846502304
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_setget_process_definition_correct>]> 0.000485897064209
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_ga_QCD_QED>]> 0.00132417678833
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_madevent_directory>]> 16.0076999664
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_get_name>]> 0.030855178833
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator3>]> 0.0653259754181
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_vertexlist>]> 1.92569303513
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_values_for_prop>]> 8.10623168945e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zccx>]> 41.9109280109
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_loop_convert_diagram>]> 0.000792026519775
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_ug_ttxz>]> 0.11712884903
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_equality>]> 0.000420093536377
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddint>]> 9.20295715332e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0104720592499
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_real_process_init>]> 0.16713809967
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testequality>]> 0.000127077102661
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdMatchBox testMethod=testIO_MatchBoxOutput>]> 3.16356706619
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_get_fks_j_from_i_lines_EW>]> 7.70092010498e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_replace_make_opt_f_compiler>]> 0.0348589420319
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_onshell_s_channel_uux_uuxng>]> 0.0812060832977
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_CPP_helas_call_writer>]> 0.0117120742798
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF3>]> 0.317361831665
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_singletop_fastjet>]> 152.502398014
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_majorana_decay_chain_process>]> 0.136888980865
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madevent_ptj_bias>]> 75.3821110725
@@ -778,10 +780,10 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_multi_gluons>]> 0.251565933228
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_equal_decay_chains>]> 0.134434938431
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_name>]> 66.2333741188
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_full_epem_ttx>]> 42.7599339485
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_helper_lcm_functions>]> 0.000735998153687
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarint>]> 6.48498535156e-05
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_ML5EW_sm_vs_stored_ML5EW_sqso>]> 0.00940799713135
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_representation>]> 0.000728130340576
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_forbidden_s_channel_decay_chain>]> 0.0207369327545
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_sqso_ddx_ddx_WEIGHTEDgt6>]> 20.8691658974
@@ -806,7 +808,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_mass_overmass>]> 0.00144410133362
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_rambo_validity_check>]> 0.000271081924438
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_get_final_ids_after_decay>]> 0.000993013381958
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_particle_list>]> 0.000241994857788
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_Fortranwriter_spin3half>]> 0.141327142715
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultmult>]> 0.000176906585693
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_ddxng>]> 0.179573059082
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_mssm_22>]> 561.371481895
@@ -824,10 +826,10 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_get_rank>]> 0.103627204895
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0196721553802
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_VVS1>]> 0.0284140110016
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 10.1859381199
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_multidiagram_decay_chains>]> 0.431716918945
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_cpp_go_process_cc_file>]> 0.0690608024597
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_split_evt_gen_zeroev>]> 67.6156620979
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testTraceofObject>]> 0.000325918197632
+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_no_combine>]> 0.184464216232
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_h_file>]> 0.0427629947662
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_leshouche_sextet_diquarks>]> 2.94189381599
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_default>]> 0.000207901000977
@@ -850,7 +852,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_C>]> 0.0504019260406
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_ttx_wpwm_EW>]> 20.03905797
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel2 testMethod=test_read_param_card>]> 1.23990178108
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_couplings>]> 0.000503063201904
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrappedWithReturnPath>]> 0.00258612632751
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct>]> 0.000214099884033
@@ -878,7 +879,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_multiple_lorentz>]> 0.000393867492676
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_values_for_prop>]> 0.110687971115
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_get_fks_info_list>]> 0.993493080139
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_launch_amcatnlo_name>]> 49.5285630226
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_fortran>]> 0.000572919845581
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_decay_width_nlo_model>]> 14.2313911915
@@ -894,7 +895,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxd_zgg>]> 39.1508870125
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess>]> 0.970643043518
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_modifparameter>]> 0.000886917114258
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_multistage_decay_chain_process>]> 0.127142906189
+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghgg_gghg>]> 0.115737915039
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_get_s_and_t_channels.TestGetSandTchannels testMethod=test_get_s_and_t_ub_tdg>]> 0.11679315567
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorTripletModel testMethod=test_ut_to_antitrip_g>]> 0.187545776367
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_wpwm_hh_QED>]> 0.00102114677429
@@ -904,7 +905,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_projector>]> 0.00699806213379
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_write_block>]> 0.0758440494537
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_output2>]> 43.6411170959
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETag testMethod=test_identify_me_tag_qq_qqg>]> 0.144216060638
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testEpsilonProperty>]> 0.054888010025
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorTripletModel testMethod=test_triplet_color_flow_output>]> 0.139855146408
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestMadAnalysis5Card testMethod=test_MadAnalysis5Card>]> 0.000823974609375
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_combine>]> 0.221959114075
@@ -926,6 +927,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_stdhep>]> 50.4594700336
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_fuse_vertex>]> 0.000200033187866
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1x_QCD>]> 69.1381390095
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_hepmc_decay>]> 0.65887594223
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_def_begin_end_point>]> 9.89437103271e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator>]> 0.128522157669
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestMadSpinFCT_in_interface testMethod=test_get_final_part>]> 0.12849187851
@@ -934,7 +936,6 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_cross_gauge_p2>]> 26775.4375861
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_no_isr>]> 0.035425901413
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_uux_QCD_QED>]> 0.00138115882874
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_ppgogo_amcatnlo_nlo>]> 56.4734661579
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_decayBW_file>]> 0.00429511070251
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_stdhep>]> 10.500576973
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8_analyse>]> 0.000602960586548
@@ -942,20 +943,19 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_butdg_butd>]> 0.0965809822083
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_full_lept>]> 29.0376198292
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_comparison>]> 0.225214958191
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_interaction>]> 0.000797033309937
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_aloha_get_name>]> 0.0285120010376
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_b_sf_fks>]> 2.02799201012
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_wpwm_QCD>]> 0.00233387947083
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_representation>]> 0.00421714782715
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_info_file>]> 0.0922110080719
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm>]> 0.0441629886627
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816
+<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_help_category>]> 0.00062894821167
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ga>]> 1.02916789055
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_setget_wavefunction_exceptions>]> 0.000231027603149
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_generate_events_nlo_py6_stdhep>]> 90.5052030087
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_check_generate_optimize>]> 0.301462173462
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_zttx>]> 42.488312006
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_values_for_prop>]> 0.000379085540771
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_zz_QCD>]> 0.0014021396637
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF>]> 0.00574803352356
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestLorentzInvariance testMethod=test_boost_momenta_gluino>]> 5.42973899841
@@ -963,39 +963,39 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_multiple_lorentz_subset>]> 0.0536549091339
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_wrong_multiparticle>]> 0.00848388671875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWZA>]> 0.0144498348236
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000127792358398
+<__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_export_v4.TestMadWeight testMethod=test_modification_to_cuts>]> 0.0898389816284
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_den_factor_lines>]> 2.02332401276
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_flipping>]> 0.0031681060791
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator2>]> 0.152077913284
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_eventsnlo_py6pt_fsr>]> 16.2141349316
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_file_EW>]> 0.000738143920898
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_MP_mode>]> 0.0349721908569
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin32propagator>]> 0.208134174347
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_setget_matrix_element_exceptions>]> 0.00100207328796
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_modified_mssm_general>]> 8.70347595215
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_configs_file_born_EW>]> 5.07831573486e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.00016713142395
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_calculate_xsect_script>]> 58.7567720413
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_identify_particle>]> 0.0015971660614
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_setget_multi_leg_correct>]> 6.60419464111e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_complicated_majorana_process>]> 0.110619068146
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uxu_wpwm_QED>]> 0.000982999801636
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower1>]> 0.000165939331055
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_permutation.TestPermutation testMethod=test_permutation_from_id>]> 0.0379128456116
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_identical_interactions>]> 0.0405609607697
-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_help_category>]> 0.00062894821167
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestPythia8Card testMethod=test_PY8Card_with_subruns>]> 0.0171630382538
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8>]> 0.000524997711182
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_aa_QED>]> 0.00227403640747
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_add_time_of_flight>]> 19.5163040161
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_nfksconfigs_file_EW>]> 0.0351588726044
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_output>]> 0.0474369525909
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_anti_pdg_code>]> 0.000168085098267
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_particle>]> 0.000631093978882
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_check_generate_optimize>]> 0.301462173462
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_generate_events_nlo_py6_stdhep>]> 90.5052030087
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_file>]> 0.00247812271118
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000146865844727
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hwpp_set>]> 29.2329268456
+<__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_add_ab_particle>]> 0.127122163773
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFONoSideEffect testMethod=test_ImportUFOcheckgoldstone>]> 0.0369899272919
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_lhe_none_decay>]> 7.61337804794
@@ -1029,6 +1029,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testrsumvarvar>]> 7.60555267334e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_complex_conjugate>]> 8.20159912109e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_VVS>]> 0.0273261070251
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_4_fermion>]> 0.0415799617767
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_special_group_decay_chain>]> 0.162132024765
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppz>]> 1.70217895508
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_OR>]> 0.00101685523987
@@ -1036,6 +1037,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_raise_invalid_path_py8>]> 74.8001401424
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_wpwm_QED>]> 0.0013861656189
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T_pair_simplify>]> 0.000263929367065
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_output_files.IOExportMadLoopAcceptanceTest testMethod=testIO_ProcOutputIOTests>]> 28.318707943
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_ppzz_in_RS>]> 5.40944194794
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_lh_order_EW>]> 0.000322818756104
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarint>]> 8.79764556885e-05
@@ -1045,7 +1047,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_gluons>]> 0.0548150539398
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_complex_mass_SA>]> 1.51796483994
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=test_short_sumofLorentzObj>]> 0.00596499443054
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_fks_EW>]> 4.79221343994e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_python_routine_are_exec>]> 0.00470900535583
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin32propagator>]> 0.232930898666
@@ -1057,7 +1058,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_FFT2>]> 0.0686628818512
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_wj_loonly_gen>]> 8.72703194618
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_model_reader.TestModelReader testMethod=test_set_parameters_and_couplings>]> 0.0923321247101
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_4_fermion>]> 0.0415799617767
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_setget_model_correct>]> 0.00034499168396
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_ddx_wpwmg>]> 26.4144010544
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_CT_vertices_generation_gg_gg>]> 1.53292918205
@@ -1095,15 +1096,15 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_parity_for_epsilon>]> 0.000339031219482
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_coloramps_file>]> 0.00445699691772
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_t_channel_vertex>]> 0.000336170196533
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000134944915771
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_setget_matrix_element_exceptions>]> 0.00100207328796
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_four_fermion_vertex_strange_fermion_flow>]> 0.0298500061035
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting>]> 15.5831661224
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testIdentityMatrix>]> 0.0287408828735
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madspin_gridpack>]> 31.1755411625
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_get_particles_type>]> 0.128159046173
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestMadLoopParam testMethod=test_modifparameter>]> 0.000784873962402
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator4>]> 0.0218019485474
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_no_combine>]> 0.184464216232
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_wpwm_QCD>]> 0.00233387947083
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_group>]> 0.119250059128
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_group_multidiagram_decay_chains>]> 0.331767082214
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_nlo_hw6_stdhep>]> 106.459758997
@@ -1117,7 +1118,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_complex_mass_scheme>]> 0.02272605896
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massless>]> 0.000313997268677
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_insert_legs>]> 0.000980854034424
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532
+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_uuxuux>]> 0.00294399261475
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_help_generate_ab_amplitude>]> 0.233986139297
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469
@@ -1125,13 +1126,13 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_level_with_flipping_triangle>]> 0.00130605697632
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_mssm_equivalence>]> 4.6789290905
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0128040313721
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_reorder_permutation>]> 5.41210174561e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_html_long_process_strings>]> 20.4391908646
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000126123428345
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00191402435303
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_nodiag>]> 0.00244688987732
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=test_obj_are_not_modified>]> 0.000224113464355
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_check_generate>]> 0.00097393989563
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttx_QED>]> 0.00158500671387
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_symmetries_and_get_info>]> 0.212943077087
@@ -1140,15 +1141,15 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_legs_to_color_link_string>]> 0.00512909889221
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_sort_fksleglist>]> 0.00221490859985
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_I>]> 0.000235080718994
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_representation>]> 7.29560852051e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_real_me_wrapper_EW>]> 5.69820404053e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_files.TestFilesGestion testMethod=test_is_uptodate>]> 1.0137488842
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization5>]> 0.00028395652771
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_particles_uux_uuxng>]> 0.0401759147644
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_initial_vertex_position>]> 0.000370979309082
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_hepmc_decay>]> 0.65887594223
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_loop_induced>]> 50.1276230812
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testTraceofObject>]> 0.000325918197632
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_duxhuduxux_guxhuuxux>]> 1.03614902496
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hw6_analyse>]> 0.000184059143066
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_helicity_states>]> 0.000174045562744
@@ -1157,21 +1158,22 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputIOTest testMethod=testIO_sqso_uux_uuxuuxx>]> 1.1301419735
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_append_remove>]> 0.000144958496094
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000118970870972
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_Plorentz>]> 0.0777571201324
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCard testMethod=test_mod_param>]> 0.000418901443481
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_paralel_cross_sm>]> 865.433312893
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_nice_string>]> 0.000377178192139
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_qq_qqg_with_subprocess_group>]> 0.406945943832
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_initMadLoopParam>]> 0.00100302696228
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00219416618347
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_fortranwriter_CFF>]> 0.0698010921478
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_other>]> 4.31537628174e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_run_card>]> 0.0163931846619
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_card_type_recognition>]> 0.0509171485901
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_nhel_file_EW>]> 0.125450849533
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_ga_EW>]> 15.2475500107
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_dxd_zzg>]> 32.0563452244
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_full_sm_decay_groups>]> 5.82679080963
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_output_files.IOExportMadLoopAcceptanceTest testMethod=testIO_ProcOutputIOTests>]> 28.318707943
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_CPP_helas_call_writer>]> 0.0117120742798
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_correct>]> 9.48905944824e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOTestMadLoopOutputFromInterface testMethod=testIO_TIR_output>]> 190.159698009
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_required_s_channel_uux_uuxng>]> 0.146993160248
@@ -1187,7 +1189,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_udxwpg_udxwp>]> 0.0118889808655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestBanner testMethod=test_banner>]> 0.0151350498199
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_values_for_prop>]> 0.000183820724487
-<__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_ML5EW_sm_vs_stored_ML5EW_sqso>]> 0.00940799713135
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_get_color_data_lines_from_color_matrix>]> 1.95838093758
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_epem_ddx>]> 25.6196660995
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_diagram_list_nice_string>]> 0.00311493873596
@@ -1196,7 +1198,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6>]> 0.000173807144165
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_expand_veto>]> 0.00168204307556
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarvar>]> 6.89029693604e-05
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestEvent testMethod=test_madspin_event>]> 0.00227999687195
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_epem_sepsemepem>]> 0.074609041214
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_hhttx>]> 141.341906071
@@ -1219,5 +1221,5 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nexternal_file>]> 0.000472784042358
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_ppzjj>]> 59.9299731255
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_check_generate_events_nlo_py6pt_fsr>]> 34.7858700752
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_dxd_gz>]> 2.18089485168
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator2>]> 0.152077913284
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_aloha_MP_mode>]> 0.0324759483337
\ No newline at end of file

=== modified file 'tests/unit_tests/iolibs/test_export_cpp.py'
--- tests/unit_tests/iolibs/test_export_cpp.py	2017-02-16 14:49:57 +0000
+++ tests/unit_tests/iolibs/test_export_cpp.py	2019-06-27 13:48:48 +0000
@@ -1386,7 +1386,7 @@
 
 using namespace std;
 
-namespace Pythia8 {
+using namespace Pythia8;
 
 class Parameters_sm
 {
@@ -1410,6 +1410,10 @@
 void setIndependentCouplings();
 // Set parameters that are changed event by event
 void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS);
+// TMP: hardcoded bogus implementation with no arguments since this
+// is being called from within the matrix elements.
+void setDependentParameters() {};
+
 // Set couplings that are changed event by event
 void setDependentCouplings();
 
@@ -1422,12 +1426,10 @@
 // Print couplings that are changed event by event
 void printDependentCouplings();
 
-
   private:
 static Parameters_sm* instance;
 };
 
-} // end namespace Pythia8
 #endif // Pythia8_parameters_sm_H
 """% misc.get_pkg_info()
 
@@ -1444,21 +1446,21 @@
 #include "Parameters_sm.h"
 #include "Pythia8/PythiaStdlib.h"
 
-namespace Pythia8 {
-
-    // Initialize static instance
-    Parameters_sm* Parameters_sm::instance = 0;
-
-    // Function to get static instance - only one instance per program
-    Parameters_sm* Parameters_sm::getInstance(){
-    if (instance == 0)
-        instance = new Parameters_sm();
-
-    return instance;
-    }
-
-    void Parameters_sm::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
-    mdl_WTau=pd->mWidth(15);
+using namespace Pythia8;
+
+// Initialize static instance
+Parameters_sm* Parameters_sm::instance = 0;
+
+// Function to get static instance - only one instance per program
+Parameters_sm* Parameters_sm::getInstance(){
+if (instance == 0)
+    instance = new Parameters_sm();
+
+return instance;
+}
+
+void Parameters_sm::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
+mdl_WTau=pd->mWidth(15);
 mdl_WH=pd->mWidth(25);
 mdl_WT=pd->mWidth(6);
 mdl_WW=pd->mWidth(24);
@@ -1559,9 +1561,9 @@
 mdl_ee__exp__2 = ((mdl_ee)*(mdl_ee));
 mdl_sw__exp__2 = ((mdl_sw)*(mdl_sw));
 mdl_cw__exp__2 = ((mdl_cw)*(mdl_cw));
-    }
-    void Parameters_sm::setIndependentCouplings(){
-    GC_1 = -(mdl_ee*mdl_complexi)/3.;
+}
+void Parameters_sm::setIndependentCouplings(){
+GC_1 = -(mdl_ee*mdl_complexi)/3.;
 GC_2 = (2.*mdl_ee*mdl_complexi)/3.;
 GC_3 = -(mdl_ee*mdl_complexi);
 GC_4 = mdl_ee*mdl_complexi;
@@ -1666,23 +1668,26 @@
 GC_106 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x1)/(mdl_sw*mdl_sqrt__2);
 GC_107 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x2)/(mdl_sw*mdl_sqrt__2);
 GC_108 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x3)/(mdl_sw*mdl_sqrt__2);
-    }
-    void Parameters_sm::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
-    aS = alpS;
+}
+
+void Parameters_sm::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
+aS = alpS;
 mdl_sqrt__aS = sqrt(aS);
 G = 2.*mdl_sqrt__aS*sqrt(M_PI);
 mdl_G__exp__2 = ((G)*(G));
-    }
-    void Parameters_sm::setDependentCouplings(){
-    GC_12 = mdl_complexi*mdl_G__exp__2;
+}
+
+
+void Parameters_sm::setDependentCouplings(){
+GC_12 = mdl_complexi*mdl_G__exp__2;
 GC_11 = mdl_complexi*G;
 GC_10 = -G;
-    }
+}
 
-    // Routines for printing out parameters
-    void Parameters_sm::printIndependentParameters(){
-    cout << "sm model parameters independent of event kinematics:" << endl;
-    cout << setw(20) << "mdl_WTau " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WTau << endl;
+// Routines for printing out parameters
+void Parameters_sm::printIndependentParameters(){
+cout << "sm model parameters independent of event kinematics:" << endl;
+cout << setw(20) << "mdl_WTau " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WTau << endl;
 cout << setw(20) << "mdl_WH " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WH << endl;
 cout << setw(20) << "mdl_WT " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WT << endl;
 cout << setw(20) << "mdl_WW " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WW << endl;
@@ -1775,10 +1780,10 @@
 cout << setw(20) << "mdl_ee__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_ee__exp__2 << endl;
 cout << setw(20) << "mdl_sw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_sw__exp__2 << endl;
 cout << setw(20) << "mdl_cw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_cw__exp__2 << endl;
-    }
-    void Parameters_sm::printIndependentCouplings(){
-    cout << "sm model couplings independent of event kinematics:" << endl;
-    cout << setw(20) << "GC_1 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_1 << endl;
+}
+void Parameters_sm::printIndependentCouplings(){
+cout << "sm model couplings independent of event kinematics:" << endl;
+cout << setw(20) << "GC_1 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_1 << endl;
 cout << setw(20) << "GC_2 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_2 << endl;
 cout << setw(20) << "GC_3 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_3 << endl;
 cout << setw(20) << "GC_4 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_4 << endl;
@@ -1883,22 +1888,21 @@
 cout << setw(20) << "GC_106 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_106 << endl;
 cout << setw(20) << "GC_107 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_107 << endl;
 cout << setw(20) << "GC_108 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_108 << endl;
-    }
-    void Parameters_sm::printDependentParameters(){
-    cout << "sm model parameters dependent on event kinematics:" << endl;
-    cout << setw(20) << "aS " << "= " << setiosflags(ios::scientific) << setw(10) << aS << endl;
+}
+void Parameters_sm::printDependentParameters(){
+cout << "sm model parameters dependent on event kinematics:" << endl;
+cout << setw(20) << "aS " << "= " << setiosflags(ios::scientific) << setw(10) << aS << endl;
 cout << setw(20) << "mdl_sqrt__aS " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_sqrt__aS << endl;
 cout << setw(20) << "G " << "= " << setiosflags(ios::scientific) << setw(10) << G << endl;
 cout << setw(20) << "mdl_G__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_G__exp__2 << endl;
-    }
-    void Parameters_sm::printDependentCouplings(){
-    cout << "sm model couplings dependent on event kinematics:" << endl;
-    cout << setw(20) << "GC_12 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_12 << endl;
+}
+void Parameters_sm::printDependentCouplings(){
+cout << "sm model couplings dependent on event kinematics:" << endl;
+cout << setw(20) << "GC_12 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_12 << endl;
 cout << setw(20) << "GC_11 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_11 << endl;
 cout << setw(20) << "GC_10 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_10 << endl;
-    }
+}
 
-} // end namespace Pythia8
 """ % misc.get_pkg_info()
 
         file_h, file_cc = self.model_builder.generate_parameters_class_files()

=== modified file 'tests/unit_tests/various/test_banner.py'
--- tests/unit_tests/various/test_banner.py	2018-04-30 11:11:08 +0000
+++ tests/unit_tests/various/test_banner.py	2019-06-27 13:48:48 +0000
@@ -203,6 +203,48 @@
         self.assertRaises(Exception, self.config.__setitem__, 'dict', {'test':'test'})
         self.assertRaises(Exception, self.config.__setitem__, 'dict', "22")
 
+    def test_integer_handling(self):
+
+        self.config.add_param("int", 1)
+        self.config['int'] = '30*2'
+        self.assertEqual(self.config['int'] ,30*2)
+        
+        self.config['int'] = 3.0
+        self.assertEqual(self.config['int'] ,3)
+         
+        self.config['int'] = '3k'
+        self.assertEqual(self.config['int'] ,3000)
+        
+        self.config['int'] = '3M'
+        self.assertEqual(self.config['int'] ,3000000)                        
+
+        self.config['int'] = '4d1'
+        self.assertEqual(self.config['int'] ,40) 
+
+        self.config['int'] = '30/2'
+        self.assertEqual(self.config['int'] , 15)
+
+    def test_float_handling(self):
+
+        self.config.add_param("int", 1.0)
+        self.config['int'] = '30*2'
+        self.assertEqual(self.config['int'] ,30*2)
+        
+        self.config['int'] = 3.0
+        self.assertEqual(self.config['int'] ,3)
+         
+        self.config['int'] = '3k'
+        self.assertEqual(self.config['int'] ,3000)
+        
+        self.config['int'] = '3M'
+        self.assertEqual(self.config['int'] ,3000000)                        
+
+        self.config['int'] = '4d1'
+        self.assertEqual(self.config['int'] ,40) 
+
+        self.config['int'] = '30/4'
+        self.assertEqual(self.config['int'] , 15/2.)
+
     def test_auto_handling(self):
         """check that any parameter can be set on auto and recover"""
         

=== modified file 'tests/unit_tests/various/test_shower_card.py'
--- tests/unit_tests/various/test_shower_card.py	2015-10-01 16:00:08 +0000
+++ tests/unit_tests/various/test_shower_card.py	2019-06-27 13:48:48 +0000
@@ -17,7 +17,8 @@
 import tests.unit_tests as unittest
 
 import madgraph.various.shower_card as shower_card
-
+import madgraph.various.misc as misc
+pjoin = os.path.join
 
 class TestShowerCard(unittest.TestCase):
     """Check the class linked to a block of the param_card"""
@@ -519,3 +520,17 @@
         for a, b in zip(text.split('\n'), goal.split('\n')):
             self.assertEqual(a,b)
         self.assertEqual(text, goal)
+
+    def test_shower_card_edit(self):
+
+        self.card.testing = True
+        new_text = self.card.text
+        old_card = shower_card.ShowerCard(new_text, testing=True)
+        new_text = old_card.set_param('ue_enabled', '.false.', write_to=True)
+        new_card = shower_card.ShowerCard(new_text, testing=True)
+        self.assertFalse(new_card['ue_enabled'])
+
+        new_text = old_card.set_param('ue_enabled', '1', write_to=True)
+        new_card = shower_card.ShowerCard(new_text, testing=True)
+        self.assertTrue(new_card['ue_enabled'])
+        

=== modified file 'tests/unit_tests/various/test_write_param.py'
--- tests/unit_tests/various/test_write_param.py	2015-10-01 16:00:08 +0000
+++ tests/unit_tests/various/test_write_param.py	2019-06-27 13:48:48 +0000
@@ -259,20 +259,20 @@
 ## analytical expression. MG5 ignores those values 
 ## but they are important for interfacing the output of MG5
 ## to external program such as Pythia.
-  1 0.000000 # d : 0.0 
-  2 0.000000 # u : 0.0 
-  3 0.000000 # s : 0.0 
-  4 0.000000 # c : 0.0 
-  5 0.000000 # b : 0.0 
-  11 0.000000 # e- : 0.0 
-  12 0.000000 # ve : 0.0 
-  13 0.000000 # mu- : 0.0 
-  14 0.000000 # vm : 0.0 
-  16 0.000000 # vt : 0.0 
-  21 0.000000 # g : 0.0 
-  22 0.000000 # a : 0.0 
-  24 80.419002 # w+ : cmath.sqrt(MZ__exp__2/2. + cmath.sqrt(MZ__exp__4/4. - (aEW*cmath.pi*MZ__exp__2)/(Gf*sqrt__2))) 
-  25 91.188000 # h : MZ 
+  1 0.000000e+00 # d : 0.0 
+  2 0.000000e+00 # u : 0.0 
+  3 0.000000e+00 # s : 0.0 
+  4 0.000000e+00 # c : 0.0 
+  5 0.000000e+00 # b : 0.0 
+  11 0.000000e+00 # e- : 0.0 
+  12 0.000000e+00 # ve : 0.0 
+  13 0.000000e+00 # mu- : 0.0 
+  14 0.000000e+00 # vm : 0.0 
+  16 0.000000e+00 # vt : 0.0 
+  21 0.000000e+00 # g : 0.0 
+  22 0.000000e+00 # a : 0.0 
+  24 8.041900e+01 # w+ : cmath.sqrt(MZ__exp__2/2. + cmath.sqrt(MZ__exp__4/4. - (aEW*cmath.pi*MZ__exp__2)/(Gf*sqrt__2))) 
+  25 9.118800e+01 # h : MZ 
 
 ###################################
 ## INFORMATION FOR SMINPUTS
@@ -300,20 +300,20 @@
 ## analytical expression. MG5 ignores those values 
 ## but they are important for interfacing the output of MG5
 ## to external program such as Pythia.
-DECAY  1 0.000000 # d : 0.0 
-DECAY  2 0.000000 # u : 0.0 
-DECAY  3 0.000000 # s : 0.0 
-DECAY  4 0.000000 # c : 0.0 
-DECAY  5 0.000000 # b : 0.0 
-DECAY  6 0.000000 # t : 0.0 
-DECAY  11 0.000000 # e- : 0.0 
-DECAY  12 0.000000 # ve : 0.0 
-DECAY  13 0.000000 # mu- : 0.0 
-DECAY  14 0.000000 # vm : 0.0 
-DECAY  15 0.000000 # ta- : 0.0 
-DECAY  16 0.000000 # vt : 0.0 
-DECAY  21 0.000000 # g : 0.0 
-DECAY  22 0.000000 # a : 0.0 
+DECAY  1 0.000000e+00 # d : 0.0 
+DECAY  2 0.000000e+00 # u : 0.0 
+DECAY  3 0.000000e+00 # s : 0.0 
+DECAY  4 0.000000e+00 # c : 0.0 
+DECAY  5 0.000000e+00 # b : 0.0 
+DECAY  6 0.000000e+00 # t : 0.0 
+DECAY  11 0.000000e+00 # e- : 0.0 
+DECAY  12 0.000000e+00 # ve : 0.0 
+DECAY  13 0.000000e+00 # mu- : 0.0 
+DECAY  14 0.000000e+00 # vm : 0.0 
+DECAY  15 0.000000e+00 # ta- : 0.0 
+DECAY  16 0.000000e+00 # vt : 0.0 
+DECAY  21 0.000000e+00 # g : 0.0 
+DECAY  22 0.000000e+00 # a : 0.0 
 """.split('\n')
 
         self.assertEqual(self.content.getvalue().split('\n'), goal)